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

media: i2c: sc2232 fixed compile error

Browse Source 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I688398cdc757dad906e3b8a9224b3add0d7e7cf7
This commit is contained in:
Zefa Chen
2022-09-05 21:26:57 +08:00
committed by Tao Huang
parent 399f2b54c2
commit 5a810868d7
3 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/i2c/Kconfig
View File

@@ -1856,6 +1856,16 @@ config VIDEO_SC210IOT
This is a Video4Linux2 sensor driver for the SmartSens
SC210IOT camera.
config VIDEO_SC2232
tristate "SmartSens SC2232 sensor support"
depends on I2C && VIDEO_V4L2
select MEDIA_CONTROLLER
select VIDEO_V4L2_SUBDEV_API
select V4L2_FWNODE
help
This is a Video4Linux2 sensor driver for the SmartSens
SC2232 camera.
config VIDEO_SC230AI
tristate "SmartSens SC230AI sensor support"
depends on I2C && VIDEO_V4L2

1
drivers/media/i2c/Makefile
View File

@@ -124,6 +124,7 @@ obj-$(CONFIG_VIDEO_SC035GS) += sc035gs.o
obj-$(CONFIG_VIDEO_SC132GS) += sc132gs.o
obj-$(CONFIG_VIDEO_SC200AI) += sc200ai.o
obj-$(CONFIG_VIDEO_SC210IOT) += sc210iot.o
obj-$(CONFIG_VIDEO_SC2232) += sc2232.o
obj-$(CONFIG_VIDEO_SC230AI) += sc230ai.o
obj-$(CONFIG_VIDEO_SC301IOT) += sc301iot.o
obj-$(CONFIG_VIDEO_SC3336) += sc3336.o

26
drivers/media/i2c/sc2232.c
View File

@@ -593,7 +593,7 @@ static int sc2232_g_frame_interval(struct v4l2_subdev *sd,
return 0;
}
static int sc2232_g_mbus_config(struct v4l2_subdev *sd,
static int sc2232_g_mbus_config(struct v4l2_subdev *sd, unsigned int pad_id,
struct v4l2_mbus_config *config)
{
struct sc2232 *sc2232 = to_sc2232(sd);
@@ -610,7 +610,7 @@ static int sc2232_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;
@@ -795,8 +795,11 @@ static long sc2232_compat_ioctl32(struct v4l2_subdev *sd,
}
ret = sc2232_ioctl(sd, cmd, inf);
if (!ret)
if (!ret) {
ret = copy_to_user(up, inf, sizeof(*inf));
if (ret)
ret = -EFAULT;
}
kfree(inf);
break;
case RKMODULE_AWB_CFG:
@@ -809,6 +812,8 @@ static long sc2232_compat_ioctl32(struct v4l2_subdev *sd,
ret = copy_from_user(cfg, up, sizeof(*cfg));
if (!ret)
ret = sc2232_ioctl(sd, cmd, cfg);
else
ret = -EFAULT;
kfree(cfg);
break;
case RKMODULE_GET_HDR_CFG:
@@ -819,8 +824,11 @@ static long sc2232_compat_ioctl32(struct v4l2_subdev *sd,
}
ret = sc2232_ioctl(sd, cmd, hdr);
if (!ret)
if (!ret) {
ret = copy_to_user(up, hdr, sizeof(*hdr));
if (ret)
ret = -EFAULT;
}
kfree(hdr);
break;
case RKMODULE_SET_HDR_CFG:
@@ -833,6 +841,8 @@ static long sc2232_compat_ioctl32(struct v4l2_subdev *sd,
ret = copy_from_user(hdr, up, sizeof(*hdr));
if (!ret)
ret = sc2232_ioctl(sd, cmd, hdr);
else
ret = -EFAULT;
kfree(hdr);
break;
case PREISP_CMD_SET_HDRAE_EXP:
@@ -845,17 +855,23 @@ static long sc2232_compat_ioctl32(struct v4l2_subdev *sd,
ret = copy_from_user(hdrae, up, sizeof(*hdrae));
if (!ret)
ret = sc2232_ioctl(sd, cmd, hdrae);
else
ret = -EFAULT;
kfree(hdrae);
break;
case RKMODULE_SET_CONVERSION_GAIN:
ret = copy_from_user(&cg, up, sizeof(cg));
if (!ret)
ret = sc2232_ioctl(sd, cmd, &cg);
else
ret = -EFAULT;
break;
case RKMODULE_SET_QUICK_STREAM:
ret = copy_from_user(&stream, up, sizeof(u32));
if (!ret)
ret = sc2232_ioctl(sd, cmd, &stream);
else
ret = -EFAULT;
break;
default:
ret = -ENOIOCTLCMD;
@@ -1120,7 +1136,6 @@ static const struct v4l2_subdev_core_ops sc2232_core_ops = {
static const struct v4l2_subdev_video_ops sc2232_video_ops = {
.s_stream = sc2232_s_stream,
.g_frame_interval = sc2232_g_frame_interval,
.g_mbus_config = sc2232_g_mbus_config,
};
static const struct v4l2_subdev_pad_ops sc2232_pad_ops = {
@@ -1129,6 +1144,7 @@ static const struct v4l2_subdev_pad_ops sc2232_pad_ops = {
.enum_frame_interval = sc2232_enum_frame_interval,
.get_fmt = sc2232_get_fmt,
.set_fmt = sc2232_set_fmt,
.get_mbus_config = sc2232_g_mbus_config,
};
static const struct v4l2_subdev_ops sc2232_subdev_ops = {