From patchwork Thu Apr 14 15:48:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 8839171 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 9D8EAC0553 for ; Thu, 14 Apr 2016 15:51:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CAD3B202EB for ; Thu, 14 Apr 2016 15:51:54 +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 F049420270 for ; Thu, 14 Apr 2016 15:51:53 +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 1aqjXB-0002GU-NF; Thu, 14 Apr 2016 15:50:21 +0000 Received: from mout.kundenserver.de ([212.227.17.10]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aqjWN-0000YL-2F for linux-arm-kernel@lists.infradead.org; Thu, 14 Apr 2016 15:49:36 +0000 Received: from localhost.localdomain ([95.91.39.67]) by mrelayeu.kundenserver.de (mreue101) with ESMTPSA (Nemesis) id 0M5Ozn-1bhi641U5v-00zXJ1; Thu, 14 Apr 2016 17:48:47 +0200 From: Stefan Wahren To: Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Marek Vasut Subject: [PATCH RFT 4/5] iio: mxs-lradc: disable only mapped channels in mxs_lradc_hw_stop Date: Thu, 14 Apr 2016 15:48:28 +0000 Message-Id: <1460648909-2657-5-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1460648909-2657-1-git-send-email-stefan.wahren@i2se.com> References: <1460648909-2657-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K0:4PudjVhbfFsTzUnGTKJhLuJ4oDDIcKxkLNFHTiTkNqsD0VVXaXd fO91L9DRYyHIvITtZ/MbTqBCU2o0NJuI+wq9kw1QYpZRXm1EmGpGtwcjLJUSRWumjttkIy/ AbBM5CnJYE25K2Wg9vqMW4HZ72q9U80f7+nIX8LthwfbazYtF1SOvxLN9CBBXysaXkqoaNt 23Q3Ykj+vDbzLqyrCcMSA== X-UI-Out-Filterresults: notjunk:1; V01:K0:dt0BOecdKMs=:PrD9odG+CPst5Cv2h9wwPL nogo+nwcQsmic5wTXWuQ73MION6ko9P/9djUNxtWLinhgdja4aF612a9e1r9fovF6dIJR5A/p G8zy41uvG9rnvfuID0Njb3ie0kLmLKPcF/3Z7I33guY1CHvEqxfvFjFs1+nnMkoo7wjrMO4ZC YydKvtus/+LYuM0X7z/s7A9usi/1nKoYfL8tUsGZX9y4Z4z65Q/tsbLNbVOhblpEXs52qRhWs iWXvXFWfx5ZzTtUqkI3uwQF+O1vqFRyfl4PWUt+fKGWcgK0Qww6DAttisyAEoyW3KjjdcfO+a i8/56WMoqW0F9p4g7GNMVe8B6ywO/Z0LSvcNPcics+lwPI45P5C+HNlSlSNVRcG617hOu1mMz J84Dy8yg23BB8rMhOAOEvDMZrDQQgpzrlLimFV5uvbmLf489TH5xS1dawUSV4KhkQVwAFtARz CTCI5MwCCc1bG0+U7TFda/xrdsCZAwGbcypyh4YcVyHYP15lVS+x488xy+Tg0CgaC20KNOrTX A+QGYrPHoYhn4BdGyo7uerZnNDbNa/SC5/ZS4IFgAWyTndslfQPe5rCcM41i6dZygns0Nc1xa Tkk+xK0sMnA423F0BQRleawFZn6fbKjYREp7+JjRdLLCBmK8KejSq1y8bBcZ9ERZnBEpAF743 yiDtV71YCHH1KiWqj2FxN+Y7ExTkTrEqxryHnUT8cxoS9TyctQufX1ZJHc6ge8lo0AVM= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160414_084931_870216_32FEF2EC X-CRM114-Status: GOOD ( 10.34 ) 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, Alexandre Belloni , 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 is already done in mxs_lradc_disable_ts. There is no need to disable them in mxs_lradc_hw_stop again. So we only need to care of the mapped channels which are common for i.MX23 and i.MX28 and we remove the now unused function mxs_lradc_irq_en_mask. Signed-off-by: Stefan Wahren --- 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 95d84c9..97c993f 100644 --- a/drivers/iio/adc/mxs-lradc.c +++ b/drivers/iio/adc/mxs-lradc.c @@ -295,6 +295,7 @@ struct mxs_lradc { #define LRADC_CTRL1_LRADC_IRQ_EN(n) (1 << ((n) + 16)) #define LRADC_CTRL1_MX28_LRADC_IRQ_EN_MASK (0x1fff << 16) #define LRADC_CTRL1_MX23_LRADC_IRQ_EN_MASK (0x01ff << 16) +#define LRADC_CTRL1_MAPPED_CHANS_IRQ_EN_MASK (0x00ff << 16) #define LRADC_CTRL1_LRADC_IRQ_EN_OFFSET 16 #define LRADC_CTRL1_TOUCH_DETECT_IRQ BIT(8) #define LRADC_CTRL1_LRADC_IRQ(n) (1 << (n)) @@ -373,13 +374,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) @@ -1505,7 +1499,8 @@ 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_CTRL1_MAPPED_CHANS_IRQ_EN_MASK, + LRADC_CTRL1); for (i = 0; i < LRADC_MAX_DELAY_CHANS; i++) mxs_lradc_reg_wrt(lradc, 0, LRADC_DELAY(i));