[U-Boot] [PATCH v2 1/3] ARM: dts: uniphier: remove skeleton.dtsi inclusion

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 ---

Changes in v2: - Fix FDTGREP warnings

arch/arm/dts/uniphier-ld4-ref.dts | 10 +++++----- arch/arm/dts/uniphier-ld4.dtsi | 4 ++-- arch/arm/dts/uniphier-ld6b-ref.dts | 10 +++++----- arch/arm/dts/uniphier-pro4-ace.dts | 10 +++++----- arch/arm/dts/uniphier-pro4-ref.dts | 10 +++++----- arch/arm/dts/uniphier-pro4-sanji.dts | 10 +++++----- arch/arm/dts/uniphier-pro4.dtsi | 4 ++-- arch/arm/dts/uniphier-pro5-4kbox.dts | 10 +++++----- arch/arm/dts/uniphier-pro5.dtsi | 4 ++-- arch/arm/dts/uniphier-pxs2-gentil.dts | 10 +++++----- arch/arm/dts/uniphier-pxs2-vodka.dts | 10 +++++----- arch/arm/dts/uniphier-pxs2.dtsi | 4 ++-- arch/arm/dts/uniphier-sld3-ref.dts | 12 ++++++------ arch/arm/dts/uniphier-sld3.dtsi | 4 ++-- arch/arm/dts/uniphier-sld8-ref.dts | 10 +++++----- arch/arm/dts/uniphier-sld8.dtsi | 4 ++-- 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/arch/arm/dts/uniphier-ld4-ref.dts b/arch/arm/dts/uniphier-ld4-ref.dts index 0f4bd9b..f397a4c 100644 --- a/arch/arm/dts/uniphier-ld4-ref.dts +++ b/arch/arm/dts/uniphier-ld4-ref.dts @@ -16,11 +16,6 @@ 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"; }; @@ -35,6 +30,11 @@ i2c2 = &i2c2; i2c3 = &i2c3; }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x20000000>; + }; };

