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

ARM: dts: at91: 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.

Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20190516225614.1458-1-robh@kernel.org
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

authored by

Rob Herring and committed by
Alexandre Belloni
8a6836ee 5f9e832c

+4 -4
+1 -1
arch/arm/boot/dts/at91sam9261ek.dts
··· 40 40 atmel,power-control-gpio = <&pioA 12 GPIO_ACTIVE_LOW>; 41 41 status = "okay"; 42 42 43 - display0: display { 43 + display0: panel { 44 44 bits-per-pixel = <16>; 45 45 atmel,lcdcon-backlight; 46 46 atmel,dmacon = <0x1>;
+1 -1
arch/arm/boot/dts/at91sam9263ek.dts
··· 110 110 display = <&display0>; 111 111 status = "okay"; 112 112 113 - display0: display { 113 + display0: panel { 114 114 bits-per-pixel = <16>; 115 115 atmel,lcdcon-backlight; 116 116 atmel,dmacon = <0x1>;
+1 -1
arch/arm/boot/dts/at91sam9m10g45ek.dts
··· 235 235 display = <&display0>; 236 236 status = "okay"; 237 237 238 - display0: display { 238 + display0: panel { 239 239 bits-per-pixel = <32>; 240 240 atmel,lcdcon-backlight; 241 241 atmel,dmacon = <0x1>;
+1 -1
arch/arm/boot/dts/at91sam9rlek.dts
··· 36 36 display = <&display0>; 37 37 status = "okay"; 38 38 39 - display0: display { 39 + display0: panel { 40 40 bits-per-pixel = <16>; 41 41 atmel,lcdcon-backlight; 42 42 atmel,dmacon = <0x1>;