From: Eva Rachel Retuya <eraretuya@gmail.com>
To: linux-iio@vger.kernel.org, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Cc: lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org,
knaack.h@gmx.de, pmeerw@pmeerw.net, gregkh@linuxfoundation.org,
Eva Rachel Retuya <eraretuya@gmail.com>
Subject: [PATCH 5/6] staging: iio: ad9832: add DVDD regulator
Date: Tue, 1 Nov 2016 01:04:34 +0800 [thread overview]
Message-ID: <1477933475-21914-6-git-send-email-eraretuya@gmail.com> (raw)
In-Reply-To: <1477933475-21914-1-git-send-email-eraretuya@gmail.com>
The AD9832/AD9835 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/frequency/ad9832.c | 33 ++++++++++++++++++++++++---------
drivers/staging/iio/frequency/ad9832.h | 2 ++
2 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/iio/frequency/ad9832.c b/drivers/staging/iio/frequency/ad9832.c
index 7d8dc6c..6a5ab02 100644
--- a/drivers/staging/iio/frequency/ad9832.c
+++ b/drivers/staging/iio/frequency/ad9832.c
@@ -222,10 +222,22 @@ static int ad9832_probe(struct spi_device *spi)
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;
+ }
+
indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
if (!indio_dev) {
ret = -ENOMEM;
- goto error_disable_reg;
+ goto error_disable_dvdd;
}
spi_set_drvdata(spi, indio_dev);
st = iio_priv(indio_dev);
@@ -280,39 +292,41 @@ static int ad9832_probe(struct spi_device *spi)
ret = spi_sync(st->spi, &st->msg);
if (ret) {
dev_err(&spi->dev, "device init failed\n");
- goto error_disable_reg;
+ goto error_disable_dvdd;
}
ret = ad9832_write_frequency(st, AD9832_FREQ0HM, pdata->freq0);
if (ret)
- goto error_disable_reg;
+ goto error_disable_dvdd;
ret = ad9832_write_frequency(st, AD9832_FREQ1HM, pdata->freq1);
if (ret)
- goto error_disable_reg;
+ goto error_disable_dvdd;
ret = ad9832_write_phase(st, AD9832_PHASE0H, pdata->phase0);
if (ret)
- goto error_disable_reg;
+ goto error_disable_dvdd;
ret = ad9832_write_phase(st, AD9832_PHASE1H, pdata->phase1);
if (ret)
- goto error_disable_reg;
+ goto error_disable_dvdd;
ret = ad9832_write_phase(st, AD9832_PHASE2H, pdata->phase2);
if (ret)
- goto error_disable_reg;
+ goto error_disable_dvdd;
ret = ad9832_write_phase(st, AD9832_PHASE3H, pdata->phase3);
if (ret)
- goto error_disable_reg;
+ goto error_disable_dvdd;
ret = iio_device_register(indio_dev);
if (ret)
- goto error_disable_reg;
+ goto error_disable_dvdd;
return 0;
+error_disable_dvdd:
+ regulator_disable(st->dvdd);
error_disable_reg:
regulator_disable(reg);
@@ -325,6 +339,7 @@ static int ad9832_remove(struct spi_device *spi)
struct ad9832_state *st = iio_priv(indio_dev);
iio_device_unregister(indio_dev);
+ regulator_disable(st->dvdd);
regulator_disable(st->reg);
return 0;
diff --git a/drivers/staging/iio/frequency/ad9832.h b/drivers/staging/iio/frequency/ad9832.h
index d32323b..eb0e7f2 100644
--- a/drivers/staging/iio/frequency/ad9832.h
+++ b/drivers/staging/iio/frequency/ad9832.h
@@ -59,6 +59,7 @@
* struct ad9832_state - driver instance specific data
* @spi: spi_device
* @reg: supply regulator
+ * @dvdd: supply regulator for the digital section
* @mclk: external master clock
* @ctrl_fp: cached frequency/phase control word
* @ctrl_ss: cached sync/selsrc control word
@@ -77,6 +78,7 @@
struct ad9832_state {
struct spi_device *spi;
struct regulator *reg;
+ struct regulator *dvdd;
unsigned long mclk;
unsigned short ctrl_fp;
unsigned short ctrl_ss;
--
2.7.4
next prev parent reply other threads:[~2016-10-31 17:08 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-31 17:04 [PATCH 0/6] staging: iio: regulator clean-up Eva Rachel Retuya
2016-10-31 17:04 ` [PATCH 1/6] staging: iio: set proper supply name to devm_regulator_get() Eva Rachel Retuya
2016-11-01 4:03 ` Matt Ranostay
2016-11-01 19:58 ` Lars-Peter Clausen
2016-11-05 12:58 ` Jonathan Cameron
2016-11-05 16:14 ` Jonathan Cameron
2016-11-04 10:17 ` Eva Rachel Retuya
2016-11-05 16:14 ` Jonathan Cameron
2016-10-31 17:04 ` [PATCH 2/6] staging: iio: rework regulator handling Eva Rachel Retuya
2016-11-05 16:18 ` Jonathan Cameron
2016-10-31 17:04 ` [PATCH 3/6] staging: iio: ad7192: add DVdd regulator Eva Rachel Retuya
2016-11-05 16:19 ` Jonathan Cameron
2016-10-31 17:04 ` [PATCH 4/6] staging: iio: ad7192: rename regulator 'reg' to 'avdd' Eva Rachel Retuya
2016-11-05 16:21 ` Jonathan Cameron
2016-10-31 17:04 ` Eva Rachel Retuya [this message]
2016-11-05 16:22 ` [PATCH 5/6] staging: iio: ad9832: add DVDD regulator Jonathan Cameron
2016-10-31 17:04 ` [PATCH 6/6] staging: iio: ad9832: clean-up regulator 'reg' Eva Rachel Retuya
2016-11-05 16:23 ` Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1477933475-21914-6-git-send-email-eraretuya@gmail.com \
--to=eraretuya@gmail.com \
--cc=Michael.Hennerich@analog.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pmeerw@pmeerw.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).