aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/armada-370-rd.dts
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2013-04-15 10:54:05 -0400
committerJason Cooper <jason@lakedaemon.net>2013-04-15 10:54:05 -0400
commit3c76a8a95daeecd881718f88324041f6a5faab86 (patch)
tree89c3d5573e9dbe3a91d533c873562c57ba4b4f2f /arch/arm/boot/dts/armada-370-rd.dts
parent513a7917b13370d9fbc41331413428dd713cb3fc (diff)
parent600468d0686096ddc1000c8a2e69475931084414 (diff)
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-rd.dts')
-rw-r--r--arch/arm/boot/dts/armada-370-rd.dts8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
index 0656c815616e..516dec31b469 100644
--- a/arch/arm/boot/dts/armada-370-rd.dts
+++ b/arch/arm/boot/dts/armada-370-rd.dts
@@ -64,6 +64,14 @@
64 status = "okay"; 64 status = "okay";
65 /* No CD or WP GPIOs */ 65 /* No CD or WP GPIOs */
66 }; 66 };
67
68 usb@d0050000 {
69 status = "okay";
70 };
71
72 usb@d0051000 {
73 status = "okay";
74 };
67 }; 75 };
68 76
69 gpio-keys { 77 gpio-keys {