Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd9fdb78 authored by Philipp Zabel's avatar Philipp Zabel
Browse files

[media] of: move graph helpers from drivers/media/v4l2-core to drivers/of 



This patch moves the parsing helpers used to parse connected graphs
in the device tree, like the video interface bindings documented in
Documentation/devicetree/bindings/media/video-interfaces.txt, from
drivers/media/v4l2-core/v4l2-of.c into drivers/of/base.c.

This allows to reuse the same parser code from outside the V4L2
framework, most importantly from display drivers.
The functions v4l2_of_get_next_endpoint, v4l2_of_get_remote_port,
and v4l2_of_get_remote_port_parent are moved. They are renamed to
of_graph_get_next_endpoint, of_graph_get_remote_port, and
of_graph_get_remote_port_parent, respectively.
Since there are not that many current users yet, switch all of
them to the new functions right away.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Acked-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
Acked-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
parent 0414855f

drivers/media/i2c/adv7343.c

+2 −2
Original line number Diff line number Diff line
@@ -26,12 +26,12 @@ 
#include <linux/videodev2.h>

#include <linux/uaccess.h>

#include <linux/of.h>

#include <linux/of_graph.h>



#include <media/adv7343.h>

#include <media/v4l2-async.h>

#include <media/v4l2-device.h>

#include <media/v4l2-ctrls.h>

#include <media/v4l2-of.h>



#include "adv7343_regs.h"
@@ -410,7 +410,7 @@ adv7343_get_pdata(struct i2c_client *client) 
	if (!IS_ENABLED(CONFIG_OF) || !client->dev.of_node)

		return client->dev.platform_data;



	np = v4l2_of_get_next_endpoint(client->dev.of_node, NULL);

	np = of_graph_get_next_endpoint(client->dev.of_node, NULL);

	if (!np)

		return NULL;

drivers/media/i2c/mt9p031.c

+2 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_gpio.h>

#include <linux/of_graph.h>

#include <linux/pm.h>

#include <linux/regulator/consumer.h>

#include <linux/slab.h>
@@ -29,7 +30,6 @@ 
#include <media/mt9p031.h>

#include <media/v4l2-ctrls.h>

#include <media/v4l2-device.h>

#include <media/v4l2-of.h>

#include <media/v4l2-subdev.h>



#include "aptina-pll.h"
@@ -943,7 +943,7 @@ mt9p031_get_pdata(struct i2c_client *client) 
	if (!IS_ENABLED(CONFIG_OF) || !client->dev.of_node)

		return client->dev.platform_data;



	np = v4l2_of_get_next_endpoint(client->dev.of_node, NULL);

	np = of_graph_get_next_endpoint(client->dev.of_node, NULL);

	if (!np)

		return NULL;

drivers/media/i2c/s5k5baf.c

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/media.h>

#include <linux/module.h>

#include <linux/of_gpio.h>

#include <linux/of_graph.h>

#include <linux/regulator/consumer.h>

#include <linux/slab.h>
@@ -1855,7 +1856,7 @@ static int s5k5baf_parse_device_node(struct s5k5baf *state, struct device *dev) 
	if (ret < 0)

		return ret;



	node_ep = v4l2_of_get_next_endpoint(node, NULL);

	node_ep = of_graph_get_next_endpoint(node, NULL);

	if (!node_ep) {

		dev_err(dev, "no endpoint defined at node %s\n",

			node->full_name);

drivers/media/i2c/tvp514x.c

+2 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <linux/module.h>

#include <linux/v4l2-mediabus.h>

#include <linux/of.h>

#include <linux/of_graph.h>



#include <media/v4l2-async.h>

#include <media/v4l2-device.h>
@@ -1068,7 +1069,7 @@ tvp514x_get_pdata(struct i2c_client *client) 
	if (!IS_ENABLED(CONFIG_OF) || !client->dev.of_node)

		return client->dev.platform_data;



	endpoint = v4l2_of_get_next_endpoint(client->dev.of_node, NULL);

	endpoint = of_graph_get_next_endpoint(client->dev.of_node, NULL);

	if (!endpoint)

		return NULL;

drivers/media/i2c/tvp7002.c

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/videodev2.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_graph.h>

#include <linux/v4l2-dv-timings.h>

#include <media/tvp7002.h>

#include <media/v4l2-async.h>
@@ -957,7 +958,7 @@ tvp7002_get_pdata(struct i2c_client *client) 
	if (!IS_ENABLED(CONFIG_OF) || !client->dev.of_node)

		return client->dev.platform_data;



	endpoint = v4l2_of_get_next_endpoint(client->dev.of_node, NULL);

	endpoint = of_graph_get_next_endpoint(client->dev.of_node, NULL);

	if (!endpoint)

		return NULL;