diff options
author | Olof Johansson <olof@lixom.net> | 2014-11-08 19:47:37 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-11-08 19:47:37 -0500 |
commit | f26e29453526fba85e32fffc7e5907eb2a291d47 (patch) | |
tree | 9a9f189e94fd8fa1db6a74486900bfbc6b832745 /Documentation | |
parent | 1749e1fc9e0a77c57b72a93291823b43803eec0d (diff) | |
parent | e4fdc8e5821d852a933963ba56b9b2fa8f68c68f (diff) |
Merge tag 'berlin-dt-3.19-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/dt
Merge "ARM: berlin: DT changes for v3.19 (round 1)" from Sebastian Hesselbarth:
"This is Berlin DT changes for v3.19 and contains those patches that missed
the v3.18 merge window plus corresponding patches to catch-up with Antoine's
BG2Q improvements for BG2 and BG2CD. We now have working SDHCI and Ethernet
on all SoCs (well, BG2CD has HDMI HEC only), SATA PHY support for BG2 is still
pending."
Berlin DT changes for v3.19 (round 1)
- AHCI and SATA PHY nodes for BG2Q
- Reset controller binding docs
- Ethernet nodes for BG2, BG2CD
- SDHCI nodes for BG2, BG2CD
- Corresponding board changes to enable AHCI, Ethernet, SDHCI
* tag 'berlin-dt-3.19-1' of git://git.infradead.org/users/hesselba/linux-berlin:
ARM: dts: berlin: Enable eMMC on Sony NSZ-GS7
ARM: dts: berlin: Enable WiFi on Google Chromecast
ARM: dts: berlin: Add SDHCI controller nodes to BG2/BG2CD
ARM: dts: berlin: Enable ethernet on Sony NSZ-GS7
ARM: dts: berlin: Add phy-connection-type to BG2Q Ethernet
ARM: dts: berlin: Add BG2CD ethernet DT nodes
ARM: dts: berlin: Add BG2 ethernet DT nodes
ARM: dts: berlin: Add GPIO leds to Google Chromecast
ARM: dts: berlin: enable timer 1 for sched_clock
ARM: dts: berlin: add a required reset property in the chip controller node
Documentation: bindings: add reset bindings docs for Marvell Berlin SoCs
ARM: dts: berlin: enable the eSATA interface on the BG2Q DMP
ARM: dts: berlin: add the AHCI node for the BG2Q
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/arm/marvell,berlin.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/marvell,berlin.txt b/Documentation/devicetree/bindings/arm/marvell,berlin.txt index 904de5781f44..a99eb9eb14c0 100644 --- a/Documentation/devicetree/bindings/arm/marvell,berlin.txt +++ b/Documentation/devicetree/bindings/arm/marvell,berlin.txt | |||
@@ -106,11 +106,21 @@ Required subnode-properties: | |||
106 | - groups: a list of strings describing the group names. | 106 | - groups: a list of strings describing the group names. |
107 | - function: a string describing the function used to mux the groups. | 107 | - function: a string describing the function used to mux the groups. |
108 | 108 | ||
109 | * Reset controller binding | ||
110 | |||
111 | A reset controller is part of the chip control registers set. The chip control | ||
112 | node also provides the reset. The register set is not at the same offset between | ||
113 | Berlin SoCs. | ||
114 | |||
115 | Required property: | ||
116 | - #reset-cells: must be set to 2 | ||
117 | |||
109 | Example: | 118 | Example: |
110 | 119 | ||
111 | chip: chip-control@ea0000 { | 120 | chip: chip-control@ea0000 { |
112 | compatible = "marvell,berlin2-chip-ctrl"; | 121 | compatible = "marvell,berlin2-chip-ctrl"; |
113 | #clock-cells = <1>; | 122 | #clock-cells = <1>; |
123 | #reset-cells = <2>; | ||
114 | reg = <0xea0000 0x400>; | 124 | reg = <0xea0000 0x400>; |
115 | clocks = <&refclk>, <&externaldev 0>; | 125 | clocks = <&refclk>, <&externaldev 0>; |
116 | clock-names = "refclk", "video_ext0"; | 126 | clock-names = "refclk", "video_ext0"; |