From patchwork Wed May 3 16:20:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Nyekjaer X-Patchwork-Id: 13230310 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB01EC7EE21 for ; Wed, 3 May 2023 16:20:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229441AbjECQUy (ORCPT ); Wed, 3 May 2023 12:20:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229498AbjECQUw (ORCPT ); Wed, 3 May 2023 12:20:52 -0400 Received: from www530.your-server.de (www530.your-server.de [188.40.30.78]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 893076A76 for ; Wed, 3 May 2023 09:20:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=geanix.com; s=default2211; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References; bh=OpZHjSdSGQpoQPed8Rj960aLDTbFhfFzVPv3Avi9JCU=; b=HvPgdKfsuBj+Z2jyjAkbJwH66/ 7z6CCF+suypgGbnh4bbOQA5YnGzZO8eqFETJKVr+KmwMVlA/G0Khn0WtfOVDmQNiHwNIVBf0VB1JI PyQUcuEldZH016Jm9ma9ZOajjXMqpjQLNX0qfmFtRwnSkeQdjfi1OgVSeF3L9X3GPdgiIploMGgYY FhAWkKYxyaXG//U/1P5kaZ6o3TF0JN0W8gbXkS2jxMk49o0C/NqUgkqQ2aa+awuVbPB3SGYQfHe3m HXZ7qsSxH/cEoiJgnP79YCK0jI2/CvFpoKHIih74lg4jF4lca/imbgSi7WM0cGtkDRlZUFRz14HnZ reQt8T3w==; Received: from sslproxy03.your-server.de ([88.198.220.132]) by www530.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1puFDf-000MMM-0k; Wed, 03 May 2023 18:20:43 +0200 Received: from [185.17.218.86] (helo=zen..) by sslproxy03.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1puFDe-000QMl-Mv; Wed, 03 May 2023 18:20:42 +0200 From: Sean Nyekjaer To: jic23@kernel.org, olivier.moysan@foss.st.com, alexandre.torgue@foss.st.com, nuno.sa@analog.com Cc: Sean Nyekjaer , linux-iio@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com Subject: [PATCH v3 1/2] iio: adc: stm32-adc: skip adc-diff-channels setup if none is present Date: Wed, 3 May 2023 18:20:28 +0200 Message-Id: <20230503162029.3654093-1-sean@geanix.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Authenticated-Sender: sean@geanix.com X-Virus-Scanned: Clear (ClamAV 0.103.8/26895/Wed May 3 09:23:02 2023) Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org If no adc differential channels are defined driver will fail with EINVAL: stm32-adc: probe of 48003000.adc:adc@0 failed with error -22 Fix this by skipping the initialization if no channels are defined. This applies only to the legacy way of initializing adc channels. Fixes: d7705f35448a ("iio: adc: stm32-adc: convert to device properties") Signed-off-by: Sean Nyekjaer --- Changes since v1: - None Changes since v2: - None drivers/iio/adc/stm32-adc.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c index e179b6611e4d..14524c1b5583 100644 --- a/drivers/iio/adc/stm32-adc.c +++ b/drivers/iio/adc/stm32-adc.c @@ -2008,16 +2008,15 @@ static int stm32_adc_get_legacy_chan_count(struct iio_dev *indio_dev, struct stm * to get the *real* number of channels. */ ret = device_property_count_u32(dev, "st,adc-diff-channels"); - if (ret < 0) - return ret; - - ret /= (int)(sizeof(struct stm32_adc_diff_channel) / sizeof(u32)); - if (ret > adc_info->max_channels) { - dev_err(&indio_dev->dev, "Bad st,adc-diff-channels?\n"); - return -EINVAL; - } else if (ret > 0) { - adc->num_diff = ret; - num_channels += ret; + if (ret > 0) { + ret /= (int)(sizeof(struct stm32_adc_diff_channel) / sizeof(u32)); + if (ret > adc_info->max_channels) { + dev_err(&indio_dev->dev, "Bad st,adc-diff-channels?\n"); + return -EINVAL; + } else if (ret > 0) { + adc->num_diff = ret; + num_channels += ret; + } } /* Optional sample time is provided either for each, or all channels */ From patchwork Wed May 3 16:20:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Nyekjaer X-Patchwork-Id: 13230309 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93B3EC77B7F for ; Wed, 3 May 2023 16:20:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229459AbjECQUx (ORCPT ); Wed, 3 May 2023 12:20:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229506AbjECQUw (ORCPT ); Wed, 3 May 2023 12:20:52 -0400 Received: from www530.your-server.de (www530.your-server.de [188.40.30.78]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89A266E90 for ; Wed, 3 May 2023 09:20:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=geanix.com; s=default2211; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID; bh=1GoopODsvTgG4yhK/ErXIIHntPk72a3taRR/Ug0RtmE=; b=veq33OwustGPuqcUUQQ7jm2eeK VPnwBoCBOXoiWFcQ3qnZ9NWh0w9i8blpPtLw2rl17B8EZbcgZy4jTk/Fk0sFO1UQtWoKXsIsZPMTs r32VuNwMRXsML2sEaq+usgngL+nDPz6wul/S33HSq2Qe1t9InfmcpYKVSOFzG4H9D5oPXtKYg5waL jroOFPZk+2sOO/tr2oCrD0sUzsTP/KsN8hp1IUnHqAGte83nY7BlZLjTJStz2OZHqWWjHyuZqxrev SBzZVfqopD7huXuAjo9XznaoExUF3HRz6Hn1F7lXkWU4cLuls0L/l/e3S8jUc8ZEMIE0WV744U9LR ZkA7/lsQ==; Received: from sslproxy03.your-server.de ([88.198.220.132]) by www530.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1puFDf-000MMN-9B; Wed, 03 May 2023 18:20:43 +0200 Received: from [185.17.218.86] (helo=zen..) by sslproxy03.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1puFDe-000QMl-TC; Wed, 03 May 2023 18:20:42 +0200 From: Sean Nyekjaer To: jic23@kernel.org, olivier.moysan@foss.st.com, alexandre.torgue@foss.st.com, nuno.sa@analog.com Cc: Sean Nyekjaer , linux-iio@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com Subject: [PATCH v3 2/2] iio: adc: stm32-adc: skip adc-channels setup if none is present Date: Wed, 3 May 2023 18:20:29 +0200 Message-Id: <20230503162029.3654093-2-sean@geanix.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230503162029.3654093-1-sean@geanix.com> References: <20230503162029.3654093-1-sean@geanix.com> MIME-Version: 1.0 X-Authenticated-Sender: sean@geanix.com X-Virus-Scanned: Clear (ClamAV 0.103.8/26895/Wed May 3 09:23:02 2023) Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org If only adc differential channels are defined driver will fail with stm32-adc: probe of 48003000.adc:adc@0 failed with error -22 Fix this by skipping the initialization if no channels are defined. This applies only to the legacy way of initializing adc channels. Fixes: d7705f35448a ("iio: adc: stm32-adc: convert to device properties") Signed-off-by: Sean Nyekjaer --- Changes since v1: - Ignore extra channel for timestamps in PIO mode - Use single ended count in channel creation (Thanks Olivier Moysan) Changes since v2: - Avoid calling device_property_read_u32_array with num_se 0 (Thanks Olivier Moysan) drivers/iio/adc/stm32-adc.c | 42 ++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c index 14524c1b5583..f7613efb870d 100644 --- a/drivers/iio/adc/stm32-adc.c +++ b/drivers/iio/adc/stm32-adc.c @@ -2038,6 +2038,7 @@ static int stm32_adc_legacy_chan_init(struct iio_dev *indio_dev, struct stm32_adc_diff_channel diff[STM32_ADC_CH_MAX]; struct device *dev = &indio_dev->dev; u32 num_diff = adc->num_diff; + int num_se = nchans - num_diff; int size = num_diff * sizeof(*diff) / sizeof(u32); int scan_index = 0, ret, i, c; u32 smp = 0, smps[STM32_ADC_CH_MAX], chans[STM32_ADC_CH_MAX]; @@ -2064,29 +2065,32 @@ static int stm32_adc_legacy_chan_init(struct iio_dev *indio_dev, scan_index++; } } - - ret = device_property_read_u32_array(dev, "st,adc-channels", chans, - nchans); - if (ret) - return ret; - - for (c = 0; c < nchans; c++) { - if (chans[c] >= adc_info->max_channels) { - dev_err(&indio_dev->dev, "Invalid channel %d\n", - chans[c]); - return -EINVAL; + if (num_se > 0) { + ret = device_property_read_u32_array(dev, "st,adc-channels", chans, num_se); + if (ret) { + dev_err(&indio_dev->dev, "Failed to get st,adc-channels %d\n", ret); + return ret; } - /* Channel can't be configured both as single-ended & diff */ - for (i = 0; i < num_diff; i++) { - if (chans[c] == diff[i].vinp) { - dev_err(&indio_dev->dev, "channel %d misconfigured\n", chans[c]); + for (c = 0; c < num_se; c++) { + if (chans[c] >= adc_info->max_channels) { + dev_err(&indio_dev->dev, "Invalid channel %d\n", + chans[c]); return -EINVAL; } + + /* Channel can't be configured both as single-ended & diff */ + for (i = 0; i < num_diff; i++) { + if (chans[c] == diff[i].vinp) { + dev_err(&indio_dev->dev, "channel %d misconfigured\n", + chans[c]); + return -EINVAL; + } + } + stm32_adc_chan_init_one(indio_dev, &channels[scan_index], + chans[c], 0, scan_index, false); + scan_index++; } - stm32_adc_chan_init_one(indio_dev, &channels[scan_index], - chans[c], 0, scan_index, false); - scan_index++; } if (adc->nsmps > 0) { @@ -2307,7 +2311,7 @@ static int stm32_adc_chan_fw_init(struct iio_dev *indio_dev, bool timestamping) if (legacy) ret = stm32_adc_legacy_chan_init(indio_dev, adc, channels, - num_channels); + timestamping ? num_channels - 1 : num_channels); else ret = stm32_adc_generic_chan_init(indio_dev, adc, channels); if (ret < 0)