Skip to contentSkip to conversation

ov05c10 cleanups and fixes

PATCH Superseded Sakari Ailus 2 participants 10 messages Oct 8 – Oct 9

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Sakari Ailus

author maintainer
#0 lore raw

cover ov05c10 cleanups and fixes

Hi folks,

This small set contains a few ov05c10 driver cleanups and fixes based on Tarang's review.

Sakari Ailus (4):
media: ov05c10: Small cleanups
media: ov05c10: Set reset GPIO high when acquiring it
media: ov05c10: Power management fixes
media: ov05c10: Remove duplicated writes to analogue gain register

 drivers/media/i2c/ov05c10.c | 53 +++++++++++++++----------------------
 1 file changed, 22 insertions(+), 31 deletions(-)
Signature · 1 line
2.47.3
author maintainer
#1 lore raw

PATCH 1/4 media: ov05c10: Small cleanups

- Use dev_err_probe() instead of dev_err() in probe() path
- Don't set event handlers just for controls
- Don't set HAS_DEVNODE sub-device flag
- Coding style improvements
- Use container_of_const()

---
 drivers/media/i2c/ov05c10.c | 46 +++++++++++++++----------------------
 1 file changed, 18 insertions(+), 28 deletions(-)
drivers/media/i2c/ov05c10.c +18 -28
index 2f2c49bac13f..0256e5514ade 100644
@@ -108,7 +108,7 @@ static const struct regmap_config ov05c10_regmap_config = {
 	.disable_locking = true,
 };
 
-#define to_ov05c10(_sd)		container_of(_sd, struct ov05c10, sd)
+#define to_ov05c10(_sd) container_of_const(_sd, struct ov05c10, sd)
 
 static const char *const ov05c10_test_pattern_menu[] = {
 	"Disabled",
@@ -320,7 +320,7 @@ static int ov05c10_test_pattern(struct ov05c10 *ov05c10, u32 pattern)
 static int ov05c10_set_ctrl(struct v4l2_ctrl *ctrl)
 {
 	struct ov05c10 *ov05c10 =
-		container_of(ctrl->handler, struct ov05c10, ctrl_handler);
+		container_of_const(ctrl->handler, struct ov05c10, ctrl_handler);
 	struct i2c_client *client = v4l2_get_subdevdata(&ov05c10->sd);
 	struct v4l2_subdev_state *state;
 	const struct v4l2_mbus_framefmt *format;
@@ -439,6 +439,7 @@ static int ov05c10_init_controls(struct ov05c10 *ov05c10)
 			  OV05C10_MIN_ANALOG_GAIN, OV05C10_MAX_ANALOG_GAIN,
 			  OV05C10_ANALOG_GAIN_STEP,
 			  OV05C10_ANALOG_GAIN_DEFAULT);
+
 	v4l2_ctrl_new_std(ctrl_hdlr, &ov05c10_ctrl_ops, V4L2_CID_DIGITAL_GAIN,
 			  OV05C10_MIN_DIG_GAIN, OV05C10_MAX_DIG_GAIN,
 			  OV05C10_DGTL_GAIN_STEP, OV05C10_DGTL_GAIN_DEFAULT);
@@ -693,13 +694,7 @@ static const struct v4l2_subdev_pad_ops ov05c10_pad_ops = {
 	.disable_streams = ov05c10_disable_streams,
 };
 
-static const struct v4l2_subdev_core_ops ov05c10_core_ops = {
-	.subscribe_event = v4l2_ctrl_subdev_subscribe_event,
-	.unsubscribe_event = v4l2_event_subdev_unsubscribe,
-};
-
 static const struct v4l2_subdev_ops ov05c10_subdev_ops = {
-	.core = &ov05c10_core_ops,
 	.pad = &ov05c10_pad_ops,
 };
 
@@ -720,7 +715,7 @@ static int ov05c10_parse_fwnode(struct ov05c10 *ov05c10, struct device *dev)
 	ret = v4l2_fwnode_endpoint_alloc_parse(endpoint, &bus_cfg);
 	fwnode_handle_put(endpoint);
 	if (ret) {
-		dev_err(dev, "parsing endpoint node failed\n");
+		dev_err_probe(dev, ret, "parsing endpoint node failed\n");
 		goto out_err;
 	}
 
@@ -743,16 +738,13 @@ static int ov05c10_identify_module(struct ov05c10 *ov05c10)
 	int ret = 0;
 
 	cci_read(ov05c10->regmap, OV05C10_REG_CHIP_ID, &val, &ret);
-	if (ret) {
-		dev_err(&client->dev, "chip id read err");
-		return ret;
-	}
+	if (ret)
+		return dev_err_probe(&client->dev, ret, "chip id read err");
 
-	if (val != OV05C10_CHIP_ID) {
-		dev_err(&client->dev, "chip id mismatch: %x!=%llu",
-			OV05C10_CHIP_ID, val);
-		return -ENXIO;
-	}
+	if (val != OV05C10_CHIP_ID)
+		return dev_err_probe(&client->dev, ret,
+				     "chip id mismatch: %x!=%llu",
+				     OV05C10_CHIP_ID, val);
 
 	return 0;
 }
