From patchwork Thu Feb 27 19:34:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlo Caione X-Patchwork-Id: 3735391 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 A594E9F35F for ; Thu, 27 Feb 2014 19:35:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DC5122024D for ; Thu, 27 Feb 2014 19:35:46 +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 E5E1A2022D for ; Thu, 27 Feb 2014 19:35:45 +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 1WJ6je-0007FC-Jg; Thu, 27 Feb 2014 19:35:10 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJ6jS-0000bc-Up; Thu, 27 Feb 2014 19:34:58 +0000 Received: from mail-ea0-f181.google.com ([209.85.215.181]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJ6jB-0000a6-PD for linux-arm-kernel@lists.infradead.org; Thu, 27 Feb 2014 19:34:43 +0000 Received: by mail-ea0-f181.google.com with SMTP id k10so2061104eaj.26 for ; Thu, 27 Feb 2014 11:34:16 -0800 (PST) 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=qkJHojZuB7Zmpl9McnhGx65FixlBMQ3o1Skfye9g5/Q=; b=jNX4dZlQkc5wl10miBT94v6T0UpdzJbhP0VyoJCpcSKHr3N+6Na679ZegFftCdtf7X Dp5dxJvinOuLfJA+tnNqAe4LGTgopxr0R36PFdLHqa5z9nsvM9il2ZsIZss9s17el5HS Xn79IVS+kuuq77NUU3gkbmsgJlPtH4mawjBBlRfuGyRpV1C6TBxPb1cVqAJX+4dba41Z YMNXQrZGN7DTBXsa4r3mHXT5azWjY7at/ejtQzFoneJPayaahyTKCDpwh6xMQ6xtPWQq +lR1aqfE2q4cAOWoesGdwE6m1LgpRcNk2ivB02KGE59bgF0+vYEfaMbbxH8HZr9NYimH 796A== X-Received: by 10.15.48.1 with SMTP id g1mr14969518eew.51.1393529656374; Thu, 27 Feb 2014 11:34:16 -0800 (PST) Received: from localhost.fastwebnet.it (2-238-57-164.ip242.fastwebnet.it. [2.238.57.164]) by mx.google.com with ESMTPSA id 46sm1194410ees.4.2014.02.27.11.34.14 for (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Thu, 27 Feb 2014 11:34:15 -0800 (PST) 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 v4 2/3] ARM: sun7i/sun6i: dts: Add NMI irqchip support Date: Thu, 27 Feb 2014 20:34:21 +0100 Message-Id: <1393529662-8663-3-git-send-email-carlo@caione.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1393529662-8663-1-git-send-email-carlo@caione.org> References: <1393529662-8663-1-git-send-email-carlo@caione.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140227_143441_936147_106A595C X-CRM114-Status: UNSURE ( 8.90 ) 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, 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 --- arch/arm/boot/dts/sun6i-a31.dtsi | 9 +++++++++ arch/arm/boot/dts/sun7i-a20.dtsi | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index 5256ad9..4a5050c 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -190,6 +190,15 @@ #size-cells = <1>; ranges; + nmi_intc: sc-nmi-intc@01f00c0c { + compatible = "allwinner,sun6i-a31-sc-nmi"; + interrupt-controller; + #interrupt-cells = <2>; + reg = <0x01f00c0c 0x38>; + interrupt-parent = <&gic>; + 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 4c25f81..f01a23c 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -310,6 +310,15 @@ #size-cells = <1>; ranges; + nmi_intc: sc-nmi-intc@01c00030 { + compatible = "allwinner,sun7i-a20-sc-nmi"; + interrupt-controller; + #interrupt-cells = <2>; + reg = <0x01c00030 0x0c>; + interrupt-parent = <&gic>; + interrupts = <0 0 4>; + }; + emac: ethernet@01c0b000 { compatible = "allwinner,sun4i-emac"; reg = <0x01c0b000 0x1000>;