ARM: dts: lpc18xx: remove skeleton.dtsi include and fix unit address warnings

Removale of skeleton.dtsi allows us also to fix the following
warning from the dts compiler:
  Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit name

by adding proper unit addresses to the memory nodes.

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Acked-by: Rob Herring <robh@kernel.org>

diff --git a/arch/arm/boot/dts/lpc18xx.dtsi b/arch/arm/boot/dts/lpc18xx.dtsi
index e956ea8aff1636111386f5a2cc1c94fce635c180..7cae9c5e27db0b15b53dfce8ae7670b6eab2f011 100644 (file)
--- a/arch/arm/boot/dts/lpc18xx.dtsi
+++ b/arch/arm/boot/dts/lpc18xx.dtsi
@@ -11,7 +11,6 @@
  *
  */
 
-#include "skeleton.dtsi"
 #include "armv7-m.dtsi"
 
 #include "dt-bindings/clock/lpc18xx-cgu.h"
@@ -21,6 +20,9 @@
 #define LPC_GPIO(port, pin)    (port * 32 + pin)
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/lpc4337-ciaa.dts b/arch/arm/boot/dts/lpc4337-ciaa.dts
index 5cfadb06c8df2f8c0be10c47dddf0d50ff2e894f..7c16d639a1b48b409623053e85ee8148db2016dd 100644 (file)
--- a/arch/arm/boot/dts/lpc4337-ciaa.dts
+++ b/arch/arm/boot/dts/lpc4337-ciaa.dts
@@ -30,7 +30,7 @@
                stdout-path = &uart2;
        };
 
-       memory {
+       memory@28000000 {
                device_type = "memory";
                reg = <0x28000000 0x0800000>; /* 8 MB */
        };

diff --git a/arch/arm/boot/dts/lpc4350-hitex-eval.dts b/arch/arm/boot/dts/lpc4350-hitex-eval.dts
index c97cba1d26a8f43ef731ddc08e9c6659e503fbde..874c75d44013d6875d0de18f94d31dc735978055 100644 (file)
--- a/arch/arm/boot/dts/lpc4350-hitex-eval.dts
+++ b/arch/arm/boot/dts/lpc4350-hitex-eval.dts
@@ -33,7 +33,7 @@
                stdout-path = &uart0;
        };
 
-       memory {
+       memory@28000000 {
                device_type = "memory";
                reg = <0x28000000 0x800000>; /* 8 MB */
        };

diff --git a/arch/arm/boot/dts/lpc4357-ea4357-devkit.dts b/arch/arm/boot/dts/lpc4357-ea4357-devkit.dts
index 1919be4dab2b4549fa933cb4804268b4045bc419..9b5fad622522090d12f6d2ddae93caf3f000a2d3 100644 (file)
--- a/arch/arm/boot/dts/lpc4357-ea4357-devkit.dts
+++ b/arch/arm/boot/dts/lpc4357-ea4357-devkit.dts
@@ -33,7 +33,7 @@
                stdout-path = &uart0;
        };
 
-       memory {
+       memory@28000000 {
                device_type = "memory";
                reg = <0x28000000 0x2000000>; /* 32 MB */
        };