Commit 8147e2e8 authored by Rob Herring's avatar Rob Herring

Merge tag 'of-graph-for-4.0' of git://git.pengutronix.de/git/pza/linux into for-next

Pull of-graph helpers from Philipp Zabel:
of: Add of-graph helpers to loop over endpoints and find ports by id

This series converts of_graph_get_next_endpoint to decrement the refcount of
the passed prev parameter. This allows to add a for_each_endpoint_of_node
helper macro to loop over all endpoints in a device tree node.
The of_graph_get_port_by_id function is added to retrieve a port by its known
port id (contained in the reg property) from the device tree.
parents bc465aa9 bfe446e3
...@@ -52,15 +52,6 @@ of_coresight_get_endpoint_device(struct device_node *endpoint) ...@@ -52,15 +52,6 @@ of_coresight_get_endpoint_device(struct device_node *endpoint)
endpoint, of_dev_node_match); endpoint, of_dev_node_match);
} }
static struct device_node *of_get_coresight_endpoint(
const struct device_node *parent, struct device_node *prev)
{
struct device_node *node = of_graph_get_next_endpoint(parent, prev);
of_node_put(prev);
return node;
}
static void of_coresight_get_ports(struct device_node *node, static void of_coresight_get_ports(struct device_node *node,
int *nr_inport, int *nr_outport) int *nr_inport, int *nr_outport)
{ {
...@@ -68,7 +59,7 @@ static void of_coresight_get_ports(struct device_node *node, ...@@ -68,7 +59,7 @@ static void of_coresight_get_ports(struct device_node *node,
int in = 0, out = 0; int in = 0, out = 0;
do { do {
ep = of_get_coresight_endpoint(node, ep); ep = of_graph_get_next_endpoint(node, ep);
if (!ep) if (!ep)
break; break;
...@@ -140,7 +131,7 @@ struct coresight_platform_data *of_get_coresight_platform_data( ...@@ -140,7 +131,7 @@ struct coresight_platform_data *of_get_coresight_platform_data(
/* Iterate through each port to discover topology */ /* Iterate through each port to discover topology */
do { do {
/* Get a handle on a port */ /* Get a handle on a port */
ep = of_get_coresight_endpoint(node, ep); ep = of_graph_get_next_endpoint(node, ep);
if (!ep) if (!ep)
break; break;
......
...@@ -431,15 +431,6 @@ int imx_drm_encoder_parse_of(struct drm_device *drm, ...@@ -431,15 +431,6 @@ int imx_drm_encoder_parse_of(struct drm_device *drm,
} }
EXPORT_SYMBOL_GPL(imx_drm_encoder_parse_of); EXPORT_SYMBOL_GPL(imx_drm_encoder_parse_of);
static struct device_node *imx_drm_of_get_next_endpoint(
const struct device_node *parent, struct device_node *prev)
{
struct device_node *node = of_graph_get_next_endpoint(parent, prev);
of_node_put(prev);
return node;
}
/* /*
* @node: device tree node containing encoder input ports * @node: device tree node containing encoder input ports
* @encoder: drm_encoder * @encoder: drm_encoder
...@@ -457,7 +448,7 @@ int imx_drm_encoder_get_mux_id(struct device_node *node, ...@@ -457,7 +448,7 @@ int imx_drm_encoder_get_mux_id(struct device_node *node,
return -EINVAL; return -EINVAL;
do { do {
ep = imx_drm_of_get_next_endpoint(node, ep); ep = of_graph_get_next_endpoint(node, ep);
if (!ep) if (!ep)
break; break;
......
...@@ -206,7 +206,7 @@ static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu, ...@@ -206,7 +206,7 @@ static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu,
enum rcar_du_encoder_type enc_type = RCAR_DU_ENCODER_NONE; enum rcar_du_encoder_type enc_type = RCAR_DU_ENCODER_NONE;
struct device_node *connector = NULL; struct device_node *connector = NULL;
struct device_node *encoder = NULL; struct device_node *encoder = NULL;
struct device_node *prev = NULL; struct device_node *ep_node = NULL;
struct device_node *entity_ep_node; struct device_node *entity_ep_node;
struct device_node *entity; struct device_node *entity;
int ret; int ret;
...@@ -225,11 +225,7 @@ static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu, ...@@ -225,11 +225,7 @@ static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu,
entity_ep_node = of_parse_phandle(ep->local_node, "remote-endpoint", 0); entity_ep_node = of_parse_phandle(ep->local_node, "remote-endpoint", 0);
while (1) { while (1) {
struct device_node *ep_node; ep_node = of_graph_get_next_endpoint(entity, ep_node);
ep_node = of_graph_get_next_endpoint(entity, prev);
of_node_put(prev);
prev = ep_node;
if (!ep_node) if (!ep_node)
break; break;
...@@ -300,7 +296,7 @@ static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu, ...@@ -300,7 +296,7 @@ static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu,
static int rcar_du_encoders_init(struct rcar_du_device *rcdu) static int rcar_du_encoders_init(struct rcar_du_device *rcdu)
{ {
struct device_node *np = rcdu->dev->of_node; struct device_node *np = rcdu->dev->of_node;
struct device_node *prev = NULL; struct device_node *ep_node = NULL;
unsigned int num_encoders = 0; unsigned int num_encoders = 0;
/* /*
...@@ -308,15 +304,12 @@ static int rcar_du_encoders_init(struct rcar_du_device *rcdu) ...@@ -308,15 +304,12 @@ static int rcar_du_encoders_init(struct rcar_du_device *rcdu)
* pipeline. * pipeline.
*/ */
while (1) { while (1) {
struct device_node *ep_node;
enum rcar_du_output output; enum rcar_du_output output;
struct of_endpoint ep; struct of_endpoint ep;
unsigned int i; unsigned int i;
int ret; int ret;
ep_node = of_graph_get_next_endpoint(np, prev); ep_node = of_graph_get_next_endpoint(np, ep_node);
of_node_put(prev);
prev = ep_node;
if (ep_node == NULL) if (ep_node == NULL)
break; break;
......
...@@ -2504,7 +2504,6 @@ vpfe_get_pdata(struct platform_device *pdev) ...@@ -2504,7 +2504,6 @@ vpfe_get_pdata(struct platform_device *pdev)
GFP_KERNEL); GFP_KERNEL);
pdata->asd[i]->match_type = V4L2_ASYNC_MATCH_OF; pdata->asd[i]->match_type = V4L2_ASYNC_MATCH_OF;
pdata->asd[i]->match.of.node = rem; pdata->asd[i]->match.of.node = rem;
of_node_put(endpoint);
of_node_put(rem); of_node_put(rem);
} }
......
...@@ -1694,7 +1694,6 @@ static void scan_of_host(struct soc_camera_host *ici) ...@@ -1694,7 +1694,6 @@ static void scan_of_host(struct soc_camera_host *ici)
if (!i) if (!i)
soc_of_bind(ici, epn, ren->parent); soc_of_bind(ici, epn, ren->parent);
of_node_put(epn);
of_node_put(ren); of_node_put(ren);
if (i) { if (i) {
...@@ -1702,6 +1701,8 @@ static void scan_of_host(struct soc_camera_host *ici) ...@@ -1702,6 +1701,8 @@ static void scan_of_host(struct soc_camera_host *ici)
break; break;
} }
} }
of_node_put(epn);
} }
#else #else
......
...@@ -2082,14 +2082,45 @@ int of_graph_parse_endpoint(const struct device_node *node, ...@@ -2082,14 +2082,45 @@ int of_graph_parse_endpoint(const struct device_node *node,
} }
EXPORT_SYMBOL(of_graph_parse_endpoint); EXPORT_SYMBOL(of_graph_parse_endpoint);
/**
* of_graph_get_port_by_id() - get the port matching a given id
* @parent: pointer to the parent device node
* @id: id of the port
*
* Return: A 'port' node pointer with refcount incremented. The caller
* has to use of_node_put() on it when done.
*/
struct device_node *of_graph_get_port_by_id(struct device_node *parent, u32 id)
{
struct device_node *node, *port;
node = of_get_child_by_name(parent, "ports");
if (node)
parent = node;
for_each_child_of_node(parent, port) {
u32 port_id = 0;
if (of_node_cmp(port->name, "port") != 0)
continue;
of_property_read_u32(port, "reg", &port_id);
if (id == port_id)
break;
}
of_node_put(node);
return port;
}
EXPORT_SYMBOL(of_graph_get_port_by_id);
/** /**
* of_graph_get_next_endpoint() - get next endpoint node * of_graph_get_next_endpoint() - get next endpoint node
* @parent: pointer to the parent device node * @parent: pointer to the parent device node
* @prev: previous endpoint node, or NULL to get first * @prev: previous endpoint node, or NULL to get first
* *
* Return: An 'endpoint' node pointer with refcount incremented. Refcount * Return: An 'endpoint' node pointer with refcount incremented. Refcount
* of the passed @prev node is not decremented, the caller have to use * of the passed @prev node is decremented.
* of_node_put() on it when done.
*/ */
struct device_node *of_graph_get_next_endpoint(const struct device_node *parent, struct device_node *of_graph_get_next_endpoint(const struct device_node *parent,
struct device_node *prev) struct device_node *prev)
...@@ -2125,12 +2156,6 @@ struct device_node *of_graph_get_next_endpoint(const struct device_node *parent, ...@@ -2125,12 +2156,6 @@ struct device_node *of_graph_get_next_endpoint(const struct device_node *parent,
if (WARN_ONCE(!port, "%s(): endpoint %s has no parent node\n", if (WARN_ONCE(!port, "%s(): endpoint %s has no parent node\n",
__func__, prev->full_name)) __func__, prev->full_name))
return NULL; return NULL;
/*
* Avoid dropping prev node refcount to 0 when getting the next
* child below.
*/
of_node_get(prev);
} }
while (1) { while (1) {
......
...@@ -164,20 +164,15 @@ static void __init omapdss_walk_device(struct device_node *node, bool root) ...@@ -164,20 +164,15 @@ static void __init omapdss_walk_device(struct device_node *node, bool root)
pn = of_graph_get_remote_port_parent(n); pn = of_graph_get_remote_port_parent(n);
if (!pn) { if (!pn)
of_node_put(n);
continue; continue;
}
if (!of_device_is_available(pn) || omapdss_list_contains(pn)) { if (!of_device_is_available(pn) || omapdss_list_contains(pn)) {
of_node_put(pn); of_node_put(pn);
of_node_put(n);
continue; continue;
} }
omapdss_walk_device(pn, false); omapdss_walk_device(pn, false);
of_node_put(n);
} }
} }
......
...@@ -26,9 +26,21 @@ struct of_endpoint { ...@@ -26,9 +26,21 @@ struct of_endpoint {
const struct device_node *local_node; const struct device_node *local_node;
}; };
/**
* for_each_endpoint_of_node - iterate over every endpoint in a device node
* @parent: parent device node containing ports and endpoints
* @child: loop variable pointing to the current endpoint node
*
* When breaking out of the loop, of_node_put(child) has to be called manually.
*/
#define for_each_endpoint_of_node(parent, child) \
for (child = of_graph_get_next_endpoint(parent, NULL); child != NULL; \
child = of_graph_get_next_endpoint(parent, child))
#ifdef CONFIG_OF #ifdef CONFIG_OF
int of_graph_parse_endpoint(const struct device_node *node, int of_graph_parse_endpoint(const struct device_node *node,
struct of_endpoint *endpoint); struct of_endpoint *endpoint);
struct device_node *of_graph_get_port_by_id(struct device_node *node, u32 id);
struct device_node *of_graph_get_next_endpoint(const struct device_node *parent, struct device_node *of_graph_get_next_endpoint(const struct device_node *parent,
struct device_node *previous); struct device_node *previous);
struct device_node *of_graph_get_remote_port_parent( struct device_node *of_graph_get_remote_port_parent(
...@@ -42,6 +54,12 @@ static inline int of_graph_parse_endpoint(const struct device_node *node, ...@@ -42,6 +54,12 @@ static inline int of_graph_parse_endpoint(const struct device_node *node,
return -ENOSYS; return -ENOSYS;
} }
static inline struct device_node *of_graph_get_port_by_id(
struct device_node *node, u32 id)
{
return NULL;
}
static inline struct device_node *of_graph_get_next_endpoint( static inline struct device_node *of_graph_get_next_endpoint(
const struct device_node *parent, const struct device_node *parent,
struct device_node *previous) struct device_node *previous)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment