ARM: dts: s3c64xx: Remove skeleton.dtsi and fix DTC warnings for /memory

Remove the usage of skeleton.dtsi to fix the DTC warnings:

    arch/arm/boot/dts/s3c6410-mini6410.dtb: Warning (unit_address_vs_reg):
        /memory: node has a reg or ranges property, but no unit name
    arch/arm/boot/dts/s3c6410-smdk6410.dtb: Warning (unit_address_vs_reg):
        /memory: node has a reg or ranges property, but no unit name

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

diff --git a/arch/arm/boot/dts/s3c6410-mini6410.dts b/arch/arm/boot/dts/s3c6410-mini6410.dts
index f68601bd9c91f4d435d0034bd8b542c42b63d4a3..0e159c884f972240914d319aeeccdccdecdf2a93 100644 (file)
--- a/arch/arm/boot/dts/s3c6410-mini6410.dts
+++ b/arch/arm/boot/dts/s3c6410-mini6410.dts
@@ -19,7 +19,8 @@
        model = "FriendlyARM Mini6410 board based on S3C6410";
        compatible = "friendlyarm,mini6410", "samsung,s3c6410";
 
-       memory {
+       memory@50000000 {
+               device_type = "memory";
                reg = <0x50000000 0x10000000>;
        };
 

diff --git a/arch/arm/boot/dts/s3c6410-smdk6410.dts b/arch/arm/boot/dts/s3c6410-smdk6410.dts
index b6b5afcd76021cafeeac64073b6869b63fbcaefe..a9a5689dc462db0b3f6abe56be1dea2dd6aedbbd 100644 (file)
--- a/arch/arm/boot/dts/s3c6410-smdk6410.dts
+++ b/arch/arm/boot/dts/s3c6410-smdk6410.dts
@@ -19,7 +19,8 @@
        model = "SAMSUNG SMDK6410 board based on S3C6410";
        compatible = "samsung,mini6410", "samsung,s3c6410";
 
-       memory {
+       memory@50000000 {
+               device_type = "memory";
                reg = <0x50000000 0x8000000>;
        };
 

diff --git a/arch/arm/boot/dts/s3c64xx.dtsi b/arch/arm/boot/dts/s3c64xx.dtsi
index e2be3fbdd3f3de9b24cf634c51e96af46565b352..2e611df379115790923ce33705ee78628deef90e 100644 (file)
--- a/arch/arm/boot/dts/s3c64xx.dtsi
+++ b/arch/arm/boot/dts/s3c64xx.dtsi
@@ -13,10 +13,12 @@
  * nodes can be added to this file.
  */
 
-#include "skeleton.dtsi"
 #include <dt-bindings/clock/samsung,s3c64xx-clock.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
        aliases {
                i2c0 = &i2c0;
                pinctrl0 = &pinctrl0;