| Message ID | 20220411013131.3553098-3-bryan.odonoghue@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | media: i2c: imx412: Add regulator control to imx412 | expand |
Hi Bryan, Thanks for the patch. On Mon, Apr 11, 2022 at 02:31:31AM +0100, Bryan O'Donoghue wrote: > Depending on the platform we may need to enable and disable three separate > regulators for the imx412. > > - DOVDD > Digital I/O power > > - AVDD > Analog power > > - DVDD > Digital core power > > The addition of these regulators shouldn't affect existing users using > fixed-on/firmware-controlled regulators. > > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > --- > drivers/media/i2c/imx412.c | 30 ++++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > > diff --git a/drivers/media/i2c/imx412.c b/drivers/media/i2c/imx412.c > index be3f6ea55559..44b92718b6cf 100644 > --- a/drivers/media/i2c/imx412.c > +++ b/drivers/media/i2c/imx412.c > @@ -11,6 +11,7 @@ > #include <linux/i2c.h> > #include <linux/module.h> > #include <linux/pm_runtime.h> > +#include <linux/regulator/consumer.h> > > #include <media/v4l2-ctrls.h> > #include <media/v4l2-fwnode.h> > @@ -101,6 +102,12 @@ struct imx412_mode { > struct imx412_reg_list reg_list; > }; > > +static const char * const imx412_supply_names[] = { > + "dovdd", /* Digital I/O power */ > + "avdd", /* Analog power */ > + "dvdd", /* Digital core power */ > +}; > + > /** > * struct imx412 - imx412 sensor device structure > * @dev: Pointer to generic device > @@ -128,6 +135,8 @@ struct imx412 { > struct media_pad pad; > struct gpio_desc *reset_gpio; > struct clk *inclk; > + struct regulator_bulk_data supplies[ARRAY_SIZE(imx412_supply_names)]; > + int num_supplies; unsigned int > struct v4l2_ctrl_handler ctrl_handler; > struct v4l2_ctrl *link_freq_ctrl; > struct v4l2_ctrl *pclk_ctrl; > @@ -946,6 +955,17 @@ static int imx412_parse_hw_config(struct imx412 *imx412) > return -EINVAL; > } > > + /* Get optional DT defined regulators */ > + imx412->num_supplies = ARRAY_SIZE(imx412_supply_names); > + for (i = 0; i < imx412->num_supplies; i++) > + imx412->supplies[i].supply = imx412_supply_names[i]; > + > + ret = devm_regulator_bulk_get(imx412->dev, > + imx412->num_supplies, Fits on previous line. > + imx412->supplies); > + if (ret) > + return ret; > + > ep = fwnode_graph_get_next_endpoint(fwnode, NULL); > if (!ep) > return -ENXIO; > @@ -1011,6 +1031,13 @@ static int imx412_power_on(struct device *dev) > struct imx412 *imx412 = to_imx412(sd); > int ret; > > + ret = regulator_bulk_enable(imx412->num_supplies, > + imx412->supplies); > + if (ret < 0) { > + dev_err(dev, "failed to enable regulators\n"); > + goto error_reset; You can return here, without touching the GPIO. > + } > + > gpiod_set_value_cansleep(imx412->reset_gpio, 1); > > ret = clk_prepare_enable(imx412->inclk); Please do disable the regulators if clk_prepare_enable() fails. > @@ -1044,6 +1071,9 @@ static int imx412_power_off(struct device *dev) > > clk_disable_unprepare(imx412->inclk); > > + regulator_bulk_disable(imx412->num_supplies, > + imx412->supplies); > + > return 0; > } >
diff --git a/drivers/media/i2c/imx412.c b/drivers/media/i2c/imx412.c index be3f6ea55559..44b92718b6cf 100644 --- a/drivers/media/i2c/imx412.c +++ b/drivers/media/i2c/imx412.c @@ -11,6 +11,7 @@ #include <linux/i2c.h> #include <linux/module.h> #include <linux/pm_runtime.h> +#include <linux/regulator/consumer.h> #include <media/v4l2-ctrls.h> #include <media/v4l2-fwnode.h> @@ -101,6 +102,12 @@ struct imx412_mode { struct imx412_reg_list reg_list; }; +static const char * const imx412_supply_names[] = { + "dovdd", /* Digital I/O power */ + "avdd", /* Analog power */ + "dvdd", /* Digital core power */ +}; + /** * struct imx412 - imx412 sensor device structure * @dev: Pointer to generic device @@ -128,6 +135,8 @@ struct imx412 { struct media_pad pad; struct gpio_desc *reset_gpio; struct clk *inclk; + struct regulator_bulk_data supplies[ARRAY_SIZE(imx412_supply_names)]; + int num_supplies; struct v4l2_ctrl_handler ctrl_handler; struct v4l2_ctrl *link_freq_ctrl; struct v4l2_ctrl *pclk_ctrl; @@ -946,6 +955,17 @@ static int imx412_parse_hw_config(struct imx412 *imx412) return -EINVAL; } + /* Get optional DT defined regulators */ + imx412->num_supplies = ARRAY_SIZE(imx412_supply_names); + for (i = 0; i < imx412->num_supplies; i++) + imx412->supplies[i].supply = imx412_supply_names[i]; + + ret = devm_regulator_bulk_get(imx412->dev, + imx412->num_supplies, + imx412->supplies); + if (ret) + return ret; + ep = fwnode_graph_get_next_endpoint(fwnode, NULL); if (!ep) return -ENXIO; @@ -1011,6 +1031,13 @@ static int imx412_power_on(struct device *dev) struct imx412 *imx412 = to_imx412(sd); int ret; + ret = regulator_bulk_enable(imx412->num_supplies, + imx412->supplies); + if (ret < 0) { + dev_err(dev, "failed to enable regulators\n"); + goto error_reset; + } + gpiod_set_value_cansleep(imx412->reset_gpio, 1); ret = clk_prepare_enable(imx412->inclk); @@ -1044,6 +1071,9 @@ static int imx412_power_off(struct device *dev) clk_disable_unprepare(imx412->inclk); + regulator_bulk_disable(imx412->num_supplies, + imx412->supplies); + return 0; }
Depending on the platform we may need to enable and disable three separate regulators for the imx412. - DOVDD Digital I/O power - AVDD Analog power - DVDD Digital core power The addition of these regulators shouldn't affect existing users using fixed-on/firmware-controlled regulators. Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> --- drivers/media/i2c/imx412.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)