From patchwork Thu Apr 14 15:48:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 8839181 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 D062A9F54F for ; Thu, 14 Apr 2016 15:52:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F1658202FF for ; Thu, 14 Apr 2016 15:52:06 +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 214D8202EB for ; Thu, 14 Apr 2016 15:52:06 +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 1aqjXV-0002t7-2i; Thu, 14 Apr 2016 15:50:41 +0000 Received: from mout.kundenserver.de ([217.72.192.75]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aqjWN-0000YV-7w for linux-arm-kernel@lists.infradead.org; Thu, 14 Apr 2016 15:49:37 +0000 Received: from localhost.localdomain ([95.91.39.67]) by mrelayeu.kundenserver.de (mreue101) with ESMTPSA (Nemesis) id 0MRDAN-1bD27l3Dx9-00UeWN; 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 3/5] iio: mxs-lradc: move STMP reset out of ADC init Date: Thu, 14 Apr 2016 15:48:27 +0000 Message-Id: <1460648909-2657-4-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:+f3BB5tYlmSLbHVvsI7dsSucayDQM3s7t2IcQPNzD2VziwCNPI8 U/aQDHwWxdIh05p4EbHdxVL2U8VkGjnG3qsXqUp6dYnVGpxSQYvVYYFqqMc+C2PqFXEABpp gWKv4VCazlQuGN6ZIRhnPLStimiVT4XEvZjQT4VREnr2c4FqgXaAw3aKqbcSaPgfB3IBTKl UyjHD0PwuV0uYRFqYlsJQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:AJybMqLE+M4=:6oCTc2jvlI58t0KXOcIKNb J3Zz1fUJuKvgLJ3RoP4tOQTmtH4jegKbAPX2KsiM26OLysWwh8muc9qD5qaz05PQc7w2u8Mcv G4yPdSqxhLuRckJ08WDFP8JOeovjipsVPxcyQxktoJKP0cqrAobFXXFJR5KEFkWqzEk3Rr+7L TdRFVI0V0zq7DwrdvgeJwNg8BvacA0OG7WTg5+SbHZUTIsEY/0AxmmrvcZrR5fRqzxTURaha+ Me2HWYjyH5IktVPdwzOgLoD2zarmEagUBWsqb+cxBSolfpVXDMdnAJjmA1zi7amouPXt3nMdH vZZ1We5ezuoz4Ujm4Yo1V4f3ikNnD+wudw/reZeC2MMREOV6mgbmLK3fSPGKbCujDHwX1TtUn szVPMEY1O3CqDUjWY0XOeg/506yRl3hDNUTGcUBhP0CLFuXjpBB0pj30pNKEfl1I24MfYijd4 EcfV7JP9Qq8Xp91ial8dhbsWCddhEs5QCZKn0WFfsU3P6OKLVyhFLnVLE/r6mRlKO6uCE94U5 N/Nr1e0VrXJxz0zo3vr6LOAkeHtBXBdI6ZfvKHHWU507rgmY5JqsmPyvhxqF24NzeS90OrWvi fqNS2ew6LSuJyj0BHk/9AjS3mvNAfq62PvXrJN7mUSp7UyCy1ZeAi4+ucum8BK8nkZrfM+qHX aa6ZNW9WFdmqJXqhEQnbcTFknOoSW1VJYZqkl6h2c+hYcMuAlr/WI2773krVkv4sFluE= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160414_084931_970081_0A669C89 X-CRM114-Status: GOOD ( 12.19 ) 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 STMP reset out of ADC init function in order to make it never fail. This is also necessary for PM ops. Signed-off-by: Stefan Wahren --- drivers/iio/adc/mxs-lradc.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/iio/adc/mxs-lradc.c b/drivers/iio/adc/mxs-lradc.c index 7118fca..95d84c9 100644 --- a/drivers/iio/adc/mxs-lradc.c +++ b/drivers/iio/adc/mxs-lradc.c @@ -1482,18 +1482,13 @@ static const struct iio_chan_spec mx28_lradc_chan_spec[] = { MXS_ADC_CHAN(15, IIO_VOLTAGE, "VDD5V"), }; -static int mxs_lradc_hw_init(struct mxs_lradc *lradc) +static void mxs_lradc_hw_init(struct mxs_lradc *lradc) { /* The ADC always uses DELAY CHANNEL 0. */ const u32 adc_cfg = (1 << (LRADC_DELAY_TRIGGER_DELAYS_OFFSET + 0)) | (LRADC_DELAY_TIMER_PER << LRADC_DELAY_DELAY_OFFSET); - int ret = stmp_reset_block(lradc->base); - - if (ret) - return ret; - /* Configure DELAY CHANNEL 0 for generic ADC sampling. */ mxs_lradc_reg_wrt(lradc, adc_cfg, LRADC_DELAY(0)); @@ -1504,8 +1499,6 @@ static int mxs_lradc_hw_init(struct mxs_lradc *lradc) /* Start internal temperature sensing. */ mxs_lradc_reg_wrt(lradc, 0, LRADC_CTRL2); - - return 0; } static void mxs_lradc_hw_stop(struct mxs_lradc *lradc) @@ -1705,11 +1698,13 @@ static int mxs_lradc_probe(struct platform_device *pdev) } } - /* Configure the hardware. */ - ret = mxs_lradc_hw_init(lradc); + ret = stmp_reset_block(lradc->base); if (ret) goto err_dev; + /* Configure the hardware. */ + mxs_lradc_hw_init(lradc); + /* Register the touchscreen input device. */ if (touch_ret == 0) { ret = mxs_lradc_ts_register(lradc);