diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2018-01-02 15:55:55 +0100 |
|---|---|---|
| committer | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2018-01-05 17:02:39 +0100 |
| commit | af9ad5bcd9bd3c2858c722650762b20e41d081b7 (patch) | |
| tree | 2fd7c16ef5edb4a6303bd7a1a978c8c60c942c9e /arch/arm64/boot | |
| parent | 4003e96a7b94903c11b6f1f4edffaf2fc2c8ad48 (diff) | |
| download | linux-stable-af9ad5bcd9bd3c2858c722650762b20e41d081b7.tar.gz linux-stable-af9ad5bcd9bd3c2858c722650762b20e41d081b7.tar.bz2 linux-stable-af9ad5bcd9bd3c2858c722650762b20e41d081b7.zip | |
arm64: dts: marvell: use mvebu-icu.h where possible
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>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Diffstat (limited to 'arch/arm64/boot')
| -rw-r--r-- | arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 2 | ||||
| -rw-r--r-- | 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 9361bac7cd6d..d9e73a9b1837 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 64848a1341dd..06340c7040ea 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 { |