From patchwork Wed Mar 19 19:21:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlo Caione X-Patchwork-Id: 3860541 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D7E049F334 for ; Wed, 19 Mar 2014 19:21:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0B662201F4 for ; Wed, 19 Mar 2014 19:21:27 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 062DB201E7 for ; Wed, 19 Mar 2014 19:21:26 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQM2k-0005Nu-Gv; Wed, 19 Mar 2014 19:20:50 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQM2b-0005FK-Pa; Wed, 19 Mar 2014 19:20:41 +0000 Received: from mail-ee0-f41.google.com ([74.125.83.41]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQM2P-0005DC-6j for linux-arm-kernel@lists.infradead.org; Wed, 19 Mar 2014 19:20:31 +0000 Received: by mail-ee0-f41.google.com with SMTP id t10so7084958eei.28 for ; Wed, 19 Mar 2014 12:20:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+HYrh9tVbScwpPlYiSYUJJK2Al4ZS9e8dRd6JyvSoDw=; b=QlUklG3Yaw5gxWqdhw+p8Cbimak5gOfIyOVXQLP8+oP4PWDVTKlr57juZfPE9bykT/ EkMdTEfSe6H56p7WHWUHwsjFbcHNJD3HeYerQQBu22oiAq2bpXLKnpQynJcAtd2jEykB 4iHM5PJeYAywlemORRbeY/6IShGGfH3HuExogjPwUcQbCZU+zv6aVo5PRMY2RfeZ/JRS WwgdcicCy0HA282NTsWpD/p63dBE6V4idXjaMQk6VDmYJAR5wWArYdSCEmRG8nWAW9qm iWa8PzwLLeZNWuDFulL0HTGwi0N+elIealMsYeqWDIKtOsHczPFstRkY05kZ0Juyt2hU 3nfw== X-Received: by 10.14.4.201 with SMTP id 49mr37937560eej.13.1395256806163; Wed, 19 Mar 2014 12:20:06 -0700 (PDT) Received: from localhost.fastwebnet.it (2-238-57-164.ip242.fastwebnet.it. [2.238.57.164]) by mx.google.com with ESMTPSA id 44sm44332464eek.30.2014.03.19.12.20.04 for (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Wed, 19 Mar 2014 12:20:05 -0700 (PDT) From: Carlo Caione To: linux-arm-kernel@lists.infradead.org, linux-sunxi@googlegroups.com, mark.rutland@arm.com, hdegoede@redhat.com, tglx@linutronix.de, maxime.ripard@free-electrons.com, devicetree@vger.kernel.org Subject: [PATCH v7 2/3] ARM: sun7i/sun6i: dts: Add NMI irqchip support Date: Wed, 19 Mar 2014 20:21:18 +0100 Message-Id: <1395256879-8475-3-git-send-email-carlo@caione.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1395256879-8475-1-git-send-email-carlo@caione.org> References: <1395256879-8475-1-git-send-email-carlo@caione.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140319_152029_432403_E1E23A6E X-CRM114-Status: UNSURE ( 8.60 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: Carlo Caione X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds DTS entries for NMI controller as child of GIC. Signed-off-by: Carlo Caione Acked-by: Maxime Ripard --- arch/arm/boot/dts/sun6i-a31.dtsi | 8 ++++++++ arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index 5256ad9..eea6033 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -190,6 +190,14 @@ #size-cells = <1>; ranges; + nmi_intc: interrupt-controller@01f00c0c { + compatible = "allwinner,sun6i-a31-sc-nmi"; + interrupt-controller; + #interrupt-cells = <2>; + reg = <0x01f00c0c 0x38>; + interrupts = <0 0 4>; + }; + pio: pinctrl@01c20800 { compatible = "allwinner,sun6i-a31-pinctrl"; reg = <0x01c20800 0x400>; diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 6f25cf5..7637f12 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -339,6 +339,14 @@ #size-cells = <1>; ranges; + nmi_intc: interrupt-controller@01c00030 { + compatible = "allwinner,sun7i-a20-sc-nmi"; + interrupt-controller; + #interrupt-cells = <2>; + reg = <0x01c00030 0x0c>; + interrupts = <0 0 4>; + }; + emac: ethernet@01c0b000 { compatible = "allwinner,sun4i-a10-emac"; reg = <0x01c0b000 0x1000>;