[U-Boot] [PATCH v2 2/3] ARM: dts: uniphier: fix no unit name warnings

12 Mar 2017

Fix warnings reported when built with W=1, by DTC 1.4.2 or later:
  Node /memory has a reg or ranges property, but no unit name
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
---
Changes in v2:
  - Adjust comments to the recent change of build system
arch/arm/dts/uniphier-ld11-ref.dts      | 10 +++++-----
 arch/arm/dts/uniphier-ld11.dtsi         |  2 +-
 arch/arm/dts/uniphier-ld20-ref.dts      | 10 +++++-----
 arch/arm/dts/uniphier-ld20.dtsi         |  2 +-
 arch/arm/dts/uniphier-ld4-ref.dts       |  2 +-
 arch/arm/dts/uniphier-ld6b-ref.dts      |  2 +-
 arch/arm/dts/uniphier-pro4-ace.dts      |  2 +-
 arch/arm/dts/uniphier-pro4-ref.dts      |  2 +-
 arch/arm/dts/uniphier-pro4-sanji.dts    |  2 +-
 arch/arm/dts/uniphier-pxs2-gentil.dts   |  2 +-
 arch/arm/dts/uniphier-pxs2-vodka.dts    |  2 +-
 arch/arm/dts/uniphier-pxs3-ref.dts      | 10 +++++-----
 arch/arm/dts/uniphier-pxs3.dtsi         |  2 +-
 arch/arm/dts/uniphier-sld3-ref.dts      |  2 +-
 arch/arm/dts/uniphier-sld8-ref.dts      |  2 +-
 arch/arm/dts/uniphier-support-card.dtsi |  2 +-
 16 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/arch/arm/dts/uniphier-ld11-ref.dts b/arch/arm/dts/uniphier-ld11-ref.dts
index 7693bf2..1b5f2d8 100644
--- a/arch/arm/dts/uniphier-ld11-ref.dts
+++ b/arch/arm/dts/uniphier-ld11-ref.dts
@@ -16,6 +16,10 @@
    model = "UniPhier LD11 Reference Board";
    compatible = "socionext,uniphier-ld11-ref", "socionext,uniphier-ld11";
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
    aliases {
    	serial0 = &serial0;
    	serial1 = &serial1;
@@ -29,14 +33,10 @@
    	i2c5 = &i2c5;
    };
-	memory {
+	memory@80000000 {
    	device_type = "memory";
    	reg = <0 0x80000000 0 0x40000000>;
    };
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
 };
&ethsc {
diff --git a/arch/arm/dts/uniphier-ld11.dtsi b/arch/arm/dts/uniphier-ld11.dtsi
index 38dc1ec..8488984 100644
--- a/arch/arm/dts/uniphier-ld11.dtsi
+++ b/arch/arm/dts/uniphier-ld11.dtsi
@@ -104,7 +104,7 @@
    		     <1 10 4>;
    };
