[PATCH] ARM: dts: imx: Fix incorrect display nodes notation

[Philipp Zabel]

Hi Marco,

On Tue, 2017-10-03 at 14:43 -0300, Marco Franchi wrote:
> 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 <marco.franchi at nxp.com>

Thank you for fixing this. Mostly

Acked-by: Philipp Zabel <p.zabel at pengutronix.de>

but I have one remark regarding i.MX51. While on the later SoCs the
parallel display interface pad groups are called DISP0 and DISP1 in the
reference manual, on i.MX51 they were called DISP1 and DISP2 [1].
This is already reflected by the pin function ids: MX51_PAD_DISP[12]_*.

Also, the display ports are currently inconsistently named across the
i.MX51 board device trees, see below. Should we use this opportunity to
also fix this inconsistency?

[1] https://www.nxp.com/docs/en/reference-manual/MCIMX51RM.pdf

> ---
> I have already submitted a fix for the Documentation bindings:
> https://git.pengutronix.de/cgit/pza/linux/commit/?h=imx-drm/next&id=db
> fdd153d4aefec13460c97475737e59af92d8e2
> 
>  arch/arm/boot/dts/imx51-apf51dev.dts          | 2 +-
>  arch/arm/boot/dts/imx51-babbage.dts           | 4 ++--
>  arch/arm/boot/dts/imx51-ts4800.dts            | 2 +-
[...]
>  30 files changed, 31 insertions(+), 31 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/imx51-apf51dev.dts
> b/arch/arm/boot/dts/imx51-apf51dev.dts
> index a5e6091..f04d0df 100644
> --- a/arch/arm/boot/dts/imx51-apf51dev.dts
> +++ b/arch/arm/boot/dts/imx51-apf51dev.dts
> @@ -24,7 +24,7 @@
>  		default-on;
>  	};
>  
> -	display at di1 {
> +	disp1 {
>  		compatible = "fsl,imx-parallel-display";
>  		interface-pix-fmt = "bgr666";
>  		pinctrl-names = "default";

This is actually DISP1 in the reference manual (connected to IPU DI0):

                pinctrl-0 = <&pinctrl_ipu_disp1>;
                port {
                        display_in: endpoint {
                                remote-endpoint = <&ipu_di0_disp0>;                                                                           
                        };
                };

The remote endpoint should be renamed to ipu_di0_disp1 for consistency.

> diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
> index 873cf24..297953c 100644
> --- a/arch/arm/boot/dts/imx51-babbage.dts
> +++ b/arch/arm/boot/dts/imx51-babbage.dts
> @@ -39,7 +39,7 @@
>  		};
>  	};
>  
> -	display0: display at di0 {
> +	display0: disp0 {
>  		compatible = "fsl,imx-parallel-display";
>  		interface-pix-fmt = "rgb24";
>  		pinctrl-names = "default";

This is also DISP1 in the reference manual (connected to IPU DI0):

		pinctrl-0 = <&pinctrl_ipu_disp1>;
                port {
                        display0_in: endpoint {
   
                             remote-endpoint = <&ipu_di0_disp0>;
        
                };
                };

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

And this is actually DISP2 in the reference manual (connected to IPU
DI1):
		pinctrl-0 = <&pinctrl_ipu_disp2>;
                port {
                        display1_in: endpoint {
                                remote-endpoint = <&ipu_di1_disp1>;
                        };
                };

The remote endpoint should be renamed to ipu_di1_disp2.

> diff --git a/arch/arm/boot/dts/imx51-ts4800.dts
> b/arch/arm/boot/dts/imx51-ts4800.dts
> index ca1cc5e..e6be869 100644
> --- a/arch/arm/boot/dts/imx51-ts4800.dts
> +++ b/arch/arm/boot/dts/imx51-ts4800.dts
> @@ -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";

And this is also DISP1 according to the reference manual.

regards
Philipp