]> Pileus Git - ~andy/linux/commitdiff
ARM: dove: move device tree nodes to DT irqchip and clocksource
authorSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tue, 2 Jul 2013 11:03:37 +0000 (13:03 +0200)
committerJason Cooper <jason@lakedaemon.net>
Thu, 25 Jul 2013 21:06:58 +0000 (21:06 +0000)
With recent support for true irqchip and clocksource drivers for Orion
SoCs, now make use of it on DT enabled Dove boards.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
arch/arm/boot/dts/dove.dtsi

index 8612658ec3c181200fa6dd2a38eeb28489adc9d9..8d5be1e856f284292bfa23717589568d467805df 100644 (file)
                        marvell,tauros2-cache-features = <0>;
                };
 
-               intc: interrupt-controller {
+               timer: timer@20300 {
+                       compatible = "marvell,orion-timer";
+                       reg = <0x20300 0x20>;
+                       interrupt-parent = <&bridge_intc>;
+                       interrupts = <1>, <2>;
+                       clocks = <&core_clk 0>;
+               };
+
+               intc: main-interrupt-ctrl@20200 {
                        compatible = "marvell,orion-intc";
                        interrupt-controller;
                        #interrupt-cells = <1>;
-                       reg = <0x20204 0x04>, <0x20214 0x04>;
+                       reg = <0x20200 0x10>, <0x20210 0x10>;
+               };
+
+               bridge_intc: bridge-interrupt-ctrl@20110 {
+                       compatible = "marvell,orion-bridge-intc";
+                       interrupt-controller;
+                       #interrupt-cells = <1>;
+                       reg = <0x20110 0x8>;
+                       interrupts = <0>;
+                       marvell,#interrupts = <5>;
                };
 
                core_clk: core-clocks@d0214 {