Procházet zdrojové kódy

ARM: kirkwood: move device tree nodes to DT irqchip and clocksource

With recent support for true irqchip and clocksource drivers for Orion
SoCs, now make use of it on DT enabled Kirkwood boards.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Sebastian Hesselbarth před 12 roky
rodič
revize
15f18591d6
1 změnil soubory, kde provedl 27 přidání a 8 odebrání
  1. 27 8
      arch/arm/boot/dts/kirkwood.dtsi

+ 27 - 8
arch/arm/boot/dts/kirkwood.dtsi

@@ -20,13 +20,6 @@
 	       gpio0 = &gpio0;
 	       gpio0 = &gpio0;
 	       gpio1 = &gpio1;
 	       gpio1 = &gpio1;
 	};
 	};
-	intc: interrupt-controller {
-		compatible = "marvell,orion-intc", "marvell,intc";
-		interrupt-controller;
-		#interrupt-cells = <1>;
-		reg = <0xf1020204 0x04>,
-		      <0xf1020214 0x04>;
-	};
 
 
 	ocp@f1000000 {
 	ocp@f1000000 {
 		compatible = "simple-bus";
 		compatible = "simple-bus";
@@ -37,6 +30,30 @@
 		#address-cells = <1>;
 		#address-cells = <1>;
 		#size-cells = <1>;
 		#size-cells = <1>;
 
 
+		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 = <0x20200 0x10>, <0x20210 0x10>;
+		};
+
+		bridge_intc: bridge-interrupt-ctrl@20110 {
+			compatible = "marvell,orion-bridge-intc";
+			interrupt-controller;
+			#interrupt-cells = <1>;
+			reg = <0x20110 0x8>;
+			interrupts = <1>;
+			marvell,#interrupts = <6>;
+		};
+
 		core_clk: core-clocks@10030 {
 		core_clk: core-clocks@10030 {
 			compatible = "marvell,kirkwood-core-clock";
 			compatible = "marvell,kirkwood-core-clock";
 			reg = <0x10030 0x4>;
 			reg = <0x10030 0x4>;
@@ -103,9 +120,11 @@
 			#clock-cells = <1>;
 			#clock-cells = <1>;
 		};
 		};
 
 
-		wdt@20300 {
+		wdt: watchdog-timer@20300 {
 			compatible = "marvell,orion-wdt";
 			compatible = "marvell,orion-wdt";
 			reg = <0x20300 0x28>;
 			reg = <0x20300 0x28>;
+			interrupt-parent = <&bridge_intc>;
+			interrupts = <3>;
 			clocks = <&gate_clk 7>;
 			clocks = <&gate_clk 7>;
 			status = "okay";
 			status = "okay";
 		};
 		};