| Message ID | 20201211183815.51269-2-stephan@gerhold.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/2] dt-bindings: iio: gyroscope: bmg160: Document regulator supplies | expand |
On Fri, 11 Dec 2020 19:38:15 +0100 Stephan Gerhold <stephan@gerhold.net> wrote: > BMG160 needs VDD and VDDIO regulators that might need to be explicitly > enabled. Add some rudimentary support to obtain and enable these > regulators during probe() and disable them using a devm action. > > Signed-off-by: Stephan Gerhold <stephan@gerhold.net> Looks good to me. I'm going to let this sit a little longer though (we've missed the merge window anyway so lots of time) in order to give Linus a chance to look at this new version seeing as he gave a Reviewed-by on previous but this is significantly different. If it looks like I've managed to loose this (it has happened a few times!) then please give me a poke in a few weeks time. Thanks, Jonathan > --- > Changes in v2: > - Do regulator_bulk_enable() immediately after devm_regulator_bulk_get() > - Simplify error handling using devm_add_action_or_reset() > --- > drivers/iio/gyro/bmg160_core.c | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/drivers/iio/gyro/bmg160_core.c b/drivers/iio/gyro/bmg160_core.c > index 2d5015801a75..029ef4c34604 100644 > --- a/drivers/iio/gyro/bmg160_core.c > +++ b/drivers/iio/gyro/bmg160_core.c > @@ -19,6 +19,7 @@ > #include <linux/iio/trigger_consumer.h> > #include <linux/iio/triggered_buffer.h> > #include <linux/regmap.h> > +#include <linux/regulator/consumer.h> > #include "bmg160.h" > > #define BMG160_IRQ_NAME "bmg160_event" > @@ -92,6 +93,7 @@ > > struct bmg160_data { > struct regmap *regmap; > + struct regulator_bulk_data regulators[2]; > struct iio_trigger *dready_trig; > struct iio_trigger *motion_trig; > struct iio_mount_matrix orientation; > @@ -1061,6 +1063,13 @@ static const char *bmg160_match_acpi_device(struct device *dev) > return dev_name(dev); > } > > +static void bmg160_disable_regulators(void *d) > +{ > + struct bmg160_data *data = d; > + > + regulator_bulk_disable(ARRAY_SIZE(data->regulators), data->regulators); > +} > + > int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq, > const char *name) > { > @@ -1077,6 +1086,22 @@ int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq, > data->irq = irq; > data->regmap = regmap; > > + data->regulators[0].supply = "vdd"; > + data->regulators[1].supply = "vddio"; > + ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(data->regulators), > + data->regulators); > + if (ret) > + return dev_err_probe(dev, ret, "Failed to get regulators\n"); > + > + ret = regulator_bulk_enable(ARRAY_SIZE(data->regulators), > + data->regulators); > + if (ret) > + return ret; > + > + ret = devm_add_action_or_reset(dev, bmg160_disable_regulators, data); > + if (ret) > + return ret; > + > ret = iio_read_mount_matrix(dev, "mount-matrix", > &data->orientation); > if (ret)
On Fri, Dec 11, 2020 at 7:39 PM Stephan Gerhold <stephan@gerhold.net> wrote: > BMG160 needs VDD and VDDIO regulators that might need to be explicitly > enabled. Add some rudimentary support to obtain and enable these > regulators during probe() and disable them using a devm action. > > Signed-off-by: Stephan Gerhold <stephan@gerhold.net> > --- > Changes in v2: > - Do regulator_bulk_enable() immediately after devm_regulator_bulk_get() > - Simplify error handling using devm_add_action_or_reset() Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Mon, 14 Dec 2020 09:57:06 +0100 Linus Walleij <linus.walleij@linaro.org> wrote: > On Fri, Dec 11, 2020 at 7:39 PM Stephan Gerhold <stephan@gerhold.net> wrote: > > > BMG160 needs VDD and VDDIO regulators that might need to be explicitly > > enabled. Add some rudimentary support to obtain and enable these > > regulators during probe() and disable them using a devm action. > > > > Signed-off-by: Stephan Gerhold <stephan@gerhold.net> > > --- > > Changes in v2: > > - Do regulator_bulk_enable() immediately after devm_regulator_bulk_get() > > - Simplify error handling using devm_add_action_or_reset() > > Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Series applied, Thanks, Jonathan > > Yours, > Linus Walleij
diff --git a/drivers/iio/gyro/bmg160_core.c b/drivers/iio/gyro/bmg160_core.c index 2d5015801a75..029ef4c34604 100644 --- a/drivers/iio/gyro/bmg160_core.c +++ b/drivers/iio/gyro/bmg160_core.c @@ -19,6 +19,7 @@ #include <linux/iio/trigger_consumer.h> #include <linux/iio/triggered_buffer.h> #include <linux/regmap.h> +#include <linux/regulator/consumer.h> #include "bmg160.h" #define BMG160_IRQ_NAME "bmg160_event" @@ -92,6 +93,7 @@ struct bmg160_data { struct regmap *regmap; + struct regulator_bulk_data regulators[2]; struct iio_trigger *dready_trig; struct iio_trigger *motion_trig; struct iio_mount_matrix orientation; @@ -1061,6 +1063,13 @@ static const char *bmg160_match_acpi_device(struct device *dev) return dev_name(dev); } +static void bmg160_disable_regulators(void *d) +{ + struct bmg160_data *data = d; + + regulator_bulk_disable(ARRAY_SIZE(data->regulators), data->regulators); +} + int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq, const char *name) { @@ -1077,6 +1086,22 @@ int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq, data->irq = irq; data->regmap = regmap; + data->regulators[0].supply = "vdd"; + data->regulators[1].supply = "vddio"; + ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(data->regulators), + data->regulators); + if (ret) + return dev_err_probe(dev, ret, "Failed to get regulators\n"); + + ret = regulator_bulk_enable(ARRAY_SIZE(data->regulators), + data->regulators); + if (ret) + return ret; + + ret = devm_add_action_or_reset(dev, bmg160_disable_regulators, data); + if (ret) + return ret; + ret = iio_read_mount_matrix(dev, "mount-matrix", &data->orientation); if (ret)
BMG160 needs VDD and VDDIO regulators that might need to be explicitly enabled. Add some rudimentary support to obtain and enable these regulators during probe() and disable them using a devm action. Signed-off-by: Stephan Gerhold <stephan@gerhold.net> --- Changes in v2: - Do regulator_bulk_enable() immediately after devm_regulator_bulk_get() - Simplify error handling using devm_add_action_or_reset() --- drivers/iio/gyro/bmg160_core.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)