Skip to content

Commit

Permalink
fbdev: omap2: replace of_graph_get_next_endpoint()
Browse files Browse the repository at this point in the history
From DT point of view, in general, drivers should be asking for a
specific port number because their function is fixed in the binding.

of_graph_get_next_endpoint() doesn't match to this concept.

Simply replace

	- of_graph_get_next_endpoint(xxx, NULL);
	+ of_graph_get_endpoint_by_regs(xxx, 0, -1);

Link: https://lore.kernel.org/r/20240202174941.GA310089-robh@kernel.org
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Helge Deller <deller@gmx.de>
  • Loading branch information
Kuninori Morimoto authored and Helge Deller committed Mar 25, 2024
1 parent 4cece76 commit ada5caa
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 27 deletions.
3 changes: 2 additions & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/dsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <linux/debugfs.h>
#include <linux/pm_runtime.h>
#include <linux/of.h>
#include <linux/of_graph.h>
#include <linux/of_platform.h>
#include <linux/component.h>

Expand Down Expand Up @@ -5079,7 +5080,7 @@ static int dsi_probe_of(struct platform_device *pdev)
struct device_node *ep;
struct omap_dsi_pin_config pin_cfg;

ep = omapdss_of_get_first_endpoint(node);
ep = of_graph_get_endpoint_by_regs(node, 0, -1);
if (!ep)
return 0;

Expand Down
20 changes: 1 addition & 19 deletions drivers/video/fbdev/omap2/omapfb/dss/dss-of.c
Original file line number Diff line number Diff line change
Expand Up @@ -130,32 +130,14 @@ static struct device_node *omapdss_of_get_remote_port(const struct device_node *
return np;
}

struct device_node *
omapdss_of_get_first_endpoint(const struct device_node *parent)
{
struct device_node *port, *ep;

port = omapdss_of_get_next_port(parent, NULL);

if (!port)
return NULL;

ep = omapdss_of_get_next_endpoint(port, NULL);

of_node_put(port);

return ep;
}
EXPORT_SYMBOL_GPL(omapdss_of_get_first_endpoint);

struct omap_dss_device *
omapdss_of_find_source_for_first_ep(struct device_node *node)
{
struct device_node *ep;
struct device_node *src_port;
struct omap_dss_device *src;

ep = omapdss_of_get_first_endpoint(node);
ep = of_graph_get_endpoint_by_regs(node, 0, -1);
if (!ep)
return ERR_PTR(-EINVAL);

Expand Down
3 changes: 2 additions & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <linux/pm_runtime.h>
#include <linux/clk.h>
#include <linux/of.h>
#include <linux/of_graph.h>
#include <linux/regulator/consumer.h>
#include <linux/component.h>
#include <video/omapfb_dss.h>
Expand Down Expand Up @@ -529,7 +530,7 @@ static int hdmi_probe_of(struct platform_device *pdev)
struct device_node *ep;
int r;

ep = omapdss_of_get_first_endpoint(node);
ep = of_graph_get_endpoint_by_regs(node, 0, -1);
if (!ep)
return 0;

Expand Down
3 changes: 2 additions & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <linux/pm_runtime.h>
#include <linux/clk.h>
#include <linux/of.h>
#include <linux/of_graph.h>
#include <linux/regulator/consumer.h>
#include <linux/component.h>
#include <video/omapfb_dss.h>
Expand Down Expand Up @@ -561,7 +562,7 @@ static int hdmi_probe_of(struct platform_device *pdev)
struct device_node *ep;
int r;

ep = omapdss_of_get_first_endpoint(node);
ep = of_graph_get_endpoint_by_regs(node, 0, -1);
if (!ep)
return 0;

Expand Down
3 changes: 2 additions & 1 deletion drivers/video/fbdev/omap2/omapfb/dss/venc.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <linux/regulator/consumer.h>
#include <linux/pm_runtime.h>
#include <linux/of.h>
#include <linux/of_graph.h>
#include <linux/component.h>

#include <video/omapfb_dss.h>
Expand Down Expand Up @@ -764,7 +765,7 @@ static int venc_probe_of(struct platform_device *pdev)
u32 channels;
int r;

ep = omapdss_of_get_first_endpoint(node);
ep = of_graph_get_endpoint_by_regs(node, 0, -1);
if (!ep)
return 0;

Expand Down
2 changes: 1 addition & 1 deletion drivers/video/fbdev/pxafb.c
Original file line number Diff line number Diff line change
Expand Up @@ -2171,7 +2171,7 @@ static int of_get_pxafb_mode_info(struct device *dev,
u32 bus_width;
int ret, i;

np = of_graph_get_next_endpoint(dev->of_node, NULL);
np = of_graph_get_endpoint_by_regs(dev->of_node, 0, -1);
if (!np) {
dev_err(dev, "could not find endpoint\n");
return -EINVAL;
Expand Down
3 changes: 0 additions & 3 deletions include/video/omapfb_dss.h
Original file line number Diff line number Diff line change
Expand Up @@ -819,9 +819,6 @@ struct device_node *
omapdss_of_get_next_endpoint(const struct device_node *parent,
struct device_node *prev);

struct device_node *
omapdss_of_get_first_endpoint(const struct device_node *parent);

struct omap_dss_device *
omapdss_of_find_source_for_first_ep(struct device_node *node);
#else
Expand Down

0 comments on commit ada5caa

Please sign in to comment.