ARM: dts: efm32: 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. Also add missing
device_type to the memory node while at it.

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

diff --git a/arch/arm/boot/dts/efm32gg-dk3750.dts b/arch/arm/boot/dts/efm32gg-dk3750.dts
index 504cf45d3cb8f5238d023ed7f3f0d982eda9a670..98fc667d22c736ae52b9caa79fbe788871ef338e 100644 (file)
--- a/arch/arm/boot/dts/efm32gg-dk3750.dts
+++ b/arch/arm/boot/dts/efm32gg-dk3750.dts
@@ -16,7 +16,8 @@
                bootargs = "console=ttyefm4,115200 init=/linuxrc ignore_loglevel ihash_entries=64 dhash_entries=64 earlyprintk uclinux.physaddr=0x8c400000 root=/dev/mtdblock0";
        };
 
-       memory {
+       memory@88000000 {
+               device_type = "memory";
                reg = <0x88000000 0x400000>;
        };
 
@@ -74,7 +75,7 @@
                        status = "ok";
                };
 
-               boardfpga: boardfpga {
+               boardfpga: boardfpga@80000000 {
                        compatible = "efm32board";
                        reg = <0x80000000 0x400>;
                        irq-gpios = <&gpio 64 1>;

diff --git a/arch/arm/boot/dts/efm32gg.dtsi b/arch/arm/boot/dts/efm32gg.dtsi
index d9dbf7f2090c04ec5094f3f97615001a726b8f07..b78c57e51ed5139a69e6d4773675a5cbdca52219 100644 (file)
--- a/arch/arm/boot/dts/efm32gg.dtsi
+++ b/arch/arm/boot/dts/efm32gg.dtsi
@@ -5,11 +5,13 @@
  * http://www.silabs.com/Support%20Documents/TechnicalDocs/EFM32GG-RM.pdf
  */
 
-#include "skeleton.dtsi"
 #include "armv7-m.dtsi"
 #include "dt-bindings/clock/efm32-cmu.h"
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
        aliases {
                i2c0 = &i2c0;
                i2c1 = &i2c1;