From patchwork Mon Feb 24 18:33:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Vaittinen X-Patchwork-Id: 13988750 Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6E1FE264FBA; Mon, 24 Feb 2025 18:33:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740422036; cv=none; b=ZDq3g2zJzavvs3SskNMTdsaNQZ7hyUyXr5mNJktAL+If4cX0tKfvlnyl3/X79Wq9Vv+48g+uqtSuB0QODfv+xJ6tob5hcJD+ksfR3H6r5mQ5xDoaV3D5WSIhEleyqsHCZj8IoXC/oHUovmSRdtGNR148GDC/e0Ns8URicM5d7kY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740422036; c=relaxed/simple; bh=DNgabINj0/zQQQgszmslDd1ZCNia1KB91/1Io5eaLn4=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=tn2i/f45/s6SKBEev5kqMumxCnSn5T0nL8Vd+7xYr4z61wKHGNf1MymoLFHuO7KIduJVvqOT826TZpLBIKNbYGlacRuZ6pGNCCFwMem81+Og1MGLEZrYTz10a7g/GkH8h67w5cqAbFMsc2xJfdYmlsVYADxE76joqVkuExDUalg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=FwgRMwzj; arc=none smtp.client-ip=209.85.167.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FwgRMwzj" Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-5484fa1401cso566361e87.1; Mon, 24 Feb 2025 10:33:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740422032; x=1741026832; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=heP8tu0ZCh/Rz+nsytMurli7kJvo4BfOkz2KYfukdDQ=; b=FwgRMwzjy1EpQ8sXOLa6AY4mHd3IpTyx5B7lDDfClEoTyLS48wnGm3ttoLgPkcbH03 PUrIjIoZWsPlSboFKAoS5qtl7R/Jc4CdxTSSsqZMXY5pRI7/I8Ym54B6g9Zoc/ZmcoPR XOaC32nkbQtaMN3rHcWPOB9x9/HSN2lAbItmC/OWIpopC5rP2Vi+C5U5Eb98pTHNf2J1 O+iF5GyaK1dHS7mlRHU5+sz4hrP/5qMAEpQQbaLVbcSPM3QediW3L3/N+NdEnk/3nI+1 9oFijGi3QOS52LIz1PIRG/Bq1JeEVXdzCLancJ7mxbF4K9r+ujAKzwH2T+8Sp02/Eoff zaFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740422032; x=1741026832; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=heP8tu0ZCh/Rz+nsytMurli7kJvo4BfOkz2KYfukdDQ=; b=UU7ZYkxfjgj0zHHUcWqJt4h0CqEp+qic9nb5dKr9Lsb/A3D2pg9ISigelbNFQ7gWNz vOpDNdMvZj/Qj4YLpJPvS7KCOYn7J3K8CnU9FegWucmDH1XkY2oiVhvf4bkwuPALj550 ymSGdJZbc1TmwHv/czTT/Q+AMGkGzzYpIqxqH3OaZoGV894Flzkx99IxUJj+BBJKxJ++ DZKV1Rk68GpDTskP4qIqSREdZ1qNeqIm7+xBde39TCYyjs8twKf525k6pwdxojqEyWCA yQNBIKD6uHCzSjOM3SrwF3ajlc53GgOLetHnWWKlhRfuF1hFWYO3SurdLTxHSW/xXy40 4lIw== X-Forwarded-Encrypted: i=1; AJvYcCU0ctX/dzHIfPn5P9oPIzLC4W7SypF7e+oUAHzZoPPPZDSgPd40AQ1rLmKDFNxiDSFhk5eH/o2z0CDLefvy+Rxx+Oo=@vger.kernel.org, AJvYcCVIP7ELy3RksMdsTJXno1ehtPUGTrxj9Wcy53d/R9vexnBxqSkTGwkBwOjNrPRlyD6AD7EbgxJ2jAHj@vger.kernel.org, AJvYcCVPi2WhMijv9xkcWSd4fkzZJ7Mz6dRdyj7yBI6XzNTv6YO4DjxShYXBYq4nCisuFIGdNOmARVzEnQ52@vger.kernel.org, AJvYcCW0hynL6adio0APsPAS7Xqe6D3+ffYbsW7uM0rPbqQNKUN7Pd64PakkMu3re0OZ4czzzutPTw7cmxCz2g==@vger.kernel.org, AJvYcCXUKBHL3i7GuKmMPAqGK/kiLpv0n/SwvsXlVKKajWlcywmBvuB1iYtJfJykyXikKW6lbxz8C0mjnIC8DMCc@vger.kernel.org X-Gm-Message-State: AOJu0YwmnSJAgpC/f/G9Qrtq2lGP7XAyCK2lrWQtKiP7nJ66BH1xEgdx VBxqef/UPRujDAS35Rzad31LhqHR0g3+b1MuZdJsmUorJBX968P/ X-Gm-Gg: ASbGncsRYxTQixg3Fzv+JbhMi7cvtES/zHSS1mSsucCOK5YAnRM60hYqMErI0y25Qzb ioTFosb5wrSjRYGOocgDmKuHl4z4GXguRVoPKQyU2Y5hEsiz9/F/8TI/JGF/AhOj5G3DVR9J6Jk DyL9op5/bKXolV0uwYLhXs0BpZc9FfshZIadEdXsCm4wNrCXCZO2HOyiV2Ig/kMUALq6ypXaees xwl6uQZ+XvcSPePddp4oqpR96BHzjxcBRqzko2gQDazSqxiiTj7DbAYKfyBgzoC5ZnHkSe1akmL 9+vzvfsdj6lUaWKoMVpcTGn6Sd6XcQCg X-Google-Smtp-Source: AGHT+IEPWpkUpgPr0eB/Achjr7Rn3Tb0Ji8xC1A5AEo/ZmVuif3jXu4CrP1IlCZOVmjDn2HsR2pkFg== X-Received: by 2002:a05:6512:280b:b0:545:1e2d:6b8e with SMTP id 2adb3069b0e04-54838f4ee02mr4841783e87.42.1740422032277; Mon, 24 Feb 2025 10:33:52 -0800 (PST) Received: from mva-rohm ([2a10:a5c0:800d:dd00:8fdf:935a:2c85:d703]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5452e4b08dasm3063356e87.87.2025.02.24.10.33.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 10:33:51 -0800 (PST) Date: Mon, 24 Feb 2025 20:33:46 +0200 From: Matti Vaittinen To: Matti Vaittinen , Matti Vaittinen Cc: Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich , Matti Vaittinen , Lad Prabhakar , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Hugo Villeneuve , Nuno Sa , David Lechner , Javier Carrasco , Guillaume Stols , Olivier Moysan , Dumitru Ceclan , Trevor Gamblin , Matteo Martelli , Alisa-Dariana Roman , Ramona Alexandra Nechita , AngeloGioacchino Del Regno , linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev Subject: [PATCH v4 05/10] iio: adc: sun20i-gpadc: Use adc-helpers Message-ID: References: Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: The new devm_iio_adc_device_alloc_chaninfo() -helper is intended to help drivers avoid open-coding the for_each_node -loop for getting the channel IDs. The helper provides standard way to detect the ADC channel nodes (by the node name), and a standard way to convert the "reg", "diff-channels", "single-channel" and the "common-mode-channel" to channel identification numbers used in the struct iio_chan_spec. Furthermore, the helper checks the ID is in range of 0 ... num-channels. The original driver treated all found child nodes as channel nodes. The new helper requires channel nodes to be named channel[@N]. This should help avoid problems with devices which may contain also other but ADC child nodes. Quick grep from arch/* with the sun20i-gpadc's compatible string didn't reveal any in-tree .dts with channel nodes named othervice. Also, same grep shows all the in-tree .dts seem to have channel IDs between 0..num of channels. Use the new helper. Signed-off-by: Matti Vaittinen --- Revision history: v3 => v4: - Adapt to 'drop diff-channel support' changes to ADC-helpers - select ADC helpers in the Kconfig v2 => v3: - New patch I picked the sun20i-gpadc in this series because it has a straightforward approach for populating the struct iio_chan_spec. Everything else except the .channel can use 'template'-data. This makes the sun20i-gpadc well suited to be an example user of this new helper. I hope this patch helps to evaluate whether these helpers are worth the hassle. The change is compile tested only!! Testing before applying is highly appreciated (as always!). Also, even though I tried to audit the dts files for the reg-properties in the channel nodes, use of references didn't make it easy. I can't guarantee I didn't miss anything. --- drivers/iio/adc/Kconfig | 1 + drivers/iio/adc/sun20i-gpadc-iio.c | 38 ++++++++++++------------------ 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index e4933de0c366..0993008a1586 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -1357,6 +1357,7 @@ config SUN4I_GPADC config SUN20I_GPADC tristate "Allwinner D1/T113s/T507/R329 and similar GPADCs driver" depends on ARCH_SUNXI || COMPILE_TEST + select IIO_ADC_HELPER help Say yes here to build support for Allwinner (D1, T113, T507 and R329) SoCs GPADC. This ADC provides up to 16 channels. diff --git a/drivers/iio/adc/sun20i-gpadc-iio.c b/drivers/iio/adc/sun20i-gpadc-iio.c index 136b8d9c294f..bf1db2a3de9b 100644 --- a/drivers/iio/adc/sun20i-gpadc-iio.c +++ b/drivers/iio/adc/sun20i-gpadc-iio.c @@ -15,6 +15,7 @@ #include #include +#include #include #define SUN20I_GPADC_DRIVER_NAME "sun20i-gpadc" @@ -149,37 +150,27 @@ static void sun20i_gpadc_reset_assert(void *data) reset_control_assert(rst); } +static const struct iio_chan_spec sun20i_gpadc_chan_template = { + .type = IIO_VOLTAGE, + .indexed = 1, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), +}; + static int sun20i_gpadc_alloc_channels(struct iio_dev *indio_dev, struct device *dev) { - unsigned int channel; - int num_channels, i, ret; + int num_channels; struct iio_chan_spec *channels; - num_channels = device_get_child_node_count(dev); + num_channels = devm_iio_adc_device_alloc_chaninfo_se(dev, + &sun20i_gpadc_chan_template, -1, &channels); + if (num_channels < 0) + return num_channels; + if (num_channels == 0) return dev_err_probe(dev, -ENODEV, "no channel children\n"); - channels = devm_kcalloc(dev, num_channels, sizeof(*channels), - GFP_KERNEL); - if (!channels) - return -ENOMEM; - - i = 0; - device_for_each_child_node_scoped(dev, node) { - ret = fwnode_property_read_u32(node, "reg", &channel); - if (ret) - return dev_err_probe(dev, ret, "invalid channel number\n"); - - channels[i].type = IIO_VOLTAGE; - channels[i].indexed = 1; - channels[i].channel = channel; - channels[i].info_mask_separate = BIT(IIO_CHAN_INFO_RAW); - channels[i].info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE); - - i++; - } - indio_dev->channels = channels; indio_dev->num_channels = num_channels; @@ -271,3 +262,4 @@ module_platform_driver(sun20i_gpadc_driver); MODULE_DESCRIPTION("ADC driver for sunxi platforms"); MODULE_AUTHOR("Maksim Kiselev "); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS("IIO_DRIVER");