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>

diff --git a/arch/arm/boot/dts/at91sam9261ek.dts b/arch/arm/boot/dts/at91sam9261ek.dts
index 7debdea..c4ef74f 100644 (file)
--- a/arch/arm/boot/dts/at91sam9261ek.dts
+++ b/arch/arm/boot/dts/at91sam9261ek.dts
@@ -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>;

diff --git a/arch/arm/boot/dts/at91sam9263ek.dts b/arch/arm/boot/dts/at91sam9263ek.dts
index 45e0c6e..62d2185 100644 (file)
--- a/arch/arm/boot/dts/at91sam9263ek.dts
+++ b/arch/arm/boot/dts/at91sam9263ek.dts
@@ -110,7 +110,7 @@
                        display = <&display0>;
                        status = "okay";
 
-                       display0: display {
+                       display0: panel {
                                bits-per-pixel = <16>;
                                atmel,lcdcon-backlight;
                                atmel,dmacon = <0x1>;

diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts
index 06d74ff..84bed6f 100644 (file)
--- a/arch/arm/boot/dts/at91sam9m10g45ek.dts
+++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts
@@ -235,7 +235,7 @@
                        display = <&display0>;
                        status = "okay";
 
-                       display0: display {
+                       display0: panel {
                                bits-per-pixel = <32>;
                                atmel,lcdcon-backlight;
                                atmel,dmacon = <0x1>;

diff --git a/arch/arm/boot/dts/at91sam9rlek.dts b/arch/arm/boot/dts/at91sam9rlek.dts
index 3a38694..0de75d3 100644 (file)
--- a/arch/arm/boot/dts/at91sam9rlek.dts
+++ b/arch/arm/boot/dts/at91sam9rlek.dts
@@ -36,7 +36,7 @@
                        display = <&display0>;
                        status = "okay";
 
-                       display0: display {
+                       display0: panel {
                                bits-per-pixel = <16>;
                                atmel,lcdcon-backlight;
                                atmel,dmacon = <0x1>;