summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/armada-370-xp.dtsi
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-06-01 09:47:53 +0400
committerOlof Johansson <olof@lixom.net>2013-06-01 09:47:53 +0400
commitd1ba78cd72190020b493369cfbd04f18198527bd (patch)
tree219ceda28f92f3c0997bebae85e33881134888da /arch/arm/boot/dts/armada-370-xp.dtsi
parentff753f43dab762db2d177e0b0be029e4b111289d (diff)
parent9196024a989ace933d6b17e0a56c847d02d81240 (diff)
downloadlinux-d1ba78cd72190020b493369cfbd04f18198527bd.tar.xz
Merge tag 'dt-3.11-3' of git://git.infradead.org/users/jcooper/linux into next/dt
From jason Cooper, mvebu dt changes for v3.11. Signed-off-by: Olof Johansson <olof@lixom.net> * tag 'dt-3.11-3' of git://git.infradead.org/users/jcooper/linux: (27 commits) arm: kirkwood: openblocks-a6: add support for Init button arm: kirkwood: openblocks-a6: group pinmux configurations arm: kirkwood: ts219: move pinmux configs to the right devices arm: kirkwood: topkick: move pinmux configs to the right devices arm: kirkwood: openblocks_a6: move pinmux configs to the right devices arm: kirkwood: nsa310: move pinmux configs to the right devices arm: kirkwood: readynas: move pinmux configs to the right devices arm: kirkwood: mplcec4: move pinmux configs to the right devices arm: kirkwood: buffalo linkstation: move pinmux configs to the right devices arm: kirkwood: keymile: move pinmux configs to the right devices arm: kirkwood: ns2: move pinmux configs to the right devices arm: kirkwood: iomega ix2-200: move pinmux configs to the right devices arm: kirkwood: iconnect: move pinmux configs to the right devices arm: kirkwood: iconnect: give meaningful names to pinmux configs arm: kirkwood: ib62x0: move pinmux configs to the right devices arm: kirkwood: guruplug: move pinmux configs to the right devices arm: kirkwood: goflexnet: move pinmux configs to the right devices arm: kirkwood: dreamplug: move pinmux configs to the right devices arm: kirkwood: dockstar: move pinmux configs to the right devices arm: kirkwood: dlink dns: move pinmux configs to the right devices ...
Diffstat (limited to 'arch/arm/boot/dts/armada-370-xp.dtsi')
-rw-r--r--arch/arm/boot/dts/armada-370-xp.dtsi4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 550eb772c30e..0d73570a303d 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -143,6 +143,10 @@
reg = <0xd4000 0x200>;
interrupts = <54>;
clocks = <&gateclk 17>;
+ bus-width = <4>;
+ cap-sdio-irq;
+ cap-sd-highspeed;
+ cap-mmc-highspeed;
status = "disabled";
};