From patchwork Sat Apr 23 19:57:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 8918921 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id ADDE0BF29F for ; Sat, 23 Apr 2016 20:01:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D0E1C201C7 for ; Sat, 23 Apr 2016 20:01:09 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B122E201B9 for ; Sat, 23 Apr 2016 20:01:08 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1au3iA-0005My-Ss; Sat, 23 Apr 2016 19:59:26 +0000 Received: from mout.kundenserver.de ([212.227.126.130]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1au3i1-0005Ji-EJ for linux-arm-kernel@lists.infradead.org; Sat, 23 Apr 2016 19:59:18 +0000 Received: from localhost.localdomain ([95.91.39.67]) by mrelayeu.kundenserver.de (mreue002) with ESMTPSA (Nemesis) id 0MWbfO-1bDGIq001y-00Xf9t; Sat, 23 Apr 2016 21:58:26 +0200 From: Stefan Wahren To: Jonathan Cameron , Dmitry Torokhov , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Marek Vasut 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 Message-Id: <1461441479-23218-4-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1461441479-23218-1-git-send-email-stefan.wahren@i2se.com> References: <1461441479-23218-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K0:Iuy+GRPRH+1DbDeWB8L+fgSLD/Yt5ZAwX7gGZ+eFmX+VR6gvmAE smjZgn+BoYSghHOYCj8Tk3iT5f1aMeorVSGr6s3EIRVaCdpde33v/ny8I2gaUiVPCZk/bkr 9hjCTGa3FHk9NLY7HbBTrIkBPynG0CvNh5Td+BO6C8jhRp6uMEPRgJC4PWF5ukurNVmo7o3 l1F2JqjoIIe7QOVayf/6w== X-UI-Out-Filterresults: notjunk:1; V01:K0:CoSMHy0dex4=:/5CaL2wWaIBPhAr6V3P9Ag cL9d+bJFPsxs14zZ2uW/7mdFEvsOkko8BkjfPCRYGv4oxP8PAiUKTCSJqbUovfc34/Re7fsAP 4b2kGHW/+F+BsLGLxotlAF//AoKeaUKukx+q7j09J/vUo7clUCyJD1QH4DHGNxwbAf+RyckT4 XBb/jdXolDM5IiTSBILppzsO170T1rksEi5XCmpCMmoqvAxSkCxU8GpMmEUfM6BJM0r4tLtRB PpRx6hT+AGCOoyBZFxN1yUgwgqwqy36LIin9yTc0RL4CD6pjgJz1TEYtMCJ+9ze0UJsSZliPa 6LngNC49znffeEiT0imhfEMrBIU7BLmrleym23h+CIqOUOYtY3lGMvKx5uMEArKhq+iiNbtBQ qNNbgHfmC/x608WHo8tNUCw0Qx/EdD22xw3CWP8IUas7ox/LPMZ3CKxW4H9771oR+ssLnTQBL Uz6UOfKrZI5r6uyaEHzUtmc85BOVmZBhuEUI6ME/LlP3z+oNdxpMqMFvBSWZtPNK4RU4nknRV K6/7LWBxDPjNgoqAilrLmA1xJIp8If6mLb2Qno32kbDkr2Di+RiYoCoJ0vzZixY6F8KZmk1jd hWphRfPTqqkRtGSYWn4vte9uzhdXYk+yr0WF77A1mUIFpDK+kUJTQsno7lDl8wRjdWLp8fSsc J3yeRcxELDzflihKZMvTxNruk7PpSsGxicsDo26VeQL6ZAPBSeLHmKWqIVt/BjW+2SNE= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160423_125917_847417_504A3C1B X-CRM114-Status: UNSURE ( 9.83 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Wahren , Ksenija Stanojevic , linux-iio@vger.kernel.org, linux-input@vger.kernel.org, Fabio Estevam , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Marek Vasut Tested-by: Marek Vasut --- 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));