ARM: DT: binding fixup to align with vendor-prefixes.txt
Subsystems (8)
PATCH 1/1 ARM: DT: binding fixup to align with vendor-prefixes.txt
[ 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.
Also rename the the following dt binding docs that had "bcm,"
in their name for consistency:
- bcm,kona-sdhci.txt -> kona-sdhci.txt
- bcm,kona-timer.txt -> kona-timer.txt
Documentation/devicetree/bindings/arm/bcm/bcm,kona-timer.txt deleted +0 -19
@@ -1,19 +0,0 @@ -Broadcom Kona Family timer ------------------------------------------------------ -This timer is used in the following Broadcom SoCs: - BCM11130, BCM11140, BCM11351, BCM28145, BCM28155 - -Required properties: -- compatible : "bcm,kona-timer" -- reg : Register range for the timer -- interrupts : interrupt for the timer -- clock-frequency: frequency that the clock operates - -Example: - timer at 35006000 { - compatible = "bcm,kona-timer"; - reg = <0x35006000 0x1000>; - interrupts = <0x0 7 0x4>; - clock-frequency = <32768>; - }; -
Documentation/devicetree/bindings/arm/bcm/bcm11351.txt +1 -1
@@ -6,4 +6,4 @@ bcm11351, bcm28145, bcm28155 SoCs) shall have the following properties: Required root node property: -compatible = "bcm,bcm11351"; +compatible = "brcm,bcm11351";
Documentation/devicetree/bindings/arm/bcm/kona-timer.txt new file +19 -0
@@ -0,0 +1,19 @@ +Broadcom Kona Family timer +----------------------------------------------------- +This timer is used in the following Broadcom SoCs: + BCM11130, BCM11140, BCM11351, BCM28145, BCM28155 + +Required properties: +- compatible : "brcm,kona-timer" +- reg : Register range for the timer +- interrupts : interrupt for the timer +- clock-frequency: frequency that the clock operates + +Example: + timer at 35006000 { + compatible = "brcm,kona-timer"; + reg = <0x35006000 0x1000>; + interrupts = <0x0 7 0x4>; + clock-frequency = <32768>; + }; +
Documentation/devicetree/bindings/arm/l2cc.txt +1 -1
@@ -16,7 +16,7 @@ Required properties: performs the same operation). "marvell,"aurora-outer-cache: Marvell Controller designed to be compatible with the ARM one with outer cache mode. - "bcm,bcm11351-a2-pl310-cache": For Broadcom bcm11351 chipset where an + "brcm,bcm11351-a2-pl310-cache": For Broadcom bcm11351 chipset where an offset needs to be added to the address before passing down to the L2 cache controller - cache-unified : Specifies the cache is a unified cache.
Documentation/devicetree/bindings/misc/smc.txt +2 -2
@@ -4,11 +4,11 @@ This binding defines the location of the bounce buffer used for non-secure to secure communications. Required properties: -- compatible : "bcm,kona-smc" +- compatible : "brcm,kona-smc" - reg : Location and size of bounce buffer Example: smc at 0x3404c000 { - compatible = "bcm,bcm11351-smc", "bcm,kona-smc"; + compatible = "brcm,bcm11351-smc", "brcm,kona-smc"; reg = <0x3404c000 0x400>; //1 KiB in SRAM };
Documentation/devicetree/bindings/mmc/bcm,kona-sdhci.txt deleted +0 -16
@@ -1,16 +0,0 @@ -Broadcom BCM281xx SDHCI - -This file documents differences between the core properties in mmc.txt -and the properties present in the bcm281xx SDHCI - -Required properties: -- compatible : Should be "bcm,kona-sdhci" - -Example: - -sdio2: sdio at 0x3f1a0000 { - compatible = "bcm,kona-sdhci"; - reg = <0x3f1a0000 0x10000>; - interrupts = <0x0 74 0x4>; -}; -
Documentation/devicetree/bindings/mmc/kona-sdhci.txt new file +16 -0
@@ -0,0 +1,16 @@ +Broadcom BCM281xx SDHCI + +This file documents differences between the core properties in mmc.txt +and the properties present in the bcm281xx SDHCI + +Required properties: +- compatible : Should be "brcm,kona-sdhci" + +Example: + +sdio2: sdio at 0x3f1a0000 { + compatible = "brcm,kona-sdhci"; + reg = <0x3f1a0000 0x10000>; + interrupts = <0x0 74 0x4>; +}; +
arch/arm/boot/dts/bcm11351-brt.dts +1 -1
@@ -17,7 +17,7 @@ / { model = "BCM11351 BRT board"; - compatible = "bcm,bcm11351-brt", "bcm,bcm11351"; + compatible = "brcm,bcm11351-brt", "brcm,bcm11351"; memory { reg = <0x80000000 0x40000000>; /* 1 GB */
arch/arm/boot/dts/bcm11351.dtsi +9 -9
@@ -18,7 +18,7 @@ / { model = "BCM11351 SoC"; - compatible = "bcm,bcm11351"; + compatible = "brcm,bcm11351"; interrupt-parent = <&gic>; chosen {
@@ -35,12 +35,12 @@ }; smc at 0x3404c000 { - compatible = "bcm,bcm11351-smc", "bcm,kona-smc"; + compatible = "brcm,bcm11351-smc", "brcm,kona-smc"; reg = <0x3404c000 0x400>; /* 1 KiB in SRAM */ }; uart at 3e000000 { - compatible = "bcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart"; + compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart"; status = "disabled"; reg = <0x3e000000 0x1000>; clock-frequency = <13000000>;
@@ -50,42 +50,42 @@ }; L2: l2-cache { - compatible = "bcm,bcm11351-a2-pl310-cache"; + compatible = "brcm,bcm11351-a2-pl310-cache"; reg = <0x3ff20000 0x1000>; cache-unified; cache-level = <2>; }; timer at 35006000 { - compatible = "bcm,kona-timer"; + compatible = "brcm,kona-timer"; reg = <0x35006000 0x1000>; interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; clock-frequency = <32768>; }; sdio0: sdio at 0x3f180000 { - compatible = "bcm,kona-sdhci"; + compatible = "brcm,kona-sdhci"; reg = <0x3f180000 0x10000>; interrupts = <0x0 77 0x4>; status = "disabled"; }; sdio1: sdio at 0x3f190000 { - compatible = "bcm,kona-sdhci"; + compatible = "brcm,kona-sdhci"; reg = <0x3f190000 0x10000>; interrupts = <0x0 76 0x4>; status = "disabled"; }; sdio2: sdio at 0x3f1a0000 { - compatible = "bcm,kona-sdhci"; + compatible = "brcm,kona-sdhci"; reg = <0x3f1a0000 0x10000>; interrupts = <0x0 74 0x4>; status = "disabled"; }; sdio3: sdio at 0x3f1b0000 { - compatible = "bcm,kona-sdhci"; + compatible = "brcm,kona-sdhci"; reg = <0x3f1b0000 0x10000>; interrupts = <0x0 73 0x4>; status = "disabled";
arch/arm/mach-bcm/bcm_kona_smc.c +1 -1
@@ -36,7 +36,7 @@ struct bcm_kona_smc_data { };static const struct of_device_id bcm_kona_smc_ids[]__initconst = { - {.compatible ="bcm,kona-smc" }, + {.compatible ="brcm,kona-smc" }, {}, };
arch/arm/mach-bcm/board_bcm.c +1 -1
@@ -50,7 +50,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,
arch/arm/mm/cache-l2x0.c +1 -1
@@ -929,7 +929,7 @@ static const struct of_device_id l2x0_ids[] __initconst = { .data = (void *)&aurora_no_outer_data}, { .compatible = "marvell,aurora-outer-cache", .data = (void *)&aurora_with_outer_data}, - { .compatible = "bcm,bcm11351-a2-pl310-cache", + { .compatible = "brcm,bcm11351-a2-pl310-cache", .data = (void *)&bcm_l2x0_data}, {} };
drivers/clocksource/bcm_kona_timer.c +2 -2
@@ -99,7 +99,7 @@ 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" }, {}, };
@@ -201,4 +201,4 @@ static void __init kona_timer_init(struct device_node *node)kona_timer_set_next_event ((arch_timer_rate /HZ ),NULL ); } -CLOCKSOURCE_OF_DECLARE (bcm_kona,"bcm,kona-timer" , kona_timer_init); +CLOCKSOURCE_OF_DECLARE (bcm_kona,"brcm,kona-timer" , kona_timer_init);
drivers/mmc/host/sdhci-bcm-kona.c +1 -1
@@ -222,7 +222,7 @@ static struct sdhci_pltfm_data sdhci_pltfm_data_kona = { };static const struct of_device_id sdhci_bcm_kona_of_match[]__initdata = { - { .compatible ="bcm,kona-sdhci" }, + { .compatible ="brcm,kona-sdhci" }, {} };MODULE_DEVICE_TABLE (of, sdhci_bcm_kona_of_match);
Signature · 1 line
1.7.10.4
PATCH 1/1 ARM: DT: binding fixup to align with vendor-prefixes.txt
Quoted 4 lines · Christian Daudt
[ 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
Quoted 8 lines
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. Also rename the the following dt binding docs that had "bcm," in their name for consistency:
- bcm,kona-sdhci.txt -> kona-sdhci.txt
- bcm,kona-timer.txt -> kona-timer.txt
Using "git format-patch -M" for renames would make it much easier to see that all that's happening is a file rename and/or whatever other diff is happening.
I'd actually prefer to go the other way on the file renaming, and name all binding files after the complete compatible value they describe, rather than removing the vendor prefix on some files. But, I don't feel strongly for files I don't directly own.
Technically this change shouldn't be made since it's an incompatible change to the DT ABI, unless you keep all the old entries in the driver's match tables and just add the new entries rather than deleting the old ones. If you do that, it should be enough to placate anyone adamantly opposed to this change, I think.
PATCH 1/1 ARM: DT: binding fixup to align with vendor-prefixes.txt
Quoted 13 lines · Stephen Warren
Quoted 4 lines · Christian Daudt
[ 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 hadQuoted 8 lines
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. Also rename the the following dt binding docs that had "bcm," in their name for consistency:
- bcm,kona-sdhci.txt -> kona-sdhci.txt
- bcm,kona-timer.txt -> kona-timer.txt
Quoted 3 lines
Using "git format-patch -M" for renames would make it much easier to see that all that's happening is a file rename and/or whatever other diff is happening.
ok
Quoted 4 lines
I'd actually prefer to go the other way on the file renaming, and name all binding files after the complete compatible value they describe, rather than removing the vendor prefix on some files. But, I don't feel strongly for files I don't directly own.
ok, I'll leave without then. Less chance of future churn :)
Quoted 6 lines
Technically this change shouldn't be made since it's an incompatible change to the DT ABI, unless you keep all the old entries in the driver's match tables and just add the new entries rather than deleting the old ones. If you do that, it should be enough to placate anyone adamantly opposed to this change, I think.
Done.
Thanks for the quick review !
csd