Skip to content

Commit

Permalink
drm/exynos/dpi: use of_graph_get_endpoint_by_regs helper
Browse files Browse the repository at this point in the history
This allows to remove the local of_graph_get_port_by_reg(),
of_graph_get_endpoint_by_reg(), of_get_child_by_name_reg(),
and of_graph_get_remote_port_parent() functions.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
  • Loading branch information
Philipp Zabel authored and Inki Dae committed May 10, 2016
1 parent 562d545 commit fb38b1f
Showing 1 changed file with 2 additions and 67 deletions.
69 changes: 2 additions & 67 deletions drivers/gpu/drm/exynos/exynos_drm_dpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <drm/drm_panel.h>
#include <drm/drm_atomic_helper.h>

#include <linux/of_graph.h>
#include <linux/regulator/consumer.h>

#include <video/of_videomode.h>
Expand Down Expand Up @@ -164,67 +165,6 @@ static const struct drm_encoder_funcs exynos_dpi_encoder_funcs = {
.destroy = drm_encoder_cleanup,
};

/* of_* functions will be removed after merge of of_graph patches */
static struct device_node *
of_get_child_by_name_reg(struct device_node *parent, const char *name, u32 reg)
{
struct device_node *np;

for_each_child_of_node(parent, np) {
u32 r;

if (!np->name || of_node_cmp(np->name, name))
continue;

if (of_property_read_u32(np, "reg", &r) < 0)
r = 0;

if (reg == r)
break;
}

return np;
}

static struct device_node *of_graph_get_port_by_reg(struct device_node *parent,
u32 reg)
{
struct device_node *ports, *port;

ports = of_get_child_by_name(parent, "ports");
if (ports)
parent = ports;

port = of_get_child_by_name_reg(parent, "port", reg);

of_node_put(ports);

return port;
}

static struct device_node *
of_graph_get_endpoint_by_reg(struct device_node *port, u32 reg)
{
return of_get_child_by_name_reg(port, "endpoint", reg);
}

static struct device_node *
of_graph_get_remote_port_parent(const struct device_node *node)
{
struct device_node *np;
unsigned int depth;

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

/* Walk 3 levels up only if there is 'ports' node. */
for (depth = 3; depth && np; depth--) {
np = of_get_next_parent(np);
if (depth == 2 && of_node_cmp(np->name, "ports"))
break;
}
return np;
}

enum {
FIMD_PORT_IN0,
FIMD_PORT_IN1,
Expand All @@ -237,12 +177,7 @@ static struct device_node *exynos_dpi_of_find_panel_node(struct device *dev)
{
struct device_node *np, *ep;

np = of_graph_get_port_by_reg(dev->of_node, FIMD_PORT_RGB);
if (!np)
return NULL;

ep = of_graph_get_endpoint_by_reg(np, 0);
of_node_put(np);
ep = of_graph_get_endpoint_by_regs(dev->of_node, FIMD_PORT_RGB, 0);
if (!ep)
return NULL;

Expand Down

0 comments on commit fb38b1f

Please sign in to comment.