linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/3] arm,arm64: dts: uniphier: remove skeleton.dtsi inclusion and fix warnings
@ 2017-02-26  5:04 Masahiro Yamada
  2017-02-26  5:04 ` [PATCH 1/3] ARM: dts: uniphier: remove skeleton.dtsi inclusion Masahiro Yamada
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Masahiro Yamada @ 2017-02-26  5:04 UTC (permalink / raw)
  To: linux-arm-kernel
  Cc: Masahiro Yamada, devicetree, Catalin Marinas, linux-kernel,
	Rob Herring, Will Deacon, Mark Rutland, Russell King

  - The inclusion of skeleton.dtsi is deprecated.
    Specify #address-cells and #size-cells explicitly

  - If built with W=1, many warnings are displayed.  Fix them.


Masahiro Yamada (3):
  ARM: dts: uniphier: remove skeleton.dtsi inclusion
  ARM: dts: uniphier: fix no unit name warnings
  arm64: dts: uniphier: fix no unit name warnings

 arch/arm/boot/dts/uniphier-ld4-ref.dts              | 2 +-
 arch/arm/boot/dts/uniphier-ld4.dtsi                 | 4 ++--
 arch/arm/boot/dts/uniphier-ld6b-ref.dts             | 2 +-
 arch/arm/boot/dts/uniphier-pro4-ace.dts             | 2 +-
 arch/arm/boot/dts/uniphier-pro4-ref.dts             | 2 +-
 arch/arm/boot/dts/uniphier-pro4-sanji.dts           | 2 +-
 arch/arm/boot/dts/uniphier-pro4.dtsi                | 4 ++--
 arch/arm/boot/dts/uniphier-pro5.dtsi                | 4 ++--
 arch/arm/boot/dts/uniphier-pxs2-gentil.dts          | 2 +-
 arch/arm/boot/dts/uniphier-pxs2-vodka.dts           | 2 +-
 arch/arm/boot/dts/uniphier-pxs2.dtsi                | 4 ++--
 arch/arm/boot/dts/uniphier-sld3-ref.dts             | 2 +-
 arch/arm/boot/dts/uniphier-sld3.dtsi                | 4 ++--
 arch/arm/boot/dts/uniphier-sld8-ref.dts             | 2 +-
 arch/arm/boot/dts/uniphier-sld8.dtsi                | 4 ++--
 arch/arm/boot/dts/uniphier-support-card.dtsi        | 2 +-
 arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts | 2 +-
 arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi    | 2 +-
 arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 2 +-
 arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi    | 2 +-
 20 files changed, 26 insertions(+), 26 deletions(-)

-- 
2.7.4

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 1/3] ARM: dts: uniphier: remove skeleton.dtsi inclusion
  2017-02-26  5:04 [PATCH 0/3] arm,arm64: dts: uniphier: remove skeleton.dtsi inclusion and fix warnings Masahiro Yamada
@ 2017-02-26  5:04 ` Masahiro Yamada
  2017-02-26  5:04 ` [PATCH 2/3] ARM: dts: uniphier: fix no unit name warnings Masahiro Yamada
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Masahiro Yamada @ 2017-02-26  5:04 UTC (permalink / raw)
  To: linux-arm-kernel
  Cc: Masahiro Yamada, devicetree, linux-kernel, Rob Herring,
	Mark Rutland, Russell King

Commit 9c0da3cc61f1 ("ARM: dts: explicitly mark skeleton.dtsi as
deprecated") declared that skeleton.dtsi was deprecated.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 arch/arm/boot/dts/uniphier-ld4.dtsi  | 4 ++--
 arch/arm/boot/dts/uniphier-pro4.dtsi | 4 ++--
 arch/arm/boot/dts/uniphier-pro5.dtsi | 4 ++--
 arch/arm/boot/dts/uniphier-pxs2.dtsi | 4 ++--
 arch/arm/boot/dts/uniphier-sld3.dtsi | 4 ++--
 arch/arm/boot/dts/uniphier-sld8.dtsi | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/arm/boot/dts/uniphier-ld4.dtsi b/arch/arm/boot/dts/uniphier-ld4.dtsi
index a7c494d..4f5fe15 100644
--- a/arch/arm/boot/dts/uniphier-ld4.dtsi
+++ b/arch/arm/boot/dts/uniphier-ld4.dtsi
@@ -43,10 +43,10 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/include/ "skeleton.dtsi"
-
 / {
 	compatible = "socionext,uniphier-ld4";
+	#address-cells = <1>;
+	#size-cells = <1>;
 
 	cpus {
 		#address-cells = <1>;
diff --git a/arch/arm/boot/dts/uniphier-pro4.dtsi b/arch/arm/boot/dts/uniphier-pro4.dtsi
index e960b09..794a85a 100644
--- a/arch/arm/boot/dts/uniphier-pro4.dtsi
+++ b/arch/arm/boot/dts/uniphier-pro4.dtsi
@@ -43,10 +43,10 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/include/ "skeleton.dtsi"
-
 / {
 	compatible = "socionext,uniphier-pro4";
+	#address-cells = <1>;
+	#size-cells = <1>;
 
 	cpus {
 		#address-cells = <1>;
diff --git a/arch/arm/boot/dts/uniphier-pro5.dtsi b/arch/arm/boot/dts/uniphier-pro5.dtsi
index dbc5e53..df07b55 100644
--- a/arch/arm/boot/dts/uniphier-pro5.dtsi
+++ b/arch/arm/boot/dts/uniphier-pro5.dtsi
@@ -43,10 +43,10 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/include/ "skeleton.dtsi"
-
 / {
 	compatible = "socionext,uniphier-pro5";
+	#address-cells = <1>;
+	#size-cells = <1>;
 
 	cpus {
 		#address-cells = <1>;
diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi
index e9e031d..58c3e2f 100644
--- a/arch/arm/boot/dts/uniphier-pxs2.dtsi
+++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi
@@ -43,10 +43,10 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/include/ "skeleton.dtsi"
-
 / {
 	compatible = "socionext,uniphier-pxs2";
+	#address-cells = <1>;
+	#size-cells = <1>;
 
 	cpus {
 		#address-cells = <1>;
diff --git a/arch/arm/boot/dts/uniphier-sld3.dtsi b/arch/arm/boot/dts/uniphier-sld3.dtsi
index 9fad6bd..01d77ed 100644
--- a/arch/arm/boot/dts/uniphier-sld3.dtsi
+++ b/arch/arm/boot/dts/uniphier-sld3.dtsi
@@ -43,10 +43,10 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/include/ "skeleton.dtsi"
-
 / {
 	compatible = "socionext,uniphier-sld3";
+	#address-cells = <1>;
+	#size-cells = <1>;
 
 	cpus {
 		#address-cells = <1>;
diff --git a/arch/arm/boot/dts/uniphier-sld8.dtsi b/arch/arm/boot/dts/uniphier-sld8.dtsi
index b2c980e..eb06fdc 100644
--- a/arch/arm/boot/dts/uniphier-sld8.dtsi
+++ b/arch/arm/boot/dts/uniphier-sld8.dtsi
@@ -43,10 +43,10 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/include/ "skeleton.dtsi"
-
 / {
 	compatible = "socionext,uniphier-sld8";
+	#address-cells = <1>;
+	#size-cells = <1>;
 
 	cpus {
 		#address-cells = <1>;
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH 2/3] ARM: dts: uniphier: fix no unit name warnings
  2017-02-26  5:04 [PATCH 0/3] arm,arm64: dts: uniphier: remove skeleton.dtsi inclusion and fix warnings Masahiro Yamada
  2017-02-26  5:04 ` [PATCH 1/3] ARM: dts: uniphier: remove skeleton.dtsi inclusion Masahiro Yamada
