diff options
author | Christian Daudt <csd@broadcom.com> | 2013-07-30 19:27:10 -0400 |
---|---|---|
committer | Christian Daudt <csd@broadcom.com> | 2013-08-20 13:47:47 -0400 |
commit | 15e22ddf045ed9796d0d2302e759aa7a37826523 (patch) | |
tree | db7593769bbebc445e616a4660df0abb8ac6995e /Documentation | |
parent | 30ca653e59b1a01eb79b68fc279d7ea1012461d6 (diff) |
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>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/arm/bcm/bcm11351.txt | 3 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/arm/bcm/kona-timer.txt (renamed from Documentation/devicetree/bindings/arm/bcm/bcm,kona-timer.txt) | 5 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/misc/smc.txt | 5 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/mmc/kona-sdhci.txt (renamed from Documentation/devicetree/bindings/mmc/bcm,kona-sdhci.txt) | 5 |
4 files changed, 11 insertions, 7 deletions
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: | |||
6 | 6 | ||
7 | Required root node property: | 7 | Required root node property: |
8 | 8 | ||
9 | compatible = "bcm,bcm11351"; | 9 | compatible = "brcm,bcm11351"; |
10 | 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 index 59fa6e68d4f6..17d88b233d1b 100644 --- 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: | |||
4 | BCM11130, BCM11140, BCM11351, BCM28145, BCM28155 | 4 | BCM11130, BCM11140, BCM11351, BCM28145, BCM28155 |
5 | 5 | ||
6 | Required properties: | 6 | Required properties: |
7 | - compatible : "bcm,kona-timer" | 7 | - compatible : "brcm,kona-timer" |
8 | - DEPRECATED: compatible : "bcm,kona-timer" | ||
8 | - reg : Register range for the timer | 9 | - reg : Register range for the timer |
9 | - interrupts : interrupt for the timer | 10 | - interrupts : interrupt for the timer |
10 | - clock-frequency: frequency that the clock operates | 11 | - clock-frequency: frequency that the clock operates |
11 | 12 | ||
12 | Example: | 13 | Example: |
13 | timer@35006000 { | 14 | timer@35006000 { |
14 | compatible = "bcm,kona-timer"; | 15 | compatible = "brcm,kona-timer"; |
15 | reg = <0x35006000 0x1000>; | 16 | reg = <0x35006000 0x1000>; |
16 | interrupts = <0x0 7 0x4>; | 17 | interrupts = <0x0 7 0x4>; |
17 | clock-frequency = <32768>; | 18 | 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 | |||
4 | used for non-secure to secure communications. | 4 | used for non-secure to secure communications. |
5 | 5 | ||
6 | Required properties: | 6 | Required properties: |
7 | - compatible : "bcm,kona-smc" | 7 | - compatible : "brcm,kona-smc" |
8 | - DEPRECATED: compatible : "bcm,kona-smc" | ||
8 | - reg : Location and size of bounce buffer | 9 | - reg : Location and size of bounce buffer |
9 | 10 | ||
10 | Example: | 11 | Example: |
11 | smc@0x3404c000 { | 12 | smc@0x3404c000 { |
12 | compatible = "bcm,bcm11351-smc", "bcm,kona-smc"; | 13 | compatible = "brcm,bcm11351-smc", "brcm,kona-smc"; |
13 | reg = <0x3404c000 0x400>; //1 KiB in SRAM | 14 | reg = <0x3404c000 0x400>; //1 KiB in SRAM |
14 | }; | 15 | }; |
diff --git a/Documentation/devicetree/bindings/mmc/bcm,kona-sdhci.txt b/Documentation/devicetree/bindings/mmc/kona-sdhci.txt index 094ae010f2fb..789fb07a426d 100644 --- 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 | |||
4 | and the properties present in the bcm281xx SDHCI | 4 | and the properties present in the bcm281xx SDHCI |
5 | 5 | ||
6 | Required properties: | 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 | Example: | 10 | Example: |
10 | 11 | ||
11 | sdio2: sdio@0x3f1a0000 { | 12 | sdio2: sdio@0x3f1a0000 { |
12 | compatible = "bcm,kona-sdhci"; | 13 | compatible = "brcm,kona-sdhci"; |
13 | reg = <0x3f1a0000 0x10000>; | 14 | reg = <0x3f1a0000 0x10000>; |
14 | interrupts = <0x0 74 0x4>; | 15 | interrupts = <0x0 74 0x4>; |
15 | }; | 16 | }; |