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>

diff --git a/Documentation/devicetree/bindings/arm/bcm/bcm11351.txt b/Documentation/devicetree/bindings/arm/bcm/bcm11351.txt
index fb7b5cd2652f412b5a0b09615506c12938ac121b..0ff6560e6094717b93a57219d7b8a07b5a6ef3ab 100644 (file)
--- a/Documentation/devicetree/bindings/arm/bcm/bcm11351.txt
+++ b/Documentation/devicetree/bindings/arm/bcm/bcm11351.txt
@@ -6,4 +6,5 @@ bcm11351, bcm28145, bcm28155 SoCs) shall have the following properties:
 
 Required root node property:
 
-compatible = "bcm,bcm11351";
+compatible = "brcm,bcm11351";
+DEPRECATED: compatible = "bcm,bcm11351";

diff --git a/Documentation/devicetree/bindings/arm/bcm/bcm,kona-timer.txt b/Documentation/devicetree/bindings/arm/bcm/kona-timer.txt
similarity index 80%
rename from Documentation/devicetree/bindings/arm/bcm/bcm,kona-timer.txt
rename to Documentation/devicetree/bindings/arm/bcm/kona-timer.txt
index 59fa6e68d4f69a2a6652bffe28b186fe66b5e42e..17d88b233d1bce30a6d0f6a1752181936dc2a07e 100644 (file)
--- a/Documentation/devicetree/bindings/arm/bcm/bcm,kona-timer.txt
+++ b/Documentation/devicetree/bindings/arm/bcm/kona-timer.txt
@@ -4,14 +4,15 @@ This timer is used in the following Broadcom SoCs:
  BCM11130, BCM11140, BCM11351, BCM28145, BCM28155
 
 Required properties:
