ARM: dts: imx: Fix incorrect display nodes notation

PATCH New Marco Franchi 3 participants 5 messages Oct 5, 2017 – Oct 13, 2017

Subsystems (2)

Device tree bindings Arm i.MX and Layerscape

lore

Share & tools

lore

Marco Franchi

author

2017-10-05 14:31 UTC #0 lore raw

PATCH v3 1/2 ARM: dts: imx: Fix incorrect display nodes notation

The following build warnings are seen with W=1:

Warning (unit_address_vs_reg): Node /display at di0 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /display at di1 has a unit name, but no reg property

Fix all these warnings by changing 'display at diX' to 'dispX'.

Signed-off-by Marco Franchi <[email protected]>

Acked-by Philipp Zabel <[email protected]>

---
Changes since v2:
-none

 arch/arm/boot/dts/imx51-apf51dev.dts          | 2 +-
 arch/arm/boot/dts/imx51-babbage.dts           | 4 ++--
 arch/arm/boot/dts/imx51-ts4800.dts            | 2 +-
 arch/arm/boot/dts/imx53-m53evk.dts            | 2 +-
 arch/arm/boot/dts/imx53-mba53.dts             | 2 +-
 arch/arm/boot/dts/imx53-qsb-common.dtsi       | 2 +-
 arch/arm/boot/dts/imx53-tx53-x03x.dts         | 2 +-
 arch/arm/boot/dts/imx6dl-aristainetos2_4.dts  | 2 +-
 arch/arm/boot/dts/imx6dl-aristainetos_4.dts   | 2 +-
 arch/arm/boot/dts/imx6dl-aristainetos_7.dts   | 2 +-
 arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts  | 2 +-
 arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts     | 2 +-
 arch/arm/boot/dts/imx6dl-tx6s-8034.dts        | 2 +-
 arch/arm/boot/dts/imx6dl-tx6s-8035.dts        | 2 +-
 arch/arm/boot/dts/imx6dl-tx6u-801x.dts        | 2 +-
 arch/arm/boot/dts/imx6dl-tx6u-8033.dts        | 2 +-
 arch/arm/boot/dts/imx6q-apalis-eval.dts       | 2 +-
 arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 2 +-
 arch/arm/boot/dts/imx6q-apalis-ixora.dts      | 2 +-
 arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts  | 2 +-
 arch/arm/boot/dts/imx6q-tx6q-1010.dts         | 2 +-
 arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts  | 2 +-
 arch/arm/boot/dts/imx6q-tx6q-1020.dts         | 2 +-
 arch/arm/boot/dts/imx6q-tx6q-1036.dts         | 2 +-
 arch/arm/boot/dts/imx6qdl-apf6dev.dtsi        | 2 +-
 arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi  | 2 +-
 arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 2 +-
 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi     | 2 +-
 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi      | 2 +-
 arch/arm/boot/dts/imx6ul-tx6ul.dtsi           | 2 +-
 30 files changed, 31 insertions(+), 31 deletions(-)

arch/arm/boot/dts/imx51-apf51dev.dts +1 -1

index a5e6091..f04d0df 100644
@@ -24,7 +24,7 @@
 		default-on;
 	};
 
-	display at di1 {
+	disp1 {
 		compatible = "fsl,imx-parallel-display";
 		interface-pix-fmt = "bgr666";
 		pinctrl-names = "default";

arch/arm/boot/dts/imx51-babbage.dts +2 -2

index 873cf24..297953c 100644
@@ -39,7 +39,7 @@
 		};
 	};
 
-	display0: display at di0 {
+	display0: disp0 {
 		compatible = "fsl,imx-parallel-display";
 		interface-pix-fmt = "rgb24";
 		pinctrl-names = "default";

@@ -66,7 +66,7 @@
 		};
 	};
 
