Commit 25a34811 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

[media] soc-camera: split struct soc_camera_link into host and subdevice parts 



struct soc_camera_link currently contains fields, used both by sensor and
bridge drivers. To make subdevice driver re-use simpler, split it into a
host and a subdevice parts.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent dd669e90

drivers/media/i2c/soc_camera/imx074.c

+7 −7
Original line number Diff line number Diff line
@@ -271,9 +271,9 @@ static int imx074_g_chip_ident(struct v4l2_subdev *sd, 
static int imx074_s_power(struct v4l2_subdev *sd, int on)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct soc_camera_link *icl = soc_camera_i2c_to_link(client);

	struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);



	return soc_camera_set_power(&client->dev, icl, on);

	return soc_camera_set_power(&client->dev, ssdd, on);

}



static int imx074_g_mbus_config(struct v4l2_subdev *sd,
@@ -430,10 +430,10 @@ static int imx074_probe(struct i2c_client *client, 
{

	struct imx074 *priv;

	struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);

	struct soc_camera_link *icl = soc_camera_i2c_to_link(client);

	struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);

	int ret;



	if (!icl) {

	if (!ssdd) {

		dev_err(&client->dev, "IMX074: missing platform data!\n");

		return -EINVAL;

	}
@@ -464,10 +464,10 @@ static int imx074_probe(struct i2c_client *client, 
static int imx074_remove(struct i2c_client *client)

{

	struct imx074 *priv = to_imx074(client);

	struct soc_camera_link *icl = soc_camera_i2c_to_link(client);

	struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);



	if (icl->free_bus)

		icl->free_bus(icl);

	if (ssdd->free_bus)

		ssdd->free_bus(ssdd);

	kfree(priv);



	return 0;

drivers/media/i2c/soc_camera/mt9m001.c

+19 −19
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
/*

 * mt9m001 i2c address 0x5d

 * The platform has to define struct i2c_board_info objects and link to them

 * from struct soc_camera_link

 * from struct soc_camera_host_desc

 */



/* mt9m001 selected register addresses */
@@ -380,9 +380,9 @@ static int mt9m001_s_register(struct v4l2_subdev *sd, 
static int mt9m001_s_power(struct v4l2_subdev *sd, int on)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct soc_camera_link *icl = soc_camera_i2c_to_link(client);

	struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);



	return soc_camera_set_power(&client->dev, icl, on);

	return soc_camera_set_power(&client->dev, ssdd, on);

}



static int mt9m001_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
@@ -482,7 +482,7 @@ static int mt9m001_s_ctrl(struct v4l2_ctrl *ctrl) 
 * Interface active, can use i2c. If it fails, it can indeed mean, that

 * this wasn't our capture interface, so, we wait for the right one

 */

static int mt9m001_video_probe(struct soc_camera_link *icl,

static int mt9m001_video_probe(struct soc_camera_subdev_desc *ssdd,

			       struct i2c_client *client)

{

	struct mt9m001 *mt9m001 = to_mt9m001(client);
@@ -526,8 +526,8 @@ static int mt9m001_video_probe(struct soc_camera_link *icl, 
	 * The platform may support different bus widths due to

	 * different routing of the data lines.

	 */

	if (icl->query_bus_param)

		flags = icl->query_bus_param(icl);

	if (ssdd->query_bus_param)

		flags = ssdd->query_bus_param(ssdd);

	else

		flags = SOCAM_DATAWIDTH_10;
@@ -558,10 +558,10 @@ done: 
	return ret;

}



static void mt9m001_video_remove(struct soc_camera_link *icl)

static void mt9m001_video_remove(struct soc_camera_subdev_desc *ssdd)

{

	if (icl->free_bus)

		icl->free_bus(icl);

	if (ssdd->free_bus)

		ssdd->free_bus(ssdd);

}



static int mt9m001_g_skip_top_lines(struct v4l2_subdev *sd, u32 *lines)
@@ -605,14 +605,14 @@ static int mt9m001_g_mbus_config(struct v4l2_subdev *sd, 
				struct v4l2_mbus_config *cfg)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct soc_camera_link *icl = soc_camera_i2c_to_link(client);

	struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);



	/* MT9M001 has all capture_format parameters fixed */

	cfg->flags = V4L2_MBUS_PCLK_SAMPLE_FALLING |

		V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_HIGH |

		V4L2_MBUS_DATA_ACTIVE_HIGH | V4L2_MBUS_MASTER;

	cfg->type = V4L2_MBUS_PARALLEL;

	cfg->flags = soc_camera_apply_board_flags(icl, cfg);

	cfg->flags = soc_camera_apply_board_flags(ssdd, cfg);



	return 0;

}
@@ -621,12 +621,12 @@ static int mt9m001_s_mbus_config(struct v4l2_subdev *sd, 
				const struct v4l2_mbus_config *cfg)

{

	const struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct soc_camera_link *icl = soc_camera_i2c_to_link(client);

	struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);

	struct mt9m001 *mt9m001 = to_mt9m001(client);

	unsigned int bps = soc_mbus_get_fmtdesc(mt9m001->fmt->code)->bits_per_sample;



	if (icl->set_bus_param)

		return icl->set_bus_param(icl, 1 << (bps - 1));

	if (ssdd->set_bus_param)

		return ssdd->set_bus_param(ssdd, 1 << (bps - 1));



	/*

	 * Without board specific bus width settings we only support the
@@ -663,10 +663,10 @@ static int mt9m001_probe(struct i2c_client *client, 
{

	struct mt9m001 *mt9m001;

	struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);

	struct soc_camera_link *icl = soc_camera_i2c_to_link(client);

	struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);

	int ret;



	if (!icl) {

	if (!ssdd) {

		dev_err(&client->dev, "MT9M001 driver needs platform data\n");

		return -EINVAL;

	}
@@ -713,7 +713,7 @@ static int mt9m001_probe(struct i2c_client *client, 
	mt9m001->rect.width	= MT9M001_MAX_WIDTH;

	mt9m001->rect.height	= MT9M001_MAX_HEIGHT;



	ret = mt9m001_video_probe(icl, client);

	ret = mt9m001_video_probe(ssdd, client);

	if (ret) {

		v4l2_ctrl_handler_free(&mt9m001->hdl);

		kfree(mt9m001);
@@ -725,11 +725,11 @@ static int mt9m001_probe(struct i2c_client *client, 
static int mt9m001_remove(struct i2c_client *client)

{

	struct mt9m001 *mt9m001 = to_mt9m001(client);

	struct soc_camera_link *icl = soc_camera_i2c_to_link(client);

	struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);



	v4l2_device_unregister_subdev(&mt9m001->subdev);

	v4l2_ctrl_handler_free(&mt9m001->hdl);

	mt9m001_video_remove(icl);

	mt9m001_video_remove(ssdd);

	kfree(mt9m001);



	return 0;

drivers/media/i2c/soc_camera/mt9m111.c

+11 −10
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ 
/*

 * MT9M111, MT9M112 and MT9M131:

 * i2c address is 0x48 or 0x5d (depending on SADDR pin)

 * The platform has to define i2c_board_info and call i2c_register_board_info()

 * The platform has to define struct i2c_board_info objects and link to them

 * from struct soc_camera_host_desc

 */



/*
@@ -799,17 +800,17 @@ static int mt9m111_init(struct mt9m111 *mt9m111) 
static int mt9m111_power_on(struct mt9m111 *mt9m111)

{

	struct i2c_client *client = v4l2_get_subdevdata(&mt9m111->subdev);

	struct soc_camera_link *icl = soc_camera_i2c_to_link(client);

	struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);

	int ret;



	ret = soc_camera_power_on(&client->dev, icl);

	ret = soc_camera_power_on(&client->dev, ssdd);

	if (ret < 0)

		return ret;



	ret = mt9m111_resume(mt9m111);

	if (ret < 0) {

		dev_err(&client->dev, "Failed to resume the sensor: %d\n", ret);

		soc_camera_power_off(&client->dev, icl);

		soc_camera_power_off(&client->dev, ssdd);

	}



	return ret;
@@ -818,10 +819,10 @@ static int mt9m111_power_on(struct mt9m111 *mt9m111) 
static void mt9m111_power_off(struct mt9m111 *mt9m111)

{

	struct i2c_client *client = v4l2_get_subdevdata(&mt9m111->subdev);

	struct soc_camera_link *icl = soc_camera_i2c_to_link(client);

	struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);



	mt9m111_suspend(mt9m111);

	soc_camera_power_off(&client->dev, icl);

	soc_camera_power_off(&client->dev, ssdd);

}



static int mt9m111_s_power(struct v4l2_subdev *sd, int on)
@@ -879,13 +880,13 @@ static int mt9m111_g_mbus_config(struct v4l2_subdev *sd, 
				struct v4l2_mbus_config *cfg)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct soc_camera_link *icl = soc_camera_i2c_to_link(client);

	struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);



	cfg->flags = V4L2_MBUS_MASTER | V4L2_MBUS_PCLK_SAMPLE_RISING |

		V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_HIGH |

		V4L2_MBUS_DATA_ACTIVE_HIGH;

	cfg->type = V4L2_MBUS_PARALLEL;

	cfg->flags = soc_camera_apply_board_flags(icl, cfg);

	cfg->flags = soc_camera_apply_board_flags(ssdd, cfg);



	return 0;

}
@@ -956,10 +957,10 @@ static int mt9m111_probe(struct i2c_client *client, 
{

	struct mt9m111 *mt9m111;

	struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);

	struct soc_camera_link *icl = soc_camera_i2c_to_link(client);

	struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);

	int ret;



	if (!icl) {

	if (!ssdd) {

		dev_err(&client->dev, "mt9m111: driver needs platform data\n");

		return -EINVAL;

	}

drivers/media/i2c/soc_camera/mt9t031.c

+11 −11
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 


/*

 * mt9t031 i2c address 0x5d

 * The platform has to define i2c_board_info and link to it from

 * struct soc_camera_link

 * The platform has to define struct i2c_board_info objects and link to them

 * from struct soc_camera_host_desc

 */



/* mt9t031 selected register addresses */
@@ -608,18 +608,18 @@ static struct device_type mt9t031_dev_type = { 
static int mt9t031_s_power(struct v4l2_subdev *sd, int on)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct soc_camera_link *icl = soc_camera_i2c_to_link(client);

	struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);

	struct video_device *vdev = soc_camera_i2c_to_vdev(client);

	int ret;



	if (on) {

		ret = soc_camera_power_on(&client->dev, icl);

		ret = soc_camera_power_on(&client->dev, ssdd);

		if (ret < 0)

			return ret;

		vdev->dev.type = &mt9t031_dev_type;

	} else {

		vdev->dev.type = NULL;

		soc_camera_power_off(&client->dev, icl);

		soc_camera_power_off(&client->dev, ssdd);

	}



	return 0;
@@ -707,13 +707,13 @@ static int mt9t031_g_mbus_config(struct v4l2_subdev *sd, 
				struct v4l2_mbus_config *cfg)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct soc_camera_link *icl = soc_camera_i2c_to_link(client);

	struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);



	cfg->flags = V4L2_MBUS_MASTER | V4L2_MBUS_PCLK_SAMPLE_RISING |

		V4L2_MBUS_PCLK_SAMPLE_FALLING | V4L2_MBUS_HSYNC_ACTIVE_HIGH |

		V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_DATA_ACTIVE_HIGH;

	cfg->type = V4L2_MBUS_PARALLEL;

	cfg->flags = soc_camera_apply_board_flags(icl, cfg);

	cfg->flags = soc_camera_apply_board_flags(ssdd, cfg);



	return 0;

}
@@ -722,9 +722,9 @@ static int mt9t031_s_mbus_config(struct v4l2_subdev *sd, 
				const struct v4l2_mbus_config *cfg)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct soc_camera_link *icl = soc_camera_i2c_to_link(client);

	struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);



	if (soc_camera_apply_board_flags(icl, cfg) &

	if (soc_camera_apply_board_flags(ssdd, cfg) &

	    V4L2_MBUS_PCLK_SAMPLE_FALLING)

		return reg_clear(client, MT9T031_PIXEL_CLOCK_CONTROL, 0x8000);

	else
@@ -758,11 +758,11 @@ static int mt9t031_probe(struct i2c_client *client, 
			 const struct i2c_device_id *did)

{

	struct mt9t031 *mt9t031;

	struct soc_camera_link *icl = soc_camera_i2c_to_link(client);

	struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);

	struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);

	int ret;



	if (!icl) {

	if (!ssdd) {

		dev_err(&client->dev, "MT9T031 driver needs platform data\n");

		return -EINVAL;

	}

drivers/media/i2c/soc_camera/mt9t112.c

+9 −9
Original line number Diff line number Diff line
@@ -779,9 +779,9 @@ static int mt9t112_s_register(struct v4l2_subdev *sd, 
static int mt9t112_s_power(struct v4l2_subdev *sd, int on)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct soc_camera_link *icl = soc_camera_i2c_to_link(client);

	struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);



	return soc_camera_set_power(&client->dev, icl, on);

	return soc_camera_set_power(&client->dev, ssdd, on);

}



