linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/8] ARM: dts: rockchip: Remove skeleton.dtsi usage and fix memory node DTC warnings
@ 2016-09-09 14:01 Javier Martinez Canillas
  2016-09-09 14:01 ` [PATCH 1/8] ARM: dts: rockchip: Remove skeleton.dtsi inclusion in rk3036.dtsi Javier Martinez Canillas
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: Javier Martinez Canillas @ 2016-09-09 14:01 UTC (permalink / raw)
  To: linux-arm-kernel

Hello Heiko,

This series removes the inclusion of the skeleton.dtsi in all the Rockchip
dts, which allows to get rid of the DTC warnings about a mismatch between
the memory nodes' unit names and reg properties.

Patches are pretty trivial and shouldn't cause functional changes AFAIK,
but were only built tested and dtbs compared with scripts/dtc/dtx_diff.

Best regards,
Javier


Javier Martinez Canillas (8):
  ARM: dts: rockchip: Remove skeleton.dtsi inclusion in rk3036.dtsi
  ARM: dts: rockchip: Remove skeleton.dtsi inclusion in rk322x.dtsi
  ARM: dts: rockchip: Remove skeleton.dtsi inclusion in rk3288.dtsi
  ARM: dts: rockchip: Remove skeleton.dtsi inclusion in rk3xxx.dtsi
  ARM: dts: rockchip: Add missing unit name to memory nodes in rk3036
    boards
  ARM: dts: rockchip: Add missing unit name to memory nodes in rk322x
    boards
  ARM: dts: rockchip: Add missing unit name to memory nodes in rk3288
    boards
  ARM: dts: rockchip: Add missing unit name to memory nodes in rk3xxx
    boards

 arch/arm/boot/dts/rk3036-evb.dts                  | 2 +-
 arch/arm/boot/dts/rk3036-kylin.dts                | 2 +-
 arch/arm/boot/dts/rk3036.dtsi                     | 4 +++-
 arch/arm/boot/dts/rk3066a-bqcurie2.dts            | 2 +-
 arch/arm/boot/dts/rk3066a-marsboard.dts           | 2 +-
 arch/arm/boot/dts/rk3066a-rayeager.dts            | 2 +-
 arch/arm/boot/dts/rk3188-radxarock.dts            | 2 +-
 arch/arm/boot/dts/rk3228-evb.dts                  | 2 +-
 arch/arm/boot/dts/rk3229-evb.dts                  | 2 +-
 arch/arm/boot/dts/rk322x.dtsi                     | 4 +++-
 arch/arm/boot/dts/rk3288-evb.dtsi                 | 2 +-
 arch/arm/boot/dts/rk3288-fennec.dts               | 2 +-
 arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 2 +-
 arch/arm/boot/dts/rk3288-firefly.dtsi             | 2 +-
 arch/arm/boot/dts/rk3288-miqi.dts                 | 2 +-
 arch/arm/boot/dts/rk3288-popmetal.dts             | 2 +-
 arch/arm/boot/dts/rk3288-r89.dts                  | 2 +-
 arch/arm/boot/dts/rk3288-rock2-som.dtsi           | 2 +-
 arch/arm/boot/dts/rk3288-veyron.dtsi              | 2 +-
 arch/arm/boot/dts/rk3288.dtsi                     | 4 +++-
 arch/arm/boot/dts/rk3xxx.dtsi                     | 4 +++-
 21 files changed, 29 insertions(+), 21 deletions(-)

-- 
2.7.4

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

* [PATCH 1/8] ARM: dts: rockchip: Remove skeleton.dtsi inclusion in rk3036.dtsi
  2016-09-09 14:01 [PATCH 0/8] ARM: dts: rockchip: Remove skeleton.dtsi usage and fix memory node DTC warnings Javier Martinez Canillas
@ 2016-09-09 14:01 ` Javier Martinez Canillas
  2016-09-09 14:01 ` [PATCH 2/8] ARM: dts: rockchip: Remove skeleton.dtsi inclusion in rk322x.dtsi Javier Martinez Canillas
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: Javier Martinez Canillas @ 2016-09-09 14:01 UTC (permalink / raw)
  To: linux-arm-kernel

The skeleton.dtsi file was removed in ARM64 for different reasons as
explained in commit ("3ebee5a2e141 arm64: dts: kill skeleton.dtsi").

These also applies to ARM and it will also allow to get rid of the
following DTC warnings in the future:

"Node /memory has a reg or ranges property, but no unit name"

The disassembled DTB are almost the same, besides empty chosen nodes
being removed. So the change should not have a functional impact.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

 arch/arm/boot/dts/rk3036.dtsi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index a935523a1eb8..81691ae50199 100644
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -44,9 +44,11 @@
 #include <dt-bindings/pinctrl/rockchip.h>
 #include <dt-bindings/clock/rk3036-cru.h>
 #include <dt-bindings/soc/rockchip,boot-mode.h>
-#include "skeleton.dtsi"
 
 / {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
 	compatible = "rockchip,rk3036";
 
 	interrupt-parent = <&gic>;
-- 
2.7.4

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

* [PATCH 2/8] ARM: dts: rockchip: Remove skeleton.dtsi inclusion in rk322x.dtsi
  2016-09-09 14:01 [PATCH 0/8] ARM: dts: rockchip: Remove skeleton.dtsi usage and fix memory node DTC warnings Javier Martinez Canillas
  2016-09-09 14:01 ` [PATCH 1/8] ARM: dts: rockchip: Remove skeleton.dtsi inclusion in rk3036.dtsi Javier Martinez Canillas
