summaryrefslogtreecommitdiff
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-11-08 16:47:37 -0800
committerOlof Johansson <olof@lixom.net>2014-11-08 16:47:37 -0800
commitf26e29453526fba85e32fffc7e5907eb2a291d47 (patch)
tree9a9f189e94fd8fa1db6a74486900bfbc6b832745 /drivers/pcmcia
parent1749e1fc9e0a77c57b72a93291823b43803eec0d (diff)
parente4fdc8e5821d852a933963ba56b9b2fa8f68c68f (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 'drivers/pcmcia')
0 files changed, 0 insertions, 0 deletions