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

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/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi
index cab91782e20c6e1e6eeb749ad57cbc0a3793c07d..8f06609879f5745055adef2eaa115d190f19216c 100644 (file)
--- a/arch/arm/boot/dts/exynos5.dtsi
+++ b/arch/arm/boot/dts/exynos5.dtsi
@@ -13,11 +13,12 @@
  * published by the Free Software Foundation.
  */
 
-#include "skeleton.dtsi"
 #include "exynos-syscon-restart.dtsi"
 
 / {
        interrupt-parent = <&gic>;
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        aliases {
                i2c0 = &i2c_0;

diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index 3d981f32874d96f79676b3a215a8482f3e5f2730..54397c7e8d7cd15e697dd089debdb27c3e2ae3b3 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -21,6 +21,7 @@
        compatible = "insignal,arndale", "samsung,exynos5250", "samsung,exynos5";
 
        memory {
+               device_type = "memory";
                reg = <0x40000000 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 7f27263728a102034ff6f58d071b604cad9a93a1..b85b78a57299c05083be3768327480121089a774 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -23,6 +23,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x40000000 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
index 1055d25c0ccc6fb324f9ef03cebf07aa4d4c9d96..5324eb488e30f389fbd9e2e878021e76262a1221 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
@@ -20,6 +20,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x40000000 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts
index 1d52a79b2f1831f97f61a8eee1a5b1debb9e2344..bdc55fa7c576d4b334e779b9717bda1e1749167a 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-spring.dts
+++ b/arch/arm/boot/dts/exynos5250-spring.dts
@@ -21,6 +21,7 @@
        compatible = "google,spring", "samsung,exynos5250", "samsung,exynos5";
 
        memory {
+               device_type = "memory";
                reg = <0x40000000 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/exynos5260-xyref5260.dts b/arch/arm/boot/dts/exynos5260-xyref5260.dts
index 3daef94bee38c4fd9e7aac10ac6eca5da031e386..d7f62918ed4bfcbc3ea821f3a16de76a818495fa 100644 (file)
--- a/arch/arm/boot/dts/exynos5260-xyref5260.dts
+++ b/arch/arm/boot/dts/exynos5260-xyref5260.dts
@@ -17,6 +17,7 @@
        compatible = "samsung,xyref5260", "samsung,exynos5260", "samsung,exynos5";
 
        memory {
+               device_type = "memory";
                reg = <0x20000000 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/exynos5260.dtsi b/arch/arm/boot/dts/exynos5260.dtsi
index 36da38e29000d0e077a1651d7586e979ea2ffb07..a86a4898d077ffca3050e4dc0cc90971e64453fb 100644 (file)
--- a/arch/arm/boot/dts/exynos5260.dtsi
+++ b/arch/arm/boot/dts/exynos5260.dtsi
@@ -9,13 +9,13 @@
  * published by the Free Software Foundation.
 */
 
-#include "skeleton.dtsi"
-
 #include <dt-bindings/clock/exynos5260-clk.h>
 
 / {
        compatible = "samsung,exynos5260", "samsung,exynos5";
        interrupt-parent = <&gic>;
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        aliases {
                pinctrl0 = &pinctrl_0;

diff --git a/arch/arm/boot/dts/exynos5410-odroidxu.dts b/arch/arm/boot/dts/exynos5410-odroidxu.dts
index 3912969ec223169cf07d47292bb94f3976ffbd8a..bf1612c0d4a4c4bb956fb2cfee04c92dc47af599 100644 (file)
--- a/arch/arm/boot/dts/exynos5410-odroidxu.dts
+++ b/arch/arm/boot/dts/exynos5410-odroidxu.dts
@@ -22,6 +22,7 @@
        compatible = "hardkernel,odroid-xu", "samsung,exynos5410", "samsung,exynos5";
 
        memory {
+               device_type = "memory";
                reg = <0x40000000 0x7ea00000>;
        };
 

diff --git a/arch/arm/boot/dts/exynos5410-smdk5410.dts b/arch/arm/boot/dts/exynos5410-smdk5410.dts
index 777fcf2edd79790b294fbbf2bb0c3971986b7a17..6ea1ac4cf1e7fbd41bcd62846ec487eb7019d211 100644 (file)
--- a/arch/arm/boot/dts/exynos5410-smdk5410.dts
+++ b/arch/arm/boot/dts/exynos5410-smdk5410.dts
@@ -17,6 +17,7 @@
        compatible = "samsung,smdk5410", "samsung,exynos5410", "samsung,exynos5";
 
        memory {
+               device_type = "memory";
                reg = <0x40000000 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
index d2ad48e195722833e60c1483b23151467dcdf3f8..10483a230538ea76593a4653aae004e77ce88981 100644 (file)
--- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
+++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
@@ -23,6 +23,7 @@
        compatible = "insignal,arndale-octa", "samsung,exynos5420", "samsung,exynos5";
 
        memory {
+               device_type = "memory";
                reg = <0x20000000 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index f6f256fd9b5e7a7f9f85002189d82ed84f31e92a..cd0c44b0bfa5d6eb869957c241702dc4eeb23987 100644 (file)
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -80,6 +80,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x20000000 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts
index 29546465d3da6db92b3155400934907579e17900..3a744d5611ea880147405ae38104e41d4f641ead 100644 (file)
--- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
+++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
@@ -20,6 +20,7 @@
        compatible = "samsung,smdk5420", "samsung,exynos5420", "samsung,exynos5";
 
        memory {
+               device_type = "memory";
                reg = <0x20000000 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
index 7bb8a370072a326d7e9501fb3dbdb8c782c7bc8a..05ae7284bb1ba1e7b9bac5301fc933daa58d3008 100644 (file)
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
@@ -22,6 +22,7 @@
 
 / {
        memory {
+               device_type = "memory";
                reg = <0x40000000 0x7EA00000>;
        };
 

diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi
index fd176819b4bfb410f3eb56d377c9e05fac03f1e3..e6bffd13cedd68da96ede7f60e0a933bb2005117 100644 (file)
--- a/arch/arm/boot/dts/exynos5440.dtsi
+++ b/arch/arm/boot/dts/exynos5440.dtsi
@@ -10,12 +10,13 @@
 */
 
 #include <dt-bindings/clock/exynos5440.h>
-#include "skeleton.dtsi"
 
 / {
        compatible = "samsung,exynos5440", "samsung,exynos5";
 
        interrupt-parent = <&gic>;
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        aliases {
                serial0 = &serial_0;

diff --git a/arch/arm/boot/dts/exynos54xx.dtsi b/arch/arm/boot/dts/exynos54xx.dtsi
index 06a604911e87edb90109c4afeda098bbf35e2e13..9d31cdce195918fb21ee3ff37531a53b8e60ff93 100644 (file)
--- a/arch/arm/boot/dts/exynos54xx.dtsi
+++ b/arch/arm/boot/dts/exynos54xx.dtsi
@@ -14,7 +14,6 @@
  * published by the Free Software Foundation.
  */
 
-#include "skeleton.dtsi"
 #include "exynos5.dtsi"
 
 / {

diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index 51a8bca4691cee992cab7a1e70a75981d0e4224c..72f89c8803d46fc49a8bd5fd201a0d4c2e139e80 100644 (file)
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -80,6 +80,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x20000000 0x80000000>;
        };