From: Lothar Rubusch <l.rubusch@gmail.com>
To: lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org,
robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org,
conor+dt@kernel.org
Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, eraretuya@gmail.com,
l.rubusch@gmail.com
Subject: [PATCH v4 1/7] iio: accel: adxl345: Make data_range obsolete
Date: Mon, 25 Mar 2024 15:33:50 +0000 [thread overview]
Message-ID: <20240325153356.46112-2-l.rubusch@gmail.com> (raw)
In-Reply-To: <20240325153356.46112-1-l.rubusch@gmail.com>
Replace write() data_format by regmap_update_bits(), because
bus specific pre-configuration may have happened before on
the same register. Changes then need to be masked.
Remove the data_range field from the struct adxl345_data,
because it is not used anymore.
Signed-off-by: Lothar Rubusch <l.rubusch@gmail.com>
---
drivers/iio/accel/adxl345_core.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/iio/accel/adxl345_core.c b/drivers/iio/accel/adxl345_core.c
index 8bd30a23e..be6758015 100644
--- a/drivers/iio/accel/adxl345_core.c
+++ b/drivers/iio/accel/adxl345_core.c
@@ -42,13 +42,13 @@
#define ADXL345_DATA_FORMAT_4G 1
#define ADXL345_DATA_FORMAT_8G 2
#define ADXL345_DATA_FORMAT_16G 3
+#define ADXL345_DATA_FORMAT_MSK ~((u8) BIT(6)) /* ignore spi-3wire */
#define ADXL345_DEVID 0xE5
struct adxl345_data {
const struct adxl345_chip_info *info;
struct regmap *regmap;
- u8 data_range;
};
#define ADXL345_CHANNEL(index, axis) { \
@@ -219,14 +219,13 @@ int adxl345_core_probe(struct device *dev, struct regmap *regmap)
data = iio_priv(indio_dev);
data->regmap = regmap;
/* Enable full-resolution mode */
- data->data_range = ADXL345_DATA_FORMAT_FULL_RES;
data->info = device_get_match_data(dev);
if (!data->info)
return -ENODEV;
- ret = regmap_write(data->regmap, ADXL345_REG_DATA_FORMAT,
- data->data_range);
- if (ret < 0)
+ ret = regmap_update_bits(regmap, ADXL345_REG_DATA_FORMAT,
+ ADXL345_DATA_FORMAT_MSK, ADXL345_DATA_FORMAT_FULL_RES);
+ if (ret)
return dev_err_probe(dev, ret, "Failed to set data range\n");
indio_dev->name = data->info->name;
--
2.25.1
next prev parent reply other threads:[~2024-03-25 15:34 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-25 15:33 [PATCH v4 0/7] iio: accel: adxl345: Add spi-3wire feature Lothar Rubusch
2024-03-25 15:33 ` Lothar Rubusch [this message]
2024-03-25 20:31 ` [PATCH v4 1/7] iio: accel: adxl345: Make data_range obsolete Jonathan Cameron
2024-03-26 20:59 ` Lothar Rubusch
2024-03-28 13:15 ` Jonathan Cameron
2024-03-25 15:33 ` [PATCH v4 2/7] iio: accel: adxl345: Group bus configuration Lothar Rubusch
2024-03-25 20:33 ` Jonathan Cameron
2024-03-25 15:33 ` [PATCH v4 3/7] iio: accel: adxl345: Move defines to header Lothar Rubusch
2024-03-25 15:33 ` [PATCH v4 4/7] dt-bindings: iio: accel: adxl345: Add spi-3wire Lothar Rubusch
2024-03-25 18:32 ` Krzysztof Kozlowski
2024-03-25 21:05 ` Lothar Rubusch
2024-03-25 21:40 ` Krzysztof Kozlowski
2024-03-25 22:09 ` Lothar Rubusch
2024-03-26 6:30 ` Krzysztof Kozlowski
2024-03-26 20:17 ` Lothar Rubusch
2024-03-27 5:02 ` Krzysztof Kozlowski
2024-03-25 15:33 ` [PATCH v4 5/7] iio: accel: adxl345: Pass function pointer to core Lothar Rubusch
2024-03-25 20:34 ` Jonathan Cameron
2024-03-25 15:33 ` [PATCH v4 6/7] iio: accel: adxl345: Add comment to probe Lothar Rubusch
2024-03-25 15:33 ` [PATCH v4 7/7] iio: accel: adxl345: Add spi-3wire option Lothar Rubusch
2024-03-25 20:37 ` 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=20240325153356.46112-2-l.rubusch@gmail.com \
--to=l.rubusch@gmail.com \
--cc=Michael.Hennerich@analog.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=eraretuya@gmail.com \
--cc=jic23@kernel.org \
--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 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.