-- compatible : "bcm,kona-timer"
+- compatible : "brcm,kona-timer"
+- DEPRECATED: compatible : "bcm,kona-timer"
 - reg : Register range for the timer
 - interrupts : interrupt for the timer
 - clock-frequency: frequency that the clock operates
 
 Example:
        timer@35006000 {
-               compatible = "bcm,kona-timer";
+               compatible = "brcm,kona-timer";
                reg = <0x35006000 0x1000>;
                interrupts = <0x0 7 0x4>;
                clock-frequency = <32768>;

diff --git a/Documentation/devicetree/bindings/misc/smc.txt b/Documentation/devicetree/bindings/misc/smc.txt
index 02b4281361771a8151735a76e88eb04fc7765c71..6c9f176f35717acf1a2fd3dcd7ca2cee86daeb88 100644 (file)
--- a/Documentation/devicetree/bindings/misc/smc.txt
+++ b/Documentation/devicetree/bindings/misc/smc.txt
@@ -4,11 +4,12 @@ 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"
+- DEPRECATED: compatible : "bcm,kona-smc"
 - reg : Location and size of bounce buffer
 
 Example:
        smc@0x3404c000 {
-               compatible = "bcm,bcm11351-smc", "bcm,kona-smc";
+               compatible = "brcm,bcm11351-smc", "brcm,kona-smc";
                reg = <0x3404c000 0x400>; //1 KiB in SRAM
        };

diff --git a/Documentation/devicetree/bindings/mmc/bcm,kona-sdhci.txt b/Documentation/devicetree/bindings/mmc/kona-sdhci.txt
similarity index 67%
rename from Documentation/devicetree/bindings/mmc/bcm,kona-sdhci.txt
rename to Documentation/devicetree/bindings/mmc/kona-sdhci.txt
index 094ae010f2fbb53163d85d9b8b73a713d8c98438..789fb07a426da61020b5caac68fd8ede83e712ec 100644 (file)
--- a/Documentation/devicetree/bindings/mmc/bcm,kona-sdhci.txt
+++ b/Documentation/devicetree/bindings/mmc/kona-sdhci.txt
@@ -4,12 +4,13 @@ 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"
+- compatible : Should be "brcm,kona-sdhci"
+- DEPRECATED: compatible : Should be "bcm,kona-sdhci"
 
 Example:
 
 sdio2: sdio@0x3f1a0000 {
-       compatible = "bcm,kona-sdhci";
+       compatible = "brcm,kona-sdhci";
        reg = <0x3f1a0000 0x10000>;
        interrupts = <0x0 74 0x4>;
 };

diff --git a/arch/arm/boot/dts/bcm11351-brt.dts b/arch/arm/boot/dts/bcm11351-brt.dts
index 647a78c6b61e30f415e7a5f3f4e77295d69ac203..9d36eb4e3c41e8f2d0e7047acf08809dbd39f835 100644 (file)
--- a/arch/arm/boot/dts/bcm11351-brt.dts
+++ b/arch/arm/boot/dts/bcm11351-brt.dts
@@ -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 */

diff --git a/arch/arm/boot/dts/bcm11351.dtsi b/arch/arm/boot/dts/bcm11351.dtsi
index 2ffd292e815f7c5792e64b103fd9a48bb580fe61..05a5aabe3b2ccadbef92c305659ccf4f51fd7580 100644 (file)
--- a/arch/arm/boot/dts/bcm11351.dtsi
+++ b/arch/arm/boot/dts/bcm11351.dtsi
@@ -18,7 +18,7 @@
 
 / {
        model = "BCM11351 SoC";
-       compatible = "bcm,bcm11351";
+       compatible = "brcm,bcm11351";
        interrupt-parent = <&gic>;
 
        chosen {
@@ -35,12 +35,12 @@
        };
 
        smc@0x3404c000 {
-               compatible = "bcm,bcm11351-smc", "bcm,kona-smc";
+               compatible = "brcm,bcm11351-smc", "brcm,kona-smc";
                reg = <0x3404c000 0x400>; /* 1 KiB in SRAM */
        };
 
        uart@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,7 +50,7 @@
        };
 
        L2: l2-cache {
-               compatible = "bcm,bcm11351-a2-pl310-cache";
+               compatible = "brcm,bcm11351-a2-pl310-cache";
                reg = <0x3ff20000 0x1000>;
                cache-unified;
                cache-level = <2>;
@@ -62,35 +62,35 @@
        };
 
        timer@35006000 {
-               compatible = "bcm,kona-timer";
+               compatible = "brcm,kona-timer";
                reg = <0x35006000 0x1000>;
                interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
                clock-frequency = <32768>;
        };
 
        sdio1: sdio@3f180000 {
-               compatible = "bcm,kona-sdhci";
+               compatible = "brcm,kona-sdhci";
                reg = <0x3f180000 0x10000>;
                interrupts = <0x0 77 0x4>;
                status = "disabled";
        };
 
        sdio2: sdio@3f190000 {
-               compatible = "bcm,kona-sdhci";
+               compatible = "brcm,kona-sdhci";
                reg = <0x3f190000 0x10000>;
                interrupts = <0x0 76 0x4>;
                status = "disabled";
        };
 
        sdio3: sdio@3f1a0000 {
-               compatible = "bcm,kona-sdhci";
+               compatible = "brcm,kona-sdhci";
                reg = <0x3f1a0000 0x10000>;
                interrupts = <0x0 74 0x4>;
                status = "disabled";
        };
 
        sdio4: sdio@3f1b0000 {
-               compatible = "bcm,kona-sdhci";
+               compatible = "brcm,kona-sdhci";
                reg = <0x3f1b0000 0x10000>;
                interrupts = <0x0 73 0x4>;
                status = "disabled";

diff --git a/arch/arm/boot/dts/bcm28155-ap.dts b/arch/arm/boot/dts/bcm28155-ap.dts
index 4b0a3ec15cd11a5f62b1961f871283cba7dc2fa6..96ae67a2f0d37dc9ec852b9c00eba004aa0757fa 100644 (file)
--- a/arch/arm/boot/dts/bcm28155-ap.dts
+++ b/arch/arm/boot/dts/bcm28155-ap.dts
@@ -17,7 +17,7 @@
 
 / {
        model = "BCM28155 AP board";
-       compatible = "bcm,bcm28155-ap", "bcm,bcm11351";
+       compatible = "brcm,bcm28155-ap", "brcm,bcm11351";
 
        memory {
                reg = <0x80000000 0x40000000>; /* 1 GB */