From patchwork Thu Apr 14 15:48:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 8839161 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 649B89F54F for ; Thu, 14 Apr 2016 15:51:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9AA6F202EB for ; Thu, 14 Apr 2016 15:51:32 +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 BCACC20270 for ; Thu, 14 Apr 2016 15:51:31 +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 1aqjWx-0001Kh-5M; Thu, 14 Apr 2016 15:50:07 +0000 Received: from mout.kundenserver.de ([212.227.17.24]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aqjWM-0000Xq-Nh for linux-arm-kernel@lists.infradead.org; Thu, 14 Apr 2016 15:49:33 +0000 Received: from localhost.localdomain ([95.91.39.67]) by mrelayeu.kundenserver.de (mreue101) with ESMTPSA (Nemesis) id 0MDgWE-1b01Zo0hR8-00H5kc; Thu, 14 Apr 2016 17:48:46 +0200 From: Stefan Wahren To: Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Marek Vasut Subject: [PATCH RFT 2/5] iio: mxs-lradc: move TS config into suitable function Date: Thu, 14 Apr 2016 15:48:26 +0000 Message-Id: <1460648909-2657-3-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:SQTJjJsqiQ/XHbYlyraRNd/oGlP+u1KnUA1kjbhVGoYqluYi6T/ LFO28taMP5hNS1Np7cD+4+pzqPtgJGeNZ+cNKiNfbx0JZ2iwT6Wp1xTf70vVdBIgDqNTdUw xpnezW5j36eqfd5GwYOeEeRwiXuwPwnFS1bCSEdMRg5Fs79LFbLEnJkIPjRfLC1uEanio9R QQTQU6J+Ky9BvmYBiImNQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:pLX9AneB/cw=:32P7UiDNyQ2S/wjnETSODJ FDFfsU/HT1F8lgtc9+Zp17FKtmI5ZQ6Convk6QT9ZlBQ2joKWHQoejAjuC0ownz4t8xtL6beu Wsn0zWR6oVcDWoz9XZjz9AfCzdUcqXc+mlS7N41Jjn38mWdAXm/mBi5SOLN2/0MJpBl8pk1qD fR0LBiaEv77MgfXPsOiZ/99C/vqMk5NRWwsQIAOz1UVPJTPXiSiffWVb7ze/H2+DZ+5vgY8yZ 9f3RU6xqb0mlvoevfcGe4yoAiGYGrKTji/H6W1Fe1zG36AqTzElc6wbEjbGjuWwqt7p6eRhL3 gzgXPKUlbKUoEDUCiohDMaEedT/ORVSp4l+kdMAZrTEepwBTqcZNh8JpPkb/Y8qd6/kOSXiaw kmB8bX06SYNbxQ9QuI6h0QLlG6eVBvWiz015/HXuwARbYXvHb20qD2SbKdPZ2v0Y+894c9DkP 1CfqSQW5N8D2rxshapviGE/9H1K/ccryvYX6vjhUII44HpFDAxFxPRtq7pPuRui/y7hQo0nQr 9DAF+U48ZpQ9vLN9aTZCOV7JkXaP88z9aDjWjOWfe1uYSnbKlwj65C+FHLvdPQm6zBR8ePKur yuHA4Lq5k3XzcfqyrrCKcid88RxQQBGgkXCAxSbX9ro7t5dt5J+y+36EoPOLyEOTOxlCuXFJI BqYfrIhwxIhhIVC6X3eZ1YZInC+Ou+k4OCizGZWnHaT20wbZ+k1QqQi1y2rWPi1vjaXc= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160414_084931_510942_CD40588E X-CRM114-Status: GOOD ( 10.70 ) 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 This patch moves the touchscreen type configuration into a more suitable function. Btw this simplifies PM ops later. Signed-off-by: Stefan Wahren Reviewed-by: Marek Vasut Acked-by: Dmitry Torokhov --- drivers/iio/adc/mxs-lradc.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/iio/adc/mxs-lradc.c b/drivers/iio/adc/mxs-lradc.c index 0576953..7118fca 100644 --- a/drivers/iio/adc/mxs-lradc.c +++ b/drivers/iio/adc/mxs-lradc.c @@ -686,6 +686,17 @@ static void mxs_lradc_prepare_pressure(struct mxs_lradc *lradc) static void mxs_lradc_enable_touch_detection(struct mxs_lradc *lradc) { + /* Configure the touchscreen type */ + if (lradc->soc == IMX28_LRADC) { + mxs_lradc_reg_clear(lradc, LRADC_CTRL0_MX28_TOUCH_SCREEN_TYPE, + LRADC_CTRL0); + + if (lradc->use_touchscreen == MXS_LRADC_TOUCHSCREEN_5WIRE) + mxs_lradc_reg_set(lradc, + LRADC_CTRL0_MX28_TOUCH_SCREEN_TYPE, + LRADC_CTRL0); + } + mxs_lradc_setup_touch_detection(lradc); lradc->cur_plate = LRADC_TOUCH; @@ -1491,16 +1502,6 @@ static int mxs_lradc_hw_init(struct mxs_lradc *lradc) mxs_lradc_reg_wrt(lradc, 0, LRADC_DELAY(2)); mxs_lradc_reg_wrt(lradc, 0, LRADC_DELAY(3)); - /* Configure the touchscreen type */ - if (lradc->soc == IMX28_LRADC) { - mxs_lradc_reg_clear(lradc, LRADC_CTRL0_MX28_TOUCH_SCREEN_TYPE, - LRADC_CTRL0); - - if (lradc->use_touchscreen == MXS_LRADC_TOUCHSCREEN_5WIRE) - mxs_lradc_reg_set(lradc, LRADC_CTRL0_MX28_TOUCH_SCREEN_TYPE, - LRADC_CTRL0); - } - /* Start internal temperature sensing. */ mxs_lradc_reg_wrt(lradc, 0, LRADC_CTRL2);