From: Jonathan Cameron <Jonathan.Cameron@Huawei.com>
To: George Stark <gnstark@sberdevices.ru>
Cc: <jic23@kernel.org>, <lars@metafoo.de>,
<neil.armstrong@linaro.org>, <khilman@baylibre.com>,
<jbrunet@baylibre.com>, <martin.blumenstingl@googlemail.com>,
<andriy.shevchenko@linux.intel.com>, <nuno.sa@analog.com>,
<linux-iio@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>,
<linux-amlogic@lists.infradead.org>, <kernel@sberdevices.ru>
Subject: Re: [PATCH v3 5/5] meson saradc: support reading from channel 7 mux inputs
Date: Sun, 2 Jul 2023 17:21:16 +0800 [thread overview]
Message-ID: <20230702172116.00006f33@Huawei.com> (raw)
In-Reply-To: <20230627224017.1724097-6-gnstark@sberdevices.ru>
On Wed, 28 Jun 2023 01:37:18 +0300
George Stark <gnstark@sberdevices.ru> wrote:
> Add iio channel for every channel 7 mux input.
> Meson saradc channel 7 is connected to a mux that can switch channel
> input to well-known sources like Vdd, GND and several Vdd dividers.
>
> Signed-off-by: George Stark <GNStark@sberdevices.ru>
> ---
> drivers/iio/adc/meson_saradc.c | 83 ++++++++++++++++++++++++++++++++--
> 1 file changed, 79 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c
> index 4a9dacedb6c3..c99a55944ece 100644
> --- a/drivers/iio/adc/meson_saradc.c
> +++ b/drivers/iio/adc/meson_saradc.c
> @@ -163,6 +163,7 @@
> #define MESON_SAR_ADC_MAX_FIFO_SIZE 32
> #define MESON_SAR_ADC_TIMEOUT 100 /* ms */
> #define MESON_SAR_ADC_VOLTAGE_AND_TEMP_CHANNEL 6
> +#define MESON_SAR_ADC_VOLTAGE_AND_MUX_CHANNEL 7
> #define MESON_SAR_ADC_TEMP_OFFSET 27
>
> /* temperature sensor calibration information in eFuse */
> @@ -202,6 +203,19 @@
> .datasheet_name = "TEMP_SENSOR", \
> }
>
> +#define MESON_SAR_ADC_MUX(_chan, _sel) { \
> + .type = IIO_VOLTAGE, \
> + .channel = _chan, \
> + .indexed = 1, \
> + .address = MESON_SAR_ADC_VOLTAGE_AND_MUX_CHANNEL, \
> + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
> + BIT(IIO_CHAN_INFO_AVERAGE_RAW), \
> + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
> + .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_CALIBBIAS) | \
> + BIT(IIO_CHAN_INFO_CALIBSCALE), \
> + .datasheet_name = "SAR_ADC_MUX_"#_sel, \
> +}
> +
> enum meson_sar_adc_avg_mode {
> NO_AVERAGING = 0x0,
> MEAN_AVERAGING = 0x1,
> @@ -235,6 +249,27 @@ enum meson_sar_adc_channel_index {
> NUM_CHAN_7,
> NUM_CHAN_TEMP,
> NUM_CHAN_SOFT_TIMESTAMP,
Silly question... Why does this device have timestamp channels?
It has no buffer support so they don't 'do anything'.
If it had then putting other channels after that might have broken
things if not done very carefully (hence I went looking)
> + NUM_MUX_0_VSS,
> + NUM_MUX_1_VDD_DIV4,
> + NUM_MUX_2_VDD_DIV2,
> + NUM_MUX_3_VDD_MUL3_DIV4,
> + NUM_MUX_4_VDD,
> +};
...
> static const struct iio_chan_spec meson_sar_adc_iio_channels[] = {
> @@ -247,6 +282,11 @@ static const struct iio_chan_spec meson_sar_adc_iio_channels[] = {
> MESON_SAR_ADC_CHAN(NUM_CHAN_6),
> MESON_SAR_ADC_CHAN(NUM_CHAN_7),
> IIO_CHAN_SOFT_TIMESTAMP(NUM_CHAN_SOFT_TIMESTAMP),
> + MESON_SAR_ADC_MUX(NUM_MUX_0_VSS, 0),
> + MESON_SAR_ADC_MUX(NUM_MUX_1_VDD_DIV4, 1),
> + MESON_SAR_ADC_MUX(NUM_MUX_2_VDD_DIV2, 2),
> + MESON_SAR_ADC_MUX(NUM_MUX_3_VDD_MUL3_DIV4, 3),
> + MESON_SAR_ADC_MUX(NUM_MUX_4_VDD, 4),
> };
Jonathan
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-07-02 9:21 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-27 22:37 [PATCH v3 0/5] meson saradc: add iio channels to read channel 7 mux inputs George Stark
2023-06-27 22:37 ` [PATCH v3 1/5] meson saradc: move enums declaration before variables declaration George Stark
2023-07-02 9:14 ` Jonathan Cameron
2023-07-04 0:39 ` George Stark
2023-06-27 22:37 ` [PATCH v3 2/5] meson saradc: move meson_sar_adc_set_chan7_mux routine upper George Stark
2023-06-27 22:37 ` [PATCH v3 3/5] meson saradc: add enum for iio channel numbers George Stark
2023-06-27 22:37 ` [PATCH v3 4/5] meson saradc: add channel labels George Stark
2023-07-02 9:16 ` Jonathan Cameron
2023-07-04 1:32 ` George Stark
2023-06-27 22:37 ` [PATCH v3 5/5] meson saradc: support reading from channel 7 mux inputs George Stark
2023-06-28 10:06 ` Andy Shevchenko
2023-07-02 9:21 ` Jonathan Cameron [this message]
2023-07-03 19:39 ` Martin Blumenstingl
2023-07-04 8:08 ` George Stark
[not found] ` <6ee38b3a-8e2f-15d6-f7bd-06ef567d2b68@sberdevices.ru>
2023-07-05 8:04 ` Jonathan Cameron
2023-07-02 9:11 ` [PATCH v3 0/5] meson saradc: add iio channels to read " 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=20230702172116.00006f33@Huawei.com \
--to=jonathan.cameron@huawei.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=gnstark@sberdevices.ru \
--cc=jbrunet@baylibre.com \
--cc=jic23@kernel.org \
--cc=kernel@sberdevices.ru \
--cc=khilman@baylibre.com \
--cc=lars@metafoo.de \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.blumenstingl@googlemail.com \
--cc=neil.armstrong@linaro.org \
--cc=nuno.sa@analog.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).