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/bcm,kona-timer.txt b/Documentation/devicetree/bindings/arm/bcm/bcm,kona-timer.txt
deleted file mode 100644 (file)
index 59fa6e6..0000000
--- a/Documentation/devicetree/bindings/arm/bcm/bcm,kona-timer.txt
+++ /dev/null
@@ -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@35006000 {
-               compatible = "bcm,kona-timer";
-               reg = <0x35006000 0x1000>;
-               interrupts = <0x0 7 0x4>;
-               clock-frequency = <32768>;
-       };
-

diff --git a/Documentation/devicetree/bindings/arm/bcm/bcm11351.txt b/Documentation/devicetree/bindings/arm/bcm/bcm11351.txt
index fb7b5cd..0ff6560 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/kona-timer.txt b/Documentation/devicetree/bindings/arm/bcm/kona-timer.txt
new file mode 100644 (file)
index 0000000..17d88b2
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/bcm/kona-timer.txt
@@ -0,0 +1,20 @@
+Broadcom Kona Family timer
+-----------------------------------------------------
+This timer is used in the following Broadcom SoCs:
+ BCM11130, BCM11140, BCM11351, BCM28145, BCM28155
+
+Required properties:
+- 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 = "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 02b4281..6c9f176 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/bcm,kona-sdhci.txt
deleted file mode 100644 (file)
index 094ae01..0000000
--- a/Documentation/devicetree/bindings/mmc/bcm,kona-sdhci.txt
+++ /dev/null
@@ -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@0x3f1a0000 {
-       compatible = "bcm,kona-sdhci";
-       reg = <0x3f1a0000 0x10000>;
-       interrupts = <0x0 74 0x4>;
-};
-

diff --git a/Documentation/devicetree/bindings/mmc/kona-sdhci.txt b/Documentation/devicetree/bindings/mmc/kona-sdhci.txt
new file mode 100644 (file)
index 0000000..789fb07
--- /dev/null
+++ b/Documentation/devicetree/bindings/mmc/kona-sdhci.txt
@@ -0,0 +1,17 @@
+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"
+- DEPRECATED: compatible : Should be "bcm,kona-sdhci"
+
+Example:
+
+sdio2: sdio@0x3f1a0000 {
+       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 647a78c..9d36eb4 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 2ffd292..05a5aab 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 4b0a3ec..96ae67a 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 */