summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/armada-370.dtsi
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2013-04-15 14:54:05 +0000
committerJason Cooper <jason@lakedaemon.net>2013-04-15 14:54:05 +0000
commit3c76a8a95daeecd881718f88324041f6a5faab86 (patch)
tree89c3d5573e9dbe3a91d533c873562c57ba4b4f2f /arch/arm/boot/dts/armada-370.dtsi
parent513a7917b13370d9fbc41331413428dd713cb3fc (diff)
parent600468d0686096ddc1000c8a2e69475931084414 (diff)
downloadlinux-3c76a8a95daeecd881718f88324041f6a5faab86.tar.gz
Merge tag 'tags/mvebu_fixes_for_v3.9_round3' into mvebu/dt
pulling in mvebu branches which changes armada*.dts? files for LPAE changes mvebu fixes for v3.9 round 3 - Kirkwood - a couple of small fixes for the Iomega ix2-200 board (ether and led) - mvebu - allow GPIO button to work on Mirabox when running SMP
Diffstat (limited to 'arch/arm/boot/dts/armada-370.dtsi')
-rw-r--r--arch/arm/boot/dts/armada-370.dtsi6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index 9cf60b2ce864..18f6eb47cc50 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -59,6 +59,12 @@
"mpp50", "mpp51", "mpp52";
marvell,function = "sd0";
};
+
+ sdio_pins3: sdio-pins3 {
+ marvell,pins = "mpp48", "mpp49", "mpp50",
+ "mpp51", "mpp52", "mpp53";
+ marvell,function = "sd0";
+ };
};
gpio0: gpio@d0018100 {