IMX274 has VANA analog 2.8V supply, VDIG digital core 1.8V supply,
and VDDL digital io 1.2V supply which are optional based on camera
module design.
IMX274 also need external 24Mhz clock and is optional based on
camera module design.
This patch adds support for IMX274 power on and off to enable and
disable these supplies and external clock.
Signed-off-by: Sowjanya Komatineni <[email protected]>
---
drivers/media/i2c/imx274.c | 132 +++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 129 insertions(+), 3 deletions(-)
diff --git a/drivers/media/i2c/imx274.c b/drivers/media/i2c/imx274.c
index 55869ff..7157b1d 100644
--- a/drivers/media/i2c/imx274.c
+++ b/drivers/media/i2c/imx274.c
@@ -19,6 +19,7 @@
#include <linux/module.h>
#include <linux/of_gpio.h>
#include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
#include <linux/slab.h>
#include <linux/v4l2-mediabus.h>
#include <linux/videodev2.h>
@@ -131,6 +132,15 @@
#define IMX274_TABLE_WAIT_MS 0
#define IMX274_TABLE_END 1
+/* regulator supplies */
+static const char * const imx274_supply_names[] = {
+ "VDDL", /* IF (1.2V) supply */
+ "VDIG", /* Digital Core (1.8V) supply */
+ "VANA", /* Analog (2.8V) supply */
+};
+
+#define IMX274_NUM_SUPPLIES ARRAY_SIZE(imx274_supply_names)
+
/*
* imx274 I2C operation related structure
*/
@@ -501,6 +511,8 @@ struct imx274_ctrls {
* @frame_rate: V4L2 frame rate structure
* @regmap: Pointer to regmap structure
* @reset_gpio: Pointer to reset gpio
+ * @supplies: imx274 analog and digital supplies
+ * @inck: input clock to imx274
* @lock: Mutex structure
* @mode: Parameters for the selected readout mode
*/
@@ -514,6 +526,8 @@ struct stimx274 {
struct v4l2_fract frame_interval;
struct regmap *regmap;
struct gpio_desc *reset_gpio;
+ struct regulator *supplies[IMX274_NUM_SUPPLIES];
+ struct clk *inck;
struct mutex lock; /* mutex lock for operations */
const struct imx274_mode *mode;
};
@@ -767,6 +781,99 @@ static void imx274_reset(struct stimx274 *priv, int rst)
usleep_range(IMX274_RESET_DELAY1, IMX274_RESET_DELAY2);
}
+/*
+ * imx274_power_on - Function called to power on the sensor
+ * @imx274: Pointer to device structure
+ */
+static int imx274_power_on(struct device *dev)
+{
+ struct i2c_client *client = to_i2c_client(dev);
+ struct v4l2_subdev *sd = i2c_get_clientdata(client);
+ struct stimx274 *imx274 = to_imx274(sd);
+ int i, ret;
+
+ ret = clk_prepare_enable(imx274->inck);
+ if (ret) {
+ dev_err(&imx274->client->dev,
+ "Failed to enable input clock: %d\n", ret);
+ return ret;
+ }
+
+ for (i = 0; i < IMX274_NUM_SUPPLIES; i++) {
+ if (imx274->supplies[i]) {
+ ret = regulator_enable(imx274->supplies[i]);
+ if (ret < 0) {
+ dev_err(&imx274->client->dev,
+ "Failed to enable %s supply: %d\n",
+ imx274_supply_names[i], ret);
+ goto fail_reg;
+ }
+ }
+ }
+
+ usleep_range(1, 2);
+ imx274_reset(imx274, 1);
+
+ return 0;
+
+fail_reg:
+ for (--i; i >= 0; i--) {
+ if (imx274->supplies[i])
+ regulator_disable(imx274->supplies[i]);
+ }
+
+ clk_disable_unprepare(imx274->inck);
+ return ret;
+}
+
+/*
+ * imx274_power_off - Function called to power off the sensor
+ * @imx274: Pointer to device structure
+ */
+static int imx274_power_off(struct device *dev)
+{
+ struct i2c_client *client = to_i2c_client(dev);
+ struct v4l2_subdev *sd = i2c_get_clientdata(client);
+ struct stimx274 *imx274 = to_imx274(sd);
+ int i;
+
+ imx274_reset(imx274, 0);
+
+ for (i = 0; i < IMX274_NUM_SUPPLIES; i++) {
+ if (imx274->supplies[i])
+ regulator_disable(imx274->supplies[i]);
+ }
+
+ clk_disable_unprepare(imx274->inck);
+
+ return 0;
+}
+
+static int imx274_get_regulators(struct device *dev, struct stimx274 *imx274)
+{
+ int i, err;
+ const char *supply;
+
+ for (i = 0; i < IMX274_NUM_SUPPLIES; i++) {
+ supply = imx274_supply_names[i];
+ imx274->supplies[i] = devm_regulator_get_optional(dev, supply);
+ if (!IS_ERR(imx274->supplies[i]))
+ continue;
+ err = PTR_ERR(imx274->supplies[i]);
+ if (err != -ENODEV) {
+ if (err != -EPROBE_DEFER)
+ dev_err(&imx274->client->dev,
+ "Failed to get %s supply: %d\n",
+ supply, err);
+ return err;
+ }
+
+ imx274->supplies[i] = NULL;
+ }
+
+ return 0;
+}
+
/**
* imx274_s_ctrl - This is used to set the imx274 V4L2 controls
* @ctrl: V4L2 control to be set
@@ -1836,6 +1943,14 @@ static int imx274_probe(struct i2c_client *client)
mutex_init(&imx274->lock);
+ imx274->inck = devm_clk_get_optional(&client->dev, "inck");
+ ret = imx274_get_regulators(&client->dev, imx274);
+ if (ret) {
+ dev_err(&client->dev,
+ "Failed to get power regulators, err: %d\n", ret);
+ return ret;
+ }
+
/* initialize format */
imx274->mode = &imx274_modes[IMX274_DEFAULT_BINNING];
imx274->crop.width = IMX274_MAX_WIDTH;
@@ -1883,15 +1998,23 @@ static int imx274_probe(struct i2c_client *client)
goto err_me;
}
- /* pull sensor out of reset */
- imx274_reset(imx274, 1);
+ /* keep sensor in reset before power on */
+ imx274_reset(imx274, 0);
+
+ /* power on the sensor */
+ ret = imx274_power_on(&client->dev);
+ if (ret < 0) {
+ dev_err(&client->dev,
+ "%s : imx274 power on failed\n", __func__);
+ goto err_me;
+ }
/* initialize controls */
ret = v4l2_ctrl_handler_init(&imx274->ctrls.handler, 4);
if (ret < 0) {
dev_err(&client->dev,
"%s : ctrl handler init Failed\n", __func__);
- goto err_me;
+ goto err_power_off;
}
imx274->ctrls.handler.lock = &imx274->lock;
@@ -1958,6 +2081,8 @@ static int imx274_probe(struct i2c_client *client)
err_ctrls:
v4l2_ctrl_handler_free(&imx274->ctrls.handler);
+err_power_off:
+ imx274_power_off(&client->dev);
err_me:
media_entity_cleanup(&sd->entity);
err_regmap:
@@ -1975,6 +2100,7 @@ static int imx274_remove(struct i2c_client *client)
v4l2_async_unregister_subdev(sd);
v4l2_ctrl_handler_free(&imx274->ctrls.handler);
+ imx274_power_off(&client->dev);
media_entity_cleanup(&sd->entity);
mutex_destroy(&imx274->lock);
return 0;
--
2.7.4
Hi Sowjanya,
On 20/07/20 19:01, Sowjanya Komatineni wrote:
> IMX274 has VANA analog 2.8V supply, VDIG digital core 1.8V supply,
> and VDDL digital io 1.2V supply which are optional based on camera
> module design.
>
> IMX274 also need external 24Mhz clock and is optional based on
> camera module design.
>
> This patch adds support for IMX274 power on and off to enable and
> disable these supplies and external clock.
>
> Signed-off-by: Sowjanya Komatineni <[email protected]>
> ---
In the future please add a log of changes since previous versions here.
As far as the patch is concerned:
Reviewed-by: Luca Ceresoli <[email protected]>
Thanks.
--
Luca
On 7/21/20 7:03 AM, Luca Ceresoli wrote:
> Hi Sowjanya,
>
> On 20/07/20 19:01, Sowjanya Komatineni wrote:
>> IMX274 has VANA analog 2.8V supply, VDIG digital core 1.8V supply,
>> and VDDL digital io 1.2V supply which are optional based on camera
>> module design.
>>
>> IMX274 also need external 24Mhz clock and is optional based on
>> camera module design.
>>
>> This patch adds support for IMX274 power on and off to enable and
>> disable these supplies and external clock.
>>
>> Signed-off-by: Sowjanya Komatineni <[email protected]>
>> ---
> In the future please add a log of changes since previous versions here.
>
> As far as the patch is concerned:
> Reviewed-by: Luca Ceresoli <[email protected]>
>
> Thanks.
Sure.
Thanks
Sowjanya
Hi Sowjanya,
Thanks for the patch.
On Mon, Jul 20, 2020 at 10:01:34AM -0700, Sowjanya Komatineni wrote:
> IMX274 has VANA analog 2.8V supply, VDIG digital core 1.8V supply,
> and VDDL digital io 1.2V supply which are optional based on camera
> module design.
>
> IMX274 also need external 24Mhz clock and is optional based on
> camera module design.
The sensor appears to be able to use other frequencies, too. Could you
check in the driver the frequency is correct? This should be found in DT
bindings, too.
>
> This patch adds support for IMX274 power on and off to enable and
> disable these supplies and external clock.
>
> Signed-off-by: Sowjanya Komatineni <[email protected]>
> ---
> drivers/media/i2c/imx274.c | 132 +++++++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 129 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/i2c/imx274.c b/drivers/media/i2c/imx274.c
> index 55869ff..7157b1d 100644
> --- a/drivers/media/i2c/imx274.c
> +++ b/drivers/media/i2c/imx274.c
> @@ -19,6 +19,7 @@
> #include <linux/module.h>
> #include <linux/of_gpio.h>
> #include <linux/regmap.h>
> +#include <linux/regulator/consumer.h>
> #include <linux/slab.h>
> #include <linux/v4l2-mediabus.h>
> #include <linux/videodev2.h>
> @@ -131,6 +132,15 @@
> #define IMX274_TABLE_WAIT_MS 0
> #define IMX274_TABLE_END 1
>
> +/* regulator supplies */
> +static const char * const imx274_supply_names[] = {
> + "VDDL", /* IF (1.2V) supply */
> + "VDIG", /* Digital Core (1.8V) supply */
> + "VANA", /* Analog (2.8V) supply */
> +};
> +
> +#define IMX274_NUM_SUPPLIES ARRAY_SIZE(imx274_supply_names)
Please use ARRAY_SIZE() directly.
> +
> /*
> * imx274 I2C operation related structure
> */
> @@ -501,6 +511,8 @@ struct imx274_ctrls {
> * @frame_rate: V4L2 frame rate structure
> * @regmap: Pointer to regmap structure
> * @reset_gpio: Pointer to reset gpio
> + * @supplies: imx274 analog and digital supplies
> + * @inck: input clock to imx274
> * @lock: Mutex structure
> * @mode: Parameters for the selected readout mode
> */
> @@ -514,6 +526,8 @@ struct stimx274 {
> struct v4l2_fract frame_interval;
> struct regmap *regmap;
> struct gpio_desc *reset_gpio;
> + struct regulator *supplies[IMX274_NUM_SUPPLIES];
> + struct clk *inck;
> struct mutex lock; /* mutex lock for operations */
> const struct imx274_mode *mode;
> };
> @@ -767,6 +781,99 @@ static void imx274_reset(struct stimx274 *priv, int rst)
> usleep_range(IMX274_RESET_DELAY1, IMX274_RESET_DELAY2);
> }
>
> +/*
> + * imx274_power_on - Function called to power on the sensor
> + * @imx274: Pointer to device structure
> + */
> +static int imx274_power_on(struct device *dev)
> +{
> + struct i2c_client *client = to_i2c_client(dev);
> + struct v4l2_subdev *sd = i2c_get_clientdata(client);
> + struct stimx274 *imx274 = to_imx274(sd);
> + int i, ret;
> +
> + ret = clk_prepare_enable(imx274->inck);
> + if (ret) {
> + dev_err(&imx274->client->dev,
> + "Failed to enable input clock: %d\n", ret);
> + return ret;
> + }
> +
Could you use regulator_bulk_enable() instead? Same for disable.
> + for (i = 0; i < IMX274_NUM_SUPPLIES; i++) {
> + if (imx274->supplies[i]) {
> + ret = regulator_enable(imx274->supplies[i]);
> + if (ret < 0) {
> + dev_err(&imx274->client->dev,
> + "Failed to enable %s supply: %d\n",
> + imx274_supply_names[i], ret);
> + goto fail_reg;
> + }
> + }
> + }
> +
> + usleep_range(1, 2);
This is a very low value. Does that 1 ?s come from the sensor datasheet?
> + imx274_reset(imx274, 1);
> +
> + return 0;
> +
> +fail_reg:
> + for (--i; i >= 0; i--) {
> + if (imx274->supplies[i])
> + regulator_disable(imx274->supplies[i]);
> + }
> +
> + clk_disable_unprepare(imx274->inck);
> + return ret;
> +}
> +
> +/*
> + * imx274_power_off - Function called to power off the sensor
> + * @imx274: Pointer to device structure
> + */
> +static int imx274_power_off(struct device *dev)
> +{
> + struct i2c_client *client = to_i2c_client(dev);
> + struct v4l2_subdev *sd = i2c_get_clientdata(client);
> + struct stimx274 *imx274 = to_imx274(sd);
> + int i;
> +
> + imx274_reset(imx274, 0);
> +
> + for (i = 0; i < IMX274_NUM_SUPPLIES; i++) {
> + if (imx274->supplies[i])
> + regulator_disable(imx274->supplies[i]);
> + }
> +
> + clk_disable_unprepare(imx274->inck);
> +
> + return 0;
> +}
> +
> +static int imx274_get_regulators(struct device *dev, struct stimx274 *imx274)
> +{
> + int i, err;
> + const char *supply;
> +
> + for (i = 0; i < IMX274_NUM_SUPPLIES; i++) {
> + supply = imx274_supply_names[i];
> + imx274->supplies[i] = devm_regulator_get_optional(dev, supply);
> + if (!IS_ERR(imx274->supplies[i]))
> + continue;
> + err = PTR_ERR(imx274->supplies[i]);
> + if (err != -ENODEV) {
> + if (err != -EPROBE_DEFER)
> + dev_err(&imx274->client->dev,
> + "Failed to get %s supply: %d\n",
> + supply, err);
> + return err;
> + }
> +
> + imx274->supplies[i] = NULL;
> + }
> +
> + return 0;
> +}
> +
> /**
> * imx274_s_ctrl - This is used to set the imx274 V4L2 controls
> * @ctrl: V4L2 control to be set
> @@ -1836,6 +1943,14 @@ static int imx274_probe(struct i2c_client *client)
>
> mutex_init(&imx274->lock);
>
> + imx274->inck = devm_clk_get_optional(&client->dev, "inck");
> + ret = imx274_get_regulators(&client->dev, imx274);
> + if (ret) {
> + dev_err(&client->dev,
> + "Failed to get power regulators, err: %d\n", ret);
> + return ret;
> + }
> +
> /* initialize format */
> imx274->mode = &imx274_modes[IMX274_DEFAULT_BINNING];
> imx274->crop.width = IMX274_MAX_WIDTH;
> @@ -1883,15 +1998,23 @@ static int imx274_probe(struct i2c_client *client)
> goto err_me;
> }
>
> - /* pull sensor out of reset */
> - imx274_reset(imx274, 1);
> + /* keep sensor in reset before power on */
> + imx274_reset(imx274, 0);
> +
> + /* power on the sensor */
> + ret = imx274_power_on(&client->dev);
This driver would really benefit from runtime PM support. I guess you
usually don't want to leave the device powered on when it's not in use?
Please see e.g. the ov8856 driver.
> + if (ret < 0) {
> + dev_err(&client->dev,
> + "%s : imx274 power on failed\n", __func__);
> + goto err_me;
> + }
>
> /* initialize controls */
> ret = v4l2_ctrl_handler_init(&imx274->ctrls.handler, 4);
> if (ret < 0) {
> dev_err(&client->dev,
> "%s : ctrl handler init Failed\n", __func__);
> - goto err_me;
> + goto err_power_off;
> }
>
> imx274->ctrls.handler.lock = &imx274->lock;
> @@ -1958,6 +2081,8 @@ static int imx274_probe(struct i2c_client *client)
>
> err_ctrls:
> v4l2_ctrl_handler_free(&imx274->ctrls.handler);
> +err_power_off:
> + imx274_power_off(&client->dev);
> err_me:
> media_entity_cleanup(&sd->entity);
> err_regmap:
> @@ -1975,6 +2100,7 @@ static int imx274_remove(struct i2c_client *client)
>
> v4l2_async_unregister_subdev(sd);
> v4l2_ctrl_handler_free(&imx274->ctrls.handler);
> + imx274_power_off(&client->dev);
> media_entity_cleanup(&sd->entity);
> mutex_destroy(&imx274->lock);
> return 0;
--
Kind regards,
Sakari Ailus
On 7/31/20 9:26 AM, Sakari Ailus wrote:
> Hi Sowjanya,
>
> Thanks for the patch.
>
> On Mon, Jul 20, 2020 at 10:01:34AM -0700, Sowjanya Komatineni wrote:
>> IMX274 has VANA analog 2.8V supply, VDIG digital core 1.8V supply,
>> and VDDL digital io 1.2V supply which are optional based on camera
>> module design.
>>
>> IMX274 also need external 24Mhz clock and is optional based on
>> camera module design.
> The sensor appears to be able to use other frequencies, too. Could you
> check in the driver the frequency is correct? This should be found in DT
> bindings, too.
External input clock is not in DT. So added it as part of this series.
We are mostly using 24Mhz I/P with IMX274 on designs we have and also on
leopard module which has onboard XTAL for 24Mhz
>> This patch adds support for IMX274 power on and off to enable and
>> disable these supplies and external clock.
>>
>> Signed-off-by: Sowjanya Komatineni <[email protected]>
>> ---
>> drivers/media/i2c/imx274.c | 132 +++++++++++++++++++++++++++++++++++++++++++--
>> 1 file changed, 129 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/media/i2c/imx274.c b/drivers/media/i2c/imx274.c
>> index 55869ff..7157b1d 100644
>> --- a/drivers/media/i2c/imx274.c
>> +++ b/drivers/media/i2c/imx274.c
>> @@ -19,6 +19,7 @@
>> #include <linux/module.h>
>> #include <linux/of_gpio.h>
>> #include <linux/regmap.h>
>> +#include <linux/regulator/consumer.h>
>> #include <linux/slab.h>
>> #include <linux/v4l2-mediabus.h>
>> #include <linux/videodev2.h>
>> @@ -131,6 +132,15 @@
>> #define IMX274_TABLE_WAIT_MS 0
>> #define IMX274_TABLE_END 1
>>
>> +/* regulator supplies */
>> +static const char * const imx274_supply_names[] = {
>> + "VDDL", /* IF (1.2V) supply */
>> + "VDIG", /* Digital Core (1.8V) supply */
>> + "VANA", /* Analog (2.8V) supply */
>> +};
>> +
>> +#define IMX274_NUM_SUPPLIES ARRAY_SIZE(imx274_supply_names)
> Please use ARRAY_SIZE() directly.
>
>> +
>> /*
>> * imx274 I2C operation related structure
>> */
>> @@ -501,6 +511,8 @@ struct imx274_ctrls {
>> * @frame_rate: V4L2 frame rate structure
>> * @regmap: Pointer to regmap structure
>> * @reset_gpio: Pointer to reset gpio
>> + * @supplies: imx274 analog and digital supplies
>> + * @inck: input clock to imx274
>> * @lock: Mutex structure
>> * @mode: Parameters for the selected readout mode
>> */
>> @@ -514,6 +526,8 @@ struct stimx274 {
>> struct v4l2_fract frame_interval;
>> struct regmap *regmap;
>> struct gpio_desc *reset_gpio;
>> + struct regulator *supplies[IMX274_NUM_SUPPLIES];
>> + struct clk *inck;
>> struct mutex lock; /* mutex lock for operations */
>> const struct imx274_mode *mode;
>> };
>> @@ -767,6 +781,99 @@ static void imx274_reset(struct stimx274 *priv, int rst)
>> usleep_range(IMX274_RESET_DELAY1, IMX274_RESET_DELAY2);
>> }
>>
>> +/*
>> + * imx274_power_on - Function called to power on the sensor
>> + * @imx274: Pointer to device structure
>> + */
>> +static int imx274_power_on(struct device *dev)
>> +{
>> + struct i2c_client *client = to_i2c_client(dev);
>> + struct v4l2_subdev *sd = i2c_get_clientdata(client);
>> + struct stimx274 *imx274 = to_imx274(sd);
>> + int i, ret;
>> +
>> + ret = clk_prepare_enable(imx274->inck);
>> + if (ret) {
>> + dev_err(&imx274->client->dev,
>> + "Failed to enable input clock: %d\n", ret);
>> + return ret;
>> + }
>> +
> Could you use regulator_bulk_enable() instead? Same for disable.
Using regulator_bulk_enable() makes these regulators mandatory.
But not all camera module designs expect power supply externally.
Leopard module don't need to enable these separately as their design has
onboard supplies that get enabled without SW control for individually
turning them on.
Some custom designs depend on sourcing externally and SW should enable
them like one of the other design module we have for Jetson TX1.
Depending on camera module design, these supplies can be optional.
>
>> + for (i = 0; i < IMX274_NUM_SUPPLIES; i++) {
>> + if (imx274->supplies[i]) {
>> + ret = regulator_enable(imx274->supplies[i]);
>> + if (ret < 0) {
>> + dev_err(&imx274->client->dev,
>> + "Failed to enable %s supply: %d\n",
>> + imx274_supply_names[i], ret);
>> + goto fail_reg;
>> + }
>> + }
>> + }
>> +
>> + usleep_range(1, 2);
> This is a very low value. Does that 1 µs come from the sensor datasheet?
>
>> + imx274_reset(imx274, 1);
>> +
>> + return 0;
>> +
>> +fail_reg:
>> + for (--i; i >= 0; i--) {
>> + if (imx274->supplies[i])
>> + regulator_disable(imx274->supplies[i]);
>> + }
>> +
>> + clk_disable_unprepare(imx274->inck);
>> + return ret;
>> +}
>> +
>> +/*
>> + * imx274_power_off - Function called to power off the sensor
>> + * @imx274: Pointer to device structure
>> + */
>> +static int imx274_power_off(struct device *dev)
>> +{
>> + struct i2c_client *client = to_i2c_client(dev);
>> + struct v4l2_subdev *sd = i2c_get_clientdata(client);
>> + struct stimx274 *imx274 = to_imx274(sd);
>> + int i;
>> +
>> + imx274_reset(imx274, 0);
>> +
>> + for (i = 0; i < IMX274_NUM_SUPPLIES; i++) {
>> + if (imx274->supplies[i])
>> + regulator_disable(imx274->supplies[i]);
>> + }
>> +
>> + clk_disable_unprepare(imx274->inck);
>> +
>> + return 0;
>> +}
>> +
>> +static int imx274_get_regulators(struct device *dev, struct stimx274 *imx274)
>> +{
>> + int i, err;
>> + const char *supply;
>> +
>> + for (i = 0; i < IMX274_NUM_SUPPLIES; i++) {
>> + supply = imx274_supply_names[i];
>> + imx274->supplies[i] = devm_regulator_get_optional(dev, supply);
>> + if (!IS_ERR(imx274->supplies[i]))
>> + continue;
>> + err = PTR_ERR(imx274->supplies[i]);
>> + if (err != -ENODEV) {
>> + if (err != -EPROBE_DEFER)
>> + dev_err(&imx274->client->dev,
>> + "Failed to get %s supply: %d\n",
>> + supply, err);
>> + return err;
>> + }
>> +
>> + imx274->supplies[i] = NULL;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> /**
>> * imx274_s_ctrl - This is used to set the imx274 V4L2 controls
>> * @ctrl: V4L2 control to be set
>> @@ -1836,6 +1943,14 @@ static int imx274_probe(struct i2c_client *client)
>>
>> mutex_init(&imx274->lock);
>>
>> + imx274->inck = devm_clk_get_optional(&client->dev, "inck");
>> + ret = imx274_get_regulators(&client->dev, imx274);
>> + if (ret) {
>> + dev_err(&client->dev,
>> + "Failed to get power regulators, err: %d\n", ret);
>> + return ret;
>> + }
>> +
>> /* initialize format */
>> imx274->mode = &imx274_modes[IMX274_DEFAULT_BINNING];
>> imx274->crop.width = IMX274_MAX_WIDTH;
>> @@ -1883,15 +1998,23 @@ static int imx274_probe(struct i2c_client *client)
>> goto err_me;
>> }
>>
>> - /* pull sensor out of reset */
>> - imx274_reset(imx274, 1);
>> + /* keep sensor in reset before power on */
>> + imx274_reset(imx274, 0);
>> +
>> + /* power on the sensor */
>> + ret = imx274_power_on(&client->dev);
> This driver would really benefit from runtime PM support. I guess you
> usually don't want to leave the device powered on when it's not in use?
>
> Please see e.g. the ov8856 driver.
>
>> + if (ret < 0) {
>> + dev_err(&client->dev,
>> + "%s : imx274 power on failed\n", __func__);
>> + goto err_me;
>> + }
>>
>> /* initialize controls */
>> ret = v4l2_ctrl_handler_init(&imx274->ctrls.handler, 4);
>> if (ret < 0) {
>> dev_err(&client->dev,
>> "%s : ctrl handler init Failed\n", __func__);
>> - goto err_me;
>> + goto err_power_off;
>> }
>>
>> imx274->ctrls.handler.lock = &imx274->lock;
>> @@ -1958,6 +2081,8 @@ static int imx274_probe(struct i2c_client *client)
>>
>> err_ctrls:
>> v4l2_ctrl_handler_free(&imx274->ctrls.handler);
>> +err_power_off:
>> + imx274_power_off(&client->dev);
>> err_me:
>> media_entity_cleanup(&sd->entity);
>> err_regmap:
>> @@ -1975,6 +2100,7 @@ static int imx274_remove(struct i2c_client *client)
>>
>> v4l2_async_unregister_subdev(sd);
>> v4l2_ctrl_handler_free(&imx274->ctrls.handler);
>> + imx274_power_off(&client->dev);
>> media_entity_cleanup(&sd->entity);
>> mutex_destroy(&imx274->lock);
>> return 0;
Hi Sowjanya,
On Fri, Jul 31, 2020 at 09:34:15AM -0700, Sowjanya Komatineni wrote:
>
> On 7/31/20 9:26 AM, Sakari Ailus wrote:
> > Hi Sowjanya,
> >
> > Thanks for the patch.
> >
> > On Mon, Jul 20, 2020 at 10:01:34AM -0700, Sowjanya Komatineni wrote:
> > > IMX274 has VANA analog 2.8V supply, VDIG digital core 1.8V supply,
> > > and VDDL digital io 1.2V supply which are optional based on camera
> > > module design.
> > >
> > > IMX274 also need external 24Mhz clock and is optional based on
> > > camera module design.
> > The sensor appears to be able to use other frequencies, too. Could you
> > check in the driver the frequency is correct? This should be found in DT
> > bindings, too.
>
> External input clock is not in DT. So added it as part of this series.
>
> We are mostly using 24Mhz I/P with IMX274 on designs we have and also on
> leopard module which has onboard XTAL for 24Mhz
Yes. This information still should be found in DT as the xtal isn't part of
the sensor.
>
> > > This patch adds support for IMX274 power on and off to enable and
> > > disable these supplies and external clock.
> > >
> > > Signed-off-by: Sowjanya Komatineni <[email protected]>
> > > ---
> > > drivers/media/i2c/imx274.c | 132 +++++++++++++++++++++++++++++++++++++++++++--
> > > 1 file changed, 129 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/drivers/media/i2c/imx274.c b/drivers/media/i2c/imx274.c
> > > index 55869ff..7157b1d 100644
> > > --- a/drivers/media/i2c/imx274.c
> > > +++ b/drivers/media/i2c/imx274.c
> > > @@ -19,6 +19,7 @@
> > > #include <linux/module.h>
> > > #include <linux/of_gpio.h>
> > > #include <linux/regmap.h>
> > > +#include <linux/regulator/consumer.h>
> > > #include <linux/slab.h>
> > > #include <linux/v4l2-mediabus.h>
> > > #include <linux/videodev2.h>
> > > @@ -131,6 +132,15 @@
> > > #define IMX274_TABLE_WAIT_MS 0
> > > #define IMX274_TABLE_END 1
> > > +/* regulator supplies */
> > > +static const char * const imx274_supply_names[] = {
> > > + "VDDL", /* IF (1.2V) supply */
> > > + "VDIG", /* Digital Core (1.8V) supply */
> > > + "VANA", /* Analog (2.8V) supply */
> > > +};
> > > +
> > > +#define IMX274_NUM_SUPPLIES ARRAY_SIZE(imx274_supply_names)
> > Please use ARRAY_SIZE() directly.
> >
> > > +
> > > /*
> > > * imx274 I2C operation related structure
> > > */
> > > @@ -501,6 +511,8 @@ struct imx274_ctrls {
> > > * @frame_rate: V4L2 frame rate structure
> > > * @regmap: Pointer to regmap structure
> > > * @reset_gpio: Pointer to reset gpio
> > > + * @supplies: imx274 analog and digital supplies
> > > + * @inck: input clock to imx274
> > > * @lock: Mutex structure
> > > * @mode: Parameters for the selected readout mode
> > > */
> > > @@ -514,6 +526,8 @@ struct stimx274 {
> > > struct v4l2_fract frame_interval;
> > > struct regmap *regmap;
> > > struct gpio_desc *reset_gpio;
> > > + struct regulator *supplies[IMX274_NUM_SUPPLIES];
> > > + struct clk *inck;
> > > struct mutex lock; /* mutex lock for operations */
> > > const struct imx274_mode *mode;
> > > };
> > > @@ -767,6 +781,99 @@ static void imx274_reset(struct stimx274 *priv, int rst)
> > > usleep_range(IMX274_RESET_DELAY1, IMX274_RESET_DELAY2);
> > > }
> > > +/*
> > > + * imx274_power_on - Function called to power on the sensor
> > > + * @imx274: Pointer to device structure
> > > + */
> > > +static int imx274_power_on(struct device *dev)
> > > +{
> > > + struct i2c_client *client = to_i2c_client(dev);
> > > + struct v4l2_subdev *sd = i2c_get_clientdata(client);
> > > + struct stimx274 *imx274 = to_imx274(sd);
> > > + int i, ret;
> > > +
> > > + ret = clk_prepare_enable(imx274->inck);
> > > + if (ret) {
> > > + dev_err(&imx274->client->dev,
> > > + "Failed to enable input clock: %d\n", ret);
> > > + return ret;
> > > + }
> > > +
> > Could you use regulator_bulk_enable() instead? Same for disable.
>
> Using regulator_bulk_enable() makes these regulators mandatory.
How? regulator_bulk_enable() simply does call regulator_enable() on all the
regulators.
--
Sakari Ailus
On 8/13/20 3:01 PM, Sakari Ailus wrote:
> Hi Sowjanya,
>
> On Fri, Jul 31, 2020 at 09:34:15AM -0700, Sowjanya Komatineni wrote:
>> On 7/31/20 9:26 AM, Sakari Ailus wrote:
>>> Hi Sowjanya,
>>>
>>> Thanks for the patch.
>>>
>>> On Mon, Jul 20, 2020 at 10:01:34AM -0700, Sowjanya Komatineni wrote:
>>>> IMX274 has VANA analog 2.8V supply, VDIG digital core 1.8V supply,
>>>> and VDDL digital io 1.2V supply which are optional based on camera
>>>> module design.
>>>>
>>>> IMX274 also need external 24Mhz clock and is optional based on
>>>> camera module design.
>>> The sensor appears to be able to use other frequencies, too. Could you
>>> check in the driver the frequency is correct? This should be found in DT
>>> bindings, too.
>> External input clock is not in DT. So added it as part of this series.
>>
>> We are mostly using 24Mhz I/P with IMX274 on designs we have and also on
>> leopard module which has onboard XTAL for 24Mhz
> Yes. This information still should be found in DT as the xtal isn't part of
> the sensor.
>
>>>> This patch adds support for IMX274 power on and off to enable and
>>>> disable these supplies and external clock.
>>>>
>>>> Signed-off-by: Sowjanya Komatineni <[email protected]>
>>>> ---
>>>> drivers/media/i2c/imx274.c | 132 +++++++++++++++++++++++++++++++++++++++++++--
>>>> 1 file changed, 129 insertions(+), 3 deletions(-)
>>>>
>>>> diff --git a/drivers/media/i2c/imx274.c b/drivers/media/i2c/imx274.c
>>>> index 55869ff..7157b1d 100644
>>>> --- a/drivers/media/i2c/imx274.c
>>>> +++ b/drivers/media/i2c/imx274.c
>>>> @@ -19,6 +19,7 @@
>>>> #include <linux/module.h>
>>>> #include <linux/of_gpio.h>
>>>> #include <linux/regmap.h>
>>>> +#include <linux/regulator/consumer.h>
>>>> #include <linux/slab.h>
>>>> #include <linux/v4l2-mediabus.h>
>>>> #include <linux/videodev2.h>
>>>> @@ -131,6 +132,15 @@
>>>> #define IMX274_TABLE_WAIT_MS 0
>>>> #define IMX274_TABLE_END 1
>>>> +/* regulator supplies */
>>>> +static const char * const imx274_supply_names[] = {
>>>> + "VDDL", /* IF (1.2V) supply */
>>>> + "VDIG", /* Digital Core (1.8V) supply */
>>>> + "VANA", /* Analog (2.8V) supply */
>>>> +};
>>>> +
>>>> +#define IMX274_NUM_SUPPLIES ARRAY_SIZE(imx274_supply_names)
>>> Please use ARRAY_SIZE() directly.
>>>
>>>> +
>>>> /*
>>>> * imx274 I2C operation related structure
>>>> */
>>>> @@ -501,6 +511,8 @@ struct imx274_ctrls {
>>>> * @frame_rate: V4L2 frame rate structure
>>>> * @regmap: Pointer to regmap structure
>>>> * @reset_gpio: Pointer to reset gpio
>>>> + * @supplies: imx274 analog and digital supplies
>>>> + * @inck: input clock to imx274
>>>> * @lock: Mutex structure
>>>> * @mode: Parameters for the selected readout mode
>>>> */
>>>> @@ -514,6 +526,8 @@ struct stimx274 {
>>>> struct v4l2_fract frame_interval;
>>>> struct regmap *regmap;
>>>> struct gpio_desc *reset_gpio;
>>>> + struct regulator *supplies[IMX274_NUM_SUPPLIES];
>>>> + struct clk *inck;
>>>> struct mutex lock; /* mutex lock for operations */
>>>> const struct imx274_mode *mode;
>>>> };
>>>> @@ -767,6 +781,99 @@ static void imx274_reset(struct stimx274 *priv, int rst)
>>>> usleep_range(IMX274_RESET_DELAY1, IMX274_RESET_DELAY2);
>>>> }
>>>> +/*
>>>> + * imx274_power_on - Function called to power on the sensor
>>>> + * @imx274: Pointer to device structure
>>>> + */
>>>> +static int imx274_power_on(struct device *dev)
>>>> +{
>>>> + struct i2c_client *client = to_i2c_client(dev);
>>>> + struct v4l2_subdev *sd = i2c_get_clientdata(client);
>>>> + struct stimx274 *imx274 = to_imx274(sd);
>>>> + int i, ret;
>>>> +
>>>> + ret = clk_prepare_enable(imx274->inck);
>>>> + if (ret) {
>>>> + dev_err(&imx274->client->dev,
>>>> + "Failed to enable input clock: %d\n", ret);
>>>> + return ret;
>>>> + }
>>>> +
>>> Could you use regulator_bulk_enable() instead? Same for disable.
>> Using regulator_bulk_enable() makes these regulators mandatory.
> How? regulator_bulk_enable() simply does call regulator_enable() on all the
> regulators.
>
regulator_bulk APIs uses regulator_bulk_data and so had to retrieve
regulators from DT with devm_regulator_bulk_get() which don't use
optional regulator get.
On 8/27/20 3:55 PM, Sowjanya Komatineni wrote:
>
> On 8/13/20 3:01 PM, Sakari Ailus wrote:
>> Hi Sowjanya,
>>
>> On Fri, Jul 31, 2020 at 09:34:15AM -0700, Sowjanya Komatineni wrote:
>>> On 7/31/20 9:26 AM, Sakari Ailus wrote:
>>>> Hi Sowjanya,
>>>>
>>>> Thanks for the patch.
>>>>
>>>> On Mon, Jul 20, 2020 at 10:01:34AM -0700, Sowjanya Komatineni wrote:
>>>>> IMX274 has VANA analog 2.8V supply, VDIG digital core 1.8V supply,
>>>>> and VDDL digital io 1.2V supply which are optional based on camera
>>>>> module design.
>>>>>
>>>>> IMX274 also need external 24Mhz clock and is optional based on
>>>>> camera module design.
>>>> The sensor appears to be able to use other frequencies, too. Could you
>>>> check in the driver the frequency is correct? This should be found
>>>> in DT
>>>> bindings, too.
>>> External input clock is not in DT. So added it as part of this series.
>>>
>>> We are mostly using 24Mhz I/P with IMX274 on designs we have and
>>> also on
>>> leopard module which has onboard XTAL for 24Mhz
>> Yes. This information still should be found in DT as the xtal isn't
>> part of
>> the sensor.
>>
>>>>> This patch adds support for IMX274 power on and off to enable and
>>>>> disable these supplies and external clock.
>>>>>
>>>>> Signed-off-by: Sowjanya Komatineni <[email protected]>
>>>>> ---
>>>>> drivers/media/i2c/imx274.c | 132
>>>>> +++++++++++++++++++++++++++++++++++++++++++--
>>>>> 1 file changed, 129 insertions(+), 3 deletions(-)
>>>>>
>>>>> diff --git a/drivers/media/i2c/imx274.c b/drivers/media/i2c/imx274.c
>>>>> index 55869ff..7157b1d 100644
>>>>> --- a/drivers/media/i2c/imx274.c
>>>>> +++ b/drivers/media/i2c/imx274.c
>>>>> @@ -19,6 +19,7 @@
>>>>> #include <linux/module.h>
>>>>> #include <linux/of_gpio.h>
>>>>> #include <linux/regmap.h>
>>>>> +#include <linux/regulator/consumer.h>
>>>>> #include <linux/slab.h>
>>>>> #include <linux/v4l2-mediabus.h>
>>>>> #include <linux/videodev2.h>
>>>>> @@ -131,6 +132,15 @@
>>>>> #define IMX274_TABLE_WAIT_MS 0
>>>>> #define IMX274_TABLE_END 1
>>>>> +/* regulator supplies */
>>>>> +static const char * const imx274_supply_names[] = {
>>>>> + "VDDL", /* IF (1.2V) supply */
>>>>> + "VDIG", /* Digital Core (1.8V) supply */
>>>>> + "VANA", /* Analog (2.8V) supply */
>>>>> +};
>>>>> +
>>>>> +#define IMX274_NUM_SUPPLIES ARRAY_SIZE(imx274_supply_names)
>>>> Please use ARRAY_SIZE() directly.
>>>>
>>>>> +
>>>>> /*
>>>>> * imx274 I2C operation related structure
>>>>> */
>>>>> @@ -501,6 +511,8 @@ struct imx274_ctrls {
>>>>> * @frame_rate: V4L2 frame rate structure
>>>>> * @regmap: Pointer to regmap structure
>>>>> * @reset_gpio: Pointer to reset gpio
>>>>> + * @supplies: imx274 analog and digital supplies
>>>>> + * @inck: input clock to imx274
>>>>> * @lock: Mutex structure
>>>>> * @mode: Parameters for the selected readout mode
>>>>> */
>>>>> @@ -514,6 +526,8 @@ struct stimx274 {
>>>>> struct v4l2_fract frame_interval;
>>>>> struct regmap *regmap;
>>>>> struct gpio_desc *reset_gpio;
>>>>> + struct regulator *supplies[IMX274_NUM_SUPPLIES];
>>>>> + struct clk *inck;
>>>>> struct mutex lock; /* mutex lock for operations */
>>>>> const struct imx274_mode *mode;
>>>>> };
>>>>> @@ -767,6 +781,99 @@ static void imx274_reset(struct stimx274
>>>>> *priv, int rst)
>>>>> usleep_range(IMX274_RESET_DELAY1, IMX274_RESET_DELAY2);
>>>>> }
>>>>> +/*
>>>>> + * imx274_power_on - Function called to power on the sensor
>>>>> + * @imx274: Pointer to device structure
>>>>> + */
>>>>> +static int imx274_power_on(struct device *dev)
>>>>> +{
>>>>> + struct i2c_client *client = to_i2c_client(dev);
>>>>> + struct v4l2_subdev *sd = i2c_get_clientdata(client);
>>>>> + struct stimx274 *imx274 = to_imx274(sd);
>>>>> + int i, ret;
>>>>> +
>>>>> + ret = clk_prepare_enable(imx274->inck);
>>>>> + if (ret) {
>>>>> + dev_err(&imx274->client->dev,
>>>>> + "Failed to enable input clock: %d\n", ret);
>>>>> + return ret;
>>>>> + }
>>>>> +
>>>> Could you use regulator_bulk_enable() instead? Same for disable.
>>> Using regulator_bulk_enable() makes these regulators mandatory.
>> How? regulator_bulk_enable() simply does call regulator_enable() on
>> all the
>> regulators.
>>
> regulator_bulk APIs uses regulator_bulk_data and so had to retrieve
> regulators from DT with devm_regulator_bulk_get() which don't use
> optional regulator get.
>
Sorry, please ignore my above comment. Yes, will fix in v4 to use
bulk_enable()