From: Marcus Folkesson <marcus.folkesson@gmail.com>
To: Marcus Folkesson <marcus.folkesson@gmail.com>,
Kent Gustavsson <kent@minoris.se>,
Jonathan Cameron <jic23@kernel.org>,
Lars-Peter Clausen <lars@metafoo.de>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v4 2/9] iio: adc: mcp3911: correct "microchip,device-addr" property
Date: Fri, 22 Jul 2022 15:07:19 +0200 [thread overview]
Message-ID: <20220722130726.7627-3-marcus.folkesson@gmail.com> (raw)
In-Reply-To: <20220722130726.7627-1-marcus.folkesson@gmail.com>
Go for the right property name that is documented in the bindings.
Fixes: 3a89b289df5d ("iio: adc: add support for mcp3911")
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/iio/adc/mcp3911.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c
index f581cefb6719..f8875076ae80 100644
--- a/drivers/iio/adc/mcp3911.c
+++ b/drivers/iio/adc/mcp3911.c
@@ -210,7 +210,14 @@ static int mcp3911_config(struct mcp3911 *adc)
u32 configreg;
int ret;
- device_property_read_u32(dev, "device-addr", &adc->dev_addr);
+ ret = device_property_read_u32(dev, "microchip,device-addr", &adc->dev_addr);
+
+ /*
+ * Fallback to "device-addr" due to historical mismatch between
+ * dt-bindings and implementation
+ */
+ if (ret)
+ device_property_read_u32(dev, "device-addr", &adc->dev_addr);
if (adc->dev_addr > 3) {
dev_err(&adc->spi->dev,
"invalid device address (%i). Must be in range 0-3.\n",
--
2.36.1
next prev parent reply other threads:[~2022-07-22 13:04 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-22 13:07 [PATCH v4 0/9] Improve MCP3911 driver Marcus Folkesson
2022-07-22 13:07 ` [PATCH v4 1/9] iio: adc: mcp3911: make use of the sign bit Marcus Folkesson
2022-07-22 13:07 ` Marcus Folkesson [this message]
2022-07-22 13:07 ` [PATCH v4 3/9] iio: adc: mcp3911: use correct formula for AD conversion Marcus Folkesson
2022-08-07 14:24 ` Jonathan Cameron
2022-07-22 13:07 ` [PATCH v4 4/9] iio: adc: mcp3911: use resource-managed version of iio_device_register Marcus Folkesson
2022-07-31 16:38 ` Jonathan Cameron
2022-07-31 16:39 ` Jonathan Cameron
2022-07-22 13:07 ` [PATCH v4 5/9] iio: adc: mcp3911: add support for buffers Marcus Folkesson
2022-07-31 16:51 ` Jonathan Cameron
2022-08-01 7:17 ` Marcus Folkesson
2022-07-22 13:07 ` [PATCH v4 6/9] iio: adc: mcp3911: add support for interrupts Marcus Folkesson
2022-07-31 16:52 ` Jonathan Cameron
2022-07-22 13:07 ` [PATCH v4 7/9] dt-bindings: iio: adc: mcp3911: add microchip,data-ready-hiz entry Marcus Folkesson
2022-07-22 13:07 ` [PATCH v4 8/9] iio: adc: mcp3911: add support for oversampling ratio Marcus Folkesson
2022-07-22 13:07 ` [PATCH v4 9/9] iio: adc: mcp3911: add support to set PGA Marcus Folkesson
2022-07-31 16:53 ` Jonathan Cameron
2022-07-31 16:41 ` [PATCH v4 0/9] Improve MCP3911 driver Jonathan Cameron
2022-08-01 7:45 ` Marcus Folkesson
2022-08-06 14:08 ` 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=20220722130726.7627-3-marcus.folkesson@gmail.com \
--to=marcus.folkesson@gmail.com \
--cc=andy.shevchenko@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=jic23@kernel.org \
--cc=kent@minoris.se \
--cc=krzysztof.kozlowski+dt@linaro.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).