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 <marco.franchi@nxp.com>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx51-apf51dev.dts b/arch/arm/boot/dts/imx51-apf51dev.dts
index f04d0df742781482396cde7e17cc03bf6daffbf7..2f1a9d203384bbdaf9d6375aab414df6f7e7162f 100644 (file)
--- a/arch/arm/boot/dts/imx51-apf51dev.dts
+++ b/arch/arm/boot/dts/imx51-apf51dev.dts
@@ -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>;
 };

diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index 297953cef0180b3c919ad680984f1567847c8916..668c37b76603218fcc5fb5af9c8edc70454c3d29 100644 (file)
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -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>;
 };
 

diff --git a/arch/arm/boot/dts/imx51-ts4800.dts b/arch/arm/boot/dts/imx51-ts4800.dts
index e6be869cfb8cfe6b0f8dd0aa8fd6edbf364d0eb0..35a11123cc9b9a9ee80fd92583cf492fc3ee04d7 100644 (file)
--- 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: disp0 {
+       display1: disp1 {
                compatible = "fsl,imx-parallel-display";
                interface-pix-fmt = "rgb24";
                pinctrl-names = "default";
@@ -73,7 +73,7 @@
 
                port@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>;
 };
 

diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 1ee1d542d9ad088c0bb94a55d66829d6ac1d92b9..378be720b3c7679992c9901ab710da85ae584b7d 100644 (file)
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -148,14 +148,14 @@
                        ipu_di0: port@2 {
                                reg = <2>;
 
-                               ipu_di0_disp0: endpoint {
+                               ipu_di0_disp1: endpoint {
                                };
                        };
 
                        ipu_di1: port@3 {
                                reg = <3>;
 
-                               ipu_di1_disp1: endpoint {
+                               ipu_di1_disp2: endpoint {
                                };
                        };
                };