@@ -871,35 +863,33 @@ static int ov05c10_probe(struct i2c_client *client)
 	full_power = acpi_dev_state_d0(dev);
 	if (full_power) {
 		ret = ov05c10_power_on(dev);
-		if (ret) {
-			dev_err(&client->dev, "failed to power on\n");
+		if (ret)
 			return ret;
-		}
 	}
 
 	ret = ov05c10_init_controls(ov05c10);
 	if (ret) {
-		dev_err(&client->dev, "failed to init controls: %d", ret);
+		dev_err_probe(&client->dev, ret, "failed to init controls\n");
 		goto probe_error_power_off;
 	}
 
 	ov05c10->sd.internal_ops = &ov05c10_internal_ops;
-	ov05c10->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE |
-			     V4L2_SUBDEV_FL_HAS_EVENTS;
+	ov05c10->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
 	ov05c10->sd.entity.ops = NULL;
 	ov05c10->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
 	ov05c10->pad.flags = MEDIA_PAD_FL_SOURCE;
 
 	ret = media_entity_pads_init(&ov05c10->sd.entity, 1, &ov05c10->pad);
 	if (ret) {
-		dev_err(&client->dev, "failed to init entity pads: %d", ret);
+		dev_err_probe(&client->dev, ret,
+			      "failed to init entity pads\n");
 		goto probe_error_v4l2_ctrl_handler_free;
 	}
 
 	ov05c10->sd.state_lock = ov05c10->ctrl_handler.lock;
 	ret = v4l2_subdev_init_finalize(&ov05c10->sd);
 	if (ret < 0) {
-		dev_err(dev, "v4l2 subdev init error: %d\n", ret);
+		dev_err_probe(dev, ret, "v4l2 subdev init error\n");
 		goto probe_error_media_entity_cleanup;
 	}
 
@@ -909,8 +899,8 @@ static int ov05c10_probe(struct i2c_client *client)
 
 	ret = v4l2_async_register_subdev_sensor(&ov05c10->sd);
 	if (ret < 0) {
-		dev_err(&client->dev, "failed to register V4L2 subdev: %d",
-			ret);
+		dev_err_probe(&client->dev, ret,
+			      "failed to register V4L2 subdev");
 		goto probe_error_rpm;
 	}
 	pm_runtime_set_autosuspend_delay(&client->dev, 1000);
Signature · 1 line
2.47.3
Reviewed-by on v1 1/4
#2 lore raw

Re: [PATCH 1/4] media: ov05c10: Small cleanups

Hi Sakari,

Quoted 7 lines

- Use dev_err_probe() instead of dev_err() in probe() path
- Don't set event handlers just for controls
- Don't set HAS_DEVNODE sub-device flag
- Coding style improvements
- Use container_of_const()

Best regards,
Tarang

author maintainer
#3 lore raw

PATCH 2/4 media: ov05c10: Set reset GPIO high when acquiring it

In reply to Sakari Ailus

Set the reset GPIO high when it is acquired.

---
 drivers/media/i2c/ov05c10.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/ov05c10.c +1 -1
index 0256e5514ade..900aa84ddbc3 100644
@@ -765,7 +765,7 @@ static int ov05c10_get_pm_resources(struct device *dev)
 		return dev_err_probe(dev, PTR_ERR(ov05c10->avdd),
 				     "failed to get avdd regulator\n");
 
-	ov05c10->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
+	ov05c10->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);
 	if (IS_ERR(ov05c10->reset))
 		return dev_err_probe(dev, PTR_ERR(ov05c10->reset),
 				     "failed to get reset gpio\n");
Signature · 1 line
2.47.3
Reviewed-by on v1 2/4
#4 lore raw

Re: [PATCH 2/4] media: ov05c10: Set reset GPIO high when acquiring it

Hi Sakari,

Quoted 12 lines

Set the reset GPIO high when it is acquired.

---
 drivers/media/i2c/ov05c10.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/ov05c10.c +0 -0
index 0256e5514ade..900aa84ddbc3 100644

drivers/media/i2c/ov05c10.c static int ov05c10_get_pm_resources(struct device *dev) · line 768

Quoted 5 lines
drivers/media/i2c/ov05c10.c +1 -1
@@ -765,7 +765,7 @@ static int ov05c10_get_pm_resources(struct device *dev)
                return dev_err_probe(dev, PTR_ERR(ov05c10->avdd),
                                     "failed to get avdd regulator\n");
 
-       ov05c10->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
+       ov05c10->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);

Best regards,
Tarang

