Commit 0d3263f9 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

[media] V4L: tw9910: 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 2ad90b71

drivers/media/video/tw9910.c

+47 −2
Original line number Diff line number Diff line
@@ -23,10 +23,12 @@ 
#include <linux/kernel.h>

#include <linux/delay.h>

#include <linux/videodev2.h>

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

#include <media/v4l2-subdev.h>



#include <media/soc_camera.h>

#include <media/soc_mediabus.h>

#include <media/tw9910.h>

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

#include <media/v4l2-subdev.h>



#define GET_ID(val)  ((val & 0xF8) >> 3)

#define GET_REV(val) (val & 0x07)
@@ -862,6 +864,47 @@ static int tw9910_enum_fmt(struct v4l2_subdev *sd, unsigned int index, 
	return 0;

}



static int tw9910_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_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER |

		V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_LOW |

		V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_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 tw9910_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);

	u8 val = VSSL_VVALID | HSSL_DVALID;

	unsigned long flags = soc_camera_apply_board_flags(icl, cfg);



	/*

	 * set OUTCTR1

	 *

	 * We use VVALID and DVALID signals to control VSYNC and HSYNC

	 * outputs, in this mode their polarity is inverted.

	 */

	if (flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)

		val |= HSP_HI;



	if (flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)

		val |= VSP_HI;



	return i2c_smbus_write_byte_data(client, OUTCTR1, val);

}



static struct v4l2_subdev_video_ops tw9910_subdev_video_ops = {

	.s_stream	= tw9910_s_stream,

	.g_mbus_fmt	= tw9910_g_fmt,
@@ -870,6 +913,8 @@ static struct v4l2_subdev_video_ops tw9910_subdev_video_ops = { 
	.cropcap	= tw9910_cropcap,

	.g_crop		= tw9910_g_crop,

	.enum_mbus_fmt	= tw9910_enum_fmt,

	.g_mbus_config	= tw9910_g_mbus_config,

	.s_mbus_config	= tw9910_s_mbus_config,

};



static struct v4l2_subdev_ops tw9910_subdev_ops = {