&ethsc { diff --git a/arch/arm/dts/uniphier-ld4.dtsi b/arch/arm/dts/uniphier-ld4.dtsi index bbfa164..0d3d963 100644 --- a/arch/arm/dts/uniphier-ld4.dtsi +++ b/arch/arm/dts/uniphier-ld4.dtsi @@ -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>; diff --git a/arch/arm/dts/uniphier-ld6b-ref.dts b/arch/arm/dts/uniphier-ld6b-ref.dts index 4da3c63..fdfb533 100644 --- a/arch/arm/dts/uniphier-ld6b-ref.dts +++ b/arch/arm/dts/uniphier-ld6b-ref.dts @@ -16,11 +16,6 @@ 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"; }; @@ -37,6 +32,11 @@ i2c5 = &i2c5; i2c6 = &i2c6; }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x80000000>; + }; };

&ethsc { diff --git a/arch/arm/dts/uniphier-pro4-ace.dts b/arch/arm/dts/uniphier-pro4-ace.dts index f70bc82..b9d4315 100644 --- a/arch/arm/dts/uniphier-pro4-ace.dts +++ b/arch/arm/dts/uniphier-pro4-ace.dts @@ -14,11 +14,6 @@ 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"; }; @@ -34,6 +29,11 @@ i2c5 = &i2c5; i2c6 = &i2c6; }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x40000000>; + }; };

&serial0 { diff --git a/arch/arm/dts/uniphier-pro4-ref.dts b/arch/arm/dts/uniphier-pro4-ref.dts index 9714fb0..920fd54 100644 --- a/arch/arm/dts/uniphier-pro4-ref.dts +++ b/arch/arm/dts/uniphier-pro4-ref.dts @@ -16,11 +16,6 @@ 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"; }; @@ -38,6 +33,11 @@ i2c6 = &i2c6; usb0 = &usb0; }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x40000000>; + }; };

&ethsc { diff --git a/arch/arm/dts/uniphier-pro4-sanji.dts b/arch/arm/dts/uniphier-pro4-sanji.dts index d43f725..b103ba5 100644 --- a/arch/arm/dts/uniphier-pro4-sanji.dts +++ b/arch/arm/dts/uniphier-pro4-sanji.dts @@ -14,11 +14,6 @@ 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"; }; @@ -33,6 +28,11 @@ i2c5 = &i2c5; i2c6 = &i2c6; }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x80000000>; + }; };

&serial0 { diff --git a/arch/arm/dts/uniphier-pro4.dtsi b/arch/arm/dts/uniphier-pro4.dtsi index 9b881f6..210ac27 100644 --- a/arch/arm/dts/uniphier-pro4.dtsi +++ b/arch/arm/dts/uniphier-pro4.dtsi @@ -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>; diff --git a/arch/arm/dts/uniphier-pro5-4kbox.dts b/arch/arm/dts/uniphier-pro5-4kbox.dts index ffc21a7..ce12f4a 100644 --- a/arch/arm/dts/uniphier-pro5-4kbox.dts +++ b/arch/arm/dts/uniphier-pro5-4kbox.dts @@ -14,11 +14,6 @@ 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"; }; @@ -30,6 +25,11 @@ i2c5 = &i2c5; i2c6 = &i2c6; }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x40000000>; + }; };

&serial1 { diff --git a/arch/arm/dts/uniphier-pro5.dtsi b/arch/arm/dts/uniphier-pro5.dtsi index 68866e1..de98697 100644 --- a/arch/arm/dts/uniphier-pro5.dtsi +++ b/arch/arm/dts/uniphier-pro5.dtsi @@ -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>; diff --git a/arch/arm/dts/uniphier-pxs2-gentil.dts b/arch/arm/dts/uniphier-pxs2-gentil.dts index 0a6d46c..aac4781 100644 --- a/arch/arm/dts/uniphier-pxs2-gentil.dts +++ b/arch/arm/dts/uniphier-pxs2-gentil.dts @@ -15,11 +15,6 @@ compatible = "socionext,uniphier-pxs2-gentil", "socionext,uniphier-pxs2";

- memory { - device_type = "memory"; - reg = <0x80000000 0x80000000>; - }; - chosen { stdout-path = "serial0:115200n8"; }; @@ -34,6 +29,11 @@ i2c5 = &i2c5; i2c6 = &i2c6; }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x80000000>; + }; };

&serial2 { diff --git a/arch/arm/dts/uniphier-pxs2-vodka.dts b/arch/arm/dts/uniphier-pxs2-vodka.dts index 770edca..f381696 100644 --- a/arch/arm/dts/uniphier-pxs2-vodka.dts +++ b/arch/arm/dts/uniphier-pxs2-vodka.dts @@ -14,11 +14,6 @@ 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"; }; @@ -32,6 +27,11 @@ i2c5 = &i2c5; i2c6 = &i2c6; }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x80000000>; + }; };

&serial2 { diff --git a/arch/arm/dts/uniphier-pxs2.dtsi b/arch/arm/dts/uniphier-pxs2.dtsi index da62070..904320c 100644 --- a/arch/arm/dts/uniphier-pxs2.dtsi +++ b/arch/arm/dts/uniphier-pxs2.dtsi @@ -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>; diff --git a/arch/arm/dts/uniphier-sld3-ref.dts b/arch/arm/dts/uniphier-sld3-ref.dts index f35500d..01aed3d 100644 --- a/arch/arm/dts/uniphier-sld3-ref.dts +++ b/arch/arm/dts/uniphier-sld3-ref.dts @@ -16,12 +16,6 @@ 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"; }; @@ -36,6 +30,12 @@ i2c3 = &i2c3; i2c4 = &i2c4; }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x20000000 + 0xc0000000 0x20000000>; + }; };

&ethsc { diff --git a/arch/arm/dts/uniphier-sld3.dtsi b/arch/arm/dts/uniphier-sld3.dtsi index 919cbff..7578920 100644 --- a/arch/arm/dts/uniphier-sld3.dtsi +++ b/arch/arm/dts/uniphier-sld3.dtsi @@ -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>; diff --git a/arch/arm/dts/uniphier-sld8-ref.dts b/arch/arm/dts/uniphier-sld8-ref.dts index 6c0544b..3c78997 100644 --- a/arch/arm/dts/uniphier-sld8-ref.dts +++ b/arch/arm/dts/uniphier-sld8-ref.dts @@ -16,11 +16,6 @@ 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"; }; @@ -35,6 +30,11 @@ i2c2 = &i2c2; i2c3 = &i2c3; }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x20000000>; + }; };

&ethsc { diff --git a/arch/arm/dts/uniphier-sld8.dtsi b/arch/arm/dts/uniphier-sld8.dtsi index 5550bb8..4117132 100644 --- a/arch/arm/dts/uniphier-sld8.dtsi +++ b/arch/arm/dts/uniphier-sld8.dtsi @@ -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>;