@ 2017-02-26  5:04 ` Masahiro Yamada
  2017-02-26  5:04 ` [PATCH 3/3] arm64: " Masahiro Yamada
  2017-03-06 20:26 ` [PATCH 0/3] arm,arm64: dts: uniphier: remove skeleton.dtsi inclusion and fix warnings Masahiro Yamada
  3 siblings, 0 replies; 5+ messages in thread
From: Masahiro Yamada @ 2017-02-26  5:04 UTC (permalink / raw)
  To: linux-arm-kernel
  Cc: Masahiro Yamada, devicetree, linux-kernel, Rob Herring,
	Mark Rutland, Russell King

Fix warnings reported when built with W=1:
  Node /memory has a reg or ranges property, but no unit name

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 arch/arm/boot/dts/uniphier-ld4-ref.dts       | 2 +-
 arch/arm/boot/dts/uniphier-ld6b-ref.dts      | 2 +-
 arch/arm/boot/dts/uniphier-pro4-ace.dts      | 2 +-
 arch/arm/boot/dts/uniphier-pro4-ref.dts      | 2 +-
 arch/arm/boot/dts/uniphier-pro4-sanji.dts    | 2 +-
 arch/arm/boot/dts/uniphier-pxs2-gentil.dts   | 2 +-
 arch/arm/boot/dts/uniphier-pxs2-vodka.dts    | 2 +-
 arch/arm/boot/dts/uniphier-sld3-ref.dts      | 2 +-
 arch/arm/boot/dts/uniphier-sld8-ref.dts      | 2 +-
 arch/arm/boot/dts/uniphier-support-card.dtsi | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/arm/boot/dts/uniphier-ld4-ref.dts b/arch/arm/boot/dts/uniphier-ld4-ref.dts
index 110031b..77163b3 100644
--- a/arch/arm/boot/dts/uniphier-ld4-ref.dts
+++ b/arch/arm/boot/dts/uniphier-ld4-ref.dts
@@ -52,7 +52,7 @@
 	model = "UniPhier LD4 Reference Board";
 	compatible = "socionext,uniphier-ld4-ref", "socionext,uniphier-ld4";
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x20000000>;
 	};
diff --git a/arch/arm/boot/dts/uniphier-ld6b-ref.dts b/arch/arm/boot/dts/uniphier-ld6b-ref.dts
index c05d631..467ad6a 100644
--- a/arch/arm/boot/dts/uniphier-ld6b-ref.dts
+++ b/arch/arm/boot/dts/uniphier-ld6b-ref.dts
@@ -52,7 +52,7 @@
 	model = "UniPhier LD6b Reference Board";
 	compatible = "socionext,uniphier-ld6b-ref", "socionext,uniphier-ld6b";
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x80000000>;
 	};
diff --git a/arch/arm/boot/dts/uniphier-pro4-ace.dts b/arch/arm/boot/dts/uniphier-pro4-ace.dts
index 0ab0a40..a10a5fa 100644
--- a/arch/arm/boot/dts/uniphier-pro4-ace.dts
+++ b/arch/arm/boot/dts/uniphier-pro4-ace.dts
@@ -50,7 +50,7 @@
 	model = "UniPhier Pro4 Ace Board";
 	compatible = "socionext,uniphier-pro4-ace", "socionext,uniphier-pro4";
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x40000000>;
 	};
diff --git a/arch/arm/boot/dts/uniphier-pro4-ref.dts b/arch/arm/boot/dts/uniphier-pro4-ref.dts
index 9e92e60..58a2cba 100644
--- a/arch/arm/boot/dts/uniphier-pro4-ref.dts
+++ b/arch/arm/boot/dts/uniphier-pro4-ref.dts
@@ -52,7 +52,7 @@
 	model = "UniPhier Pro4 Reference Board";
 	compatible = "socionext,uniphier-pro4-ref", "socionext,uniphier-pro4";
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x40000000>;
 	};
diff --git a/arch/arm/boot/dts/uniphier-pro4-sanji.dts b/arch/arm/boot/dts/uniphier-pro4-sanji.dts
index dc4ea88..1508eeb 100644
--- a/arch/arm/boot/dts/uniphier-pro4-sanji.dts
+++ b/arch/arm/boot/dts/uniphier-pro4-sanji.dts
@@ -50,7 +50,7 @@
 	model = "UniPhier Pro4 Sanji Board";
 	compatible = "socionext,uniphier-pro4-sanji", "socionext,uniphier-pro4";
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x80000000>;
 	};
diff --git a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
index 373818a..e26ed59 100644
--- a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
+++ b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
@@ -51,7 +51,7 @@
 	compatible = "socionext,uniphier-pxs2-gentil",
 		     "socionext,uniphier-pxs2";
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x80000000>;
 	};
diff --git a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
index 51a3eac..a28e9e4 100644
--- a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
+++ b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
@@ -50,7 +50,7 @@
 	model = "UniPhier PXs2 Vodka Board";
 	compatible = "socionext,uniphier-pxs2-vodka", "socionext,uniphier-pxs2";
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x80000000>;
 	};
diff --git a/arch/arm/boot/dts/uniphier-sld3-ref.dts b/arch/arm/boot/dts/uniphier-sld3-ref.dts
index ac792ae0..827c821 100644
--- a/arch/arm/boot/dts/uniphier-sld3-ref.dts
+++ b/arch/arm/boot/dts/uniphier-sld3-ref.dts
@@ -52,7 +52,7 @@
 	model = "UniPhier sLD3 Reference Board";
 	compatible = "socionext,uniphier-sld3-ref", "socionext,uniphier-sld3";
 
-	memory {
+	memory@8000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x20000000
 		       0xc0000000 0x20000000>;
diff --git a/arch/arm/boot/dts/uniphier-sld8-ref.dts b/arch/arm/boot/dts/uniphier-sld8-ref.dts
index a8291f9..93c3dd9 100644
--- a/arch/arm/boot/dts/uniphier-sld8-ref.dts
+++ b/arch/arm/boot/dts/uniphier-sld8-ref.dts
@@ -52,7 +52,7 @@
 	model = "UniPhier sLD8 Reference Board";
 	compatible = "socionext,uniphier-sld8-ref", "socionext,uniphier-sld8";
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x20000000>;
 	};
diff --git a/arch/arm/boot/dts/uniphier-support-card.dtsi b/arch/arm/boot/dts/uniphier-support-card.dtsi
index 51ecc9b9..22da112 100644
--- a/arch/arm/boot/dts/uniphier-support-card.dtsi
+++ b/arch/arm/boot/dts/uniphier-support-card.dtsi
@@ -46,7 +46,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

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH 3/3] arm64: dts: uniphier: fix no unit name warnings
  2017-02-26  5:04 [PATCH 0/3] arm,arm64: dts: uniphier: remove skeleton.dtsi inclusion and fix warnings Masahiro Yamada
  2017-02-26  5:04 ` [PATCH 1/3] ARM: dts: uniphier: remove skeleton.dtsi inclusion Masahiro Yamada
  2017-02-26  5:04 ` [PATCH 2/3] ARM: dts: uniphier: fix no unit name warnings Masahiro Yamada
@ 2017-02-26  5:04 ` Masahiro Yamada
  2017-03-06 20:26 ` [PATCH 0/3] arm,arm64: dts: uniphier: remove skeleton.dtsi inclusion and fix warnings Masahiro Yamada
  3 siblings, 0 replies; 5+ messages in thread
From: Masahiro Yamada @ 2017-02-26  5:04 UTC (permalink / raw)
  To: linux-arm-kernel
  Cc: Masahiro Yamada, devicetree, linux-kernel, Rob Herring,
	Will Deacon, Mark Rutland, Catalin Marinas

Fix warnings reported when built with W=1:
  Node /memory has a reg or ranges property, but no unit name

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts | 2 +-
 arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi    | 2 +-
 arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 2 +-
 arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts
index 7168cf8..1b96e24 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts
@@ -52,7 +52,7 @@
 	model = "UniPhier LD11 Reference Board";
 	compatible = "socionext,uniphier-ld11-ref", "socionext,uniphier-ld11";
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0 0x80000000 0 0x40000000>;
 	};
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
index da881f5..2ed35e3 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
@@ -140,7 +140,7 @@
 			     <1 10 4>;
 	};
 
-	soc {
+	soc@0 {
 		compatible = "simple-bus";
 		#address-cells = <1>;
 		#size-cells = <1>;
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
index 609162a..8cb0f11 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
@@ -52,7 +52,7 @@
 	model = "UniPhier LD20 Reference Board";
 	compatible = "socionext,uniphier-ld20-ref", "socionext,uniphier-ld20";
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0 0x80000000 0 0xc0000000>;
 	};
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
index a6b3a70..96c053f 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
@@ -209,7 +209,7 @@
 			     <1 10 4>;
 	};
 
-	soc {
+	soc@0 {
 		compatible = "simple-bus";
 		#address-cells = <1>;
 		#size-cells = <1>;
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH 0/3] arm,arm64: dts: uniphier: remove skeleton.dtsi inclusion and fix warnings
  2017-02-26  5:04 [PATCH 0/3] arm,arm64: dts: uniphier: remove skeleton.dtsi inclusion and fix warnings Masahiro Yamada
                   ` (2 preceding siblings ...)
  2017-02-26  5:04 ` [PATCH 3/3] arm64: " Masahiro Yamada
@ 2017-03-06 20:26 ` Masahiro Yamada
  3 siblings, 0 replies; 5+ messages in thread