author maintainer
#5 lore raw

PATCH 3/4 media: ov05c10: Power management fixes

In reply to Sakari Ailus

If the device wasn't powered on in probe(), probe failure led to it still being powered off. Fix this.

Also disable autosuspend in remove().

---
 drivers/media/i2c/ov05c10.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/i2c/ov05c10.c +3 -1
index 900aa84ddbc3..cd64a621ff48 100644
@@ -920,7 +920,8 @@ static int ov05c10_probe(struct i2c_client *client)
 	v4l2_ctrl_handler_free(ov05c10->sd.ctrl_handler);
 
 probe_error_power_off:
-	ov05c10_power_off(&client->dev);
+	if (full_power)
+		ov05c10_power_off(&client->dev);
 
 	return ret;
 }
@@ -934,6 +935,7 @@ static void ov05c10_remove(struct i2c_client *client)
 	v4l2_subdev_cleanup(sd);
 	media_entity_cleanup(&ov05c10->sd.entity);
 	v4l2_ctrl_handler_free(&ov05c10->ctrl_handler);
+	pm_runtime_dont_use_autosuspend(&client->dev);
 	pm_runtime_disable(&client->dev);
 
 	if (!pm_runtime_status_suspended(&client->dev)) {
Signature · 1 line
2.47.3
Reviewed-by on v1 3/4
#6 lore raw

Re: [PATCH 3/4] media: ov05c10: Power management fixes

Hi Sakari,

Quoted 4 lines

If the device wasn't powered on in probe(), probe failure led to it still being powered off. Fix this.

Also disable autosuspend in remove().

If v4l2_async_register_subdev_sensor() fails when full_power is true, the runtime PM status remains active while the sensor is powered off.

Should we call pm_runtime_set_suspended() in probe_error_rpm, under the full_power condition?

Quoted 20 lines
---
 drivers/media/i2c/ov05c10.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/i2c/ov05c10.c +2 -1
index 900aa84ddbc3..cd64a621ff48 100644
@@ -920,7 +920,8 @@ static int ov05c10_probe(struct i2c_client *client)
        v4l2_ctrl_handler_free(ov05c10->sd.ctrl_handler);
 
 probe_error_power_off:
-       ov05c10_power_off(&client->dev);
+       if (full_power)
+               ov05c10_power_off(&client->dev);
 
        return ret;
 }

drivers/media/i2c/ov05c10.c static void ov05c10_remove(struct i2c_client *client) · line 938

Quoted 4 lines
drivers/media/i2c/ov05c10.c +1 -0
@@ -934,6 +935,7 @@ static void ov05c10_remove(struct i2c_client *client)
        v4l2_subdev_cleanup(sd);
        media_entity_cleanup(&ov05c10->sd.entity);
        v4l2_ctrl_handler_free(&ov05c10->ctrl_handler);
+       pm_runtime_dont_use_autosuspend(&client->dev);

other than that, LGTM.

Best regards,
Tarang

author maintainer
#7 lore raw

Re: [PATCH 3/4] media: ov05c10: Power management fixes

Hi Tarang,

Quoted 5 lines · Tarang Raval

Hi Sakari,

Quoted 3 lines

If the device wasn't powered on in probe(), probe failure led to it still being powered off. Fix this.

Quoted 7 lines
Quoted 1 line

Also disable autosuspend in remove().

If v4l2_async_register_subdev_sensor() fails when full_power is true, the runtime PM status remains active while the sensor is powered off.

Should we call pm_runtime_set_suspended() in probe_error_rpm, under the full_power condition?

Correct. I missed this earlier so I'll add that in v2.

Quoted 3 lines

other than that, LGTM.

Thanks!

Signature · 1 line
Sakari Ailus
author maintainer
#8 lore raw

PATCH 4/4 media: ov05c10: Remove duplicated writes to analogue gain register

In reply to Sakari Ailus

Remove duplicated writes to analogue gain (P1:0x24) register from the mode register list.

---
 drivers/media/i2c/ov05c10.c | 1 -
 1 file changed, 1 deletion(-)
drivers/media/i2c/ov05c10.c +0 -1
index cd64a621ff48..30f118c58ecc 100644
@@ -158,7 +158,6 @@ static const struct cci_reg_sequence mode_2800_1576_30fps[] = {
 	{ OV05C10_REG8(0x01, 0x06), 0x76 },
 	{ OV05C10_REG8(0x01, 0x07), 0x08 },
 	{ OV05C10_REG8(0x01, 0x1b), 0x01 },
-	{ OV05C10_REG8(0x01, 0x24), 0xff },
 	{ OV05C10_REG8(0x01, 0x42), 0x5d },
 	{ OV05C10_REG8(0x01, 0x43), 0x08 },
 	{ OV05C10_REG8(0x01, 0x44), 0x81 },
Signature · 1 line
2.47.3