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

Browse Source 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ia1ec948b69b12181030ff8f41665482c0c45c1fe
This commit is contained in:
Zefa Chen
2021-09-08 17:14:12 +08:00
parent b4d2b726b4
commit 2b8ebc7099
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/media/i2c/Kconfig
View File

@@ -967,6 +967,17 @@ config VIDEO_IMX327
To compile this driver as a module, choose M here: the
module will be called imx327.
config VIDEO_IMX334
tristate "Sony IMX334 sensor support"
depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
depends on MEDIA_CAMERA_SUPPORT
help
This is a Video4Linux2 sensor driver for the Sony
IMX334 camera.
To compile this driver as a module, choose M here: the
module will be called imx334.
config VIDEO_IMX355
tristate "Sony IMX355 sensor support"
depends on I2C && VIDEO_V4L2

1
drivers/media/i2c/Makefile
View File

@@ -132,6 +132,7 @@ obj-$(CONFIG_VIDEO_IMX317) += imx317.o
obj-$(CONFIG_VIDEO_IMX319) += imx319.o
obj-$(CONFIG_VIDEO_IMX323) += imx323.o
obj-$(CONFIG_VIDEO_IMX327) += imx327.o
obj-$(CONFIG_VIDEO_IMX334) += imx334.o
obj-$(CONFIG_VIDEO_IMX355) += imx355.o
obj-$(CONFIG_VIDEO_MAX9286) += max9286.o
rdacm20-camera_module-objs := rdacm20.o max9271.o

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

@@ -858,7 +858,7 @@ static int imx334_g_frame_interval(struct v4l2_subdev *sd,
return 0;
}
static int imx334_g_mbus_config(struct v4l2_subdev *sd,
static int imx334_g_mbus_config(struct v4l2_subdev *sd, unsigned int pad_id,
struct v4l2_mbus_config *config)
{
struct imx334 *imx334 = to_imx334(sd);
@@ -870,7 +870,7 @@ static int imx334_g_mbus_config(struct v4l2_subdev *sd,
V4L2_MBUS_CSI2_CONTINUOUS_CLOCK;
config->flags = (mode->hdr_mode == NO_HDR) ? val : (val | V4L2_MBUS_CSI2_CHANNEL_1);
config->type = V4L2_MBUS_CSI2;
config->type = V4L2_MBUS_CSI2_DPHY;
return 0;
}
@@ -1474,7 +1474,6 @@ static const struct v4l2_subdev_core_ops imx334_core_ops = {
static const struct v4l2_subdev_video_ops imx334_video_ops = {
.s_stream = imx334_s_stream,
.g_frame_interval = imx334_g_frame_interval,
.g_mbus_config = imx334_g_mbus_config,
};
static const struct v4l2_subdev_pad_ops imx334_pad_ops = {
@@ -1484,6 +1483,7 @@ static const struct v4l2_subdev_pad_ops imx334_pad_ops = {
.get_fmt = imx334_get_fmt,
.set_fmt = imx334_set_fmt,
.get_selection = imx334_get_selection,
.get_mbus_config = imx334_g_mbus_config,
};
static const struct v4l2_subdev_ops imx334_subdev_ops = {