Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15e22ddf authored by Christian Daudt's avatar Christian Daudt
Browse files

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: default avatarChristian Daudt <csd@broadcom.com>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
parent 30ca653e

Documentation/devicetree/bindings/arm/bcm/bcm11351.txt

+2 −1
Original line number Diff line number Diff line
@@ -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";

Documentation/devicetree/bindings/arm/bcm/bcm,kona-timer.txt→Documentation/devicetree/bindings/arm/bcm/kona-timer.txt

+3 −2
Original line number Diff line number Diff line
@@ -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>;

Documentation/devicetree/bindings/misc/smc.txt

+3 −2
Original line number Diff line number Diff line
@@ -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

	};

Documentation/devicetree/bindings/mmc/bcm,kona-sdhci.txt→Documentation/devicetree/bindings/mmc/kona-sdhci.txt

+3 −2
Original line number Diff line number Diff line
@@ -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>;

};

arch/arm/boot/dts/bcm11351-brt.dts

+1 −1
Original line number Diff line number Diff line
@@ -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 */