shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

media: i2c: os05a20 fix compile error

Browse Source 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ie73e5a8c51168fccef7a2953f1a9ae046b9683c7
This commit is contained in:
Zefa Chen
2021-09-08 18:05:24 +08:00
parent a103d7b776
commit f3053daf2e
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/media/i2c/Kconfig
View File

@@ -1053,6 +1053,15 @@ config VIDEO_OS04A10
This is a Video4Linux2 sensor driver for the OmniVision
OS04A10 camera.
config VIDEO_OS05A20
tristate "OmniVision OS05A20 sensor support"
depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
depends on MEDIA_CAMERA_SUPPORT
select V4L2_FWNODE
help
This is a Video4Linux2 sensor driver for the OmniVision
OS05A20 camera.
config VIDEO_OV2640
tristate "OmniVision OV2640 sensor support"
depends on VIDEO_V4L2 && I2C

1
drivers/media/i2c/Makefile
View File

@@ -66,6 +66,7 @@ obj-$(CONFIG_VIDEO_UPD64031A) += upd64031a.o
obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o
obj-$(CONFIG_VIDEO_OS02G10) += os02g10.o
obj-$(CONFIG_VIDEO_OS04A10) += os04a10.o
obj-$(CONFIG_VIDEO_OS05A20) += os05a20.o
obj-$(CONFIG_VIDEO_OV2640) += ov2640.o
obj-$(CONFIG_VIDEO_OV2680) += ov2680.o
obj-$(CONFIG_VIDEO_OV2685) += ov2685.o

6
drivers/media/i2c/os05a20.c
View File

@@ -935,7 +935,7 @@ static int os05a20_g_frame_interval(struct v4l2_subdev *sd,
return 0;
}
static int os05a20_g_mbus_config(struct v4l2_subdev *sd,
static int os05a20_g_mbus_config(struct v4l2_subdev *sd, unsigned int pad_id,
struct v4l2_mbus_config *config)
{
struct os05a20 *os05a20 = to_os05a20(sd);
@@ -952,7 +952,7 @@ static int os05a20_g_mbus_config(struct v4l2_subdev *sd,
V4L2_MBUS_CSI2_CONTINUOUS_CLOCK |
V4L2_MBUS_CSI2_CHANNEL_1;
config->type = V4L2_MBUS_CSI2;
config->type = V4L2_MBUS_CSI2_DPHY;
config->flags = val;
return 0;
@@ -1526,7 +1526,6 @@ static const struct v4l2_subdev_core_ops os05a20_core_ops = {
static const struct v4l2_subdev_video_ops os05a20_video_ops = {
.s_stream = os05a20_s_stream,
.g_frame_interval = os05a20_g_frame_interval,
.g_mbus_config = os05a20_g_mbus_config,
};
static const struct v4l2_subdev_pad_ops os05a20_pad_ops = {
@@ -1535,6 +1534,7 @@ static const struct v4l2_subdev_pad_ops os05a20_pad_ops = {
.enum_frame_interval = os05a20_enum_frame_interval,
.get_fmt = os05a20_get_fmt,
.set_fmt = os05a20_set_fmt,
.get_mbus_config = os05a20_g_mbus_config,
};
static const struct v4l2_subdev_ops os05a20_subdev_ops = {