All of lore.kernel.org
 help / color / mirror / Atom feed
From: thomas.petazzoni@free-electrons.com (Thomas Petazzoni)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 5/8] arm64: dts: marvell: use mvebu-icu.h where possible
Date: Tue,  2 Jan 2018 15:55:55 +0100	[thread overview]
Message-ID: <20180102145558.9773-6-thomas.petazzoni@free-electrons.com> (raw)
In-Reply-To: <20180102145558.9773-1-thomas.petazzoni@free-electrons.com>

Back when the ICU Device Tree binding was introduced, we could not use
mvebu-icu.h from the Device Tree files, because the DT files and
mvebu-icu.h were following different merge routes towards Linus
tree. Now that both have been merged, we can switch the Marvell Armada
CP110 Device Tree files to use the mvebu-icu.h header instead of
duplicating the ICU_GRP_NSR definition.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 2 +-
 arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
index a0b2cec2823f..f89053577bcc 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
@@ -44,7 +44,7 @@
  * Device Tree file for Marvell Armada CP110 Master.
  */
 
-#define ICU_GRP_NSR 0x0
+#include <dt-bindings/interrupt-controller/mvebu-icu.h>
 
 / {
 	cp110-master {
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
index 3eda62d482fc..a658b72b0229 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
@@ -44,7 +44,7 @@
  * Device Tree file for Marvell Armada CP110 Slave.
  */
 
-#define ICU_GRP_NSR 0x0
+#include <dt-bindings/interrupt-controller/mvebu-icu.h>
 
 / {
 	cp110-slave {
-- 
2.14.3

  parent reply	other threads:[~2018-01-02 14:55 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-02 14:55 [PATCH v2 0/8] Armada 7K/8K CP110 DT de-duplication Thomas Petazzoni
2018-01-02 14:55 ` [PATCH v2 1/8] arm64: dts: marvell: fix watchdog unit address in Armada AP806 Thomas Petazzoni
2018-01-02 14:55 ` [PATCH v2 2/8] arm64: dts: marvell: use lower case for unit address and reg property Thomas Petazzoni
2018-01-02 14:55 ` [PATCH v2 3/8] arm64: dts: marvell: fix typos in comment describing the NAND controller Thomas Petazzoni
2018-01-02 14:55 ` [PATCH v2 4/8] arm64: dts: marvell: fix compatible string list for Armada CP110 slave NAND Thomas Petazzoni
2018-01-02 14:55 ` Thomas Petazzoni [this message]
2018-01-02 14:55 ` [PATCH v2 6/8] arm64: dts: marvell: use aliases for SPI busses on Armada 7K/8K Thomas Petazzoni
2018-01-02 14:55 ` [PATCH v2 7/8] arm64: dts: marvell: de-duplicate CP110 description Thomas Petazzoni
2018-01-02 14:55 ` [PATCH v2 8/8] arm64: dts: marvell: replace cpm by cp0, cps by cp1 Thomas Petazzoni
2018-01-02 15:31 ` [PATCH v2 0/8] Armada 7K/8K CP110 DT de-duplication Gregory CLEMENT
2018-01-02 16:07   ` Thomas Petazzoni

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=20180102145558.9773-6-thomas.petazzoni@free-electrons.com \
    --to=thomas.petazzoni@free-electrons.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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.