Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1512735

[PATCH 3/6] staging: iio: ad7192: add DVdd regulator

Show all headers | View raw

The AD7190/AD7192/AD7193/AD7195 is supplied with two power sources:
AVdd as analog supply voltage and DVdd as digital supply voltage.

Attempt to fetch and enable the regulator 'dvdd'. Bail out if any error
occurs.

Suggested-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Eva Rachel Retuya <eraretuya@gmail.com>
---
 drivers/staging/iio/adc/ad7192.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c
index 29e32b7..3f8dc66 100644
--- a/drivers/staging/iio/adc/ad7192.c
+++ b/drivers/staging/iio/adc/ad7192.c
@@ -153,6 +153,7 @@
 
 struct ad7192_state {
 	struct regulator		*reg;
+	struct regulator		*dvdd;
 	u16				int_vref_mv;
 	u32				mclk;
 	u32				f_order;
@@ -642,6 +643,19 @@ static int ad7192_probe(struct spi_device *spi)
 		dev_err(&spi->dev, "Failed to enable specified AVdd supply\n");
 		return ret;
 	}
+
+	st->dvdd = devm_regulator_get(&spi->dev, "dvdd");
+	if (IS_ERR(st->dvdd)) {
+		ret = PTR_ERR(st->dvdd);
+		goto error_disable_reg;
+	}
+
+	ret = regulator_enable(st->dvdd);
+	if (ret) {
+		dev_err(&spi->dev, "Failed to enable specified DVdd supply\n");
+		goto error_disable_reg;
+	}
+
 	voltage_uv = regulator_get_voltage(st->reg);
 
 	if (pdata->vref_mv)
@@ -677,7 +691,7 @@ static int ad7192_probe(struct spi_device *spi)
 
 	ret = ad_sd_setup_buffer_and_trigger(indio_dev);
 	if (ret)
-		goto error_disable_reg;
+		goto error_disable_dvdd;
 
 	ret = ad7192_setup(st, pdata);
 	if (ret)
@@ -690,6 +704,8 @@ static int ad7192_probe(struct spi_device *spi)
 
 error_remove_trigger:
 	ad_sd_cleanup_buffer_and_trigger(indio_dev);
+error_disable_dvdd:
+	regulator_disable(st->dvdd);
 error_disable_reg:
 	regulator_disable(st->reg);
 
@@ -704,6 +720,7 @@ static int ad7192_remove(struct spi_device *spi)
 	iio_device_unregister(indio_dev);
 	ad_sd_cleanup_buffer_and_trigger(indio_dev);
 
+	regulator_disable(st->dvdd);
 	regulator_disable(st->reg);
 
 	return 0;
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/6] staging: iio: regulator clean-up Eva Rachel Retuya <eraretuya@gmail.com> - 2016-10-31 18:10 +0100
  [PATCH 4/6] staging: iio: ad7192: rename regulator 'reg' to 'avdd' Eva Rachel Retuya <eraretuya@gmail.com> - 2016-10-31 18:10 +0100
    Re: [PATCH 4/6] staging: iio: ad7192: rename regulator 'reg' to  'avdd' Jonathan Cameron <jic23@kernel.org> - 2016-11-05 17:30 +0100
  [PATCH 1/6] staging: iio: set proper supply name to devm_regulator_get() Eva Rachel Retuya <eraretuya@gmail.com> - 2016-10-31 18:10 +0100
    Re: [PATCH 1/6] staging: iio: set proper supply name to devm_regulator_get() Matt Ranostay <matt@ranostay.consulting> - 2016-11-01 05:10 +0100
      Re: [PATCH 1/6] staging: iio: set proper supply name to  devm_regulator_get() Lars-Peter Clausen <lars@metafoo.de> - 2016-11-01 21:00 +0100
        Re: [PATCH 1/6] staging: iio: set proper supply name to  devm_regulator_get() Jonathan Cameron <jic23@kernel.org> - 2016-11-05 14:00 +0100
          Re: [PATCH 1/6] staging: iio: set proper supply name to  devm_regulator_get() Jonathan Cameron <jic23@kernel.org> - 2016-11-05 17:20 +0100
      Re: [PATCH 1/6] staging: iio: set proper supply name to  devm_regulator_get() Eva Rachel Retuya <eraretuya@gmail.com> - 2016-11-04 11:20 +0100
    Re: [PATCH 1/6] staging: iio: set proper supply name to  devm_regulator_get() Jonathan Cameron <jic23@kernel.org> - 2016-11-05 17:20 +0100
  [PATCH 6/6] staging: iio: ad9832: clean-up regulator 'reg' Eva Rachel Retuya <eraretuya@gmail.com> - 2016-10-31 18:10 +0100
    Re: [PATCH 6/6] staging: iio: ad9832: clean-up regulator 'reg' Jonathan Cameron <jic23@kernel.org> - 2016-11-05 17:30 +0100
  [PATCH 2/6] staging: iio: rework regulator handling Eva Rachel Retuya <eraretuya@gmail.com> - 2016-10-31 18:10 +0100
    Re: [PATCH 2/6] staging: iio: rework regulator handling Jonathan Cameron <jic23@kernel.org> - 2016-11-05 17:20 +0100
  [PATCH 5/6] staging: iio: ad9832: add DVDD regulator Eva Rachel Retuya <eraretuya@gmail.com> - 2016-10-31 18:10 +0100
    Re: [PATCH 5/6] staging: iio: ad9832: add DVDD regulator Jonathan Cameron <jic23@kernel.org> - 2016-11-05 17:30 +0100
  [PATCH 3/6] staging: iio: ad7192: add DVdd regulator Eva Rachel Retuya <eraretuya@gmail.com> - 2016-10-31 18:10 +0100
    Re: [PATCH 3/6] staging: iio: ad7192: add DVdd regulator Jonathan Cameron <jic23@kernel.org> - 2016-11-05 17:20 +0100

csiph-web