Commit 94d964e5 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

media: v4l2-fwnode: Move bus config structure to v4l2_mediabus.h 



To prepare for usage of the v4l2_fwnode_bus_* data structures to
describe bus configuration in the subdev .get_mbus_config() operation,
rename the structures with a v4l2_mbus_config_ prefix instead of
v4l2_fwnode_bus_, and move them to v4l2_mediabus.h.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent a2992999

drivers/media/i2c/ov5648.c

+2 −2
Original line number Diff line number Diff line
@@ -1112,7 +1112,7 @@ static int ov5648_pad_configure(struct ov5648_sensor *sensor) 


static int ov5648_mipi_configure(struct ov5648_sensor *sensor)

{

	struct v4l2_fwnode_bus_mipi_csi2 *bus_mipi_csi2 =

	struct v4l2_mbus_config_mipi_csi2 *bus_mipi_csi2 =

		&sensor->endpoint.bus.mipi_csi2;

	unsigned int lanes_count = bus_mipi_csi2->num_data_lanes;

	int ret;
@@ -1692,7 +1692,7 @@ static int ov5648_state_mipi_configure(struct ov5648_sensor *sensor, 
				       u32 mbus_code)

{

	struct ov5648_ctrls *ctrls = &sensor->ctrls;

	struct v4l2_fwnode_bus_mipi_csi2 *bus_mipi_csi2 =

	struct v4l2_mbus_config_mipi_csi2 *bus_mipi_csi2 =

		&sensor->endpoint.bus.mipi_csi2;

	unsigned long mipi_clk_rate;

	unsigned int bits_per_sample;

drivers/media/i2c/ov8865.c

+2 −2
Original line number Diff line number Diff line
@@ -1471,7 +1471,7 @@ static int ov8865_charge_pump_configure(struct ov8865_sensor *sensor) 


static int ov8865_mipi_configure(struct ov8865_sensor *sensor)

{

	struct v4l2_fwnode_bus_mipi_csi2 *bus_mipi_csi2 =

	struct v4l2_mbus_config_mipi_csi2 *bus_mipi_csi2 =

		&sensor->endpoint.bus.mipi_csi2;

	unsigned int lanes_count = bus_mipi_csi2->num_data_lanes;

	int ret;
@@ -2241,7 +2241,7 @@ static int ov8865_state_mipi_configure(struct ov8865_sensor *sensor, 
				       u32 mbus_code)

{

	struct ov8865_ctrls *ctrls = &sensor->ctrls;

	struct v4l2_fwnode_bus_mipi_csi2 *bus_mipi_csi2 =

	struct v4l2_mbus_config_mipi_csi2 *bus_mipi_csi2 =

		&sensor->endpoint.bus.mipi_csi2;

	unsigned long mipi_clk_rate;

	unsigned int bits_per_sample;

drivers/media/i2c/tc358743.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static const struct v4l2_dv_timings_cap tc358743_timings_cap = { 


struct tc358743_state {

	struct tc358743_platform_data pdata;

	struct v4l2_fwnode_bus_mipi_csi2 bus;

	struct v4l2_mbus_config_mipi_csi2 bus;

	struct v4l2_subdev sd;

	struct media_pad pad;

	struct v4l2_ctrl_handler hdl;

drivers/media/platform/qcom/camss/camss.c

+1 −1
Original line number Diff line number Diff line
@@ -1035,7 +1035,7 @@ static int camss_of_parse_endpoint_node(struct device *dev, 
					struct camss_async_subdev *csd)

{

	struct csiphy_lanes_cfg *lncfg = &csd->interface.csi2.lane_cfg;

	struct v4l2_fwnode_bus_mipi_csi2 *mipi_csi2;

	struct v4l2_mbus_config_mipi_csi2 *mipi_csi2;

	struct v4l2_fwnode_endpoint vep = { { 0 } };

	unsigned int i;

drivers/media/platform/rcar-vin/rcar-vin.h

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ struct rvin_parallel_entity { 
	struct v4l2_subdev *subdev;



	enum v4l2_mbus_type mbus_type;

	struct v4l2_fwnode_bus_parallel bus;

	struct v4l2_mbus_config_parallel bus;



	unsigned int source_pad;

	unsigned int sink_pad;