diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 18:19:23 +0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 18:19:23 +0400 |
commit | 22261b22f425cb79e0a70cfc13b7baec07daee94 (patch) | |
tree | 8e090c577757c432eea1016691c7dadd2314e8dc /Documentation/devicetree/bindings/arm | |
parent | 38edc2da5014e70e46a724d97c3ef3dde106331b (diff) | |
parent | a97d67d1c4c331644f26704976f92a5b160c3f77 (diff) | |
download | linux-22261b22f425cb79e0a70cfc13b7baec07daee94.tar.xz |
Merge tag 'armsoc/for-3.15/dt-2' of git://github.com/broadcom/mach-bcm into next/dt
Merge "ARM: mach-bcm: dt updates for 3.15 - part 2" from Matt Porter:
- BCM21664 SoC support
- BCM59056 PMU support
- BCM281xx reboot fix
* tag 'armsoc/for-3.15/dt-2' of git://github.com/broadcom/mach-bcm:
ARM: dts: bcm28155-ap: leave camldo1 on to fix reboot
ARM: dts: add bcm590xx pmu support and enable for bcm28155-ap
ARM: dts: bcm21664: Add device tree files.
ARM: DT: bcm21664: Device tree bindings
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/devicetree/bindings/arm')
-rw-r--r-- | Documentation/devicetree/bindings/arm/bcm/bcm21664.txt | 15 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/arm/bcm/kona-resetmgr.txt | 14 |
2 files changed, 29 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/bcm/bcm21664.txt b/Documentation/devicetree/bindings/arm/bcm/bcm21664.txt new file mode 100644 index 000000000000..e0774255e1a6 --- /dev/null +++ b/Documentation/devicetree/bindings/arm/bcm/bcm21664.txt @@ -0,0 +1,15 @@ +Broadcom BCM21664 device tree bindings +-------------------------------------- + +This document describes the device tree bindings for boards with the BCM21664 +SoC. + +Required root node property: + - compatible: brcm,bcm21664 + +Example: + / { + model = "BCM21664 SoC"; + compatible = "brcm,bcm21664"; + [...] + } diff --git a/Documentation/devicetree/bindings/arm/bcm/kona-resetmgr.txt b/Documentation/devicetree/bindings/arm/bcm/kona-resetmgr.txt new file mode 100644 index 000000000000..93f31ca1ef4b --- /dev/null +++ b/Documentation/devicetree/bindings/arm/bcm/kona-resetmgr.txt @@ -0,0 +1,14 @@ +Broadcom Kona Family Reset Manager +---------------------------------- + +The reset manager is used on the Broadcom BCM21664 SoC. + +Required properties: + - compatible: brcm,bcm21664-resetmgr + - reg: memory address & range + +Example: + brcm,resetmgr@35001f00 { + compatible = "brcm,bcm21664-resetmgr"; + reg = <0x35001f00 0x24>; + }; |