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 3/3] staging: iio: cdc: ad7746: use dt binding to set the excitation level
Date: Fri, 9 Apr 2021 15:50:42 -0300 [thread overview]
Message-ID: <07b173e1d823dbdde40dc9ea31bb699b48043278.1617993776.git.lucas.p.stankus@gmail.com> (raw)
In-Reply-To: <cover.1617993776.git.lucas.p.stankus@gmail.com>
Set device excitation level using properties from device tree binding
instead of using platform_data.
As this replaces the last instance where the platform_data struct was
used, remove ad7746.h header file since it's no longer needed.
Signed-off-by: Lucas Stankus <lucas.p.stankus@gmail.com>
---
drivers/staging/iio/cdc/ad7746.c | 16 ++++++----------
drivers/staging/iio/cdc/ad7746.h | 24 ------------------------
2 files changed, 6 insertions(+), 34 deletions(-)
delete mode 100644 drivers/staging/iio/cdc/ad7746.h
diff --git a/drivers/staging/iio/cdc/ad7746.c b/drivers/staging/iio/cdc/ad7746.c
index 63041b164dbe..3c75d147c3dd 100644
--- a/drivers/staging/iio/cdc/ad7746.c
+++ b/drivers/staging/iio/cdc/ad7746.c
@@ -18,8 +18,6 @@
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>
-#include "ad7746.h"
-
/*
* AD7746 Register Definition
*/
@@ -676,11 +674,10 @@ static const struct iio_info ad7746_info = {
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 int exca_en, excb_en, exclvl;
unsigned char regval = 0;
int ret = 0;
@@ -721,12 +718,11 @@ static int ad7746_probe(struct i2c_client *client,
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_EXCLVL(3);
- }
+ ret = of_property_read_u32(np, "adi,excitation-voltage-level", &exclvl);
+ if (!ret)
+ regval |= AD7746_EXCSETUP_EXCLVL(exclvl);
+ else
+ regval |= AD7746_EXCSETUP_EXCLVL(3);
ret = i2c_smbus_write_byte_data(chip->client,
AD7746_REG_EXC_SETUP, regval);
diff --git a/drivers/staging/iio/cdc/ad7746.h b/drivers/staging/iio/cdc/ad7746.h
deleted file mode 100644
index 6cae4ecf779e..000000000000
--- a/drivers/staging/iio/cdc/ad7746.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * AD7746 capacitive sensor driver supporting AD7745, AD7746 and AD7747
- *
- * Copyright 2011 Analog Devices Inc.
- */
-
-#ifndef IIO_CDC_AD7746_H_
-#define IIO_CDC_AD7746_H_
-
-/*
- * TODO: struct ad7746_platform_data needs to go into include/linux/iio
- */
-
-#define AD7466_EXCLVL_0 0 /* +-VDD/8 */
-#define AD7466_EXCLVL_1 1 /* +-VDD/4 */
-#define AD7466_EXCLVL_2 2 /* +-VDD * 3/8 */
-#define AD7466_EXCLVL_3 3 /* +-VDD/2 */
-
-struct ad7746_platform_data {
- unsigned char exclvl; /*Excitation Voltage Level */
-};
-
-#endif /* IIO_CDC_AD7746_H_ */
--
2.31.1
next prev parent reply other threads:[~2021-04-09 18:50 UTC|newest]
Thread overview: 13+ 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 ` [PATCH 2/3] staging: iio: cdc: ad7746: use dt bindings to set the EXCx pins output Lucas Stankus
2021-04-10 16:12 ` Alexandru Ardelean
2021-04-10 16:12 ` Alexandru Ardelean
2021-04-10 16:15 ` 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 ` Lucas Stankus [this message]
2021-04-10 16:20 ` [PATCH 0/3] staging: iio: cdc: ad7746: remove platform_data in favor of device tree bindings Alexandru Ardelean
2021-04-10 16:20 ` 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=07b173e1d823dbdde40dc9ea31bb699b48043278.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.