From: Lucas Stankus <lucas.p.stankus@gmail.com>
To: lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org,
gregkh@linuxfoundation.org
Cc: linux-iio@vger.kernel.org, linux-staging@lists.linux.dev,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org
Subject: [PATCH 2/3] staging: iio: cdc: ad7746: use dt bindings to set the EXCx pins output
Date: Fri, 9 Apr 2021 15:50:27 -0300 [thread overview]
Message-ID: <39486895e4e985d0220342f3accfd98a1e149ea7.1617993776.git.lucas.p.stankus@gmail.com> (raw)
In-Reply-To: <cover.1617993776.git.lucas.p.stankus@gmail.com>
Ditch platform_data fields in favor of device tree properties for
configuring EXCA and EXCB output.
This also removes the fields from the platform_data struct, since they're
not used anymore.
Signed-off-by: Lucas Stankus <lucas.p.stankus@gmail.com>
---
drivers/staging/iio/cdc/ad7746.c | 33 +++++++++++++++++---------------
drivers/staging/iio/cdc/ad7746.h | 4 ----
2 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/drivers/staging/iio/cdc/ad7746.c b/drivers/staging/iio/cdc/ad7746.c
index dfd71e99e872..63041b164dbe 100644
--- a/drivers/staging/iio/cdc/ad7746.c
+++ b/drivers/staging/iio/cdc/ad7746.c
@@ -677,8 +677,10 @@ static int ad7746_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct ad7746_platform_data *pdata = client->dev.platform_data;
+ struct device_node *np = client->dev.of_node;
struct ad7746_chip_info *chip;
struct iio_dev *indio_dev;
+ unsigned int exca_en, excb_en;
unsigned char regval = 0;
int ret = 0;
@@ -703,26 +705,27 @@ static int ad7746_probe(struct i2c_client *client,
indio_dev->num_channels = ARRAY_SIZE(ad7746_channels);
indio_dev->modes = INDIO_DIRECT_MODE;
- if (pdata) {
- if (pdata->exca_en) {
- if (pdata->exca_inv_en)
- regval |= AD7746_EXCSETUP_NEXCA;
- else
- regval |= AD7746_EXCSETUP_EXCA;
- }
+ ret = of_property_read_u32(np, "adi,exca-output", &exca_en);
+ if (!ret && exca_en) {
+ if (exca_en == 1)
+ regval |= AD7746_EXCSETUP_EXCA;
+ else
+ regval |= AD7746_EXCSETUP_NEXCA;
+ }
- if (pdata->excb_en) {
- if (pdata->excb_inv_en)
- regval |= AD7746_EXCSETUP_NEXCB;
- else
- regval |= AD7746_EXCSETUP_EXCB;
- }
+ ret = of_property_read_u32(np, "adi,excb-output", &excb_en);
+ if (!ret && excb_en) {
+ if (excb_en == 1)
+ regval |= AD7746_EXCSETUP_EXCB;
+ else
+ regval |= AD7746_EXCSETUP_NEXCB;
+ }
+ if (pdata) {
regval |= AD7746_EXCSETUP_EXCLVL(pdata->exclvl);
} else {
dev_warn(&client->dev, "No platform data? using default\n");
- regval = AD7746_EXCSETUP_EXCA | AD7746_EXCSETUP_EXCB |
- AD7746_EXCSETUP_EXCLVL(3);
+ regval = AD7746_EXCSETUP_EXCLVL(3);
}
ret = i2c_smbus_write_byte_data(chip->client,
diff --git a/drivers/staging/iio/cdc/ad7746.h b/drivers/staging/iio/cdc/ad7746.h
index 8bdbd732dbbd..6cae4ecf779e 100644
--- a/drivers/staging/iio/cdc/ad7746.h
+++ b/drivers/staging/iio/cdc/ad7746.h
@@ -19,10 +19,6 @@
struct ad7746_platform_data {
unsigned char exclvl; /*Excitation Voltage Level */
- bool exca_en; /* enables EXCA pin as the excitation output */
- bool exca_inv_en; /* enables /EXCA pin as the excitation output */
- bool excb_en; /* enables EXCB pin as the excitation output */
- bool excb_inv_en; /* enables /EXCB pin as the excitation output */
};
#endif /* IIO_CDC_AD7746_H_ */
--
2.31.1
next prev parent reply other threads:[~2021-04-09 18:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-09 18:49 [PATCH 0/3] staging: iio: cdc: ad7746: remove platform_data in favor of device tree bindings Lucas Stankus
2021-04-09 18:50 ` [PATCH 1/3] dt-bindings: staging: iio: cdc: ad7746: add binding documentation for AD7746 Lucas Stankus
2021-04-11 13:46 ` Jonathan Cameron
2021-04-09 18:50 ` Lucas Stankus [this message]
2021-04-10 16:12 ` [PATCH 2/3] staging: iio: cdc: ad7746: use dt bindings to set the EXCx pins output Alexandru Ardelean
2021-04-10 16:15 ` Alexandru Ardelean
2021-04-11 13:52 ` Jonathan Cameron
[not found] ` <CAHp75Ve2NBMyQf7jw63a=4r135ShGEoRjZ+CUr36DC+gH39d7A@mail.gmail.com>
[not found] ` <CAHp75VcMsMvSrbP3tkcivvd+s=8drqiCt-xmk+HxhLS87w6zYw@mail.gmail.com>
2021-04-11 13:50 ` Jonathan Cameron
2021-04-09 18:50 ` [PATCH 3/3] staging: iio: cdc: ad7746: use dt binding to set the excitation level Lucas Stankus
2021-04-10 16:20 ` [PATCH 0/3] staging: iio: cdc: ad7746: remove platform_data in favor of device tree bindings Alexandru Ardelean
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=39486895e4e985d0220342f3accfd98a1e149ea7.1617993776.git.lucas.p.stankus@gmail.com \
--to=lucas.p.stankus@gmail.com \
--cc=Michael.Hennerich@analog.com \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=jic23@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/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).