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

[media] V4L: ov9640: 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 00cf08f5

drivers/media/video/ov9640.c

+20 −2
Original line number Diff line number Diff line
@@ -25,9 +25,11 @@ 
#include <linux/slab.h>

#include <linux/delay.h>

#include <linux/videodev2.h>



#include <media/soc_camera.h>

#include <media/soc_mediabus.h>

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

#include <media/v4l2-common.h>

#include <media/soc_camera.h>



#include "ov9640.h"
@@ -722,6 +724,22 @@ static struct v4l2_subdev_core_ops ov9640_core_ops = { 


};



static int ov9640_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 ov9640_video_ops = {

	.s_stream	= ov9640_s_stream,

	.s_mbus_fmt	= ov9640_s_fmt,
@@ -729,7 +747,7 @@ static struct v4l2_subdev_video_ops ov9640_video_ops = { 
	.enum_mbus_fmt	= ov9640_enum_fmt,

	.cropcap	= ov9640_cropcap,

	.g_crop		= ov9640_g_crop,



	.g_mbus_config	= ov9640_g_mbus_config,

};



static struct v4l2_subdev_ops ov9640_subdev_ops = {