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

Commit ef691ff4 authored by Archit Taneja's avatar Archit Taneja Committed by Tomi Valkeinen
Browse files

OMAPDSS: DT: Get source endpoint by matching reg-id 



In omapdss_of_find_source_for_first_ep, we retrieve a source endpoint's DT node,
and then see what omapdss output has the matching device_node pointer in
omap_dss_find_output_by_node.

For all DPI and SDI outputs, the device_node pointer is set as the parent's DSS
device_node pointer. If the source is one of these outputs, the above method
won't work.

To get the correct output for ports within DSS(and in other cases in the future,
where multiple ports might be under one device), we require additional
information which is exclusive to the output port.

We create a new field in omap_dss_device called 'port_num', this provides port
number of the output port corresponding to this device. When searching for the
source endpoint in DT, we extract the 'reg' property from the port corresponding
to the endpoint source. From the list of registered outputs, we pick out that
output which has both dev->of_node and port_num matching with the device_node
pointer and 'reg' of the source endpoint node from DT.

For encoder blocks(the ones which have both an input and output port), we need
to set the port_num as the 'reg' property for the output port as defined in the
DT bindings. We set port_num to 1 in the tfp410 and tpd12s015 encoder drivers.

Signed-off-by: default avatarArchit Taneja <archit@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 387ce9f2

drivers/video/fbdev/omap2/displays-new/encoder-tfp410.c

+1 −0
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ static int tfp410_probe(struct platform_device *pdev) 
	dssdev->output_type = OMAP_DISPLAY_TYPE_DVI;

	dssdev->owner = THIS_MODULE;

	dssdev->phy.dpi.data_lines = ddata->data_lines;

	dssdev->port_num = 1;



	r = omapdss_register_output(dssdev);

	if (r) {

drivers/video/fbdev/omap2/displays-new/encoder-tpd12s015.c

+1 −0
Original line number Diff line number Diff line
@@ -409,6 +409,7 @@ static int tpd_probe(struct platform_device *pdev) 
	dssdev->type = OMAP_DISPLAY_TYPE_HDMI;

	dssdev->output_type = OMAP_DISPLAY_TYPE_HDMI;

	dssdev->owner = THIS_MODULE;

	dssdev->port_num = 1;



	in = ddata->in;

drivers/video/fbdev/omap2/dss/dss-of.c

+40 −18
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 


#include <video/omapdss.h>



#include "dss.h"



struct device_node *

omapdss_of_get_next_port(const struct device_node *parent,

			 struct device_node *prev)
@@ -84,20 +86,17 @@ omapdss_of_get_next_endpoint(const struct device_node *parent, 
}

EXPORT_SYMBOL_GPL(omapdss_of_get_next_endpoint);



static struct device_node *

omapdss_of_get_remote_device_node(const struct device_node *node)

struct device_node *dss_of_port_get_parent_device(struct device_node *port)

{

	struct device_node *np;

	int i;



	np = of_parse_phandle(node, "remote-endpoint", 0);



	if (!np)

	if (!port)

		return NULL;



	np = of_get_next_parent(np);

	np = of_get_next_parent(port);



	for (i = 0; i < 3 && np; ++i) {

	for (i = 0; i < 2 && np; ++i) {

		struct property *prop;



		prop = of_find_property(np, "compatible", NULL);
@@ -111,6 +110,31 @@ omapdss_of_get_remote_device_node(const struct device_node *node) 
	return NULL;

}



u32 dss_of_port_get_port_number(struct device_node *port)

{

	int r;

	u32 reg;



	r = of_property_read_u32(port, "reg", &reg);

	if (r)

		reg = 0;



	return reg;

}



static struct device_node *omapdss_of_get_remote_port(const struct device_node *node)

{

	struct device_node *np;



	np = of_parse_phandle(node, "remote-endpoint", 0);

	if (!np)

		return NULL;



	np = of_get_next_parent(np);



	return np;

}



struct device_node *

omapdss_of_get_first_endpoint(const struct device_node *parent)

{
@@ -133,27 +157,25 @@ struct omap_dss_device * 
omapdss_of_find_source_for_first_ep(struct device_node *node)

{

	struct device_node *ep;

	struct device_node *src_node;

	struct device_node *src_port;

	struct omap_dss_device *src;



	ep = omapdss_of_get_first_endpoint(node);

	if (!ep)

		return ERR_PTR(-EINVAL);



	src_node = omapdss_of_get_remote_device_node(ep);



	src_port = omapdss_of_get_remote_port(ep);

	if (!src_port) {

		of_node_put(ep);



	if (!src_node)

		return ERR_PTR(-EINVAL);

	}



	src = omap_dss_find_output_by_node(src_node);

	of_node_put(ep);



	of_node_put(src_node);

	src = omap_dss_find_output_by_port_node(src_port);



	if (!src)

		return ERR_PTR(-EPROBE_DEFER);

	of_node_put(src_port);



	return src;

	return src ? src : ERR_PTR(-EPROBE_DEFER);

}

EXPORT_SYMBOL_GPL(omapdss_of_find_source_for_first_ep);

drivers/video/fbdev/omap2/dss/dss.h

+4 −0
Original line number Diff line number Diff line
@@ -215,6 +215,10 @@ enum dss_hdmi_venc_clk_source_select dss_get_hdmi_venc_clk_source(void); 
const char *dss_get_generic_clk_source_name(enum omap_dss_clk_source clk_src);

void dss_dump_clocks(struct seq_file *s);



/* dss-of */

struct device_node *dss_of_port_get_parent_device(struct device_node *port);

u32 dss_of_port_get_port_number(struct device_node *port);



#if defined(CONFIG_OMAP2_DSS_DEBUGFS)

void dss_debug_dump_clocks(struct seq_file *s);

#endif

drivers/video/fbdev/omap2/dss/output.c

+16 −3
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/of.h>



#include <video/omapdss.h>
@@ -131,18 +132,30 @@ struct omap_dss_device *omap_dss_find_output(const char *name) 
}

EXPORT_SYMBOL(omap_dss_find_output);



struct omap_dss_device *omap_dss_find_output_by_node(struct device_node *node)

struct omap_dss_device *omap_dss_find_output_by_port_node(struct device_node *port)

{

	struct device_node *src_node;

	struct omap_dss_device *out;

	u32 reg;



	src_node = dss_of_port_get_parent_device(port);

	if (!src_node)

		return NULL;



	reg = dss_of_port_get_port_number(port);



	list_for_each_entry(out, &output_list, list) {

		if (out->dev->of_node == node)

		if (out->dev->of_node == src_node && out->port_num == reg) {

			of_node_put(src_node);

			return omap_dss_get_device(out);

		}

	}



	of_node_put(src_node);



	return NULL;

}

EXPORT_SYMBOL(omap_dss_find_output_by_node);

EXPORT_SYMBOL(omap_dss_find_output_by_port_node);



struct omap_dss_device *omapdss_find_output_from_display(struct omap_dss_device *dssdev)

{