@ 2016-09-09 14:01 ` Javier Martinez Canillas
  2016-09-09 14:01 ` [PATCH 3/8] ARM: dts: rockchip: Remove skeleton.dtsi inclusion in rk3288.dtsi Javier Martinez Canillas
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: Javier Martinez Canillas @ 2016-09-09 14:01 UTC (permalink / raw)
  To: linux-arm-kernel

The skeleton.dtsi file was removed in ARM64 for different reasons as
explained in commit ("3ebee5a2e141 arm64: dts: kill skeleton.dtsi").

These also applies to ARM and it will also allow to get rid of the
following DTC warnings in the future:

"Node /memory has a reg or ranges property, but no unit name"

The disassembled DTB are almost the same, besides empty chosen nodes
being removed. So the change should not have a functional impact.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

 arch/arm/boot/dts/rk322x.dtsi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
index 9e6bf0e311bb..6ea8126d7a5f 100644
--- a/arch/arm/boot/dts/rk322x.dtsi
+++ b/arch/arm/boot/dts/rk322x.dtsi
@@ -44,9 +44,11 @@
 #include <dt-bindings/pinctrl/rockchip.h>
 #include <dt-bindings/clock/rk3228-cru.h>
 #include <dt-bindings/thermal/thermal.h>
-#include "skeleton.dtsi"
 
 / {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
 	interrupt-parent = <&gic>;
 
 	aliases {
-- 
2.7.4

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

* [PATCH 3/8] ARM: dts: rockchip: Remove skeleton.dtsi inclusion in rk3288.dtsi
  2016-09-09 14:01 [PATCH 0/8] ARM: dts: rockchip: Remove skeleton.dtsi usage and fix memory node DTC warnings Javier Martinez Canillas
  2016-09-09 14:01 ` [PATCH 1/8] ARM: dts: rockchip: Remove skeleton.dtsi inclusion in rk3036.dtsi Javier Martinez Canillas
  2016-09-09 14:01 ` [PATCH 2/8] ARM: dts: rockchip: Remove skeleton.dtsi inclusion in rk322x.dtsi Javier Martinez Canillas
@ 2016-09-09 14:01 ` Javier Martinez Canillas
  2016-09-09 14:01 ` [PATCH 4/8] ARM: dts: rockchip: Remove skeleton.dtsi inclusion in rk3xxx.dtsi Javier Martinez Canillas
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: Javier Martinez Canillas @ 2016-09-09 14:01 UTC (permalink / raw)
  To: linux-arm-kernel

The skeleton.dtsi file was removed in ARM64 for different reasons as
explained in commit ("3ebee5a2e141 arm64: dts: kill skeleton.dtsi").

These also applies to ARM and it will also allow to get rid of the
following DTC warnings in the future:

"Node /memory has a reg or ranges property, but no unit name"

The disassembled DTB are almost the same, besides empty chosen nodes
being removed. So the change should not have a functional impact.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

 arch/arm/boot/dts/rk3288.dtsi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 17ec2e2d7a60..2cf1eb2e6202 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -46,9 +46,11 @@
 #include <dt-bindings/thermal/thermal.h>
 #include <dt-bindings/power/rk3288-power.h>
 #include <dt-bindings/soc/rockchip,boot-mode.h>
-#include "skeleton.dtsi"
 
 / {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
 	compatible = "rockchip,rk3288";
 
 	interrupt-parent = <&gic>;
-- 
2.7.4

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

* [PATCH 4/8] ARM: dts: rockchip: Remove skeleton.dtsi inclusion in rk3xxx.dtsi
  2016-09-09 14:01 [PATCH 0/8] ARM: dts: rockchip: Remove skeleton.dtsi usage and fix memory node DTC warnings Javier Martinez Canillas
                   ` (2 preceding siblings ...)
  2016-09-09 14:01 ` [PATCH 3/8] ARM: dts: rockchip: Remove skeleton.dtsi inclusion in rk3288.dtsi Javier Martinez Canillas
@ 2016-09-09 14:01 ` Javier Martinez Canillas
  2016-09-09 14:01 ` [PATCH 5/8] ARM: dts: rockchip: Add missing unit name to memory nodes in rk3036 boards Javier Martinez Canillas
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: Javier Martinez Canillas @ 2016-09-09 14:01 UTC (permalink / raw)
  To: linux-arm-kernel

The skeleton.dtsi file was removed in ARM64 for different reasons as
explained in commit ("3ebee5a2e141 arm64: dts: kill skeleton.dtsi").

These also applies to ARM and it will also allow to get rid of the
following DTC warnings in the future:

"Node /memory has a reg or ranges property, but no unit name"

The disassembled DTB are almost the same, besides empty chosen nodes
being removed. So the change should not have a functional impact.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

 arch/arm/boot/dts/rk3xxx.dtsi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi
index e15beb3c671e..0394312f392d 100644
--- a/arch/arm/boot/dts/rk3xxx.dtsi
+++ b/arch/arm/boot/dts/rk3xxx.dtsi
@@ -44,9 +44,11 @@
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/soc/rockchip,boot-mode.h>
-#include "skeleton.dtsi"
 
 / {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
 	interrupt-parent = <&gic>;
 
 	aliases {
-- 
2.7.4

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

* [PATCH 5/8] ARM: dts: rockchip: Add missing unit name to memory nodes in rk3036 boards
  2016-09-09 14:01 [PATCH 0/8] ARM: dts: rockchip: Remove skeleton.dtsi usage and fix memory node DTC warnings Javier Martinez Canillas
                   ` (3 preceding siblings ...)
  2016-09-09 14:01 ` [PATCH 4/8] ARM: dts: rockchip: Remove skeleton.dtsi inclusion in rk3xxx.dtsi Javier Martinez Canillas
@ 2016-09-09 14:01 ` Javier Martinez Canillas
  2016-09-09 14:01 ` [PATCH 6/8] ARM: dts: rockchip: Add missing unit name to memory nodes in rk322x boards Javier Martinez Canillas
                   ` (3 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: Javier Martinez Canillas @ 2016-09-09 14:01 UTC (permalink / raw)
  To: linux-arm-kernel

This patch fixes the following DTC warnings:

"Node /memory has a reg or ranges property, but no unit name"

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

 arch/arm/boot/dts/rk3036-evb.dts   | 2 +-
 arch/arm/boot/dts/rk3036-kylin.dts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/rk3036-evb.dts b/arch/arm/boot/dts/rk3036-evb.dts
index 8db9e9b197a2..2f5f15524fba 100644
--- a/arch/arm/boot/dts/rk3036-evb.dts
+++ b/arch/arm/boot/dts/rk3036-evb.dts
@@ -46,7 +46,7 @@
 	model = "Rockchip RK3036 Evaluation board";
 	compatible = "rockchip,rk3036-evb", "rockchip,rk3036";
 
-	memory {
+	memory at 60000000 {
 		device_type = "memory";
 		reg = <0x60000000 0x40000000>;
 	};
diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts
index 1df1557a46c3..3de958ec29c0 100644
--- a/arch/arm/boot/dts/rk3036-kylin.dts
+++ b/arch/arm/boot/dts/rk3036-kylin.dts
@@ -46,7 +46,7 @@
 	model = "Rockchip RK3036 KylinBoard";
 	compatible = "rockchip,rk3036-kylin", "rockchip,rk3036";
 
-	memory {
+	memory at 60000000 {
 		device_type = "memory";
 		reg = <0x60000000 0x20000000>;
 	};
-- 
2.7.4

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

* [PATCH 6/8] ARM: dts: rockchip: Add missing unit name to memory nodes in rk322x boards
  2016-09-09 14:01 [PATCH 0/8] ARM: dts: rockchip: Remove skeleton.dtsi usage and fix memory node DTC warnings Javier Martinez Canillas
                   ` (4 preceding siblings ...)
  2016-09-09 14:01 ` [PATCH 5/8] ARM: dts: rockchip: Add missing unit name to memory nodes in rk3036 boards Javier Martinez Canillas
@ 2016-09-09 14:01 ` Javier Martinez Canillas
  2016-09-09 14:01 ` [PATCH 7/8] ARM: dts: rockchip: Add missing unit name to memory nodes in rk3288 boards Javier Martinez Canillas
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: Javier Martinez Canillas @ 2016-09-09 14:01 UTC (permalink / raw)
  To: linux-arm-kernel

This patch fixes the following DTC warnings:

"Node /memory has a reg or ranges property, but no unit name"

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

 arch/arm/boot/dts/rk3228-evb.dts | 2 +-
 arch/arm/boot/dts/rk3229-evb.dts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/rk3228-evb.dts b/arch/arm/boot/dts/rk3228-evb.dts
index 904668e2e666..58834330a5ba 100644
--- a/arch/arm/boot/dts/rk3228-evb.dts
+++ b/arch/arm/boot/dts/rk3228-evb.dts
@@ -46,7 +46,7 @@
 	model = "Rockchip RK3228 Evaluation board";
 	compatible = "rockchip,rk3228-evb", "rockchip,rk3228";
 
-	memory {
+	memory at 60000000 {
 		device_type = "memory";
 		reg = <0x60000000 0x40000000>;
 	};
diff --git a/arch/arm/boot/dts/rk3229-evb.dts b/arch/arm/boot/dts/rk3229-evb.dts
index b6a12035a6bb..dcdd0cee619e 100644
--- a/arch/arm/boot/dts/rk3229-evb.dts
+++ b/arch/arm/boot/dts/rk3229-evb.dts
@@ -46,7 +46,7 @@
 	model = "Rockchip RK3229 Evaluation board";
 	compatible = "rockchip,rk3229-evb", "rockchip,rk3229";
 
-	memory {
+	memory at 60000000 {
 		device_type = "memory";
 		reg = <0x60000000 0x40000000>;
 	};
-- 
2.7.4

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

* [PATCH 7/8] ARM: dts: rockchip: Add missing unit name to memory nodes in rk3288 boards
  2016-09-09 14:01 [PATCH 0/8] ARM: dts: rockchip: Remove skeleton.dtsi usage and fix memory node DTC warnings Javier Martinez Canillas
                   ` (5 preceding siblings ...)
  2016-09-09 14:01 ` [PATCH 6/8] ARM: dts: rockchip: Add missing unit name to memory nodes in rk322x boards Javier Martinez Canillas
@ 2016-09-09 14:01 ` Javier Martinez Canillas
  2016-09-09 14:01 ` [PATCH 8/8] ARM: dts: rockchip: Add missing unit name to memory nodes in rk3xxx boards Javier Martinez Canillas
  2016-09-10 21:51 ` [PATCH 0/8] ARM: dts: rockchip: Remove skeleton.dtsi usage and fix memory node DTC warnings Heiko Stuebner
  8 siblings, 0 replies; 10+ messages in thread
From: Javier Martinez Canillas @ 2016-09-09 14:01 UTC (permalink / raw)
  To: linux-arm-kernel

This patch fixes the following DTC warnings:

"Node /memory has a reg or ranges property, but no unit name"

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

 arch/arm/boot/dts/rk3288-evb.dtsi                 | 2 +-
 arch/arm/boot/dts/rk3288-fennec.dts               | 2 +-
 arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 2 +-
 arch/arm/boot/dts/rk3288-firefly.dtsi             | 2 +-
 arch/arm/boot/dts/rk3288-miqi.dts                 | 2 +-
 arch/arm/boot/dts/rk3288-popmetal.dts             | 2 +-
 arch/arm/boot/dts/rk3288-r89.dts                  | 2 +-
 arch/arm/boot/dts/rk3288-rock2-som.dtsi           | 2 +-
 arch/arm/boot/dts/rk3288-veyron.dtsi              | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi
index d59208b5eb6c..bf7ccfad3260 100644
--- a/arch/arm/boot/dts/rk3288-evb.dtsi
+++ b/arch/arm/boot/dts/rk3288-evb.dtsi
@@ -43,7 +43,7 @@
 #include "rk3288.dtsi"
 
 / {
-	memory {
+	memory at 0 {
 		device_type = "memory";
 		reg = <0x0 0x80000000>;
 	};
diff --git a/arch/arm/boot/dts/rk3288-fennec.dts b/arch/arm/boot/dts/rk3288-fennec.dts
index 2e3c34135ed8..805c0d26770b 100644
--- a/arch/arm/boot/dts/rk3288-fennec.dts
+++ b/arch/arm/boot/dts/rk3288-fennec.dts
@@ -46,7 +46,7 @@
 	model = "Rockchip RK3288 Fennec Board";
 	compatible = "rockchip,rk3288-fennec", "rockchip,rk3288";
 
-	memory {
+	memory at 0 {
 		reg = <0x0 0x80000000>;
 		device_type = "memory";
 	};
diff --git a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
index ec418c99de95..d242588bae0d 100644
--- a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
@@ -45,7 +45,7 @@
 #include "rk3288.dtsi"
 
 / {
-	memory {
+	memory at 0 {
 		device_type = "memory";
 		reg = <0 0x80000000>;
 	};
diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi
index 114c90fb65e2..44935af1fb0e 100644
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -44,7 +44,7 @@
 #include "rk3288.dtsi"
 
 / {
-	memory {
+	memory at 0 {
 		device_type = "memory";
 		reg = <0 0x80000000>;
 	};
diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
index 24488421f0f0..441d450fd151 100644
--- a/arch/arm/boot/dts/rk3288-miqi.dts
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
@@ -52,7 +52,7 @@
 		stdout-path = "serial2:115200n8";
 	};
 
-	memory {
+	memory at 0 {
 		device_type = "memory";
 		reg = <0 0x80000000>;
 	};
diff --git a/arch/arm/boot/dts/rk3288-popmetal.dts b/arch/arm/boot/dts/rk3288-popmetal.dts
index 56dd377d5658..23003a221234 100644
--- a/arch/arm/boot/dts/rk3288-popmetal.dts
+++ b/arch/arm/boot/dts/rk3288-popmetal.dts
@@ -48,7 +48,7 @@
 	model = "PopMetal-RK3288";
 	compatible = "chipspark,popmetal-rk3288", "rockchip,rk3288";
 
-	memory{
+	memory at 0 {
 		device_type = "memory";
 		reg = <0 0x80000000>;
 	};
diff --git a/arch/arm/boot/dts/rk3288-r89.dts b/arch/arm/boot/dts/rk3288-r89.dts
index 4b8a8adb243c..04faa72dbd95 100644
--- a/arch/arm/boot/dts/rk3288-r89.dts
+++ b/arch/arm/boot/dts/rk3288-r89.dts
@@ -48,7 +48,7 @@
 / {
 	compatible = "netxeon,r89", "rockchip,rk3288";
 
-	memory {
+	memory at 0 {
 		device_type = "memory";
 		reg = <0x0 0x80000000>;
 	};
diff --git a/arch/arm/boot/dts/rk3288-rock2-som.dtsi b/arch/arm/boot/dts/rk3288-rock2-som.dtsi
index bb1f01e037ba..b25ba806d5ee 100644
--- a/arch/arm/boot/dts/rk3288-rock2-som.dtsi
+++ b/arch/arm/boot/dts/rk3288-rock2-som.dtsi
@@ -42,7 +42,7 @@
 #include "rk3288.dtsi"
 
 / {
-	memory {
+	memory at 0 {
 		reg = <0x0 0x80000000>;
 		device_type = "memory";
 	};
diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi
index 3dd2cca48c11..2251d28e9d2a 100644
--- a/arch/arm/boot/dts/rk3288-veyron.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
@@ -47,7 +47,7 @@
 #include "rk3288.dtsi"
 
 / {
-	memory {
+	memory at 0 {
 		device_type = "memory";
 		reg = <0x0 0x80000000>;
 	};
-- 
2.7.4

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

* [PATCH 8/8] ARM: dts: rockchip: Add missing unit name to memory nodes in rk3xxx boards
  2016-09-09 14:01 [PATCH 0/8] ARM: dts: rockchip: Remove skeleton.dtsi usage and fix memory node DTC warnings Javier Martinez Canillas
                   ` (6 preceding siblings ...)
  2016-09-09 14:01 ` [PATCH 7/8] ARM: dts: rockchip: Add missing unit name to memory nodes in rk3288 boards Javier Martinez Canillas
@ 2016-09-09 14:01 ` Javier Martinez Canillas
  2016-09-10 21:51 ` [PATCH 0/8] ARM: dts: rockchip: Remove skeleton.dtsi usage and fix memory node DTC warnings Heiko Stuebner
  8 siblings, 0 replies; 10+ messages in thread
From: Javier Martinez Canillas @ 2016-09-09 14:01 UTC (permalink / raw)
  To: linux-arm-kernel

This patch fixes the following DTC warnings:

"Node /memory has a reg or ranges property, but no unit name"

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>

---

 arch/arm/boot/dts/rk3066a-bqcurie2.dts  | 2 +-
 arch/arm/boot/dts/rk3066a-marsboard.dts | 2 +-
 arch/arm/boot/dts/rk3066a-rayeager.dts  | 2 +-
 arch/arm/boot/dts/rk3188-radxarock.dts  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
index bc674ee206ec..c0d8b5446ba7 100644
--- a/arch/arm/boot/dts/rk3066a-bqcurie2.dts
+++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
@@ -49,7 +49,7 @@
 	model = "bq Curie 2";
 	compatible = "mundoreader,bq-curie2", "rockchip,rk3066a";
 
-	memory {
+	memory at 60000000 {
 		device_type = "memory";
 		reg = <0x60000000 0x40000000>;
 	};
diff --git a/arch/arm/boot/dts/rk3066a-marsboard.dts b/arch/arm/boot/dts/rk3066a-marsboard.dts
index a2b763e949b4..0a54c4beff8d 100644
--- a/arch/arm/boot/dts/rk3066a-marsboard.dts
+++ b/arch/arm/boot/dts/rk3066a-marsboard.dts
@@ -47,7 +47,7 @@
 	model = "MarsBoard RK3066";
 	compatible = "haoyu,marsboard-rk3066", "rockchip,rk3066a";
 
-	memory {
+	memory at 60000000 {
 		device_type = "memory";
 		reg = <0x60000000 0x40000000>;
 	};
diff --git a/arch/arm/boot/dts/rk3066a-rayeager.dts b/arch/arm/boot/dts/rk3066a-rayeager.dts
index 6e7f2187a0e3..82465b644443 100644
--- a/arch/arm/boot/dts/rk3066a-rayeager.dts
+++ b/arch/arm/boot/dts/rk3066a-rayeager.dts
@@ -48,7 +48,7 @@
 	model = "Rayeager PX2";
 	compatible = "chipspark,rayeager-px2", "rockchip,rk3066a";
 
-	memory {
+	memory at 60000000 {
 		device_type = "memory";
 		reg = <0x60000000 0x40000000>;
 	};
diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts
index 1da46d138029..5e8a235ed02d 100644
--- a/arch/arm/boot/dts/rk3188-radxarock.dts
+++ b/arch/arm/boot/dts/rk3188-radxarock.dts
@@ -48,7 +48,7 @@
 	model = "Radxa Rock";
 	compatible = "radxa,rock", "rockchip,rk3188";
 
-	memory {
+	memory at 60000000 {
 		device_type = "memory";
 		reg = <0x60000000 0x80000000>;
 	};
-- 
2.7.4

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

* [PATCH 0/8] ARM: dts: rockchip: Remove skeleton.dtsi usage and fix memory node DTC warnings
  2016-09-09 14:01 [PATCH 0/8] ARM: dts: rockchip: Remove skeleton.dtsi usage and fix memory node DTC warnings Javier Martinez Canillas
                   ` (7 preceding siblings ...)
  2016-09-09 14:01 ` [PATCH 8/8] ARM: dts: rockchip: Add missing unit name to memory nodes in rk3xxx boards Javier Martinez Canillas
@ 2016-09-10 21:51 ` Heiko Stuebner
  8 siblings, 0 replies; 10+ messages in thread
From: Heiko Stuebner @ 2016-09-10 21:51 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Javier,

Am Freitag, 9. September 2016, 10:01:01 CEST schrieb Javier Martinez Canillas:
> This series removes the inclusion of the skeleton.dtsi in all the Rockchip
> dts, which allows to get rid of the DTC warnings about a mismatch between
> the memory nodes' unit names and reg properties.
> 
> Patches are pretty trivial and shouldn't cause functional changes AFAIK,
> but were only built tested and dtbs compared with scripts/dtc/dtx_diff.

applied all 8 to my dts branch (for 4.9 but might get delayed to 4.10 ... not 
sure yet)


Thanks
Heiko

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

end of thread, other threads:[~2016-09-10 21:51 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-09 14:01 [PATCH 0/8] ARM: dts: rockchip: Remove skeleton.dtsi usage and fix memory node DTC warnings Javier Martinez Canillas
2016-09-09 14:01 ` [PATCH 1/8] ARM: dts: rockchip: Remove skeleton.dtsi inclusion in rk3036.dtsi Javier Martinez Canillas
2016-09-09 14:01 ` [PATCH 2/8] ARM: dts: rockchip: Remove skeleton.dtsi inclusion in rk322x.dtsi Javier Martinez Canillas
2016-09-09 14:01 ` [PATCH 3/8] ARM: dts: rockchip: Remove skeleton.dtsi inclusion in rk3288.dtsi Javier Martinez Canillas
2016-09-09 14:01 ` [PATCH 4/8] ARM: dts: rockchip: Remove skeleton.dtsi inclusion in rk3xxx.dtsi Javier Martinez Canillas
2016-09-09 14:01 ` [PATCH 5/8] ARM: dts: rockchip: Add missing unit name to memory nodes in rk3036 boards Javier Martinez Canillas
2016-09-09 14:01 ` [PATCH 6/8] ARM: dts: rockchip: Add missing unit name to memory nodes in rk322x boards Javier Martinez Canillas
2016-09-09 14:01 ` [PATCH 7/8] ARM: dts: rockchip: Add missing unit name to memory nodes in rk3288 boards Javier Martinez Canillas
2016-09-09 14:01 ` [PATCH 8/8] ARM: dts: rockchip: Add missing unit name to memory nodes in rk3xxx boards Javier Martinez Canillas
2016-09-10 21:51 ` [PATCH 0/8] ARM: dts: rockchip: Remove skeleton.dtsi usage and fix memory node DTC warnings Heiko Stuebner

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