Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aea237bf authored by Christian Daudt's avatar Christian Daudt
Browse files

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: default avatarChristian Daudt <csd@broadcom.com>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
parent cf68b629

arch/arm/mach-bcm/bcm_kona_smc.c

+2 −1
Original line number Diff line number Diff line
@@ -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 */

	{},

};

arch/arm/mach-bcm/board_bcm281xx.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

drivers/clocksource/bcm_kona_timer.c

+7 −1
Original line number Diff line number Diff line
@@ -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);

drivers/mmc/host/sdhci-bcm-kona.c

+2 −1
Original line number Diff line number Diff line
@@ -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);