mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-31 12:52:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

media: i2c: imx412: switch to {enable,disable}_streams

Browse Source 
Switch from s_stream to enable_streams and disable_streams callbacks.

Signed-off-by: Elgin Perumbilly <elgin.perumbilly@siliconsignals.io>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
This commit is contained in:
Elgin Perumbilly
2026-03-16 14:30:56 +05:30
committed by Sakari Ailus
parent 42e682e692
commit b845e0f353
1 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
drivers/media/i2c/imx412.c
View File

@@ -625,30 +625,40 @@ static int imx412_init_state(struct v4l2_subdev *sd,
}
/**
* imx412_start_streaming() - Start sensor stream
* @imx412: pointer to imx412 device
* imx412_enable_streams() - Enable specified streams for the sensor
* @sd: pointer to the V4L2 subdevice
* @state: pointer to the subdevice state
* @pad: pad number for which streams are enabled
* @streams_mask: bitmask specifying the streams to enable
*
* Return: 0 if successful, error code otherwise.
*/
static int imx412_start_streaming(struct imx412 *imx412)
static int imx412_enable_streams(struct v4l2_subdev *sd,
struct v4l2_subdev_state *state,
u32 pad, u64 streams_mask)
{
const struct imx412_reg_list *reg_list;
struct imx412 *imx412 = to_imx412(sd);
int ret;
ret = pm_runtime_resume_and_get(imx412->dev);
if (ret < 0)
return ret;
/* Write sensor mode registers */
reg_list = &imx412->cur_mode->reg_list;
ret = cci_multi_reg_write(imx412->cci, reg_list->regs,
reg_list->num_of_regs, NULL);
if (ret) {
dev_err(imx412->dev, "fail to write initial registers\n");
return ret;
goto err_rpm_put;
}
/* Setup handler will write actual exposure and gain */
ret = __v4l2_ctrl_handler_setup(imx412->sd.ctrl_handler);
if (ret) {
dev_err(imx412->dev, "fail to setup handler\n");
return ret;
goto err_rpm_put;
}
/* Delay is required before streaming*/
@@ -659,55 +669,42 @@ static int imx412_start_streaming(struct imx412 *imx412)
IMX412_MODE_STREAMING, NULL);
if (ret) {
dev_err(imx412->dev, "fail to start streaming\n");
return ret;
goto err_rpm_put;
}
return 0;
err_rpm_put:
pm_runtime_put(imx412->dev);
return ret;
}
/**
* imx412_stop_streaming() - Stop sensor stream
* @imx412: pointer to imx412 device
* imx412_disable_streams() - Enable specified streams for the sensor
* @sd: pointer to the V4L2 subdevice
* @state: pointer to the subdevice state
* @pad: pad number for which streams are disabled
* @streams_mask: bitmask specifying the streams to disable
*
* Return: 0 if successful, error code otherwise.
*/
static int imx412_stop_streaming(struct imx412 *imx412)
{
return cci_write(imx412->cci, IMX412_REG_MODE_SELECT,
IMX412_MODE_STANDBY, NULL);
}
static int imx412_set_stream(struct v4l2_subdev *sd, int enable)
static int imx412_disable_streams(struct v4l2_subdev *sd,
struct v4l2_subdev_state *state,
u32 pad, u64 streams_mask)
{
struct imx412 *imx412 = to_imx412(sd);
struct v4l2_subdev_state *state;
int ret;
state = v4l2_subdev_lock_and_get_active_state(sd);
ret = cci_write(imx412->cci, IMX412_REG_MODE_SELECT,
IMX412_MODE_STANDBY, NULL);
if (enable) {
ret = pm_runtime_resume_and_get(imx412->dev);
if (ret)
goto error_unlock;
if (ret)
dev_err(imx412->dev, "failed to set stream off\n");
ret = imx412_start_streaming(imx412);
if (ret)
goto error_power_off;
} else {
imx412_stop_streaming(imx412);
pm_runtime_put(imx412->dev);
}
v4l2_subdev_unlock_state(state);
pm_runtime_put(imx412->dev);
return 0;
error_power_off:
pm_runtime_put(imx412->dev);
error_unlock:
v4l2_subdev_unlock_state(state);
return ret;
}
/**
@@ -824,7 +821,7 @@ static int imx412_parse_hw_config(struct imx412 *imx412)
/* V4l2 subdevice ops */
static const struct v4l2_subdev_video_ops imx412_video_ops = {
.s_stream = imx412_set_stream,
.s_stream = v4l2_subdev_s_stream_helper,
};
static const struct v4l2_subdev_pad_ops imx412_pad_ops = {
@@ -832,6 +829,8 @@ static const struct v4l2_subdev_pad_ops imx412_pad_ops = {
.enum_frame_size = imx412_enum_frame_size,
.get_fmt = imx412_get_pad_format,
.set_fmt = imx412_set_pad_format,
.enable_streams = imx412_enable_streams,
.disable_streams = imx412_disable_streams,
};
static const struct v4l2_subdev_ops imx412_subdev_ops = {