diff options
| author | Christian Daudt <csd@broadcom.com> | 2013-08-20 08:37:19 -0700 |
|---|---|---|
| committer | Christian Daudt <csd@broadcom.com> | 2013-08-20 10:51:38 -0700 |
| commit | aea237bfa0a8ce8fe364e3fa7de6850777044a60 (patch) | |
| tree | daa7d7ce07327b787cd707f1d8add2ab896ecbeb | |
| 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>
| -rw-r--r-- | arch/arm/mach-bcm/bcm_kona_smc.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-bcm/board_bcm281xx.c | 4 | ||||
| -rw-r--r-- | drivers/clocksource/bcm_kona_timer.c | 8 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci-bcm-kona.c | 3 |
4 files changed, 13 insertions, 5 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 { }; static const struct of_device_id bcm_kona_smc_ids[] __initconst = { - {.compatible = "bcm,kona-smc"}, + {.compatible = "brcm,kona-smc"}, + {.compatible = "bcm,kona-smc"}, /* deprecated name */ {}, }; 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) { struct device_node *np; - np = of_find_compatible_node(NULL, NULL, "bcm,bcm11351"); + np = of_find_compatible_node(NULL, NULL, "brcm,bcm11351"); if (np) { if (of_device_is_available(np)) bcm_kona_setup_restart(); @@ -63,7 +63,7 @@ static void __init board_init(void) kona_l2_cache_init(); } -static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351", NULL, }; +static const char * const bcm11351_dt_compat[] = { "brcm,bcm11351", NULL, }; DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor") .init_time = clocksource_of_init, 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); diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c index 90a936732925..9ec7ca5dbcee 100644 --- a/drivers/mmc/host/sdhci-bcm-kona.c +++ b/drivers/mmc/host/sdhci-bcm-kona.c @@ -222,7 +222,8 @@ static struct sdhci_pltfm_data sdhci_pltfm_data_kona = { }; static struct __initconst of_device_id sdhci_bcm_kona_of_match[] = { - { .compatible = "bcm,kona-sdhci"}, + { .compatible = "brcm,kona-sdhci"}, + { .compatible = "bcm,kona-sdhci"}, /* deprecated name */ {} }; MODULE_DEVICE_TABLE(of, sdhci_bcm_kona_of_match); |