Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 553a59fc authored by Philipp Zabel's avatar Philipp Zabel
Browse files

drm/imx: parallel-display: fix drm_panel support 



The parallel-display driver used an undocumented, non-standard property
"fsl,panel" to optionally associate with a drm_panel device. This patch
fixes the driver to use the same OF graph bindings as the LDB driver
instead:

    parallel-display {
            compatible = "fsl,imx-parallel-display";
            ...

            port@1 {
                    reg = <1>;

                    parallel_out: endpoint {
                            remote_endpoint = <&panel_in>;
                    };
            };
    };

    panel {
            ...

            port {
                    panel_in: endpoint {
                            remote-endpoint = <&parallel_out>;
                    };
            };
    };

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Tested-by: default avatarGary Bisson <gary.bisson@boundarydevices.com>
parent d770e558

Documentation/devicetree/bindings/drm/imx/fsl-imx-drm.txt

+24 −2
Original line number Diff line number Diff line
@@ -65,8 +65,10 @@ Optional properties: 
- edid: verbatim EDID data block describing attached display.

- ddc: phandle describing the i2c bus handling the display data

  channel

- port: A port node with endpoint definitions as defined in

- port@[0-1]: Port nodes with endpoint definitions as defined in

  Documentation/devicetree/bindings/media/video-interfaces.txt.

  Port 0 is the input port connected to the IPU display interface,

  port 1 is the output port connected to a panel.



example:
@@ -75,9 +77,29 @@ display@di0 { 
	edid = [edid-data];

	interface-pix-fmt = "rgb24";



	port {

	port@0 {

		reg = <0>;



		display_in: endpoint {

			remote-endpoint = <&ipu_di0_disp0>;

		};

	};



	port@1 {

		reg = <1>;



		display_out: endpoint {

			remote-endpoint = <&panel_in>;

		};

	};

};



panel {

	...



	port {

		panel_in: endpoint {

			remote-endpoint = <&display_out>;

		};

	};

};

drivers/gpu/drm/imx/parallel-display.c

+15 −6
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <drm/drm_panel.h>

#include <linux/videodev2.h>

#include <video/of_display_timing.h>

#include <linux/of_graph.h>



#include "imx-drm.h"
@@ -208,7 +209,7 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data) 
{

	struct drm_device *drm = data;

	struct device_node *np = dev->of_node;

	struct device_node *panel_node;

	struct device_node *port;

	const u8 *edidp;

	struct imx_parallel_display *imxpd;

	int ret;
@@ -234,12 +235,20 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data) 
			imxpd->bus_format = MEDIA_BUS_FMT_RGB666_1X24_CPADHI;

	}



	panel_node = of_parse_phandle(np, "fsl,panel", 0);

	if (panel_node) {

		imxpd->panel = of_drm_find_panel(panel_node);

	/* port@1 is the output port */

	port = of_graph_get_port_by_id(np, 1);

	if (port) {

		struct device_node *endpoint, *remote;



		endpoint = of_get_child_by_name(port, "endpoint");

		if (endpoint) {

			remote = of_graph_get_remote_port_parent(endpoint);

			if (remote)

				imxpd->panel = of_drm_find_panel(remote);

			if (!imxpd->panel)

				return -EPROBE_DEFER;

		}

	}



	imxpd->dev = dev;