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 <shawnguo@kernel.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: NXP Linux Team <linux-imx@nxp.com>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx6ul-geam.dts b/arch/arm/boot/dts/imx6ul-geam.dts
index bc77f26a2f1dee7ccaf5141ea6c4f6eea751cad2..21ddd359d3ed68b99281a86c9f6136e25e5f1b60 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-geam.dts
+++ b/arch/arm/boot/dts/imx6ul-geam.dts
@@ -169,7 +169,7 @@
        display = <&display0>;
        status = "okay";
 
-       display0: display {
+       display0: display0 {
                bits-per-pixel = <16>;
                bus-width = <18>;
 

diff --git a/arch/arm/boot/dts/imx6ul-isiot.dtsi b/arch/arm/boot/dts/imx6ul-isiot.dtsi
index 213e802bf35c5dc1a5a6162eae28917d2acd30ca..b26d4f57c6555009b6aa5bca6ff67b03aa64f83b 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-isiot.dtsi
+++ b/arch/arm/boot/dts/imx6ul-isiot.dtsi
@@ -161,7 +161,7 @@
        display = <&display0>;
        status = "okay";
 
-       display0: display {
+       display0: display0 {
                bits-per-pixel = <16>;
                bus-width = <18>;