From: Masahiro Yamada @ 2017-03-06 20:26 UTC (permalink / raw)
  To: linux-arm-kernel
  Cc: Masahiro Yamada, devicetree, Catalin Marinas,
	Linux Kernel Mailing List, Rob Herring, Will Deacon,
	Mark Rutland, Russell King

2017-02-26 14:04 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
>   - The inclusion of skeleton.dtsi is deprecated.
>     Specify #address-cells and #size-cells explicitly
>
>   - If built with W=1, many warnings are displayed.  Fix them.
>
>
> Masahiro Yamada (3):
>   ARM: dts: uniphier: remove skeleton.dtsi inclusion
>   ARM: dts: uniphier: fix no unit name warnings
>   arm64: dts: uniphier: fix no unit name warnings


Series, applied to linux-uniphier.






-- 
Best Regards
Masahiro Yamada

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2017-03-06 20:27 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-26  5:04 [PATCH 0/3] arm,arm64: dts: uniphier: remove skeleton.dtsi inclusion and fix warnings Masahiro Yamada
2017-02-26  5:04 ` [PATCH 1/3] ARM: dts: uniphier: remove skeleton.dtsi inclusion Masahiro Yamada
2017-02-26  5:04 ` [PATCH 2/3] ARM: dts: uniphier: fix no unit name warnings Masahiro Yamada
2017-02-26  5:04 ` [PATCH 3/3] arm64: " Masahiro Yamada
2017-03-06 20:26 ` [PATCH 0/3] arm,arm64: dts: uniphier: remove skeleton.dtsi inclusion and fix warnings Masahiro Yamada

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).