diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-02-22 18:16:33 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-02-22 18:16:33 +0000 |
| commit | 3a7120431d7dac533294ce650b6824aec1ccedb3 (patch) | |
| tree | f2b7aa17a8777e9cd71875a3be6c83a4eabf5508 | |
| parent | 2d0a7addbd109bd4a586d2ae2914a0047a4719de (diff) | |
| parent | ae10f8329f9b22d650aa12307b260eba2bc0c571 (diff) | |
Merge tag 'tags/mvebu-dt-fixes-3.14' into mvebu/dt
mvebu dt fixes for v3.14
- mvebu: add missing 'eth3' alias for mv78260
- dove: revert PMU interrupt controller node, wait for driver to land.
| -rw-r--r-- | arch/arm/boot/dts/armada-xp-mv78260.dtsi | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/dove.dtsi | 11 |
2 files changed, 2 insertions, 12 deletions
diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi index 66609684d41b..9480cf891f8c 100644 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi @@ -23,6 +23,7 @@ gpio0 = &gpio0; gpio1 = &gpio1; gpio2 = &gpio2; + eth3 = ð3; }; cpus { @@ -291,7 +292,7 @@ interrupts = <91>; }; - ethernet@34000 { + eth3: ethernet@34000 { compatible = "marvell,armada-370-neta"; reg = <0x34000 0x4000>; interrupts = <14>; diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index a88ed73c1c86..644b1f40cb30 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi @@ -387,15 +387,6 @@ #clock-cells = <1>; }; - pmu_intc: pmu-interrupt-ctrl@d0050 { - compatible = "marvell,dove-pmu-intc"; - interrupt-controller; - #interrupt-cells = <1>; - reg = <0xd0050 0x8>; - interrupts = <33>; - marvell,#interrupts = <7>; - }; - pinctrl: pin-ctrl@d0200 { compatible = "marvell,dove-pinctrl"; reg = <0xd0200 0x10>; @@ -618,8 +609,6 @@ rtc: real-time-clock@d8500 { compatible = "marvell,orion-rtc"; reg = <0xd8500 0x20>; - interrupt-parent = <&pmu_intc>; - interrupts = <5>; }; gpio2: gpio-ctrl@e8400 { |