Commit bbc6071c authored by Jacopo Mondi's avatar Jacopo Mondi Committed by Mauro Carvalho Chehab

media: i2c: ov5670: Implement init_cfg

Implement the .init_cfg() pad operation and initialize the default
format with the default full resolution mode 2592x1944.

With .init_cfg() pad operation implemented the deprecated .open()
internal operation can now be dropped.
Signed-off-by: default avatarJacopo Mondi <jacopo.mondi@ideasonboard.com>
Tested-by: default avatarLuca Weiss <luca@z3ntu.xyz>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 62ab1e32
...@@ -1962,27 +1962,6 @@ static int ov5670_write_reg_list(struct ov5670 *ov5670, ...@@ -1962,27 +1962,6 @@ static int ov5670_write_reg_list(struct ov5670 *ov5670,
return ov5670_write_regs(ov5670, r_list->regs, r_list->num_of_regs); return ov5670_write_regs(ov5670, r_list->regs, r_list->num_of_regs);
} }
/* Open sub-device */
static int ov5670_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
{
struct ov5670 *ov5670 = to_ov5670(sd);
struct v4l2_mbus_framefmt *try_fmt =
v4l2_subdev_get_try_format(sd, fh->state, 0);
mutex_lock(&ov5670->mutex);
/* Initialize try_fmt */
try_fmt->width = ov5670->cur_mode->width;
try_fmt->height = ov5670->cur_mode->height;
try_fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10;
try_fmt->field = V4L2_FIELD_NONE;
/* No crop or compose */
mutex_unlock(&ov5670->mutex);
return 0;
}
static int ov5670_update_digital_gain(struct ov5670 *ov5670, u32 d_gain) static int ov5670_update_digital_gain(struct ov5670 *ov5670, u32 d_gain)
{ {
int ret; int ret;
...@@ -2182,6 +2161,25 @@ static int ov5670_init_controls(struct ov5670 *ov5670) ...@@ -2182,6 +2161,25 @@ static int ov5670_init_controls(struct ov5670 *ov5670)
return ret; return ret;
} }
static int ov5670_init_cfg(struct v4l2_subdev *sd,
struct v4l2_subdev_state *state)
{
struct v4l2_mbus_framefmt *fmt =
v4l2_subdev_get_try_format(sd, state, 0);
const struct ov5670_mode *default_mode = &supported_modes[0];
fmt->width = default_mode->width;
fmt->height = default_mode->height;
fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10;
fmt->field = V4L2_FIELD_NONE;
fmt->colorspace = V4L2_COLORSPACE_SRGB;
fmt->ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(V4L2_COLORSPACE_SRGB);
fmt->quantization = V4L2_QUANTIZATION_FULL_RANGE;
fmt->xfer_func = V4L2_MAP_XFER_FUNC_DEFAULT(V4L2_COLORSPACE_SRGB);
return 0;
}
static int ov5670_enum_mbus_code(struct v4l2_subdev *sd, static int ov5670_enum_mbus_code(struct v4l2_subdev *sd,
struct v4l2_subdev_state *sd_state, struct v4l2_subdev_state *sd_state,
struct v4l2_subdev_mbus_code_enum *code) struct v4l2_subdev_mbus_code_enum *code)
...@@ -2513,6 +2511,7 @@ static const struct v4l2_subdev_video_ops ov5670_video_ops = { ...@@ -2513,6 +2511,7 @@ static const struct v4l2_subdev_video_ops ov5670_video_ops = {
}; };
static const struct v4l2_subdev_pad_ops ov5670_pad_ops = { static const struct v4l2_subdev_pad_ops ov5670_pad_ops = {
.init_cfg = ov5670_init_cfg,
.enum_mbus_code = ov5670_enum_mbus_code, .enum_mbus_code = ov5670_enum_mbus_code,
.get_fmt = ov5670_get_pad_format, .get_fmt = ov5670_get_pad_format,
.set_fmt = ov5670_set_pad_format, .set_fmt = ov5670_set_pad_format,
...@@ -2534,10 +2533,6 @@ static const struct media_entity_operations ov5670_subdev_entity_ops = { ...@@ -2534,10 +2533,6 @@ static const struct media_entity_operations ov5670_subdev_entity_ops = {
.link_validate = v4l2_subdev_link_validate, .link_validate = v4l2_subdev_link_validate,
}; };
static const struct v4l2_subdev_internal_ops ov5670_internal_ops = {
.open = ov5670_open,
};
static int ov5670_regulators_probe(struct ov5670 *ov5670) static int ov5670_regulators_probe(struct ov5670 *ov5670)
{ {
struct i2c_client *client = v4l2_get_subdevdata(&ov5670->sd); struct i2c_client *client = v4l2_get_subdevdata(&ov5670->sd);
...@@ -2640,7 +2635,6 @@ static int ov5670_probe(struct i2c_client *client) ...@@ -2640,7 +2635,6 @@ static int ov5670_probe(struct i2c_client *client)
goto error_mutex_destroy; goto error_mutex_destroy;
} }
ov5670->sd.internal_ops = &ov5670_internal_ops;
ov5670->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | ov5670->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE |
V4L2_SUBDEV_FL_HAS_EVENTS; V4L2_SUBDEV_FL_HAS_EVENTS;
ov5670->sd.entity.ops = &ov5670_subdev_entity_ops; ov5670->sd.entity.ops = &ov5670_subdev_entity_ops;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment