From patchwork Mon Mar 17 15:50:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Vaittinen X-Patchwork-Id: 14019600 X-Patchwork-Delegate: geert@linux-m68k.org Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) (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 81CD918CC10; Mon, 17 Mar 2025 15:50:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742226659; cv=none; b=e52TL+b+ZgKx/bhR6mdMrOAUcCs9L5YsQrvObosRf/ULsrt5fGhmLkjWlHr1bRt0856PDSV7kdxAalWHgTlhXXm6E+trsg6hme7WAtOY/R4cUe6E1hAM9dQS0CV0s1MKeDZpwdE15AD4U4As3WkGzgRtTMqBNdsZTbAxpdYs6yQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742226659; c=relaxed/simple; bh=EYqnE3TxIdwal4Cm/7kgvJ/wHUh9YOULf7xU+ZQ1paA=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=nG/vaiGH8l9q2jIx4yJB2T6JB2w+mIKZgehQbsVFsaCx1cNJVfGGHRw1NzztkZ3gbJ90BEZuIFyyv9uuwmJSjglj1PmS5wuqqd3nrKwpocMCEjROJdvIPzfgzWlJO2Lkh63Z5J2l93wDQbXHgNYbjKPbbtDpRM8Hv9fOH5tcdEw= 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=l9qKlCxg; arc=none smtp.client-ip=209.85.208.169 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="l9qKlCxg" Received: by mail-lj1-f169.google.com with SMTP id 38308e7fff4ca-30bef9b04adso49937181fa.1; Mon, 17 Mar 2025 08:50:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742226656; x=1742831456; 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=ii7b0KSEIGWdGVz920b6yiZTvzIrS7hqW2hr3ua9Jtc=; b=l9qKlCxgeMxrTj2gwhg4WnCqu3N7zSqXMkmM5j6b8Ek0QWsjipJWuMb/Ln+Fw3EDye QFifyDYlIJGaCERKUes56lwiA+ZAFhmpoVEZ4tNoHHZ7/BCOyW923K3+9s+nM9XsNHaw lLtUl+ih1NOsIucz0fO6foGzho0vFIFz2y7+VTz6AImlBBZtKMk3J7PV52nTpOIxELx+ 41YooTbgnv8/hFr4rOKl4TDDAauOWWl98zJ80H29L0icJcVbnmlFQWZAlLRgfb8KbmbT 7yI2QW2tngKLdY7WFgRZDE2n9/XlOZscyYp6RbYuy7h3zo/rj4v8wziK3rfcBUSJNfMM I/vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742226656; x=1742831456; 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=ii7b0KSEIGWdGVz920b6yiZTvzIrS7hqW2hr3ua9Jtc=; b=vDAa/i70f+Mq4MKTby/NyyMUvG9o0+tpq3WiU/ijthKXrvSqQ9nT1laADvNc++r19x RrisPJ1NuWSfTxdDMKryG0SKLI0JfH+vUkMrryRBSydPJADaLwNk2Zd3PCtJ6bwInRUF +us7rrrXXa9GLcuvUtXIsoVlrTl5uLxn7ptsABJUIJbM6ejljKBuyjWm2OfwgIAmrGER LtGmTKsum9XM8C3hKTA4YBTCrLsffKmM/c2d7HqTx744tczU7KtJfLI0npxoy5SH5MpF 7Ld5QguioRjtmJhueQjY+1F7Ke77pAvwuqtQAN8cuVL8479fxMoxdJonfbQPhJYb8LdH jJBw== X-Forwarded-Encrypted: i=1; AJvYcCUXQxXXbpFpsAe79G79Z3NaGwJsu6QnsgAl08GdKwYVTbYacDqLo31rXGYjpWs4AAJGs0T/tB5+/BuT@vger.kernel.org, AJvYcCUwDVtYrry5andfK/IZ7ETm2YHH01RxZ0jcbbkUIssqHg9ffB92GxEiWDuDAM45kWbWxuWXwhgTzD4PGXE9@vger.kernel.org, AJvYcCV8oyGh+68acWo9WVkbCE/WG2vb0mKSeGjbLSM1IOi1PPZgcbGkpiOokx1upJsA8C1EXSTYPZ7+457h4w==@vger.kernel.org, AJvYcCXkOACunYO0wcoPEUMRinhomby4FfhadR3UMmMOE5f7OckTQLYcdKfcoY7lW7FiRE2lMDUJIwDvPKgF@vger.kernel.org, AJvYcCXyhPvSaJEaErY6NeVrm/ADrVGQqHU1KCBSWbsiIvBb2D1MmWHIBIwVKyX48QToj4jiIo1XI59yIdOgSVmTYzE0O8U=@vger.kernel.org X-Gm-Message-State: AOJu0YzFLRBrJSOHQupFLi1ITUvDPA8ih9p2moSA5m2rx4w6HDhqw2Eb ZArJU9yajOx7iCFUy5O+RpY7hM55jP+rVJzMj2cs2x7aqS3XE2T7 X-Gm-Gg: ASbGncvS2fr5uNqSAnNBGBpy7fxOGAVvpuA7Pp8AbQs2c6Y95DhhyCkjo2d8GQQ5aEz plJfXRFyQnbg+EdNMfyMN0r/LCXZw3i+qQg3CQ7xSt+BPtSK+zIJ6dLYKy7QKi/1NbSKTTKz/q+ 6llsiHbyxNqWPnSed0i/FzUW5K1AJhPHYz40S13YE++G21rqkf+3zo5SjboE04Le3NVP5dMA2Cz dOYGeAJFhlxU9uoC30RZdRt4O16PP381kbBZW8DqiqsdKkMwMNR5ZSg66tbWTvedXMy6hy50ZT4 lXYrX38iFOMa7qFPVR0shn8Z/wyEA7yUTI8aABHpoj5BMh4TFbVH2QQQWRdDyA== X-Google-Smtp-Source: AGHT+IEEGvh3xBWemsVzH4wBXP8yRpV5NjdfvJKnT0Q5uYgr5FPXWVoYQ+4hCSjx/lxflCVclNNDFg== X-Received: by 2002:a05:6512:2823:b0:549:8e5d:a84c with SMTP id 2adb3069b0e04-54a03b78224mr236127e87.2.1742226655332; Mon, 17 Mar 2025 08:50:55 -0700 (PDT) Received: from mva-rohm ([2a10:a5c0:800d:dd00:8fdf:935a:2c85:d703]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-549ba864ed4sm1385343e87.128.2025.03.17.08.50.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 08:50:53 -0700 (PDT) Date: Mon, 17 Mar 2025 17:50:49 +0200 From: Matti Vaittinen To: Matti Vaittinen , Matti Vaittinen Cc: Jonathan Cameron , Lars-Peter Clausen , Andy Shevchenko , Matti Vaittinen , Lad Prabhakar , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Hugo Villeneuve , Nuno Sa , David Lechner , Javier Carrasco , Guillaume Stols , 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 v8 03/10] iio: adc: add helpers for parsing ADC nodes Message-ID: References: Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: There are ADC ICs which may have some of the AIN pins usable for other functions. These ICs may have some of the AIN pins wired so that they should not be used for ADC. (Preferred?) way for marking pins which can be used as ADC inputs is to add corresponding channels@N nodes in the device tree as described in the ADC binding yaml. Add couple of helper functions which can be used to retrieve the channel information from the device node. Signed-off-by: Matti Vaittinen Reviewed-by: Andy Shevchenko --- Revision history: v7 => v8: devm_iio_adc_device_alloc_chaninfo_se(): - Treat all negative values for the max ID as 'don't care' - Return -ENOENT instead of '0' if no channels were found. v5 => v6: - Adapt to changed fwnode helper names - Fix spelling v4 => v5: - Inline iio_adc_device_num_channels() - Fix Indenting function parameters - Combine the max channel ID checks. v3 => v4: - Drop diff-channel support - Drop iio_adc_device_channels_by_property() - Add IIO_DEVICE namespace - Move industrialio-adc.o to top of the Makefile - Some styling as suggested by Andy - Re-consider included headers v2 => v3: Mostly based on review comments by Jonathan - Support differential and single-ended channels - Rename iio_adc_device_get_channels() as iio_adc_device_channels_by_property() - Improve spelling - Drop support for cases where DT comes from parent device's node - Decrease loop indent by reverting node name check conditions - Don't set 'chan->indexed' by number of channels to keep the interface consistent no matter how many channels are connected. - Fix ID range check and related comment RFC v1 => v2: - New patch --- drivers/iio/adc/Kconfig | 3 ++ drivers/iio/adc/Makefile | 2 + drivers/iio/adc/industrialio-adc.c | 82 ++++++++++++++++++++++++++++++ include/linux/iio/adc-helpers.h | 27 ++++++++++ 4 files changed, 114 insertions(+) create mode 100644 drivers/iio/adc/industrialio-adc.c create mode 100644 include/linux/iio/adc-helpers.h diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index 849c90203071..37b70a65da6f 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -6,6 +6,9 @@ menu "Analog to digital converters" +config IIO_ADC_HELPER + tristate + config AB8500_GPADC bool "ST-Ericsson AB8500 GPADC driver" depends on AB8500_CORE && REGULATOR_AB8500 diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile index ee19afba62b7..1c410f483029 100644 --- a/drivers/iio/adc/Makefile +++ b/drivers/iio/adc/Makefile @@ -3,6 +3,8 @@ # Makefile for IIO ADC drivers # +obj-$(CONFIG_IIO_ADC_HELPER) += industrialio-adc.o + # When adding new entries keep the list in alphabetical order obj-$(CONFIG_AB8500_GPADC) += ab8500-gpadc.o obj-$(CONFIG_AD_SIGMA_DELTA) += ad_sigma_delta.o diff --git a/drivers/iio/adc/industrialio-adc.c b/drivers/iio/adc/industrialio-adc.c new file mode 100644 index 000000000000..b4057230e749 --- /dev/null +++ b/drivers/iio/adc/industrialio-adc.c @@ -0,0 +1,82 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Helpers for parsing common ADC information from a firmware node. + * + * Copyright (c) 2025 Matti Vaittinen + */ + +#include +#include +#include +#include +#include +#include + +#include +#include + +/** + * devm_iio_adc_device_alloc_chaninfo_se - allocate and fill iio_chan_spec for ADC + * + * Scan the device node for single-ended ADC channel information. Channel ID is + * expected to be found from the "reg" property. Allocate and populate the + * iio_chan_spec structure corresponding to channels that are found. The memory + * for iio_chan_spec structure will be freed upon device detach. + * + * @dev: Pointer to the ADC device. + * @template: Template iio_chan_spec from which the fields of all + * found and allocated channels are initialized. + * @max_chan_id: Maximum value of a channel ID. Use negative value if no + * checking is required. + * @cs: Location where pointer to allocated iio_chan_spec + * should be stored. + * + * Return: Number of found channels on success. Negative value to indicate + * failure. Specifically, -ENOENT if no channel nodes were found. + */ +int devm_iio_adc_device_alloc_chaninfo_se(struct device *dev, + const struct iio_chan_spec *template, + int max_chan_id, + struct iio_chan_spec **cs) +{ + struct iio_chan_spec *chan_array, *chan; + int num_chan, ret; + + num_chan = iio_adc_device_num_channels(dev); + if (num_chan < 0) + return num_chan; + + if (!num_chan) + return -ENOENT; + + chan_array = devm_kcalloc(dev, num_chan, sizeof(*chan_array), + GFP_KERNEL); + if (!chan_array) + return -ENOMEM; + + chan = &chan_array[0]; + + device_for_each_named_child_node_scoped(dev, child, "channel") { + u32 ch; + + ret = fwnode_property_read_u32(child, "reg", &ch); + if (ret) + return ret; + + if (max_chan_id >= 0 && ch > max_chan_id) + return -ERANGE; + + *chan = *template; + chan->channel = ch; + chan++; + } + + *cs = chan_array; + + return num_chan; +} +EXPORT_SYMBOL_NS_GPL(devm_iio_adc_device_alloc_chaninfo_se, "IIO_DRIVER"); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Matti Vaittinen "); +MODULE_DESCRIPTION("IIO ADC fwnode parsing helpers"); diff --git a/include/linux/iio/adc-helpers.h b/include/linux/iio/adc-helpers.h new file mode 100644 index 000000000000..56b092a2a4c4 --- /dev/null +++ b/include/linux/iio/adc-helpers.h @@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* + * The industrial I/O ADC firmware property parsing helpers + * + * Copyright (c) 2025 Matti Vaittinen + */ + +#ifndef _INDUSTRIAL_IO_ADC_HELPERS_H_ +#define _INDUSTRIAL_IO_ADC_HELPERS_H_ + +#include + +struct device; +struct iio_chan_spec; + +static inline int iio_adc_device_num_channels(struct device *dev) +{ + return device_get_named_child_node_count(dev, "channel"); +} + +int devm_iio_adc_device_alloc_chaninfo_se(struct device *dev, + const struct iio_chan_spec *template, + int max_chan_id, + struct iio_chan_spec **cs); + +#endif /* _INDUSTRIAL_IO_ADC_HELPERS_H_ */ From patchwork Mon Mar 17 15:51:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Vaittinen X-Patchwork-Id: 14019601 X-Patchwork-Delegate: geert@linux-m68k.org Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) (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 9C9BA18CC10; Mon, 17 Mar 2025 15:51:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742226672; cv=none; b=V7gFfQ0bc1ewUd8HKc+WONS4D+gLw3mpIMhNxu7lg4U0RdbfFXxdmGhrgW+kN8R6b61OGM9ESWJy+atDgNtL+Jr1msW/+vQqtCEPimrMHfI64nSvYZynlECiv0UH4AtZHMAcU7jDJNiIHBeEv3w939i6Y9lY/XFRIRjqteTivSU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742226672; c=relaxed/simple; bh=nUgF7BpmBFQHlh/SW+L2+6UKfHzhCGfZzOdkk2YYTKU=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=c3Kvjc6SQjfX1VQZ5oTZWrtP7cObxpy933hL7ADT8SBKfklY4yxL1gB2xhmAjhzqGL3TGLC7fNLoTxb5FtMtTWFNL+leFcZ0w1GddpVXmR7+7SSCl7PFYjaV6FpDRp25oSzgxsDmDt9EfnwYcjxamPfXXUzT0XVT6LQyA1gRdbo= 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=KTC17P+O; arc=none smtp.client-ip=209.85.208.176 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="KTC17P+O" Received: by mail-lj1-f176.google.com with SMTP id 38308e7fff4ca-30beedb99c9so41984421fa.3; Mon, 17 Mar 2025 08:51:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742226669; x=1742831469; 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=EUhFMAJ0TI9lHx1fpt2tcoLPC0eRKK/W60iKIY6k6Hk=; b=KTC17P+OKNrQ/GVaXpZd322qsFCIuFQYkkjG50ZVXunKwfbIcfSAx1IGpxWoAMX/dL Nd+O8g4JfRw6ygzlCYPnVKGfl55ILgYvwRDAPD29C0bhiB5mk20Q9+Fp+lGGtmPXQITw MrpczS+zA6F+cX4oP53013033QY1LuHR0H7XqGF15anFMvh21Nc/j+zbHusQHAMse1p8 xKwtTMKM3fOpESUkzXXcbdXhmoI0/GUzZt602pXT4PytjJHLcrCE5/UpU78SS1NkjRfc 0WQhi920dLZLVRafNiP0xNzlESC6/3rGWlIBpf9UAH/megpG+ZXfU8Co0LzMXxfj6sBe 8E6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742226669; x=1742831469; 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=EUhFMAJ0TI9lHx1fpt2tcoLPC0eRKK/W60iKIY6k6Hk=; b=a7XtpemDwPWaezThRfzUFSnXnNz3YLPCvh/45+3hcKFLtDDBOyhuJmGMV480dMcP7C mzWt2zfBpcyW9vY8bjKeW/oZIRJTCfuXJT1hsctyBazuQWQeLB0K41SzHGwZDE6VMoTt tet+6bq3Q1JmAFu/11D0unTu+8ZKshjLSEmhHd9cV8y0vfU5sBTypbnKc0qAe5N3RzWG DsYDpJUZ45gZ7LZ2RCDuAkpOjSpbuIxnNf/nezVDp+Ag2zRmVKFq9ltTgl03IJRIZepD WrpOv0BJr2/kYR4D8usNafkEjRKQHevwJf3d7TenK0cmms5McgH0cnQeNBZXnGys5zE9 Ae7g== X-Forwarded-Encrypted: i=1; AJvYcCULvJw9gkgShALOUPiRD3Lijbtq5fivsVNMD/sxuPkFdSANVBWxAqi4Nbh5w6Lb8r4cod7waalIGu8=@vger.kernel.org, AJvYcCVj+KUzGFEo7qicXWaw0jrHytVmFrrlu6dd6W8knFmrUV5aP8R6xGf2THhOb6121xQ7MYYn+EPzxVdKn6fp@vger.kernel.org, AJvYcCVo/PFDq25sKo2SZsZdXlVLfSz9UUcJR1tK9vMWorVdcvXRUzEfg+Vgc7DHfmpsYct1U1aIQnGbrKl8os2SHc8Wylk=@vger.kernel.org X-Gm-Message-State: AOJu0YwglNquTiXEVs1z9V1TCjSeIiq/wFDgr3i/cbG/d+DO5brCcGLH PP4Vyt/h0RpDwaLHlF8LOHUoSWr3oLWSilwEpMA8VtqukRacz/BK+OD46A== X-Gm-Gg: ASbGncug/mBdKwwT2C4qyuOT/HKz9CJhEK/caBB7BwMrdlAjGs2YdXkQwKYUFCkLdn5 7wGO84dS69H8LefpG3U7kCLsycxj+GhT07v50HjqMta43PhCtgXFqW77ej01fFzPRx75DV7m6v6 ksBPJ8cS6Z/3Yq+s6lxRKb6ElALSScEvDlvGps2lG8gETdOCQsovXnjoyoZFsX41ruja4GaX6vd 4uHUNYkswtG3hiwABv1j5eOl9Kcuv0KJW6tRLxDX7o/fDGLZfywuqcU6WzFntsDLRcGZL+YAtaf xkB6Ns1cOG/nLGGDsyVS/jecLxwFwNUBTBnop/tTGksZQJcFi6A= X-Google-Smtp-Source: AGHT+IH9c4A6bdrRvvLHiVn+XSUiasQ49Prj2rnL8yMEX2EWx71QX8CVsgo36CW+3qbuUR/wlFX5ig== X-Received: by 2002:a05:6512:138a:b0:545:2efc:7458 with SMTP id 2adb3069b0e04-54a03cf4e09mr321289e87.39.1742226668289; Mon, 17 Mar 2025 08:51:08 -0700 (PDT) Received: from mva-rohm ([2a10:a5c0:800d:dd00:8fdf:935a:2c85:d703]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-549ba88213esm1352414e87.175.2025.03.17.08.51.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 08:51:07 -0700 (PDT) Date: Mon, 17 Mar 2025 17:51:02 +0200 From: Matti Vaittinen To: Matti Vaittinen , Matti Vaittinen Cc: Jonathan Cameron , Lars-Peter Clausen , Matti Vaittinen , Lad Prabhakar , Chen-Yu Tsai , David Lechner , Javier Carrasco , Guillaume Stols , Olivier Moysan , Dumitru Ceclan , Trevor Gamblin , Matteo Martelli , Alisa-Dariana Roman , Andy Shevchenko , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: [PATCH v8 04/10] iio: adc: rzg2l_adc: Use adc-helpers Message-ID: <69b627227e675d94c27f42783d7cf9ada93f730b.1742225817.git.mazziesaccount@gmail.com> References: Precedence: bulk X-Mailing-List: linux-renesas-soc@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_se() -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" -properties to channel identification numbers, used in the struct iio_chan_spec. Furthermore, the helper can optionally check the found channel IDs are smaller than given maximum. This is useful for callers which later use the IDs for example for indexing a channel data array. 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 rzg2l_adc's compatible string didn't reveal any in-tree .dts with channel nodes named otherwise. Also, same grep shows all the .dts seem to have channel IDs between 0..num of channels. Use the new helper. Signed-off-by: Matti Vaittinen Reviewed-by: Andy Shevchenko --- NOTE: This change now drops a print "no channel children" which used to be printed if no channel nodes were found. It also changes the return value from -ENODEV to -ENOENT. Revision history: v7 => v8: - drop explicit "no channels check". It is now done inside the devm_iio_adc_device_alloc_chaninfo_se(). v6 => v7: - Fix function name in the commit message v5 => v6: - Commit message typofix v4 => v5: - Drop the diff-channel stuff from the commit message v3 => v4: - Adapt to 'drop diff-channel support' changes to ADC-helpers - select ADC helpers in the Kconfig - Rebased to 6.14-rc3 => channel type can no longer come from the template. v2 => v3: - New patch The change is compile tested only!! Testing before applying is highly appreciated (as always!). --- drivers/iio/adc/Kconfig | 1 + drivers/iio/adc/rzg2l_adc.c | 39 +++++++++++++++---------------------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index 37b70a65da6f..e4933de0c366 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -1222,6 +1222,7 @@ config RICHTEK_RTQ6056 config RZG2L_ADC tristate "Renesas RZ/G2L ADC driver" depends on ARCH_RZG2L || COMPILE_TEST + select IIO_ADC_HELPER help Say yes here to build support for the ADC found in Renesas RZ/G2L family. diff --git a/drivers/iio/adc/rzg2l_adc.c b/drivers/iio/adc/rzg2l_adc.c index 883c167c0670..8097e59da516 100644 --- a/drivers/iio/adc/rzg2l_adc.c +++ b/drivers/iio/adc/rzg2l_adc.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -324,48 +325,39 @@ static irqreturn_t rzg2l_adc_isr(int irq, void *dev_id) return IRQ_HANDLED; } +static const struct iio_chan_spec rzg2l_adc_chan_template = { + .indexed = 1, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), +}; + static int rzg2l_adc_parse_properties(struct platform_device *pdev, struct rzg2l_adc *adc) { const struct rzg2l_adc_hw_params *hw_params = adc->hw_params; struct iio_chan_spec *chan_array; struct rzg2l_adc_data *data; - unsigned int channel; int num_channels; - int ret; u8 i; data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); if (!data) return -ENOMEM; - num_channels = device_get_child_node_count(&pdev->dev); - if (!num_channels) - return dev_err_probe(&pdev->dev, -ENODEV, "no channel children\n"); + num_channels = devm_iio_adc_device_alloc_chaninfo_se(&pdev->dev, + &rzg2l_adc_chan_template, + hw_params->num_channels - 1, + &chan_array); + if (num_channels < 0) + return num_channels; if (num_channels > hw_params->num_channels) return dev_err_probe(&pdev->dev, -EINVAL, "num of channel children out of range\n"); - chan_array = devm_kcalloc(&pdev->dev, num_channels, sizeof(*chan_array), - GFP_KERNEL); - if (!chan_array) - return -ENOMEM; + for (i = 0; i < num_channels; i++) { + int channel = chan_array[i].channel; - i = 0; - device_for_each_child_node_scoped(&pdev->dev, fwnode) { - ret = fwnode_property_read_u32(fwnode, "reg", &channel); - if (ret) - return ret; - - if (channel >= hw_params->num_channels) - return -EINVAL; - - chan_array[i].type = rzg2l_adc_channels[channel].type; - chan_array[i].indexed = 1; - chan_array[i].channel = channel; - chan_array[i].info_mask_separate = BIT(IIO_CHAN_INFO_RAW); chan_array[i].datasheet_name = rzg2l_adc_channels[channel].name; - i++; + chan_array[i].type = rzg2l_adc_channels[channel].type; } data->num_channels = num_channels; @@ -626,3 +618,4 @@ module_platform_driver(rzg2l_adc_driver); MODULE_AUTHOR("Lad Prabhakar "); MODULE_DESCRIPTION("Renesas RZ/G2L ADC driver"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS("IIO_DRIVER"); From patchwork Mon Mar 17 15:51:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Vaittinen X-Patchwork-Id: 14019602 X-Patchwork-Delegate: geert@linux-m68k.org Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) (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 2B44217A2F7; Mon, 17 Mar 2025 15:51:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742226706; cv=none; b=J9HfEbgP4Pfllad/wzsmXdFUtJqTiWkIIomS3QdLDOsc+XKXrt0OR5rG0qqFFdc+UdNvcox5VVtj/AchxzEjteSkUX/6Dgx3JbTO+/SrClRw+7MyQ1WKaxjc0EMpmu5eji17OlNuxPrJUl6u6p7c26F8G8CjAm2aifNfgKtTRtg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742226706; c=relaxed/simple; bh=Oh4plqYxXdIyOPcR3vPrbHY1zS/ykJMjhXiKqSvBciA=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=SRTfUHsTCmAR7ol7H/59VNSGtq7H/IiVj8XGHcC4CNaG9WDkdFUXY/R52pf4d7zG1XaDJ2U+d4WGhx4RE8lMyzJ2N98mmzVm2TxCWfDU45FLdGwUcBuULdw29D7anzFE86rYit1Gz1ei8zoI3XjPQd4tbWI9ho7t6e6DMkm/bhQ= 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=WpbREVpm; arc=none smtp.client-ip=209.85.167.43 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="WpbREVpm" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-5497e7bf2e0so5374022e87.3; Mon, 17 Mar 2025 08:51:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742226703; x=1742831503; 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=qZp/H4slk78IiHDNm1oAqEElmdRePMABQQlvBKJ8MF4=; b=WpbREVpmXgbbijTHnVguMNmQgYIWTmFFWz6yLZuMu0saFN/NOglvPJbideqI38IHtH i9z331/tfhnXmNoVRsyn66u7vIurRPWefy9wHJqbXwtLKbxuKBwM1nqFoswg6HwR8IjE WrQBiPUdgZfpr8QQpVcOrQuWVjFzWhe81yrEAu29cBvsXsvH8oKIcL5JED4xaxtuR9XF vyCqvEnT8SVIN5eNOo79W30Szj005nG/FyUDcUg50LiKuu/JizflgsHsScxaD7ioCwxs lMUBUJijwc8rgSSoofwRK2BVeMxgQ3c6ghalb+uyFVDs2/R3LwN37zaLvhhBNSlPmwoB Fyvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742226703; x=1742831503; 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=qZp/H4slk78IiHDNm1oAqEElmdRePMABQQlvBKJ8MF4=; b=E/IX9iZyecNwTp0OtsBZG/sj09TXTVHrRrQm3+l9RUs4KQonYYDg5nvcMQdq2CQZm0 rOfRlSpAZUEPg3uBjFQTFANB6sybQFnVnWuVu8djcBs7h3Wsd1u9TIp+vbngg3hyUOEC WB5I52QclD9czrBH5+69IdYn0oua52///6UZ04TWDjrPW+eA+ks/NW2C3r4sKlbATcJu aWtSwfdCgCnBhRBeOUFuz3RT2DhFBX2GiVzE6PckpjzMvfFZchtWB3cu1/xviFukZIlG h1qdWBwhbRwMOD7Sp4UI1ciHHd5uEkkkEj+QOJtZ1gJwf1dllF1uGHvKeArDSrIvEO1p s6/w== X-Forwarded-Encrypted: i=1; AJvYcCU5E3GC92l/B+CvUWXE2jd/yyK9h4RRvvMADoFQs7etC1HVHFozARodSPFTyBdKpBlozlb3/g0K5dVAmCJT@vger.kernel.org, AJvYcCVCqWX0GwfphjSP6j6BEER8X+kl6lLMvP4OHnJwG4PJ/8PaUZDYZ6o6sIMZh+8td0BDygG0Ctt8IaGk@vger.kernel.org, AJvYcCVNxNXnNRjaUX7A8KgfsEuS9dnoIDf6v6rh+9w6IczP+XXWs1SwGCYkBIRAi2srf4SowdSZjVk4IXb1jhRYCN6koGM=@vger.kernel.org, AJvYcCVXfAMe0Mah0V4RJ5zOdaodx1M/T1Zx33fyW1sWz5FSmCDH8oEVz0HlTdQltHNerObsVcJngj+6/tUR@vger.kernel.org, AJvYcCW7gqIM0e1Aak9W+9XCRJtHFIlHM2DGfkwlvJikGxM/VVEvHrxrcXpYxT258EVuEg77Idt9kId1onyEYA==@vger.kernel.org X-Gm-Message-State: AOJu0YxDoZ9Vcjh4c/4/pTJc8OAsAqpqMgvhfVRbJzZikCGz09VWH0US uZVpBTllc+jlUDOzfOJTtuXNNoJVC3y8Ehc2vkTAnBNjRsm+RUOK X-Gm-Gg: ASbGnctvGi1Ok0LScur9brU74XFp5rICw0LwcL959Loodydb0O8vYc+fFzDKsCn8r5s j9/zywksUCy3lqUG/wG1C1RkX1ScCZV+JF70J1C2b60w29pXrmUbjrl/CgCPLIVcTncIA0/Lu6I dKoaQ+wdNm3bIUt5hjNA6BqmjcN6HFCRRy7IvIp3brQsebBwgnYZvAvvjuj0OVd5yorLaORpCne RsxwJC9wpbDWtlqrcsmBPcbvxA+V8AKwdN7+raQvwOm1lzRkA/TcKnEfrca/fpWrpKfTtbRfW/i PXoMaQBY/1VxvIzMRRSttrpSZJMNIxV75gPUrPEJYog3LyNyQgDPVGYWZxaQ8g== X-Google-Smtp-Source: AGHT+IGvE83lD5O75qXN7tU8+BEUTnVmyQ+DR7gPnljh2efy53y9OxWZRbn1FAQt9KPWJXz11ev7ZQ== X-Received: by 2002:a05:6512:398a:b0:545:2335:6597 with SMTP id 2adb3069b0e04-54a03d02bcfmr277694e87.50.1742226703043; Mon, 17 Mar 2025 08:51:43 -0700 (PDT) Received: from mva-rohm ([2a10:a5c0:800d:dd00:8fdf:935a:2c85:d703]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-549ba7c0a39sm1359539e87.65.2025.03.17.08.51.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 08:51:42 -0700 (PDT) Date: Mon, 17 Mar 2025 17:51:38 +0200 From: Matti Vaittinen To: Matti Vaittinen , Matti Vaittinen Cc: Jonathan Cameron , Lars-Peter Clausen , Andy Shevchenko , Matti Vaittinen , Lad Prabhakar , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Hugo Villeneuve , Nuno Sa , David Lechner , Javier Carrasco , Guillaume Stols , 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 v8 07/10] MAINTAINERS: Add IIO ADC helpers Message-ID: References: Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Add undersigned as a maintainer for the IIO ADC helpers. Signed-off-by: Matti Vaittinen --- Revision history: v2 => - No changes RFC v1 => v2: - New patch --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 8e0736dc2ee0..5b96fb864227 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11208,6 +11208,13 @@ L: linux-media@vger.kernel.org S: Maintained F: drivers/media/rc/iguanair.c +IIO ADC HELPERS +M: Matti Vaittinen +L: linux-iio@vger.kernel.org +S: Maintained +F: drivers/iio/adc/industrialio-adc.c +F: include/linux/iio/adc-helpers.h + IIO BACKEND FRAMEWORK M: Nuno Sa R: Olivier Moysan