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: ov8858 fix compile error

Browse Source 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I72c29e787a6ee82b7ade0e73ed462afeac301f34
This commit is contained in:
Zefa Chen
2021-09-08 18:31:08 +08:00
parent 0fa474c1db
commit 1fc1905431
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/media/i2c/Kconfig
View File

@@ -1336,6 +1336,17 @@ config VIDEO_OV8856
To compile this driver as a module, choose M here: the
module will be called ov8856.
config VIDEO_OV8858
tristate "OmniVision OV8858 sensor support"
depends on I2C && VIDEO_V4L2
depends on MEDIA_CAMERA_SUPPORT
help
This is a Video4Linux2 sensor driver for the OmniVision
OV8858 camera.
To compile this driver as a module, choose M here: the
module will be called ov8858.
config VIDEO_OV9640
tristate "OmniVision OV9640 sensor support"
depends on I2C && VIDEO_V4L2

1
drivers/media/i2c/Makefile
View File

@@ -90,6 +90,7 @@ obj-$(CONFIG_VIDEO_OV7670) += ov7670.o
obj-$(CONFIG_VIDEO_OV772X) += ov772x.o
obj-$(CONFIG_VIDEO_OV7740) += ov7740.o
obj-$(CONFIG_VIDEO_OV8856) += ov8856.o
obj-$(CONFIG_VIDEO_OV8858) += ov8858.o
obj-$(CONFIG_VIDEO_OV9640) += ov9640.o
obj-$(CONFIG_VIDEO_OV9650) += ov9650.o
obj-$(CONFIG_VIDEO_OV13858) += ov13858.o

8
drivers/media/i2c/ov8858.c
View File

@@ -2861,7 +2861,7 @@ static int ov8858_enum_frame_interval(struct v4l2_subdev *sd,
return 0;
}
static int ov8858_g_mbus_config(struct v4l2_subdev *sd,
static int ov8858_g_mbus_config(struct v4l2_subdev *sd, unsigned int pad_id,
struct v4l2_mbus_config *config)
{
struct ov8858 *sensor = to_ov8858 (sd);
@@ -2870,12 +2870,12 @@ static int ov8858_g_mbus_config(struct v4l2_subdev *sd,
dev_info(dev, "%s(%d) enter!\n", __func__, __LINE__);
if (2 == sensor->lane_num) {
config->type = V4L2_MBUS_CSI2;
config->type = V4L2_MBUS_CSI2_DPHY;
config->flags = V4L2_MBUS_CSI2_2_LANE |
V4L2_MBUS_CSI2_CHANNEL_0 |
V4L2_MBUS_CSI2_CONTINUOUS_CLOCK;
} else if (4 == sensor->lane_num) {
config->type = V4L2_MBUS_CSI2;
config->type = V4L2_MBUS_CSI2_DPHY;
config->flags = V4L2_MBUS_CSI2_4_LANE |
V4L2_MBUS_CSI2_CHANNEL_0 |
V4L2_MBUS_CSI2_CONTINUOUS_CLOCK;
@@ -2908,7 +2908,6 @@ static const struct v4l2_subdev_core_ops ov8858_core_ops = {
static const struct v4l2_subdev_video_ops ov8858_video_ops = {
.s_stream = ov8858_s_stream,
.g_frame_interval = ov8858_g_frame_interval,
.g_mbus_config = ov8858_g_mbus_config,
};
static const struct v4l2_subdev_pad_ops ov8858_pad_ops = {
@@ -2917,6 +2916,7 @@ static const struct v4l2_subdev_pad_ops ov8858_pad_ops = {
.enum_frame_interval = ov8858_enum_frame_interval,
.get_fmt = ov8858_get_fmt,
.set_fmt = ov8858_set_fmt,
.get_mbus_config = ov8858_g_mbus_config,
};
static const struct v4l2_subdev_ops ov8858_subdev_ops = {