linux-kernel - [PATCH 26/28] ARC: [axs101] Prepare for AXS103

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 9 Jun 2015 17:18:26 +0530
From:	Vineet Gupta <Vineet.Gupta1@...opsys.com>
To:	<linux-arch@...r.kernel.org>, <linux-kernel@...r.kernel.org>
CC:	<arnd@...db.de>, <arc-linux-dev@...opsys.com>,
	Alexey Brodkin <Alexey.Brodkin@...opsys.com>,
	Grant Likely <grant.likely@...aro.org>,
	Rob Herring <robh+dt@...nel.org>, <devicetree@...r.kernel.org>,
	Vineet Gupta <Vineet.Gupta1@...opsys.com>
Subject: [PATCH 26/28] ARC: [axs101] Prepare for AXS103

From: Alexey Brodkin <abrodkin@...opsys.com>

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

Cc: Grant Likely <grant.likely@...aro.org>
Cc: Rob Herring <robh+dt@...nel.org>
Cc: devicetree@...r.kernel.org
Signed-off-by: Vineet Gupta <vgupta@...opsys.com>
---
 arch/arc/boot/dts/axc001.dtsi    | 21 +++++++++++++++++++++
 arch/arc/boot/dts/axs10x_mb.dtsi | 17 -----------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/arch/arc/boot/dts/axc001.dtsi b/arch/arc/boot/dts/axc001.dtsi
index 6990ca45fc7b..a5e2726a067e 100644
--- 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@...0012000 {
+		#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 5d06f1fb4266..f3db32154973 100644
--- 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@...2000 {
-			#interrupt-cells = <1>;
-			compatible = "snps,dw-apb-ictl";
-			reg = < 0x12000 0x200 >;
-			interrupt-controller;
-			interrupt-parent = <&cpu_intc>;
-			interrupts = < 7 >;
-		};
-
 		ethernet@...8000 {
 			#interrupt-cells = <1>;
 			compatible = "snps,dwmac";
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/