iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/imx: parallel-display: fix drm_panel support

Browse Source 
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: Philipp Zabel <p.zabel@pengutronix.de>
Tested-by: Gary Bisson <gary.bisson@boundarydevices.com>
This commit is contained in:
Philipp Zabel
2015-05-19 16:28:12 +02:00
parent d770e558e2
commit 553a59fc8f
2 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Documentation/devicetree/bindings/drm/imx/fsl-imx-drm.txt
View File

@ -65,8 +65,10 @@ Optional properties:
- edid: verbatim EDID data block describing attached display. - edid: verbatim EDID data block describing attached display.
- ddc: phandle describing the i2c bus handling the display data - ddc: phandle describing the i2c bus handling the display data
channel 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. 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: example:
@ -75,9 +77,29 @@ display@di0 {
edid = [edid-data]; edid = [edid-data];
interface-pix-fmt = "rgb24"; interface-pix-fmt = "rgb24";
port { port@0 {
reg = <0>;
display_in: endpoint { display_in: endpoint {
remote-endpoint = <&ipu_di0_disp0>; 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>;
};
};
}; };

17
drivers/gpu/drm/imx/parallel-display.c
View File

@ -21,6 +21,7 @@
#include <drm/drm_panel.h> #include <drm/drm_panel.h>
#include <linux/videodev2.h> #include <linux/videodev2.h>
#include <video/of_display_timing.h> #include <video/of_display_timing.h>
#include <linux/of_graph.h>
#include "imx-drm.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 drm_device *drm = data;
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
struct device_node *panel_node; struct device_node *port;
const u8 *edidp; const u8 *edidp;
struct imx_parallel_display *imxpd; struct imx_parallel_display *imxpd;
int ret; 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; imxpd->bus_format = MEDIA_BUS_FMT_RGB666_1X24_CPADHI;
} }
panel_node = of_parse_phandle(np, "fsl,panel", 0); /* port@1 is the output port */
if (panel_node) { port = of_graph_get_port_by_id(np, 1);
imxpd->panel = of_drm_find_panel(panel_node); 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) if (!imxpd->panel)
return -EPROBE_DEFER; return -EPROBE_DEFER;
} }
}
imxpd->dev = dev; imxpd->dev = dev;