[PATCH 1/2] drm/exynos/dpi: use of_graph_get_endpoint_by_regs helper

[PATCH 1/2] drm/exynos/dpi: use of_graph_get_endpoint_by_regs helper

[Philipp Zabel]

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>
---
 drivers/gpu/drm/exynos/exynos_drm_dpi.c | 69 +--------------------------------
 1 file changed, 2 insertions(+), 67 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_dpi.c b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
index 75e570f..5e38e74 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dpi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
@@ -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>
@@ -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,
@@ -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;
 
-- 
2.8.0.rc3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 2/2] drm/exynos/dsi: use of_graph_get_endpoint_by_regs helper

[Philipp Zabel]

This allows to remove the local of_graph_get_port_by_reg(),
of_graph_get_endpoint_by_reg(), and of_get_child_by_name_reg()
functions.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 drivers/gpu/drm/exynos/exynos_drm_dsi.c | 57 ++-------------------------------
 1 file changed, 3 insertions(+), 54 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index 63c84a1..61251fe 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -1641,50 +1641,6 @@ static const struct drm_encoder_funcs exynos_dsi_encoder_funcs = {
 
 MODULE_DEVICE_TABLE(of, exynos_dsi_of_match);
 
-/* 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 int exynos_dsi_of_read_u32(const struct device_node *np,
 				  const char *propname, u32 *out_value)
 {
@@ -1706,7 +1662,7 @@ static int exynos_dsi_parse_dt(struct exynos_dsi *dsi)
 {
 	struct device *dev = dsi->dev;
 	struct device_node *node = dev->of_node;
-	struct device_node *port, *ep;
+	struct device_node *ep;
 	int ret;
 
 	ret = exynos_dsi_of_read_u32(node, "samsung,pll-clock-frequency",
@@ -1714,16 +1670,9 @@ static int exynos_dsi_parse_dt(struct exynos_dsi *dsi)
 	if (ret < 0)
 		return ret;
 
-	port = of_graph_get_port_by_reg(node, DSI_PORT_OUT);
-	if (!port) {
-		dev_err(dev, "no output port specified\n");
-		return -EINVAL;
-	}
-
-	ep = of_graph_get_endpoint_by_reg(port, 0);
-	of_node_put(port);
+	ep = of_graph_get_endpoint_by_regs(node, DSI_PORT_OUT, 0);
 	if (!ep) {
-		dev_err(dev, "no endpoint specified in output port\n");
+		dev_err(dev, "no output port with endpoint specified\n");
 		return -EINVAL;
 	}
 
-- 
2.8.0.rc3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 1/2] drm/exynos/dpi: use of_graph_get_endpoint_by_regs helper

[Andrzej Hajda]

On 05/03/2016 03:47 PM, Philipp Zabel wrote:
> 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>

Thanks for the patch.

Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
--
Regards
Andrzej

> ---
>  drivers/gpu/drm/exynos/exynos_drm_dpi.c | 69 +--------------------------------
>  1 file changed, 2 insertions(+), 67 deletions(-)
> 
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_dpi.c b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
> index 75e570f..5e38e74 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_dpi.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
> @@ -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>
> @@ -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,
> @@ -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;
>  
> 

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 2/2] drm/exynos/dsi: use of_graph_get_endpoint_by_regs helper

[Andrzej Hajda]

On 05/03/2016 03:47 PM, Philipp Zabel wrote:
> This allows to remove the local of_graph_get_port_by_reg(),
> of_graph_get_endpoint_by_reg(), and of_get_child_by_name_reg()
> functions.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>

Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
--
Regards
Andrzej

> ---
>  drivers/gpu/drm/exynos/exynos_drm_dsi.c | 57 ++-------------------------------
>  1 file changed, 3 insertions(+), 54 deletions(-)
> 
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
> index 63c84a1..61251fe 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
> @@ -1641,50 +1641,6 @@ static const struct drm_encoder_funcs exynos_dsi_encoder_funcs = {
>  
>  MODULE_DEVICE_TABLE(of, exynos_dsi_of_match);
>  
> -/* 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 int exynos_dsi_of_read_u32(const struct device_node *np,
>  				  const char *propname, u32 *out_value)
>  {
> @@ -1706,7 +1662,7 @@ static int exynos_dsi_parse_dt(struct exynos_dsi *dsi)
>  {
>  	struct device *dev = dsi->dev;
>  	struct device_node *node = dev->of_node;
> -	struct device_node *port, *ep;
> +	struct device_node *ep;
>  	int ret;
>  
>  	ret = exynos_dsi_of_read_u32(node, "samsung,pll-clock-frequency",
> @@ -1714,16 +1670,9 @@ static int exynos_dsi_parse_dt(struct exynos_dsi *dsi)
>  	if (ret < 0)
>  		return ret;
>  
> -	port = of_graph_get_port_by_reg(node, DSI_PORT_OUT);
> -	if (!port) {
> -		dev_err(dev, "no output port specified\n");
> -		return -EINVAL;
> -	}
> -
> -	ep = of_graph_get_endpoint_by_reg(port, 0);
> -	of_node_put(port);
> +	ep = of_graph_get_endpoint_by_regs(node, DSI_PORT_OUT, 0);
>  	if (!ep) {
> -		dev_err(dev, "no endpoint specified in output port\n");
> +		dev_err(dev, "no output port with endpoint specified\n");
>  		return -EINVAL;
>  	}
>  
> 

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel