From 7ad79c129108d68d541d17f1820f9558a9a03311 Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Mon, 13 Mar 2017 00:16:40 +0900
Subject: [PATCH] ARM: dts: uniphier: fix no unit name warnings
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>
---
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 | 5 +++--
16 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/arch/arm/dts/uniphier-ld11-ref.dts b/arch/arm/dts/uniphier-ld11-ref.dts
index 7693bf2736..1b5f2d8ee0 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";
- };
};
ðsc {
diff --git a/arch/arm/dts/uniphier-ld11.dtsi b/arch/arm/dts/uniphier-ld11.dtsi
index 38dc1ecfab..8488984669 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 41ee07ebab..9cbd1f2941 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";
- };
};
ðsc {
diff --git a/arch/arm/dts/uniphier-ld20.dtsi b/arch/arm/dts/uniphier-ld20.dtsi
index 7176757ce5..d853526a4b 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 f397a4c8c9..d3177e90b9 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 fdfb533152..7cdc923ae1 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 b9d43159f0..0183df0fdc 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 920fd5468f..a1fbbdc2bc 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 b103ba57f9..11016a4b8d 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 aac478175f..a26d586c76 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 f3816965a3..f296c7d6be 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 27f0cb08b9..cb1eef43c4 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";
- };
};
ðsc {
diff --git a/arch/arm/dts/uniphier-pxs3.dtsi b/arch/arm/dts/uniphier-pxs3.dtsi
index 3b30eeff3f..76b656652c 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 01aed3d68f..907448a0d6 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 3c78997dab..99a284ad43 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 be0f1d694d..924f2296e6 100644
--- a/arch/arm/dts/uniphier-support-card.dtsi
+++ b/arch/arm/dts/uniphier-support-card.dtsi
@@ -1,7 +1,8 @@
/*
* Device Tree Source for UniPhier Support Card (Expansion Board)
*
- * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2015-2017 Socionext Inc.
+ * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*
* SPDX-License-Identifier: GPL-2.0+ X11
*/
@@ -10,7 +11,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.39.5