diff options
| author | Christian Daudt <csd@broadcom.com> | 2013-08-20 19:37:19 +0400 |
|---|---|---|
| committer | Christian Daudt <csd@broadcom.com> | 2013-08-20 21:51:38 +0400 |
| commit | aea237bfa0a8ce8fe364e3fa7de6850777044a60 (patch) | |
| tree | daa7d7ce07327b787cd707f1d8add2ab896ecbeb /drivers/clocksource/bcm_kona_timer.c | |
| parent | cf68b629f938c01c9aa84fff95e1be96032af08d (diff) | |
| download | linux-aea237bfa0a8ce8fe364e3fa7de6850777044a60.tar.xz | |
ARM: DT: binding fixup to align with vendor-prefixes.txt (drivers)
[ this is a follow-up to this discussion:
http://archive.arm.linux.org.uk/lurker/message/20130730.230827.a1ceb12a.en.html ]
This patchset renames all uses of "bcm," name bindings to
"brcm," as they were done prior to knowing that brcm had
already been standardized as Broadcom vendor prefix
(in Documentation/devicetree/bindings/vendor-prefixes.txt).
This will not cause any churn on devices because none of
these bindings have made it into production yet.
Signed-off-by: Christian Daudt <csd@broadcom.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'drivers/clocksource/bcm_kona_timer.c')
| -rw-r--r-- | drivers/clocksource/bcm_kona_timer.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/clocksource/bcm_kona_timer.c b/drivers/clocksource/bcm_kona_timer.c index ba3d85904c9a..0d7d8c3ed6b2 100644 --- a/drivers/clocksource/bcm_kona_timer.c +++ b/drivers/clocksource/bcm_kona_timer.c @@ -99,7 +99,8 @@ kona_timer_get_counter(void *timer_base, uint32_t *msw, uint32_t *lsw) } static const struct of_device_id bcm_timer_ids[] __initconst = { - {.compatible = "bcm,kona-timer"}, + {.compatible = "brcm,kona-timer"}, + {.compatible = "bcm,kona-timer"}, /* deprecated name */ {}, }; @@ -201,4 +202,9 @@ static void __init kona_timer_init(struct device_node *node) kona_timer_set_next_event((arch_timer_rate / HZ), NULL); } +CLOCKSOURCE_OF_DECLARE(brcm_kona, "brcm,kona-timer", kona_timer_init); +/* + * bcm,kona-timer is deprecated by brcm,kona-timer + * being kept here for driver compatibility + */ CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer", kona_timer_init); |