ARM: dts: s3c24xx: Remove skeleton.dtsi and fix DTC warning for /memory

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

    arch/arm/boot/dts/s3c2416-smdk2416.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/s3c2416-smdk2416.dts b/arch/arm/boot/dts/s3c2416-smdk2416.dts
index a1c9d8c695ccecdb52f6e6dd89a9915d50713609..5ef1144afcebfc2883058e7d4f5446f5ad946d62 100644 (file)
--- a/arch/arm/boot/dts/s3c2416-smdk2416.dts
+++ b/arch/arm/boot/dts/s3c2416-smdk2416.dts
@@ -12,7 +12,8 @@ / {
        model = "SMDK2416";
        compatible = "samsung,s3c2416";
 
-       memory {
+       memory@30000000 {
+               device_type = "memory";
                reg =  <0x30000000 0x4000000>;
        };
 

diff --git a/arch/arm/boot/dts/s3c24xx.dtsi b/arch/arm/boot/dts/s3c24xx.dtsi
index 34c7fe6751cf98da48ee2584e406c1e87f1e2ed2..6d8dd3cdd3c08c19d643aba45a66401a6b333fe9 100644 (file)
--- a/arch/arm/boot/dts/s3c24xx.dtsi
+++ b/arch/arm/boot/dts/s3c24xx.dtsi
@@ -5,11 +5,11 @@
  * Copyright (c) 2013 Heiko Stuebner <heiko@sntech.de>
  */
 
-#include "skeleton.dtsi"
-
 / {
        compatible = "samsung,s3c24xx";
        interrupt-parent = <&intc>;
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        aliases {
                pinctrl0 = &pinctrl_0;