From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
To: Cosmin Tanislav <cosmin.tanislav@analog.com>,
Lars-Peter Clausen <lars@metafoo.de>,
Michael Hennerich <Michael.Hennerich@analog.com>,
Jonathan Cameron <jic23@kernel.org>
Cc: devicetree@vger.kernel.org, Rob Herring <robh+dt@kernel.org>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/5] iio: addac: ad74413r: implement support for optional refin-supply
Date: Fri, 11 Nov 2022 15:39:19 +0100 [thread overview]
Message-ID: <20221111143921.742194-4-linux@rasmusvillemoes.dk> (raw)
In-Reply-To: <20221111143921.742194-1-linux@rasmusvillemoes.dk>
The ad74412r/ad74413r has an internal 2.5V reference output, which (by
tying the REFOUT pin to the REFIN pin) can be used in lieu of an
external 2.5V input reference.
Support that case by using devm_regulator_get_optional(), and simply
hardcode the 2500000 uV in ad74413r_get_output_current_scale().
I'm not sure this is completely correct, but it's certainly better
than the current behaviour, where when refin-supply is not defined in
device tree, the regulator framework helpfully does its
supply refin not found, using dummy regulator
thing. When we then do the regulator_get_voltage(), that dummy
regulator of course doesn't support that operation and thus returns
-22 (-EINVAL) which is used without being checked.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
---
drivers/iio/addac/ad74413r.c | 31 ++++++++++++++++++++-----------
1 file changed, 20 insertions(+), 11 deletions(-)
diff --git a/drivers/iio/addac/ad74413r.c b/drivers/iio/addac/ad74413r.c
index 37485be88a63..9f77d2f514de 100644
--- a/drivers/iio/addac/ad74413r.c
+++ b/drivers/iio/addac/ad74413r.c
@@ -608,7 +608,10 @@ static int ad74413r_get_output_voltage_scale(struct ad74413r_state *st,
static int ad74413r_get_output_current_scale(struct ad74413r_state *st,
int *val, int *val2)
{
- *val = regulator_get_voltage(st->refin_reg);
+ if (st->refin_reg)
+ *val = regulator_get_voltage(st->refin_reg);
+ else
+ *val = 2500000;
*val2 = st->sense_resistor_ohms * AD74413R_DAC_CODE_MAX * 1000;
return IIO_VAL_FRACTIONAL;
@@ -1313,19 +1316,25 @@ static int ad74413r_probe(struct spi_device *spi)
if (IS_ERR(st->regmap))
return PTR_ERR(st->regmap);
- st->refin_reg = devm_regulator_get(st->dev, "refin");
- if (IS_ERR(st->refin_reg))
- return dev_err_probe(st->dev, PTR_ERR(st->refin_reg),
- "Failed to get refin regulator\n");
+ st->refin_reg = devm_regulator_get_optional(st->dev, "refin");
+ if (IS_ERR(st->refin_reg)) {
+ ret = PTR_ERR(st->refin_reg);
+ if (ret != -ENODEV)
+ return dev_err_probe(st->dev, ret,
+ "Failed to get refin regulator\n");
+ st->refin_reg = NULL;
+ }
- ret = regulator_enable(st->refin_reg);
- if (ret)
- return ret;
+ if (st->refin_reg) {
+ ret = regulator_enable(st->refin_reg);
+ if (ret)
+ return ret;
- ret = devm_add_action_or_reset(st->dev, ad74413r_regulator_disable,
+ ret = devm_add_action_or_reset(st->dev, ad74413r_regulator_disable,
st->refin_reg);
- if (ret)
- return ret;
+ if (ret)
+ return ret;
+ }
st->sense_resistor_ohms = 100000000;
device_property_read_u32(st->dev, "shunt-resistor-micro-ohms",
--
2.37.2
next prev parent reply other threads:[~2022-11-11 14:40 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-11 14:39 [PATCH 0/5] iio: addac: ad74413r: various fixups Rasmus Villemoes
2022-11-11 14:39 ` [PATCH 1/5] iio: addac: ad74413r: add spi_device_id table Rasmus Villemoes
2022-11-12 16:50 ` Jonathan Cameron
2022-11-14 8:02 ` Rasmus Villemoes
2022-11-14 19:39 ` Jonathan Cameron
2022-11-11 14:39 ` [PATCH 2/5] dt-bindings: iio: ad74413r: make refin-supply optional Rasmus Villemoes
2022-11-12 16:54 ` Jonathan Cameron
2022-11-14 8:10 ` Rasmus Villemoes
2022-11-11 14:39 ` Rasmus Villemoes [this message]
2022-11-12 16:56 ` [PATCH 3/5] iio: addac: ad74413r: implement support for optional refin-supply Jonathan Cameron
2022-11-11 14:39 ` [PATCH 4/5] dt-bindings: iio: ad74413r: add optional reset-gpios Rasmus Villemoes
2022-11-12 17:00 ` Jonathan Cameron
2022-11-11 14:39 ` [PATCH 5/5] iio: addac: ad74413r: add support for reset-gpio Rasmus Villemoes
2022-11-12 17:07 ` Jonathan Cameron
2022-11-14 8:37 ` Rasmus Villemoes
2022-11-14 19:41 ` Jonathan Cameron
2022-11-14 13:52 ` Tanislav, Cosmin
2022-11-14 19:44 ` Jonathan Cameron
2022-11-15 14:49 ` Nuno Sá
2022-11-15 16:10 ` Jonathan Cameron
2022-11-15 19:10 ` Rasmus Villemoes
2022-11-16 10:22 ` Jonathan Cameron
2022-11-16 12:06 ` Nuno Sá
2022-11-18 11:21 ` Rasmus Villemoes
2022-11-15 14:53 ` Nuno Sá
2022-11-15 9:55 ` [PATCH v2 0/3] iio: addac: ad74413r: add spi device id table, support reset gpio Rasmus Villemoes
2022-11-15 9:55 ` [PATCH v2 1/3] iio: addac: ad74413r: add spi_device_id table Rasmus Villemoes
2022-11-15 9:55 ` [PATCH v2 2/3] dt-bindings: iio: ad74413r: add optional reset-gpios Rasmus Villemoes
2022-11-15 10:12 ` Krzysztof Kozlowski
2022-11-15 9:55 ` [PATCH v2 3/3] iio: addac: ad74413r: add support for reset-gpio Rasmus Villemoes
2022-11-23 20:55 ` [PATCH v2 0/3] iio: addac: ad74413r: add spi device id table, support reset gpio 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=20221111143921.742194-4-linux@rasmusvillemoes.dk \
--to=linux@rasmusvillemoes.dk \
--cc=Michael.Hennerich@analog.com \
--cc=cosmin.tanislav@analog.com \
--cc=devicetree@vger.kernel.org \
--cc=jic23@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.org \
/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).