Skip to contentSkip to conversation

ARM: dts: imx: Avoid colliding 'display' node and property names

PATCH Applied Rob Herring 2 participants 2 messages May 16, 2019 – May 23, 2019

Subsystems (2)
lore
Share & tools
lore

Rob Herring

author maintainer
#0 lore raw

PATCH 1/1 ARM: dts: imx: Avoid colliding 'display' node and property names

While properties and child nodes with the same name are valid DT, the practice is not encouraged. Furthermore, the collision is problematic for YAML encoded DT. Let's just avoid the issue and rename the nodes.

Cc Shawn Guo <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Pengutronix Kernel Team <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc NXP Linux Team <[email protected]>
---
 arch/arm/boot/dts/imx6ul-geam.dts   | 2 +-
 arch/arm/boot/dts/imx6ul-isiot.dtsi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx6ul-geam.dts +1 -1
index bc77f26a2f1d..21ddd359d3ed 100644
@@ -169,7 +169,7 @@
 	display = <&display0>;
 	status = "okay";
 
-	display0: display {
+	display0: display0 {
 		bits-per-pixel = <16>;
 		bus-width = <18>;
 
arch/arm/boot/dts/imx6ul-isiot.dtsi +1 -1
index 213e802bf35c..b26d4f57c655 100644
@@ -161,7 +161,7 @@
 	display = <&display0>;
 	status = "okay";
 
-	display0: display {
+	display0: display0 {
 		bits-per-pixel = <16>;
 		bus-width = <18>;
 
Signature · 1 line
2.20.1
Applied
#1 lore raw
Quoted 11 lines · Rob Herring

While properties and child nodes with the same name are valid DT, the practice is not encouraged. Furthermore, the collision is problematic for YAML encoded DT. Let's just avoid the issue and rename the nodes.

Cc Shawn Guo <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Pengutronix Kernel Team <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc NXP Linux Team <[email protected]>

Applied, thanks.