static struct v4l2_subdev_core_ops mt9t112_subdev_core_ops = {
@@ -991,13 +991,13 @@ static int mt9t112_g_mbus_config(struct v4l2_subdev *sd, 
				 struct v4l2_mbus_config *cfg)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct soc_camera_link *icl = soc_camera_i2c_to_link(client);

	struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);



	cfg->flags = V4L2_MBUS_MASTER | V4L2_MBUS_VSYNC_ACTIVE_HIGH |

		V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_DATA_ACTIVE_HIGH |

		V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_PCLK_SAMPLE_FALLING;

	cfg->type = V4L2_MBUS_PARALLEL;

	cfg->flags = soc_camera_apply_board_flags(icl, cfg);

	cfg->flags = soc_camera_apply_board_flags(ssdd, cfg);



	return 0;

}
@@ -1006,10 +1006,10 @@ static int mt9t112_s_mbus_config(struct v4l2_subdev *sd, 
				 const struct v4l2_mbus_config *cfg)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct soc_camera_link *icl = soc_camera_i2c_to_link(client);

	struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);

	struct mt9t112_priv *priv = to_mt9t112(client);



	if (soc_camera_apply_board_flags(icl, cfg) & V4L2_MBUS_PCLK_SAMPLE_RISING)

	if (soc_camera_apply_board_flags(ssdd, cfg) & V4L2_MBUS_PCLK_SAMPLE_RISING)

		priv->flags |= PCLK_RISING;



	return 0;
@@ -1078,7 +1078,7 @@ static int mt9t112_probe(struct i2c_client *client, 
			 const struct i2c_device_id *did)

{

	struct mt9t112_priv *priv;

	struct soc_camera_link *icl = soc_camera_i2c_to_link(client);

	struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);

	struct v4l2_rect rect = {

		.width = VGA_WIDTH,

		.height = VGA_HEIGHT,
@@ -1087,7 +1087,7 @@ static int mt9t112_probe(struct i2c_client *client, 
	};

	int ret;



	if (!icl || !icl->priv) {

	if (!ssdd || !ssdd->drv_priv) {

		dev_err(&client->dev, "mt9t112: missing platform data!\n");

		return -EINVAL;

	}
@@ -1096,7 +1096,7 @@ static int mt9t112_probe(struct i2c_client *client, 
	if (!priv)

		return -ENOMEM;



	priv->info = icl->priv;

	priv->info = ssdd->drv_priv;



	v4l2_i2c_subdev_init(&priv->subdev, client, &mt9t112_subdev_ops);

CRA Git | Maintained and supported by SUSTech CRA and CCSE