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

[media] V4L: ov2640: 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 e8e2c70c

drivers/media/video/ov2640.c

+20 −2
Original line number Diff line number Diff line
@@ -19,10 +19,11 @@ 
#include <linux/slab.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/v4l2-chip-ident.h>

#include <media/v4l2-subdev.h>



#define VAL_SET(x, mask, rshift, lshift)  \

		((((x) >> rshift) & mask) << lshift)
@@ -1083,6 +1084,22 @@ static struct v4l2_subdev_core_ops ov2640_subdev_core_ops = { 
#endif

};



static int ov2640_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_HSYNC_ACTIVE_HIGH |

		V4L2_MBUS_DATA_ACTIVE_HIGH;

	cfg->type = V4L2_MBUS_PARALLEL;

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



	return 0;

}



static struct v4l2_subdev_video_ops ov2640_subdev_video_ops = {

	.s_stream	= ov2640_s_stream,

	.g_mbus_fmt	= ov2640_g_fmt,
@@ -1091,6 +1108,7 @@ static struct v4l2_subdev_video_ops ov2640_subdev_video_ops = { 
	.cropcap	= ov2640_cropcap,

	.g_crop		= ov2640_g_crop,

	.enum_mbus_fmt	= ov2640_enum_fmt,

	.g_mbus_config	= ov2640_g_mbus_config,

};



static struct v4l2_subdev_ops ov2640_subdev_ops = {