ARM: dts: imx53: Add IPU DI ports and endpoints, move imx-drm node to dtsi

This patch connects IPU and display encoder (VGA, LVDS)
device tree nodes, as well as parallel displays on the DISP0
and DISP1 outputs, using the OF graph bindings described in
Documentation/devicetree/bindings/media/video-interfaces.txt

The IPU ports correspond to the two display interfaces. The
order of endpoints in the ports is arbitrary.

Since the imx-drm node now only needs to contain links to the
display interfaces, it can be moved to the SoC dtsi level. At
the board level, only connections between the display interface
ports and encoders or panels have to be added.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

4 files changed, 89 insertions, 24 deletions

diff --git a/arch/arm/boot/dts/imx53-m53evk.dts b/arch/arm/boot/dts/imx53-m53evk.dts
index ee6107b6484c..0298adc73bb7 100644
--- a/arch/arm/boot/dts/imx53-m53evk.dts
+++ b/arch/arm/boot/dts/imx53-m53evk.dts
@@ -23,7 +23,6 @@
         soc {
                 display1: display@di1 {
                         compatible = "fsl,imx-parallel-display";
-                        crtcs = <&ipu 1>;
                         interface-pix-fmt = "bgr666";
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_ipu_disp2_1>;
@@ -44,6 +43,12 @@
                                 };
                         };
                 };
+
+                port {
+                        display1_in: endpoint {
+                                remote-endpoint = <&ipu_di1_disp1>;
+                        };
+                };
         };
 
         backlight {
@@ -53,12 +58,6 @@
                 default-brightness-level = <6>;
         };
 
-        imx-drm {
-                compatible = "fsl,imx-drm";
-                crtcs = <&ipu 1>;
-                connectors = <&display1>;
-        };
-
         leds {
                 compatible = "gpio-leds";
                 pinctrl-names = "default";
@@ -227,6 +226,10 @@
         };
 };
 
+&ipu_di1_disp1 {
+        remote-endpoint = <&display1_in>;
+};
+
 &nfc {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_nand_1>;
diff --git a/arch/arm/boot/dts/imx53-mba53.dts b/arch/arm/boot/dts/imx53-mba53.dts
index f2affb0cb959..a5b55c603591 100644
--- a/arch/arm/boot/dts/imx53-mba53.dts
+++ b/arch/arm/boot/dts/imx53-mba53.dts
@@ -38,15 +38,14 @@
                 compatible = "fsl,imx-parallel-display";
                 pinctrl-names = "default";
                 pinctrl-0 = <&pinctrl_disp1_1>;
-                crtcs = <&ipu 1>;
                 interface-pix-fmt = "rgb24";
                 status = "disabled";
-        };
 
-        imx-drm {
-                compatible = "fsl,imx-drm";
-                crtcs = <&ipu 1>;
-                connectors = <&disp1>, <&tve>;
+                port {
+                        display1_in: endpoint {
+                                remote-endpoint = <&ipu_di1_disp1>;
+                        };
+                };
         };
 
         reg_3p2v: 3p2v {
@@ -147,6 +146,10 @@
         };
 };
 
+&ipu_di1_disp1 {
+        remote-endpoint = <&display1_in>;
+};
+
 &cspi {
         status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx53-qsb.dts b/arch/arm/boot/dts/imx53-qsb.dts
index 3cb4f7791a91..8b254289344f 100644
--- a/arch/arm/boot/dts/imx53-qsb.dts
+++ b/arch/arm/boot/dts/imx53-qsb.dts
@@ -23,7 +23,6 @@
 
         display0: display@di0 {
                 compatible = "fsl,imx-parallel-display";
-                crtcs = <&ipu 0>;
                 interface-pix-fmt = "rgb565";
                 pinctrl-names = "default";
                 pinctrl-0 = <&pinctrl_ipu_disp0_1>;
@@ -46,6 +45,12 @@
                                 pixelclk-active = <0>;
                         };
                 };
+
+                port {
+                        display0_in: endpoint {
+                                remote-endpoint = <&ipu_di0_disp0>;
+                        };
+                };
         };
 
         gpio-keys {
@@ -72,12 +77,6 @@
                 };
         };
 
-        imx-drm {
-                compatible = "fsl,imx-drm";
-                crtcs = <&ipu 0>;
-                connectors = <&display0>;
-        };
-
         leds {
                 compatible = "gpio-leds";
                 pinctrl-names = "default";
@@ -132,6 +131,10 @@
         status = "okay";
 };
 
+&ipu_di0_disp0 {
+        remote-endpoint = <&display0_in>;
+};
+
 &ssi2 {
         fsl,mode = "i2s-slave";
         status = "okay";
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 4307e80b2d2e..04d3127edfe1 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -45,6 +45,11 @@
                 };
         };
 
+        display-subsystem {
+                compatible = "fsl,imx-display-subsystem";
+                ports = <&ipu_di0>, <&ipu_di1>;
+        };
+
         tzic: tz-interrupt-controller@0fffc000 {
                 compatible = "fsl,imx53-tzic", "fsl,tzic";
                 interrupt-controller;
@@ -85,13 +90,49 @@
                 ranges;
 
                 ipu: ipu@18000000 {
-                        #crtc-cells = <1>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
                         compatible = "fsl,imx53-ipu";
                         reg = <0x18000000 0x080000000>;
                         interrupts = <11 10>;
                         clocks = <&clks 59>, <&clks 110>, <&clks 61>;
                         clock-names = "bus", "di0", "di1";
                         resets = <&src 2>;
+
+                        ipu_di0: port@2 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                reg = <2>;
+
+                                ipu_di0_disp0: endpoint@0 {
+                                        reg = <0>;
+                                };
+
+                                ipu_di0_lvds0: endpoint@1 {
+                                        reg = <1>;
+                                        remote-endpoint = <&lvds0_in>;
+                                };
+                        };
+
+                        ipu_di1: port@3 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                reg = <3>;
+
+                                ipu_di1_disp1: endpoint@0 {
+                                        reg = <0>;
+                                };
+
+                                ipu_di1_lvds1: endpoint@1 {
+                                        reg = <1>;
+                                        remote-endpoint = <&lvds1_in>;
+                                };
+
+                                ipu_di1_tve: endpoint@2 {
+                                        reg = <2>;
+                                        remote-endpoint = <&tve_in>;
+                                };
+                        };
                 };
 
                 aips@50000000 { /* AIPS1 */
@@ -838,14 +879,24 @@
 
                                 lvds-channel@0 {
                                         reg = <0>;
-                                        crtcs = <&ipu 0>;
                                         status = "disabled";
+
+                                        port {
+                                                lvds0_in: endpoint {
+                                                        remote-endpoint = <&ipu_di0_lvds0>;
+                                                };
+                                        };
                                 };
 
                                 lvds-channel@1 {
                                         reg = <1>;
-                                        crtcs = <&ipu 1>;
                                         status = "disabled";
+
+                                        port {
+                                                lvds1_in: endpoint {
+                                                        remote-endpoint = <&ipu_di0_lvds0>;
+                                                };
+                                        };
                                 };
                         };
 
@@ -1103,8 +1154,13 @@
                                 interrupts = <92>;
                                 clocks = <&clks 69>, <&clks 116>;
                                 clock-names = "tve", "di_sel";
-                                crtcs = <&ipu 1>;
                                 status = "disabled";
+
+                                port {
+                                        tve_in: endpoint {
+                                                remote-endpoint = <&ipu_di1_tve>;
+                                        };
+                                };
                         };
 
                         vpu: vpu@63ff4000 {