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 7debdeabcf2f7f7f71396bf7714260bff1aba4fb..c4ef74fea97c222b3b60412a3fbbeb240d1d4a05 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 45e0c6e88cab706cf873b8dffae0ad0ebbecc695..62d218542a480336ffde7a6150a3b05309124e8f 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 06d74ff1a7d078c5f2d36daa273fd8cf428dac4e..84bed6f55fcdd4f9874c3db5e1cadefa18cae176 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 3a3869444fdcdc872bbfe14d478a4ffa5ff2a3f6..0de75d3c4f18c61a502d021078e20c7835d24d90 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>;