[PATCH 2/2] arm: AT91: fix DT duplicate node name

Michał Mirosław mirq-linux at rere.qmqm.pl
Tue Aug 29 13:08:54 PDT 2017


Fix following warning at bootup:

device-tree: Duplicate name in fb at 0x00500000, renamed to "display#1"

Signed-off-by: Michał Mirosław <mirq-linux at rere.qmqm.pl>
---
 arch/arm/boot/dts/at91sam9m10g45ek.dts | 48 +++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts
index 9cf1f5163fbd..272af5867403 100644
--- a/arch/arm/boot/dts/at91sam9m10g45ek.dts
+++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts
@@ -223,30 +223,6 @@
 		fb0: fb at 0x00500000 {
 			display = <&display0>;
 			status = "okay";
-
-			display0: display {
-				bits-per-pixel = <32>;
-				atmel,lcdcon-backlight;
-				atmel,dmacon = <0x1>;
-				atmel,lcdcon2 = <0x80008002>;
-				atmel,guard-time = <9>;
-				atmel,lcd-wiring-mode = "RGB";
-
-				display-timings {
-					native-mode = <&timing0>;
-					timing0: timing0 {
-						clock-frequency = <9000000>;
-						hactive = <480>;
-						vactive = <272>;
-						hback-porch = <1>;
-						hfront-porch = <1>;
-						vback-porch = <40>;
-						vfront-porch = <1>;
-						hsync-len = <45>;
-						vsync-len = <1>;
-					};
-				};
-			};
 		};
 
 		nand0: nand at 40000000 {
@@ -293,6 +269,30 @@
 		};
 	};
 
+	display0: display {
+		bits-per-pixel = <32>;
+		atmel,lcdcon-backlight;
+		atmel,dmacon = <0x1>;
+		atmel,lcdcon2 = <0x80008002>;
+		atmel,guard-time = <9>;
+		atmel,lcd-wiring-mode = "RGB";
+
+		display-timings {
+			native-mode = <&timing0>;
+			timing0: 480x272 {
+				clock-frequency = <9000000>;
+				hactive = <480>;
+				vactive = <272>;
+				hback-porch = <1>;
+				hfront-porch = <1>;
+				vback-porch = <40>;
+				vfront-porch = <1>;
+				hsync-len = <45>;
+				vsync-len = <1>;
+			};
+		};
+	};
+
 	pwmleds {
 		compatible = "pwm-leds";
 
-- 
2.11.0




More information about the linux-arm-kernel mailing list