Commit 527261dd authored by Maxime Ripard's avatar Maxime Ripard

drm/sun4i: mixer: Simplify the get_id logic

Using the new helpers introduced since we wrote that code, we can simplify
the code to retrieve the mixer ID significantly.

The new code will also allow us to deal nicely with endpoints that don't
have a reg property, as expected in the case where there's a single
endpoint for a given port.
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Reviewed-by: default avatarChen-Yu Tsai <wens@csie.org>
Link: https://patchwork.freedesktop.org/patch/msgid/3da40505e18a981c5ad626127e14ff594a826ef5.1552594551.git-series.maxime.ripard@bootlin.com
parent eb40baef
...@@ -325,38 +325,22 @@ static struct regmap_config sun8i_mixer_regmap_config = { ...@@ -325,38 +325,22 @@ static struct regmap_config sun8i_mixer_regmap_config = {
static int sun8i_mixer_of_get_id(struct device_node *node) static int sun8i_mixer_of_get_id(struct device_node *node)
{ {
struct device_node *port, *ep; struct device_node *ep, *remote;
int ret = -EINVAL; struct of_endpoint of_ep;
/* output is port 1 */ /* Output port is 1, and we want the first endpoint. */
port = of_graph_get_port_by_id(node, 1); ep = of_graph_get_endpoint_by_regs(node, 1, -1);
if (!port) if (!ep)
return -EINVAL; return -EINVAL;
/* try to find downstream endpoint */ remote = of_graph_get_remote_endpoint(ep);
for_each_available_child_of_node(port, ep) { of_node_put(ep);
struct device_node *remote; if (!remote)
u32 reg; return -EINVAL;
remote = of_graph_get_remote_endpoint(ep);
if (!remote)
continue;
ret = of_property_read_u32(remote, "reg", &reg);
if (!ret) {
of_node_put(remote);
of_node_put(ep);
of_node_put(port);
return reg;
}
of_node_put(remote);
}
of_node_put(port);
return ret; of_graph_parse_endpoint(remote, &of_ep);
of_node_put(remote);
return of_ep.id;
} }
static int sun8i_mixer_bind(struct device *dev, struct device *master, static int sun8i_mixer_bind(struct device *dev, struct device *master,
......
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