-	display1: display at di1 {
+	display1: disp1 {
 		compatible = "fsl,imx-parallel-display";
 		interface-pix-fmt = "rgb565";
 		pinctrl-names = "default";

arch/arm/boot/dts/imx51-ts4800.dts +1 -1

index ca1cc5e..e6be869 100644
@@ -50,7 +50,7 @@
 		power-supply = <&backlight_reg>;
 	};
 
-	display0: display at di0 {
+	display0: disp0 {
 		compatible = "fsl,imx-parallel-display";
 		interface-pix-fmt = "rgb24";
 		pinctrl-names = "default";

arch/arm/boot/dts/imx53-m53evk.dts +1 -1

index 4347a32..9794a04 100644
@@ -16,7 +16,7 @@
 	model = "Aries/DENX M53EVK";
 	compatible = "aries,imx53-m53evk", "denx,imx53-m53evk", "fsl,imx53";
 
-	display1: display at di1 {
+	display1: disp1 {
 		compatible = "fsl,imx-parallel-display";
 		interface-pix-fmt = "bgr666";
 		pinctrl-names = "default";

arch/arm/boot/dts/imx53-mba53.dts +1 -1

index df705ba..296dd74 100644
@@ -30,7 +30,7 @@
 		power-supply = <&reg_backlight>;
 	};
 
-	disp1: display at disp1 {
+	disp1: disp1 {
 		compatible = "fsl,imx-parallel-display";
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_disp1_1>;

arch/arm/boot/dts/imx53-qsb-common.dtsi +1 -1

index 683dcbe..d5adf33 100644
@@ -22,7 +22,7 @@
 		      <0xb0000000 0x20000000>;
 	};
 
-	display0: display at di0 {
+	display0: disp0 {
 		compatible = "fsl,imx-parallel-display";
 		interface-pix-fmt = "rgb565";
 		pinctrl-names = "default";

arch/arm/boot/dts/imx53-tx53-x03x.dts +1 -1

index 0ecb43d..b1ea73f 100644
@@ -24,7 +24,7 @@
 	};
 
 	soc {
-		display: display at di0 {
+		display: disp0 {
 			compatible = "fsl,imx-parallel-display";
 			interface-pix-fmt = "rgb24";
 			pinctrl-names = "default";

arch/arm/boot/dts/imx6dl-aristainetos2_4.dts +1 -1

index 0677625..5f0d196 100644
@@ -52,7 +52,7 @@
 		reg = <0x10000000 0x40000000>;
 	};
 
-	display0: display at di0 {
+	display0: disp0 {
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "fsl,imx-parallel-display";

arch/arm/boot/dts/imx6dl-aristainetos_4.dts +1 -1

index 32a812b..cc418ce 100644
@@ -32,7 +32,7 @@
 	};
 
 	soc {
-		display0: display at di0 {
+		display0: disp0 {
 			compatible = "fsl,imx-parallel-display";
 			interface-pix-fmt = "rgb24";
 			pinctrl-names = "default";

arch/arm/boot/dts/imx6dl-aristainetos_7.dts +1 -1

index 15203f0..126ff96 100644
@@ -21,7 +21,7 @@
 	};
 
 	soc {
-		display0: display at di0 {
+		display0: disp0 {
 			compatible = "fsl,imx-parallel-display";
 			interface-pix-fmt = "rgb24";
 			pinctrl-names = "default";

arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +1 -1

index 2654153..5705ebe 100644
@@ -88,7 +88,7 @@
 		};
 	};
 
-	lcd_display: display at di0 {
+	lcd_display: disp0 {
 		compatible = "fsl,imx-parallel-display";
 		#address-cells = <1>;
 		#size-cells = <0>;

arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts +1 -1

index aac42ac..389fc16 100644
@@ -73,7 +73,7 @@
 		default-brightness-level = <50>;
 	};
 
-	display: display at di0 {
+	display: disp0 {
 		compatible = "fsl,imx-parallel-display";
 		interface-pix-fmt = "rgb24";
 		pinctrl-names = "default";

arch/arm/boot/dts/imx6dl-tx6s-8034.dts +1 -1

index ff8f7b1..a21075b 100644
@@ -81,7 +81,7 @@
 		default-brightness-level = <50>;
 	};
 
-	display: display at di0 {
+	display: disp0 {
 		compatible = "fsl,imx-parallel-display";
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_disp0_2>;

arch/arm/boot/dts/imx6dl-tx6s-8035.dts +1 -1

index f988950..fee8854 100644
@@ -81,7 +81,7 @@
 		default-brightness-level = <50>;
 	};
 
-	display: display at di0 {
+	display: disp0 {
 		compatible = "fsl,imx-parallel-display";
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_disp0_2>;

arch/arm/boot/dts/imx6dl-tx6u-801x.dts +1 -1

index d1f1298..efe5772 100644
@@ -73,7 +73,7 @@
 		default-brightness-level = <50>;
 	};
 
-	display: display at di0 {
+	display: disp0 {
 		compatible = "fsl,imx-parallel-display";
 		interface-pix-fmt = "rgb24";
 		pinctrl-names = "default";

arch/arm/boot/dts/imx6dl-tx6u-8033.dts +1 -1

index 4d3204a..e222086 100644
@@ -76,7 +76,7 @@
 		default-brightness-level = <50>;
 	};
 
-	display: display at di0 {
+	display: disp0 {
 		compatible = "fsl,imx-parallel-display";
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_disp0_2>;

arch/arm/boot/dts/imx6q-apalis-eval.dts +1 -1

index 4bbfe3d..8b56656 100644
@@ -76,7 +76,7 @@
 		};
 	};
 
-	lcd_display: display at di0 {
+	lcd_display: disp0 {
 		compatible = "fsl,imx-parallel-display";
 		#address-cells = <1>;
 		#size-cells = <0>;

arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +1 -1

index a35c7a5..27dc0fc 100644
@@ -77,7 +77,7 @@
 		};
 	};
 
-	lcd_display: display at di0 {
+	lcd_display: disp0 {
 		compatible = "fsl,imx-parallel-display";
 		#address-cells = <1>;
 		#size-cells = <0>;

arch/arm/boot/dts/imx6q-apalis-ixora.dts +1 -1

index 60d33e9..40b2c67 100644
@@ -76,7 +76,7 @@
 		};
 	};
 
-	lcd_display: display at di0 {
+	lcd_display: disp0 {
 		compatible = "fsl,imx-parallel-display";
 		#address-cells = <1>;
 		#size-cells = <0>;

arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts +1 -1

index 71746ed..d3ee1f5 100644
@@ -73,7 +73,7 @@
 		default-brightness-level = <50>;
 	};
 
-	display: display at di0 {
+	display: disp0 {
 		compatible = "fsl,imx-parallel-display";
 		interface-pix-fmt = "rgb24";
 		pinctrl-names = "default";

arch/arm/boot/dts/imx6q-tx6q-1010.dts +1 -1

index f9cd21a..e14e6be 100644
@@ -73,7 +73,7 @@
 		default-brightness-level = <50>;
 	};
 
-	display: display at di0 {
+	display: disp0 {
 		compatible = "fsl,imx-parallel-display";
 		interface-pix-fmt = "rgb24";
 		pinctrl-names = "default";

arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts +1 -1

index 959ff3fb..ea84561 100644
@@ -73,7 +73,7 @@
 		default-brightness-level = <50>;
 	};
 
-	display: display at di0 {
+	display: disp0 {
 		compatible = "fsl,imx-parallel-display";
 		interface-pix-fmt = "rgb24";
 		pinctrl-names = "default";

arch/arm/boot/dts/imx6q-tx6q-1020.dts +1 -1

index b49133d..9c168ee 100644
@@ -73,7 +73,7 @@
 		default-brightness-level = <50>;
 	};
 
-	display: display at di0 {
+	display: disp0 {
 		compatible = "fsl,imx-parallel-display";
 		interface-pix-fmt = "rgb24";
 		pinctrl-names = "default";

arch/arm/boot/dts/imx6q-tx6q-1036.dts +1 -1

index 7c152e3..c81e8bd 100644
@@ -76,7 +76,7 @@
 		default-brightness-level = <50>;
 	};
 
-	display: display at di0 {
+	display: disp0 {
 		compatible = "fsl,imx-parallel-display";
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_disp0_2>;

arch/arm/boot/dts/imx6qdl-apf6dev.dtsi +1 -1

index 9cd2a74..37a59a8 100644
@@ -54,7 +54,7 @@
 		stdout-path = &uart4;
 	};
 
-	display at di0 {
+	disp0 {
 		compatible = "fsl,imx-parallel-display";
 		interface-pix-fmt = "bgr666";
 		pinctrl-names = "default";

arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi +1 -1

index b63134e..472b0c9 100644
@@ -256,7 +256,7 @@
 		status = "okay";
 	};
 
-	lcd_display: display at di0 {
+	lcd_display: disp0 {
 		compatible = "fsl,imx-parallel-display";
 		#address-cells = <1>;
 		#size-cells = <0>;

arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi +1 -1

index a24e4f1..4bab60a 100644
@@ -120,7 +120,7 @@
 		};
 	};
 
-	lcd_display: display at di0 {
+	lcd_display: disp0 {
 		compatible = "fsl,imx-parallel-display";
 		#address-cells = <1>;
 		#size-cells = <0>;

arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi +1 -1

index d309a4d..9a46cf1 100644
@@ -197,7 +197,7 @@
 		status = "okay";
 	};
 
-	lcd_display: display at di0 {
+	lcd_display: disp0 {
 		compatible = "fsl,imx-parallel-display";
 		#address-cells = <1>;
 		#size-cells = <0>;

arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +1 -1

index 756c505..fc1f2c0 100644
@@ -221,7 +221,7 @@
 		status = "okay";
 	};
 
-	lcd_display: display at di0 {
+	lcd_display: disp0 {
 		compatible = "fsl,imx-parallel-display";
 		#address-cells = <1>;
 		#size-cells = <0>;

arch/arm/boot/dts/imx6ul-tx6ul.dtsi +1 -1

index ec745eb..5610d19 100644
@@ -424,7 +424,7 @@
 	display = <&display>;
 	status = "okay";
 
-	display: display at di0 {
+	display: disp0 {
 		bits-per-pixel = <32>;
 		bus-width = <24>;
 		status = "okay";

Signature · 1 line

2.7.4

Marco Franchi

author

2017-10-05 14:31 UTC #1 lore raw

PATCH v3 2/2 ARM: dts: imx51: Fix inconsistent display port names

Contrary to later i.MX SoCs, the parallel display interface pad groups on i.MX51 are called DISP1 and DISP2 in the Reference Manual, not DISP0 and DISP1.

Fix this inconsistence by changing the DISP names in the i.mx51 dts.

Signed-off-by Marco Franchi <[email protected]>

Acked-by Philipp Zabel <[email protected]>

---
Changes since v2:
-change message log text

 arch/arm/boot/dts/imx51-apf51dev.dts |  4 ++--
 arch/arm/boot/dts/imx51-babbage.dts  | 12 ++++++------
 arch/arm/boot/dts/imx51-ts4800.dts   |  6 +++---
 arch/arm/boot/dts/imx51.dtsi         |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

arch/arm/boot/dts/imx51-apf51dev.dts +2 -2

index f04d0df..2f1a9d2 100644
@@ -51,7 +51,7 @@
 
 		port {
 			display_in: endpoint {
-				remote-endpoint = <&ipu_di0_disp0>;
+				remote-endpoint = <&ipu_di0_disp1>;
 			};
 		};
 	};

@@ -218,6 +218,6 @@
 	};
 };
 
-&ipu_di0_disp0 {
+&ipu_di0_disp1 {
 	remote-endpoint = <&display_in>;
 };

arch/arm/boot/dts/imx51-babbage.dts +6 -6

index 297953c..668c37b 100644
@@ -39,7 +39,7 @@
 		};
 	};
 
-	display0: disp0 {
+	display1: disp1 {
 		compatible = "fsl,imx-parallel-display";
 		interface-pix-fmt = "rgb24";
 		pinctrl-names = "default";

@@ -61,12 +61,12 @@
 
 		port {
 			display0_in: endpoint {
-				remote-endpoint = <&ipu_di0_disp0>;
+				remote-endpoint = <&ipu_di0_disp1>;
 			};
 		};
 	};
 
-	display1: disp1 {
+	display2: disp2 {
 		compatible = "fsl,imx-parallel-display";
 		interface-pix-fmt = "rgb565";
 		pinctrl-names = "default";

@@ -93,7 +93,7 @@
 
 		port {
 			display1_in: endpoint {
-				remote-endpoint = <&ipu_di1_disp1>;
+				remote-endpoint = <&ipu_di1_disp2>;
 			};
 		};
 	};

@@ -348,11 +348,11 @@
 	};
 };
 
-&ipu_di0_disp0 {
+&ipu_di0_disp1 {
 	remote-endpoint = <&display0_in>;
 };
 
-&ipu_di1_disp1 {
+&ipu_di1_disp2 {
 	remote-endpoint = <&display1_in>;
 };

arch/arm/boot/dts/imx51-ts4800.dts +3 -3

index e6be869..35a1112 100644
@@ -50,7 +50,7 @@
 		power-supply = <&backlight_reg>;
 	};
 
-	display0: disp0 {
+	display1: disp1 {
 		compatible = "fsl,imx-parallel-display";
 		interface-pix-fmt = "rgb24";
 		pinctrl-names = "default";

@@ -73,7 +73,7 @@
 
 		port at 0 {
 			display0_in: endpoint {
-				remote-endpoint = <&ipu_di0_disp0>;
+				remote-endpoint = <&ipu_di0_disp1>;
 			};
 		};
 	};

@@ -107,7 +107,7 @@
 	};
 };
 
-&ipu_di0_disp0 {
+&ipu_di0_disp1 {
 	remote-endpoint = <&display0_in>;
 };

arch/arm/boot/dts/imx51.dtsi +2 -2

index 1ee1d54..378be72 100644
@@ -148,14 +148,14 @@
 			ipu_di0: port at 2 {
 				reg = <2>;
 
-				ipu_di0_disp0: endpoint {
+				ipu_di0_disp1: endpoint {
 				};
 			};
 
 			ipu_di1: port at 3 {
 				reg = <3>;
 
-				ipu_di1_disp1: endpoint {
+				ipu_di1_disp2: endpoint {
 				};
 			};
 		};

Signature · 1 line

2.7.4

Fabio Estevam

reviewer

2017-10-05 15:56 UTC #2 lore raw

PATCH v3 2/2 ARM: dts: imx51: Fix inconsistent display port names

Quoted 8 lines · Marco Franchi

Contrary to later i.MX SoCs, the parallel display interface pad groups on i.MX51 are called DISP1 and DISP2 in the Reference Manual, not DISP0 and DISP1.
Fix this inconsistence by changing the DISP names in the i.mx51 dts.
Signed-off-by Marco Franchi <[email protected]>
Acked-by Philipp Zabel <[email protected]>

Reviewed-by Fabio Estevam <[email protected]>

Fabio Estevam

reviewer

2017-10-05 15:56 UTC #3 lore raw

PATCH v3 1/2 ARM: dts: imx: Fix incorrect display nodes notation

In reply to Marco Franchi

Quoted 9 lines · Marco Franchi

The following build warnings are seen with W=1:
Warning (unit_address_vs_reg): Node /display at di0 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /display at di1 has a unit name, but no reg property
Fix all these warnings by changing 'display at diX' to 'dispX'.
Signed-off-by Marco Franchi <[email protected]>
Acked-by Philipp Zabel <[email protected]>

This aligns the dts with the binding doc and also fixes the warnings, great!
https://git.pengutronix.de/cgit/pza/linux/commit/?h=imx-drm/next&id=dbfdd153d4aefec13460c97475737e59af92d8e2

Reviewed-by Fabio Estevam <[email protected]>

Shawn Guo

Applied

2017-10-13 13:00 UTC #4 lore raw

PATCH v3 1/2 ARM: dts: imx: Fix incorrect display nodes notation

In reply to Marco Franchi

Quoted 9 lines · Marco Franchi

The following build warnings are seen with W=1:
Warning (unit_address_vs_reg): Node /display at di0 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /display at di1 has a unit name, but no reg property
Fix all these warnings by changing 'display at diX' to 'dispX'.
Signed-off-by Marco Franchi <[email protected]>
Acked-by Philipp Zabel <[email protected]>

Applied both, thanks.