Commit 103c6a71 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'armsoc/for-3.12/dt' of git://github.com/broadcom/bcm11351 into next/dt 

From Christian Daudt, DT changes for Broadcom.

* 'armsoc/for-3.12/dt' of git://github.com/broadcom/bcm11351:
  ARM: DT: binding fixup to align with vendor-prefixes.txt (DT)
  ARM: dts: add sdio blocks to bcm28155-ap board
  ARM: dts: align sdio numbers to HW definition
  ARM: bcm281xx: DT changes for reboot code
  ARM: bcm281xx: Adding bcm28155-ap.dts
parents ef8932b9 15e22ddf

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -6,4 +6,5 @@ bcm11351, bcm28145, bcm28155 SoCs) shall have the following properties: 




Required root node property:

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 Original line Diff line number Diff line
@@ -4,14 +4,15 @@ This timer is used in the following Broadcom SoCs: 
 BCM11130, BCM11140, BCM11351, BCM28145, BCM28155

 BCM11130, BCM11140, BCM11351, BCM28145, BCM28155





Required properties:

Required properties:

- compatible : "bcm,kona-timer"

- compatible : "brcm,kona-timer"

- DEPRECATED: compatible : "bcm,kona-timer"

- reg : Register range for the timer

- reg : Register range for the timer

- interrupts : interrupt for the timer

- interrupts : interrupt for the timer

- clock-frequency: frequency that the clock operates

- clock-frequency: frequency that the clock operates





Example:

Example:

	timer@35006000 {

	timer@35006000 {

		compatible = "bcm,kona-timer";

		compatible = "brcm,kona-timer";

		reg = <0x35006000 0x1000>;

		reg = <0x35006000 0x1000>;

		interrupts = <0x0 7 0x4>;

		interrupts = <0x0 7 0x4>;

		clock-frequency = <32768>;

		clock-frequency = <32768>;

Documentation/devicetree/bindings/arm/bcm/kona-wdt.txt

0 → 100644
+15 −0
Original line number Original line Diff line number Diff line 
Broadcom Kona Family Watchdog Timer

-----------------------------------



This watchdog timer is used in the following Broadcom SoCs:

  BCM11130, BCM11140, BCM11351, BCM28145, BCM28155



Required properties:

  - compatible = "brcm,bcm11351-wdt", "brcm,kona-wdt";

  - reg: memory address & range



Example:

	watchdog@35002f40 {

		compatible = "brcm,bcm11351-wdt", "brcm,kona-wdt";

		reg = <0x35002f40 0x6c>;

	};

Documentation/devicetree/bindings/misc/smc.txt

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

used for non-secure to secure communications.





Required properties:

Required properties:

- compatible : "bcm,kona-smc"

- compatible : "brcm,kona-smc"

- DEPRECATED: compatible : "bcm,kona-smc"

- reg : Location and size of bounce buffer

- reg : Location and size of bounce buffer





Example:

Example:

	smc@0x3404c000 {

	smc@0x3404c000 {

		compatible = "bcm,bcm11351-smc", "bcm,kona-smc";

		compatible = "brcm,bcm11351-smc", "brcm,kona-smc";

		reg = <0x3404c000 0x400>; //1 KiB in SRAM

		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 Original line 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

and the properties present in the bcm281xx SDHCI





Required properties:

Required properties:

- compatible : Should be "bcm,kona-sdhci"

- compatible : Should be "brcm,kona-sdhci"

- DEPRECATED: compatible : Should be "bcm,kona-sdhci"





Example:

Example:





sdio2: sdio@0x3f1a0000 {

sdio2: sdio@0x3f1a0000 {

	compatible = "bcm,kona-sdhci";

	compatible = "brcm,kona-sdhci";

	reg = <0x3f1a0000 0x10000>;

	reg = <0x3f1a0000 0x10000>;

	interrupts = <0x0 74 0x4>;

	interrupts = <0x0 74 0x4>;

};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE