ARM: dts: exynos: Remove skeleton.dtsi usage for Exynos4

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"

The disassembled DTB are almost the same besides an empty chosen
node being removed and nodes reordered, so it should not have
functional changes.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 32f22e1..5f034eb 100644 (file)
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -21,11 +21,12 @@
 
 #include <dt-bindings/clock/exynos4.h>
 #include <dt-bindings/clock/exynos-audss-clk.h>
-#include "skeleton.dtsi"
 #include "exynos-syscon-restart.dtsi"
 
 / {
        interrupt-parent = <&gic>;
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        aliases {
                spi0 = &spi_0;

diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts
index be2751e..6b2c41a 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -25,6 +25,7 @@
        compatible = "insignal,origen", "samsung,exynos4210", "samsung,exynos4";
 
        memory {
+               device_type = "memory";
                reg = <0x40000000 0x10000000
                       0x50000000 0x10000000
                       0x60000000 0x10000000

diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts
index 847fae3..3c759ba 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-smdkv310.dts
+++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts
@@ -24,6 +24,7 @@
        compatible = "samsung,smdkv310", "samsung,exynos4210", "samsung,exynos4";
 
        memory {
+               device_type = "memory";
                reg = <0x40000000 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts
index 79d9830..5f7ddb0 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-trats.dts
+++ b/arch/arm/boot/dts/exynos4210-trats.dts
@@ -21,6 +21,7 @@
        compatible = "samsung,trats", "samsung,exynos4210", "samsung,exynos4";
 
        memory {
+               device_type = "memory";
                reg =  <0x40000000 0x10000000
                        0x50000000 0x10000000
                        0x60000000 0x10000000

diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts
index cf95202..30d938e 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-universal_c210.dts
+++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts
@@ -21,6 +21,7 @@
        compatible = "samsung,universal_c210", "samsung,exynos4210", "samsung,exynos4";
 
        memory {
+               device_type = "memory";
                reg =  <0x40000000 0x10000000
                        0x50000000 0x10000000>;
        };

diff --git a/arch/arm/boot/dts/exynos4412-odroidu3.dts b/arch/arm/boot/dts/exynos4412-odroidu3.dts
index d73aa6c..cc1b87e 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-odroidu3.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidu3.dts
@@ -19,6 +19,7 @@
        compatible = "hardkernel,odroid-u3", "samsung,exynos4412", "samsung,exynos4";
 
        memory {
+               device_type = "memory";
                reg = <0x40000000 0x7FF00000>;
        };
 

diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts
index 2af2351..518ca57 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-odroidx.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx.dts
@@ -19,6 +19,7 @@
        compatible = "hardkernel,odroid-x", "samsung,exynos4412", "samsung,exynos4";
 
        memory {
+               device_type = "memory";
                reg = <0x40000000 0x3FF00000>;
        };
 

diff --git a/arch/arm/boot/dts/exynos4412-odroidx2.dts b/arch/arm/boot/dts/exynos4412-odroidx2.dts
index 3e35842..92cdeea 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-odroidx2.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx2.dts
@@ -18,6 +18,7 @@
        compatible = "hardkernel,odroid-x2", "samsung,exynos4412", "samsung,exynos4";
 
        memory {
+               device_type = "memory";
                reg = <0x40000000 0x7FF00000>;
        };
 };

diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index 26a36fe..9156a35 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -23,6 +23,7 @@
        compatible = "insignal,origen4412", "samsung,exynos4412", "samsung,exynos4";
 
        memory {
+               device_type = "memory";
                reg = <0x40000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/exynos4412-smdk4412.dts b/arch/arm/boot/dts/exynos4412-smdk4412.dts
index 231ffbd..2e868c4 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-smdk4412.dts
+++ b/arch/arm/boot/dts/exynos4412-smdk4412.dts
@@ -21,6 +21,7 @@
        compatible = "samsung,smdk4412", "samsung,exynos4412", "samsung,exynos4";
 
        memory {
+               device_type = "memory";
                reg = <0x40000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/exynos4412-tiny4412.dts b/arch/arm/boot/dts/exynos4412-tiny4412.dts
index 4840bbd..ad60f38 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-tiny4412.dts
+++ b/arch/arm/boot/dts/exynos4412-tiny4412.dts
@@ -24,6 +24,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x40000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index 129e973..e1380ba 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -31,6 +31,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg =  <0x40000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/exynos4415.dtsi b/arch/arm/boot/dts/exynos4415.dtsi
index 28b04b6..3c40f8a 100644 (file)
--- a/arch/arm/boot/dts/exynos4415.dtsi
+++ b/arch/arm/boot/dts/exynos4415.dtsi
@@ -16,13 +16,14 @@
  * published by the Free Software Foundation.
  */
 
-#include "skeleton.dtsi"
 #include <dt-bindings/clock/exynos4415.h>
 #include <dt-bindings/clock/exynos-audss-clk.h>
 
 / {
        compatible = "samsung,exynos4415";
        interrupt-parent = <&gic>;
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        aliases {
                pinctrl0 = &pinctrl_0;