summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/armada-370-mirabox.dts
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2013-04-15 18:54:05 +0400
committerJason Cooper <jason@lakedaemon.net>2013-04-15 18:54:05 +0400
commit3c76a8a95daeecd881718f88324041f6a5faab86 (patch)
tree89c3d5573e9dbe3a91d533c873562c57ba4b4f2f /arch/arm/boot/dts/armada-370-mirabox.dts
parent513a7917b13370d9fbc41331413428dd713cb3fc (diff)
parent600468d0686096ddc1000c8a2e69475931084414 (diff)
downloadlinux-3c76a8a95daeecd881718f88324041f6a5faab86.tar.xz
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-mirabox.dts')
-rw-r--r--arch/arm/boot/dts/armada-370-mirabox.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts
index 70effc617123..58ee79372206 100644
--- a/arch/arm/boot/dts/armada-370-mirabox.dts
+++ b/arch/arm/boot/dts/armada-370-mirabox.dts
@@ -91,7 +91,7 @@
};
mvsdio@d00d4000 {
- pinctrl-0 = <&sdio_pins2>;
+ pinctrl-0 = <&sdio_pins3>;
pinctrl-names = "default";
status = "okay";
/*