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 32f22e12c70bcd1856ec81887c977312f2e91c65..5f034eb5a5e271af11258480298937f8ec220bd5 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 be2751eebaf84484bfb6281701876972b500e77a..6b2c41a87a3ea3bdbd22d81bbb6cb82619cd2b8d 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 847fae3dd1f1ea965e0756f5899815f132a62234..3c759baeadcc693a7e71c53de1708c1aa011513e 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 79d983036560d7ee52d865bd5580acb59c85b5d3..5f7ddb0627fb205919afbc5c2f4137ccb3de94b7 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 cf95202fa310dad3bc751a806192a514ad36b0c5..30d938e17c9fc1e5cdeac3e1ab88ff35a8c805d4 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 d73aa6c58fe377419c7890d5df3795756fbf0426..cc1b87e095348f1b40083e93fa37e8b5e31bf6a3 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 2af2351513010e23f34f6e7adaa7d841b241c6ec..518ca57837beeedcdae5661b2d3655aefe8d1378 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 3e3584270e003f603badab735390aca8b738bfa2..92cdeea1cfb302bc788f86f9afed33514b5f4c90 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 26a36fed96528702cdc5a93ad190cdc36793f1b3..9156a35a6117c6b7fabc59ffe300f7bf2b504398 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 231ffbdbf9d0e3c7a5afd07fc981ecfad61ef6a0..2e868c4c307e0ef48c6fe97616ea44258d151b0d 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 4840bbdaa9ec053a99a95e21d3e75ba6e28fafb1..ad60f3840e2426d42e70c3f3146b767345416b3d 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 129e973a06a625dba3d022b8c6f87ba08080b0b9..e1380bae8ee33c9d8c47fe09338aad4b5255672d 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 28b04b6795c99c31d45acdea57e3d2e40f1815de..3c40f8a956dda21ac7156e1755e714fd53a58cc5 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;