From patchwork Mon Feb 24 18:32:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Vaittinen X-Patchwork-Id: 13988795 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3D667C021A4 for ; Mon, 24 Feb 2025 18:40:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=N39GuLsH/GHnLWfi6A3DaLvaYCvcqGiUvrrDOML07K8=; b=TpyGZx6+KYryswqKxSR3AJICIq ChrONiovO878Mqu3kUJRZWV/EexyDvYrA7FgXLeDcd7r7VZ6lEoaKv7uScfNLvoLTotz6AlsnRCp3 DMiObVzpeCK1Qh3b/QVJQWgV/RthF3SjcYpUTi/FIAZQB9ZabqvDmkQpbXB9Z3aXMIa+it5ziDOwg kq2Gy45VwuzESTK48akMWb+jjLXJdxZm2Bu8w6kz1cKASA0CE0NUaDykP8p0d2/t+97ErKVJ0Fq4w TkRhVrP6IIoHwhU/zu0YnRa+4KiWPmptIRg55f0vBN1pynq88FeIR1k3TfCrHg2QHlgCJWdOIQYYi MkH+P3ZA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tmdN5-0000000Er1b-0tyV; Mon, 24 Feb 2025 18:40:03 +0000 Received: from mail-lf1-x134.google.com ([2a00:1450:4864:20::134]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tmdFu-0000000Eort-1olt for linux-arm-kernel@lists.infradead.org; Mon, 24 Feb 2025 18:32:39 +0000 Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-54605bfcc72so6517271e87.0 for ; Mon, 24 Feb 2025 10:32:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740421956; x=1741026756; darn=lists.infradead.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=N39GuLsH/GHnLWfi6A3DaLvaYCvcqGiUvrrDOML07K8=; b=AiLwS6Jr9o7OBQY4Rbk4YtHwP2HVsyNfQqP+v04WWiMc7/AftD0P/1MEQco5UdUAMv LpVqav2xx1dV6LxvMKe+RyQ11lkyMD1G35Kc6HBM124ItGECWMn+lPObiD2gP5cSPMqs ayrR+Zpe5PivavMY930TVsv4L5fVI2NwLLOpYHWRG8UvBwWvxp2iWZwx/JWNDbOkxbsj pwAQp7JOspw2ZTTTAXkQBP5KIZ8FFEUXtjMulEJk/B7nYCioq0fbLjF8mS29g+2xBzEs kMnUrTwmHqGlcBQrsCFJ5SyFHtnSyFV6haES9EgN+PpYjAuj2PxWcCFhWEEpMx5cFRbS ymeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740421956; x=1741026756; 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=N39GuLsH/GHnLWfi6A3DaLvaYCvcqGiUvrrDOML07K8=; b=VtV0zgCjjn32AaG0kcj/F7XBlgDkPQ5nLT1fFO0Me90GJcmSBBMH1jvKm465R8wZcS 6+BDcge1LlP+vO3dUzysQJTl3DdQVSIAnN+5/UqJmpscmN+Rw/nDco2Cyqwy1VUYoRRb xA1FSdFX5FV2CvrYKZRChL/l6bc86rTiXq6bBx0Nddx9UrSL1m1ihhgqdsScu6QTr7Rc AcvLczqjnhz15YuA+dBGn5mKp6GUOejsZc/ud9l0N661mQiqlt6zj9ijOF4abwir9IiI 0Z3kYm5vlPKNahSLlzfLKwBS01hIF2TQAA+ab5X7wl6KeICjxqd5AHW7PDUrQ3xyqVyO jo9Q== X-Forwarded-Encrypted: i=1; AJvYcCWQt4sgNYyvwQaV4KdQbNlGnkbLb9DHYRR9deBBjqYNPYpLUdAl1xO2a3PvIdX9jV76g2mbC1IHjPyyWiUkQa7u@lists.infradead.org X-Gm-Message-State: AOJu0YzMOP0+GqDbMkePFup8cU/HV4b9uS1ZCrH3an9MOCs2CkMp8jq3 V9Z9ACHtEAcNRkYYRIFzFEf0x6y/FkRVOUDpM294njGuLeeX6yOd X-Gm-Gg: ASbGncuFI4EeMMRhdWwxuEsGsemXFA2KXC5TJ8zX41y9IUY94Drb435nYWz03qWwfS+ 2F3DO7iwyycObecVrUIER/K6u+YNpKdKD+rae1BAkSk58o3Hn0k8NdjUXj0kxzOo7Xi/6VDdsEx tXzqoo66nI6or1QZ168GxLsSBfrYM0g9uo7wofl8YYi1mSpZ1JRhUKIjQLSBwZ2hC/0/ySP6KVA rFDvMLNx2x+eHHjGKP/EiDhkfvLFzpB9RdzfDtXMayEU9Uuq3Mxlw8DWC5J/AOkeCqRWs7S8Si9 ftg7mqRpR+9caauBhmNr14zIFeKUVaYq X-Google-Smtp-Source: AGHT+IGuoaXIvmZgefmGuVB5f6nZE8zpUKpcTq1FcueeKygwj6PXc2F3VGYVqvK8LafWdWjrrE8P6g== X-Received: by 2002:a05:6512:159b:b0:545:fdd:9ef4 with SMTP id 2adb3069b0e04-54838c5e1bfmr4544720e87.8.1740421956169; Mon, 24 Feb 2025 10:32:36 -0800 (PST) Received: from mva-rohm ([2a10:a5c0:800d:dd00:8fdf:935a:2c85:d703]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54771f058casm1259809e87.188.2025.02.24.10.32.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 10:32:34 -0800 (PST) Date: Mon, 24 Feb 2025 20:32:29 +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 01/10] dt-bindings: ROHM BD79124 ADC/GPO Message-ID: <4d390ca96434a8ee35c0c850cfe4fd49e99db653.1740421248.git.mazziesaccount@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250224_103238_481673_9EC6E6F0 X-CRM114-Status: GOOD ( 14.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add binding document for the ROHM BD79124 ADC / GPO. ROHM BD79124 is a 8-channel, 12-bit ADC. The input pins can also be used as general purpose outputs. Signed-off-by: Matti Vaittinen Reviewed-by: Conor Dooley --- Revision history: v2 => v3: - Restrict channel numbers to 0-7 as suggested by Conor RFC v1 => v2: - drop MFD and represent directly as ADC - drop pinmux and treat all non ADC channel pins as GPOs --- .../bindings/iio/adc/rohm,bd79124.yaml | 114 ++++++++++++++++++ 1 file changed, 114 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/rohm,bd79124.yaml diff --git a/Documentation/devicetree/bindings/iio/adc/rohm,bd79124.yaml b/Documentation/devicetree/bindings/iio/adc/rohm,bd79124.yaml new file mode 100644 index 000000000000..503285823376 --- /dev/null +++ b/Documentation/devicetree/bindings/iio/adc/rohm,bd79124.yaml @@ -0,0 +1,114 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/iio/adc/rohm,bd79124.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: ROHM BD79124 ADC/GPO + +maintainers: + - Matti Vaittinen + +description: | + The ROHM BD79124 is a 12-bit, 8-channel, SAR ADC. The ADC supports + an automatic measurement mode, with an alarm interrupt for out-of-window + measurements. ADC input pins can be also configured as general purpose + outputs. + +properties: + compatible: + const: rohm,bd79124 + + reg: + description: + I2C slave address. + maxItems: 1 + + interrupts: + maxItems: 1 + + gpio-controller: true + + "#gpio-cells": + const: 1 + description: + The pin number. + + vdd-supply: true + + iovdd-supply: true + + "#address-cells": + const: 1 + + "#size-cells": + const: 0 + +patternProperties: + "^channel@[0-7]+$": + type: object + $ref: /schemas/iio/adc/adc.yaml# + description: Represents ADC channel. + + properties: + reg: + description: AIN pin number + minimum: 0 + maximum: 7 + + required: + - reg + + additionalProperties: false + +required: + - compatible + - reg + - iovdd-supply + - vdd-supply + +additionalProperties: false + +examples: + - | + #include + #include + i2c { + #address-cells = <1>; + #size-cells = <0>; + adc: adc@10 { + compatible = "rohm,bd79124"; + reg = <0x10>; + + interrupt-parent = <&gpio1>; + interrupts = <29 8>; + + vdd-supply = <&dummyreg>; + iovdd-supply = <&dummyreg>; + + #address-cells = <1>; + #size-cells = <0>; + + channel@0 { + reg = <0>; + }; + channel@1 { + reg = <1>; + }; + channel@2 { + reg = <2>; + }; + channel@3 { + reg = <3>; + }; + channel@4 { + reg = <4>; + }; + channel@5 { + reg = <5>; + }; + channel@6 { + reg = <6>; + }; + }; + }; From patchwork Mon Feb 24 18:32:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Vaittinen X-Patchwork-Id: 13988799 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 49354C021BB for ; Mon, 24 Feb 2025 18:41:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=SSOud79Vzi0uiSwrFzUVnpNiszCNIWd+xmMcmCt0CGY=; b=NDX1QIi/WAec2tVZljIy0eE+q5 DnTOgiG/AKni//TT7FpWZHy7HVJ+CcjEjSSKMq2KlMoDP5+gukPw1pZB0mVLtKRLK3rgvDUsDMIlF aggvmItsW7oh8tbhzYVBX5EZbPt+ZaAyvq0qN/sEFaNOXu8t19PtIkkaZay7NEtb3xqWri0Vi0AoY q1DoIuIrKDxobw4c+iiAMbVJQX3WkQ55QqUwiNHXsiimn9HsWvcxJfObH/gOzrb3SHUeZF6c1rSgl hXyFPAXEuQus4vtSVpX2pf5YtGQwq3/Y7W39Tjs0Q4dGhHd/9+jVnvJ2CTMYZJddV6VlSSYlkEClB 3Fp+VRRQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tmdOY-0000000ErKG-0EHs; Mon, 24 Feb 2025 18:41:34 +0000 Received: from mail-lf1-x135.google.com ([2a00:1450:4864:20::135]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tmdGO-0000000EpAQ-288k for linux-arm-kernel@lists.infradead.org; Mon, 24 Feb 2025 18:33:11 +0000 Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-548409cd2a8so2969541e87.3 for ; Mon, 24 Feb 2025 10:33:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740421986; x=1741026786; darn=lists.infradead.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=SSOud79Vzi0uiSwrFzUVnpNiszCNIWd+xmMcmCt0CGY=; b=c6UiacIiZImq//YTaSu9RGTCxB6XQ/E5gEq3NR7Z7mF2nsmH6Ay0olxKiBn6ri6sqX U5fKIRq9XNaTZVgcuQYabYp+LvyQpVwXGrP4cMgNSnFPCfPfkL3Lxdg0DT2ynBZ1j65t /JGVdbS+kNtDF5nZeCGsiDOCQyXJzoN29sv13dSnBbKljCBSpmqAv+86yBQ6gAEFbeNy CoyHI/DcYGpfdR/cpnwvT6abUoDjF+R25/mH94M31zd4rjqLqQL33LW5P3azOcNM/qdT LIrMG3MgTy94UXkGNNg4eBjlTN+J+QyKZb9YzmWJi8fVwi1e2cVSO5U4Sd/k/Ne7au/Q zFhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740421986; x=1741026786; 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=SSOud79Vzi0uiSwrFzUVnpNiszCNIWd+xmMcmCt0CGY=; b=Y6FPDDiwYkI/f226lpI6j5HrO8W4rUEEh2luVoH5vAPTT3CnDFUbl9WTp4sYY3P6AE QvDCjwcH8sxOfG3+yRNPVFAwhP3rmx7uJ9zurzYfW0n3Vh+KVibDmTEw9BILL5fwGHk9 DAFuhsKXoG8tB4Yk+QFliKe37Ya4TxwLS5F1X5IalaIfFNmirmcrM0gcSV7RyxC9mJNW IqU8bpgzgZRvr5U8YjmxfNbbuNbbqMgIM8rKACLwuQF/YDhMWt2efa5t14t+NLXlc1sU FsQ7VEw19KVnEAFvxjcOKYr1hA2jYw6NlUZ5wzQRUm5TAp4VKqifQEVWLfiYwDrsW+5p gncQ== X-Forwarded-Encrypted: i=1; AJvYcCUz9ig8iItd5b3laAF4ZUBbTbLVdX619zytuFdwkRPsZmtIdE5TD3gz9aMlwEooOv8lU+NR30ucXQ6IOdwGj8kv@lists.infradead.org X-Gm-Message-State: AOJu0YwN9WKNXByB1xRhdlAc93R4sCigBTAgWW2MLk9Cbc6dFuC/Wygi 9tDwSpxr696AFD1uDHLqM0qGMRLPvA4hMXE5Vr/i+XQTx1A7P1VH X-Gm-Gg: ASbGnctplcEcgl+MNvMxUSkeahWTjFY5PQOMps9r/+PVyrf5cJiMHRGEMf4IlHhvz6D R9UoD4kFuBWM/+xB2eDNqBdX9QeZDA5/X6yqTVgHQ9ifH98Oxbppf+sYZ3RDRhuABjvgVlgXx2u avnChQKBta0TwMda8sRW1WqymWB8iMPvNbR3JdmeLtTvELely+EPq1aLUaAGZ+OobcM2gRkDHbm PG5Q/XcX0eh2pIzqc3lPAogkvtSJaAA7P8psk/2rSKf58yrTya63V5ruj2k5+1+4ouVjLGeGzBT heiBoNJHgGHGEwgk2HCW3NE4S8cAG62G X-Google-Smtp-Source: AGHT+IEb7m6b4nDvSqYxkQoqLJkKID/UW05aywoBDG1L44MOe5fbAylNbYH/ooMs67cDj3WL7N982Q== X-Received: by 2002:a05:6512:2814:b0:545:60b:f38c with SMTP id 2adb3069b0e04-548510ed080mr34279e87.41.1740421986219; Mon, 24 Feb 2025 10:33:06 -0800 (PST) Received: from mva-rohm ([2a10:a5c0:800d:dd00:8fdf:935a:2c85:d703]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5461e731f02sm2539348e87.192.2025.02.24.10.33.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 10:33:05 -0800 (PST) Date: Mon, 24 Feb 2025 20:32:59 +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 02/10] property: Add device_get_child_node_count_named() Message-ID: <29ec24f1498392cafbecc0e0c0e23e1ce3289565.1740421248.git.mazziesaccount@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250224_103308_596006_8154327D X-CRM114-Status: GOOD ( 17.56 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org There are some use-cases where child nodes with a specific name need to be parsed. In a few cases the data from the found nodes is added to an array which is allocated based on the number of found nodes. One example of such use is the IIO subsystem's ADC channel nodes, where the relevant nodes are named as channel[@N]. Add a helper for counting device's sub-nodes with certain name instead of open-coding this in every user. Suggested-by: Jonathan Cameron Signed-off-by: Matti Vaittinen --- Revision history: v3 => v4: - New patch as suggested by Jonathan, see discussion in: https://lore.kernel.org/lkml/20250223161338.5c896280@jic23-huawei/ --- drivers/base/property.c | 28 ++++++++++++++++++++++++++++ include/linux/property.h | 2 ++ 2 files changed, 30 insertions(+) diff --git a/drivers/base/property.c b/drivers/base/property.c index c1392743df9c..3f85818183cd 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -945,6 +945,34 @@ unsigned int device_get_child_node_count(const struct device *dev) } EXPORT_SYMBOL_GPL(device_get_child_node_count); +/** + * device_get_child_node_count_named - number of child nodes with given name + * + * Scan device's child nodes and find all the nodes with a specific name and + * return the number of found nodes. Potential '@number' -ending for scanned + * names is ignored. Eg, + * device_get_child_node_count(dev, "channel"); + * would match all the nodes: + * channel { }, channel@0 {}, channel@0xabba {}... + * + * @dev: Device to count the child nodes for + * + * Return: the number of child nodes with a matching name for a given device. + */ +unsigned int device_get_child_node_count_named(const struct device *dev, + const char *name) +{ + struct fwnode_handle *child; + unsigned int count = 0; + + device_for_each_child_node(dev, child) + if (fwnode_name_eq(child, "channel")) + count++; + + return count; +} +EXPORT_SYMBOL_GPL(device_get_child_node_count_named); + bool device_dma_supported(const struct device *dev) { return fwnode_call_bool_op(dev_fwnode(dev), device_dma_supported); diff --git a/include/linux/property.h b/include/linux/property.h index e214ecd241eb..a2770197f76b 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -209,6 +209,8 @@ int fwnode_irq_get(const struct fwnode_handle *fwnode, unsigned int index); int fwnode_irq_get_byname(const struct fwnode_handle *fwnode, const char *name); unsigned int device_get_child_node_count(const struct device *dev); +unsigned int device_get_child_node_count_named(const struct device *dev, + const char *name); static inline int device_property_read_u8(const struct device *dev, const char *propname, u8 *val) From patchwork Mon Feb 24 18:33:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Vaittinen X-Patchwork-Id: 13988800 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 93D7EC021BB for ; Mon, 24 Feb 2025 18:43:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=va2pvWmTusgEpgeYLRyDeBT6KWSDeENhUBZHU/VVNr8=; b=Q3uQq0GajkTk14FxTX+B6LQsyW WxPbgCyZU9WuHwHayxC10KOFvOpt5M8aYEcM+M0VdXHKySvbfh66oUJEfu5dAq0g4SkmXKtWnKQLB u7nHajORN0T21C/DDCx4dGdGc8qNjF786bM/3iIJZbi99xul20nAoxKe4d2LK2UiGeQq88yErgyhR e+7YH594Crj3f+A04ojLcO21hF0Kv7ElJiWyjGSaq2+HnHZVzBSYbRE9ENJpQhlg1f7OrhF5nV+Oi kKNjf+AuxoBv5zMhc1gRdrjKc9xRzNsuBg/0OAXMsKca96Hjgjq5dimt7YmaeshUnSafXwz8UnPCe BLHeZb7Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tmdQ0-0000000ErYX-2ju7; Mon, 24 Feb 2025 18:43:04 +0000 Received: from mail-lf1-x132.google.com ([2a00:1450:4864:20::132]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tmdGe-0000000EpHs-14gr for linux-arm-kernel@lists.infradead.org; Mon, 24 Feb 2025 18:33:25 +0000 Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-546237cd3cbso4781765e87.0 for ; Mon, 24 Feb 2025 10:33:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740422002; x=1741026802; darn=lists.infradead.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=va2pvWmTusgEpgeYLRyDeBT6KWSDeENhUBZHU/VVNr8=; b=DXMoP5hovAr7tI197TOuhroubm3Tz1xfMZFmvbIh/yMMkxp8rLMeQS6p55OeSmx+48 1jTVYzoxrQ+q00cbHBeBBUn26wa31aiRVk1PmJDMlFOdGMlgH0AauMfO/kidJv+7aLFK fwp7mofXrAn+NpBHlES5HWQi3dA3eBqnTqQNR6n0Mvy3is5OBaxNla0+zhIJNjXgSi4d 7pSoH0nNQUfaJG3TZvh6RWGheuGmBeiJrIevB6L+6epPs1tyqXmGntAOS0eaIXxgSzPp 4CbHPP16pqZkoE9HBcqox1zv91ZFiBhoXL6gQh7lqtnFGPQOUETwYAQOFw1GdULm8gDS NBJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740422002; x=1741026802; 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=va2pvWmTusgEpgeYLRyDeBT6KWSDeENhUBZHU/VVNr8=; b=ckceInj0fn6kWmvU+9VW/lc8PH7df9r9/iJwe8YT4XQ1TRVwoemANbfQwRZ1o6Ajb2 PY2yMwYm7yu1dGJnL8sGGbrl6UhKA6kPdvzwRGy/lEjgI/TFgOrcf/5iH1JBVHnqgRNO 4NEslGJ9KHgM6O2MPBFBzpOtbZSoS1CzvSBtBG0F9hckKW1BTlD+Z7u32HfhEP8qcYa0 oelkcR2WeLjUlN4E1YG24gpDPRCS2/iGkq+pKqatsE6IWh4HwIgcuaPBoOv8oLjatXeP Vk9RikuQPf1aUrlD5947ltwfIUfyf7VfvOxlCMXoY1Ke59dBJ9vTt6ixf0PQhp5g7sRK A/JQ== X-Forwarded-Encrypted: i=1; AJvYcCV4lyCmJB3qjj9Iyyi7yzG/YOUlr5UwDhn5OIGkrXzDSEbMCV/nhAQOik81+ehXubKbz679LOXR+aOFxh2xqh41@lists.infradead.org X-Gm-Message-State: AOJu0Yz/A92tI0gNSXuxp3rZ5CamuFA+O0UuBPCKA6AnHDaiA+h0pOwy X4YQ6JIPHIwsDv7gB2PfVf3PwsK3j58B6Hgw5SsrzO6pQeVd+mtw X-Gm-Gg: ASbGncsMrGXmB1LoUze/vxY8j8gIh//4S+R2KuXRHyrWPQhxMOoyg/r1pZmpmyB//1e ODH/roo40+zoJukyBGpFKmFGyzjxo0mtiA1q3sEvH+550z0H9iW0DL6OimAhRuyI7euAv7R2ias iEeIorG+AQvuRu/IROzrj6pxLFcTewKI1bw7XAaOtB+qMdqivZ3yHj4EVNQG82Uwf3SoOZ7/W3a yWeDEjq8JNeakrNSrjOtxwFinOCK6TT3XIiLb4HW/hDelpBBi2fhMBMvpm+vhhijJB1bpNMUyWf 8cUviNaj3J0dk6unIGih/93eRPmDDdbd X-Google-Smtp-Source: AGHT+IFU/BAE8/JP2/pFWB6uj3X2U5hpIcR9yw/fgE/bh3vrS5xv0stjrRkIhM1Vu3CupP2zc9Z8ug== X-Received: by 2002:a05:6512:b0a:b0:545:d72:95f0 with SMTP id 2adb3069b0e04-548510dd0efmr39333e87.24.1740422002020; Mon, 24 Feb 2025 10:33:22 -0800 (PST) Received: from mva-rohm ([2a10:a5c0:800d:dd00:8fdf:935a:2c85:d703]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-30a819ebdf6sm46721fa.35.2025.02.24.10.33.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 10:33:20 -0800 (PST) Date: Mon, 24 Feb 2025 20:33:16 +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 03/10] iio: adc: add helpers for parsing ADC nodes Message-ID: <23f5ee3e3bf7179930d66c720d5c4c33cdbe8366.1740421248.git.mazziesaccount@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250224_103324_304270_618A1EAD X-CRM114-Status: GOOD ( 29.07 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- Revision history: 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 iio: adc: helper: drop headers --- drivers/iio/adc/Kconfig | 3 + drivers/iio/adc/Makefile | 2 + drivers/iio/adc/industrialio-adc.c | 89 ++++++++++++++++++++++++++++++ include/linux/iio/adc-helpers.h | 22 ++++++++ 4 files changed, 116 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..d8e9e6825d2b --- /dev/null +++ b/drivers/iio/adc/industrialio-adc.c @@ -0,0 +1,89 @@ +// 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 + +int iio_adc_device_num_channels(struct device *dev) +{ + return device_get_child_node_count_named(dev, "channel"); +} +EXPORT_SYMBOL_GPL(iio_adc_device_num_channels); + +/** + * 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 -1 if no checking + * is required. + * @cs: Location where pointer to allocated iio_chan_spec + * should be stored. + * + * Return: Number of found channels on succes. Negative value to indicate + * failure. + */ +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 = 0, ret; + + num_chan = iio_adc_device_num_channels(dev); + if (num_chan < 1) + return num_chan; + + chan_array = devm_kcalloc(dev, num_chan, sizeof(*chan_array), + GFP_KERNEL); + if (!chan_array) + return -ENOMEM; + + chan = &chan_array[0]; + + device_for_each_child_node_scoped(dev, child) { + u32 ch; + + if (!fwnode_name_eq(child, "channel")) + continue; + + ret = fwnode_property_read_u32(child, "reg", &ch); + if (ret) + return ret; + + if (max_chan_id != -1) + if (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..5d64244f1552 --- /dev/null +++ b/include/linux/iio/adc-helpers.h @@ -0,0 +1,22 @@ +/* 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_ + +struct device; +struct fwnode_handle; +struct iio_chan_spec; + +int iio_adc_device_num_channels(struct device *dev); +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 Feb 24 18:33:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Vaittinen X-Patchwork-Id: 13988801 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A0E19C021A4 for ; Mon, 24 Feb 2025 18:44:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=sbgG/npWw2NepzS3A/ksrl5rJ4Tlhh8QEzNC+teb494=; b=WTpihkZCTA67QT/PpMmh8ok4Am qguPL9ec2lQyyCWwoE/x1SFNkz3chOmjuXwzkXeOEKhHItTq99fidaj4/qODEEJ47Eedg92WLncTJ DaVmoxs+P2VrGhg7DaLNZ2s21+hDx5Tp3KIPYHpBKA+S60707bZlOd5kw9Q7gjMTNPjyYCv33Nt83 U7I9zkvLyw4M7ACOdq9GhOJs7A/M3RwwaT8BjDa8c2SIaqPpTQkQsgW29MYYaSARwBYruEevmIwOI Rgghms5vfZyeT/Ikq1Jz34Iri6KbFjQQkbXXUz45FZUJ1YYzSHl50cLS+FnYsxqHvoW9UWr+fDg/O 94SW//Pw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tmdRT-0000000Erot-1lBB; Mon, 24 Feb 2025 18:44:35 +0000 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tmdGs-0000000EpR5-3qq5 for linux-arm-kernel@lists.infradead.org; Mon, 24 Feb 2025 18:33:42 +0000 Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-5452c29bacfso5215756e87.3 for ; Mon, 24 Feb 2025 10:33:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740422017; x=1741026817; darn=lists.infradead.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=sbgG/npWw2NepzS3A/ksrl5rJ4Tlhh8QEzNC+teb494=; b=S0pZen/tGWeNRvD5GW8kAvIzqc3toHSa3zt02L3YV6W/cLYATKdQgReoR03ZPfnFRp OUq6stb8J0G6SB8nIZ89To0F+e7uuOav8MxfW90Apul8Z6uLdlBOLpT71rvlvrIwPxzl LYaYUhHDbgzIKuZj9BQtkZ6//VhluudcO29s1C9FBNOK5iLTDMcXz4Fm8eDp3G0jfqUU oyfszZOpmYBDsUywRFD7m+pdcaYsjfe+26YjDyVGYmn97F+hB7zp7QgHn1jHWlX4nDdk AYry8fUcNbogiHrKWLPerjpRv29eRgEsj/bV/o+5V2jS6G0fZ/qurc7F7tmS/wTZvoNr Dlaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740422017; x=1741026817; 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=sbgG/npWw2NepzS3A/ksrl5rJ4Tlhh8QEzNC+teb494=; b=M5OWTb63Je8VP+w3NcJp4RzwCNsDS1Cn17ueTmnJjSXuU8/g7FClRbHgogJtc7Lcwg UTCMRf6PYhBqi7uUqRAM7iv3F+689PPb+Otgm93OhlfPW1wHe43kjiic41dQ8r8SZGge +GAQBeCdBcPRuxCNxGSNY5rXZ76FiljjkUIkQ1MTUtDRvmoIueD0KQOMCeGkMD0RiH99 WpPHSk+e1didem5O18gn1jOe9YrzIOP0FVMviRGK6QXN+/raj6nXoD7MN07vSOCF5dFW IGDTGBLBN33XoOQUfMS9B1RfWSX+QZRkkA9dBv/RB7vREXQfca4rsoOi5F1jX2fDT1XW jQxA== X-Forwarded-Encrypted: i=1; AJvYcCWtbNR4UaIXbdt6OQfcK31AXEH4dg4YJkX6vcRuOs17uHsZ12Vgq7Ibqg8yTws1GMFjJBlv7+NdvpVXNFcNPtug@lists.infradead.org X-Gm-Message-State: AOJu0YyPhMnEJp26syykkwTOC3KhJe12ZCKDFwLYd/wwaj3EyAKalgc/ wxCROUn/OOA0Y0Dxt4cnTvGkNPSHdwOdI9QqVoYbO6+0UKaFsLGN X-Gm-Gg: ASbGncuKFFJ/aAGrny1BqPBXWm74So7sCWlaqebMbUiFgwwYsfFVH2/87wsHNtTt6IQ 2Jt0vC2xeRB12Vtshuh9X+2uM+LUZ34YQJsKmAIW5Z9d5cEvoFAo4vdntNy4AUyrg54nsA9bXTS mFFRmDUV0S5gX08OkG3S2qg6iB6CMjlc0G8XNewJGzJnTZPcD5rMdIulqk4zvsWgxrAWhy50bei 9BvKLA/OqfbO7Js9EsjK9Bkyxfdmg7uDii7gb3cpP8tHJRptjkcMiM2FRwJjhLDsgCfZ0EaTn9w CVWdPj9hJwVtQGPfi9JOAZH1vMmKuFhp X-Google-Smtp-Source: AGHT+IGBSL1yjpp7J6W1giQ4I2dWNpu3PXBwrEQmef+HokD2Y0Oka/qGiW3kVLsJKEKXgtjM51bkUg== X-Received: by 2002:a05:6512:4013:b0:53e:239b:6097 with SMTP id 2adb3069b0e04-548392717f4mr5798488e87.50.1740422017026; Mon, 24 Feb 2025 10:33:37 -0800 (PST) Received: from mva-rohm ([2a10:a5c0:800d:dd00:8fdf:935a:2c85:d703]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54850e58973sm11520e87.23.2025.02.24.10.33.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 10:33:34 -0800 (PST) Date: Mon, 24 Feb 2025 20:33:29 +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 04/10] iio: adc: rzg2l_adc: Use adc-helpers Message-ID: <5658fbdd886cc7ada278a42c63a140bc14d1277d.1740421248.git.mazziesaccount@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250224_103338_987686_1D323F1E X-CRM114-Status: GOOD ( 25.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 rzg2l_adc's compatible string didn't reveal any in-tree .dts with channel nodes named othervice. 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 --- Revision history: 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 I picked the rzg2l_adc in this series because it has a straightforward approach for populating the struct iio_chan_spec. Only other member in the stuct besides the .channel, which can't use a 'template' -data, is the .datasheet_name. This makes the rzg2l_adc well suited for 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!). --- drivers/iio/adc/Kconfig | 1 + drivers/iio/adc/rzg2l_adc.c | 38 +++++++++++++++++-------------------- 2 files changed, 18 insertions(+), 21 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..51c87b1bdc98 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,21 +325,30 @@ 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); + 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) return dev_err_probe(&pdev->dev, -ENODEV, "no channel children\n"); @@ -346,26 +356,11 @@ static int rzg2l_adc_parse_properties(struct platform_device *pdev, struct rzg2l 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; - - 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; + for (i = 0; i < num_channels; i++) { + int channel = chan_array[i].channel; - 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 +621,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 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: 13988806 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2061CC021A4 for ; Mon, 24 Feb 2025 18:46:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=heP8tu0ZCh/Rz+nsytMurli7kJvo4BfOkz2KYfukdDQ=; b=iU21V/1NEIKDDCFM8TaTABIj9Y VzU9n4b0g8hqCOXuv6YZj4smMWDACaB66IcASe/BYNIm4JM+9wprgAdyoBP/rAAioVCzdrMJPNQKd RdLvehq8d82uZHdP04OJVXOxUsYeNMTfs+TRloQChhrEThr8UzcOfsEi8fj9LNL+FjlSS0vWkRk3/ XtObe5JSG3qz8gY+5Ge4wAEbY9xEeadVisMk9lOjcmgqxAhZG+Z3I/odyGLVFl5cswfFtnuX8fbT6 gEOSWceEPkEMuUfijFfnOD+fLdOWR6bpXJ1Vt2n3MN4K3v+UCrHWC8gx2PZUsuwPivGWC81mb6owE Atrgd9/Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tmdSw-0000000Es5t-0H9k; Mon, 24 Feb 2025 18:46:06 +0000 Received: from mail-lf1-x129.google.com ([2a00:1450:4864:20::129]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tmdH8-0000000EpWs-1yFN for linux-arm-kernel@lists.infradead.org; Mon, 24 Feb 2025 18:33:55 +0000 Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-54622940ef7so5391613e87.3 for ; Mon, 24 Feb 2025 10:33:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740422032; x=1741026832; darn=lists.infradead.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=RvQ53KBu/QXmCERkwknFhNZGpJPaceFzZzfIjFL+WO57v7kWWJSxd1y4gwTs3tunbA QbLTYUyHjdKAoXRXQE7NhDk4CFaD2FeMWPm7c3IqgJJDYEk7R/PkLq5iJCkMP77qTyI2 OyjYzBTOXf3af9zyys8A0MEWCjztBk658VNbgRyFBhfBKit8crOqxQjevvpyVEyGfLkf W4iuS981H6eV07Jkvz4iXolC6y91uOQnmqLtuRNsKRnAeN3n6UEyNkzNm07se8pDRJH9 782aQd2Acq4Dq4+BMTc39H1KEg5HVCPvwpWXimIgmUQ5id/E8PHJR801h5XAoUovdVDy UjUQ== 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=w+VxsCeaVY23Hj4OsmWDa5dVzHqWW2b6CeBgJUpSPGXDZmMihnNZBVzamvyglTT4ko R4rbstzrGB5smt/ggylHQHHTzPCrXEU91iVketAufkKaQjHvWHr9kIkYLr6qTwRqGREk RURtTIwRlapp6usb9IGNvJqfBWSYCdgyoSvCScyY7aVxC1CZpeSR2CAdyQsikywRwDyW VrBqCsgqTrMBMfOztCUXhPk4NV+jlW7qTlcw2LGzVdi8Rgz1PoculPzAloI4eShWNAU9 3UtQs77ROyrVpZq/SuJEUweRGdM46epSMnY7KCpEifaAnuNXqOtMM7V1CpBXV+5lrado Njqg== X-Forwarded-Encrypted: i=1; AJvYcCWhu8oQBu9zoUtFHwR6hPhhMse+QqgDLCJH5sxKsKLLUOBncC0bdKecdqrI/dDf4IyPdsGYFtVc2S54/YVITiHF@lists.infradead.org X-Gm-Message-State: AOJu0YxYU/mEPN/rUH5cfvGjKdq/nYPbdN3D71R9LyHdBioQ/idUdUVo T4pbAaIa52RghJ5bnvcSrsNegR+3kKVpkz2HbNnZ7MG0BUnomCLw X-Gm-Gg: ASbGncvWMx3CEyAy+rHFnRXBC3gij8BHB0BhiFHov2vlKHWQe78QNdCB9VPCB57EDxK XGhYJtcs2dMpcRjnGJtkvIDB0xlJUzmQEU8pCiDL1MYinyuLNk2U+SKMNg/81khv9Ub1u1f8lyj 1m64NImyaYcHtCzuMdKttAdjX+N4+uHolUHmAH7wYO6Z+efAcbWfn8h2zRWHOHWCyXPONKfddf6 7z4SGwSR/PoWsRZ936WqA767DuZb7xpmD+gRHVx5NTi5is0vWiKERj1+NjAOGFpyLgfOG/zm4ZO QCGUMm/UNcSSCE0PWdPmGh89QNu/FO6c 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: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250224_103354_514330_F7636EA3 X-CRM114-Status: GOOD ( 21.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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"); From patchwork Mon Feb 24 18:34:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Vaittinen X-Patchwork-Id: 13988807 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 02B5AC021A4 for ; Mon, 24 Feb 2025 18:47:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Lvtg9LiT9FPYIsAlfx6bzRkO3KM227JB/0Q4qpEPDEo=; b=mZP9BZ3fWd3GcSmkNdb8BoLY48 4oMxaFxGF+rjEnlZ9xlphK8Rs8H0tSU3V7/ycO8pcJ3e56W5BWvo9KBNsqAGhTYukCYRR0xkuQwPo RqbRODIVObgYqnsDDwuc9FMfuXLChLO7wa8fTedK/zT/wUDaiw1614u0l/i+UtJOdBwYVLoZcguds +Xw6iNxYTQTWRWwhmQJqu4y2gd0FNfyg/BzSb0wSkBD51Kz5H5sy0UXPzN+oxNePLIlcAEXNT8def xt4eDdkVdX4ylN6rqDUhnOF1oyCT7QE8yWc1BrnqbU7+Nhj3DpqE2p0H5Vkt7fQw7S7GbwANNGBd+ wCX571dQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tmdUN-0000000EsGV-3KJW; Mon, 24 Feb 2025 18:47:35 +0000 Received: from mail-lj1-x22e.google.com ([2a00:1450:4864:20::22e]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tmdHP-0000000EpcA-1rZ6 for linux-arm-kernel@lists.infradead.org; Mon, 24 Feb 2025 18:34:12 +0000 Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-309311e7b39so43331671fa.2 for ; Mon, 24 Feb 2025 10:34:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740422049; x=1741026849; darn=lists.infradead.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=Lvtg9LiT9FPYIsAlfx6bzRkO3KM227JB/0Q4qpEPDEo=; b=PZ4D5CRO24Fc28pITQHX1VsSbN8/JekEGTB/2B8gifcnBwIX4p+MZ3EHvHMLhG8klA +5LH4T26LFz03S95R+r39BaSUYeJUYjv6BU+lbZ+9XTTDNVlYqBIApJkmlnW5t9EQHyv o/b79mhzxwidW5u3Yimx18cIs+8mr1/d0AX+psl7zoz3aAho3lGHosAMkFJppGc4oT4u Dm+TVR2e79OipdfydrHugrVYwhxRoHDpT34Vl/gJZHoQ/JSeh/dnJ9cbS2XoQiY2aoNQ jO1syjYw3IQ81/V2Te1K/DQAHh6yB7GDM8F9KtOfOD4KukRAsrSWD+3m+ePCVMDZO53Q ArGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740422049; x=1741026849; 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=Lvtg9LiT9FPYIsAlfx6bzRkO3KM227JB/0Q4qpEPDEo=; b=nky3bdaKTe6VQhELf5DLZp744k1mIPRAZlIljiS+QGyqv9qeMp1F9MKx7ZeiquMMLs 4jWRdxhD0LHx4YgqhC2mR9VYYM9wh3lUXbu2lN3SBoXV0HC/cvi3+OyO0eHF7bEPtO0r G5bVIfAQepkPR4VpMyFEfLNW/AsQ+Be3a2fN7FO/DsjGNGiuWCy/32WTiCkxjQi3WkVN DzGXp7Syw2anD86+pOktVOxUreMqpMPP/8mFob7SeyJ9DWFX+VQtbzI49iFUsoH832xl qdxfIb5ZFktWuMSCLbJlN4Hmrg1OIy/4X/hMbDQE6Sdn3sbfeu+w96IaMMEexzA4wZHS pM8w== X-Forwarded-Encrypted: i=1; AJvYcCWrGQmdz2CS+6Npg45ROsdYa5cFqKP4UCgPrbjioA+/ZiTDVwoiE9Yv7nYMhL5dJ0TbDuP0z3WPUHWmA4uZFigz@lists.infradead.org X-Gm-Message-State: AOJu0YxreOZ2v8kKd77dbPFDPi2+2sw1TSzRmv//FIvyarxXFs26Pyu6 KDh0WnBYPgELGiOB16OwAspJKLdfURzUx3G2pvdKmVNPsnoI5JUt X-Gm-Gg: ASbGnctz5uHzk4rzyRGR0rBLcspiacJt519XWVNf4jhufJQ2jHvcwN2Z+UYrdkeWyPs qREXLQXjt6Y0LDToCW06VgZI3yfQGrvSgrd+BPWxK5rrKYg57bQ4B0G2VkB4uy/2g21ruek+RfB JRIWSJz1IP4344GLnJja4F9GFLV2dlhyZ9ysblbut32MJFIr45p6biQ5dbPFCZUSw7MT4YOEH1K qpMnOqQdy7KL9CbjVotLaEjrXQMCKfKZUh+GQrU2rr+/YJBRUHwU5Ifvq5vC0K417YI9P+7WmPX x7rfCSt/6a/hkBHO0iuaVLrqPaQNhIA3 X-Google-Smtp-Source: AGHT+IEnOT33v2tdUxI89+C2mfa+nuzArxhmJ+3qGyLgimw3UzsP7sWa0GhRzJ9QUi85xzA0PWfy3A== X-Received: by 2002:a05:6512:1244:b0:545:b28:2fa2 with SMTP id 2adb3069b0e04-54838edd962mr5783123e87.7.1740422049175; Mon, 24 Feb 2025 10:34:09 -0800 (PST) Received: from mva-rohm ([2a10:a5c0:800d:dd00:8fdf:935a:2c85:d703]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-30a81ae82ecsm22381fa.98.2025.02.24.10.34.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 10:34:07 -0800 (PST) Date: Mon, 24 Feb 2025 20:34:01 +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 06/10] iio: adc: ti-ads7924 Drop unnecessary function parameters Message-ID: <38d39befcca110132fd4349c87fcb5d7ff51a2c8.1740421248.git.mazziesaccount@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250224_103411_495202_6A04CAB2 X-CRM114-Status: GOOD ( 16.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Device pointer is the only variable which is used by the ads7924_get_channels_config() and which is declared outside this function. Still, the function gets the iio_device and i2c_client as parameters. The sole caller of this function (probe) already has the device pointer which it can directly pass to the function. Simplify code by passing the device pointer directly as a parameter instead of digging it from the iio_device's private data. Signed-off-by: Matti Vaittinen --- This commit is compile-tested only! All further testing is appreciated. --- drivers/iio/adc/ti-ads7924.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/iio/adc/ti-ads7924.c b/drivers/iio/adc/ti-ads7924.c index 66b54c0d75aa..b1f745f75dbe 100644 --- a/drivers/iio/adc/ti-ads7924.c +++ b/drivers/iio/adc/ti-ads7924.c @@ -251,11 +251,8 @@ static const struct iio_info ads7924_info = { .read_raw = ads7924_read_raw, }; -static int ads7924_get_channels_config(struct i2c_client *client, - struct iio_dev *indio_dev) +static int ads7924_get_channels_config(struct device *dev) { - struct ads7924_data *priv = iio_priv(indio_dev); - struct device *dev = priv->dev; struct fwnode_handle *node; int num_channels = 0; @@ -380,7 +377,7 @@ static int ads7924_probe(struct i2c_client *client) indio_dev->num_channels = ARRAY_SIZE(ads7924_channels); indio_dev->info = &ads7924_info; - ret = ads7924_get_channels_config(client, indio_dev); + ret = ads7924_get_channels_config(dev); if (ret < 0) return dev_err_probe(dev, ret, "failed to get channels configuration\n"); From patchwork Mon Feb 24 18:34:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Vaittinen X-Patchwork-Id: 13988808 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 414B8C021BB for ; Mon, 24 Feb 2025 18:49:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=KGcm2bkFDPXzL23Cd0xQolPfqoEIsDRM3DUNg3w1Cy8=; b=gKJvukSQSzZLu8L+i8QA04eKLz FzcgGcSrK05tVzbxH2TkpKX1mPz4kJiebW4fwWsJpR2hdaS+0t6q1+SnYDGDcZ3DVEz8h1qGFg4o4 SlteFpqS25Cp7i8kE5MiYN+6if+cE9/FZXxig883RZSJrX6GaXCvKxV8UbLwLqfuMry1KU9wy7bFf WjReYdXpqtfy9WcgaMddvs5ZUBqM9fpuMAxqN1j5+Qpf9rb9o8a9g7XUlM/kM6Q1pcs6RLVJ6x3j0 K/JQDvVLYci6IfgPmnzevezCxhH9+3kIJV+7Zlup7ZuCIO+o6dCO6VgTybP0FvqEXUGh2w+X+mfcL NaQrmpnQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tmdVq-0000000EsQF-1tYV; Mon, 24 Feb 2025 18:49:06 +0000 Received: from mail-lj1-x235.google.com ([2a00:1450:4864:20::235]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tmdHc-0000000EpiR-2FKI for linux-arm-kernel@lists.infradead.org; Mon, 24 Feb 2025 18:34:25 +0000 Received: by mail-lj1-x235.google.com with SMTP id 38308e7fff4ca-30a303a656aso49552941fa.0 for ; Mon, 24 Feb 2025 10:34:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740422062; x=1741026862; darn=lists.infradead.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=KGcm2bkFDPXzL23Cd0xQolPfqoEIsDRM3DUNg3w1Cy8=; b=HqwVw6dI6jJHicaHkAKfQ3+LAtv02XD89q9PJJutUZcfXrn1mUfj7TD1V5s0qlSuSq 2v97OVplxOVA0I0YLWchMLr3zHuD6shGC9+r97uY6euP6veWAeLn++wtBJrcfMMEeeFs GhVd2SipUnvSxaPb3uPnsPzZftT1tsKlUlB+gUFOxN/heYvzmh/qNZs9CgIJMNkEErFY rBHZqWvT/jNDvrwAYYObkgLFjeyQCd+u2mK+j14QqtJYMDCYxrxv5iLUFNLBfUoTUbxW tJsGGSwrU20IyQxeaucMgKxSsdiwV+aEoem/+EpfAExyFvb2k0PVk+/9kWLCwjF5+qsB nRbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740422062; x=1741026862; 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=KGcm2bkFDPXzL23Cd0xQolPfqoEIsDRM3DUNg3w1Cy8=; b=O/19/luEVg/91t+p+7CuLmv3cf73XOSsG+jZ5HlNCPemmXRWik+J5kgCkEw4hT/m77 ljQW3Lk8tCuDr1mN7biS/luOI4i+9rqC4LWybqX0xcvWn6XWCY2KW7STwmo5tFGxzh2Q xY/HHRYIHKxtk1aECtfDfAq7BUFDspHPXiClACnJnblKCYaBlv9EMMdL2ZnUxR7xmHhM NuHDNUu/f8FidMJhfb8QemBA1IbgpswW7q124welzI567dZxGTeTIEzhcxGi/uvbkHSZ gwkwYdDr1Da4XabDMYqWl2Jndu9e+Zqx/dNvRA99NksRXyZGlvIq+Rh0jaUM2jESMgr1 0fig== X-Forwarded-Encrypted: i=1; AJvYcCVYPEVZ6D+3pdka1aOY3ccKVamckJmh8yQx4RjMS2hhv570yCRwXZdWMVNohRMebvIqjorfwhyCyGLvX25J2y5O@lists.infradead.org X-Gm-Message-State: AOJu0YwA07CGn/4nljsuCGK9LN2/wgPa4s2wscNXJADKhfH19R6urbEj AToTeXhdMzu/vphKqyDkDjtg1QgdW9hevKvpkwOqyCd5d3lrprDb X-Gm-Gg: ASbGncu6hKWg0o2tV/hAOcEHspsJlmGdlmE4l7s0uV4HMMfCKBeYY1nWiHRo1BBJ1ih nRJSuFCmzARZkOLQcZ/9PpIVB8pDVmH0vUkTQrz2DoEsVtLfIrbA4iqp8tmRvi0etB4CoVnCSqK gJQD8vF9OxfsFh4b1iOzhYeESJ4MHHC+2iLsQX30nY1XHMwLTCgBHpfBN/bijFpDuZIJ7a+gMeC jxk3apgXuaQHuyoF19hO6nisoQpdWIG2XqexA6EFcV1002NaduslAN5BFlwFE5/niXdH6SzvUPF qckHSk8+8+U2J1aiTsopTiX109zWZj5L X-Google-Smtp-Source: AGHT+IFEpds9WAAPmdXGIB+EMRIMZX8JJNMGJEFMaa6SvRSCJp+geS/XDIi8N88vVzGAieZpjJvTTw== X-Received: by 2002:a2e:8017:0:b0:300:4107:6294 with SMTP id 38308e7fff4ca-30a5b216a46mr47097571fa.35.1740422062295; Mon, 24 Feb 2025 10:34:22 -0800 (PST) Received: from mva-rohm ([2a10:a5c0:800d:dd00:8fdf:935a:2c85:d703]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-30a819e0a4fsm58811fa.2.2025.02.24.10.34.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 10:34:20 -0800 (PST) Date: Mon, 24 Feb 2025 20:34:16 +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 07/10] iio: adc: ti-ads7924: Respect device tree config Message-ID: <20dd0e4ea72fe39b90b611f9c08dbd4bc1d5217f.1740421248.git.mazziesaccount@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250224_103424_583980_A72B085A X-CRM114-Status: GOOD ( 25.73 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The ti-ads7924 driver ignores the device-tree ADC channel specification and always exposes all 4 channels to users whether they are present in the device-tree or not. Additionally, the "reg" values in the channel nodes are ignored, although an error is printed if they are out of range. Register only the channels described in the device-tree, and use the reg property as a channel ID. 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 Please note that this is potentially breaking existing users if they have wrong values in the device-tree. I believe the device-tree should ideally be respected, and if it says device X has only one channel, then we should believe it and not register 4. Well, we don't live in the ideal world, so even though I believe this is TheRightThingToDo - it may cause havoc because correct device-tree has not been required from the day 1. So, please review and test and apply at your own risk :) As a side note, this might warrant a fixes tag but the adc-helper -stuff is hardly worth to be backported... (And I've already exceeded my time budget with this series - hence I'll leave crafting backportable fix to TI people ;) ) This has only been compile tested! All testing is highly appreciated. --- drivers/iio/adc/Kconfig | 1 + drivers/iio/adc/ti-ads7924.c | 78 ++++++++++++++++-------------------- 2 files changed, 36 insertions(+), 43 deletions(-) diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index 0993008a1586..d16082ac2e1f 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -1476,6 +1476,7 @@ config TI_ADS7924 tristate "Texas Instruments ADS7924 ADC" depends on I2C select REGMAP_I2C + select IIO_ADC_HELPER help If you say yes here you get support for Texas Instruments ADS7924 4 channels, 12-bit I2C ADC chip. diff --git a/drivers/iio/adc/ti-ads7924.c b/drivers/iio/adc/ti-ads7924.c index b1f745f75dbe..e3ac170c73f4 100644 --- a/drivers/iio/adc/ti-ads7924.c +++ b/drivers/iio/adc/ti-ads7924.c @@ -22,6 +22,7 @@ #include #include +#include #include #include @@ -119,15 +120,12 @@ #define ADS7924_TOTAL_CONVTIME_US (ADS7924_PWRUPTIME_US + ADS7924_ACQTIME_US + \ ADS7924_CONVTIME_US) -#define ADS7924_V_CHAN(_chan, _addr) { \ - .type = IIO_VOLTAGE, \ - .indexed = 1, \ - .channel = _chan, \ - .address = _addr, \ - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ - .datasheet_name = "AIN"#_chan, \ -} +static const struct iio_chan_spec ads7924_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), +}; struct ads7924_data { struct device *dev; @@ -182,13 +180,6 @@ static const struct regmap_config ads7924_regmap_config = { .writeable_reg = ads7924_is_writeable_reg, }; -static const struct iio_chan_spec ads7924_channels[] = { - ADS7924_V_CHAN(0, ADS7924_DATA0_U_REG), - ADS7924_V_CHAN(1, ADS7924_DATA1_U_REG), - ADS7924_V_CHAN(2, ADS7924_DATA2_U_REG), - ADS7924_V_CHAN(3, ADS7924_DATA3_U_REG), -}; - static int ads7924_get_adc_result(struct ads7924_data *data, struct iio_chan_spec const *chan, int *val) { @@ -251,32 +242,35 @@ static const struct iio_info ads7924_info = { .read_raw = ads7924_read_raw, }; -static int ads7924_get_channels_config(struct device *dev) +static int ads7924_get_channels_config(struct iio_dev *indio_dev, + struct device *dev) { - struct fwnode_handle *node; - int num_channels = 0; + struct iio_chan_spec *chan_array; + int num_channels = 0, i; + static const char * const datasheet_names[] = { + "AIN0", "AIN1", "AIN2", "AIN3" + }; - device_for_each_child_node(dev, node) { - u32 pval; - unsigned int channel; + num_channels = devm_iio_adc_device_alloc_chaninfo_se(dev, + &ads7924_chan_template, + ARRAY_SIZE(datasheet_names) - 1, + &chan_array); - if (fwnode_property_read_u32(node, "reg", &pval)) { - dev_err(dev, "invalid reg on %pfw\n", node); - continue; - } + if (num_channels < 0) + return num_channels; - channel = pval; - if (channel >= ADS7924_CHANNELS) { - dev_err(dev, "invalid channel index %d on %pfw\n", - channel, node); - continue; - } + if (!num_channels) + return -EINVAL; - num_channels++; + for (i = 0; i < num_channels; i++) { + int ch_id = chan_array[i].channel; + + chan_array[i].address = ADS7924_DATA0_U_REG + ch_id; + chan_array[i].datasheet_name = datasheet_names[ch_id]; } - if (!num_channels) - return -EINVAL; + indio_dev->channels = chan_array; + indio_dev->num_channels = num_channels; return 0; } @@ -370,18 +364,15 @@ static int ads7924_probe(struct i2c_client *client) mutex_init(&data->lock); - indio_dev->name = "ads7924"; - indio_dev->modes = INDIO_DIRECT_MODE; - - indio_dev->channels = ads7924_channels; - indio_dev->num_channels = ARRAY_SIZE(ads7924_channels); - indio_dev->info = &ads7924_info; - - ret = ads7924_get_channels_config(dev); + ret = ads7924_get_channels_config(indio_dev, dev); if (ret < 0) return dev_err_probe(dev, ret, "failed to get channels configuration\n"); + indio_dev->name = "ads7924"; + indio_dev->modes = INDIO_DIRECT_MODE; + indio_dev->info = &ads7924_info; + data->regmap = devm_regmap_init_i2c(client, &ads7924_regmap_config); if (IS_ERR(data->regmap)) return dev_err_probe(dev, PTR_ERR(data->regmap), @@ -469,3 +460,4 @@ module_i2c_driver(ads7924_driver); MODULE_AUTHOR("Hugo Villeneuve "); MODULE_DESCRIPTION("Texas Instruments ADS7924 ADC I2C driver"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS("IIO_DRIVER"); From patchwork Mon Feb 24 18:34:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Vaittinen X-Patchwork-Id: 13988809 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D4F71C021BB for ; Mon, 24 Feb 2025 18:50:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=buHH90ReAfKMuPjfAlkI7RzTSkaQo1eKFWDc0/jro5c=; b=1YPDZSOGDRVOwomgqHxuwI0fmF yj8eKlFojsRi57LcQHsXacVsltQ4gagmE3JwR6OCBEz9w+xxjOq/G2byQQcf0TtrqcQOZlC2/pTtl Cu/h6xG81yTCurIN31Bj9KPIgEncxAX9knYsoVbaKO0KtUiKg7PK1Bz1Iq4aBp5EobydNQLioGMEU uypu/PPsmSLNBctNLmL6wIJhu6dqBYiUo9pO4gMz2i3rAH4WIiot5XzWA5tbV9CnDqA6tZE+nixuy 2gfWZZlixrJNS4OVv38PSqs5kgEnzaQCLKjjnPZzbyXhu6AQzPykocssYmMq4qnQ3bPkr1gbQqzWO qNvLp3kw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tmdXJ-0000000Esd7-0XUB; Mon, 24 Feb 2025 18:50:37 +0000 Received: from mail-lf1-x135.google.com ([2a00:1450:4864:20::135]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tmdHq-0000000EplI-2ZpX for linux-arm-kernel@lists.infradead.org; Mon, 24 Feb 2025 18:34:40 +0000 Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-546202d633dso4771583e87.2 for ; Mon, 24 Feb 2025 10:34:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740422077; x=1741026877; darn=lists.infradead.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=buHH90ReAfKMuPjfAlkI7RzTSkaQo1eKFWDc0/jro5c=; b=UxGfP5HuSKQQvB+i7smigYFqSffVHmOVGy4nGBxesG3Ya3j4LzTEjlY54CsNHW60db ve8sWiTwZsfxaASEAV82PhVdXnP5wv21G3j3kLEqRLq134sGfbCGgea8JAuycp0HF/07 gKYXmZyqeyySbmS83Ho3SpLmPeXcNgH766zl7//CTCNATY0y/cEoxxaZhnRc1/liAaIA H27QohcbOEoixSBvJZXDpaCtDD+WRC4kNSHG+kf0qm2smV/bBQUizOHaMMfHPVHWQvZo NfTb2rua25JQE0VR/SW93LUJiTLyKVZPwV9ntrsNmpcKylXhAXDjwR4WgVkvAPAASXmf l+tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740422077; x=1741026877; 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=buHH90ReAfKMuPjfAlkI7RzTSkaQo1eKFWDc0/jro5c=; b=fYIxaRxONRAdCinJa1Xy5G8SuLP/bY4Gn0tfPOoRPD6KHNSDu/eXjANyA3IN7/G9IC CEtgpn56/+d74zU3thNugRTbSZmsrK8JjRzPW18XL6yjLCRzkVOhEUVKGiBcA7pWA8AM aRAZeYIP72xtihl2t3r9s8bPOsoA+8BIjgM20fQPEME0wxjH802SS30ZV4DVM5p7mFp3 +0AJp9OlxfVPClvKyrTDSHPoJO+RZp9uGNBBqbM2IuOMe2HtVmFFWWBpLaKi9HrUeV8D kRR/3YvPB4ncq+S/d+gRAKzUHQj0/2IbGpEvlNxkZi5L+8NhhO/gUpVntd2m78gpOSrx AgXQ== X-Forwarded-Encrypted: i=1; AJvYcCWMPTiBbM86Rjub+XkLw/YK/RXI2vIEYtCAu/G5x6wuHFirNRFIK8Y9GkEo4AyGrPSdugccAoCymLpo0/YBPMFv@lists.infradead.org X-Gm-Message-State: AOJu0YyU5W0qa5erG+L3rRViL/5fEH9fzMmskVlrsc1wuIGbTuBdMdUh T0BH2g4+RFqretk6gyB7zuv/gZ5SF3A2D2UpnnhiFoTHknBhDgMf X-Gm-Gg: ASbGnctba00gxImnicef36kledLzl31pgC9zcd+K4BR6xgj9F97OVU/XPNxmC0yJ0Pi ocYqZN3svqvz0FBzlm/KBUBCrUTAYragqf+e86lxere5veJkh9+QubeuTS7lD6F+i4DrhBwZezr Edm7kveJvfNi2X9/tiIMuy/RGwWJNJPjpX+mRgthXW6OyfGsethNDAGY5zSwfzgAOI/M/nuFkd0 Wm1WDCRiISBwde3GJJbb1ZOkrOS+QNB9jgJXetd2PJQUyqKwjoq1Xa+yEPlLd2xCuNOYT6FLmGE H3YnFsEqfBYm3yHbHoupnn9tNAUqXHSC X-Google-Smtp-Source: AGHT+IEwPd7V3DuZhCUYJUCWKv9yz82USqNjLXyyDPCW8me8mAN1vtlenDqvbheqk3knGvmVORLeCg== X-Received: by 2002:a05:6512:3b8d:b0:545:2474:2c98 with SMTP id 2adb3069b0e04-548510dba39mr34866e87.23.1740422076563; Mon, 24 Feb 2025 10:34:36 -0800 (PST) Received: from mva-rohm ([2a10:a5c0:800d:dd00:8fdf:935a:2c85:d703]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5451f105c2fsm3510203e87.117.2025.02.24.10.34.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 10:34:34 -0800 (PST) Date: Mon, 24 Feb 2025 20:34:30 +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, Linus Walleij Subject: [PATCH v4 08/10] iio: adc: Support ROHM BD79124 ADC Message-ID: <4d1bf5df8f3b0f760422b6b67fcc8245ebf520e0.1740421249.git.mazziesaccount@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250224_103438_878999_707E23BE X-CRM114-Status: GOOD ( 34.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The ROHM BD79124 is a 12-bit, 8-channel, SAR ADC. The ADC supports an automatic measurement mode, with an alarm interrupt for out-of-window measurements. The window is configurable for each channel. The I2C protocol for manual start of the measurement and data reading is somewhat peculiar. It requires the master to do clock stretching after sending the I2C slave-address until the slave has captured the data. Needless to say this is not well suopported by the I2C controllers. Thus the driver does not support the BD79124's manual measurement mode but implements the measurements using automatic measurement mode relying on the BD79124's ability of storing latest measurements into register. The driver does also support configuring the threshold events for detecting the out-of-window events. The BD79124 keeps asserting IRQ for as long as the measured voltage is out of the configured window. Thus the driver masks the received event for a fixed duration (1 second) when an event is handled. This prevents the user-space from choking on the events The ADC input pins can be also configured as general purpose outputs. Those pins which don't have corresponding ADC channel node in the device-tree will be controllable as GPO. Signed-off-by: Matti Vaittinen --- Revision history: v3 => v4: - Adapt to 'drop diff-channel support' changes to ADC-helpers - Don't parse fwnode in GPIO valid-mask callback but use pin config cached at probe() - Drop use of iio_adc_device_channels_by_property() - Open code the bd79124_reg_init loop (as suggested by Jonathan) - Use devm variant of mutex_init() - Styling v2 => v3: - Fix uninitialized return value reported by the kernel test robot - Fix indent - Adapt to adc-helper changes supporting also single-ended and differential channels RFC v1 => v2: - Add event throttling (constant delay of 1 sec) - rename variable 'd' to 'data' - Use ADC helpers to detect pins used for ADC - bd79124 drop MFD and pinmux && handle GPO in this driver - Drop adc suffix from the IIO file name --- drivers/iio/adc/Kconfig | 12 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/rohm-bd79124.c | 1114 ++++++++++++++++++++++++++++++++ 3 files changed, 1127 insertions(+) create mode 100644 drivers/iio/adc/rohm-bd79124.c diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index d16082ac2e1f..357214bc5024 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -1191,6 +1191,18 @@ config RN5T618_ADC This driver can also be built as a module. If so, the module will be called rn5t618-adc. +config ROHM_BD79124 + tristate "Rohm BD79124 ADC driver" + depends on I2C + select REGMAP_I2C + select IIO_ADC_HELPER + help + Say yes here to build support for the ROHM BD79124 ADC. The + ROHM BD79124 is a 12-bit, 8-channel, SAR ADC. The ADC supports + also an automatic measurement mode, with an alarm interrupt for + out-of-window measurements. The window is configurable for each + channel. + config ROCKCHIP_SARADC tristate "Rockchip SARADC driver" depends on ARCH_ROCKCHIP || COMPILE_TEST diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile index 1c410f483029..3e10af9ec4c4 100644 --- a/drivers/iio/adc/Makefile +++ b/drivers/iio/adc/Makefile @@ -109,6 +109,7 @@ obj-$(CONFIG_QCOM_VADC_COMMON) += qcom-vadc-common.o obj-$(CONFIG_RCAR_GYRO_ADC) += rcar-gyroadc.o obj-$(CONFIG_RICHTEK_RTQ6056) += rtq6056.o obj-$(CONFIG_RN5T618_ADC) += rn5t618-adc.o +obj-$(CONFIG_ROHM_BD79124) += rohm-bd79124.o obj-$(CONFIG_ROCKCHIP_SARADC) += rockchip_saradc.o obj-$(CONFIG_RZG2L_ADC) += rzg2l_adc.o obj-$(CONFIG_SC27XX_ADC) += sc27xx_adc.o diff --git a/drivers/iio/adc/rohm-bd79124.c b/drivers/iio/adc/rohm-bd79124.c new file mode 100644 index 000000000000..b3ef0e0c9a3a --- /dev/null +++ b/drivers/iio/adc/rohm-bd79124.c @@ -0,0 +1,1114 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * ROHM ADC driver for BD79124 ADC/GPO device + * https://fscdn.rohm.com/en/products/databook/datasheet/ic/data_converter/dac/bd79124muf-c-e.pdf + * + * Copyright (c) 2025, ROHM Semiconductor. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#define BD79124_I2C_MULTI_READ 0x30 +#define BD79124_I2C_MULTI_WRITE 0x28 +#define BD79124_REG_MAX 0xaf + +#define BD79124_REG_SYSTEM_STATUS 0x0 +#define BD79124_REG_GEN_CFG 0x01 +#define BD79124_REG_OPMODE_CFG 0x04 +#define BD79124_REG_PINCFG 0x05 +#define BD79124_REG_GPO_VAL 0x0B +#define BD79124_REG_SEQUENCE_CFG 0x10 +#define BD79124_REG_MANUAL_CHANNELS 0x11 +#define BD79124_REG_AUTO_CHANNELS 0x12 +#define BD79124_REG_ALERT_CH_SEL 0x14 +#define BD79124_REG_EVENT_FLAG 0x18 +#define BD79124_REG_EVENT_FLAG_HI 0x1a +#define BD79124_REG_EVENT_FLAG_LO 0x1c +#define BD79124_REG_HYSTERESIS_CH0 0x20 +#define BD79124_REG_EVENTCOUNT_CH0 0x22 +#define BD79124_REG_RECENT_CH0_LSB 0xa0 +#define BD79124_REG_RECENT_CH7_MSB 0xaf + +#define BD79124_ADC_BITS 12 +#define BD79124_MASK_CONV_MODE GENMASK(6, 5) +#define BD79124_MASK_AUTO_INTERVAL GENMASK(1, 0) +#define BD79124_CONV_MODE_MANSEQ 0 +#define BD79124_CONV_MODE_AUTO 1 +#define BD79124_INTERVAL_075 0 +#define BD79124_INTERVAL_150 1 +#define BD79124_INTERVAL_300 2 +#define BD79124_INTERVAL_600 3 + +#define BD79124_MASK_DWC_EN BIT(4) +#define BD79124_MASK_STATS_EN BIT(5) +#define BD79124_MASK_SEQ_START BIT(4) +#define BD79124_MASK_SEQ_MODE GENMASK(1, 0) +#define BD79124_MASK_SEQ_MANUAL 0 +#define BD79124_MASK_SEQ_SEQ 1 + +#define BD79124_MASK_HYSTERESIS GENMASK(3, 0) +#define BD79124_LOW_LIMIT_MIN 0 +#define BD79124_HIGH_LIMIT_MAX GENMASK(11, 0) + +/* + * The high limit, low limit and last measurement result are each stored in + * 2 consequtive registers. 4 bits are in the high bits of the 1.st register + * and 8 bits in the next register. + * + * These macros return the address of the 1.st reg for the given channel + */ +#define BD79124_GET_HIGH_LIMIT_REG(ch) (BD79124_REG_HYSTERESIS_CH0 + (ch) * 4) +#define BD79124_GET_LOW_LIMIT_REG(ch) (BD79124_REG_EVENTCOUNT_CH0 + (ch) * 4) +#define BD79124_GET_LIMIT_REG(ch, dir) ((dir) == IIO_EV_DIR_RISING ? \ + BD79124_GET_HIGH_LIMIT_REG(ch) : BD79124_GET_LOW_LIMIT_REG(ch)) +#define BD79124_GET_RECENT_RES_REG(ch) (BD79124_REG_RECENT_CH0_LSB + (ch) * 2) + +/* + * The hysteresis for a channel is stored in the same register where the + * 4 bits of high limit reside. + */ +#define BD79124_GET_HYSTERESIS_REG(ch) BD79124_GET_HIGH_LIMIT_REG(ch) + +#define BD79124_MAX_NUM_CHANNELS 8 + +struct bd79124_data { + s64 timestamp; + struct regmap *map; + struct device *dev; + int vmax; + /* + * Keep measurement status so read_raw() knows if the measurement needs + * to be started. + */ + int alarm_monitored[BD79124_MAX_NUM_CHANNELS]; + /* + * The BD79124 does not allow disabling/enabling limit separately for + * one direction only. Hence, we do the disabling by changing the limit + * to maximum/minimum measurable value. This means we need to cache + * the limit in order to maintain it over the time limit is disabled. + */ + u16 alarm_r_limit[BD79124_MAX_NUM_CHANNELS]; + u16 alarm_f_limit[BD79124_MAX_NUM_CHANNELS]; + /* Bitmask of disabled events (for rate limiting) for each channel. */ + int alarm_suppressed[BD79124_MAX_NUM_CHANNELS]; + /* + * The BD79124 is configured to run the measurements in the background. + * This is done for the event monitoring as well as for the read_raw(). + * Protect the measurement starting/stopping using a mutex. + */ + struct mutex mutex; + struct delayed_work alm_enable_work; + struct gpio_chip gc; + u8 gpio_valid_mask; +}; + +/* Read-only regs */ +static const struct regmap_range bd79124_ro_ranges[] = { + { + .range_min = BD79124_REG_EVENT_FLAG, + .range_max = BD79124_REG_EVENT_FLAG, + }, { + .range_min = BD79124_REG_RECENT_CH0_LSB, + .range_max = BD79124_REG_RECENT_CH7_MSB, + }, +}; + +static const struct regmap_access_table bd79124_ro_regs = { + .no_ranges = &bd79124_ro_ranges[0], + .n_no_ranges = ARRAY_SIZE(bd79124_ro_ranges), +}; + +static const struct regmap_range bd79124_volatile_ranges[] = { + { + .range_min = BD79124_REG_RECENT_CH0_LSB, + .range_max = BD79124_REG_RECENT_CH7_MSB, + }, { + .range_min = BD79124_REG_EVENT_FLAG, + .range_max = BD79124_REG_EVENT_FLAG, + }, { + .range_min = BD79124_REG_EVENT_FLAG_HI, + .range_max = BD79124_REG_EVENT_FLAG_HI, + }, { + .range_min = BD79124_REG_EVENT_FLAG_LO, + .range_max = BD79124_REG_EVENT_FLAG_LO, + }, { + .range_min = BD79124_REG_SYSTEM_STATUS, + .range_max = BD79124_REG_SYSTEM_STATUS, + }, +}; + +static const struct regmap_access_table bd79124_volatile_regs = { + .yes_ranges = &bd79124_volatile_ranges[0], + .n_yes_ranges = ARRAY_SIZE(bd79124_volatile_ranges), +}; + +static const struct regmap_range bd79124_precious_ranges[] = { + { + .range_min = BD79124_REG_EVENT_FLAG_HI, + .range_max = BD79124_REG_EVENT_FLAG_HI, + }, { + .range_min = BD79124_REG_EVENT_FLAG_LO, + .range_max = BD79124_REG_EVENT_FLAG_LO, + }, +}; + +static const struct regmap_access_table bd79124_precious_regs = { + .yes_ranges = &bd79124_precious_ranges[0], + .n_yes_ranges = ARRAY_SIZE(bd79124_precious_ranges), +}; + +static const struct regmap_config bd79124_regmap = { + .reg_bits = 16, + .val_bits = 8, + .read_flag_mask = BD79124_I2C_MULTI_READ, + .write_flag_mask = BD79124_I2C_MULTI_WRITE, + .max_register = BD79124_REG_MAX, + .cache_type = REGCACHE_MAPLE, + .volatile_table = &bd79124_volatile_regs, + .wr_table = &bd79124_ro_regs, + .precious_table = &bd79124_precious_regs, +}; + +static int bd79124gpo_direction_get(struct gpio_chip *gc, unsigned int offset) +{ + return GPIO_LINE_DIRECTION_OUT; +} + +static void bd79124gpo_set(struct gpio_chip *gc, unsigned int offset, int value) +{ + struct bd79124_data *data = gpiochip_get_data(gc); + + if (value) + regmap_set_bits(data->map, BD79124_REG_GPO_VAL, BIT(offset)); + else + regmap_clear_bits(data->map, BD79124_REG_GPO_VAL, BIT(offset)); +} + +static void bd79124gpo_set_multiple(struct gpio_chip *gc, unsigned long *mask, + unsigned long *bits) +{ + int ret, val; + struct bd79124_data *data = gpiochip_get_data(gc); + + /* Ensure all GPIOs in 'mask' are set to be GPIOs */ + ret = regmap_read(data->map, BD79124_REG_PINCFG, &val); + if (ret) + return; + + if ((val & *mask) != *mask) { + dev_dbg(data->dev, "Invalid mux config. Can't set value.\n"); + /* Do not set value for pins configured as ADC inputs */ + *mask &= val; + } + + regmap_update_bits(data->map, BD79124_REG_GPO_VAL, *mask, *bits); +} + +static int bd79124_init_valid_mask(struct gpio_chip *gc, + unsigned long *valid_mask, + unsigned int ngpios) +{ + struct bd79124_data *data = gpiochip_get_data(gc); + + *valid_mask = data->gpio_valid_mask; + + return 0; +} + +/* Template for GPIO chip */ +static const struct gpio_chip bd79124gpo_chip = { + .label = "bd79124-gpo", + .get_direction = bd79124gpo_direction_get, + .set = bd79124gpo_set, + .set_multiple = bd79124gpo_set_multiple, + .init_valid_mask = bd79124_init_valid_mask, + .can_sleep = true, + .ngpio = 8, + .base = -1, +}; + +struct bd79124_raw { + u8 bit0_3; /* Is set in high bits of the byte */ + u8 bit4_11; +}; +#define BD79124_RAW_TO_INT(r) ((r.bit4_11 << 4) | (r.bit0_3 >> 4)) + +/* + * The high and low limits as well as the recent result values are stored in + * the same way in 2 consequent registers. The first register contains 4 bits + * of the value. These bits are stored in the high bits [7:4] of register, but + * they represent the low bits [3:0] of the value. + * The value bits [11:4] are stored in the next register. + * + * Read data from register and convert to integer. + */ +static int bd79124_read_reg_to_int(struct bd79124_data *data, int reg, + unsigned int *val) +{ + int ret; + struct bd79124_raw raw; + + ret = regmap_bulk_read(data->map, reg, &raw, sizeof(raw)); + if (ret) { + dev_dbg(data->dev, "bulk_read failed %d\n", ret); + + return ret; + } + + *val = BD79124_RAW_TO_INT(raw); + + return 0; +} + +/* + * The high and low limits as well as the recent result values are stored in + * the same way in 2 consequent registers. The first register contains 4 bits + * of the value. These bits are stored in the high bits [7:4] of register, but + * they represent the low bits [3:0] of the value. + * The value bits [11:4] are stored in the next regoster. + * + * Conver the integer to register format and write it using rmw cycle. + */ +static int bd79124_write_int_to_reg(struct bd79124_data *data, int reg, + unsigned int val) +{ + struct bd79124_raw raw; + int ret, tmp; + + raw.bit4_11 = (u8)(val >> 4); + raw.bit0_3 = (u8)(val << 4); + + ret = regmap_read(data->map, reg, &tmp); + if (ret) + return ret; + + raw.bit0_3 |= (0xf & tmp); + + return regmap_bulk_write(data->map, reg, &raw, sizeof(raw)); +} + +static const struct iio_event_spec bd79124_events[] = { + { + .type = IIO_EV_TYPE_THRESH, + .dir = IIO_EV_DIR_RISING, + .mask_separate = BIT(IIO_EV_INFO_VALUE) | + BIT(IIO_EV_INFO_ENABLE), + }, + { + .type = IIO_EV_TYPE_THRESH, + .dir = IIO_EV_DIR_FALLING, + .mask_separate = BIT(IIO_EV_INFO_VALUE) | + BIT(IIO_EV_INFO_ENABLE), + }, + { + .type = IIO_EV_TYPE_THRESH, + .dir = IIO_EV_DIR_EITHER, + .mask_separate = BIT(IIO_EV_INFO_HYSTERESIS), + }, +}; + +static const struct iio_chan_spec bd79124_chan_template_noirq = { + .type = IIO_VOLTAGE, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), + .indexed = 1, +}; + +static const struct iio_chan_spec bd79124_chan_template = { + .type = IIO_VOLTAGE, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), + .indexed = 1, + .event_spec = bd79124_events, + .num_event_specs = ARRAY_SIZE(bd79124_events), +}; + +static int bd79124_read_event_value(struct iio_dev *iio_dev, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir, + enum iio_event_info info, int *val, + int *val2) +{ + struct bd79124_data *data = iio_priv(iio_dev); + int ret, reg; + + if (chan->channel >= BD79124_MAX_NUM_CHANNELS) + return -EINVAL; + + switch (info) { + case IIO_EV_INFO_VALUE: + if (dir == IIO_EV_DIR_RISING) + *val = data->alarm_r_limit[chan->channel]; + else if (dir == IIO_EV_DIR_FALLING) + *val = data->alarm_f_limit[chan->channel]; + else + return -EINVAL; + + return IIO_VAL_INT; + + case IIO_EV_INFO_HYSTERESIS: + reg = BD79124_GET_HYSTERESIS_REG(chan->channel); + ret = regmap_read(data->map, reg, val); + if (ret) + return ret; + /* Mask the non hysteresis bits */ + *val &= BD79124_MASK_HYSTERESIS; + /* + * The data-sheet says the hysteresis register value needs to be + * sifted left by 3 (or multiplied by 8, depending on the + * page :] ) + */ + *val <<= 3; + + return IIO_VAL_INT; + default: + return -EINVAL; + } +} + +static int bd79124_start_measurement(struct bd79124_data *data, int chan) +{ + int val, ret, regval; + + /* See if already started */ + ret = regmap_read(data->map, BD79124_REG_AUTO_CHANNELS, &val); + if (val & BIT(chan)) + return 0; + + ret = regmap_clear_bits(data->map, BD79124_REG_SEQUENCE_CFG, + BD79124_MASK_SEQ_START); + if (ret) + return ret; + + /* Add the channel to measured channels */ + ret = regmap_write(data->map, BD79124_REG_AUTO_CHANNELS, val | BIT(chan)); + if (ret) + return ret; + + ret = regmap_set_bits(data->map, BD79124_REG_SEQUENCE_CFG, + BD79124_MASK_SEQ_START); + if (ret) + return ret; + + /* + * Start the measurement at the background. Don't bother checking if + * it was started, regmap has cache. + */ + regval = FIELD_PREP(BD79124_MASK_CONV_MODE, BD79124_CONV_MODE_AUTO); + + return regmap_update_bits(data->map, BD79124_REG_OPMODE_CFG, + BD79124_MASK_CONV_MODE, regval); +} + +static int bd79124_stop_measurement(struct bd79124_data *data, int chan) +{ + int val, ret; + + /* See if already stopped */ + ret = regmap_read(data->map, BD79124_REG_AUTO_CHANNELS, &val); + if (!(val & BIT(chan))) + return 0; + + ret = regmap_clear_bits(data->map, BD79124_REG_SEQUENCE_CFG, + BD79124_MASK_SEQ_START); + + /* Clear the channel from the measured channels */ + ret = regmap_write(data->map, BD79124_REG_AUTO_CHANNELS, + (~BIT(chan)) & val); + if (ret) + return ret; + + /* + * Stop background conversion for power saving if it was the last + * channel + */ + if (!((~BIT(chan)) & val)) { + int regval = FIELD_PREP(BD79124_MASK_CONV_MODE, + BD79124_CONV_MODE_MANSEQ); + + ret = regmap_update_bits(data->map, BD79124_REG_OPMODE_CFG, + BD79124_MASK_CONV_MODE, regval); + if (ret) + return ret; + } + + return regmap_set_bits(data->map, BD79124_REG_SEQUENCE_CFG, + BD79124_MASK_SEQ_START); +} + +static int bd79124_read_event_config(struct iio_dev *iio_dev, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir) +{ + struct bd79124_data *data = iio_priv(iio_dev); + + if (chan->channel >= BD79124_MAX_NUM_CHANNELS) + return -EINVAL; + + return (data->alarm_monitored[chan->channel] & BIT(dir)); +} + +static int bd79124_disable_event(struct bd79124_data *data, + enum iio_event_direction dir, int channel) +{ + int dir_bit = BIT(dir), reg; + unsigned int limit; + + guard(mutex)(&data->mutex); + /* + * Set thresholds either to 0 or to 2^12 - 1 as appropriate to prevent + * alerts and thus disable event generation. + */ + if (dir == IIO_EV_DIR_RISING) { + reg = BD79124_GET_HIGH_LIMIT_REG(channel); + limit = BD79124_HIGH_LIMIT_MAX; + } else if (dir == IIO_EV_DIR_FALLING) { + reg = BD79124_GET_LOW_LIMIT_REG(channel); + limit = BD79124_LOW_LIMIT_MIN; + } else { + return -EINVAL; + } + + data->alarm_monitored[channel] &= (~dir_bit); + /* + * Stop measurement if there is no more events to monitor. + * We don't bother checking the retval because the limit + * setting should in any case effectively disable the alarm. + */ + if (!data->alarm_monitored[channel]) { + bd79124_stop_measurement(data, channel); + regmap_clear_bits(data->map, BD79124_REG_ALERT_CH_SEL, + BIT(channel)); + } + + return bd79124_write_int_to_reg(data, reg, limit); +} + +static int bd79124_enable_event(struct bd79124_data *data, + enum iio_event_direction dir, unsigned int channel) +{ + int dir_bit = BIT(dir); + int reg; + u16 *limit; + int ret; + + guard(mutex)(&data->mutex); + /* Set channel to be measured */ + ret = bd79124_start_measurement(data, channel); + if (ret) + return ret; + + data->alarm_monitored[channel] |= dir_bit; + + /* Add the channel to the list of monitored channels */ + ret = regmap_set_bits(data->map, BD79124_REG_ALERT_CH_SEL, + BIT(channel)); + if (ret) + return ret; + + if (dir == IIO_EV_DIR_RISING) { + limit = &data->alarm_f_limit[channel]; + reg = BD79124_GET_HIGH_LIMIT_REG(channel); + } else { + limit = &data->alarm_f_limit[channel]; + reg = BD79124_GET_LOW_LIMIT_REG(channel); + } + /* Don't write the new limit to the hardware if we are in the + * rate-limit period. The timer which re-enables the event will set + * the limit. + */ + if (!(data->alarm_suppressed[channel] & dir_bit)) { + ret = bd79124_write_int_to_reg(data, reg, *limit); + if (ret) + return ret; + } + + /* + * Enable comparator. Trust the regmap cache, no need to check + * if it was already enabled. + * + * We could do this in the hw-init, but there may be users who + * never enable alarms and for them it makes sense to not + * enable the comparator at probe. + */ + return regmap_set_bits(data->map, BD79124_REG_GEN_CFG, + BD79124_MASK_DWC_EN); + +} + +static int bd79124_write_event_config(struct iio_dev *iio_dev, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir, bool state) +{ + struct bd79124_data *data = iio_priv(iio_dev); + + if (chan->channel >= BD79124_MAX_NUM_CHANNELS) + return -EINVAL; + + if (state) + return bd79124_enable_event(data, dir, chan->channel); + + return bd79124_disable_event(data, dir, chan->channel); +} + +static int bd79124_write_event_value(struct iio_dev *iio_dev, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir, + enum iio_event_info info, int val, + int val2) +{ + struct bd79124_data *data = iio_priv(iio_dev); + int reg; + + if (chan->channel >= BD79124_MAX_NUM_CHANNELS) + return -EINVAL; + + switch (info) { + case IIO_EV_INFO_VALUE: + if (dir == IIO_EV_DIR_RISING) { + guard(mutex)(&data->mutex); + + data->alarm_r_limit[chan->channel] = val; + reg = BD79124_GET_HIGH_LIMIT_REG(chan->channel); + } else if (dir == IIO_EV_DIR_FALLING) { + guard(mutex)(&data->mutex); + + data->alarm_f_limit[chan->channel] = val; + reg = BD79124_GET_LOW_LIMIT_REG(chan->channel); + } else { + return -EINVAL; + } + /* + * We don't want to enable the alarm if it is not enabled or + * if it is suppressed. In that case skip writing to the + * register. + */ + if (!(data->alarm_monitored[chan->channel] & BIT(dir)) || + data->alarm_suppressed[chan->channel] & BIT(dir)) + return 0; + + return bd79124_write_int_to_reg(data, reg, val); + + case IIO_EV_INFO_HYSTERESIS: + reg = BD79124_GET_HYSTERESIS_REG(chan->channel); + val >>= 3; + + return regmap_update_bits(data->map, reg, BD79124_MASK_HYSTERESIS, + val); + default: + return -EINVAL; + } +} + +static int bd79124_single_chan_seq(struct bd79124_data *data, int chan, int *old) +{ + int ret; + + ret = regmap_clear_bits(data->map, BD79124_REG_SEQUENCE_CFG, + BD79124_MASK_SEQ_START); + if (ret) + return ret; + + /* + * It may be we have some channels monitored for alarms so we want to + * cache the old config and return it when the single channel + * measurement has been completed. + */ + ret = regmap_read(data->map, BD79124_REG_AUTO_CHANNELS, old); + if (ret) + return ret; + + ret = regmap_write(data->map, BD79124_REG_AUTO_CHANNELS, BIT(chan)); + if (ret) + return ret; + + /* Restart the sequencer */ + return regmap_set_bits(data->map, BD79124_REG_SEQUENCE_CFG, + BD79124_MASK_SEQ_START); +} + +static int bd79124_single_chan_seq_end(struct bd79124_data *data, int old) +{ + int ret; + + ret = regmap_clear_bits(data->map, BD79124_REG_SEQUENCE_CFG, + BD79124_MASK_SEQ_START); + if (ret) + return ret; + + ret = regmap_write(data->map, BD79124_REG_AUTO_CHANNELS, old); + if (ret) + return ret; + + return regmap_set_bits(data->map, BD79124_REG_SEQUENCE_CFG, + BD79124_MASK_SEQ_START); +} + +static int bd79124_read_raw(struct iio_dev *iio_dev, + struct iio_chan_spec const *chan, + int *val, int *val2, long m) +{ + struct bd79124_data *data = iio_priv(iio_dev); + int ret; + + if (chan->channel >= BD79124_MAX_NUM_CHANNELS) + return -EINVAL; + + switch (m) { + case IIO_CHAN_INFO_RAW: + { + int old_chan_cfg, tmp; + int regval; + + guard(mutex)(&data->mutex); + + /* + * Start the automatic conversion. This is needed here if no + * events have been enabled. + */ + regval = FIELD_PREP(BD79124_MASK_CONV_MODE, + BD79124_CONV_MODE_AUTO); + ret = regmap_update_bits(data->map, BD79124_REG_OPMODE_CFG, + BD79124_MASK_CONV_MODE, regval); + if (ret) + return ret; + + ret = bd79124_single_chan_seq(data, chan->channel, &old_chan_cfg); + if (ret) + return ret; + + /* The maximum conversion time is 6 uS. */ + udelay(6); + + ret = bd79124_read_reg_to_int(data, + BD79124_GET_RECENT_RES_REG(chan->channel), + val); + /* + * Return the old chan config even if data reading failed in + * order to re-enable the event monitoring. + */ + tmp = bd79124_single_chan_seq_end(data, old_chan_cfg); + if (tmp) + dev_err(data->dev, + "Failed to return config. Alarms may be disabled\n"); + + if (ret) + return ret; + + return IIO_VAL_INT; + } + case IIO_CHAN_INFO_SCALE: + *val = data->vmax / 1000; + *val2 = BD79124_ADC_BITS; + return IIO_VAL_FRACTIONAL_LOG2; + default: + return -EINVAL; + } +} + +static const struct iio_info bd79124_info = { + .read_raw = bd79124_read_raw, + .read_event_config = &bd79124_read_event_config, + .write_event_config = &bd79124_write_event_config, + .read_event_value = &bd79124_read_event_value, + .write_event_value = &bd79124_write_event_value, +}; + +static void bd79124_re_enable_lo(struct bd79124_data *data, unsigned int channel) +{ + int ret, evbit = BIT(IIO_EV_DIR_FALLING); + + if (!(data->alarm_suppressed[channel] & evbit)) + return; + + data->alarm_suppressed[channel] &= (~evbit); + + if (!(data->alarm_monitored[channel] & evbit)) + return; + + ret = bd79124_write_int_to_reg(data, BD79124_GET_LOW_LIMIT_REG(channel), + data->alarm_f_limit[channel]); + if (ret) + dev_warn(data->dev, "Low limit enabling failed for channel%d\n", + channel); +} + +static void bd79124_re_enable_hi(struct bd79124_data *data, unsigned int channel) +{ + int ret, evbit = BIT(IIO_EV_DIR_RISING); + + if (!(data->alarm_suppressed[channel] & evbit)) + return; + + data->alarm_suppressed[channel] &= (~evbit); + + if (!(data->alarm_monitored[channel] & evbit)) + return; + + ret = bd79124_write_int_to_reg(data, BD79124_GET_HIGH_LIMIT_REG(channel), + data->alarm_r_limit[channel]); + if (ret) + dev_warn(data->dev, "High limit enabling failed for channel%d\n", + channel); +} + +static void bd79124_alm_enable_worker(struct work_struct *work) +{ + int i; + struct bd79124_data *data = container_of(work, struct bd79124_data, + alm_enable_work.work); + + guard(mutex)(&data->mutex); + /* + * We should not re-enable the event if user has disabled it while + * rate-limiting was enabled. + */ + for (i = 0; i < BD79124_MAX_NUM_CHANNELS; i++) { + bd79124_re_enable_hi(data, i); + bd79124_re_enable_lo(data, i); + } +} + +static int __bd79124_event_ratelimit(struct bd79124_data *data, int reg, + unsigned int limit) +{ + int ret; + + if (limit > BD79124_HIGH_LIMIT_MAX) + return -EINVAL; + + ret = bd79124_write_int_to_reg(data, reg, limit); + if (ret) + return ret; + + /* + * We use 1 sec 'grace period'. At the moment I see no reason to make + * this user configurable. We need an ABI for this if configuration is + * needed. + */ + schedule_delayed_work(&data->alm_enable_work, + msecs_to_jiffies(1000)); + + return 0; +} + +static int bd79124_event_ratelimit_hi(struct bd79124_data *data, + unsigned int channel) +{ + guard(mutex)(&data->mutex); + data->alarm_suppressed[channel] |= BIT(IIO_EV_DIR_RISING); + + return __bd79124_event_ratelimit(data, + BD79124_GET_HIGH_LIMIT_REG(channel), + BD79124_HIGH_LIMIT_MAX); +} + +static int bd79124_event_ratelimit_lo(struct bd79124_data *data, + unsigned int channel) +{ + guard(mutex)(&data->mutex); + data->alarm_suppressed[channel] |= BIT(IIO_EV_DIR_FALLING); + + return __bd79124_event_ratelimit(data, + BD79124_GET_LOW_LIMIT_REG(channel), + BD79124_LOW_LIMIT_MIN); +} + +static irqreturn_t bd79124_event_handler(int irq, void *priv) +{ + int ret, i_hi, i_lo, i; + struct iio_dev *iio_dev = priv; + struct bd79124_data *data = iio_priv(iio_dev); + + /* + * Return IRQ_NONE if bailing-out without acking. This allows the IRQ + * subsystem to disable the offending IRQ line if we get a hardware + * problem. This behaviour has saved my poor bottom a few times in the + * past as, instead of getting unusably unresponsive, the system has + * spilled out the magic words "...nobody cared". + */ + ret = regmap_read(data->map, BD79124_REG_EVENT_FLAG_HI, &i_hi); + if (ret) + return IRQ_NONE; + + ret = regmap_read(data->map, BD79124_REG_EVENT_FLAG_LO, &i_lo); + if (ret) + return IRQ_NONE; + + if (!i_lo && !i_hi) + return IRQ_NONE; + + for (i = 0; i < BD79124_MAX_NUM_CHANNELS; i++) { + u64 ecode; + + if (BIT(i) & i_hi) { + ecode = IIO_UNMOD_EVENT_CODE(IIO_VOLTAGE, i, + IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING); + + iio_push_event(iio_dev, ecode, data->timestamp); + /* + * The BD79124 keeps the IRQ asserted for as long as + * the voltage exceeds the threshold. It causes the IRQ + * to keep firing. + * + * Disable the event for the channel and schedule the + * re-enabling the event later to prevent storm of + * events. + */ + ret = bd79124_event_ratelimit_hi(data, i); + if (ret) + return IRQ_NONE; + } + if (BIT(i) & i_lo) { + ecode = IIO_UNMOD_EVENT_CODE(IIO_VOLTAGE, i, + IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING); + + iio_push_event(iio_dev, ecode, data->timestamp); + ret = bd79124_event_ratelimit_lo(data, i); + if (ret) + return IRQ_NONE; + } + } + + ret = regmap_write(data->map, BD79124_REG_EVENT_FLAG_HI, i_hi); + if (ret) + return IRQ_NONE; + + ret = regmap_write(data->map, BD79124_REG_EVENT_FLAG_LO, i_lo); + if (ret) + return IRQ_NONE; + + return IRQ_HANDLED; +} + +static irqreturn_t bd79124_irq_handler(int irq, void *priv) +{ + struct iio_dev *iio_dev = priv; + struct bd79124_data *data = iio_priv(iio_dev); + + data->timestamp = iio_get_time_ns(iio_dev); + + return IRQ_WAKE_THREAD; +} + +struct bd79124_reg_init { + int reg; + int val; +}; + +static int bd79124_chan_init(struct bd79124_data *data, int channel) +{ + int ret; + + ret = regmap_write(data->map, BD79124_GET_HIGH_LIMIT_REG(channel), 4095); + if (ret) + return ret; + + return regmap_write(data->map, BD79124_GET_LOW_LIMIT_REG(channel), 0); +} + +static int bd79124_get_gpio_pins(const struct iio_chan_spec *cs, int num_channels) +{ + int i, gpio_channels; + + /* + * Let's initialize the mux config to say that all 8 channels are + * GPIOs. Then we can just loop through the iio_chan_spec and clear the + * bits for found ADC channels. + */ + gpio_channels = GENMASK(7, 0); + for (i = 0; i < num_channels; i++) + gpio_channels &= (~BIT(cs[i].channel)); + + return gpio_channels; +} + +static int bd79124_init_mux(struct bd79124_data *data, int gpio_pins) +{ + return regmap_write(data->map, BD79124_REG_PINCFG, gpio_pins); +} + +static int bd79124_hw_init(struct bd79124_data *data, int gpio_pins) +{ + int ret, regval, i; + + ret = bd79124_init_mux(data, gpio_pins); + if (ret) + return ret; + + for (i = 0; i < BD79124_MAX_NUM_CHANNELS; i++) { + ret = bd79124_chan_init(data, i); + if (ret) + return ret; + data->alarm_r_limit[i] = 4095; + } + /* Stop auto sequencer */ + ret = regmap_clear_bits(data->map, BD79124_REG_SEQUENCE_CFG, + BD79124_MASK_SEQ_START); + if (ret) + return ret; + + /* Enable writing the measured values to the regsters */ + ret = regmap_set_bits(data->map, BD79124_REG_GEN_CFG, + BD79124_MASK_STATS_EN); + if (ret) + return ret; + + /* Set no channels to be auto-measured */ + ret = regmap_write(data->map, BD79124_REG_AUTO_CHANNELS, 0x0); + if (ret) + return ret; + + /* Set no channels to be manually measured */ + ret = regmap_write(data->map, BD79124_REG_MANUAL_CHANNELS, 0x0); + if (ret) + return ret; + + /* Set the measurement interval to 0.75 mS */ + regval = FIELD_PREP(BD79124_MASK_AUTO_INTERVAL, BD79124_INTERVAL_075); + ret = regmap_update_bits(data->map, BD79124_REG_OPMODE_CFG, + BD79124_MASK_AUTO_INTERVAL, regval); + if (ret) + return ret; + + /* Sequencer mode to auto */ + ret = regmap_set_bits(data->map, BD79124_REG_SEQUENCE_CFG, + BD79124_MASK_SEQ_SEQ); + if (ret) + return ret; + + /* Don't start the measurement */ + regval = FIELD_PREP(BD79124_MASK_CONV_MODE, BD79124_CONV_MODE_MANSEQ); + return regmap_update_bits(data->map, BD79124_REG_OPMODE_CFG, + BD79124_MASK_CONV_MODE, regval); + +} + +static int bd79124_probe(struct i2c_client *i2c) +{ + struct bd79124_data *data; + struct iio_dev *iio_dev; + const struct iio_chan_spec *template; + struct iio_chan_spec *cs; + struct device *dev = &i2c->dev; + int gpio_pins, ret; + + iio_dev = devm_iio_device_alloc(dev, sizeof(*data)); + if (!iio_dev) + return -ENOMEM; + + data = iio_priv(iio_dev); + data->dev = dev; + data->map = devm_regmap_init_i2c(i2c, &bd79124_regmap); + if (IS_ERR(data->map)) + return dev_err_probe(dev, PTR_ERR(data->map), + "Failed to initialize Regmap\n"); + + ret = devm_regulator_get_enable_read_voltage(dev, "vdd"); + if (ret < 0) + return dev_err_probe(dev, ret, "Failed to get the Vdd\n"); + + data->vmax = ret; + + ret = devm_regulator_get_enable(dev, "iovdd"); + if (ret < 0) + return dev_err_probe(dev, ret, "Failed to enable I/O voltage\n"); + + ret = devm_delayed_work_autocancel(dev, &data->alm_enable_work, + bd79124_alm_enable_worker); + if (ret) + return ret; + + if (i2c->irq) { + template = &bd79124_chan_template; + } else { + template = &bd79124_chan_template_noirq; + dev_dbg(dev, "No IRQ found, events disabled\n"); + } + ret = devm_iio_adc_device_alloc_chaninfo_se(dev, template, + BD79124_MAX_NUM_CHANNELS - 1, &cs); + if (ret < 0) + return ret; + + iio_dev->channels = cs; + iio_dev->num_channels = ret; + iio_dev->info = &bd79124_info; + iio_dev->name = "bd79124"; + iio_dev->modes = INDIO_DIRECT_MODE; + + gpio_pins = bd79124_get_gpio_pins(iio_dev->channels, + iio_dev->num_channels); + ret = bd79124_hw_init(data, gpio_pins); + if (ret) + return ret; + + data->gpio_valid_mask = gpio_pins; + data->gc = bd79124gpo_chip; + data->gc.parent = dev; + devm_mutex_init(dev, &data->mutex); + + ret = devm_gpiochip_add_data(dev, &data->gc, data); + if (ret) + return dev_err_probe(dev, ret, "gpio init Failed\n"); + + if (i2c->irq > 0) { + ret = devm_request_threaded_irq(dev, i2c->irq, + bd79124_irq_handler, &bd79124_event_handler, + IRQF_ONESHOT, "adc-thresh-alert", iio_dev); + if (ret) + return dev_err_probe(data->dev, ret, + "Failed to register IRQ\n"); + } + + return devm_iio_device_register(data->dev, iio_dev); +} + +static const struct of_device_id bd79124_of_match[] = { + { .compatible = "rohm,bd79124" }, + { } +}; +MODULE_DEVICE_TABLE(of, bd79124_of_match); + +static const struct i2c_device_id bd79124_id[] = { + { "bd79124", }, + { } +}; +MODULE_DEVICE_TABLE(i2c, bd79124_id); + +static struct i2c_driver bd79124_driver = { + .driver = { + .name = "bd79124", + .of_match_table = bd79124_of_match, + }, + .probe = bd79124_probe, + .id_table = bd79124_id, +}; +module_i2c_driver(bd79124_driver); + +MODULE_AUTHOR("Matti Vaittinen "); +MODULE_DESCRIPTION("Driver for ROHM BD79124 ADC"); +MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS("IIO_DRIVER"); From patchwork Mon Feb 24 18:34:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Vaittinen X-Patchwork-Id: 13988813 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 52EEAC021A4 for ; Mon, 24 Feb 2025 18:52:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=oIkYf97P4n3NLrtzlwokY4ULnxlvFjbpCf7nMOEO/04=; b=21qzXpsUm4rNnhdjHlzYIsys53 j1Uuzeg2QrebfrqjKbUQWRmtSQRBid3XdFIpqYhgbQ6Fjg5QzXqg23hJqz6hfY8BXKzgweoI4bQ+P LRjYEiRCM3/bwb8IiRxkLl1gOlU5YYW6GuD34r9gqiX36VED+tPMboLDsrA39XT3n31SaZSuXJ9Pf 4Q53bUYbNsHW0yN3w+HPFEQRAAYZnu74e1lkbmr0kQ4JPJhvFebf3GYXtNND5yFInldzHsxR9CiaS LmL7PB4nx4eZuFF8tSh8aj+loBRNmwgy64z93w/xJRkeVN6xdX8557fsdGZLtyTsoRxZImsiwgOj9 VfZi8VIQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tmdYk-0000000Esxn-3QYz; Mon, 24 Feb 2025 18:52:06 +0000 Received: from mail-lj1-x22d.google.com ([2a00:1450:4864:20::22d]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tmdI4-0000000EpoZ-0qk6 for linux-arm-kernel@lists.infradead.org; Mon, 24 Feb 2025 18:34:53 +0000 Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-30615661f98so45764291fa.2 for ; Mon, 24 Feb 2025 10:34:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740422090; x=1741026890; darn=lists.infradead.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=oIkYf97P4n3NLrtzlwokY4ULnxlvFjbpCf7nMOEO/04=; b=m2CDpTUe/NADttkDt1Pk1FCTtRv1g5BpLpoHWScjsWAFETb+I4T6XaWFPE/2ejxX7w 6AwfCRBZWdOtOP+kmxHp+ljB4IFxZiCbCCGUu2gRcERKgOF+4/U1gqzUrw4PftUVs8fC 69xxefHO95mC7AYmHzpt+tPI4LQ3ej/eeP1L+4wpz7zofFzYIr+PzKSGdYb/Uymrhxy8 mUcgDABgeJ0cvtDJ8+c6Vd+7x8fgdhqYqlpDNkg+zXXIgsDrfhIiAolWl5bfZG0NraT9 JhKIgUjxebvf8ZX84/CjzKvXB0AEdAVZTNB1lL3Kv8cE0/xgzRgA+4c/8tLrDyEw4RQs G6LA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740422090; x=1741026890; 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=oIkYf97P4n3NLrtzlwokY4ULnxlvFjbpCf7nMOEO/04=; b=QfSTLJ8ut5+CyDtQsFj9B0XG3/Ob6DWTAlG0xnL44AOIbKVCPZo6wiTG/SEMLRYqnz V4NxD/p1K3g22URdFK7a4fU2aKLpvIkyhq9RynbBuz6bapBE0CGG5mqxF4mxbFxdpnzr dCvbSNvTp1QoH4youvmbj0GOYnVQarPcdGnpVB1uXkstdsBBtamQSJdnCY71Ynh6h8/w 3PPhB2X4WvygQgUwB267so+GBLIRhm4SdQe2aTPXTeM9zBUTzCxORudRH/qoj1UH2qAu CkROK7w4dp3tKdwTNoCtejoToYA1ZY6pJ6MirQF2F2IBVaRfcpCSlH5FjD1aWVnc1tgQ Jh3Q== X-Forwarded-Encrypted: i=1; AJvYcCUi3aAb0uJJTkPA3FDZRzd2NN885QfPw68qz06q/T/Lv/L7C8S3QRKbh5IYvlsr1z317gYGBx6vVF/PPUrFSIrh@lists.infradead.org X-Gm-Message-State: AOJu0YwHtZYf7epk77qu7+IPe6Y6k5CcI4msB2ANWIulIDHymUyuSXhg H9VrHdhEDMgWL/IMrqDbmRoaePFP0oSvzFrTW0nPVWzPZZAT6B4U X-Gm-Gg: ASbGncst3srzzkNY/ObTO8WO0/XOLv3xe/i3WgvRUVTDLxukTRteg03sE41hG+iBbq2 fAnBEnZ5eSXZf4Af2qC8wV1OkSCsHRJHKx2CupwQRFM6/xFxf3dNNvODfS9oAh9bu/FF27s7OV0 BfqGWoNyr+ooMn8zThG6lbi3P+eN58Uzu2AgOArX02Q4Vuk0Y4iXRbTnhlMHQ4u2jensdfkAQ09 2HxyX7gjgHhpHCWS0vvYCJvLYSnxvx9gOwtPX5cLWMeYvPiQtcS9bAMDceP5DVdrnY0qZOUVUlV 9rFDfUw5oDqchUGe7buBQ2IstkK1ZbvU X-Google-Smtp-Source: AGHT+IHlnu2JCoyY3lnko7RRFUdy6VX59uK9aMyzAe5hg6Irx/qYyxzQ9YwTyDI8XMZofmwi5dO6yA== X-Received: by 2002:a2e:b8d1:0:b0:309:2627:8b04 with SMTP id 38308e7fff4ca-30a80c247d9mr1391031fa.9.1740422090039; Mon, 24 Feb 2025 10:34:50 -0800 (PST) Received: from mva-rohm ([2a10:a5c0:800d:dd00:8fdf:935a:2c85:d703]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-30a819f4f4csm52781fa.61.2025.02.24.10.34.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 10:34:49 -0800 (PST) Date: Mon, 24 Feb 2025 20:34:45 +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 09/10] MAINTAINERS: Add IIO ADC helpers Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250224_103452_246755_5C3944D2 X-CRM114-Status: GOOD ( 11.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add undersigned as a maintainer for the IIO ADC helpers. Signed-off-by: Matti Vaittinen --- Revision history: RFC v1 => v2: - New patch --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index efee40ea589f..c1821fa8099b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11200,6 +11200,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 From patchwork Mon Feb 24 18:34:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Vaittinen X-Patchwork-Id: 13988814 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8994DC021BB for ; Mon, 24 Feb 2025 18:53:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=wB6e0LbXYe7xZo2cDjAU++WyYsDziZwYbdBjD9+h5AA=; b=LT2sOZ7zSF8h+gQrrB8pGB/3SL vxTG+vfLQ6SJKuAJY9KoQACm09xcXmEG+oAJ9IWqPqXTOdFkguLrVlE16chV55ESTir8FBscOfvlj nWNWDPtH9ssxkwe+KvmFogDRn3Spok6ryaepzJ2rU08kIVNyjA8TZhZAAZBvfJDjRCkxnFecdpCfO lKv7IHxI1n5OGk9pjju77GhQ7Zn9ookJYYCrBqotv3VM7KCQwGBBGTJx3h4sOfgorBiFL913/isV+ iHaisDrTCrHie74OlJmiuQBPJCwVNC5Vvnu9NdnQrsW21AVR7JgkYZoLm0+kYCaoUfeHsCvabJClm 3RhDQaWw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tmdaD-0000000EtDL-2Pw6; Mon, 24 Feb 2025 18:53:37 +0000 Received: from mail-lj1-x22c.google.com ([2a00:1450:4864:20::22c]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tmdIH-0000000EpuB-3vG4 for linux-arm-kernel@lists.infradead.org; Mon, 24 Feb 2025 18:35:07 +0000 Received: by mail-lj1-x22c.google.com with SMTP id 38308e7fff4ca-30a317e4c27so41093781fa.2 for ; Mon, 24 Feb 2025 10:35:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740422104; x=1741026904; darn=lists.infradead.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=wB6e0LbXYe7xZo2cDjAU++WyYsDziZwYbdBjD9+h5AA=; b=mIC/5G7XZLXbnnSGMS9QxRMJO5VKzNX+i0emVmuo1krbaBe58Gv0gFncQQhiIqAY0f AwT01XhU011ks0oodiX6j+ZZKF2rx/pvKjzZTlZ5ua2kkehb5VsdqF/6KGv53fzegkJ2 PgRcTb3fIpllnIcG6+oF+upmeuK6Wdu6iKOrLWY22+YDVFbXxs9CXl1esUinkAlgpp5d 0VCEl0Hzts0F+QXNJb/NkwC3PHjbH8h8WLw9tg7mIKi2QG3lOZt4COtR027yu2C8YE20 I+xV1LFSzPDf68K5054GfVUJyf4BqkpKexfhmkIUdbH0FoYUauf7Zsu16BrwI0BkjNvq tKUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740422104; x=1741026904; 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=wB6e0LbXYe7xZo2cDjAU++WyYsDziZwYbdBjD9+h5AA=; b=l5fkkAGB4ukus6Qi2nqtJ0Q1H456ENWqDBpSA2FKpGiVGhfwABls/M5GWDAaueUH5i y1zoHci6Z9/iiH9laQEOlFCnb4mhEPPEEj8Jueuhx+3hpRcB1jQaNCWJPl4FL+KUkRQH 1PkZ448jvf52QuufRYb2gR8tyDXR+zj41LyWe6F38R5zSOMa6DvLZtVc4/xWSVooeCnF HxIbGhqKxQdtC0BklTncnf7xVNAWwey8aUlPF34j+bdnTYXZkNCX6Vx9kS6wjxzgI81e eIehuowffaerg4vWihUW0RbUoBPW+fSIBEeiCAMm/6pip1iTBci7hLbqBqwUCwei+6rg NCSg== X-Forwarded-Encrypted: i=1; AJvYcCWN+7hIG6HwXqhMp7rdHLkuCAUyo4uKyP3UqMDG5Bz33M2P6DA8RwE1899zoZ3IjN76pSDLvfkEk6lBForh8Kw1@lists.infradead.org X-Gm-Message-State: AOJu0Yylba1ugQoQXMJqK9G7uuJhXHlTeOavNmM7uju2z5sdWqO35PHE tzTjZqbXLDXCcPEU8PYYYhtP2ubixVZkcBZM70VMooCC4pDA7TsM X-Gm-Gg: ASbGncvtstTxN9HlpFNhGCig8i0Ajim5/UVdya+WSJOq4+XShpHmd5PEVaEUNMGKSwL rDOGUA1XKwensi2mfXS49QdtqwWKdpHwiG/8nlIrPdrcVmw2Pn1SB+Kf9BdoK5SS+lVERb1QmOf aJB2YpLC1+6nGppGgCpnT04Mvm6Ek8IEVhtejtRCjrFKkds8qxBTy/GMa4zjfFPkfq3i1g7i3rZ DKvuxi0BBqA6Px+qqo2+vOnmZrTcfhz+UL/DKjSG3xR++zEvSbURdTA899BweAfkDbk37k4tqn+ ffgkmmlCRblJAnJK36Do8IAf5XyyUZGe X-Google-Smtp-Source: AGHT+IFs7Y+fPcBuO8FWsGzVtgW29xKLHKqg2RgdPdKlbhb4D5IMevpKDqe0ksSM6DR2potkoMrNfA== X-Received: by 2002:a2e:81d2:0:b0:2fb:cc0:2a05 with SMTP id 38308e7fff4ca-30a80cba36dmr1382731fa.37.1740422103756; Mon, 24 Feb 2025 10:35:03 -0800 (PST) Received: from mva-rohm ([2a10:a5c0:800d:dd00:8fdf:935a:2c85:d703]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-30a819e0c3esm52791fa.7.2025.02.24.10.35.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 10:35:02 -0800 (PST) Date: Mon, 24 Feb 2025 20:34:58 +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 10/10] MAINTAINERS: Add ROHM BD79124 ADC/GPO Message-ID: <3d7ebd442adbba2719c6028308571995ec10f468.1740421249.git.mazziesaccount@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250224_103505_971010_E7792668 X-CRM114-Status: GOOD ( 12.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add undersigned as a maintainer for the ROHM BD79124 ADC/GPO driver. Signed-off-by: Matti Vaittinen --- Revision history: RFC v1 => v2: - Drop MFD and pinmux drivers --- MAINTAINERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index c1821fa8099b..b116a497d905 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -20533,6 +20533,11 @@ S: Supported F: drivers/power/supply/bd99954-charger.c F: drivers/power/supply/bd99954-charger.h +ROHM BD79124 ADC / GPO IC +M: Matti Vaittinen +S: Supported +F: drivers/iio/adc/rohm-bd79124.c + ROHM BH1745 COLOUR SENSOR M: Mudit Sharma L: linux-iio@vger.kernel.org