linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Wahren <stefan.wahren@i2se.com>
To: Jonathan Cameron <jic23@kernel.org>,
	Dmitry Torokhov <dmitry.torokhov@gmail.com>,
	Hartmut Knaack <knaack.h@gmx.de>,
	Lars-Peter Clausen <lars@metafoo.de>,
	Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
	Marek Vasut <marex@denx.de>
Cc: Ksenija Stanojevic <ksenija.stanojevic@gmail.com>,
	Fabio Estevam <fabio.estevam@nxp.com>,
	Juergen Borleis <jbe@pengutronix.de>,
	linux-iio@vger.kernel.org, linux-input@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	Stefan Wahren <stefan.wahren@i2se.com>
Subject: [PATCH V3 3/3] iio: mxs-lradc: disable only masked channels in  mxs_lradc_hw_stop
Date: Sat, 23 Apr 2016 19:57:59 +0000	[thread overview]
Message-ID: <1461441479-23218-4-git-send-email-stefan.wahren@i2se.com> (raw)
In-Reply-To: <1461441479-23218-1-git-send-email-stefan.wahren@i2se.com>

Disabling of the touchscreen IRQs should be done in
mxs_lradc_disable_ts. So disable only the masked virtual channels
in mxs_lradc_hw_stop and finally remove the unused function
mxs_lradc_irq_en_mask.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Tested-by: Marek Vasut <marex@denx.de>
---
 drivers/iio/adc/mxs-lradc.c |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/iio/adc/mxs-lradc.c b/drivers/iio/adc/mxs-lradc.c
index 90242ba..b84d37c 100644
--- a/drivers/iio/adc/mxs-lradc.c
+++ b/drivers/iio/adc/mxs-lradc.c
@@ -373,13 +373,6 @@ static u32 mxs_lradc_plate_mask(struct mxs_lradc *lradc)
 	return LRADC_CTRL0_MX28_PLATE_MASK;
 }
 
-static u32 mxs_lradc_irq_en_mask(struct mxs_lradc *lradc)
-{
-	if (lradc->soc == IMX23_LRADC)
-		return LRADC_CTRL1_MX23_LRADC_IRQ_EN_MASK;
-	return LRADC_CTRL1_MX28_LRADC_IRQ_EN_MASK;
-}
-
 static u32 mxs_lradc_irq_mask(struct mxs_lradc *lradc)
 {
 	if (lradc->soc == IMX23_LRADC)
@@ -1496,7 +1489,9 @@ static void mxs_lradc_hw_stop(struct mxs_lradc *lradc)
 {
 	int i;
 
-	mxs_lradc_reg_clear(lradc, mxs_lradc_irq_en_mask(lradc), LRADC_CTRL1);
+	mxs_lradc_reg_clear(lradc,
+		lradc->buffer_vchans << LRADC_CTRL1_LRADC_IRQ_EN_OFFSET,
+		LRADC_CTRL1);
 
 	for (i = 0; i < LRADC_MAX_DELAY_CHANS; i++)
 		mxs_lradc_reg_wrt(lradc, 0, LRADC_DELAY(i));
-- 
1.7.9.5


  parent reply	other threads:[~2016-04-23 19:59 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-23 19:57 [PATCH V3 0/3] iio: mxs-lradc: simplify TS handling Stefan Wahren
2016-04-23 19:57 ` [PATCH V3 1/3] iio: mxs-lradc: simplify TS registration Stefan Wahren
     [not found]   ` <1461441479-23218-2-git-send-email-stefan.wahren-eS4NqCHxEME@public.gmane.org>
2016-04-25 21:00     ` Dmitry Torokhov
2016-05-04  9:38       ` Jonathan Cameron
2016-04-23 19:57 ` [PATCH V3 2/3] iio: mxs-lradc: remove mxs_lradc_ts_unregister Stefan Wahren
     [not found]   ` <1461441479-23218-3-git-send-email-stefan.wahren-eS4NqCHxEME@public.gmane.org>
2016-04-25 21:00     ` Dmitry Torokhov
2016-05-04  9:39       ` Jonathan Cameron
2016-04-23 19:57 ` Stefan Wahren [this message]
     [not found]   ` <1461441479-23218-4-git-send-email-stefan.wahren-eS4NqCHxEME@public.gmane.org>
2016-05-04  9:39     ` [PATCH V3 3/3] iio: mxs-lradc: disable only masked channels in mxs_lradc_hw_stop Jonathan Cameron
2016-05-01 20:08 ` [PATCH V3 0/3] iio: mxs-lradc: simplify TS handling Jonathan Cameron
     [not found]   ` <500c5874-4ef8-b37b-e12f-80fd5205c172-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2016-05-02  6:06     ` Ksenija Stanojević
     [not found]       ` <CAL7P5jJF9EL4Zk-AC9csyadfrmUp4R+6ceVAN_kNm7dKgo+ZgQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-05-04  9:40         ` 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=1461441479-23218-4-git-send-email-stefan.wahren@i2se.com \
    --to=stefan.wahren@i2se.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=fabio.estevam@nxp.com \
    --cc=jbe@pengutronix.de \
    --cc=jic23@kernel.org \
    --cc=knaack.h@gmx.de \
    --cc=ksenija.stanojevic@gmail.com \
    --cc=lars@metafoo.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=marex@denx.de \
    --cc=pmeerw@pmeerw.net \
    /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).