aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/dove.dtsi
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2014-02-22 13:16:33 -0500
committerJason Cooper <jason@lakedaemon.net>2014-02-22 13:16:33 -0500
commit3a7120431d7dac533294ce650b6824aec1ccedb3 (patch)
treef2b7aa17a8777e9cd71875a3be6c83a4eabf5508 /arch/arm/boot/dts/dove.dtsi
parent2d0a7addbd109bd4a586d2ae2914a0047a4719de (diff)
parentae10f8329f9b22d650aa12307b260eba2bc0c571 (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.
Diffstat (limited to 'arch/arm/boot/dts/dove.dtsi')
-rw-r--r--arch/arm/boot/dts/dove.dtsi11
1 files changed, 0 insertions, 11 deletions
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 @@
387 #clock-cells = <1>; 387 #clock-cells = <1>;
388 }; 388 };
389 389
390 pmu_intc: pmu-interrupt-ctrl@d0050 {
391 compatible = "marvell,dove-pmu-intc";
392 interrupt-controller;
393 #interrupt-cells = <1>;
394 reg = <0xd0050 0x8>;
395 interrupts = <33>;
396 marvell,#interrupts = <7>;
397 };
398
399 pinctrl: pin-ctrl@d0200 { 390 pinctrl: pin-ctrl@d0200 {
400 compatible = "marvell,dove-pinctrl"; 391 compatible = "marvell,dove-pinctrl";
401 reg = <0xd0200 0x10>; 392 reg = <0xd0200 0x10>;
@@ -618,8 +609,6 @@
618 rtc: real-time-clock@d8500 { 609 rtc: real-time-clock@d8500 {
619 compatible = "marvell,orion-rtc"; 610 compatible = "marvell,orion-rtc";
620 reg = <0xd8500 0x20>; 611 reg = <0xd8500 0x20>;
621 interrupt-parent = <&pmu_intc>;
622 interrupts = <5>;
623 }; 612 };
624 613
625 gpio2: gpio-ctrl@e8400 { 614 gpio2: gpio-ctrl@e8400 {