ARM: dts: uniphier: remove skeleton.dtsi inclusion
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Sun, 12 Mar 2017 15:16:39 +0000 (00:16 +0900)
committerMasahiro Yamada <yamada.masahiro@socionext.com>
Mon, 13 Mar 2017 19:15:24 +0000 (04:15 +0900)
Linux Commit 9c0da3cc61f1 ("ARM: dts: explicitly mark skeleton.dtsi
as deprecated") declared that skeleton.dtsi was deprecated.

Move the memory node below to suppress warnings of FDTGREP.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
16 files changed:
arch/arm/dts/uniphier-ld4-ref.dts
arch/arm/dts/uniphier-ld4.dtsi
arch/arm/dts/uniphier-ld6b-ref.dts
arch/arm/dts/uniphier-pro4-ace.dts
arch/arm/dts/uniphier-pro4-ref.dts
arch/arm/dts/uniphier-pro4-sanji.dts
arch/arm/dts/uniphier-pro4.dtsi
arch/arm/dts/uniphier-pro5-4kbox.dts
arch/arm/dts/uniphier-pro5.dtsi
arch/arm/dts/uniphier-pxs2-gentil.dts
arch/arm/dts/uniphier-pxs2-vodka.dts
arch/arm/dts/uniphier-pxs2.dtsi
arch/arm/dts/uniphier-sld3-ref.dts
arch/arm/dts/uniphier-sld3.dtsi
arch/arm/dts/uniphier-sld8-ref.dts
arch/arm/dts/uniphier-sld8.dtsi

index 0f4bd9b..f397a4c 100644 (file)
        model = "UniPhier LD4 Reference Board";
        compatible = "socionext,uniphier-ld4-ref", "socionext,uniphier-ld4";
 
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x20000000>;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
                i2c2 = &i2c2;
                i2c3 = &i2c3;
        };
+
+       memory {
+               device_type = "memory";
+               reg = <0x80000000 0x20000000>;
+       };
 };
 
 &ethsc {
index bbfa164..0d3d963 100644 (file)
@@ -7,10 +7,10 @@
  * SPDX-License-Identifier:    GPL-2.0+        X11
  */
 
-/include/ "skeleton.dtsi"
-
 / {
        compatible = "socionext,uniphier-ld4";
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        cpus {
                #address-cells = <1>;
index 4da3c63..fdfb533 100644 (file)
        model = "UniPhier LD6b Reference Board";
        compatible = "socionext,uniphier-ld6b-ref", "socionext,uniphier-ld6b";
 
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x80000000>;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
                i2c5 = &i2c5;
                i2c6 = &i2c6;
        };
+
+       memory {
+               device_type = "memory";
+               reg = <0x80000000 0x80000000>;
+       };
 };
 
 &ethsc {
index f70bc82..b9d4315 100644 (file)
        model = "UniPhier Pro4 Ace Board";
        compatible = "socionext,uniphier-pro4-ace", "socionext,uniphier-pro4";
 
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x40000000>;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
                i2c5 = &i2c5;
                i2c6 = &i2c6;
        };
+
+       memory {
+               device_type = "memory";
+               reg = <0x80000000 0x40000000>;
+       };
 };
 
 &serial0 {
index 9714fb0..920fd54 100644 (file)
        model = "UniPhier Pro4 Reference Board";
        compatible = "socionext,uniphier-pro4-ref", "socionext,uniphier-pro4";
 
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x40000000>;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
                i2c6 = &i2c6;
                usb0 = &usb0;
        };
+
+       memory {
+               device_type = "memory";
+               reg = <0x80000000 0x40000000>;
+       };
 };
 
 &ethsc {
index d43f725..b103ba5 100644 (file)
        model = "UniPhier Pro4 Sanji Board";
        compatible = "socionext,uniphier-pro4-sanji", "socionext,uniphier-pro4";
 
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x80000000>;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
                i2c5 = &i2c5;
                i2c6 = &i2c6;
        };
