fbdev: omap2: replace of_graph_get_next_endpoint()

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>

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
index b7eb17a16ec42cce3e5631cc91705a7bcf233ce2..1f13bcf73da54fe1eb38724be8e27065f98b5bb8 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
@@ -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>
 
@@ -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;
 

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss-of.c b/drivers/video/fbdev/omap2/omapfb/dss/dss-of.c
index 0282d4eef139d4971a86b2c2e5b0b289ac9c5a19..14965a3fd05b712f43069ff49a296410da250d71 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/dss-of.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dss-of.c
@@ -130,24 +130,6 @@ 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)
 {
@@ -155,7 +137,7 @@ omapdss_of_find_source_for_first_ep(struct device_node *node)
        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);
 

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
index f05b4e35a8427c42b8c51f04c63f5379ebc2e1ee..8f407ec134dc3302d643b747c21883654ee497fa 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
@@ -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>
@@ -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;
 

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
index 03292945b1d40e8c02e2d36c11e38604a31ddd74..4ad219f522b90befee7ec311851441f9a79feb18 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
@@ -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>
@@ -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;
 

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/venc.c b/drivers/video/fbdev/omap2/omapfb/dss/venc.c
index c9d40e28a06f90afec20a44ca759672c06165e4d..0bd80d3b8f1b78b3c87ede70b4a50fafee9ec263 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/venc.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/venc.c
@@ -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>
@@ -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;
 

diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c
index fa943612c4e2b32b81877afa4aeb503fa3d69967..2ef56fa28aff369743f8e5c5db99f90abfa4893b 100644 (file)
--- a/drivers/video/fbdev/pxafb.c
+++ b/drivers/video/fbdev/pxafb.c
@@ -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;

diff --git a/include/video/omapfb_dss.h b/include/video/omapfb_dss.h
index e8eaac2cb7b85043c19ba7b9bfc42f7377e01eb1..a8c0c3eeeb5ba14a4df1cb8eea0dae7309cc777a 100644 (file)
--- a/include/video/omapfb_dss.h
+++ b/include/video/omapfb_dss.h
@@ -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