diff options
author | Christian Daudt <csd@broadcom.com> | 2013-08-20 11:37:19 -0400 |
---|---|---|
committer | Christian Daudt <csd@broadcom.com> | 2013-08-20 13:51:38 -0400 |
commit | aea237bfa0a8ce8fe364e3fa7de6850777044a60 (patch) | |
tree | daa7d7ce07327b787cd707f1d8add2ab896ecbeb /arch/arm/mach-bcm | |
parent | cf68b629f938c01c9aa84fff95e1be96032af08d (diff) |
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 'arch/arm/mach-bcm')
-rw-r--r-- | arch/arm/mach-bcm/bcm_kona_smc.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-bcm/board_bcm281xx.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-bcm/bcm_kona_smc.c b/arch/arm/mach-bcm/bcm_kona_smc.c index 56d9d19b2470..bcc1c5903fb1 100644 --- a/arch/arm/mach-bcm/bcm_kona_smc.c +++ b/arch/arm/mach-bcm/bcm_kona_smc.c | |||
@@ -36,7 +36,8 @@ struct bcm_kona_smc_data { | |||
36 | }; | 36 | }; |
37 | 37 | ||
38 | static const struct of_device_id bcm_kona_smc_ids[] __initconst = { | 38 | static const struct of_device_id bcm_kona_smc_ids[] __initconst = { |
39 | {.compatible = "bcm,kona-smc"}, | 39 | {.compatible = "brcm,kona-smc"}, |
40 | {.compatible = "bcm,kona-smc"}, /* deprecated name */ | ||
40 | {}, | 41 | {}, |
41 | }; | 42 | }; |
42 | 43 | ||
diff --git a/arch/arm/mach-bcm/board_bcm281xx.c b/arch/arm/mach-bcm/board_bcm281xx.c index 1e49ec0399ad..3fe1e4d2e9a7 100644 --- a/arch/arm/mach-bcm/board_bcm281xx.c +++ b/arch/arm/mach-bcm/board_bcm281xx.c | |||
@@ -44,7 +44,7 @@ static void bcm_board_setup_restart(void) | |||
44 | { | 44 | { |
45 | struct device_node *np; | 45 | struct device_node *np; |
46 | 46 | ||
47 | np = of_find_compatible_node(NULL, NULL, "bcm,bcm11351"); | 47 | np = of_find_compatible_node(NULL, NULL, "brcm,bcm11351"); |
48 | if (np) { | 48 | if (np) { |
49 | if (of_device_is_available(np)) | 49 | if (of_device_is_available(np)) |
50 | bcm_kona_setup_restart(); | 50 | bcm_kona_setup_restart(); |
@@ -63,7 +63,7 @@ static void __init board_init(void) | |||
63 | kona_l2_cache_init(); | 63 | kona_l2_cache_init(); |
64 | } | 64 | } |
65 | 65 | ||
66 | static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351", NULL, }; | 66 | static const char * const bcm11351_dt_compat[] = { "brcm,bcm11351", NULL, }; |
67 | 67 | ||
68 | DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor") | 68 | DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor") |
69 | .init_time = clocksource_of_init, | 69 | .init_time = clocksource_of_init, |