All of lore.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Carlo Caione <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
	carlo@caione.org, tglx@linutronix.de
Subject: [tip:irq/core] ARM: sun7i/sun6i: dts: Add NMI irqchip support
Date: Tue, 25 Mar 2014 17:03:48 -0700	[thread overview]
Message-ID: <tip-8ff973a26763ef2f2d45c1649c618dfff528a502@git.kernel.org> (raw)
In-Reply-To: <1395256879-8475-3-git-send-email-carlo@caione.org>

Commit-ID:  8ff973a26763ef2f2d45c1649c618dfff528a502
Gitweb:     http://git.kernel.org/tip/8ff973a26763ef2f2d45c1649c618dfff528a502
Author:     Carlo Caione <carlo@caione.org>
AuthorDate: Wed, 19 Mar 2014 20:21:18 +0100
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Wed, 26 Mar 2014 01:00:50 +0100

ARM: sun7i/sun6i: dts: Add NMI irqchip support

This patch adds DTS entries for NMI controller as child of GIC.

Signed-off-by: Carlo Caione <carlo@caione.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-sunxi@googlegroups.com
Cc: mark.rutland@arm.com
Cc: hdegoede@redhat.com
Acked-by: maxime.ripard@free-electrons.com
Link: http://lkml.kernel.org/r/1395256879-8475-3-git-send-email-carlo@caione.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 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>;

  parent reply	other threads:[~2014-03-26  0:04 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-19 19:21 [PATCH v7 0/3] ARM: sun7i/sun6i: irqchip: Irqchip driver for NMI controller Carlo Caione
2014-03-19 19:21 ` Carlo Caione
2014-03-19 19:21 ` [PATCH v7 1/3] ARM: sun7i/sun6i: irqchip: Add irqchip " Carlo Caione
2014-03-19 19:21   ` Carlo Caione
2014-03-26  0:03   ` [tip:irq/core] " tip-bot for Carlo Caione
2014-03-19 19:21 ` [PATCH v7 2/3] ARM: sun7i/sun6i: dts: Add NMI irqchip support Carlo Caione
2014-03-19 19:21   ` Carlo Caione
2014-03-20 15:17   ` Maxime Ripard
2014-03-20 15:17     ` Maxime Ripard
2014-03-26  0:03   ` tip-bot for Carlo Caione [this message]
2014-03-26  8:39   ` Hans de Goede
2014-03-26  8:39     ` Hans de Goede
2014-03-26  9:39     ` Maxime Ripard
2014-03-26  9:39       ` Maxime Ripard
2014-03-26 10:04       ` Hans de Goede
2014-03-26 10:04         ` Hans de Goede
2014-03-26 14:38         ` Hans de Goede
2014-03-26 14:38           ` Hans de Goede
2014-03-26 20:24           ` Carlo Caione
2014-03-26 20:24             ` Carlo Caione
2014-03-19 19:21 ` [PATCH v7 3/3] ARM: sun7i/sun6i: irqchip: Update the documentation Carlo Caione
2014-03-19 19:21   ` Carlo Caione
2014-03-20 15:17   ` Maxime Ripard
2014-03-20 15:17     ` Maxime Ripard
2014-03-26  0:03   ` [tip:irq/core] " tip-bot for Carlo Caione
2014-03-25 21:27 ` [PATCH v7 0/3] ARM: sun7i/sun6i: irqchip: Irqchip driver for NMI controller Carlo Caione
2014-03-25 21:27   ` Carlo Caione

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-8ff973a26763ef2f2d45c1649c618dfff528a502@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=carlo@caione.org \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.