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

[media] V4L: mt9m111: 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 32ca2085

drivers/media/video/mt9m111.c

+19 −1
Original line number Diff line number Diff line
@@ -14,9 +14,10 @@ 
#include <linux/gpio.h>

#include <linux/delay.h>



#include <media/soc_camera.h>

#include <media/soc_mediabus.h>

#include <media/v4l2-common.h>

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

#include <media/soc_camera.h>



/*

 * MT9M111, MT9M112 and MT9M131:
@@ -1019,6 +1020,22 @@ static int mt9m111_enum_fmt(struct v4l2_subdev *sd, unsigned int index, 
	return 0;

}



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_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_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);



	return 0;

}



static struct v4l2_subdev_video_ops mt9m111_subdev_video_ops = {

	.s_mbus_fmt	= mt9m111_s_fmt,

	.g_mbus_fmt	= mt9m111_g_fmt,
@@ -1027,6 +1044,7 @@ static struct v4l2_subdev_video_ops mt9m111_subdev_video_ops = { 
	.g_crop		= mt9m111_g_crop,

	.cropcap	= mt9m111_cropcap,

	.enum_mbus_fmt	= mt9m111_enum_fmt,

	.g_mbus_config	= mt9m111_g_mbus_config,

};



static struct v4l2_subdev_ops mt9m111_subdev_ops = {