Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Rob Herring and committed by
Shawn Guo
efb8393c 37a4bdea

+2 -2
+1 -1
arch/arm/boot/dts/imx6ul-geam.dts
··· 169 169 display = <&display0>; 170 170 status = "okay"; 171 171 172 - display0: display { 172 + display0: display0 { 173 173 bits-per-pixel = <16>; 174 174 bus-width = <18>; 175 175
+1 -1
arch/arm/boot/dts/imx6ul-isiot.dtsi
··· 161 161 display = <&display0>; 162 162 status = "okay"; 163 163 164 - display0: display { 164 + display0: display0 { 165 165 bits-per-pixel = <16>; 166 166 bus-width = <18>; 167 167