diff options
author | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 10:54:05 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 10:54:05 -0400 |
commit | 3c76a8a95daeecd881718f88324041f6a5faab86 (patch) | |
tree | 89c3d5573e9dbe3a91d533c873562c57ba4b4f2f /arch/arm/boot/dts/armada-xp.dtsi | |
parent | 513a7917b13370d9fbc41331413428dd713cb3fc (diff) | |
parent | 600468d0686096ddc1000c8a2e69475931084414 (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-xp.dtsi')
-rw-r--r-- | arch/arm/boot/dts/armada-xp.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index d85fa6aa69fd..29dfeb6d4a26 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi | |||
@@ -46,7 +46,7 @@ | |||
46 | reg = <0xd0012200 0x100>; | 46 | reg = <0xd0012200 0x100>; |
47 | reg-shift = <2>; | 47 | reg-shift = <2>; |
48 | interrupts = <43>; | 48 | interrupts = <43>; |
49 | reg-io-width = <4>; | 49 | reg-io-width = <1>; |
50 | status = "disabled"; | 50 | status = "disabled"; |
51 | }; | 51 | }; |
52 | serial@d0012300 { | 52 | serial@d0012300 { |
@@ -54,7 +54,7 @@ | |||
54 | reg = <0xd0012300 0x100>; | 54 | reg = <0xd0012300 0x100>; |
55 | reg-shift = <2>; | 55 | reg-shift = <2>; |
56 | interrupts = <44>; | 56 | interrupts = <44>; |
57 | reg-io-width = <4>; | 57 | reg-io-width = <1>; |
58 | status = "disabled"; | 58 | status = "disabled"; |
59 | }; | 59 | }; |
60 | 60 | ||