ARCv2: [vdk] No need to maintain 2 versions of MB DTS

Signed-off-by: Vineet Gupta <[email protected]>

Author: vineetgarc

arch/arc/boot/dts/axc003_smp_vdk.dtsi

@@ -57,6 +57,20 @@
 
 	};
 
+	/*
+	 * This intc actually resides on MB, but we move it here to
+	 * avoid duplicating the MB dtsi file given that IRQ from
+	 * this intc to cpu intc are different for UP and SMP configs
+	 */
+	mb_intc: dw-apb-ictl@0xe0012000 {
+		#interrupt-cells = <1>;
+		compatible = "snps,dw-apb-ictl";
+		reg = < 0xe0012000 0x200 >;
+		interrupt-controller;
+		interrupt-parent = <&idu_intc>;
+		interrupts = < 0 0 >;
+	};
+
 	memory {
 		#address-cells = <1>;
 		#size-cells = <1>;

arch/arc/boot/dts/axc003_vdk.dtsi

@@ -42,6 +42,20 @@
 
 	};
 
+	/*
+	 * This intc actually resides on MB, but we move it here to
+	 * avoid duplicating the MB dtsi file given that IRQ from
+	 * this intc to cpu intc are different for UP and SMP configs
+	 */
+	mb_intc: dw-apb-ictl@0xe0012000 {
+		#interrupt-cells = <1>;
+		compatible = "snps,dw-apb-ictl";
+		reg = < 0xe0012000 0x200 >;
+		interrupt-controller;
+		interrupt-parent = <&cpu_intc>;
+		interrupts = < 18 >;
+	};
+
 	memory {
 		#address-cells = <1>;
 		#size-cells = <1>;

arch/arc/boot/dts/axs10x_mb_vdk.dtsi

@@ -25,16 +25,6 @@
 
 		};
 
-		mb_intc: dw-apb-ictl@0x12000 {
-			#interrupt-cells = <1>;
-			compatible = "snps,dw-apb-ictl";
-			reg = < 0x12000 0x200 >;
-			interrupt-controller;
-			interrupt-parent = <&cpu_intc>;
-			/* On VDK, mb int controller is directly hooked to cpu int controller */
-			interrupts = < 18 >;
-		};
-
 /* Not supported in VDK
 		nand@0x16000 {
 			compatible = "snps,axs-nand";

arch/arc/boot/dts/axs10x_smp_mb_vdk.dtsi

@@ -10,7 +10,7 @@
 /dts-v1/;
 
 /include/ "axc003_smp_vdk.dtsi"
-/include/ "axs10x_smp_mb_vdk.dtsi"
+/include/ "axs10x_mb_vdk.dtsi"
 
 / {
 	compatible = "snps,axs103";