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

media: i2c: imx415 fix compile error

Browse Source 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I221bfc2c80d935f6cded97ec4fd26b6e88ba2e4b
This commit is contained in:
Zefa Chen
2021-09-08 17:47:00 +08:00
parent 7c143edefb
commit 871a7558a3
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

@@ -1012,6 +1012,17 @@ config VIDEO_IMX378
To compile this driver as a module, choose M here: the
module will be called imx378.
config VIDEO_IMX415
tristate "Sony IMX415 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
IMX415 camera.
To compile this driver as a module, choose M here: the
module will be called imx415.
config VIDEO_IMX355
tristate "Sony IMX355 sensor support"
depends on I2C && VIDEO_V4L2

1
drivers/media/i2c/Makefile
View File

@@ -136,6 +136,7 @@ obj-$(CONFIG_VIDEO_IMX334) += imx334.o
obj-$(CONFIG_VIDEO_IMX335) += imx335.o
obj-$(CONFIG_VIDEO_IMX347) += imx347.o
obj-$(CONFIG_VIDEO_IMX378) += imx378.o
obj-$(CONFIG_VIDEO_IMX415) += imx415.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/imx415.c
View File

@@ -1205,7 +1205,7 @@ static int imx415_g_frame_interval(struct v4l2_subdev *sd,
return 0;
}
static int imx415_g_mbus_config(struct v4l2_subdev *sd,
static int imx415_g_mbus_config(struct v4l2_subdev *sd, unsigned int pad_id,
struct v4l2_mbus_config *config)
{
struct imx415 *imx415 = to_imx415(sd);
@@ -1219,7 +1219,7 @@ static int imx415_g_mbus_config(struct v4l2_subdev *sd,
val |= V4L2_MBUS_CSI2_CHANNEL_1;
if (mode->hdr_mode == HDR_X3)
val |= V4L2_MBUS_CSI2_CHANNEL_2;
config->type = V4L2_MBUS_CSI2;
config->type = V4L2_MBUS_CSI2_DPHY;
config->flags = val;
return 0;
@@ -2175,7 +2175,6 @@ static const struct v4l2_subdev_core_ops imx415_core_ops = {
static const struct v4l2_subdev_video_ops imx415_video_ops = {
.s_stream = imx415_s_stream,
.g_frame_interval = imx415_g_frame_interval,
.g_mbus_config = imx415_g_mbus_config,
};
static const struct v4l2_subdev_pad_ops imx415_pad_ops = {
@@ -2185,6 +2184,7 @@ static const struct v4l2_subdev_pad_ops imx415_pad_ops = {
.get_fmt = imx415_get_fmt,
.set_fmt = imx415_set_fmt,
.get_selection = imx415_get_selection,
.get_mbus_config = imx415_g_mbus_config,
};
static const struct v4l2_subdev_ops imx415_subdev_ops = {