+
+       memory {
+               device_type = "memory";
+               reg = <0x80000000 0x80000000>;
+       };
 };
 
 &serial0 {
index 9b881f6..210ac27 100644 (file)
@@ -7,10 +7,10 @@
  * SPDX-License-Identifier:    GPL-2.0+        X11
  */
 
-/include/ "skeleton.dtsi"
-
 / {
        compatible = "socionext,uniphier-pro4";
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        cpus {
                #address-cells = <1>;
index ffc21a7..ce12f4a 100644 (file)
        model = "UniPhier Pro5 4KBOX Board";
        compatible = "socionext,uniphier-pro5-4kbox", "socionext,uniphier-pro5";
 
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x40000000>;
-       };
-
        chosen {
                stdout-path = "serial1:115200n8";
        };
                i2c5 = &i2c5;
                i2c6 = &i2c6;
        };
+
+       memory {
+               device_type = "memory";
+               reg = <0x80000000 0x40000000>;
+       };
 };
 
 &serial1 {
index 68866e1..de98697 100644 (file)
@@ -7,10 +7,10 @@
  * SPDX-License-Identifier:    GPL-2.0+        X11
  */
 
-/include/ "skeleton.dtsi"
-
 / {
        compatible = "socionext,uniphier-pro5";
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        cpus {
                #address-cells = <1>;
index 0a6d46c..aac4781 100644 (file)
        compatible = "socionext,uniphier-pxs2-gentil",
                     "socionext,uniphier-pxs2";
 
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x80000000>;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
                i2c5 = &i2c5;
                i2c6 = &i2c6;
        };
+
+       memory {
+               device_type = "memory";
+               reg = <0x80000000 0x80000000>;
+       };
 };
 
 &serial2 {
index 770edca..f381696 100644 (file)
        model = "UniPhier PXs2 Vodka Board";
        compatible = "socionext,uniphier-pxs2-vodka", "socionext,uniphier-pxs2";
 
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x80000000>;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
                i2c5 = &i2c5;
                i2c6 = &i2c6;
        };
+
+       memory {
+               device_type = "memory";
+               reg = <0x80000000 0x80000000>;
+       };
 };
 
 &serial2 {
index da62070..904320c 100644 (file)
@@ -7,10 +7,10 @@
  * SPDX-License-Identifier:    GPL-2.0+        X11
  */
 
-/include/ "skeleton.dtsi"
-
 / {
        compatible = "socionext,uniphier-pxs2";
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        cpus {
                #address-cells = <1>;
index f35500d..01aed3d 100644 (file)
        model = "UniPhier sLD3 Reference Board";
        compatible = "socionext,uniphier-sld3-ref", "socionext,uniphier-sld3";
 
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x20000000
-                      0xc0000000 0x20000000>;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
                i2c3 = &i2c3;
                i2c4 = &i2c4;
        };
+
+       memory {
+               device_type = "memory";
+               reg = <0x80000000 0x20000000
+                      0xc0000000 0x20000000>;
+       };
 };
 
 &ethsc {
index 919cbff..7578920 100644 (file)
@@ -7,10 +7,10 @@
  * SPDX-License-Identifier:    GPL-2.0+        X11
  */
 
-/include/ "skeleton.dtsi"
-
 / {
        compatible = "socionext,uniphier-sld3";
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        cpus {
                #address-cells = <1>;
index 6c0544b..3c78997 100644 (file)
        model = "UniPhier sLD8 Reference Board";
        compatible = "socionext,uniphier-sld8-ref", "socionext,uniphier-sld8";
 
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x20000000>;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
                i2c2 = &i2c2;
                i2c3 = &i2c3;
        };
+
+       memory {
+               device_type = "memory";
+               reg = <0x80000000 0x20000000>;
+       };
 };
 
 &ethsc {
index 5550bb8..4117132 100644 (file)
@@ -7,10 +7,10 @@
  * SPDX-License-Identifier:    GPL-2.0+        X11
  */
 
-/include/ "skeleton.dtsi"
-
 / {
        compatible = "socionext,uniphier-sld8";
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        cpus {
                #address-cells = <1>;