Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: DT: binding fixup to align with vendor-prefixes.txt (DT)

[ 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

Signed-off-by: Christian Daudt <csd@broadcom.com>
Acked-by: Stephen Warren <swarren@nvidia.com>

+22 -18
+3 -2
Documentation/devicetree/bindings/arm/bcm/bcm,kona-timer.txt Documentation/devicetree/bindings/arm/bcm/kona-timer.txt
··· 4 4 BCM11130, BCM11140, BCM11351, BCM28145, BCM28155 5 5 6 6 Required properties: 7 - - compatible : "bcm,kona-timer" 7 + - compatible : "brcm,kona-timer" 8 + - DEPRECATED: compatible : "bcm,kona-timer" 8 9 - reg : Register range for the timer 9 10 - interrupts : interrupt for the timer 10 11 - clock-frequency: frequency that the clock operates 11 12 12 13 Example: 13 14 timer@35006000 { 14 - compatible = "bcm,kona-timer"; 15 + compatible = "brcm,kona-timer"; 15 16 reg = <0x35006000 0x1000>; 16 17 interrupts = <0x0 7 0x4>; 17 18 clock-frequency = <32768>;
+2 -1
Documentation/devicetree/bindings/arm/bcm/bcm11351.txt
··· 6 6 7 7 Required root node property: 8 8 9 - compatible = "bcm,bcm11351"; 9 + compatible = "brcm,bcm11351"; 10 + DEPRECATED: compatible = "bcm,bcm11351";
+3 -2
Documentation/devicetree/bindings/misc/smc.txt
··· 4 4 used for non-secure to secure communications. 5 5 6 6 Required properties: 7 - - compatible : "bcm,kona-smc" 7 + - compatible : "brcm,kona-smc" 8 + - DEPRECATED: compatible : "bcm,kona-smc" 8 9 - reg : Location and size of bounce buffer 9 10 10 11 Example: 11 12 smc@0x3404c000 { 12 - compatible = "bcm,bcm11351-smc", "bcm,kona-smc"; 13 + compatible = "brcm,bcm11351-smc", "brcm,kona-smc"; 13 14 reg = <0x3404c000 0x400>; //1 KiB in SRAM 14 15 };
+3 -2
Documentation/devicetree/bindings/mmc/bcm,kona-sdhci.txt Documentation/devicetree/bindings/mmc/kona-sdhci.txt
··· 4 4 and the properties present in the bcm281xx SDHCI 5 5 6 6 Required properties: 7 - - compatible : Should be "bcm,kona-sdhci" 7 + - compatible : Should be "brcm,kona-sdhci" 8 + - DEPRECATED: compatible : Should be "bcm,kona-sdhci" 8 9 9 10 Example: 10 11 11 12 sdio2: sdio@0x3f1a0000 { 12 - compatible = "bcm,kona-sdhci"; 13 + compatible = "brcm,kona-sdhci"; 13 14 reg = <0x3f1a0000 0x10000>; 14 15 interrupts = <0x0 74 0x4>; 15 16 };
+1 -1
arch/arm/boot/dts/bcm11351-brt.dts
··· 17 17 18 18 / { 19 19 model = "BCM11351 BRT board"; 20 - compatible = "bcm,bcm11351-brt", "bcm,bcm11351"; 20 + compatible = "brcm,bcm11351-brt", "brcm,bcm11351"; 21 21 22 22 memory { 23 23 reg = <0x80000000 0x40000000>; /* 1 GB */
+9 -9
arch/arm/boot/dts/bcm11351.dtsi
··· 18 18 19 19 / { 20 20 model = "BCM11351 SoC"; 21 - compatible = "bcm,bcm11351"; 21 + compatible = "brcm,bcm11351"; 22 22 interrupt-parent = <&gic>; 23 23 24 24 chosen { ··· 35 35 }; 36 36 37 37 smc@0x3404c000 { 38 - compatible = "bcm,bcm11351-smc", "bcm,kona-smc"; 38 + compatible = "brcm,bcm11351-smc", "brcm,kona-smc"; 39 39 reg = <0x3404c000 0x400>; /* 1 KiB in SRAM */ 40 40 }; 41 41 42 42 uart@3e000000 { 43 - compatible = "bcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart"; 43 + compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart"; 44 44 status = "disabled"; 45 45 reg = <0x3e000000 0x1000>; 46 46 clock-frequency = <13000000>; ··· 50 50 }; 51 51 52 52 L2: l2-cache { 53 - compatible = "bcm,bcm11351-a2-pl310-cache"; 53 + compatible = "brcm,bcm11351-a2-pl310-cache"; 54 54 reg = <0x3ff20000 0x1000>; 55 55 cache-unified; 56 56 cache-level = <2>; ··· 62 62 }; 63 63 64 64 timer@35006000 { 65 - compatible = "bcm,kona-timer"; 65 + compatible = "brcm,kona-timer"; 66 66 reg = <0x35006000 0x1000>; 67 67 interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; 68 68 clock-frequency = <32768>; 69 69 }; 70 70 71 71 sdio1: sdio@3f180000 { 72 - compatible = "bcm,kona-sdhci"; 72 + compatible = "brcm,kona-sdhci"; 73 73 reg = <0x3f180000 0x10000>; 74 74 interrupts = <0x0 77 0x4>; 75 75 status = "disabled"; 76 76 }; 77 77 78 78 sdio2: sdio@3f190000 { 79 - compatible = "bcm,kona-sdhci"; 79 + compatible = "brcm,kona-sdhci"; 80 80 reg = <0x3f190000 0x10000>; 81 81 interrupts = <0x0 76 0x4>; 82 82 status = "disabled"; 83 83 }; 84 84 85 85 sdio3: sdio@3f1a0000 { 86 - compatible = "bcm,kona-sdhci"; 86 + compatible = "brcm,kona-sdhci"; 87 87 reg = <0x3f1a0000 0x10000>; 88 88 interrupts = <0x0 74 0x4>; 89 89 status = "disabled"; 90 90 }; 91 91 92 92 sdio4: sdio@3f1b0000 { 93 - compatible = "bcm,kona-sdhci"; 93 + compatible = "brcm,kona-sdhci"; 94 94 reg = <0x3f1b0000 0x10000>; 95 95 interrupts = <0x0 73 0x4>; 96 96 status = "disabled";
+1 -1
arch/arm/boot/dts/bcm28155-ap.dts
··· 17 17 18 18 / { 19 19 model = "BCM28155 AP board"; 20 - compatible = "bcm,bcm28155-ap", "bcm,bcm11351"; 20 + compatible = "brcm,bcm28155-ap", "brcm,bcm11351"; 21 21 22 22 memory { 23 23 reg = <0x80000000 0x40000000>; /* 1 GB */