Commit 59ca25b7 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

[media] V4L: ov6650: support the new mbus-config subdev ops 



Extend the driver to also support [gs]_mbus_config() subdevice video
operations.

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

drivers/media/video/ov6650.c

+52 −1
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ 
#include <linux/slab.h>



#include <media/soc_camera.h>

#include <media/soc_mediabus.h>

#include <media/v4l2-chip-ident.h>





/* Register definitions */

#define REG_GAIN		0x00	/* range 00 - 3F */

#define REG_BLUE		0x01
@@ -1111,6 +1111,55 @@ static struct v4l2_subdev_core_ops ov6650_core_ops = { 
#endif

};



static int ov6650_g_mbus_config(struct v4l2_subdev *sd,

				struct v4l2_mbus_config *cfg)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct soc_camera_device *icd = client->dev.platform_data;

	struct soc_camera_link *icl = to_soc_camera_link(icd);



	cfg->flags = V4L2_MBUS_MASTER |

		V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_PCLK_SAMPLE_FALLING |

		V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_LOW |

		V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_LOW |

		V4L2_MBUS_DATA_ACTIVE_HIGH;

	cfg->type = V4L2_MBUS_PARALLEL;

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



	return 0;

}



static int ov6650_s_mbus_config(struct v4l2_subdev *sd,

				const struct v4l2_mbus_config *cfg)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct soc_camera_device *icd = client->dev.platform_data;

	struct soc_camera_link *icl = to_soc_camera_link(icd);

	unsigned long flags = soc_camera_apply_board_flags(icl, cfg);

	int ret;



	if (flags & V4L2_MBUS_PCLK_SAMPLE_RISING)

		ret = ov6650_reg_rmw(client, REG_COMJ, COMJ_PCLK_RISING, 0);

	else

		ret = ov6650_reg_rmw(client, REG_COMJ, 0, COMJ_PCLK_RISING);

	if (ret)

		return ret;



	if (flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)

		ret = ov6650_reg_rmw(client, REG_COMF, COMF_HREF_LOW, 0);

	else

		ret = ov6650_reg_rmw(client, REG_COMF, 0, COMF_HREF_LOW);

	if (ret)

		return ret;



	if (flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH)

		ret = ov6650_reg_rmw(client, REG_COMJ, COMJ_VSYNC_HIGH, 0);

	else

		ret = ov6650_reg_rmw(client, REG_COMJ, 0, COMJ_VSYNC_HIGH);



	return ret;

}



static struct v4l2_subdev_video_ops ov6650_video_ops = {

	.s_stream	= ov6650_s_stream,

	.g_mbus_fmt	= ov6650_g_fmt,
@@ -1122,6 +1171,8 @@ static struct v4l2_subdev_video_ops ov6650_video_ops = { 
	.s_crop		= ov6650_s_crop,

	.g_parm		= ov6650_g_parm,

	.s_parm		= ov6650_s_parm,

	.g_mbus_config	= ov6650_g_mbus_config,

	.s_mbus_config	= ov6650_s_mbus_config,

};



static struct v4l2_subdev_ops ov6650_subdev_ops = {