From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Jonathan Cameron <jic23@kernel.org>,
Lars-Peter Clausen <lars@metafoo.de>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
linux-iio@vger.kernel.org, <linux-kernel@vger.kernel.org>,
Miquel Raynal <miquel.raynal@bootlin.com>
Subject: [PATCH 07/16] iio: adc: max1027: Create a helper to configure the trigger
Date: Wed, 18 Aug 2021 13:11:30 +0200 [thread overview]
Message-ID: <20210818111139.330636-8-miquel.raynal@bootlin.com> (raw)
In-Reply-To: <20210818111139.330636-1-miquel.raynal@bootlin.com>
There are two ways to physically trigger a conversion:
- A falling edge on the cnvst pin
- A write operation on the conversion register
Let's create a helper for this.
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
drivers/iio/adc/max1027.c | 52 ++++++++++++++++++++++++++-------------
1 file changed, 35 insertions(+), 17 deletions(-)
diff --git a/drivers/iio/adc/max1027.c b/drivers/iio/adc/max1027.c
index a6ebc951c09a..59914fcfd320 100644
--- a/drivers/iio/adc/max1027.c
+++ b/drivers/iio/adc/max1027.c
@@ -232,10 +232,37 @@ struct max1027_state {
struct iio_trigger *trig;
__be16 *buffer;
struct mutex lock;
-
+ bool cnvst_trigger;
u8 reg ____cacheline_aligned;
};
+static int max1027_configure_trigger(struct iio_dev *indio_dev)
+{
+ struct max1027_state *st = iio_priv(indio_dev);
+ int ret;
+
+ st->reg = MAX1027_SETUP_REG | MAX1027_REF_MODE2;
+
+ /*
+ * Start acquisition on:
+ * MODE0: external hardware trigger wired to the cnvst input pin
+ * MODE2: conversion register write
+ */
+ if (st->cnvst_trigger)
+ st->reg |= MAX1027_CKS_MODE0;
+ else
+ st->reg |= MAX1027_CKS_MODE2;
+
+ ret = spi_write(st->spi, &st->reg, 1);
+ if (ret < 0) {
+ dev_err(&indio_dev->dev,
+ "Failed to configure register (%d)\n", ret);
+ return ret;
+ }
+
+ return 0;
+}
+
static int max1027_read_single_value(struct iio_dev *indio_dev,
struct iio_chan_spec const *chan,
int *val)
@@ -248,14 +275,9 @@ static int max1027_read_single_value(struct iio_dev *indio_dev,
return -EBUSY;
}
- /* Start acquisition on conversion register write */
- st->reg = MAX1027_SETUP_REG | MAX1027_REF_MODE2 | MAX1027_CKS_MODE2;
- ret = spi_write(st->spi, &st->reg, 1);
- if (ret < 0) {
- dev_err(&indio_dev->dev,
- "Failed to configure setup register\n");
+ ret = max1027_configure_trigger(indio_dev);
+ if (ret)
return ret;
- }
/* Configure conversion register with the requested chan */
st->reg = MAX1027_CONV_REG | MAX1027_CHAN(chan->channel) |
@@ -363,12 +385,10 @@ static int max1027_set_cnvst_trigger_state(struct iio_trigger *trig, bool state)
if (bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength))
return -EINVAL;
+ st->cnvst_trigger = state;
if (state) {
- /* Start acquisition on cnvst */
- st->reg = MAX1027_SETUP_REG | MAX1027_CKS_MODE0 |
- MAX1027_REF_MODE2;
- ret = spi_write(st->spi, &st->reg, 1);
- if (ret < 0)
+ ret = max1027_configure_trigger(indio_dev);
+ if (ret)
return ret;
/*
@@ -382,10 +402,8 @@ static int max1027_set_cnvst_trigger_state(struct iio_trigger *trig, bool state)
return ret;
} else {
/* Start acquisition on conversion register write */
- st->reg = MAX1027_SETUP_REG | MAX1027_CKS_MODE2 |
- MAX1027_REF_MODE2;
- ret = spi_write(st->spi, &st->reg, 1);
- if (ret < 0)
+ ret = max1027_configure_trigger(indio_dev);
+ if (ret)
return ret;
}
--
2.27.0
next prev parent reply other threads:[~2021-08-18 11:12 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-18 11:11 [PATCH 00/16] Bring software triggers support to MAX1027-like ADCs Miquel Raynal
2021-08-18 11:11 ` [PATCH 01/16] iio: adc: max1027: Fix wrong shift with 12-bit devices Miquel Raynal
2021-08-20 7:02 ` Sa, Nuno
2021-08-30 9:57 ` Jonathan Cameron
2021-08-18 11:11 ` [PATCH 02/16] iio: adc: max1027: Fix the number of max1X31 channels Miquel Raynal
2021-08-20 7:03 ` Sa, Nuno
2021-08-30 10:00 ` Jonathan Cameron
2021-08-18 11:11 ` [PATCH 03/16] iio: adc: max1027: Push only the requested samples Miquel Raynal
2021-08-20 7:10 ` Sa, Nuno
2021-08-30 10:07 ` Jonathan Cameron
2021-08-30 10:49 ` Sa, Nuno
2021-08-30 14:29 ` Jonathan Cameron
2021-08-30 15:02 ` Sa, Nuno
2021-09-01 8:12 ` Miquel Raynal
2021-09-04 14:06 ` Jonathan Cameron
2021-09-06 8:59 ` Sa, Nuno
2021-09-06 16:56 ` Jonathan Cameron
2021-09-06 17:34 ` Miquel Raynal
2021-08-30 10:06 ` Jonathan Cameron
2021-08-18 11:11 ` [PATCH 04/16] iio: adc: max1027: Lower conversion time Miquel Raynal
2021-08-20 7:12 ` Sa, Nuno
2021-08-30 10:10 ` Jonathan Cameron
2021-08-18 11:11 ` [PATCH 05/16] iio: adc: max1027: Drop extra warning message Miquel Raynal
2021-08-20 7:12 ` Sa, Nuno
2021-08-30 10:12 ` Jonathan Cameron
2021-08-18 11:11 ` [PATCH 06/16] iio: adc: max1027: Rename a helper Miquel Raynal
2021-08-20 7:13 ` Sa, Nuno
2021-08-18 11:11 ` Miquel Raynal [this message]
2021-08-20 7:16 ` [PATCH 07/16] iio: adc: max1027: Create a helper to configure the trigger Sa, Nuno
2021-08-30 10:16 ` Jonathan Cameron
2021-08-18 11:11 ` [PATCH 08/16] iio: adc: max1027: Explain better how the trigger state gets changed Miquel Raynal
2021-08-20 7:17 ` Sa, Nuno
2021-08-18 11:11 ` [PATCH 09/16] iio: adc: max1027: Create a helper to configure the channels to scan Miquel Raynal
2021-08-20 7:18 ` Sa, Nuno
2021-08-18 11:11 ` [PATCH 10/16] iio: adc: max1027: Prevent single channel accesses during buffer reads Miquel Raynal
2021-08-20 7:20 ` Sa, Nuno
2021-08-20 7:30 ` Sa, Nuno
2021-08-30 10:20 ` Jonathan Cameron
2021-09-02 8:56 ` Miquel Raynal
2021-08-18 11:11 ` [PATCH 11/16] iio: adc: max1027: Separate the IRQ handler from the read logic Miquel Raynal
2021-08-20 7:23 ` Sa, Nuno
2021-09-02 8:55 ` Miquel Raynal
2021-09-04 14:08 ` Jonathan Cameron
2021-08-18 11:11 ` [PATCH 12/16] iio: adc: max1027: Introduce an end of conversion helper Miquel Raynal
2021-08-20 7:28 ` Sa, Nuno
2021-09-02 9:26 ` Miquel Raynal
2021-08-30 10:34 ` Jonathan Cameron
2021-08-18 11:11 ` [PATCH 13/16] iio: adc: max1027: Prepare re-using the EOC interrupt Miquel Raynal
2021-08-20 7:31 ` Sa, Nuno
2021-08-30 10:30 ` Jonathan Cameron
2021-08-30 10:47 ` Jonathan Cameron
2021-08-18 11:11 ` [PATCH 14/16] iio: adc: max1027: Consolidate the end of conversion helper Miquel Raynal
2021-08-20 7:45 ` Sa, Nuno
2021-08-30 10:37 ` Jonathan Cameron
2021-08-30 12:44 ` Sa, Nuno
2021-08-30 14:32 ` Jonathan Cameron
2021-09-02 15:12 ` Miquel Raynal
2021-09-03 14:28 ` Sa, Nuno
2021-09-03 14:46 ` Miquel Raynal
2021-09-05 9:41 ` Jonathan Cameron
2021-09-06 9:12 ` Sa, Nuno
2021-09-06 9:30 ` Sa, Nuno
2021-08-18 11:11 ` [PATCH 15/16] iio: adc: max1027: Support software triggers Miquel Raynal
2021-08-20 7:58 ` Sa, Nuno
2021-09-02 12:25 ` Miquel Raynal
2021-09-03 14:20 ` Sa, Nuno
2021-08-30 10:50 ` Jonathan Cameron
2021-09-02 15:21 ` Miquel Raynal
2021-09-05 9:43 ` Jonathan Cameron
2021-08-18 11:11 ` [PATCH 16/16] iio: adc: max1027: Enable software triggers to be used without IRQ Miquel Raynal
2021-08-30 10:54 ` 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=20210818111139.330636-8-miquel.raynal@bootlin.com \
--to=miquel.raynal@bootlin.com \
--cc=jic23@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=thomas.petazzoni@bootlin.com \
/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).