From 15e22ddf045ed9796d0d2302e759aa7a37826523 Mon Sep 17 00:00:00 2001 From: Christian Daudt Date: Tue, 30 Jul 2013 16:27:10 -0700 Subject: 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 Acked-by: Stephen Warren --- .../devicetree/bindings/arm/bcm/bcm,kona-timer.txt | 19 ------------------- .../devicetree/bindings/arm/bcm/bcm11351.txt | 3 ++- .../devicetree/bindings/arm/bcm/kona-timer.txt | 20 ++++++++++++++++++++ Documentation/devicetree/bindings/misc/smc.txt | 5 +++-- .../devicetree/bindings/mmc/bcm,kona-sdhci.txt | 16 ---------------- Documentation/devicetree/bindings/mmc/kona-sdhci.txt | 17 +++++++++++++++++ 6 files changed, 42 insertions(+), 38 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/bcm/bcm,kona-timer.txt create mode 100644 Documentation/devicetree/bindings/arm/bcm/kona-timer.txt delete mode 100644 Documentation/devicetree/bindings/mmc/bcm,kona-sdhci.txt create mode 100644 Documentation/devicetree/bindings/mmc/kona-sdhci.txt (limited to 'Documentation') 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 index 59fa6e68d4f6..000000000000 --- 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 fb7b5cd2652f..0ff6560e6094 100644 --- 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 index 000000000000..17d88b233d1b --- /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 02b428136177..6c9f176f3571 100644 --- 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 index 094ae010f2fb..000000000000 --- 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 index 000000000000..789fb07a426d --- /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>; +}; + -- cgit v1.2.3