-	soc {
+	soc@0 {
    	compatible = "simple-bus";
    	#address-cells = <1>;
    	#size-cells = <1>;
diff --git a/arch/arm/dts/uniphier-ld20-ref.dts b/arch/arm/dts/uniphier-ld20-ref.dts
index 41ee07e..9cbd1f2 100644
--- a/arch/arm/dts/uniphier-ld20-ref.dts
+++ b/arch/arm/dts/uniphier-ld20-ref.dts
@@ -16,6 +16,10 @@
    model = "UniPhier LD20 Reference Board";
    compatible = "socionext,uniphier-ld20-ref", "socionext,uniphier-ld20";
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
    aliases {
    	serial0 = &serial0;
    	serial1 = &serial1;
@@ -29,14 +33,10 @@
    	i2c5 = &i2c5;
    };
-	memory {
+	memory@80000000 {
    	device_type = "memory";
    	reg = <0 0x80000000 0 0xc0000000>;
    };
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
 };
&ethsc {
diff --git a/arch/arm/dts/uniphier-ld20.dtsi b/arch/arm/dts/uniphier-ld20.dtsi
index 7176757..d853526 100644
--- a/arch/arm/dts/uniphier-ld20.dtsi
+++ b/arch/arm/dts/uniphier-ld20.dtsi
@@ -173,7 +173,7 @@
    		     <1 10 4>;
    };
-	soc {
+	soc@0 {
    	compatible = "simple-bus";
    	#address-cells = <1>;
    	#size-cells = <1>;
diff --git a/arch/arm/dts/uniphier-ld4-ref.dts b/arch/arm/dts/uniphier-ld4-ref.dts
index f397a4c..d3177e9 100644
--- a/arch/arm/dts/uniphier-ld4-ref.dts
+++ b/arch/arm/dts/uniphier-ld4-ref.dts
@@ -31,7 +31,7 @@
    	i2c3 = &i2c3;
    };
-	memory {
+	memory@80000000 {
    	device_type = "memory";
    	reg = <0x80000000 0x20000000>;
    };
diff --git a/arch/arm/dts/uniphier-ld6b-ref.dts b/arch/arm/dts/uniphier-ld6b-ref.dts
index fdfb533..7cdc923 100644
--- a/arch/arm/dts/uniphier-ld6b-ref.dts
+++ b/arch/arm/dts/uniphier-ld6b-ref.dts
@@ -33,7 +33,7 @@
    	i2c6 = &i2c6;
    };
-	memory {
+	memory@80000000 {
    	device_type = "memory";
    	reg = <0x80000000 0x80000000>;
    };
diff --git a/arch/arm/dts/uniphier-pro4-ace.dts b/arch/arm/dts/uniphier-pro4-ace.dts
index b9d4315..0183df0 100644
--- a/arch/arm/dts/uniphier-pro4-ace.dts
+++ b/arch/arm/dts/uniphier-pro4-ace.dts
@@ -30,7 +30,7 @@
    	i2c6 = &i2c6;
    };
-	memory {
+	memory@80000000 {
    	device_type = "memory";
    	reg = <0x80000000 0x40000000>;
    };
diff --git a/arch/arm/dts/uniphier-pro4-ref.dts b/arch/arm/dts/uniphier-pro4-ref.dts
index 920fd54..a1fbbdc 100644
--- a/arch/arm/dts/uniphier-pro4-ref.dts
+++ b/arch/arm/dts/uniphier-pro4-ref.dts
@@ -34,7 +34,7 @@
    	usb0 = &usb0;
    };
-	memory {
+	memory@80000000 {
    	device_type = "memory";
    	reg = <0x80000000 0x40000000>;
    };
diff --git a/arch/arm/dts/uniphier-pro4-sanji.dts b/arch/arm/dts/uniphier-pro4-sanji.dts
index b103ba5..11016a4 100644
--- a/arch/arm/dts/uniphier-pro4-sanji.dts
+++ b/arch/arm/dts/uniphier-pro4-sanji.dts
@@ -29,7 +29,7 @@
    	i2c6 = &i2c6;
    };
-	memory {
+	memory@80000000 {
    	device_type = "memory";
    	reg = <0x80000000 0x80000000>;
    };
diff --git a/arch/arm/dts/uniphier-pxs2-gentil.dts b/arch/arm/dts/uniphier-pxs2-gentil.dts
index aac4781..a26d586 100644
--- a/arch/arm/dts/uniphier-pxs2-gentil.dts
+++ b/arch/arm/dts/uniphier-pxs2-gentil.dts
@@ -30,7 +30,7 @@
    	i2c6 = &i2c6;
    };
-	memory {
+	memory@80000000 {
    	device_type = "memory";
    	reg = <0x80000000 0x80000000>;
    };
diff --git a/arch/arm/dts/uniphier-pxs2-vodka.dts b/arch/arm/dts/uniphier-pxs2-vodka.dts
index f381696..f296c7d 100644
--- a/arch/arm/dts/uniphier-pxs2-vodka.dts
+++ b/arch/arm/dts/uniphier-pxs2-vodka.dts
@@ -28,7 +28,7 @@
    	i2c6 = &i2c6;
    };
-	memory {
+	memory@80000000 {
    	device_type = "memory";
    	reg = <0x80000000 0x80000000>;
    };
diff --git a/arch/arm/dts/uniphier-pxs3-ref.dts b/arch/arm/dts/uniphier-pxs3-ref.dts
index 27f0cb0..cb1eef4 100644
--- a/arch/arm/dts/uniphier-pxs3-ref.dts
+++ b/arch/arm/dts/uniphier-pxs3-ref.dts
@@ -16,6 +16,10 @@
    model = "UniPhier PXs3 Reference Board";
    compatible = "socionext,uniphier-pxs3-ref", "socionext,uniphier-pxs3";
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
    aliases {
    	serial0 = &serial0;
    	serial1 = &serial1;
@@ -28,14 +32,10 @@
    	i2c6 = &i2c6;
    };
-	memory {
+	memory@80000000 {
    	device_type = "memory";
    	reg = <0 0x80000000 0 0xa0000000>;
    };
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
 };
&ethsc {
diff --git a/arch/arm/dts/uniphier-pxs3.dtsi b/arch/arm/dts/uniphier-pxs3.dtsi
index 3b30eef..76b6566 100644
--- a/arch/arm/dts/uniphier-pxs3.dtsi
+++ b/arch/arm/dts/uniphier-pxs3.dtsi
@@ -86,7 +86,7 @@
    		     <1 10 4>;
    };
-	soc {
+	soc@0 {
    	compatible = "simple-bus";
    	#address-cells = <1>;
    	#size-cells = <1>;
diff --git a/arch/arm/dts/uniphier-sld3-ref.dts b/arch/arm/dts/uniphier-sld3-ref.dts
index 01aed3d..907448a 100644
--- a/arch/arm/dts/uniphier-sld3-ref.dts
+++ b/arch/arm/dts/uniphier-sld3-ref.dts
@@ -31,7 +31,7 @@
    	i2c4 = &i2c4;
    };
-	memory {
+	memory@8000000 {
    	device_type = "memory";
    	reg = <0x80000000 0x20000000
    	       0xc0000000 0x20000000>;
diff --git a/arch/arm/dts/uniphier-sld8-ref.dts b/arch/arm/dts/uniphier-sld8-ref.dts
index 3c78997..99a284a 100644
--- a/arch/arm/dts/uniphier-sld8-ref.dts
+++ b/arch/arm/dts/uniphier-sld8-ref.dts
@@ -31,7 +31,7 @@
    	i2c3 = &i2c3;
    };
-	memory {
+	memory@80000000 {
    	device_type = "memory";
    	reg = <0x80000000 0x20000000>;
    };
diff --git a/arch/arm/dts/uniphier-support-card.dtsi b/arch/arm/dts/uniphier-support-card.dtsi
index be0f1d6..58a853c 100644
--- a/arch/arm/dts/uniphier-support-card.dtsi
+++ b/arch/arm/dts/uniphier-support-card.dtsi
@@ -10,7 +10,7 @@
    status = "okay";
    ranges = <1 0x00000000 0x42000000 0x02000000>;
-	support_card: support_card {
+	support_card: support_card@1,1f00000 {
    	compatible = "simple-bus";
    	#address-cells = <1>;
    	#size-cells = <1>;
-- 
2.7.4


    