| Message ID | 20220715074858.875808-6-alexander.stein@ew.tq-group.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | OV9281 support | expand |
Hi Alexander, Thanks for the set. On Fri, Jul 15, 2022 at 09:48:57AM +0200, Alexander Stein wrote: > Need in case the sensors is supplied by a switchable regulator. > > Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> > --- > Changes in v2: > * Remove error message for failed regulator_bulk_disable() > * Rename ov9282_configure_regulators to ov9282_get_regulators > > drivers/media/i2c/ov9282.c | 39 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 39 insertions(+) > > diff --git a/drivers/media/i2c/ov9282.c b/drivers/media/i2c/ov9282.c > index 04fda8222e07..263cdffc558f 100644 > --- a/drivers/media/i2c/ov9282.c > +++ b/drivers/media/i2c/ov9282.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> > @@ -55,6 +56,14 @@ > #define OV9282_REG_MIN 0x00 > #define OV9282_REG_MAX 0xfffff > > +static const char * const ov9282_supply_names[] = { > + "avdd", /* Analog power */ > + "dovdd", /* Digital I/O power */ > + "dvdd", /* Digital core power */ > +}; > + > +#define OV9282_NUM_SUPPLIES ARRAY_SIZE(ov9282_supply_names) > + > /** > * struct ov9282_reg - ov9282 sensor register > * @address: Register address > @@ -127,6 +136,7 @@ struct ov9282 { > struct media_pad pad; > struct gpio_desc *reset_gpio; > struct clk *inclk; > + struct regulator_bulk_data supplies[OV9282_NUM_SUPPLIES]; > struct v4l2_ctrl_handler ctrl_handler; > struct v4l2_ctrl *link_freq_ctrl; > struct v4l2_ctrl *pclk_ctrl; > @@ -883,10 +893,18 @@ static int ov9282_power_on(struct device *dev) > goto error_reset; > } > > + ret = regulator_bulk_enable(ARRAY_SIZE(ov9282->supplies), ov9282->supplies); Please run the set through: ./scripts/checkpatch.pl --strict --max-line-length=80 > + if (ret) { > + dev_err(dev, "Failed to enable regulators\n"); > + goto disable_clk; > + } > + > usleep_range(400, 600); > > return 0; > > +disable_clk: > + clk_disable_unprepare(ov9282->inclk); > error_reset: > gpiod_set_value_cansleep(ov9282->reset_gpio, 0); > > @@ -903,6 +921,9 @@ static int ov9282_power_off(struct device *dev) > { > struct v4l2_subdev *sd = dev_get_drvdata(dev); > struct ov9282 *ov9282 = to_ov9282(sd); > + int ret; ret seems to be unused. > + > + regulator_bulk_disable(ARRAY_SIZE(ov9282->supplies), ov9282->supplies); > > gpiod_set_value_cansleep(ov9282->reset_gpio, 0); > > @@ -996,6 +1017,18 @@ static int ov9282_init_controls(struct ov9282 *ov9282) > return 0; > } > > +static int ov9282_get_regulators(struct ov9282 *ov9282) > +{ > + unsigned int i; > + > + for (i = 0; i < ARRAY_SIZE(ov9282->supplies); i++) > + ov9282->supplies[i].supply = ov9282_supply_names[i]; > + > + return devm_regulator_bulk_get(ov9282->dev, > + ARRAY_SIZE(ov9282->supplies), > + ov9282->supplies); > +} > + > /** > * ov9282_probe() - I2C client device binding > * @client: pointer to i2c client device > @@ -1022,6 +1055,12 @@ static int ov9282_probe(struct i2c_client *client) > return ret; > } > > + ret = ov9282_get_regulators(ov9282); > + if (ret) { > + dev_err(&client->dev, "Failed to get power regulators\n"); > + return ret; > + } > + > mutex_init(&ov9282->mutex); > > ret = ov9282_power_on(ov9282->dev);
Hi Sakari, Am Sonntag, 17. Juli 2022, 16:17:09 CEST schrieb Sakari Ailus: > Hi Alexander, > > Thanks for the set. > > On Fri, Jul 15, 2022 at 09:48:57AM +0200, Alexander Stein wrote: > > Need in case the sensors is supplied by a switchable regulator. > > > > Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> > > --- > > Changes in v2: > > * Remove error message for failed regulator_bulk_disable() > > * Rename ov9282_configure_regulators to ov9282_get_regulators > > > > drivers/media/i2c/ov9282.c | 39 ++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 39 insertions(+) > > > > diff --git a/drivers/media/i2c/ov9282.c b/drivers/media/i2c/ov9282.c > > index 04fda8222e07..263cdffc558f 100644 > > --- a/drivers/media/i2c/ov9282.c > > +++ b/drivers/media/i2c/ov9282.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> > > > > @@ -55,6 +56,14 @@ > > > > #define OV9282_REG_MIN 0x00 > > #define OV9282_REG_MAX 0xfffff > > > > +static const char * const ov9282_supply_names[] = { > > + "avdd", /* Analog power */ > > + "dovdd", /* Digital I/O power */ > > + "dvdd", /* Digital core power */ > > +}; > > + > > +#define OV9282_NUM_SUPPLIES ARRAY_SIZE(ov9282_supply_names) > > + > > > > /** > > > > * struct ov9282_reg - ov9282 sensor register > > * @address: Register address > > > > @@ -127,6 +136,7 @@ struct ov9282 { > > > > struct media_pad pad; > > struct gpio_desc *reset_gpio; > > struct clk *inclk; > > > > + struct regulator_bulk_data supplies[OV9282_NUM_SUPPLIES]; > > > > struct v4l2_ctrl_handler ctrl_handler; > > struct v4l2_ctrl *link_freq_ctrl; > > struct v4l2_ctrl *pclk_ctrl; > > > > @@ -883,10 +893,18 @@ static int ov9282_power_on(struct device *dev) > > > > goto error_reset; > > > > } > > > > + ret = regulator_bulk_enable(ARRAY_SIZE(ov9282->supplies), > > ov9282->supplies); > Please run the set through: > > ./scripts/checkpatch.pl --strict --max-line-length=80 Thanks, will be fixed. > > + if (ret) { > > + dev_err(dev, "Failed to enable regulators\n"); > > + goto disable_clk; > > + } > > + > > > > usleep_range(400, 600); > > > > return 0; > > > > +disable_clk: > > + clk_disable_unprepare(ov9282->inclk); > > > > error_reset: > > gpiod_set_value_cansleep(ov9282->reset_gpio, 0); > > > > @@ -903,6 +921,9 @@ static int ov9282_power_off(struct device *dev) > > > > { > > > > struct v4l2_subdev *sd = dev_get_drvdata(dev); > > struct ov9282 *ov9282 = to_ov9282(sd); > > > > + int ret; > > ret seems to be unused. You are right, leftover from last cleanup. Will be removed. Thanks and best regards, Alexander > > + > > + regulator_bulk_disable(ARRAY_SIZE(ov9282->supplies), ov9282- >supplies); > > > > gpiod_set_value_cansleep(ov9282->reset_gpio, 0); > > > > @@ -996,6 +1017,18 @@ static int ov9282_init_controls(struct ov9282 > > *ov9282)> > > return 0; > > > > } > > > > +static int ov9282_get_regulators(struct ov9282 *ov9282) > > +{ > > + unsigned int i; > > + > > + for (i = 0; i < ARRAY_SIZE(ov9282->supplies); i++) > > + ov9282->supplies[i].supply = ov9282_supply_names[i]; > > + > > + return devm_regulator_bulk_get(ov9282->dev, > > + ARRAY_SIZE(ov9282- >supplies), > > + ov9282->supplies); > > +} > > + > > > > /** > > > > * ov9282_probe() - I2C client device binding > > * @client: pointer to i2c client device > > > > @@ -1022,6 +1055,12 @@ static int ov9282_probe(struct i2c_client *client) > > > > return ret; > > > > } > > > > + ret = ov9282_get_regulators(ov9282); > > + if (ret) { > > + dev_err(&client->dev, "Failed to get power regulators\n"); > > + return ret; > > + } > > + > > > > mutex_init(&ov9282->mutex); > > > > ret = ov9282_power_on(ov9282->dev);
diff --git a/drivers/media/i2c/ov9282.c b/drivers/media/i2c/ov9282.c index 04fda8222e07..263cdffc558f 100644 --- a/drivers/media/i2c/ov9282.c +++ b/drivers/media/i2c/ov9282.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> @@ -55,6 +56,14 @@ #define OV9282_REG_MIN 0x00 #define OV9282_REG_MAX 0xfffff +static const char * const ov9282_supply_names[] = { + "avdd", /* Analog power */ + "dovdd", /* Digital I/O power */ + "dvdd", /* Digital core power */ +}; + +#define OV9282_NUM_SUPPLIES ARRAY_SIZE(ov9282_supply_names) + /** * struct ov9282_reg - ov9282 sensor register * @address: Register address @@ -127,6 +136,7 @@ struct ov9282 { struct media_pad pad; struct gpio_desc *reset_gpio; struct clk *inclk; + struct regulator_bulk_data supplies[OV9282_NUM_SUPPLIES]; struct v4l2_ctrl_handler ctrl_handler; struct v4l2_ctrl *link_freq_ctrl; struct v4l2_ctrl *pclk_ctrl; @@ -883,10 +893,18 @@ static int ov9282_power_on(struct device *dev) goto error_reset; } + ret = regulator_bulk_enable(ARRAY_SIZE(ov9282->supplies), ov9282->supplies); + if (ret) { + dev_err(dev, "Failed to enable regulators\n"); + goto disable_clk; + } + usleep_range(400, 600); return 0; +disable_clk: + clk_disable_unprepare(ov9282->inclk); error_reset: gpiod_set_value_cansleep(ov9282->reset_gpio, 0); @@ -903,6 +921,9 @@ static int ov9282_power_off(struct device *dev) { struct v4l2_subdev *sd = dev_get_drvdata(dev); struct ov9282 *ov9282 = to_ov9282(sd); + int ret; + + regulator_bulk_disable(ARRAY_SIZE(ov9282->supplies), ov9282->supplies); gpiod_set_value_cansleep(ov9282->reset_gpio, 0); @@ -996,6 +1017,18 @@ static int ov9282_init_controls(struct ov9282 *ov9282) return 0; } +static int ov9282_get_regulators(struct ov9282 *ov9282) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(ov9282->supplies); i++) + ov9282->supplies[i].supply = ov9282_supply_names[i]; + + return devm_regulator_bulk_get(ov9282->dev, + ARRAY_SIZE(ov9282->supplies), + ov9282->supplies); +} + /** * ov9282_probe() - I2C client device binding * @client: pointer to i2c client device @@ -1022,6 +1055,12 @@ static int ov9282_probe(struct i2c_client *client) return ret; } + ret = ov9282_get_regulators(ov9282); + if (ret) { + dev_err(&client->dev, "Failed to get power regulators\n"); + return ret; + } + mutex_init(&ov9282->mutex); ret = ov9282_power_on(ov9282->dev);
Need in case the sensors is supplied by a switchable regulator. Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> --- Changes in v2: * Remove error message for failed regulator_bulk_disable() * Rename ov9282_configure_regulators to ov9282_get_regulators drivers/media/i2c/ov9282.c | 39 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+)