diff options
author | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2016-11-05 19:35:12 +0100 |
---|---|---|
committer | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2016-11-19 09:16:40 +0100 |
commit | 1cb92a98a1a57c5e71f69985451ff6f0c1534af5 (patch) | |
tree | 0a66a6234e9760972241a6770c515a09ec61b110 /arch/arm/boot/dts | |
parent | ARM: dts: armada-370: Fixup pcie DT warnings (diff) | |
download | linux-1cb92a98a1a57c5e71f69985451ff6f0c1534af5.tar.xz linux-1cb92a98a1a57c5e71f69985451ff6f0c1534af5.zip |
ARM: dts: armada-370-xp: Remove skeleton.dtsi
The skeleton.dtsi file was removed in ARM64 for different reasons as
explained in commit ("3ebee5a2e141 arm64: dts: kill skeleton.dtsi").
These also applies to ARM and it will also allow to get rid of the
following DTC warnings in the future:
"Node /memory has a reg or ranges property, but no unit name"
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r-- | arch/arm/boot/dts/armada-370-xp.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-370.dtsi | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp.dtsi | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi index a4f9684def1c..b0520bdeea27 100644 --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi @@ -50,8 +50,6 @@ * 370 and Armada XP SoC. */ -/include/ "skeleton64.dtsi" - #define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16)) / { diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index 60cdeb35f117..a65bc4d3b810 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi @@ -50,9 +50,11 @@ */ #include "armada-370-xp.dtsi" -/include/ "skeleton.dtsi" / { + #address-cells = <1>; + #size-cells = <1>; + model = "Marvell Armada 370 family SoC"; compatible = "marvell,armada370", "marvell,armada-370-xp"; diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index bb8f7dcaf656..097ea70736e2 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi @@ -53,6 +53,9 @@ #include "armada-370-xp.dtsi" / { + #address-cells = <2>; + #size-cells = <2>; + model = "Marvell Armada XP family SoC"; compatible = "marvell,armadaxp", "marvell,armada-370-xp"; |