ARC: [axs101] Prepare for AXS103

To avoid duplicating the MB DTS file, move the MB intc entry into cpu
card specific file

Cc: Grant Likely <grant.likely@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: devicetree@vger.kernel.org
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>

diff --git a/arch/arc/boot/dts/axc001.dtsi b/arch/arc/boot/dts/axc001.dtsi
index 6990ca4..a5e2726 100644 (file)
--- a/arch/arc/boot/dts/axc001.dtsi
+++ b/arch/arc/boot/dts/axc001.dtsi
@@ -69,6 +69,27 @@
                };
        };
 
+       /*
+        * This INTC is actually connected to DW APB GPIO
+        * which acts as a wire between MB INTC and CPU INTC.
+        * GPIO INTC is configured in platform init code
+        * and here we mimic direct connection from MB INTC to
+        * CPU INTC, thus we set "interrupts = <7>" instead of
+        * "interrupts = <12>"
+        *
+        * 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 axs101 and axs103
+        */
+       mb_intc: dw-apb-ictl@0xe0012000 {
+               #interrupt-cells = <1>;
+               compatible = "snps,dw-apb-ictl";
+               reg = < 0xe0012000 0x200 >;
+               interrupt-controller;
+               interrupt-parent = <&cpu_intc>;
+               interrupts = < 7 >;
+       };
+
        memory {
                #address-cells = <1>;
                #size-cells = <1>;

diff --git a/arch/arc/boot/dts/axs10x_mb.dtsi b/arch/arc/boot/dts/axs10x_mb.dtsi
index 5d06f1f..f3db321 100644 (file)
--- a/arch/arc/boot/dts/axs10x_mb.dtsi
+++ b/arch/arc/boot/dts/axs10x_mb.dtsi
@@ -36,23 +36,6 @@
                        };
                };
 
-               /*
-                * This INTC is actually connected to DW APB GPIO
-                * which acts as a wire between MB INTC and CPU INTC.
-                * GPIO INTC is configured in platform init code
-                * and here we mimic direct connection from MB INTC to
-                * CPU INTC, thus we set "interrupts = <7>" instead of
-                * "interrupts = <12>"
-                */
-               mb_intc: dw-apb-ictl@0x12000 {
-                       #interrupt-cells = <1>;
-                       compatible = "snps,dw-apb-ictl";
-                       reg = < 0x12000 0x200 >;
-                       interrupt-controller;
-                       interrupt-parent = <&cpu_intc>;
-                       interrupts = < 7 >;
-               };
-
                ethernet@0x18000 {
                        #interrupt-cells = <1>;
                        compatible = "snps,dwmac";