Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a6836ee authored by Rob Herring's avatar Rob Herring Committed by Alexandre Belloni
Browse files

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: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20190516225614.1458-1-robh@kernel.org


Acked-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 5f9e832c

arch/arm/boot/dts/at91sam9261ek.dts

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
			atmel,power-control-gpio = <&pioA 12 GPIO_ACTIVE_LOW>;

			status = "okay";



			display0: display {

			display0: panel {

				bits-per-pixel = <16>;

				atmel,lcdcon-backlight;

				atmel,dmacon = <0x1>;

arch/arm/boot/dts/at91sam9263ek.dts

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ 
			display = <&display0>;

			status = "okay";



			display0: display {

			display0: panel {

				bits-per-pixel = <16>;

				atmel,lcdcon-backlight;

				atmel,dmacon = <0x1>;

arch/arm/boot/dts/at91sam9m10g45ek.dts

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ 
			display = <&display0>;

			status = "okay";



			display0: display {

			display0: panel {

				bits-per-pixel = <32>;

				atmel,lcdcon-backlight;

				atmel,dmacon = <0x1>;

arch/arm/boot/dts/at91sam9rlek.dts

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
			display = <&display0>;

			status = "okay";



			display0: display {

			display0: panel {

				bits-per-pixel = <16>;

				atmel,lcdcon-backlight;

				atmel,dmacon = <0x1>;