diff options
author | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 14:54:05 +0000 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 14:54:05 +0000 |
commit | 3c76a8a95daeecd881718f88324041f6a5faab86 (patch) | |
tree | 89c3d5573e9dbe3a91d533c873562c57ba4b4f2f /arch/arm/boot/dts/kirkwood.dtsi | |
parent | 513a7917b13370d9fbc41331413428dd713cb3fc (diff) | |
parent | 600468d0686096ddc1000c8a2e69475931084414 (diff) | |
download | linux-next-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/kirkwood.dtsi')
-rw-r--r-- | arch/arm/boot/dts/kirkwood.dtsi | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi index 2c738d9dc82a..fada7e6d24d8 100644 --- a/arch/arm/boot/dts/kirkwood.dtsi +++ b/arch/arm/boot/dts/kirkwood.dtsi @@ -38,6 +38,7 @@ interrupt-controller; #interrupt-cells = <2>; interrupts = <35>, <36>, <37>, <38>; + clocks = <&gate_clk 7>; }; gpio1: gpio@10140 { @@ -49,6 +50,7 @@ interrupt-controller; #interrupt-cells = <2>; interrupts = <39>, <40>, <41>; + clocks = <&gate_clk 7>; }; serial@12000 { @@ -57,7 +59,6 @@ reg-shift = <2>; interrupts = <33>; clocks = <&gate_clk 7>; - /* set clock-frequency in board dts */ status = "disabled"; }; @@ -67,7 +68,6 @@ reg-shift = <2>; interrupts = <34>; clocks = <&gate_clk 7>; - /* set clock-frequency in board dts */ status = "disabled"; }; @@ -75,6 +75,7 @@ compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc"; reg = <0x10300 0x20>; interrupts = <53>; + clocks = <&gate_clk 7>; }; spi@10600 { |