LKML Archive on lore.kernel.org help / color / mirror / Atom feed
From: Eugen Hristev <eugen.hristev@microchip.com> To: <jic23@kernel.org>, <ludovic.desroches@microchip.com>, <alexandre.belloni@bootlin.com>, <linux-arm-kernel@lists.infradead.org>, <devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-iio@vger.kernel.org>, <linux-input@vger.kernel.org>, <nicolas.ferre@microchip.com>, <dmitry.torokhov@gmail.com> Cc: Eugen Hristev <eugen.hristev@microchip.com> Subject: [PATCH v2 05/10] iio: adc: at91-sama5d2_adc: fix channel configuration for differential channels Date: Tue, 27 Mar 2018 15:32:38 +0300 [thread overview] Message-ID: <1522153963-1121-6-git-send-email-eugen.hristev@microchip.com> (raw) In-Reply-To: <1522153963-1121-1-git-send-email-eugen.hristev@microchip.com> When iterating through the channels, the index in the array is not the scan index. Added an xlate function to translate to the proper index. This will be used also for devicetree channel xlate Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com> --- drivers/iio/adc/at91-sama5d2_adc.c | 41 ++++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c index 4eff835..8729d65 100644 --- a/drivers/iio/adc/at91-sama5d2_adc.c +++ b/drivers/iio/adc/at91-sama5d2_adc.c @@ -333,6 +333,27 @@ static const struct iio_chan_spec at91_adc_channels[] = { + AT91_SAMA5D2_DIFF_CHAN_CNT + 1), }; +static int at91_adc_chan_xlate(struct iio_dev *indio_dev, int chan) +{ + int i; + + for (i = 0; i < indio_dev->num_channels; i++) { + if (indio_dev->channels[i].scan_index == chan) + return i; + } + return -EINVAL; +} + +static inline struct iio_chan_spec const * +at91_adc_chan_get(struct iio_dev *indio_dev, int chan) +{ + int index = at91_adc_chan_xlate(indio_dev, chan); + + if (index < 0) + return NULL; + return indio_dev->channels + index; +} + static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state) { struct iio_dev *indio = iio_trigger_get_drvdata(trig); @@ -350,8 +371,10 @@ static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state) at91_adc_writel(st, AT91_SAMA5D2_TRGR, status); for_each_set_bit(bit, indio->active_scan_mask, indio->num_channels) { - struct iio_chan_spec const *chan = indio->channels + bit; + struct iio_chan_spec const *chan = at91_adc_chan_get(indio, bit); + if (!chan) + continue; if (state) { at91_adc_writel(st, AT91_SAMA5D2_CHER, BIT(chan->channel)); @@ -448,7 +471,11 @@ static int at91_adc_dma_start(struct iio_dev *indio_dev) for_each_set_bit(bit, indio_dev->active_scan_mask, indio_dev->num_channels) { - struct iio_chan_spec const *chan = indio_dev->channels + bit; + struct iio_chan_spec const *chan = + at91_adc_chan_get(indio_dev, bit); + + if (!chan) + continue; st->dma_st.rx_buf_sz += chan->scan_type.storagebits / 8; } @@ -526,8 +553,11 @@ static int at91_adc_buffer_predisable(struct iio_dev *indio_dev) */ for_each_set_bit(bit, indio_dev->active_scan_mask, indio_dev->num_channels) { - struct iio_chan_spec const *chan = indio_dev->channels + bit; + struct iio_chan_spec const *chan = + at91_adc_chan_get(indio_dev, bit); + if (!chan) + continue; if (st->dma_st.dma_chan) at91_adc_readl(st, chan->address); } @@ -587,8 +617,11 @@ static void at91_adc_trigger_handler_nodma(struct iio_dev *indio_dev, for_each_set_bit(bit, indio_dev->active_scan_mask, indio_dev->num_channels) { - struct iio_chan_spec const *chan = indio_dev->channels + bit; + struct iio_chan_spec const *chan = + at91_adc_chan_get(indio_dev, bit); + if (!chan) + continue; st->buffer[i] = at91_adc_readl(st, chan->address); i++; } -- 2.7.4
next prev parent reply other threads:[~2018-03-27 12:36 UTC|newest] Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-03-27 12:32 [PATCH v2 00/10] Add support for SAMA5D2 touchscreen Eugen Hristev 2018-03-27 12:32 ` [PATCH v2 01/10] MAINTAINERS: add generic resistive touchscreen adc Eugen Hristev 2018-03-27 12:32 ` [PATCH v2 02/10] iio: Add channel for Position Relative Eugen Hristev 2018-03-27 12:32 ` [PATCH v2 03/10] dt-bindings: input: touchscreen: touch_adc: create bindings Eugen Hristev 2018-04-09 18:46 ` Rob Herring 2018-03-27 12:32 ` [PATCH v2 04/10] iio: inkern: add module put/get on iio dev module when requesting channels Eugen Hristev 2018-03-27 12:32 ` Eugen Hristev [this message] 2018-03-30 12:17 ` [PATCH v2 05/10] iio: adc: at91-sama5d2_adc: fix channel configuration for differential channels Jonathan Cameron 2018-03-27 12:32 ` [PATCH v2 06/10] iio: adc: at91-sama5d2_adc: add support for position and pressure channels Eugen Hristev 2018-03-30 12:47 ` Jonathan Cameron 2018-03-27 12:32 ` [PATCH v2 07/10] input: touchscreen: touch_adc: add generic resistive ADC touchscreen Eugen Hristev 2018-03-30 12:58 ` Jonathan Cameron 2018-03-30 18:09 ` Dmitry Torokhov 2018-04-06 15:13 ` Jonathan Cameron 2018-03-27 12:32 ` [PATCH v2 08/10] dt-bindings: iio: adc: at91-sama5d2_adc: add channel specific consumer info Eugen Hristev 2018-04-09 18:47 ` Rob Herring 2018-03-27 12:32 ` [PATCH v2 09/10] ARM: dts: at91: sama5d2: add channel cells for ADC device Eugen Hristev 2018-03-27 12:32 ` [PATCH v2 10/10] ARM: dts: at91: sama5d2: Add resistive touch device Eugen Hristev 2018-03-30 13:02 ` [PATCH v2 00/10] Add support for SAMA5D2 touchscreen Jonathan Cameron 2018-04-10 7:38 ` Quentin Schulz 2018-04-10 13:47 ` 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=1522153963-1121-6-git-send-email-eugen.hristev@microchip.com \ --to=eugen.hristev@microchip.com \ --cc=alexandre.belloni@bootlin.com \ --cc=devicetree@vger.kernel.org \ --cc=dmitry.torokhov@gmail.com \ --cc=jic23@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-iio@vger.kernel.org \ --cc=linux-input@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=ludovic.desroches@microchip.com \ --cc=nicolas.ferre@microchip.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: linkBe 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).