From nobody Fri Feb 13 17:30:43 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69047E7D0AC for ; Thu, 21 Sep 2023 20:25:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231671AbjIUUZ3 (ORCPT ); Thu, 21 Sep 2023 16:25:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232249AbjIUUZK (ORCPT ); Thu, 21 Sep 2023 16:25:10 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C26ED73AD5 for ; Thu, 21 Sep 2023 10:33:57 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-3226b8de467so535317f8f.3 for ; Thu, 21 Sep 2023 10:33:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1695317634; x=1695922434; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=y5XZRvh5FJ3F9RXkqi8NbBrwtIOGm1RUjmAFGYn0SWM=; b=JLwuvSRq2iI8y1NRhksb7fblxFUXl6RqQPpspzhudgUzafu9rVDcXQCeAvc66wgNR1 AzhGOdsEO5FEnLigknHA1ahWxzMMWOtebrBA6JiZwAcncrv/u6RDdsrvuDPQ5+P4N/3H ES+ZqO2WHd4QGreCSeSNvL1Qeo88sRkXMj3tu8uObkLaTydca/lrDGQIs5HA3yDsKgG5 Dcdp7QieDh1L3o84/HysbXRTX1deTnhk5oiCymyAcVZrptB3p/zmny84uw75/QFvs5Ao GqTBNgbwWZr9jfscfh4ZMb9Z8rnqPL52C5ucyb7gSyywyPtlW3gppwyl8kACaU1o5IJ6 cSug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695317634; x=1695922434; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y5XZRvh5FJ3F9RXkqi8NbBrwtIOGm1RUjmAFGYn0SWM=; b=opK+++jSzoFlcN5RlFZBh5VNYO98aCzNKXVC3QywTB3jSJMJI+mNA803tw9uPi7krf +jBzEkwA5/XNCCOxREKd5OoPWdi7/68EjlfaPjIN3u+3sWVellVy/bFpDUghfEpavcIt YYUl5mVVuIEM2ZhLsS1wcE5vzD1E2/YsupR5x1mbjSIkbGTv07jc9Carl6XAi9+YkGwO n947oAvgnKyYd5oYgeUXvlR4n7qcbIaMWuaqFm/LZruXc/7WJIROp36hPvsZt9fihZ96 7GmJjIUKuh2Ecg4Ytzcz1nOyx0YB6xCd8IYc2SfAltaOj7r+PD2LP6eAeoK//FzAlFhK 0xFQ== X-Gm-Message-State: AOJu0YzPn8Quld4GOtRfh54jCRGwQfatuN4HgvkHr9h7fC7ifOq8b8HZ msbKbaClbIKXP/Ck2SfW+NYtaYY7SNzo1D9Wzuddrxds X-Google-Smtp-Source: AGHT+IGc8rbAltPbhW/F+K8m0uCBqxxkmZHh/AgenqhR08Wj+pATxjfsKZe5oZaKwcnGW1CIGp0mkQ== X-Received: by 2002:adf:fd4f:0:b0:317:636b:fcb1 with SMTP id h15-20020adffd4f000000b00317636bfcb1mr5633352wrs.27.1695306151764; Thu, 21 Sep 2023 07:22:31 -0700 (PDT) Received: from localhost.localdomain (abordeaux-655-1-129-86.w90-5.abo.wanadoo.fr. [90.5.10.86]) by smtp.gmail.com with ESMTPSA id n11-20020a5d4c4b000000b0031fbbe347ebsm1901426wrt.22.2023.09.21.07.22.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 07:22:31 -0700 (PDT) From: David Lechner To: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-staging@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , =?UTF-8?q?Nuno=20S=C3=A1?= , Axel Haslam , Philip Molloy , David Lechner Subject: [PATCH 1/2] staging: iio: resolver: ad2s1210: add phase_lock_range attributes Date: Thu, 21 Sep 2023 09:19:28 -0500 Message-Id: <20230921141947.57784-3-dlechner@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921141947.57784-1-dlechner@baylibre.com> References: <20230921141947.57784-1-dlechner@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This adds new phase_lock_range and phase_lock_range_available attributes to the ad2s1210 resolver driver. These attributes allow the user to set the phase lock range bit in the control register to modify the behavior of the resolver to digital converter. Signed-off-by: David Lechner --- drivers/staging/iio/resolver/ad2s1210.c | 58 +++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/= resolver/ad2s1210.c index 71f0913b7e2e..f5b8b290e860 100644 --- a/drivers/staging/iio/resolver/ad2s1210.c +++ b/drivers/staging/iio/resolver/ad2s1210.c @@ -259,6 +259,60 @@ static ssize_t excitation_frequency_store(struct devic= e *dev, return ret; } =20 +static ssize_t phase_lock_range_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct ad2s1210_state *st =3D iio_priv(dev_to_iio_dev(dev)); + int ret; + + mutex_lock(&st->lock); + ret =3D regmap_test_bits(st->regmap, AD2S1210_REG_CONTROL, + AD2S1210_PHASE_LOCK_RANGE_44); + if (ret < 0) + goto error_ret; + + ret =3D sprintf(buf, "%d\n", ret ? 44 : 360); + +error_ret: + mutex_unlock(&st->lock); + return ret; +} + +static ssize_t phase_lock_range_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t len) +{ + struct ad2s1210_state *st =3D iio_priv(dev_to_iio_dev(dev)); + u16 udata; + int ret; + + ret =3D kstrtou16(buf, 10, &udata); + if (ret < 0 || (udata !=3D 44 && udata !=3D 360)) + return -EINVAL; + + mutex_lock(&st->lock); + + ret =3D regmap_update_bits(st->regmap, AD2S1210_REG_CONTROL, + AD2S1210_PHASE_LOCK_RANGE_44, + udata =3D=3D 44 ? AD2S1210_PHASE_LOCK_RANGE_44 : 0); + if (ret < 0) + goto error_ret; + + ret =3D len; + +error_ret: + mutex_unlock(&st->lock); + return ret; +} + +static ssize_t phase_lock_range_available_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + return sprintf(buf, "44 360\n"); +} + /* read the fault register since last sample */ static ssize_t ad2s1210_show_fault(struct device *dev, struct device_attribute *attr, char *buf) @@ -506,6 +560,8 @@ static int ad2s1210_write_raw(struct iio_dev *indio_dev, } =20 static IIO_DEVICE_ATTR_RW(excitation_frequency, 0); +static IIO_DEVICE_ATTR_RW(phase_lock_range, 0); +static IIO_DEVICE_ATTR_RO(phase_lock_range_available, 0); static IIO_DEVICE_ATTR(fault, 0644, ad2s1210_show_fault, ad2s1210_clear_fault, 0); =20 @@ -552,6 +608,8 @@ static const struct iio_chan_spec ad2s1210_channels[] = =3D { =20 static struct attribute *ad2s1210_attributes[] =3D { &iio_dev_attr_excitation_frequency.dev_attr.attr, + &iio_dev_attr_phase_lock_range.dev_attr.attr, + &iio_dev_attr_phase_lock_range_available.dev_attr.attr, &iio_dev_attr_fault.dev_attr.attr, &iio_dev_attr_los_thrd.dev_attr.attr, &iio_dev_attr_dos_ovr_thrd.dev_attr.attr, --=20 2.34.1 From nobody Fri Feb 13 17:30:43 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B615E7D0A2 for ; Thu, 21 Sep 2023 20:35:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232106AbjIUUek (ORCPT ); Thu, 21 Sep 2023 16:34:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231903AbjIUUd7 (ORCPT ); Thu, 21 Sep 2023 16:33:59 -0400 Received: from mail-lj1-x22f.google.com (mail-lj1-x22f.google.com [IPv6:2a00:1450:4864:20::22f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74B858D20B for ; Thu, 21 Sep 2023 10:42:57 -0700 (PDT) Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2c038a1e2e6so19415781fa.2 for ; Thu, 21 Sep 2023 10:42:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1695318176; x=1695922976; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SZXK6IdVBTSXcGTIHRUU/WhDyCqjH/rftizzn5sbxAE=; b=AfP5sIV15O62qqfqcrXKYc+BxLt5z5LEJscWFczrzt13fH4aDDufPgePXVsR1HVMIN z+aLDD0isRvTPZ2SpjPFReZdqGMSgfPob+j60GE8BI3GsQX1L1qZOf9C8kVjiTC1Ucuu 8bIhMdHGWTj7yUjNIg1KQ4crK2HM5pwXbg497QtbPwB5PZ0q9/qOh2xlg3DIhi/J32VX nMG6/6dRfh/eKl2ixyrS8GlFUtGeADOIhWkOblloIQsvUJ1+3fImLiOxMN0n+aVdqw3h zpSo0a1UmXD4r7Ba/PQOL/1VdKnqLhSy0VXHJgmATT7xrWfKIxA+YTzfpqI5Rt8Mamqv krjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695318176; x=1695922976; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SZXK6IdVBTSXcGTIHRUU/WhDyCqjH/rftizzn5sbxAE=; b=EzMKJkIXOVpKtK9oRC+iPHxoAC8t3jO+6TNKEpNYYCHP4b20l9wj8EYLRfTVEaOPm1 TlwfOGQGLgZ6O/dpgYY0iyW6VyfqOe134GYujapZPSSs1sPNhcJpl09NKUw3Hq2MMyZA L/UYDnc4nt2jLkWTO3lUZSEHS+j6ssgjX4MPo0kjafkcwWMK94Qb53MhqjuBUmzny8vw RCXNPkIgZmhf7/tLWBvJLE6nsAxuXN68TeWm+NkznUpxsGegtCl1KjSXtQZjemSyPsSL P34PjwcKOFl9036hkbD7D3vRwD+eQk1mueTG/+x1yGymLVNI+etS7ZqFa1rQhyJXeTmJ 8wAg== X-Gm-Message-State: AOJu0YznYDFwXNYvNzLbLloe7OzO27gdTtx+MYE9Zx4rHyiON0mVlD96 JvCACGkVVtqj4yYVhiQljkyDvqRUoByJ+Q1QJ6OoQoCA X-Google-Smtp-Source: AGHT+IFEoId9dhUAMXkJBPEIyyf6kDoS3FhAfCiTp3N7TsdUJvie1QeO4TIHK8ErhC7KtOLF/MPK6w== X-Received: by 2002:a5d:4292:0:b0:31f:f753:5897 with SMTP id k18-20020a5d4292000000b0031ff7535897mr4864012wrq.59.1695306150891; Thu, 21 Sep 2023 07:22:30 -0700 (PDT) Received: from localhost.localdomain (abordeaux-655-1-129-86.w90-5.abo.wanadoo.fr. [90.5.10.86]) by smtp.gmail.com with ESMTPSA id n11-20020a5d4c4b000000b0031fbbe347ebsm1901426wrt.22.2023.09.21.07.22.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 07:22:30 -0700 (PDT) From: David Lechner To: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-staging@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , =?UTF-8?q?Nuno=20S=C3=A1?= , Axel Haslam , Philip Molloy , David Lechner , Apelete Seketeli Subject: [v2 01/19] dt-bindings: iio: resolver: add devicetree bindings for ad2s1210 Date: Thu, 21 Sep 2023 09:19:27 -0500 Message-Id: <20230921141947.57784-2-dlechner@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921141947.57784-1-dlechner@baylibre.com> References: <20230921141947.57784-1-dlechner@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This adds new DeviceTree bindings for the Analog Devices, Inc. AD2S1210 resolver-to-digital converter. Co-developed-by: Apelete Seketeli Signed-off-by: Apelete Seketeli Signed-off-by: David Lechner --- v2 changes: * Add Co-developed-by: * Remove extraneous quotes on strings * Remove extraneous pipe on some multi-line descriptions .../bindings/iio/resolver/adi,ad2s1210.yaml | 150 ++++++++++++++++++ 1 file changed, 150 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/resolver/adi,ad2s= 1210.yaml diff --git a/Documentation/devicetree/bindings/iio/resolver/adi,ad2s1210.ya= ml b/Documentation/devicetree/bindings/iio/resolver/adi,ad2s1210.yaml new file mode 100644 index 000000000000..f55c9652cfb7 --- /dev/null +++ b/Documentation/devicetree/bindings/iio/resolver/adi,ad2s1210.yaml @@ -0,0 +1,150 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/iio/resolver/adi,ad2s1210.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Analog Devices AD2S1210 Resolver-to-Digital Converter + +maintainers: + - Michael Hennerich + +description: | + The AD2S1210 is a complete 10-bit to 16-bit resolution tracking + resolver-to-digital converter, integrating an on-board programmable + sinusoidal oscillator that provides sine wave excitation for + resolvers. + + The AD2S1210 allows the user to read the angular position or the + angular velocity data directly from the parallel outputs or through + the serial interface. + + A1 A0 Result + 0 0 Normal mode - position output + 0 1 Normal mode - velocity output + 1 0 Reserved + 1 1 Configuration mode + + In normal mode, the resolution of the digital output is selected using + the RES0 and RES1 input pins. In configuration mode, the resolution is + selected by setting the RES0 and RES1 bits in the control register. + + RES1 RES0 Resolution (Bits) + 0 0 10 + 0 1 12 + 1 0 14 + 1 1 16 + + Note on SPI connections: The CS line on the AD2S1210 should hard-wired to + logic low and the WR/FSYNC line on the AD2S1210 should be connected to t= he + SPI CSn output of the SPI controller. + + Datasheet: + https://www.analog.com/media/en/technical-documentation/data-sheets/ad2s= 1210.pdf + +properties: + compatible: + const: adi,ad2s1210 + + reg: + maxItems: 1 + + spi-max-frequency: + maximum: 25000000 + + spi-cpha: true + + clocks: + maxItems: 1 + description: External oscillator clock (CLKIN). + + reset-gpios: + description: + GPIO connected to the /RESET pin. As the line needs to be low for the + reset to be active, it should be configured as GPIO_ACTIVE_LOW. + maxItems: 1 + + sample-gpios: + description: + GPIO connected to the /SAMPLE pin. As the line needs to be low to tr= igger + a sample, it should be configured as GPIO_ACTIVE_LOW. + maxItems: 1 + + mode-gpios: + description: + GPIO lines connected to the A0 and A1 pins. These pins select the da= ta + transfer mode. + minItems: 2 + maxItems: 2 + + resolution-gpios: + description: + GPIO lines connected to the RES0 and RES1 pins. These pins select the + resolution of the digital output. If omitted, it is assumed that the + RES0 and RES1 pins are hard-wired to match the assigned-resolution-b= its + property. + minItems: 2 + maxItems: 2 + + fault-gpios: + description: + GPIO lines connected to the LOT and DOS pins. These pins combined in= dicate + the type of fault present, if any. As these pins a pulled low to ind= icate + a fault condition, they should be configured as GPIO_ACTIVE_LOW. + minItems: 2 + maxItems: 2 + + adi,fixed-mode: + description: + This is used to indicate the selected mode if A0 and A1 are hard-wir= ed + instead of connected to GPIOS (i.e. mode-gpios is omitted). + $ref: /schemas/types.yaml#/definitions/string + enum: [config, velocity, position] + + assigned-resolution-bits: + description: + Resolution of the digital output required by the application. This + determines the precision of the angle and/or the maximum speed that = can + be measured. If resolution-gpios is omitted, it is assumed that RES0= and + RES1 are hard-wired to match this value. + enum: [10, 12, 14, 16] + +required: + - compatible + - reg + - spi-cpha + - clocks + - sample-gpios + - assigned-resolution-bits + +oneOf: + - required: + - mode-gpios + - required: + - adi,fixed-mode + +allOf: + - $ref: /schemas/spi/spi-peripheral-props.yaml# + +unevaluatedProperties: false + +examples: + - | + #include + + spi { + #address-cells =3D <1>; + #size-cells =3D <0>; + + resolver@0 { + compatible =3D "adi,ad2s1210"; + reg =3D <0>; + spi-max-frequency =3D <20000000>; + spi-cpha; + clocks =3D <&ext_osc>; + sample-gpios =3D <&gpio0 90 GPIO_ACTIVE_LOW>; + mode-gpios =3D <&gpio0 86 0>, <&gpio0 87 0>; + resolution-gpios =3D <&gpio0 88 0>, <&gpio0 89 0>; + assigned-resolution-bits =3D <16>; + }; + }; --=20 2.34.1 From nobody Fri Feb 13 17:30:43 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D5CFE7D0A8 for ; Thu, 21 Sep 2023 20:27:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229685AbjIUU1j (ORCPT ); Thu, 21 Sep 2023 16:27:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231951AbjIUU1Q (ORCPT ); Thu, 21 Sep 2023 16:27:16 -0400 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A20CC444D2 for ; Thu, 21 Sep 2023 10:23:52 -0700 (PDT) Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2b962c226ceso20418721fa.3 for ; Thu, 21 Sep 2023 10:23:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1695317031; x=1695921831; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BurSNjw3LRUUcMvXtonPsGB5QUx7CZPo8/XQKc8tXvQ=; b=efM7C+qLQF0wGTHY+ukd9E5ip7Beu+qwyG2enYzoccZRa0buiOMwUAZ5dp+iSDv7UT 0f5xtl3v00IcAya+YxqPcMac8yOg8d1s2q/9AjjpOo5A//grV667/bTYJI+7wEfkqaCo P6i9VKtPO1TF/c3sAhef+M3Dtwzas1d0zzbMGOm+20GUdcM1AUgi5KQBVPnGcmtjkzuw 7AJKLyWXNmkSAWIJasXNkU6jW+yC7StLh8JpbRIQFrui4PCqnkEuTkHbmyw+usESgzuf QNEg4XdLmbB8gJeyqRJygcixu3Kxrr22hE936o6fQ4qrGLWqNw9g+wfoKwv6kfDldtGG vGRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695317031; x=1695921831; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BurSNjw3LRUUcMvXtonPsGB5QUx7CZPo8/XQKc8tXvQ=; b=qmKSjWure6mKbO9jTpuw30Bme0QXYAwVHwAUw01B30NgSRSKiIddsaWV50lSXkdqnK HVS72rJw8s+w58hP2VuztLsIj8wfY/MNPUB1Pc5/7W9+ng+6NpSLvJnODLIsm0uqGhJH PqudEMFBUetXOIZjaJLXNBTYz0YZ0NRYi29OdMIaeTV4a0691Y/iLDIEUotjbEXD6Skn i/2DBJOLxtOcSw4vwEXx4wB6JyjR2Ae/yGNF+uNL9pxPWn7X7gZ3XHq5HquBodvVvpLB B3XGltlM3Zm6PXG2rDwSWc2rkfZuxDw2kX4yGZQO3jRT59oAOAloHZXYiv/6LYt7qk9f yruA== X-Gm-Message-State: AOJu0YxIBlD3Et5z5PfdYYBS8hRTqIqYHQUlhqfjLKG9QOf+/VWd1d60 iLf+kRQmuvWQO1wSE8wxZhw+w+ila9uS1l1f+ZSV5R3r X-Google-Smtp-Source: AGHT+IHNEr10kFqru6shnxnQjCxmHgYq/iqV95+VoS8aS+sGpqc8B3o89A4hIe6FM7kiYkFbjggLAA== X-Received: by 2002:adf:f88f:0:b0:31d:3669:1c55 with SMTP id u15-20020adff88f000000b0031d36691c55mr5308299wrp.65.1695306153705; Thu, 21 Sep 2023 07:22:33 -0700 (PDT) Received: from localhost.localdomain (abordeaux-655-1-129-86.w90-5.abo.wanadoo.fr. [90.5.10.86]) by smtp.gmail.com with ESMTPSA id n11-20020a5d4c4b000000b0031fbbe347ebsm1901426wrt.22.2023.09.21.07.22.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 07:22:33 -0700 (PDT) From: David Lechner To: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-staging@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , =?UTF-8?q?Nuno=20S=C3=A1?= , Axel Haslam , Philip Molloy , David Lechner Subject: [PATCH 2/2] staging: iio: resolver: ad2s1210: add triggered buffer support Date: Thu, 21 Sep 2023 09:19:30 -0500 Message-Id: <20230921141947.57784-5-dlechner@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921141947.57784-1-dlechner@baylibre.com> References: <20230921141947.57784-1-dlechner@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This adds support for triggered buffers to the AD2S1210 resolver driver. Signed-off-by: David Lechner --- drivers/staging/iio/resolver/ad2s1210.c | 84 ++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/= resolver/ad2s1210.c index f5b8b290e860..44a2ecaeeeff 100644 --- a/drivers/staging/iio/resolver/ad2s1210.c +++ b/drivers/staging/iio/resolver/ad2s1210.c @@ -19,8 +19,11 @@ #include #include =20 +#include #include #include +#include +#include =20 #define DRV_NAME "ad2s1210" =20 @@ -85,6 +88,12 @@ struct ad2s1210_state { unsigned long fclkin; /** The selected resolution */ enum ad2s1210_resolution resolution; + /** Scan buffer */ + struct { + __be16 chan[2]; + /* Ensure timestamp is naturally aligned. */ + s64 timestamp __aligned(8); + } scan; u8 rx[2] __aligned(IIO_DMA_MINALIGN); u8 tx[2]; }; @@ -592,18 +601,35 @@ static const struct iio_chan_spec ad2s1210_channels[]= =3D { .type =3D IIO_ANGL, .indexed =3D 1, .channel =3D 0, + .scan_index =3D 0, + .scan_type =3D { + .sign =3D 'u', + .realbits =3D 16, + .storagebits =3D 16, + .endianness =3D IIO_BE, + }, .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE) | BIT(IIO_CHAN_INFO_HYSTERESIS), .info_mask_separate_available =3D BIT(IIO_CHAN_INFO_HYSTERESIS), + .datasheet_name =3D "position", }, { .type =3D IIO_ANGL_VEL, .indexed =3D 1, .channel =3D 0, + .scan_index =3D 1, + .scan_type =3D { + .sign =3D 's', + .realbits =3D 16, + .storagebits =3D 16, + .endianness =3D IIO_BE, + }, .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE), - } + .datasheet_name =3D "velocity", + }, + IIO_CHAN_SOFT_TIMESTAMP(2), }; =20 static struct attribute *ad2s1210_attributes[] =3D { @@ -665,6 +691,55 @@ static int ad2s1210_debugfs_reg_access(struct iio_dev = *indio_dev, return ret; } =20 +static irqreturn_t ad2s1210_trigger_handler(int irq, void *p) +{ + struct iio_poll_func *pf =3D p; + struct iio_dev *indio_dev =3D pf->indio_dev; + struct ad2s1210_state *st =3D iio_priv(indio_dev); + size_t chan =3D 0; + int ret; + + mutex_lock(&st->lock); + + memset(&st->scan, 0, sizeof(st->scan)); + gpiod_set_value(st->sample_gpio, 1); + + if (test_bit(0, indio_dev->active_scan_mask)) { + ret =3D ad2s1210_set_mode(st, MOD_POS); + if (ret < 0) + goto error_ret; + + /* REVIST: we can read 3 bytes here and also get fault flags */ + ret =3D spi_read(st->sdev, st->rx, 2); + if (ret < 0) + goto error_ret; + + memcpy(&st->scan.chan[chan++], st->rx, 2); + } + + if (test_bit(1, indio_dev->active_scan_mask)) { + ret =3D ad2s1210_set_mode(st, MOD_VEL); + if (ret < 0) + goto error_ret; + + /* REVIST: we can read 3 bytes here and also get fault flags */ + ret =3D spi_read(st->sdev, st->rx, 2); + if (ret < 0) + goto error_ret; + + memcpy(&st->scan.chan[chan++], st->rx, 2); + } + + iio_push_to_buffers_with_timestamp(indio_dev, &st->scan, pf->timestamp); + +error_ret: + gpiod_set_value(st->sample_gpio, 0); + mutex_unlock(&st->lock); + iio_trigger_notify_done(indio_dev->trig); + + return IRQ_HANDLED; +} + static const struct iio_info ad2s1210_info =3D { .read_raw =3D ad2s1210_read_raw, .read_avail =3D ad2s1210_read_avail, @@ -850,6 +925,13 @@ static int ad2s1210_probe(struct spi_device *spi) indio_dev->num_channels =3D ARRAY_SIZE(ad2s1210_channels); indio_dev->name =3D spi_get_device_id(spi)->name; =20 + ret =3D devm_iio_triggered_buffer_setup(&spi->dev, indio_dev, + &iio_pollfunc_store_time, + &ad2s1210_trigger_handler, NULL); + if (ret < 0) + return dev_err_probe(&spi->dev, ret, + "iio triggered buffer setup failed\n"); + return devm_iio_device_register(&spi->dev, indio_dev); } =20 --=20 2.34.1 From nobody Fri Feb 13 17:30:43 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C4B5E7D0A2 for ; Thu, 21 Sep 2023 17:24:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229897AbjIURYY (ORCPT ); Thu, 21 Sep 2023 13:24:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229534AbjIURYA (ORCPT ); Thu, 21 Sep 2023 13:24:00 -0400 Received: from mail-lf1-x142.google.com (mail-lf1-x142.google.com [IPv6:2a00:1450:4864:20::142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 156AD86B1 for ; Thu, 21 Sep 2023 10:05:31 -0700 (PDT) Received: by mail-lf1-x142.google.com with SMTP id 2adb3069b0e04-50309daf971so2068626e87.3 for ; Thu, 21 Sep 2023 10:05:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1695315930; x=1695920730; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dOWL8UFN0vGXrTIparX6s/KCVRR+pmZ6D/qH1lVsdWQ=; b=SKFFvN3kCENMePMcKKC9HCfjrzdwz6Js7iC7W5L/c+u2OpF6a5ZQOHqA1uI3swvAGw Ae1b3mtQgo0S9fdd2TvFe2fzSASXKEeT9gU21B1BeFH5rWCwaQM4vy8Pa32aM0I26JQ1 Mj2AbmrKPjdYdXv4oq4Lvxbc4eOvf1DZgbOdmQDIOcZKYy1KbK0HJBy1Vh1XmNEyHGfA 79V7B70F09zL4T5ileYyz9nUnIpj7h9BT9c5HeC8YHW3chkA3FMOjOSYWq9yRuGBHukJ dWviIgDOlXibw/BZFii4DZWrLie3x0rImYHbkRU+Yqhnxm7KE58hbLL12/ZUPJJLB8OP QVbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695315930; x=1695920730; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dOWL8UFN0vGXrTIparX6s/KCVRR+pmZ6D/qH1lVsdWQ=; b=gAU5lu31GNjoC2fgsE4MTbzlt5QXlPa4gw+OU8gHiR0gLjbIoCRANSj7eO2L6f/gD0 toM4PRBUxAEi4ooyJhonCENqOjY5uewOkbdzpj8zBWnvEw/qv8XyGqZMc57NvpZmX+ws wCjPp1JjNmQtky1E+sjj9gsuBlZEggOZXlU2cSG3zsQTvzCjNzcqdaHD0l8KcAaNI99P MrcCeBFvc3ed9NwwXvGq3zcHyuzlEDcFhbfelAnC4PR6d+fyedfuwF5kYXUuhBs2QtJ0 7AEKV+qYa/4yxiQGYCIIY9yKKNHikklI/dQYGCUlFchrybqzKnJVHMINYoYZJSSXE0ek gbTw== X-Gm-Message-State: AOJu0YwAHVOmmSh7DE8YOLcuKLgMzRLd0Sbo/khiq29b+O2Q1CMQy/rO MS9SKGTeFWZpuVPk9yKVe390N0WeqliM1M1ovlrV5QC8Yv8= X-Google-Smtp-Source: AGHT+IErr9vfLKcGbuaDz6p0WEc9gtQaWzHZCdYrnWpb8xs+8uWyyRU6Xrb3jaQvYbOOtHHu0seULw== X-Received: by 2002:a5d:6405:0:b0:319:6ec3:79c7 with SMTP id z5-20020a5d6405000000b003196ec379c7mr5205794wru.36.1695306152763; Thu, 21 Sep 2023 07:22:32 -0700 (PDT) Received: from localhost.localdomain (abordeaux-655-1-129-86.w90-5.abo.wanadoo.fr. [90.5.10.86]) by smtp.gmail.com with ESMTPSA id n11-20020a5d4c4b000000b0031fbbe347ebsm1901426wrt.22.2023.09.21.07.22.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 07:22:32 -0700 (PDT) From: David Lechner To: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-staging@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , =?UTF-8?q?Nuno=20S=C3=A1?= , Axel Haslam , Philip Molloy , David Lechner Subject: [v2 02/19] staging: iio: Documentation: document IIO resolver AD2S1210 sysfs attributes Date: Thu, 21 Sep 2023 09:19:29 -0500 Message-Id: <20230921141947.57784-4-dlechner@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921141947.57784-1-dlechner@baylibre.com> References: <20230921141947.57784-1-dlechner@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This adds documentation for the device-specific sysfs attributes of the iio/resolver/ad2s1210 driver. Signed-off-by: David Lechner --- .../sysfs-bus-iio-resolver-ad2s1210 | 109 ++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 drivers/staging/iio/Documentation/sysfs-bus-iio-resolve= r-ad2s1210 diff --git a/drivers/staging/iio/Documentation/sysfs-bus-iio-resolver-ad2s1= 210 b/drivers/staging/iio/Documentation/sysfs-bus-iio-resolver-ad2s1210 new file mode 100644 index 000000000000..32890c85168e --- /dev/null +++ b/drivers/staging/iio/Documentation/sysfs-bus-iio-resolver-ad2s1210 @@ -0,0 +1,109 @@ +What: /sys/bus/iio/devices/iio:deviceX/dos_mis_thrd +KernelVersion: 6.7 +Contact: linux-iio@vger.kernel.org +Description: + Reading returns the current Degradation of Signal Mismatch + Threshold value. Writing sets the value. Valid values are 0 (0V) + to 127 (4.826V). To convert the value to volts, multiply by + 0.038. + +What: /sys/bus/iio/devices/iio:deviceX/dos_ovr_thrd +KernelVersion: 6.7 +Contact: linux-iio@vger.kernel.org +Description: + Reading returns the current Degradation of Signal Overrange + Threshold value. Writing sets the value. Valid values are 0 (0V) + to 127 (4.826V). To convert the value to volts, multiply by + 0.038. + +What: /sys/bus/iio/devices/iio:deviceX/dos_rst_max_thrd +KernelVersion: 6.7 +Contact: linux-iio@vger.kernel.org +Description: + Reading returns the current Degradation of Signal Reset Maximum + Threshold value. Writing sets the value. Valid values are 0 (0V) + to 127 (4.826V). To convert the value to volts, multiply by + 0.038. + +What: /sys/bus/iio/devices/iio:deviceX/dos_rst_min_thrd +KernelVersion: 6.7 +Contact: linux-iio@vger.kernel.org +Description: + Reading returns the current Degradation of Signal Reset Minimum + Threshold value. Writing sets the value. Valid values are 0 (0V) + to 127 (4.826V). To convert the value to volts, multiply by + 0.038. + +What: /sys/bus/iio/devices/iio:deviceX/fault +KernelVersion: 6.7 +Contact: linux-iio@vger.kernel.org +Description: + Reading returns a hex value containing the fault bit flags. + + Bit Description + --- ----------- + D7 Sine/cosine inputs clipped + D6 Sine/cosine inputs below LOS threshold + D5 Sine/cosine inputs exceed DOS overrange threshold + D4 Sine/cosine inputs exceed DOS mismatch threshold + D3 Tracking error exceeds LOT threshold + D2 Velocity exceeds maximum tracking rate + D1 Phase error exceeds phase lock range + D0 Configuration parity error + + Writing any value will clear any fault conditions. + +What: /sys/bus/iio/devices/iio:deviceX/excitation_frequency +KernelVersion: 6.7 +Contact: linux-iio@vger.kernel.org +Description: + Reading returns the current Excitation Frequency in Hz. Writing + sets the Excitation Frequency and performs a software reset on + the device to apply the change. Valid values are 2000 (2kHz) to + 20000 (20kHz). + +What: /sys/bus/iio/devices/iio:deviceX/los_thrd +KernelVersion: 6.7 +Contact: linux-iio@vger.kernel.org +Description: + Reading returns the current Loss of Signal Reset Threshold + value. Writing sets the value. Valid values are 0 (0V) to + 127 (4.826V). To convert the value to volts, multiply by 0.038. + +What: /sys/bus/iio/devices/iio:deviceX/lot_high_thrd +KernelVersion: 6.7 +Contact: linux-iio@vger.kernel.org +Description: + Reading returns the current Loss of Position Tracking Detection + High Threshold value. Writing sets the value. Valid values are + 0 (0 deg) to 127 (9/18/45 deg). The interpretation of the value + depends on the selected resolution. To convert the value to + degrees, multiply by 0.35 for 10-bit resolution, multiply by + 0.14 for 12-bit resolution or multiply by 0.09 for 14 and 16-bit + resolution. + +What: /sys/bus/iio/devices/iio:deviceX/lot_low_thrd +KernelVersion: 6.7 +Contact: linux-iio@vger.kernel.org +Description: + Reading returns the current Loss of Position Tracking Detection + Low Threshold value. Writing sets the value. Valid values are + 0 (0 deg) to 127 (9/18/45 deg). The interpretation of the value + depends on the selected resolution. To convert the value to + degrees, multiply by 0.35 for 10-bit resolution, multiply by + 0.14 for 12-bit resolution or multiply by 0.09 for 14 and 16-bit + resolution. + +What: /sys/bus/iio/devices/iio:deviceX/phase_lock_range +KernelVersion: 6.7 +Contact: linux-iio@vger.kernel.org +Description: + Reading returns the current Phase lock range in degrees. Writing + sets the value in the configuration register. + +What: /sys/bus/iio/devices/iio:deviceX/phase_lock_range_available +KernelVersion: 6.7 +Contact: linux-iio@vger.kernel.org +Description: + Reading returns the possible values for the phase_lock_range + attribute, namely 44 and 360. --=20 2.34.1 From nobody Fri Feb 13 17:30:43 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 204E0E7D0A6 for ; Thu, 21 Sep 2023 20:12:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231253AbjIUUMW (ORCPT ); Thu, 21 Sep 2023 16:12:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230204AbjIUULz (ORCPT ); Thu, 21 Sep 2023 16:11:55 -0400 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 634B5561ED for ; Thu, 21 Sep 2023 10:17:50 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-5334f9a56f6so784143a12.3 for ; Thu, 21 Sep 2023 10:17:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1695316669; x=1695921469; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NWszhBlTWMiwkXqgF1w4h8oNmYkV0xe9wPBMJvnXBgI=; b=gGR9Ph21fAE+az4hS0gxgRHlY8bXY/GswP7AjtctrxJJIQzHJvSEqU+yW5eWlQi9rk vlQZmPOu4fM29G7+lE6+DC83crxuHW2xV3nFcgX45kDO3CuC/iDlHUt38EYPJ2/AtfOp Fa7na4vIVAIE3w3fZo8N3fRNvyxdRuyZOhnRLmmESpinoGKoz8JQgLx8VjpW/N2KTGlf anwn/M+U636gNd83CnJPHwA4toR0LE3oQHGA6SHc0TjKiF9XsdviUK//0i/7hA3HfV9T PqJ3R1/lT0hoO67nRgce1Vs/ao3flGEmIv8vDpGd91tKChnVKb4Gw8IIJvXhaep5/lgr 8weA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695316669; x=1695921469; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NWszhBlTWMiwkXqgF1w4h8oNmYkV0xe9wPBMJvnXBgI=; b=SgKJ6/riiHg2Az0XBTLGuOnZlsdaJuuExnhYiKSVvpi+jssmyaCRkOEec4ml0Qb0Go 96EUuQTs2L1xjYxDBdTKU3uYp2hpIFlLwr3yrdvi5hK5hjLiAgBVsEDmt8SImr3O/YpO UL6pm0fJsnzsvloHODqLF+8X8e0LdRnVd97Y/7f21Zi0rgiacOsiB+BIcOtncbLqxtq3 +2fl3hzgLNG73kfMRwhqPZFnKAuj0+ThPIMI+pSiYQioPy8hG8st5RsvQybbyRVpL//0 s0hKk/1BtXNRw237bngYOtVf70I+zOY1YFRQ22wp1iXbqhzQyi0FOYQlAoLsjj1s5wmv fk2w== X-Gm-Message-State: AOJu0YzwhHyEE93C9NJk9KbL+Nyin7KIprkVyps2OfkPkbQ/l0+gOJ/j RU1+HRtA7VqPguu/bnkz5wamb8FA8pkpVQWbc6wq1DaU X-Google-Smtp-Source: AGHT+IGfS13FEnLVNfJuIWeRBxS2FNjPxoFFMDKS2aE22dbReCOydRtLnM6n0AwKa1SbUdaYxLP7RA== X-Received: by 2002:a5d:4a82:0:b0:31f:ec91:39a7 with SMTP id o2-20020a5d4a82000000b0031fec9139a7mr5419502wrq.14.1695306154592; Thu, 21 Sep 2023 07:22:34 -0700 (PDT) Received: from localhost.localdomain (abordeaux-655-1-129-86.w90-5.abo.wanadoo.fr. [90.5.10.86]) by smtp.gmail.com with ESMTPSA id n11-20020a5d4c4b000000b0031fbbe347ebsm1901426wrt.22.2023.09.21.07.22.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 07:22:34 -0700 (PDT) From: David Lechner To: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-staging@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , =?UTF-8?q?Nuno=20S=C3=A1?= , Axel Haslam , Philip Molloy , David Lechner Subject: [v2 03/19] staging: iio: resolver: ad2s1210: fix ad2s1210_show_fault Date: Thu, 21 Sep 2023 09:19:31 -0500 Message-Id: <20230921141947.57784-6-dlechner@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921141947.57784-1-dlechner@baylibre.com> References: <20230921141947.57784-1-dlechner@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" When reading the fault attribute, an empty string was printed if the fault register value was non-zero. This is fixed by checking that the return value is less than zero instead of not zero. Also always print two hex digits while we are touching this line. Signed-off-by: David Lechner --- drivers/staging/iio/resolver/ad2s1210.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/= resolver/ad2s1210.c index 06de5823eb8e..84743e31261a 100644 --- a/drivers/staging/iio/resolver/ad2s1210.c +++ b/drivers/staging/iio/resolver/ad2s1210.c @@ -393,7 +393,7 @@ static ssize_t ad2s1210_show_fault(struct device *dev, ret =3D ad2s1210_config_read(st, AD2S1210_REG_FAULT); mutex_unlock(&st->lock); =20 - return ret ? ret : sprintf(buf, "0x%x\n", ret); + return (ret < 0) ? ret : sprintf(buf, "0x%02x\n", ret); } =20 static ssize_t ad2s1210_clear_fault(struct device *dev, --=20 2.34.1 From nobody Fri Feb 13 17:30:43 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB54AE7D0A2 for ; Thu, 21 Sep 2023 20:01:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229731AbjIUUBt (ORCPT ); Thu, 21 Sep 2023 16:01:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230089AbjIUUBI (ORCPT ); Thu, 21 Sep 2023 16:01:08 -0400 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BDB057B08 for ; Thu, 21 Sep 2023 10:18:48 -0700 (PDT) Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-503f39d3236so2125504e87.0 for ; Thu, 21 Sep 2023 10:18:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1695316726; x=1695921526; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=x9YCZ78k5Zg5KKitr5PpHsZw/Rz0qYyLXQR2L135bIs=; b=p725f+u/GCXMgTcmvd17mKS+XZWOteY2gYOCuBCh3vzHoy4MPBVGu8WPx52QLOOrxJ /YD14zD1WxUTKzA2AjDjFfdV9UNlqtY9DrGghfgJ5F2KSjb/xJmhhQNS2EApCbOFz/GA LTrqISiUfpoTveqcCnArZJWaHZhqo/E0InpkUaDXWv2GcZBnfSkYbz/dlD9+7YyFguFR gI2LWTPZBBXU/H35iS4XTC0FaShVnZGoC5soqgO4C2AyqcRaD5J799xNJXZRDUc8QbuW ++AcZviGCZZARa6wMF5gGVps2bi3DFxPpMw4pDVhEYPCbx5a3GxhCsbXWW6lJM37f5/m oTOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695316726; x=1695921526; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x9YCZ78k5Zg5KKitr5PpHsZw/Rz0qYyLXQR2L135bIs=; b=i6mLRe7MfYJ1Wcfl7IKifNASPdE+i9SybKXCY4Hs2hsQb5wwJ7rCahgMAakC9dHwsc glWkaKEFQodtq7r4tDsi1pLXMzinfBqZgjJAVkvX3WLL0X9i/RWrlarwESARqFd4QQ23 SfGzmjg8IdvuolRx2f4hHcQo/kNwb2ERuPrkF7n5nE2SNRzgzbji9TUIWo61QzvaDftA hfrrslY+cwQg/AZYRMY5VudEHkGCfqp3TjMA4/0EK3SCOKUxUkiIeDGHxqJUAaHGAbQ+ NwAkYNb7uTKf2M7J9Ty5G72zVE2hwGy9Se+FRgySW8VoDVWRR7Wdj0AHVRLrJnxP7nxG c35w== X-Gm-Message-State: AOJu0YwcPqN9AQYkIZ/nV5GioALAxL+4fbZ50LKl9EcHoXxQn9PvLI3b FO5JE70pwEHAsIrDLvA2rDPIkIoMYbA2RepfcbO96NQl X-Google-Smtp-Source: AGHT+IFLOeeKjkZXzmrmyjj61SlCO4QtLumxRWkUp/uZ0wPGaqOzHFNXTE+bvD2TXSjNSCu16d/fHw== X-Received: by 2002:adf:fe8e:0:b0:319:f9d6:a769 with SMTP id l14-20020adffe8e000000b00319f9d6a769mr5207822wrr.45.1695306155398; Thu, 21 Sep 2023 07:22:35 -0700 (PDT) Received: from localhost.localdomain (abordeaux-655-1-129-86.w90-5.abo.wanadoo.fr. [90.5.10.86]) by smtp.gmail.com with ESMTPSA id n11-20020a5d4c4b000000b0031fbbe347ebsm1901426wrt.22.2023.09.21.07.22.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 07:22:35 -0700 (PDT) From: David Lechner To: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-staging@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , =?UTF-8?q?Nuno=20S=C3=A1?= , Axel Haslam , Philip Molloy , David Lechner Subject: [v2 04/19] staging: iio: resolver: ad2s1210: fix not restoring sample gpio in channel read Date: Thu, 21 Sep 2023 09:19:32 -0500 Message-Id: <20230921141947.57784-7-dlechner@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921141947.57784-1-dlechner@baylibre.com> References: <20230921141947.57784-1-dlechner@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In theory, this code path should not be reachable because of the previous switch statement. But just in case we should make sure we are restoring the SAMPLE gpio to its original state before returning in addition to releasing the mutex lock. Signed-off-by: David Lechner --- drivers/staging/iio/resolver/ad2s1210.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/= resolver/ad2s1210.c index 84743e31261a..0bdd5a30d45d 100644 --- a/drivers/staging/iio/resolver/ad2s1210.c +++ b/drivers/staging/iio/resolver/ad2s1210.c @@ -510,8 +510,8 @@ static int ad2s1210_read_raw(struct iio_dev *indio_dev, ret =3D IIO_VAL_INT; break; default: - mutex_unlock(&st->lock); - return -EINVAL; + ret =3D -EINVAL; + break; } =20 error_ret: --=20 2.34.1 From nobody Fri Feb 13 17:30:43 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7190FE7D0A2 for ; Thu, 21 Sep 2023 20:49:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232521AbjIUUta (ORCPT ); Thu, 21 Sep 2023 16:49:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232204AbjIUUsk (ORCPT ); Thu, 21 Sep 2023 16:48:40 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E048D7960D for ; Thu, 21 Sep 2023 10:34:52 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-9aa0495f9cfso529232766b.1 for ; Thu, 21 Sep 2023 10:34:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1695317691; x=1695922491; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NC6Tj/wZ71OdWmHfRNe2x49Rd8CoFCC05cRR7nhn858=; b=A2ZhzJmxIK839Cicf4hvdj4BxxClLyj+V5Gi3qvkWEP/g6c3do/uM03epCNbUIyEgB MZuWFoXVX77l7oNYAwMUEr8R79r0zZQMuYwivxBS3S//wK9mxvor7uzibC5z78e/YbLi mqQQmj+MgPN9o4Uhe7gZGPOwE/2koh+6cOdAqYKlXtdWDLjYgQj7tu55O/lIC0YHIxJN fzcqt+Qm6T2d6ps71GIrWpN8MXeWQ6PaKx7biLbyX3p9YsjuxU+mFmdzjFx/mLlF4ClO GpJcf7J66eDz5wsMPbHs3eJ4P/vw10IE5rfkfHwKv2IWcgLBrG/XceAlXM5vhqaKR3rx 5eeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695317691; x=1695922491; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NC6Tj/wZ71OdWmHfRNe2x49Rd8CoFCC05cRR7nhn858=; b=D8KmwB8Ay3WHNWEit0fTjInGBoXmbDCp28/zo3FiSmhFbLiqKlCg/Lh19bmdhjwwjo RnV9/qf82OYGanLuqe6z1uYJGot3NjkdISoMoxkEcv80tnmjpxxWwprNlDXTzwC9CUQG NoYgO83bl8hHoVSzMPw5qZGetUJWKISRZP81OUzEKQcbwUf4PfXHDDsgP1faz/0CHO6S suf8L3g3SiJTZ+sZTpuQHsctAZY6JZYlJyayJEmNdpiFDk6roBGr/nIiJVRtaeQNWkwK M5OLI1gALl1D7HkszkfGASrRY92Aud41Q356zbEIshUcqoLFz0Q3DYlPO0bB9FLKMX1/ 8RGw== X-Gm-Message-State: AOJu0Yy8IP8gtIojeIf2QV6IUTTNPXOGoB9Bo72nhv3OV9cotFpArgX4 ZuDu0QvjbNDRHf/ul34850qLKG9Pyhgq/1fkmXjGeMuv X-Google-Smtp-Source: AGHT+IF4+sS/mDwYhthmKF77V0j/XEIKbvBHYAVm/9YBijGkzsfCBsc9F5TNf9h81eIYvejG3U+XtA== X-Received: by 2002:adf:e641:0:b0:31f:ffe3:b957 with SMTP id b1-20020adfe641000000b0031fffe3b957mr4444516wrn.31.1695306156350; Thu, 21 Sep 2023 07:22:36 -0700 (PDT) Received: from localhost.localdomain (abordeaux-655-1-129-86.w90-5.abo.wanadoo.fr. [90.5.10.86]) by smtp.gmail.com with ESMTPSA id n11-20020a5d4c4b000000b0031fbbe347ebsm1901426wrt.22.2023.09.21.07.22.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 07:22:36 -0700 (PDT) From: David Lechner To: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-staging@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , =?UTF-8?q?Nuno=20S=C3=A1?= , Axel Haslam , Philip Molloy , David Lechner Subject: [v2 05/19] staging: iio: resolver: ad2s1210: fix probe Date: Thu, 21 Sep 2023 09:19:33 -0500 Message-Id: <20230921141947.57784-8-dlechner@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921141947.57784-1-dlechner@baylibre.com> References: <20230921141947.57784-1-dlechner@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This fixes a number of issues in the ad2s1210_probe() function: - Move call to ad2s1210_setup_gpios() after `st->sdev =3D spi;`. This fixes use of this pointer before it is initialized. - Check return value on ad2s1210_initial(). - Move devm_iio_device_register() to the end to avoid race of registering before fully initialized. - Remove call to spi_setup(). Note: MODE_3 was incorrect, it should be MODE_1 but we can let the device tree select this. - Change default value for fclkin. This is an external oscillator, not the SPI bus clock. (Will use device tree to get the correct value in a future patch. For now, using the eval board value.) - Remove spi_set_drvdata(). Signed-off-by: David Lechner --- drivers/staging/iio/resolver/ad2s1210.c | 30 ++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/= resolver/ad2s1210.c index 0bdd5a30d45d..9c7f76114360 100644 --- a/drivers/staging/iio/resolver/ad2s1210.c +++ b/drivers/staging/iio/resolver/ad2s1210.c @@ -3,6 +3,7 @@ * ad2s1210.c support for the ADI Resolver to Digital Converters: AD2S1210 * * Copyright (c) 2010-2010 Analog Devices Inc. + * Copyright (C) 2023 BayLibre, SAS */ #include #include @@ -657,12 +658,8 @@ static int ad2s1210_probe(struct spi_device *spi) indio_dev =3D devm_iio_device_alloc(&spi->dev, sizeof(*st)); if (!indio_dev) return -ENOMEM; - st =3D iio_priv(indio_dev); - ret =3D ad2s1210_setup_gpios(st); - if (ret < 0) - return ret; =20 - spi_set_drvdata(spi, indio_dev); + st =3D iio_priv(indio_dev); =20 mutex_init(&st->lock); st->sdev =3D spi; @@ -671,22 +668,25 @@ static int ad2s1210_probe(struct spi_device *spi) st->resolution =3D 12; st->fexcit =3D AD2S1210_DEF_EXCIT; =20 + ret =3D ad2s1210_setup_clocks(st); + if (ret < 0) + return ret; + + ret =3D ad2s1210_setup_gpios(st); + if (ret < 0) + return ret; + + ret =3D ad2s1210_initial(st); + if (ret < 0) + return ret; + indio_dev->info =3D &ad2s1210_info; indio_dev->modes =3D INDIO_DIRECT_MODE; indio_dev->channels =3D ad2s1210_channels; indio_dev->num_channels =3D ARRAY_SIZE(ad2s1210_channels); indio_dev->name =3D spi_get_device_id(spi)->name; =20 - ret =3D devm_iio_device_register(&spi->dev, indio_dev); - if (ret) - return ret; - - st->fclkin =3D spi->max_speed_hz; - spi->mode =3D SPI_MODE_3; - spi_setup(spi); - ad2s1210_initial(st); - - return 0; + return devm_iio_device_register(&spi->dev, indio_dev); } =20 static const struct of_device_id ad2s1210_of_match[] =3D { --=20 2.34.1 From nobody Fri Feb 13 17:30:43 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03EC1E7D0A2 for ; Thu, 21 Sep 2023 17:51:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230206AbjIURvg (ORCPT ); Thu, 21 Sep 2023 13:51:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51378 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229747AbjIURvQ (ORCPT ); Thu, 21 Sep 2023 13:51:16 -0400 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1BB991BF for ; Thu, 21 Sep 2023 10:22:14 -0700 (PDT) Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-501eec0a373so2194305e87.3 for ; Thu, 21 Sep 2023 10:22:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1695316932; x=1695921732; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gabiCx8aQ+iMVEJft2DL0LHbd3RWq71VIbUUi+w3JfM=; b=Gj1N929OQhSew4rZWjj1I9EtfgztYKeM9fj6JuUS07OyUy9qA1gjz3i35SI5Czt1MN Y8Ri5S+zC+BTTYP6zdrVJTkxW+Yh5QM9FkyCOK29dAhm9LE3YdkcSWjHdgdvqP4t3gXF jQlOx6CQZImywvD5iOm1mfe73sf+/ejCHlBwPBket5W+9JW7rUqBeAloA2vTg9MzCZIm SwS4HvbXwPF1X+TkWh4J9wvrlgc9MOB4YquWu4Nx7iVcw5p4jb5ngw9COMMEURCMdwK7 biZX5to2UTYSBOVASai28EfL0Sv9Y3mqkUlx6hIej4oaYx//bx2RQ7q//O3Ikcb1UMld mp2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695316932; x=1695921732; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gabiCx8aQ+iMVEJft2DL0LHbd3RWq71VIbUUi+w3JfM=; b=nG9L4K9XUiUlukpbtajj9nBkKkSRQF9AAJvhujkdk9sW6r28f7HhDeJvBHfKvQXKpV bi4mogdt9daNNH7N1WXUbPEvTljz5/V3funt6GMsL3ie00JHcNqhWihWlvJMCJIdlg8g tVDSm6H1maKzcC6ZFUzy9JSKPsnR73vXETa2DeKUfUkQZ61lvKj2LE05c7Yq5u4sK2O5 uZ3a0MbC3FKL8EWwcokejQZoKJXYaned8Kvgg+MReWkpq5e8hfILYlIS+f8mPopf93cB 15Lclj9ezNQuchPgXHSbABkopmWWLS4RPaXP4gmhWAh4M0a3DIyhUcVA3NiFXYnlhLZZ GHzA== X-Gm-Message-State: AOJu0YyIZd5eF9VjBOHzvXydczZ6kiHK5E178HCo3wddxWBv2gtqJKGw J7vdS8MtgJ+mvUNfgTrCKmMeIVqYgpxX3prmpI6A4NQL X-Google-Smtp-Source: AGHT+IE4sDvMSw/UkfMczfXLxgbpckMACuzljnUTY5SM6KE9BEVvGBveVsOv+3vfUogJ5wktpvrmbA== X-Received: by 2002:a5d:6e54:0:b0:31a:e8e6:8a96 with SMTP id j20-20020a5d6e54000000b0031ae8e68a96mr5153996wrz.67.1695306157156; Thu, 21 Sep 2023 07:22:37 -0700 (PDT) Received: from localhost.localdomain (abordeaux-655-1-129-86.w90-5.abo.wanadoo.fr. [90.5.10.86]) by smtp.gmail.com with ESMTPSA id n11-20020a5d4c4b000000b0031fbbe347ebsm1901426wrt.22.2023.09.21.07.22.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 07:22:36 -0700 (PDT) From: David Lechner To: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-staging@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , =?UTF-8?q?Nuno=20S=C3=A1?= , Axel Haslam , Philip Molloy , David Lechner Subject: [v2 06/19] staging: iio: resolver: ad2s1210: always use 16-bit value for raw read Date: Thu, 21 Sep 2023 09:19:34 -0500 Message-Id: <20230921141947.57784-9-dlechner@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921141947.57784-1-dlechner@baylibre.com> References: <20230921141947.57784-1-dlechner@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This removes the special handling for resolutions lower than 16 bits. This will allow us to use a fixed scale independent of the resolution. Also, for the record, according to the datasheet, the logic for the special handling based on hysteresis that was removed was incorrect. Signed-off-by: David Lechner --- drivers/staging/iio/resolver/ad2s1210.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/= resolver/ad2s1210.c index 9c7f76114360..985b8fecd65a 100644 --- a/drivers/staging/iio/resolver/ad2s1210.c +++ b/drivers/staging/iio/resolver/ad2s1210.c @@ -465,10 +465,7 @@ static int ad2s1210_read_raw(struct iio_dev *indio_dev, long m) { struct ad2s1210_state *st =3D iio_priv(indio_dev); - u16 negative; int ret =3D 0; - u16 pos; - s16 vel; =20 mutex_lock(&st->lock); gpiod_set_value(st->gpios[AD2S1210_SAMPLE], 0); @@ -494,20 +491,11 @@ static int ad2s1210_read_raw(struct iio_dev *indio_de= v, =20 switch (chan->type) { case IIO_ANGL: - pos =3D be16_to_cpup((__be16 *)st->rx); - if (st->hysteresis) - pos >>=3D 16 - st->resolution; - *val =3D pos; + *val =3D be16_to_cpup((__be16 *)st->rx); ret =3D IIO_VAL_INT; break; case IIO_ANGL_VEL: - vel =3D be16_to_cpup((__be16 *)st->rx); - vel >>=3D 16 - st->resolution; - if (vel & 0x8000) { - negative =3D (0xffff >> st->resolution) << st->resolution; - vel |=3D negative; - } - *val =3D vel; + *val =3D (s16)be16_to_cpup((__be16 *)st->rx); ret =3D IIO_VAL_INT; break; default: --=20 2.34.1 From nobody Fri Feb 13 17:30:43 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8DD3EE7D0AB for ; Thu, 21 Sep 2023 21:30:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231592AbjIUVaU (ORCPT ); Thu, 21 Sep 2023 17:30:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232913AbjIUV3t (ORCPT ); Thu, 21 Sep 2023 17:29:49 -0400 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23EF45A547 for ; Thu, 21 Sep 2023 10:21:05 -0700 (PDT) Received: by mail-lf1-x12c.google.com with SMTP id 2adb3069b0e04-50309daf971so2094804e87.3 for ; Thu, 21 Sep 2023 10:21:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1695316863; x=1695921663; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8xPn0fJb1G79vmQneRtFHd9riwOuPrJO1tNQT+KG0zw=; b=h+hIf0yJTtxC72bXuY5NuqQFwkiUreo703I7TggGX1vLVGqRCpqzbfVUTIjhmbt840 JT4/6OYVPq8qQCgh4Hmms9gLcXl8blCuNe0BGPx6sdlJqw6jfGc2l8ZFXEGTHQu4daKL pdrOkXXG6NrsREwYjM5Tn2on4XW63es2Kw5S3m8HrJ5iRQHOMrGQ8IvTYbS9x5z1uSpD SwyDGYeMozAtVkH/NotniAcAC7yxijZHGgNyNkwIbFRWSMKqaxnnoK9jczNU47+v6JCM hm6AKztTlNdB47tlBxKDDiEex2r00SZxfKX2+VlmB5j3LthsTEgn1np+BTeHD6vz8Fie j20A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695316863; x=1695921663; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8xPn0fJb1G79vmQneRtFHd9riwOuPrJO1tNQT+KG0zw=; b=InytAFA2UIu6S4d1YFfRtCgt+TGKlkFr7T2RKDb5277tzL40fFewoYng9wAZ96/vtu ACknd8Eqp//45/GOMEKKQc8/Osv3lwE0g5seAR7hs+SrAbFGZ2lz3cb5n0SxgOnIB6rU BJtz624CQLbh9oVG+X5L/HStuBCwWa4uiMUUhi28J00OAndZ6a4xxKmsIOQIU7XydvlA moe3UVjPcqSN4+UdMrCVHuxd2csAitZSpzo7emH4A9mtFshJnuupiJIfaF/Oih+iOLq6 VbG2oqjyfnFiNMpV+0V3aMGoUUljXmwLPr3ql5l/iYyTavO5c+w8X7IPl3xDLKoXjPnj 790Q== X-Gm-Message-State: AOJu0Yw0eykL0JAqRRb+5pMUAcebZxLSU4EoB0De9rsNGIEee72NBThc HYa3vJB7802lwj18QEXsdCpyku0kRj58UhYBtcs8nwFT X-Google-Smtp-Source: AGHT+IHCsgQf5YDU2b8qhjf3hqvfyriFBctb7CQVc25Wz8iRM3Vsev+NwoaLu/6Clxbuw75eKXqg8g== X-Received: by 2002:a5d:608d:0:b0:321:4b47:d1c0 with SMTP id w13-20020a5d608d000000b003214b47d1c0mr4847398wrt.71.1695306158083; Thu, 21 Sep 2023 07:22:38 -0700 (PDT) Received: from localhost.localdomain (abordeaux-655-1-129-86.w90-5.abo.wanadoo.fr. [90.5.10.86]) by smtp.gmail.com with ESMTPSA id n11-20020a5d4c4b000000b0031fbbe347ebsm1901426wrt.22.2023.09.21.07.22.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 07:22:37 -0700 (PDT) From: David Lechner To: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-staging@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , =?UTF-8?q?Nuno=20S=C3=A1?= , Axel Haslam , Philip Molloy , David Lechner Subject: [v2 07/19] staging: iio: resolver: ad2s1210: implement IIO_CHAN_INFO_SCALE Date: Thu, 21 Sep 2023 09:19:35 -0500 Message-Id: <20230921141947.57784-10-dlechner@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921141947.57784-1-dlechner@baylibre.com> References: <20230921141947.57784-1-dlechner@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This adds an implementation of IIO_CHAN_INFO_SCALE to the ad2s1210 resolver driver. This allows userspace to get the scale factor for the raw values. Signed-off-by: David Lechner --- drivers/staging/iio/resolver/ad2s1210.c | 107 ++++++++++++++++-------- 1 file changed, 72 insertions(+), 35 deletions(-) diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/= resolver/ad2s1210.c index 985b8fecd65a..95d43b241a75 100644 --- a/drivers/staging/iio/resolver/ad2s1210.c +++ b/drivers/staging/iio/resolver/ad2s1210.c @@ -458,56 +458,91 @@ static ssize_t ad2s1210_store_reg(struct device *dev, return ret < 0 ? ret : len; } =20 +static const int ad2s1210_velocity_scale[] =3D { + 17089132, /* 8.192MHz / (2*pi * 2500 / 2^15) */ + 42722830, /* 8.192MHz / (2*pi * 1000 / 2^15) */ + 85445659, /* 8.192MHz / (2*pi * 500 / 2^15) */ + 341782638, /* 8.192MHz / (2*pi * 125 / 2^15) */ +}; + static int ad2s1210_read_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, int *val, int *val2, - long m) + long mask) { struct ad2s1210_state *st =3D iio_priv(indio_dev); int ret =3D 0; =20 - mutex_lock(&st->lock); - gpiod_set_value(st->gpios[AD2S1210_SAMPLE], 0); - /* delay (6 * tck + 20) nano seconds */ - udelay(1); + switch (mask) { + case IIO_CHAN_INFO_RAW: + mutex_lock(&st->lock); + gpiod_set_value(st->gpios[AD2S1210_SAMPLE], 0); + /* delay (6 * tck + 20) nano seconds */ + udelay(1); + + switch (chan->type) { + case IIO_ANGL: + ad2s1210_set_mode(MOD_POS, st); + break; + case IIO_ANGL_VEL: + ad2s1210_set_mode(MOD_VEL, st); + break; + default: + ret =3D -EINVAL; + break; + } + if (ret < 0) + goto error_info_raw; + ret =3D spi_read(st->sdev, st->rx, 2); + if (ret < 0) + goto error_info_raw; + + switch (chan->type) { + case IIO_ANGL: + *val =3D be16_to_cpup((__be16 *)st->rx); + ret =3D IIO_VAL_INT; + break; + case IIO_ANGL_VEL: + *val =3D (s16)be16_to_cpup((__be16 *)st->rx); + ret =3D IIO_VAL_INT; + break; + default: + ret =3D -EINVAL; + break; + } =20 - switch (chan->type) { - case IIO_ANGL: - ad2s1210_set_mode(MOD_POS, st); - break; - case IIO_ANGL_VEL: - ad2s1210_set_mode(MOD_VEL, st); - break; - default: - ret =3D -EINVAL; +error_info_raw: + gpiod_set_value(st->gpios[AD2S1210_SAMPLE], 1); + /* delay (2 * tck + 20) nano seconds */ + udelay(1); + mutex_unlock(&st->lock); break; - } - if (ret < 0) - goto error_ret; - ret =3D spi_read(st->sdev, st->rx, 2); - if (ret < 0) - goto error_ret; =20 - switch (chan->type) { - case IIO_ANGL: - *val =3D be16_to_cpup((__be16 *)st->rx); - ret =3D IIO_VAL_INT; - break; - case IIO_ANGL_VEL: - *val =3D (s16)be16_to_cpup((__be16 *)st->rx); - ret =3D IIO_VAL_INT; + case IIO_CHAN_INFO_SCALE: + switch (chan->type) { + case IIO_ANGL: + /* approx 0.3 arc min converted to radians */ + *val =3D 0; + *val2 =3D 95874; + ret =3D IIO_VAL_INT_PLUS_NANO; + break; + case IIO_ANGL_VEL: + *val =3D st->fclkin; + *val2 =3D ad2s1210_velocity_scale[st->resolution]; + ret =3D IIO_VAL_FRACTIONAL; + break; + default: + ret =3D -EINVAL; + break; + } break; + default: ret =3D -EINVAL; break; } =20 -error_ret: - gpiod_set_value(st->gpios[AD2S1210_SAMPLE], 1); - /* delay (2 * tck + 20) nano seconds */ - udelay(1); - mutex_unlock(&st->lock); return ret; } =20 @@ -549,12 +584,14 @@ static const struct iio_chan_spec ad2s1210_channels[]= =3D { .type =3D IIO_ANGL, .indexed =3D 1, .channel =3D 0, - .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW), + .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_SCALE), }, { .type =3D IIO_ANGL_VEL, .indexed =3D 1, .channel =3D 0, - .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW), + .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_SCALE), } }; =20 --=20 2.34.1 From nobody Fri Feb 13 17:30:43 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3628E7D0A5 for ; Thu, 21 Sep 2023 18:15:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230294AbjIUSP3 (ORCPT ); Thu, 21 Sep 2023 14:15:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230081AbjIUSPA (ORCPT ); Thu, 21 Sep 2023 14:15:00 -0400 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F33AB4F938 for ; Thu, 21 Sep 2023 10:15:19 -0700 (PDT) Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-5041335fb9cso2098797e87.0 for ; Thu, 21 Sep 2023 10:15:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1695316517; x=1695921317; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=phvZq4VpwSFX4vyqlS17/uN/agj73xAJlQboMqH0z3o=; b=2/w3DQTsFoE8IXVo9XvxrUBOP0vOKq3/Sd8VnK0Hz2RqkTqQAyNj0y68tmNEfowjak ZoNsGqeCVsRLyxEx6rUnU7iWOwHle3SGScIb1ZtPsZxHr5tGcMB/WFlkIoVhItM6lHqF 7mMP6XnWKnubvv1qBqNpnDpDISd7BqkfWIzETAOOx2aNZvMp7ali3Rwq4jFHqan+s4/o 7GnxqdDTfpfDqjk2s4HUsQjfZrC9s0KvK4gjEZdNAjJCtrIgwV6Px0+k+gV50Xcj0I0+ 6KlOcDHzhNBO3d4OZLd3P5s/W3FWc63EdUYC13btf8IYlS+ESERwND9I5DpjS/RyCTR8 /hoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695316517; x=1695921317; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=phvZq4VpwSFX4vyqlS17/uN/agj73xAJlQboMqH0z3o=; b=nT5xfYcmY0pXys1BN/IlBTjyxRyCWZ7bq3248jtlV/OsUd3Yal4veIb9EFJlCK+CUC R3drd48CoN3L0DP381LMsancXvAsRbwIeoGstzq1ZzVjVqnFRf38WelDcvnmdksHMv8W D1OgXIEXgg9eOwhHnBMP1l/1n/+JN9rgHDZ2/6ACH4WasjYGlTJgnh/f4oBgFjiAtpv5 Ph4Nj5jl68H2/J25MhdCJRVeUDeYZ56RtFEpo6kvODyqLWMSsX+xaJAirtwQFUrAQypU HL1/l6tJUXWjnn0WbRSeQGEorrmbJtGGHP7eBIpugKrrnc6XXEmHe4TQNpk9CqQflFrJ cAYQ== X-Gm-Message-State: AOJu0Yw0DTVUhe99tcP1/TsHrvkQsLQbBOn6sCqB2pfNZEAL74uk4z0+ De87JVyrL/dkCKrbZOgQ1j1jInMcyvpWYkqxFDmKxHVQ X-Google-Smtp-Source: AGHT+IFPxpl1mL31xHJRVnXCLfFPLtUCE+7JOw2swmApi7DrJQIpgim9CNysuQqHjc696HN9aqGOFA== X-Received: by 2002:adf:fdc3:0:b0:321:6388:bccb with SMTP id i3-20020adffdc3000000b003216388bccbmr4781473wrs.21.1695306159013; Thu, 21 Sep 2023 07:22:39 -0700 (PDT) Received: from localhost.localdomain (abordeaux-655-1-129-86.w90-5.abo.wanadoo.fr. [90.5.10.86]) by smtp.gmail.com with ESMTPSA id n11-20020a5d4c4b000000b0031fbbe347ebsm1901426wrt.22.2023.09.21.07.22.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 07:22:38 -0700 (PDT) From: David Lechner To: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-staging@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , =?UTF-8?q?Nuno=20S=C3=A1?= , Axel Haslam , Philip Molloy , David Lechner Subject: [v2 08/19] staging: iio: resolver: ad2s1210: use devicetree to get fclkin Date: Thu, 21 Sep 2023 09:19:36 -0500 Message-Id: <20230921141947.57784-11-dlechner@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921141947.57784-1-dlechner@baylibre.com> References: <20230921141947.57784-1-dlechner@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This removes the fclkin sysfs attribute and replaces it with getting the fclkin clock rate using the clk subsystem (i.e. from the devicetree). The fclkin clock comes from an external oscillator that is connected directly to the AD2S1210 chip, so users of the sysfs attributes should not need to be concerned with this. Also sort includes while we are touching this. Signed-off-by: David Lechner --- drivers/staging/iio/resolver/Kconfig | 1 + drivers/staging/iio/resolver/ad2s1210.c | 76 +++++++++---------------- 2 files changed, 28 insertions(+), 49 deletions(-) diff --git a/drivers/staging/iio/resolver/Kconfig b/drivers/staging/iio/res= olver/Kconfig index 6d1e2622e0b0..bebb35822c9e 100644 --- a/drivers/staging/iio/resolver/Kconfig +++ b/drivers/staging/iio/resolver/Kconfig @@ -7,6 +7,7 @@ menu "Resolver to digital converters" config AD2S1210 tristate "Analog Devices ad2s1210 driver" depends on SPI + depends on COMMON_CLK depends on GPIOLIB || COMPILE_TEST help Say yes here to build support for Analog Devices spi resolver diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/= resolver/ad2s1210.c index 95d43b241a75..153ac7704ad7 100644 --- a/drivers/staging/iio/resolver/ad2s1210.c +++ b/drivers/staging/iio/resolver/ad2s1210.c @@ -5,16 +5,17 @@ * Copyright (c) 2010-2010 Analog Devices Inc. * Copyright (C) 2023 BayLibre, SAS */ -#include -#include +#include +#include #include +#include +#include +#include #include -#include #include +#include #include -#include -#include -#include +#include =20 #include #include @@ -91,7 +92,8 @@ struct ad2s1210_state { struct mutex lock; struct spi_device *sdev; struct gpio_desc *gpios[5]; - unsigned int fclkin; + /** The external oscillator frequency in Hz. */ + unsigned long fclkin; unsigned int fexcit; bool hysteresis; u8 resolution; @@ -198,45 +200,6 @@ static inline int ad2s1210_soft_reset(struct ad2s1210_= state *st) return ad2s1210_config_write(st, 0x0); } =20 -static ssize_t ad2s1210_show_fclkin(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct ad2s1210_state *st =3D iio_priv(dev_to_iio_dev(dev)); - - return sprintf(buf, "%u\n", st->fclkin); -} - -static ssize_t ad2s1210_store_fclkin(struct device *dev, - struct device_attribute *attr, - const char *buf, - size_t len) -{ - struct ad2s1210_state *st =3D iio_priv(dev_to_iio_dev(dev)); - unsigned int fclkin; - int ret; - - ret =3D kstrtouint(buf, 10, &fclkin); - if (ret) - return ret; - if (fclkin < AD2S1210_MIN_CLKIN || fclkin > AD2S1210_MAX_CLKIN) { - dev_err(dev, "ad2s1210: fclkin out of range\n"); - return -EINVAL; - } - - mutex_lock(&st->lock); - st->fclkin =3D fclkin; - - ret =3D ad2s1210_update_frequency_control_word(st); - if (ret < 0) - goto error_ret; - ret =3D ad2s1210_soft_reset(st); -error_ret: - mutex_unlock(&st->lock); - - return ret < 0 ? ret : len; -} - static ssize_t ad2s1210_show_fexcit(struct device *dev, struct device_attribute *attr, char *buf) @@ -546,8 +509,6 @@ static int ad2s1210_read_raw(struct iio_dev *indio_dev, return ret; } =20 -static IIO_DEVICE_ATTR(fclkin, 0644, - ad2s1210_show_fclkin, ad2s1210_store_fclkin, 0); static IIO_DEVICE_ATTR(fexcit, 0644, ad2s1210_show_fexcit, ad2s1210_store_fexcit, 0); static IIO_DEVICE_ATTR(control, 0644, @@ -596,7 +557,6 @@ static const struct iio_chan_spec ad2s1210_channels[] = =3D { }; =20 static struct attribute *ad2s1210_attributes[] =3D { - &iio_dev_attr_fclkin.dev_attr.attr, &iio_dev_attr_fexcit.dev_attr.attr, &iio_dev_attr_control.dev_attr.attr, &iio_dev_attr_bits.dev_attr.attr, @@ -654,6 +614,24 @@ static const struct iio_info ad2s1210_info =3D { .attrs =3D &ad2s1210_attribute_group, }; =20 +static int ad2s1210_setup_clocks(struct ad2s1210_state *st) +{ + struct device *dev =3D &st->sdev->dev; + struct clk *clk; + + clk =3D devm_clk_get_enabled(dev, NULL); + if (IS_ERR(clk)) + return dev_err_probe(dev, PTR_ERR(clk), "failed to get clock\n"); + + st->fclkin =3D clk_get_rate(clk); + if (st->fclkin < AD2S1210_MIN_CLKIN || st->fclkin > AD2S1210_MAX_CLKIN) + return dev_err_probe(dev, -EINVAL, + "clock frequency out of range: %lu\n", + st->fclkin); + + return 0; +} + static int ad2s1210_setup_gpios(struct ad2s1210_state *st) { struct spi_device *spi =3D st->sdev; --=20 2.34.1 From nobody Fri Feb 13 17:30:43 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A89BDE7D0A5 for ; Thu, 21 Sep 2023 18:11:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230203AbjIUSLa (ORCPT ); Thu, 21 Sep 2023 14:11:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230162AbjIUSK6 (ORCPT ); Thu, 21 Sep 2023 14:10:58 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8DE6819A for ; Thu, 21 Sep 2023 10:51:20 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-400a087b0bfso13022415e9.2 for ; Thu, 21 Sep 2023 10:51:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1695318678; x=1695923478; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ms6XtDC2gqm1+y4qBooiAiA+r/YZdcas3vjvFP4dBPU=; b=zB9Hv8U+d53HTid3NzV6+rYWOl9xaUyOKct+mnAL8/ViNWrMTIT92zNt0vdGHVelYC Z+AD9C3OmMwBY1MQuehevSdi5DaALkT1qiAUxe2c05gqVeTOwdRrTXdxxliowb+RMszB AlGKqCiD3SWSgsS7HFR9Ls0AWF4Jyigo9m8RGEHFrKGtNTBHi3zrJKVKki3vPdfDWwIN jzfZaYJiG3wD096v55BOWlmYjdvA8qNHJ2X1ab1rMDhqiRt0oUt9iWeEiaMEbqQN8xjB jUZD7gey98PAfB7YsTuir361Hi1PxwOQTgrsqZUKEgSsDmz6VimtjQx2qETg/5l7d7gl hc5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695318678; x=1695923478; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ms6XtDC2gqm1+y4qBooiAiA+r/YZdcas3vjvFP4dBPU=; b=b0ZEkOtZ0/2MWIRVu3W8RoCi4LUtZHWnoFAwYeg/onViGms+FgCM7bAENXWfmF+j0e B18H/NPmGLKMXHHfoMmH90M16dKVrVqBN+fCQVhlAANXlMtQHEijyuJ195fwmabyq+qL 5poMlccdpg5pBclRiFJAgBVLk+OstZo1kJjyCONS8TyXlFgYwYWJmi+WWKaJsVC81X+w 2ejOGlfovTuqtLy8fYXo6taHbY1RYvcUrnauRWgRvpYLPvT6uC7se23qC8Cypn2hfC8X vXTP0mSaTKv5p+OWqP7M8kCY5IEJC+vsdhIhoZ26EjpTSNeIEgnT/AEC6I3eECG+Jy4T jQQg== X-Gm-Message-State: AOJu0YzNuVMMNyoeJCjbRBa88wfHtS5y4irokjJ3NitUf66AZfKCzYR4 5lAP+DSYsFvAS6Ysu11UJ/DpX+hIYMParo0kp02jIqRI X-Google-Smtp-Source: AGHT+IGGmEyk1OjFw9m0pn/8yG9jZBYUcbB2fnTx4NWYXyDuPq5yL654tmO33MmRV0H62lUW8r3SXw== X-Received: by 2002:adf:ea8b:0:b0:31a:e772:ddf0 with SMTP id s11-20020adfea8b000000b0031ae772ddf0mr5106504wrm.53.1695306160016; Thu, 21 Sep 2023 07:22:40 -0700 (PDT) Received: from localhost.localdomain (abordeaux-655-1-129-86.w90-5.abo.wanadoo.fr. [90.5.10.86]) by smtp.gmail.com with ESMTPSA id n11-20020a5d4c4b000000b0031fbbe347ebsm1901426wrt.22.2023.09.21.07.22.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 07:22:39 -0700 (PDT) From: David Lechner To: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-staging@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , =?UTF-8?q?Nuno=20S=C3=A1?= , Axel Haslam , Philip Molloy , David Lechner Subject: [v2 09/19] staging: iio: resolver: ad2s1210: use regmap for config registers Date: Thu, 21 Sep 2023 09:19:37 -0500 Message-Id: <20230921141947.57784-12-dlechner@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921141947.57784-1-dlechner@baylibre.com> References: <20230921141947.57784-1-dlechner@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This makes use of the regmap API to read and write the configuration registers. This simplifies code quite a bit and makes it safer (previously, it was easy to write a bad value to the config registers which causes the chip to lock up and need to be reset). Signed-off-by: David Lechner --- drivers/staging/iio/resolver/ad2s1210.c | 251 ++++++++++++++---------- 1 file changed, 149 insertions(+), 102 deletions(-) diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/= resolver/ad2s1210.c index 153ac7704ad7..3c81ee61b897 100644 --- a/drivers/staging/iio/resolver/ad2s1210.c +++ b/drivers/staging/iio/resolver/ad2s1210.c @@ -5,6 +5,7 @@ * Copyright (c) 2010-2010 Analog Devices Inc. * Copyright (C) 2023 BayLibre, SAS */ +#include #include #include #include @@ -12,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -22,21 +24,20 @@ =20 #define DRV_NAME "ad2s1210" =20 +/* default value of control register on powerup */ #define AD2S1210_DEF_CONTROL 0x7E =20 -#define AD2S1210_MSB_IS_HIGH 0x80 -#define AD2S1210_MSB_IS_LOW 0x7F -#define AD2S1210_PHASE_LOCK_RANGE_44 0x20 -#define AD2S1210_ENABLE_HYSTERESIS 0x10 -#define AD2S1210_SET_ENRES1 0x08 -#define AD2S1210_SET_ENRES0 0x04 -#define AD2S1210_SET_RES1 0x02 -#define AD2S1210_SET_RES0 0x01 - -#define AD2S1210_SET_RESOLUTION (AD2S1210_SET_RES1 | AD2S1210_SET_RES0) - -#define AD2S1210_REG_POSITION 0x80 -#define AD2S1210_REG_VELOCITY 0x82 +/* control register flags */ +#define AD2S1210_ADDRESS_DATA BIT(7) +#define AD2S1210_PHASE_LOCK_RANGE_44 BIT(5) +#define AD2S1210_ENABLE_HYSTERESIS BIT(4) +#define AD2S1210_SET_ENRES GENMASK(3, 2) +#define AD2S1210_SET_RES GENMASK(1, 0) + +#define AD2S1210_REG_POSITION_MSB 0x80 +#define AD2S1210_REG_POSITION_LSB 0x81 +#define AD2S1210_REG_VELOCITY_MSB 0x82 +#define AD2S1210_REG_VELOCITY_LSB 0x83 #define AD2S1210_REG_LOS_THRD 0x88 #define AD2S1210_REG_DOS_OVR_THRD 0x89 #define AD2S1210_REG_DOS_MIS_THRD 0x8A @@ -92,6 +93,8 @@ struct ad2s1210_state { struct mutex lock; struct spi_device *sdev; struct gpio_desc *gpios[5]; + /** Used to access config registers. */ + struct regmap *regmap; /** The external oscillator frequency in Hz. */ unsigned long fclkin; unsigned int fexcit; @@ -116,24 +119,51 @@ static inline void ad2s1210_set_mode(enum ad2s1210_mo= de mode, st->mode =3D mode; } =20 -/* write 1 bytes (address or data) to the chip */ -static int ad2s1210_config_write(struct ad2s1210_state *st, u8 data) +/* + * Writes the given data to the given register address. + * + * If the mode is configurable, the device will first be placed in + * configuration mode. + */ +static int ad2s1210_regmap_reg_write(void *context, unsigned int reg, + unsigned int val) { - int ret; + struct ad2s1210_state *st =3D context; + struct spi_transfer xfers[] =3D { + { + .len =3D 1, + .rx_buf =3D &st->rx[0], + .tx_buf =3D &st->tx[0], + .cs_change =3D 1, + }, { + .len =3D 1, + .rx_buf =3D &st->rx[1], + .tx_buf =3D &st->tx[1], + }, + }; + + /* values can only be 7 bits, the MSB indicates an address */ + if (val & ~0x7F) + return -EINVAL; + + st->tx[0] =3D reg; + st->tx[1] =3D val; =20 ad2s1210_set_mode(MOD_CONFIG, st); - st->tx[0] =3D data; - ret =3D spi_write(st->sdev, st->tx, 1); - if (ret < 0) - return ret; =20 - return 0; + return spi_sync_transfer(st->sdev, xfers, ARRAY_SIZE(xfers)); } =20 -/* read value from one of the registers */ -static int ad2s1210_config_read(struct ad2s1210_state *st, - unsigned char address) +/* + * Reads value from one of the registers. + * + * If the mode is configurable, the device will first be placed in + * configuration mode. + */ +static int ad2s1210_regmap_reg_read(void *context, unsigned int reg, + unsigned int *val) { + struct ad2s1210_state *st =3D context; struct spi_transfer xfers[] =3D { { .len =3D 1, @@ -146,22 +176,34 @@ static int ad2s1210_config_read(struct ad2s1210_state= *st, .tx_buf =3D &st->tx[1], }, }; - int ret =3D 0; + int ret; =20 ad2s1210_set_mode(MOD_CONFIG, st); - st->tx[0] =3D address | AD2S1210_MSB_IS_HIGH; + st->tx[0] =3D reg; + /* Must be valid register address here otherwise this could write data. + * It doesn't matter which one. + */ st->tx[1] =3D AD2S1210_REG_FAULT; - ret =3D spi_sync_transfer(st->sdev, xfers, 2); + + ret =3D spi_sync_transfer(st->sdev, xfers, ARRAY_SIZE(xfers)); if (ret < 0) return ret; =20 - return st->rx[1]; + /* If the D7 bit is set on any read/write register, it indicates a + * parity error. The fault register is read-only and the D7 bit means + * something else there. + */ + if (reg !=3D AD2S1210_REG_FAULT && st->rx[1] & AD2S1210_ADDRESS_DATA) + return -EBADMSG; + + *val =3D st->rx[1]; + + return 0; } =20 static inline int ad2s1210_update_frequency_control_word(struct ad2s1210_state *st) { - int ret; unsigned char fcw; =20 fcw =3D (unsigned char)(st->fexcit * (1 << 15) / st->fclkin); @@ -170,11 +212,7 @@ int ad2s1210_update_frequency_control_word(struct ad2s= 1210_state *st) return -ERANGE; } =20 - ret =3D ad2s1210_config_write(st, AD2S1210_REG_EXCIT_FREQ); - if (ret < 0) - return ret; - - return ad2s1210_config_write(st, fcw); + return regmap_write(st->regmap, AD2S1210_REG_EXCIT_FREQ, fcw); } =20 static const int ad2s1210_res_pins[4][2] =3D { @@ -191,13 +229,7 @@ static inline void ad2s1210_set_resolution_pin(struct = ad2s1210_state *st) =20 static inline int ad2s1210_soft_reset(struct ad2s1210_state *st) { - int ret; - - ret =3D ad2s1210_config_write(st, AD2S1210_REG_SOFT_RESET); - if (ret < 0) - return ret; - - return ad2s1210_config_write(st, 0x0); + return regmap_write(st->regmap, AD2S1210_REG_SOFT_RESET, 0); } =20 static ssize_t ad2s1210_show_fexcit(struct device *dev, @@ -242,12 +274,13 @@ static ssize_t ad2s1210_show_control(struct device *d= ev, char *buf) { struct ad2s1210_state *st =3D iio_priv(dev_to_iio_dev(dev)); + unsigned int value; int ret; =20 mutex_lock(&st->lock); - ret =3D ad2s1210_config_read(st, AD2S1210_REG_CONTROL); + ret =3D regmap_read(st->regmap, AD2S1210_REG_CONTROL, &value); mutex_unlock(&st->lock); - return ret < 0 ? ret : sprintf(buf, "0x%x\n", ret); + return ret < 0 ? ret : sprintf(buf, "0x%x\n", value); } =20 static ssize_t ad2s1210_store_control(struct device *dev, @@ -264,25 +297,13 @@ static ssize_t ad2s1210_store_control(struct device *= dev, return -EINVAL; =20 mutex_lock(&st->lock); - ret =3D ad2s1210_config_write(st, AD2S1210_REG_CONTROL); - if (ret < 0) - goto error_ret; - data =3D udata & AD2S1210_MSB_IS_LOW; - ret =3D ad2s1210_config_write(st, data); + data =3D udata & ~AD2S1210_ADDRESS_DATA; + ret =3D regmap_write(st->regmap, AD2S1210_REG_CONTROL, data); if (ret < 0) goto error_ret; =20 - ret =3D ad2s1210_config_read(st, AD2S1210_REG_CONTROL); - if (ret < 0) - goto error_ret; - if (ret & AD2S1210_MSB_IS_HIGH) { - ret =3D -EIO; - dev_err(dev, - "ad2s1210: write control register fail\n"); - goto error_ret; - } st->resolution =3D - ad2s1210_resolution_value[data & AD2S1210_SET_RESOLUTION]; + ad2s1210_resolution_value[data & AD2S1210_SET_RES]; ad2s1210_set_resolution_pin(st); ret =3D len; st->hysteresis =3D !!(data & AD2S1210_ENABLE_HYSTERESIS); @@ -315,30 +336,17 @@ static ssize_t ad2s1210_store_resolution(struct devic= e *dev, dev_err(dev, "ad2s1210: resolution out of range\n"); return -EINVAL; } + + data =3D (udata - 10) >> 1; + mutex_lock(&st->lock); - ret =3D ad2s1210_config_read(st, AD2S1210_REG_CONTROL); - if (ret < 0) - goto error_ret; - data =3D ret; - data &=3D ~AD2S1210_SET_RESOLUTION; - data |=3D (udata - 10) >> 1; - ret =3D ad2s1210_config_write(st, AD2S1210_REG_CONTROL); - if (ret < 0) - goto error_ret; - ret =3D ad2s1210_config_write(st, data & AD2S1210_MSB_IS_LOW); + ret =3D regmap_update_bits(st->regmap, AD2S1210_REG_CONTROL, + AD2S1210_SET_RES, data); if (ret < 0) goto error_ret; - ret =3D ad2s1210_config_read(st, AD2S1210_REG_CONTROL); - if (ret < 0) - goto error_ret; - data =3D ret; - if (data & AD2S1210_MSB_IS_HIGH) { - ret =3D -EIO; - dev_err(dev, "ad2s1210: setting resolution fail\n"); - goto error_ret; - } + st->resolution =3D - ad2s1210_resolution_value[data & AD2S1210_SET_RESOLUTION]; + ad2s1210_resolution_value[data & AD2S1210_SET_RES]; ad2s1210_set_resolution_pin(st); ret =3D len; error_ret: @@ -351,13 +359,14 @@ static ssize_t ad2s1210_show_fault(struct device *dev, struct device_attribute *attr, char *buf) { struct ad2s1210_state *st =3D iio_priv(dev_to_iio_dev(dev)); + unsigned int value; int ret; =20 mutex_lock(&st->lock); - ret =3D ad2s1210_config_read(st, AD2S1210_REG_FAULT); + ret =3D regmap_read(st->regmap, AD2S1210_REG_FAULT, &value); mutex_unlock(&st->lock); =20 - return (ret < 0) ? ret : sprintf(buf, "0x%02x\n", ret); + return ret < 0 ? ret : sprintf(buf, "0x%02x\n", value); } =20 static ssize_t ad2s1210_clear_fault(struct device *dev, @@ -366,6 +375,7 @@ static ssize_t ad2s1210_clear_fault(struct device *dev, size_t len) { struct ad2s1210_state *st =3D iio_priv(dev_to_iio_dev(dev)); + unsigned int value; int ret; =20 mutex_lock(&st->lock); @@ -373,7 +383,7 @@ static ssize_t ad2s1210_clear_fault(struct device *dev, /* delay (2 * tck + 20) nano seconds */ udelay(1); gpiod_set_value(st->gpios[AD2S1210_SAMPLE], 1); - ret =3D ad2s1210_config_read(st, AD2S1210_REG_FAULT); + ret =3D regmap_read(st->regmap, AD2S1210_REG_FAULT, &value); if (ret < 0) goto error_ret; gpiod_set_value(st->gpios[AD2S1210_SAMPLE], 0); @@ -390,13 +400,14 @@ static ssize_t ad2s1210_show_reg(struct device *dev, { struct ad2s1210_state *st =3D iio_priv(dev_to_iio_dev(dev)); struct iio_dev_attr *iattr =3D to_iio_dev_attr(attr); + unsigned int value; int ret; =20 mutex_lock(&st->lock); - ret =3D ad2s1210_config_read(st, iattr->address); + ret =3D regmap_read(st->regmap, iattr->address, &value); mutex_unlock(&st->lock); =20 - return ret < 0 ? ret : sprintf(buf, "%d\n", ret); + return ret < 0 ? ret : sprintf(buf, "%d\n", value); } =20 static ssize_t ad2s1210_store_reg(struct device *dev, @@ -409,14 +420,11 @@ static ssize_t ad2s1210_store_reg(struct device *dev, struct iio_dev_attr *iattr =3D to_iio_dev_attr(attr); =20 ret =3D kstrtou8(buf, 10, &data); - if (ret) + if (ret < 0) return -EINVAL; + mutex_lock(&st->lock); - ret =3D ad2s1210_config_write(st, iattr->address); - if (ret < 0) - goto error_ret; - ret =3D ad2s1210_config_write(st, data & AD2S1210_MSB_IS_LOW); -error_ret: + ret =3D regmap_write(st->regmap, iattr->address, data); mutex_unlock(&st->lock); return ret < 0 ? ret : len; } @@ -583,23 +591,12 @@ static int ad2s1210_initial(struct ad2s1210_state *st) mutex_lock(&st->lock); ad2s1210_set_resolution_pin(st); =20 - ret =3D ad2s1210_config_write(st, AD2S1210_REG_CONTROL); - if (ret < 0) - goto error_ret; - data =3D AD2S1210_DEF_CONTROL & ~(AD2S1210_SET_RESOLUTION); + data =3D AD2S1210_DEF_CONTROL & ~AD2S1210_SET_RES; data |=3D (st->resolution - 10) >> 1; - ret =3D ad2s1210_config_write(st, data); - if (ret < 0) - goto error_ret; - ret =3D ad2s1210_config_read(st, AD2S1210_REG_CONTROL); + ret =3D regmap_write(st->regmap, AD2S1210_REG_CONTROL, data); if (ret < 0) goto error_ret; =20 - if (ret & AD2S1210_MSB_IS_HIGH) { - ret =3D -EIO; - goto error_ret; - } - ret =3D ad2s1210_update_frequency_control_word(st); if (ret < 0) goto error_ret; @@ -652,6 +649,52 @@ static int ad2s1210_setup_gpios(struct ad2s1210_state = *st) return 0; } =20 +static const struct regmap_range ad2s1210_regmap_readable_ranges[] =3D { + regmap_reg_range(AD2S1210_REG_POSITION_MSB, AD2S1210_REG_VELOCITY_LSB), + regmap_reg_range(AD2S1210_REG_LOS_THRD, AD2S1210_REG_LOT_LOW_THRD), + regmap_reg_range(AD2S1210_REG_EXCIT_FREQ, AD2S1210_REG_CONTROL), + regmap_reg_range(AD2S1210_REG_FAULT, AD2S1210_REG_FAULT), +}; + +static const struct regmap_access_table ad2s1210_regmap_rd_table =3D { + .yes_ranges =3D ad2s1210_regmap_readable_ranges, + .n_yes_ranges =3D ARRAY_SIZE(ad2s1210_regmap_readable_ranges), +}; + +static const struct regmap_range ad2s1210_regmap_writeable_ranges[] =3D { + regmap_reg_range(AD2S1210_REG_LOS_THRD, AD2S1210_REG_LOT_LOW_THRD), + regmap_reg_range(AD2S1210_REG_EXCIT_FREQ, AD2S1210_REG_CONTROL), + regmap_reg_range(AD2S1210_REG_SOFT_RESET, AD2S1210_REG_SOFT_RESET), + regmap_reg_range(AD2S1210_REG_FAULT, AD2S1210_REG_FAULT), +}; + +static const struct regmap_access_table ad2s1210_regmap_wr_table =3D { + .yes_ranges =3D ad2s1210_regmap_writeable_ranges, + .n_yes_ranges =3D ARRAY_SIZE(ad2s1210_regmap_writeable_ranges), +}; + +static int ad2s1210_setup_regmap(struct ad2s1210_state *st) +{ + struct device *dev =3D &st->sdev->dev; + const struct regmap_config config =3D { + .reg_bits =3D 8, + .val_bits =3D 8, + .disable_locking =3D true, + .reg_read =3D ad2s1210_regmap_reg_read, + .reg_write =3D ad2s1210_regmap_reg_write, + .rd_table =3D &ad2s1210_regmap_rd_table, + .wr_table =3D &ad2s1210_regmap_wr_table, + .can_sleep =3D true, + }; + + st->regmap =3D devm_regmap_init(dev, NULL, st, &config); + if (IS_ERR(st->regmap)) + return dev_err_probe(dev, PTR_ERR(st->regmap), + "failed to allocate register map\n"); + + return 0; +} + static int ad2s1210_probe(struct spi_device *spi) { struct iio_dev *indio_dev; @@ -679,6 +722,10 @@ static int ad2s1210_probe(struct spi_device *spi) if (ret < 0) return ret; =20 + ret =3D ad2s1210_setup_regmap(st); + if (ret < 0) + return ret; + ret =3D ad2s1210_initial(st); if (ret < 0) return ret; --=20 2.34.1 From nobody Fri Feb 13 17:30:43 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24971E7D0A2 for ; Thu, 21 Sep 2023 20:12:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230109AbjIUUMT (ORCPT ); Thu, 21 Sep 2023 16:12:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230047AbjIUULs (ORCPT ); Thu, 21 Sep 2023 16:11:48 -0400 Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 60F145AA83 for ; Thu, 21 Sep 2023 10:21:24 -0700 (PDT) Received: by mail-lj1-x22c.google.com with SMTP id 38308e7fff4ca-2c007d6159aso21441401fa.3 for ; Thu, 21 Sep 2023 10:21:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1695316882; x=1695921682; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NDg1sZsypbtmVZl9501Jvjfjp7cqgNO2wWu9eDz+bAo=; b=PgHTlmA9ZZBPsUHkRek3QR07IKwzAo5DleHlDtwQe9dKPw9bk3uzFx6mC3JiqzAoe5 o2z9GDYDukAmISUOdBTofle92Q1pQ+2aIwlvIcgtu0E0wHXLDYrTmqmD2VUPmxkX2gZq uiBqm13rY++vFrNGu02o7SsNFLl3HFjhtYjr7sxDlYuuW+6eFH0el3wFrIhP6+2G569J EuqaNytOhFE+uIcSqbELz7GGluAHNTqJuNzRLIn0qRJSskyyltFj/xPV11uHDfWhE67S hOVm1tI/NayaubkwTnN29OaoEW2C3V0rIoD/hEs/jHnEXT2Y3h5wlFVrMK8N+5uX6oK7 cI9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695316882; x=1695921682; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NDg1sZsypbtmVZl9501Jvjfjp7cqgNO2wWu9eDz+bAo=; b=jI0po5fbAWubTedurd+iLlsUKT582kQeAlHVMM9fpj6t00tsg7EPORknerV7kStJKi Z9FQXaiLJzMwAa0CTZleNmmnb0QLluv61BPHfFJTB4ykApDPTZ4IErI4fUhMkZwU/axY ov6I+QfYsgIr+ybU2FLk4S/iMsQkY6jKTnplaoBSi6n+ACFRai0mS8wTspTXV0Qr+ooK I+ZdoXl9zFTAYxghOSv9YlGrat7q7EOU7hQoYXqUmyoJ9+wGKDzip/Z+osSl+uHOchp9 e8ZiMTo6HNmXKGX8Vr3UQJJhfa+/S9NFL66nLte3dgmdLlFPjckNHGU+NshVKoE9jFyk kCBg== X-Gm-Message-State: AOJu0YxnqHjnD8GhrWEKFt1MdFjQDqoorpcqvbuuYolRifhP6JWHvDbC ASkSQaXvZyDl8QSI7NhDO5ErntATBxvBuehmCRODYCWR X-Google-Smtp-Source: AGHT+IGgYCYV4RIyluC952QS15xlxGsYiHuw3JJvkpeLNvHhq4UFPDC/C6dReCQO1m30NxXKsPt5kw== X-Received: by 2002:a5d:4c85:0:b0:31f:a259:733 with SMTP id z5-20020a5d4c85000000b0031fa2590733mr5275304wrs.20.1695306161138; Thu, 21 Sep 2023 07:22:41 -0700 (PDT) Received: from localhost.localdomain (abordeaux-655-1-129-86.w90-5.abo.wanadoo.fr. [90.5.10.86]) by smtp.gmail.com with ESMTPSA id n11-20020a5d4c4b000000b0031fbbe347ebsm1901426wrt.22.2023.09.21.07.22.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 07:22:40 -0700 (PDT) From: David Lechner To: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-staging@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , =?UTF-8?q?Nuno=20S=C3=A1?= , Axel Haslam , Philip Molloy , David Lechner Subject: [v2 10/19] staging: iio: resolver: ad2s1210: add debugfs reg access Date: Thu, 21 Sep 2023 09:19:38 -0500 Message-Id: <20230921141947.57784-13-dlechner@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921141947.57784-1-dlechner@baylibre.com> References: <20230921141947.57784-1-dlechner@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This add an implementation of debugfs_reg_access for the AD2S1210 driver. Signed-off-by: David Lechner --- drivers/staging/iio/resolver/ad2s1210.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/= resolver/ad2s1210.c index 3c81ee61b897..b99928394e3f 100644 --- a/drivers/staging/iio/resolver/ad2s1210.c +++ b/drivers/staging/iio/resolver/ad2s1210.c @@ -606,9 +606,29 @@ static int ad2s1210_initial(struct ad2s1210_state *st) return ret; } =20 +static int ad2s1210_debugfs_reg_access(struct iio_dev *indio_dev, + unsigned int reg, unsigned int writeval, + unsigned int *readval) +{ + struct ad2s1210_state *st =3D iio_priv(indio_dev); + int ret; + + mutex_lock(&st->lock); + + if (readval) + ret =3D regmap_read(st->regmap, reg, readval); + else + ret =3D regmap_write(st->regmap, reg, writeval); + + mutex_unlock(&st->lock); + + return ret; +} + static const struct iio_info ad2s1210_info =3D { .read_raw =3D ad2s1210_read_raw, .attrs =3D &ad2s1210_attribute_group, + .debugfs_reg_access =3D &ad2s1210_debugfs_reg_access, }; =20 static int ad2s1210_setup_clocks(struct ad2s1210_state *st) --=20 2.34.1 From nobody Fri Feb 13 17:30:43 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C515E7D0A9 for ; Thu, 21 Sep 2023 18:35:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229778AbjIUSff (ORCPT ); Thu, 21 Sep 2023 14:35:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229902AbjIUSfU (ORCPT ); Thu, 21 Sep 2023 14:35:20 -0400 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A63A37BF3 for ; Thu, 21 Sep 2023 10:24:50 -0700 (PDT) Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4053c6f0d55so410915e9.0 for ; Thu, 21 Sep 2023 10:24:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1695317086; x=1695921886; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=T9WVKxDU/WCTxqQ52/M5ua8wasfSRRcZpI1eeblkSC8=; b=0AA6CHTOlyn5DcYdQm82Wdh8HrYy77CMizme03XzsnhPkGK49AriWCJXP/I1UmiqUE 0BrIdNXR7UytEoX5+pParh+pZbvAaxIoLmqVL23DoQuoj3+RpnqMMWshRsK/mK66il0P TZ8UMhVNKF4nYOEQ6oytCAxyth8aUhnsQSDIv1DNPtsFyw4//yY/Gr5YIQtkImSgr2J2 JV4t3v0ORKWp8ta22c6KxZClme39ij2zihMqKJnzyl5+pSr6SbaQvsii202YwgyaDjOu /RJ2ENfZQH6RPd970i0VC0cEFo/DVmMZNKEg5z/2wiAdEv8X5vEvxpkwc3kTByDRNStp oc0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695317086; x=1695921886; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T9WVKxDU/WCTxqQ52/M5ua8wasfSRRcZpI1eeblkSC8=; b=SZZG0SZMJNBrqNCfmtJX5dsTSs/mD0UBCdvTwgifrW5w+i0sEOsRci88n+ljcKoiwu ghbVAYnQcap3blN5y1PPemBReZnDtfWx2jO4RN5Vc/ZIHCMwmeh5MTt6wddr7j04IXbz qZC+lZs/1PZ+BfeAkeLeDwp/gqWUhKcPiYQmGOy4qnayvSWAQJtyoHfgzYRfJnWm3wRe 7NCD7kuSAVc+2aUcc5meLCNOJuVyEJyVFGXEWm5wDGadAiTNyjtIHMvxNjJPTCsGA7Ne 2iKuY54QwYXx9M3xoa7L+AK8SoB6qG+xy41GZE34IUrsxBG2FeFoyDRLA5avKHR+PP0F ADKA== X-Gm-Message-State: AOJu0YxPJhZP2BD4Bj8jso/J92YaA7ZxCyfo2hYJDkDEZnn9UTgkHy28 tdhnLe6iJl/4Z5M8Oi8K9/f21ypDr14HSltC5GAUljEr X-Google-Smtp-Source: AGHT+IErIr8HYB39hw00Tn3dC53NPjDauGkjswbrG4/MJD7OhSd2tta9YfBeev9o1GBCz+kjzTcBFw== X-Received: by 2002:a05:600c:1d1d:b0:405:336b:8307 with SMTP id l29-20020a05600c1d1d00b00405336b8307mr1536343wms.7.1695306162032; Thu, 21 Sep 2023 07:22:42 -0700 (PDT) Received: from localhost.localdomain (abordeaux-655-1-129-86.w90-5.abo.wanadoo.fr. [90.5.10.86]) by smtp.gmail.com with ESMTPSA id n11-20020a5d4c4b000000b0031fbbe347ebsm1901426wrt.22.2023.09.21.07.22.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 07:22:41 -0700 (PDT) From: David Lechner To: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-staging@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , =?UTF-8?q?Nuno=20S=C3=A1?= , Axel Haslam , Philip Molloy , David Lechner Subject: [v2 11/19] staging: iio: resolver: ad2s1210: remove config attribute Date: Thu, 21 Sep 2023 09:19:39 -0500 Message-Id: <20230921141947.57784-14-dlechner@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921141947.57784-1-dlechner@baylibre.com> References: <20230921141947.57784-1-dlechner@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This removes the config register sysfs attribute. Writing to the config register directly can be dangerous and userspace should not need to have to know the register layout. This register can still be accessed though debugfs if needed. We can add new attributes to set specific flags in the config register in the future if needed (e.g. `enable_hysterisis` and `phase_lock_range`). Signed-off-by: David Lechner --- drivers/staging/iio/resolver/ad2s1210.c | 47 ------------------------- 1 file changed, 47 deletions(-) diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/= resolver/ad2s1210.c index b99928394e3f..223cc4702188 100644 --- a/drivers/staging/iio/resolver/ad2s1210.c +++ b/drivers/staging/iio/resolver/ad2s1210.c @@ -269,50 +269,6 @@ static ssize_t ad2s1210_store_fexcit(struct device *de= v, return ret < 0 ? ret : len; } =20 -static ssize_t ad2s1210_show_control(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct ad2s1210_state *st =3D iio_priv(dev_to_iio_dev(dev)); - unsigned int value; - int ret; - - mutex_lock(&st->lock); - ret =3D regmap_read(st->regmap, AD2S1210_REG_CONTROL, &value); - mutex_unlock(&st->lock); - return ret < 0 ? ret : sprintf(buf, "0x%x\n", value); -} - -static ssize_t ad2s1210_store_control(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t len) -{ - struct ad2s1210_state *st =3D iio_priv(dev_to_iio_dev(dev)); - unsigned char udata; - unsigned char data; - int ret; - - ret =3D kstrtou8(buf, 16, &udata); - if (ret) - return -EINVAL; - - mutex_lock(&st->lock); - data =3D udata & ~AD2S1210_ADDRESS_DATA; - ret =3D regmap_write(st->regmap, AD2S1210_REG_CONTROL, data); - if (ret < 0) - goto error_ret; - - st->resolution =3D - ad2s1210_resolution_value[data & AD2S1210_SET_RES]; - ad2s1210_set_resolution_pin(st); - ret =3D len; - st->hysteresis =3D !!(data & AD2S1210_ENABLE_HYSTERESIS); - -error_ret: - mutex_unlock(&st->lock); - return ret; -} - static ssize_t ad2s1210_show_resolution(struct device *dev, struct device_attribute *attr, char *buf) @@ -519,8 +475,6 @@ static int ad2s1210_read_raw(struct iio_dev *indio_dev, =20 static IIO_DEVICE_ATTR(fexcit, 0644, ad2s1210_show_fexcit, ad2s1210_store_fexcit, 0); -static IIO_DEVICE_ATTR(control, 0644, - ad2s1210_show_control, ad2s1210_store_control, 0); static IIO_DEVICE_ATTR(bits, 0644, ad2s1210_show_resolution, ad2s1210_store_resolution, 0); static IIO_DEVICE_ATTR(fault, 0644, @@ -566,7 +520,6 @@ static const struct iio_chan_spec ad2s1210_channels[] = =3D { =20 static struct attribute *ad2s1210_attributes[] =3D { &iio_dev_attr_fexcit.dev_attr.attr, - &iio_dev_attr_control.dev_attr.attr, &iio_dev_attr_bits.dev_attr.attr, &iio_dev_attr_fault.dev_attr.attr, &iio_dev_attr_los_thrd.dev_attr.attr, --=20 2.34.1 From nobody Fri Feb 13 17:30:43 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 129C3E7D0A3 for ; Thu, 21 Sep 2023 17:53:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229923AbjIURyB (ORCPT ); Thu, 21 Sep 2023 13:54:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230250AbjIURxr (ORCPT ); Thu, 21 Sep 2023 13:53:47 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 850AA5B8F8 for ; Thu, 21 Sep 2023 10:29:40 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-532addba879so2647664a12.0 for ; Thu, 21 Sep 2023 10:29:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1695317369; x=1695922169; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xoiF1sc5Yv1hjuRdgeGOkvi9X2NDURf5lh9dRaGmJUM=; b=w/y6pZynNzcpSeLIsCj9ynAqT8PQqmkBhda2jxXHRihnfZlMlFgLsgqltbjsKj/iut XdLHz5ezl1NIgJDXb6PwgPSHZSTu/SWNCpHnScDWy1zyIeAvhWClnD9PE69Z0/zbraip 19oigA55j9xTKIm9RdCGUXnAn192kJ4S5o+5Y2Dyp8v2MARR/zDPYvEsIDUYbi6SH69x iyCSdDtawzugou/cbkq84XMLOgkqcoQ+wbb9MAMQ1Lc6Dpmecwp2yfzcRhEOiq9XPDy8 moeINQb2csJUG6gBAYMzZnjPP9dgzcHWXCDe/fFcILlGPvefYHygEMf0VsE3Z6evn0o3 Wq0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695317369; x=1695922169; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xoiF1sc5Yv1hjuRdgeGOkvi9X2NDURf5lh9dRaGmJUM=; b=gPTikhk6VX+EzxCKikz61aD998QGiWU08rCAEsrCNwr2GbJa0qcO7Vgec/roLEbKj2 TInxnQ9B+HEez86NRxJCgMS0q67wbM2SBJmSZDMi5ZbAJSvK5fh3ZgP4yrp6UH8GGkgL tyZTkVNjPsLIAWJL8FYx3/IGwpNScpefgEHjraI5ohcdtQO8kvWwb5pmZ+sfEmVeLU0H tR5p9wQKdczcSmZ7lP80eTOM/q77aqLVbGx9tPSVz84sB5oQohVvM9p0kh12j59YucSt /vCDp0EAzu9z/gOqHg+FhdUuaoHQEHP+zo8xIM20708ysyUM3ClIyj33G31d0FVfqILz 8YYQ== X-Gm-Message-State: AOJu0YxzLjCSG478BNfBSWl4HsyV8LpwaHAGgi0pTcceY5bp9esxYVU7 3FPJVHHHhTPOwXBEmUPeIWEawIc7jirb13FUw0DnTvX5 X-Google-Smtp-Source: AGHT+IFLAailNSfpLWCmoZinfeHn+u6645WDTA+4EEZgkEmo5Zeo7s9f1tFWyiN0QMRZgSvQMKO0kw== X-Received: by 2002:adf:d0cc:0:b0:31f:ebb5:cd51 with SMTP id z12-20020adfd0cc000000b0031febb5cd51mr4695038wrh.33.1695306162905; Thu, 21 Sep 2023 07:22:42 -0700 (PDT) Received: from localhost.localdomain (abordeaux-655-1-129-86.w90-5.abo.wanadoo.fr. [90.5.10.86]) by smtp.gmail.com with ESMTPSA id n11-20020a5d4c4b000000b0031fbbe347ebsm1901426wrt.22.2023.09.21.07.22.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 07:22:42 -0700 (PDT) From: David Lechner To: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-staging@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , =?UTF-8?q?Nuno=20S=C3=A1?= , Axel Haslam , Philip Molloy , David Lechner Subject: [v2 12/19] staging: iio: resolver: ad2s1210: rework gpios Date: Thu, 21 Sep 2023 09:19:40 -0500 Message-Id: <20230921141947.57784-15-dlechner@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921141947.57784-1-dlechner@baylibre.com> References: <20230921141947.57784-1-dlechner@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" - Remove "adi," prefix from gpio names. - Sample gpio is now expected to be active low. - Convert A0 and A1 gpios to "mode-gpios" gpio array. - Convert RES0 and RES1 gpios to "resolution-gpios" gpio array. - Remove extraneous lookup tables. - Remove unused mode field from state struct. - Swap argument order of ad2s1210_set_mode() while we are touching this. Signed-off-by: David Lechner --- drivers/staging/iio/resolver/ad2s1210.c | 162 ++++++++++++------------ 1 file changed, 84 insertions(+), 78 deletions(-) diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/= resolver/ad2s1210.c index 223cc4702188..7a1069d948eb 100644 --- a/drivers/staging/iio/resolver/ad2s1210.c +++ b/drivers/staging/iio/resolver/ad2s1210.c @@ -60,39 +60,21 @@ #define AD2S1210_DEF_EXCIT 10000 =20 enum ad2s1210_mode { - MOD_POS =3D 0, - MOD_VEL, - MOD_CONFIG, - MOD_RESERVED, + MOD_POS =3D 0b00, + MOD_VEL =3D 0b01, + MOD_RESERVED =3D 0b10, + MOD_CONFIG =3D 0b11, }; =20 -enum ad2s1210_gpios { - AD2S1210_SAMPLE, - AD2S1210_A0, - AD2S1210_A1, - AD2S1210_RES0, - AD2S1210_RES1, -}; - -struct ad2s1210_gpio { - const char *name; - unsigned long flags; -}; - -static const struct ad2s1210_gpio gpios[] =3D { - [AD2S1210_SAMPLE] =3D { .name =3D "adi,sample", .flags =3D GPIOD_OUT_LOW = }, - [AD2S1210_A0] =3D { .name =3D "adi,a0", .flags =3D GPIOD_OUT_LOW }, - [AD2S1210_A1] =3D { .name =3D "adi,a1", .flags =3D GPIOD_OUT_LOW }, - [AD2S1210_RES0] =3D { .name =3D "adi,res0", .flags =3D GPIOD_OUT_LOW }, - [AD2S1210_RES1] =3D { .name =3D "adi,res1", .flags =3D GPIOD_OUT_LOW }, -}; - -static const unsigned int ad2s1210_resolution_value[] =3D { 10, 12, 14, 16= }; - struct ad2s1210_state { struct mutex lock; struct spi_device *sdev; - struct gpio_desc *gpios[5]; + /** GPIO pin connected to SAMPLE line. */ + struct gpio_desc *sample_gpio; + /** GPIO pins connected to A0 and A1 lines. */ + struct gpio_descs *mode_gpios; + /** GPIO pins connected to RES0 and RES1 lines. */ + struct gpio_descs *resolution_gpios; /** Used to access config registers. */ struct regmap *regmap; /** The external oscillator frequency in Hz. */ @@ -100,23 +82,19 @@ struct ad2s1210_state { unsigned int fexcit; bool hysteresis; u8 resolution; - enum ad2s1210_mode mode; u8 rx[2] __aligned(IIO_DMA_MINALIGN); u8 tx[2]; }; =20 -static const int ad2s1210_mode_vals[4][2] =3D { - [MOD_POS] =3D { 0, 0 }, - [MOD_VEL] =3D { 0, 1 }, - [MOD_CONFIG] =3D { 1, 1 }, -}; - -static inline void ad2s1210_set_mode(enum ad2s1210_mode mode, - struct ad2s1210_state *st) +static int ad2s1210_set_mode(struct ad2s1210_state *st, enum ad2s1210_mode= mode) { - gpiod_set_value(st->gpios[AD2S1210_A0], ad2s1210_mode_vals[mode][0]); - gpiod_set_value(st->gpios[AD2S1210_A1], ad2s1210_mode_vals[mode][1]); - st->mode =3D mode; + struct gpio_descs *gpios =3D st->mode_gpios; + DECLARE_BITMAP(bitmap, 2); + + bitmap[0] =3D mode; + + return gpiod_set_array_value(gpios->ndescs, gpios->desc, gpios->info, + bitmap); } =20 /* @@ -141,6 +119,7 @@ static int ad2s1210_regmap_reg_write(void *context, uns= igned int reg, .tx_buf =3D &st->tx[1], }, }; + int ret; =20 /* values can only be 7 bits, the MSB indicates an address */ if (val & ~0x7F) @@ -149,7 +128,9 @@ static int ad2s1210_regmap_reg_write(void *context, uns= igned int reg, st->tx[0] =3D reg; st->tx[1] =3D val; =20 - ad2s1210_set_mode(MOD_CONFIG, st); + ret =3D ad2s1210_set_mode(st, MOD_CONFIG); + if (ret < 0) + return ret; =20 return spi_sync_transfer(st->sdev, xfers, ARRAY_SIZE(xfers)); } @@ -178,7 +159,10 @@ static int ad2s1210_regmap_reg_read(void *context, uns= igned int reg, }; int ret; =20 - ad2s1210_set_mode(MOD_CONFIG, st); + ret =3D ad2s1210_set_mode(st, MOD_CONFIG); + if (ret < 0) + return ret; + st->tx[0] =3D reg; /* Must be valid register address here otherwise this could write data. * It doesn't matter which one. @@ -215,16 +199,16 @@ int ad2s1210_update_frequency_control_word(struct ad2= s1210_state *st) return regmap_write(st->regmap, AD2S1210_REG_EXCIT_FREQ, fcw); } =20 -static const int ad2s1210_res_pins[4][2] =3D { - { 0, 0 }, {0, 1}, {1, 0}, {1, 1} -}; - -static inline void ad2s1210_set_resolution_pin(struct ad2s1210_state *st) +static int ad2s1210_set_resolution_gpios(struct ad2s1210_state *st, + u8 resolution) { - gpiod_set_value(st->gpios[AD2S1210_RES0], - ad2s1210_res_pins[(st->resolution - 10) / 2][0]); - gpiod_set_value(st->gpios[AD2S1210_RES1], - ad2s1210_res_pins[(st->resolution - 10) / 2][1]); + struct gpio_descs *gpios =3D st->resolution_gpios; + DECLARE_BITMAP(bitmap, 2); + + bitmap[0] =3D (resolution - 10) >> 1; + + return gpiod_set_array_value(gpios->ndescs, gpios->desc, gpios->info, + bitmap); } =20 static inline int ad2s1210_soft_reset(struct ad2s1210_state *st) @@ -301,10 +285,13 @@ static ssize_t ad2s1210_store_resolution(struct devic= e *dev, if (ret < 0) goto error_ret; =20 - st->resolution =3D - ad2s1210_resolution_value[data & AD2S1210_SET_RES]; - ad2s1210_set_resolution_pin(st); + ret =3D ad2s1210_set_resolution_gpios(st, udata); + if (ret < 0) + goto error_ret; + + st->resolution =3D udata; ret =3D len; + error_ret: mutex_unlock(&st->lock); return ret; @@ -335,15 +322,19 @@ static ssize_t ad2s1210_clear_fault(struct device *de= v, int ret; =20 mutex_lock(&st->lock); - gpiod_set_value(st->gpios[AD2S1210_SAMPLE], 0); + + gpiod_set_value(st->sample_gpio, 1); /* delay (2 * tck + 20) nano seconds */ udelay(1); - gpiod_set_value(st->gpios[AD2S1210_SAMPLE], 1); + gpiod_set_value(st->sample_gpio, 0); + ret =3D regmap_read(st->regmap, AD2S1210_REG_FAULT, &value); if (ret < 0) goto error_ret; - gpiod_set_value(st->gpios[AD2S1210_SAMPLE], 0); - gpiod_set_value(st->gpios[AD2S1210_SAMPLE], 1); + + gpiod_set_value(st->sample_gpio, 1); + gpiod_set_value(st->sample_gpio, 0); + error_ret: mutex_unlock(&st->lock); =20 @@ -404,16 +395,16 @@ static int ad2s1210_read_raw(struct iio_dev *indio_de= v, switch (mask) { case IIO_CHAN_INFO_RAW: mutex_lock(&st->lock); - gpiod_set_value(st->gpios[AD2S1210_SAMPLE], 0); + gpiod_set_value(st->sample_gpio, 1); /* delay (6 * tck + 20) nano seconds */ udelay(1); =20 switch (chan->type) { case IIO_ANGL: - ad2s1210_set_mode(MOD_POS, st); + ret =3D ad2s1210_set_mode(st, MOD_POS); break; case IIO_ANGL_VEL: - ad2s1210_set_mode(MOD_VEL, st); + ret =3D ad2s1210_set_mode(st, MOD_VEL); break; default: ret =3D -EINVAL; @@ -440,7 +431,7 @@ static int ad2s1210_read_raw(struct iio_dev *indio_dev, } =20 error_info_raw: - gpiod_set_value(st->gpios[AD2S1210_SAMPLE], 1); + gpiod_set_value(st->sample_gpio, 0); /* delay (2 * tck + 20) nano seconds */ udelay(1); mutex_unlock(&st->lock); @@ -542,7 +533,9 @@ static int ad2s1210_initial(struct ad2s1210_state *st) int ret; =20 mutex_lock(&st->lock); - ad2s1210_set_resolution_pin(st); + ret =3D ad2s1210_set_resolution_gpios(st, st->resolution); + if (ret < 0) + return ret; =20 data =3D AD2S1210_DEF_CONTROL & ~AD2S1210_SET_RES; data |=3D (st->resolution - 10) >> 1; @@ -604,20 +597,34 @@ static int ad2s1210_setup_clocks(struct ad2s1210_stat= e *st) =20 static int ad2s1210_setup_gpios(struct ad2s1210_state *st) { - struct spi_device *spi =3D st->sdev; - int i, ret; - - for (i =3D 0; i < ARRAY_SIZE(gpios); i++) { - st->gpios[i] =3D devm_gpiod_get(&spi->dev, gpios[i].name, - gpios[i].flags); - if (IS_ERR(st->gpios[i])) { - ret =3D PTR_ERR(st->gpios[i]); - dev_err(&spi->dev, - "ad2s1210: failed to request %s GPIO: %d\n", - gpios[i].name, ret); - return ret; - } - } + struct device *dev =3D &st->sdev->dev; + + /* should not be sampling on startup */ + st->sample_gpio =3D devm_gpiod_get(dev, "sample", GPIOD_OUT_LOW); + if (IS_ERR(st->sample_gpio)) + return dev_err_probe(dev, PTR_ERR(st->sample_gpio), + "failed to request sample GPIO\n"); + + /* both pins high means that we start in config mode */ + st->mode_gpios =3D devm_gpiod_get_array(dev, "mode", GPIOD_OUT_HIGH); + if (IS_ERR(st->mode_gpios)) + return dev_err_probe(dev, PTR_ERR(st->mode_gpios), + "failed to request mode GPIOs\n"); + + if (st->mode_gpios->ndescs !=3D 2) + return dev_err_probe(dev, -EINVAL, + "requires exactly 2 mode-gpios\n"); + + /* both pins high means that we start with 16-bit resolution */ + st->resolution_gpios =3D devm_gpiod_get_array(dev, "resolution", + GPIOD_OUT_HIGH); + if (IS_ERR(st->resolution_gpios)) + return dev_err_probe(dev, PTR_ERR(st->resolution_gpios), + "failed to request resolution GPIOs\n"); + + if (st->resolution_gpios->ndescs !=3D 2) + return dev_err_probe(dev, -EINVAL, + "requires exactly 2 resolution-gpios\n"); =20 return 0; } @@ -683,7 +690,6 @@ static int ad2s1210_probe(struct spi_device *spi) mutex_init(&st->lock); st->sdev =3D spi; st->hysteresis =3D true; - st->mode =3D MOD_CONFIG; st->resolution =3D 12; st->fexcit =3D AD2S1210_DEF_EXCIT; =20 --=20 2.34.1 From nobody Fri Feb 13 17:30:43 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6127EE7D0B3 for ; Thu, 21 Sep 2023 21:46:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231572AbjIUVqf (ORCPT ); Thu, 21 Sep 2023 17:46:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231576AbjIUVqS (ORCPT ); Thu, 21 Sep 2023 17:46:18 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A728451024 for ; Thu, 21 Sep 2023 10:15:31 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-40537481094so7267745e9.0 for ; Thu, 21 Sep 2023 10:15:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1695316530; x=1695921330; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AZybWEnlutF3BnUcq+xH7uoi35RICanW/277eMaA8Sc=; b=QX7oj5np2ycSjEfo16DJk51/6otI5U4wdTk4MHhhoZqEQq2sMNOVJURgTOW08Lsntk p+5j6M+bsd9jDRVI1qImshIFkGzeYKzMnKImUUSvGZSCAjwsq/NyO9E8dl/geDjzbXuc p5KIAuQ+0oHnvPZgKxkoEmE88wCFB0UjpnE5moyhtJyWckY6oKGO3zOXfT/tf+668uFf hyDGFgXL38Bgc75KJsHub0gvKOIgBuCQ7WmCFlbosnp+qWsg/EAMG0MrtskE9YJ2Ovvw EVsCjYIKnDqWDvi64gG+OqlnVR/fCtZs6922yIbyzSj4p7oLGRSjDqPHhom42j4xiSAz pd2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695316530; x=1695921330; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AZybWEnlutF3BnUcq+xH7uoi35RICanW/277eMaA8Sc=; b=aV0zjsK0mQxc97cnskrh6OQWizP7nHbWml+2wzu0zdFjwyT9KCDp2Fn1+Sg6fIXeVs QrdgPZHyz3+CMSAbAUkh479962QS5nxPgaQQo99d+QdJifrjJ6Ii+ExBhl6pP/M36h+t NccoGWo47bvxPRg5wNkc3yS9XfsGz1n0QqA7IsdY/l7sQ535b6LfjvAqszJ5kghaUBIc oE81/4VX9fqvmhes2RbW5tMNPVhvMpyHvOa4QOBv7zzaZoZSBWzC9RhD6bnyBkaLELXe ZzmjLviKuULMR0n4ybBMA5eC9UuM20M+W1+jRmbgpuPhK+M7ZnZQM5AMkpAcy/EvQoH4 Gw/w== X-Gm-Message-State: AOJu0YxEtrso9ynsfHtXviTruqJqiQ6+ZeeDdPeeGX5oFv4TAXt/s1Jx 9aXOmpTXCvRIFpChiZNaTKQqY1bsZzgEjfqqUPlN2JAn X-Google-Smtp-Source: AGHT+IEc+ToK/YlPl4OhhuhcmW2i+TTG/k1yEvY4gVlKSX7pGRedYf1SANoITpOQbOK/u1re+CP3BA== X-Received: by 2002:adf:f68c:0:b0:320:b1b:86a9 with SMTP id v12-20020adff68c000000b003200b1b86a9mr5129294wrp.24.1695306163828; Thu, 21 Sep 2023 07:22:43 -0700 (PDT) Received: from localhost.localdomain (abordeaux-655-1-129-86.w90-5.abo.wanadoo.fr. [90.5.10.86]) by smtp.gmail.com with ESMTPSA id n11-20020a5d4c4b000000b0031fbbe347ebsm1901426wrt.22.2023.09.21.07.22.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 07:22:43 -0700 (PDT) From: David Lechner To: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-staging@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , =?UTF-8?q?Nuno=20S=C3=A1?= , Axel Haslam , Philip Molloy , David Lechner Subject: [v2 13/19] staging: iio: resolver: ad2s1210: implement hysteresis as channel attr Date: Thu, 21 Sep 2023 09:19:41 -0500 Message-Id: <20230921141947.57784-16-dlechner@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921141947.57784-1-dlechner@baylibre.com> References: <20230921141947.57784-1-dlechner@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The AD2S1210 resolver has a hysteresis feature that can be used to prevent flicker in the LSB of the position register. This can be either enabled or disabled. Disabling hysteresis is useful for increasing precision by oversampling. Signed-off-by: David Lechner --- drivers/staging/iio/resolver/ad2s1210.c | 88 ++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 3 deletions(-) diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/= resolver/ad2s1210.c index 7a1069d948eb..fe413759deb9 100644 --- a/drivers/staging/iio/resolver/ad2s1210.c +++ b/drivers/staging/iio/resolver/ad2s1210.c @@ -80,7 +80,6 @@ struct ad2s1210_state { /** The external oscillator frequency in Hz. */ unsigned long fclkin; unsigned int fexcit; - bool hysteresis; u8 resolution; u8 rx[2] __aligned(IIO_DMA_MINALIGN); u8 tx[2]; @@ -456,6 +455,27 @@ static int ad2s1210_read_raw(struct iio_dev *indio_dev, } break; =20 + case IIO_CHAN_INFO_HYSTERESIS: + switch (chan->type) { + case IIO_ANGL: + mutex_lock(&st->lock); + ret =3D regmap_test_bits(st->regmap, AD2S1210_REG_CONTROL, + AD2S1210_ENABLE_HYSTERESIS); + if (ret < 0) + goto error_info_hysteresis; + + *val =3D !!ret; + ret =3D IIO_VAL_INT; + +error_info_hysteresis: + mutex_unlock(&st->lock); + break; + default: + ret =3D -EINVAL; + break; + } + break; + default: ret =3D -EINVAL; break; @@ -464,6 +484,64 @@ static int ad2s1210_read_raw(struct iio_dev *indio_dev, return ret; } =20 +static int ad2s1210_read_avail(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + const int **vals, int *type, + int *length, long mask) +{ + static const int available[] =3D { 0, 1 }; + int ret =3D -EINVAL; + + switch (mask) { + case IIO_CHAN_INFO_HYSTERESIS: + switch (chan->type) { + case IIO_ANGL: + *vals =3D available; + *type =3D IIO_VAL_INT; + *length =3D ARRAY_SIZE(available); + ret =3D IIO_AVAIL_LIST; + break; + default: + break; + } + default: + break; + } + + return ret; +} + +static int ad2s1210_write_raw(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + int val, int val2, long mask) +{ + struct ad2s1210_state *st =3D iio_priv(indio_dev); + int ret =3D -EINVAL; + + switch (mask) { + case IIO_CHAN_INFO_HYSTERESIS: + switch (chan->type) { + case IIO_ANGL: + mutex_lock(&st->lock); + ret =3D regmap_update_bits(st->regmap, AD2S1210_REG_CONTROL, + AD2S1210_ENABLE_HYSTERESIS, + val ? AD2S1210_ENABLE_HYSTERESIS + : 0); + mutex_unlock(&st->lock); + break; + + default: + break; + } + break; + + default: + break; + } + + return ret; +} + static IIO_DEVICE_ATTR(fexcit, 0644, ad2s1210_show_fexcit, ad2s1210_store_fexcit, 0); static IIO_DEVICE_ATTR(bits, 0644, @@ -499,7 +577,10 @@ static const struct iio_chan_spec ad2s1210_channels[] = =3D { .indexed =3D 1, .channel =3D 0, .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW) | - BIT(IIO_CHAN_INFO_SCALE), + BIT(IIO_CHAN_INFO_SCALE) | + BIT(IIO_CHAN_INFO_HYSTERESIS), + .info_mask_separate_available =3D + BIT(IIO_CHAN_INFO_HYSTERESIS), }, { .type =3D IIO_ANGL_VEL, .indexed =3D 1, @@ -573,6 +654,8 @@ static int ad2s1210_debugfs_reg_access(struct iio_dev *= indio_dev, =20 static const struct iio_info ad2s1210_info =3D { .read_raw =3D ad2s1210_read_raw, + .read_avail =3D ad2s1210_read_avail, + .write_raw =3D ad2s1210_write_raw, .attrs =3D &ad2s1210_attribute_group, .debugfs_reg_access =3D &ad2s1210_debugfs_reg_access, }; @@ -689,7 +772,6 @@ static int ad2s1210_probe(struct spi_device *spi) =20 mutex_init(&st->lock); st->sdev =3D spi; - st->hysteresis =3D true; st->resolution =3D 12; st->fexcit =3D AD2S1210_DEF_EXCIT; =20 --=20 2.34.1 From nobody Fri Feb 13 17:30:43 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2C6FE7D0A7 for ; Thu, 21 Sep 2023 19:29:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230462AbjIUT32 (ORCPT ); Thu, 21 Sep 2023 15:29:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230036AbjIUT3J (ORCPT ); Thu, 21 Sep 2023 15:29:09 -0400 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 632BE5FCB for ; Thu, 21 Sep 2023 10:09:08 -0700 (PDT) Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-3214cdb4b27so1214881f8f.1 for ; Thu, 21 Sep 2023 10:09:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1695316146; x=1695920946; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lWgDNsrrXF5syWEsVgdKbxr1ASE09oFAZQly/Ty6i74=; b=wNowJkgm6tzUaoI+x4w+v7mhL0Je6UPMVV6SPamP70hGNqS0OdnuM0NLABwqkn2TJJ yk3G6DPz+bdazgIQky6vh+hEwV1xjvjKf5RIE8NISFIc8BF8wZDyaLUcFn2JAOBdimAw p7YWei25EKwHnkVr9+a3FMTN9Ee7GMdfm6qTHxrAvUI4GmYNiQVODhCgYGfr83JlIZMz vMV5eQolyO9fSEiGA/ioNpaCwdudGyWJlxkKxwjspVnC97WRgijnLLjsgbHRfd0COs4Z Y6NdBRdCiFGj53RBKP8jo/wdyZlR1vBXPnam7C1UOi2x0XCRi7diNnXxry0UXrmrwDYJ a9bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695316146; x=1695920946; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lWgDNsrrXF5syWEsVgdKbxr1ASE09oFAZQly/Ty6i74=; b=EiKDgDzVTnsdiKjgIQzgr+WpnBhKJD0iMBxE7MYztnHgjga5/xsTCGCS/2kg6RD8oI jHOX3YU49Jcfr3MsnhS1fM099GdvtOlSLBWBnDku58W4rQCqa3YGixWDhh0UjRQnyyjH e3UxaMaepT9jR6M8hwNox7iEIhT7M/7feK9lRY4GtVjCbcDQw40o1r93rALTJg6vQ8B6 PKuUzwWOtnNeJKmw76jZJoVYJqpzJmvbz59q2hss2JnB3Aa+VuD8qp5JohKkVWx7j6HZ e5s7HUZ4x/WOxqvCmTrjFBQpfLpKIVfkLFaWtbwxB11UcAAqRQ16ycdbO24FyMupsT1P u3mQ== X-Gm-Message-State: AOJu0YzLQt7cF2eJOU+kL0Oa7NRBKKBkgPTPq3+KIHc3ju/+LR/UW+7K HDTlEDt6xQoKw7gZ8+SSSc/0VxFdLQUy58Ay4+Q0Tgzz X-Google-Smtp-Source: AGHT+IGRjZhp2R5sxkFWDdwbOa90jJSgYK4eOmJzrC4HUjAJ3wveQwXoDeexC2vjkJhYZNOJkJ9DkA== X-Received: by 2002:a5d:5192:0:b0:320:9e2:b3a2 with SMTP id k18-20020a5d5192000000b0032009e2b3a2mr4841480wrv.33.1695306164753; Thu, 21 Sep 2023 07:22:44 -0700 (PDT) Received: from localhost.localdomain (abordeaux-655-1-129-86.w90-5.abo.wanadoo.fr. [90.5.10.86]) by smtp.gmail.com with ESMTPSA id n11-20020a5d4c4b000000b0031fbbe347ebsm1901426wrt.22.2023.09.21.07.22.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 07:22:44 -0700 (PDT) From: David Lechner To: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-staging@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , =?UTF-8?q?Nuno=20S=C3=A1?= , Axel Haslam , Philip Molloy , David Lechner Subject: [v2 14/19] staging: iio: resolver: ad2s1210: refactor setting excitation frequency Date: Thu, 21 Sep 2023 09:19:42 -0500 Message-Id: <20230921141947.57784-17-dlechner@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921141947.57784-1-dlechner@baylibre.com> References: <20230921141947.57784-1-dlechner@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This combines the ad2s1210_update_frequency_control_word() and ad2s1210_soft_reset() functions into a single function since they both have to be called together. Also clean up a few things while touching this: - move AD2S1210_DEF_EXCIT macro with similar macros - remove unnecessary dev_err() calls Signed-off-by: David Lechner --- drivers/staging/iio/resolver/ad2s1210.c | 63 ++++++++++++------------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/= resolver/ad2s1210.c index fe413759deb9..f1ffee34ebbc 100644 --- a/drivers/staging/iio/resolver/ad2s1210.c +++ b/drivers/staging/iio/resolver/ad2s1210.c @@ -53,12 +53,11 @@ #define AD2S1210_MIN_CLKIN 6144000 #define AD2S1210_MAX_CLKIN 10240000 #define AD2S1210_MIN_EXCIT 2000 +#define AD2S1210_DEF_EXCIT 10000 #define AD2S1210_MAX_EXCIT 20000 #define AD2S1210_MIN_FCW 0x4 #define AD2S1210_MAX_FCW 0x50 =20 -#define AD2S1210_DEF_EXCIT 10000 - enum ad2s1210_mode { MOD_POS =3D 0b00, MOD_VEL =3D 0b01, @@ -184,18 +183,29 @@ static int ad2s1210_regmap_reg_read(void *context, un= signed int reg, return 0; } =20 -static inline -int ad2s1210_update_frequency_control_word(struct ad2s1210_state *st) +/* + * Sets the excitation frequency and performs software reset. + * + * Must be called with lock held. + */ +static int ad2s1210_set_excitation_frequency(struct ad2s1210_state *st, + u16 fexcit) { - unsigned char fcw; + int ret; + u8 fcw; =20 - fcw =3D (unsigned char)(st->fexcit * (1 << 15) / st->fclkin); - if (fcw < AD2S1210_MIN_FCW || fcw > AD2S1210_MAX_FCW) { - dev_err(&st->sdev->dev, "ad2s1210: FCW out of range\n"); + fcw =3D fexcit * (1 << 15) / st->fclkin; + if (fcw < AD2S1210_MIN_FCW || fcw > AD2S1210_MAX_FCW) return -ERANGE; - } =20 - return regmap_write(st->regmap, AD2S1210_REG_EXCIT_FREQ, fcw); + ret =3D regmap_write(st->regmap, AD2S1210_REG_EXCIT_FREQ, fcw); + if (ret < 0) + return ret; + + st->fexcit =3D fexcit; + + /* software reset reinitializes the excitation frequency output */ + return regmap_write(st->regmap, AD2S1210_REG_SOFT_RESET, 0); } =20 static int ad2s1210_set_resolution_gpios(struct ad2s1210_state *st, @@ -210,11 +220,6 @@ static int ad2s1210_set_resolution_gpios(struct ad2s12= 10_state *st, bitmap); } =20 -static inline int ad2s1210_soft_reset(struct ad2s1210_state *st) -{ - return regmap_write(st->regmap, AD2S1210_REG_SOFT_RESET, 0); -} - static ssize_t ad2s1210_show_fexcit(struct device *dev, struct device_attribute *attr, char *buf) @@ -229,27 +234,24 @@ static ssize_t ad2s1210_store_fexcit(struct device *d= ev, const char *buf, size_t len) { struct ad2s1210_state *st =3D iio_priv(dev_to_iio_dev(dev)); - unsigned int fexcit; + u16 fexcit; int ret; =20 - ret =3D kstrtouint(buf, 10, &fexcit); - if (ret < 0) - return ret; - if (fexcit < AD2S1210_MIN_EXCIT || fexcit > AD2S1210_MAX_EXCIT) { - dev_err(dev, - "ad2s1210: excitation frequency out of range\n"); + ret =3D kstrtou16(buf, 10, &fexcit); + if (ret < 0 || fexcit < AD2S1210_MIN_EXCIT || fexcit > AD2S1210_MAX_EXCIT) return -EINVAL; - } + mutex_lock(&st->lock); - st->fexcit =3D fexcit; - ret =3D ad2s1210_update_frequency_control_word(st); + ret =3D ad2s1210_set_excitation_frequency(st, fexcit); if (ret < 0) goto error_ret; - ret =3D ad2s1210_soft_reset(st); + + ret =3D len; + error_ret: mutex_unlock(&st->lock); =20 - return ret < 0 ? ret : len; + return ret; } =20 static ssize_t ad2s1210_show_resolution(struct device *dev, @@ -624,10 +626,8 @@ static int ad2s1210_initial(struct ad2s1210_state *st) if (ret < 0) goto error_ret; =20 - ret =3D ad2s1210_update_frequency_control_word(st); - if (ret < 0) - goto error_ret; - ret =3D ad2s1210_soft_reset(st); + ret =3D ad2s1210_set_excitation_frequency(st, AD2S1210_DEF_EXCIT); + error_ret: mutex_unlock(&st->lock); return ret; @@ -773,7 +773,6 @@ static int ad2s1210_probe(struct spi_device *spi) mutex_init(&st->lock); st->sdev =3D spi; st->resolution =3D 12; - st->fexcit =3D AD2S1210_DEF_EXCIT; =20 ret =3D ad2s1210_setup_clocks(st); if (ret < 0) --=20 2.34.1 From nobody Fri Feb 13 17:30:43 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 557C2E7D0A6 for ; Thu, 21 Sep 2023 20:16:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230458AbjIUUQ1 (ORCPT ); Thu, 21 Sep 2023 16:16:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230510AbjIUUP5 (ORCPT ); Thu, 21 Sep 2023 16:15:57 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B3E8561E1 for ; Thu, 21 Sep 2023 10:26:58 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-307d58b3efbso1184971f8f.0 for ; Thu, 21 Sep 2023 10:26:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1695317217; x=1695922017; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FFHoFBATjyYAR3S3Kihiw7DM+oB505Wu13vuO5lq7BQ=; b=yvWMD0jtUUOnZDRS2AIp4PN9mEgHewIy4n4gE9fnEdhiTvaxpiE7n+yHXp1SpZhyE4 UgCrRCz/bh3jepA503qzJMi00Q3iRAjBCUK36bDstPlUykNn+DN4jUC20rYhzzyyxjEW 7hFePKz9LMHvBf0usRsQ9nZUeXt+4KqTg8+7eDm42KqBuuY9LOYad4OH4B7OvHOBbABB cmQtluJQb8W1YjjUbVU4Mw3AkILYHmEQtDpZx0xvrHkzsJYMyG1nnLpX3/kKpikXq9Mx 5tuWUBoqEjklRULX39xcrEADQKu2A0A6E2OtHE4KIpy8jXBjIqTB9Xcs5vU3sVFOug7n RiFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695317217; x=1695922017; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FFHoFBATjyYAR3S3Kihiw7DM+oB505Wu13vuO5lq7BQ=; b=Mrns3e+v2XyDE0u76fnxoDtSvDnoUyx1rH/I556whLk/rSZrf03lHKAQxYKlThCRZa Ft/r3nBX4A4npdXAnMxt8yUSQL2Npcsvg8Gr9F6t1SjO3Y160fUYowo5oMVOAPfCT3ze nl18zlx/27HClXbgImNe7U1sLzFiQjHIv2aSToAG3l6e7slUvixm9yhoAZQrP5B07iqW F0oNYEaPBopG/R4joRO3imFXNALuKHcDYMW1dECsI37UK0HlhwwxSVFCOIW4oyLHYwHk DrSJqOiVsZ6HVDXZYR/dUgmZLyjJR+fKsR5lSIwMHwbpGrV2yIkAoMYluZEUSkNaA56s f+og== X-Gm-Message-State: AOJu0YzsO1vuSfb/rgW/SZ8LxeBhLTVJS/EO2y47X6sRSperb4rHsJ2Q lKgYkeiyt2u/XPrNwk+Zq3BDFd3LLG8T898RBkDEAlGf X-Google-Smtp-Source: AGHT+IEuEQ+yHcKXMmNkfUgwvUgJV0TYHVRrMSBE2WgINBdiZLHbPgjRXkTk6HjPHk2lj+d6o1Or/w== X-Received: by 2002:adf:fb47:0:b0:316:fc63:dfed with SMTP id c7-20020adffb47000000b00316fc63dfedmr3915975wrs.39.1695306165716; Thu, 21 Sep 2023 07:22:45 -0700 (PDT) Received: from localhost.localdomain (abordeaux-655-1-129-86.w90-5.abo.wanadoo.fr. [90.5.10.86]) by smtp.gmail.com with ESMTPSA id n11-20020a5d4c4b000000b0031fbbe347ebsm1901426wrt.22.2023.09.21.07.22.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 07:22:45 -0700 (PDT) From: David Lechner To: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-staging@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , =?UTF-8?q?Nuno=20S=C3=A1?= , Axel Haslam , Philip Molloy , David Lechner Subject: [v2 15/19] staging: iio: resolver: ad2s1210: read excitation frequency from control register Date: Thu, 21 Sep 2023 09:19:43 -0500 Message-Id: <20230921141947.57784-18-dlechner@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921141947.57784-1-dlechner@baylibre.com> References: <20230921141947.57784-1-dlechner@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This modifies the ad2s1210_show_fexcit() function to read the excitation frequency from the control register. This way we don't have to keep track of the value and don't risk returning a stale value. Signed-off-by: David Lechner --- drivers/staging/iio/resolver/ad2s1210.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/= resolver/ad2s1210.c index f1ffee34ebbc..27294eff99ef 100644 --- a/drivers/staging/iio/resolver/ad2s1210.c +++ b/drivers/staging/iio/resolver/ad2s1210.c @@ -78,7 +78,6 @@ struct ad2s1210_state { struct regmap *regmap; /** The external oscillator frequency in Hz. */ unsigned long fclkin; - unsigned int fexcit; u8 resolution; u8 rx[2] __aligned(IIO_DMA_MINALIGN); u8 tx[2]; @@ -202,8 +201,6 @@ static int ad2s1210_set_excitation_frequency(struct ad2= s1210_state *st, if (ret < 0) return ret; =20 - st->fexcit =3D fexcit; - /* software reset reinitializes the excitation frequency output */ return regmap_write(st->regmap, AD2S1210_REG_SOFT_RESET, 0); } @@ -225,8 +222,22 @@ static ssize_t ad2s1210_show_fexcit(struct device *dev, char *buf) { struct ad2s1210_state *st =3D iio_priv(dev_to_iio_dev(dev)); + unsigned int value; + u16 fexcit; + int ret; =20 - return sprintf(buf, "%u\n", st->fexcit); + mutex_lock(&st->lock); + ret =3D regmap_read(st->regmap, AD2S1210_REG_EXCIT_FREQ, &value); + if (ret < 0) + goto error_ret; + + fexcit =3D value * st->fclkin / (1 << 15); + + ret =3D sprintf(buf, "%u\n", fexcit); + +error_ret: + mutex_unlock(&st->lock); + return ret; } =20 static ssize_t ad2s1210_store_fexcit(struct device *dev, --=20 2.34.1 From nobody Fri Feb 13 17:30:43 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6DBA0E7D0A1 for ; Thu, 21 Sep 2023 17:24:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229849AbjIURYQ (ORCPT ); Thu, 21 Sep 2023 13:24:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229580AbjIURXw (ORCPT ); Thu, 21 Sep 2023 13:23:52 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5C3642C3A for ; Thu, 21 Sep 2023 10:13:33 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-400a087b0bfso12646275e9.2 for ; Thu, 21 Sep 2023 10:13:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1695316409; x=1695921209; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nYFN9YS9lGoY3Drq+6yfHeUu5PUEzCkva/9j6XN0ZE4=; b=2efiOwzUDnc3Jd61Owi4Ga0h1S17k2rrXV2JoGVfTkXAtgxfVhKhYWLM/OXdtsqXCU luiAXiWMjKr7uv5z0QduzOvqBawRLsuX8h7BjV0D+QLYbUFwsPwcZlEDmKPcQyluzhff JsTV6TxWIvdlf7HAzQAIhUvLsIKBJoqA7AnXMtflGBMooCfkcPYxZx+T0+f49wS51JIU uJTLBAxaVUWmqHAXcgkqL4+C7k+rjy7Z/1FuRlPaYbOLPuVqyLbZ8aZwGgzrUZdEjodg TpQ6VnbE4D2t4SpnE6JzNBlS5iHoH5RHt3rS7TsIISA4kWZcPecGIy3kb9F3GfIvJ1S0 jjKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695316409; x=1695921209; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nYFN9YS9lGoY3Drq+6yfHeUu5PUEzCkva/9j6XN0ZE4=; b=MsaR840LW0G/ZKX5crRRzroQ8IAMbQBG2DUI7UFqFa8poeq+zZO8/P+RcYZGw9NL5/ FDzEQSJdU0xgA50U/1TouKQspWQoeTu+kXu2OMCb21wqcF4Ze1/nET6mpV+bV9x6ZQrF MmiQfFXa/SAj0mSsrwX4i7PAxOtirYyQQTFg/GHlLpAoDnmBpc8P4+ovyclK451Fa/4O c4uMbuyoIW813WxlzutUoAxGczzkygo8fflowsOpvW8rwnuqYfES71bsKM1nsIH1is2h qsLpvcxcjvkewJ6ISoC9Do6/roeCV0rscfZVRJ94HSQCuy3rJpnXRnom+87qh/QYb7q2 1nTw== X-Gm-Message-State: AOJu0YxysCAaztIyLe1xdIjL7P1ANBNIIZugS/rT0IMQPfkxGsUmJy0c UD7yA4Dds2MlBFoLHxwEvBKm1tjcWbSG1ivQxONOU9jI X-Google-Smtp-Source: AGHT+IFu1F25pmyaAgzXYF1qsHUDXBwQ437AiaWnWjMjwmw80fpRWTPc2ECeCGljKdTfsMbdgIq1Yg== X-Received: by 2002:a1c:ed08:0:b0:405:1bbd:aa9c with SMTP id l8-20020a1ced08000000b004051bbdaa9cmr5515593wmh.34.1695306166581; Thu, 21 Sep 2023 07:22:46 -0700 (PDT) Received: from localhost.localdomain (abordeaux-655-1-129-86.w90-5.abo.wanadoo.fr. [90.5.10.86]) by smtp.gmail.com with ESMTPSA id n11-20020a5d4c4b000000b0031fbbe347ebsm1901426wrt.22.2023.09.21.07.22.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 07:22:46 -0700 (PDT) From: David Lechner To: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-staging@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , =?UTF-8?q?Nuno=20S=C3=A1?= , Axel Haslam , Philip Molloy , David Lechner Subject: [v2 16/19] staging: iio: resolver: ad2s1210: rename fexcit attribute Date: Thu, 21 Sep 2023 09:19:44 -0500 Message-Id: <20230921141947.57784-19-dlechner@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921141947.57784-1-dlechner@baylibre.com> References: <20230921141947.57784-1-dlechner@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This renames the fexcit attribute to excitation_frequency to be more human-readable. Since we are already making many breaking changes to the staging driver, this is a good time to do this. Also make use of IIO_DEVICE_ATTR_RW while we are touching this. Signed-off-by: David Lechner --- drivers/staging/iio/resolver/ad2s1210.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/= resolver/ad2s1210.c index 27294eff99ef..14bec2b20939 100644 --- a/drivers/staging/iio/resolver/ad2s1210.c +++ b/drivers/staging/iio/resolver/ad2s1210.c @@ -217,9 +217,9 @@ static int ad2s1210_set_resolution_gpios(struct ad2s121= 0_state *st, bitmap); } =20 -static ssize_t ad2s1210_show_fexcit(struct device *dev, - struct device_attribute *attr, - char *buf) +static ssize_t excitation_frequency_show(struct device *dev, + struct device_attribute *attr, + char *buf) { struct ad2s1210_state *st =3D iio_priv(dev_to_iio_dev(dev)); unsigned int value; @@ -240,9 +240,9 @@ static ssize_t ad2s1210_show_fexcit(struct device *dev, return ret; } =20 -static ssize_t ad2s1210_store_fexcit(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t len) +static ssize_t excitation_frequency_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t len) { struct ad2s1210_state *st =3D iio_priv(dev_to_iio_dev(dev)); u16 fexcit; @@ -555,8 +555,7 @@ static int ad2s1210_write_raw(struct iio_dev *indio_dev, return ret; } =20 -static IIO_DEVICE_ATTR(fexcit, 0644, - ad2s1210_show_fexcit, ad2s1210_store_fexcit, 0); +static IIO_DEVICE_ATTR_RW(excitation_frequency, 0); static IIO_DEVICE_ATTR(bits, 0644, ad2s1210_show_resolution, ad2s1210_store_resolution, 0); static IIO_DEVICE_ATTR(fault, 0644, @@ -604,7 +603,7 @@ static const struct iio_chan_spec ad2s1210_channels[] = =3D { }; =20 static struct attribute *ad2s1210_attributes[] =3D { - &iio_dev_attr_fexcit.dev_attr.attr, + &iio_dev_attr_excitation_frequency.dev_attr.attr, &iio_dev_attr_bits.dev_attr.attr, &iio_dev_attr_fault.dev_attr.attr, &iio_dev_attr_los_thrd.dev_attr.attr, --=20 2.34.1 From nobody Fri Feb 13 17:30:43 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5122E7D0A3 for ; Thu, 21 Sep 2023 17:48:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229655AbjIURs6 (ORCPT ); Thu, 21 Sep 2023 13:48:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229452AbjIURsz (ORCPT ); Thu, 21 Sep 2023 13:48:55 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B00D676AC for ; Thu, 21 Sep 2023 10:31:01 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-404fbfac998so14316905e9.3 for ; Thu, 21 Sep 2023 10:31:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1695317454; x=1695922254; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bSzhqtQuH6rCmKnaqNrN1q0TijVTu8SKnjt98b8WvE0=; b=BWZ6pp8L5dlNJMOCLX7qz8iHI85oVrNy2iUdNc/Nsqs3j15b41EYuhd9OMYr3PMv+N TGHWZb1GV8ZgSLcnHJj9p/5iUqZKBPVQaKEv6Jinok8uEZAaUc2GC9niVP5Fy8oHFGID mHitnZDtImrKGGqmuB9bjSK+BPrYzwu/gtChlWCjahvToTPAWuzfDePZJK8COhHSdb2f lLEGyWi0S3DdTsXLr6c1IS1jEBSlUo05JWM8zYP0dK3/BzAEbmduqIbPFBZTDj6I/61D nwvjNgxkV/z/hyv3TTCm9+HCkXeJJ5R+bpsywmTuBSKDYhPq1+99i5jDnV3nUnH/JXrr snug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695317454; x=1695922254; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bSzhqtQuH6rCmKnaqNrN1q0TijVTu8SKnjt98b8WvE0=; b=SPddoW1w4I4o5DuHn85pXIm0x8LWn+52X+xuzquiRTYm+Z86GOLIP+G1TUZNP2yi51 6ZEKDn8dKxwYNvzosBM5r1sP3H4oAIGNE3dbXTdvKuZjV6jcOm9xEcBLPwxmUaVZQl8E iSjMaQgbANqigFq4csq6M6KVk0B3lzHMBHy7blfNCA+IFuMlO5vF1nvNr9CTwk2XoZpp PXeLgBC8p1lSk2TH4qBg4gaoymnqLm1godicWLRgujN7f6ecuTjI6m82e2uqeW7IvQnP nLOtdIuHZUqw372IOxktmbfefqlon41zVR3noojvImJCE14R+bKzN8LS92I7sPAHzvx1 EDnQ== X-Gm-Message-State: AOJu0YwUNRseqEcNHpZ5XcIJKO1YicJ1QAn1OK9GqgNHjJnFVCGG0dCc 4LtuixbrBvRoJqzyMDvUj/LEObg+Ng65GPQd6WoIZO49 X-Google-Smtp-Source: AGHT+IFP4MOcE7E2V9WBBp93krIW5ELA1JqtXyr+E6QkCDPSXWbGg/ybS0qM51T45avLvC8CEMIykQ== X-Received: by 2002:a1c:f204:0:b0:404:fc5c:15ed with SMTP id s4-20020a1cf204000000b00404fc5c15edmr4949109wmc.35.1695306167586; Thu, 21 Sep 2023 07:22:47 -0700 (PDT) Received: from localhost.localdomain (abordeaux-655-1-129-86.w90-5.abo.wanadoo.fr. [90.5.10.86]) by smtp.gmail.com with ESMTPSA id n11-20020a5d4c4b000000b0031fbbe347ebsm1901426wrt.22.2023.09.21.07.22.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 07:22:47 -0700 (PDT) From: David Lechner To: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-staging@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , =?UTF-8?q?Nuno=20S=C3=A1?= , Axel Haslam , Philip Molloy , David Lechner Subject: [v2 17/19] staging: iio: resolver: ad2s1210: convert resolution to devicetree property Date: Thu, 21 Sep 2023 09:19:45 -0500 Message-Id: <20230921141947.57784-20-dlechner@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921141947.57784-1-dlechner@baylibre.com> References: <20230921141947.57784-1-dlechner@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Selecting the resolution was implemented as the `bits` sysfs attribute. However, the selection of the resolution depends on how the hardware is wired and the specific application, so this is rather a job for devicetree to describe. A new devicetree property `adi,resolution` to specify the resolution required for each chip is added and the `bits` sysfs attribute is removed. Since the resolution is now supplied by a devicetree property, the resolution-gpios are now optional and we can allow for the case where the resolution pins on the AD2S1210 are hard-wired instead of requiring them to be connected to gpios. Signed-off-by: David Lechner --- drivers/staging/iio/resolver/ad2s1210.c | 136 +++++++++++------------- 1 file changed, 61 insertions(+), 75 deletions(-) diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/= resolver/ad2s1210.c index 14bec2b20939..71f0913b7e2e 100644 --- a/drivers/staging/iio/resolver/ad2s1210.c +++ b/drivers/staging/iio/resolver/ad2s1210.c @@ -65,6 +65,13 @@ enum ad2s1210_mode { MOD_CONFIG =3D 0b11, }; =20 +enum ad2s1210_resolution { + AD2S1210_RES_10 =3D 0b00, + AD2S1210_RES_12 =3D 0b01, + AD2S1210_RES_14 =3D 0b10, + AD2S1210_RES_16 =3D 0b11, +}; + struct ad2s1210_state { struct mutex lock; struct spi_device *sdev; @@ -72,13 +79,12 @@ struct ad2s1210_state { struct gpio_desc *sample_gpio; /** GPIO pins connected to A0 and A1 lines. */ struct gpio_descs *mode_gpios; - /** GPIO pins connected to RES0 and RES1 lines. */ - struct gpio_descs *resolution_gpios; /** Used to access config registers. */ struct regmap *regmap; /** The external oscillator frequency in Hz. */ unsigned long fclkin; - u8 resolution; + /** The selected resolution */ + enum ad2s1210_resolution resolution; u8 rx[2] __aligned(IIO_DMA_MINALIGN); u8 tx[2]; }; @@ -205,18 +211,6 @@ static int ad2s1210_set_excitation_frequency(struct ad= 2s1210_state *st, return regmap_write(st->regmap, AD2S1210_REG_SOFT_RESET, 0); } =20 -static int ad2s1210_set_resolution_gpios(struct ad2s1210_state *st, - u8 resolution) -{ - struct gpio_descs *gpios =3D st->resolution_gpios; - DECLARE_BITMAP(bitmap, 2); - - bitmap[0] =3D (resolution - 10) >> 1; - - return gpiod_set_array_value(gpios->ndescs, gpios->desc, gpios->info, - bitmap); -} - static ssize_t excitation_frequency_show(struct device *dev, struct device_attribute *attr, char *buf) @@ -265,50 +259,6 @@ static ssize_t excitation_frequency_store(struct devic= e *dev, return ret; } =20 -static ssize_t ad2s1210_show_resolution(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct ad2s1210_state *st =3D iio_priv(dev_to_iio_dev(dev)); - - return sprintf(buf, "%d\n", st->resolution); -} - -static ssize_t ad2s1210_store_resolution(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t len) -{ - struct ad2s1210_state *st =3D iio_priv(dev_to_iio_dev(dev)); - unsigned char data; - unsigned char udata; - int ret; - - ret =3D kstrtou8(buf, 10, &udata); - if (ret || udata < 10 || udata > 16) { - dev_err(dev, "ad2s1210: resolution out of range\n"); - return -EINVAL; - } - - data =3D (udata - 10) >> 1; - - mutex_lock(&st->lock); - ret =3D regmap_update_bits(st->regmap, AD2S1210_REG_CONTROL, - AD2S1210_SET_RES, data); - if (ret < 0) - goto error_ret; - - ret =3D ad2s1210_set_resolution_gpios(st, udata); - if (ret < 0) - goto error_ret; - - st->resolution =3D udata; - ret =3D len; - -error_ret: - mutex_unlock(&st->lock); - return ret; -} - /* read the fault register since last sample */ static ssize_t ad2s1210_show_fault(struct device *dev, struct device_attribute *attr, char *buf) @@ -556,8 +506,6 @@ static int ad2s1210_write_raw(struct iio_dev *indio_dev, } =20 static IIO_DEVICE_ATTR_RW(excitation_frequency, 0); -static IIO_DEVICE_ATTR(bits, 0644, - ad2s1210_show_resolution, ad2s1210_store_resolution, 0); static IIO_DEVICE_ATTR(fault, 0644, ad2s1210_show_fault, ad2s1210_clear_fault, 0); =20 @@ -604,7 +552,6 @@ static const struct iio_chan_spec ad2s1210_channels[] = =3D { =20 static struct attribute *ad2s1210_attributes[] =3D { &iio_dev_attr_excitation_frequency.dev_attr.attr, - &iio_dev_attr_bits.dev_attr.attr, &iio_dev_attr_fault.dev_attr.attr, &iio_dev_attr_los_thrd.dev_attr.attr, &iio_dev_attr_dos_ovr_thrd.dev_attr.attr, @@ -626,12 +573,10 @@ static int ad2s1210_initial(struct ad2s1210_state *st) int ret; =20 mutex_lock(&st->lock); - ret =3D ad2s1210_set_resolution_gpios(st, st->resolution); - if (ret < 0) - return ret; =20 data =3D AD2S1210_DEF_CONTROL & ~AD2S1210_SET_RES; - data |=3D (st->resolution - 10) >> 1; + data |=3D st->resolution; + ret =3D regmap_write(st->regmap, AD2S1210_REG_CONTROL, data); if (ret < 0) goto error_ret; @@ -670,6 +615,26 @@ static const struct iio_info ad2s1210_info =3D { .debugfs_reg_access =3D &ad2s1210_debugfs_reg_access, }; =20 +static int ad2s1210_setup_properties(struct ad2s1210_state *st) +{ + struct device *dev =3D &st->sdev->dev; + u32 val; + int ret; + + ret =3D device_property_read_u32(dev, "assigned-resolution-bits", &val); + if (ret < 0) + return dev_err_probe(dev, ret, + "failed to read assigned-resolution-bits property\n"); + + if (val < 10 || val > 16) + return dev_err_probe(dev, -EINVAL, + "resolution out of range: %u\n", val); + + st->resolution =3D (val - 10) >> 1; + + return 0; +} + static int ad2s1210_setup_clocks(struct ad2s1210_state *st) { struct device *dev =3D &st->sdev->dev; @@ -691,6 +656,9 @@ static int ad2s1210_setup_clocks(struct ad2s1210_state = *st) static int ad2s1210_setup_gpios(struct ad2s1210_state *st) { struct device *dev =3D &st->sdev->dev; + struct gpio_descs *resolution_gpios; + DECLARE_BITMAP(bitmap, 2); + int ret; =20 /* should not be sampling on startup */ st->sample_gpio =3D devm_gpiod_get(dev, "sample", GPIOD_OUT_LOW); @@ -708,16 +676,31 @@ static int ad2s1210_setup_gpios(struct ad2s1210_state= *st) return dev_err_probe(dev, -EINVAL, "requires exactly 2 mode-gpios\n"); =20 - /* both pins high means that we start with 16-bit resolution */ - st->resolution_gpios =3D devm_gpiod_get_array(dev, "resolution", - GPIOD_OUT_HIGH); - if (IS_ERR(st->resolution_gpios)) - return dev_err_probe(dev, PTR_ERR(st->resolution_gpios), + /* If resolution gpios are provided, they get set to the required + * resolution, otherwise it is assumed the RES0 and RES1 pins are + * hard-wired to match the resolution indicated in the devicetree. + */ + resolution_gpios =3D devm_gpiod_get_array_optional(dev, "resolution", + GPIOD_ASIS); + if (IS_ERR(resolution_gpios)) + return dev_err_probe(dev, PTR_ERR(resolution_gpios), "failed to request resolution GPIOs\n"); =20 - if (st->resolution_gpios->ndescs !=3D 2) - return dev_err_probe(dev, -EINVAL, - "requires exactly 2 resolution-gpios\n"); + if (resolution_gpios) { + if (resolution_gpios->ndescs !=3D 2) + return dev_err_probe(dev, -EINVAL, + "requires exactly 2 resolution-gpios\n"); + + bitmap[0] =3D st->resolution; + + ret =3D gpiod_set_array_value(resolution_gpios->ndescs, + resolution_gpios->desc, + resolution_gpios->info, + bitmap); + if (ret < 0) + return dev_err_probe(dev, ret, + "failed to set resolution gpios\n"); + } =20 return 0; } @@ -782,7 +765,10 @@ static int ad2s1210_probe(struct spi_device *spi) =20 mutex_init(&st->lock); st->sdev =3D spi; - st->resolution =3D 12; + + ret =3D ad2s1210_setup_properties(st); + if (ret < 0) + return ret; =20 ret =3D ad2s1210_setup_clocks(st); if (ret < 0) --=20 2.34.1 From nobody Fri Feb 13 17:30:43 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4A55E71096 for ; Thu, 21 Sep 2023 17:06:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229452AbjIURGe (ORCPT ); Thu, 21 Sep 2023 13:06:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230005AbjIURGD (ORCPT ); Thu, 21 Sep 2023 13:06:03 -0400 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D88C49D2 for ; Thu, 21 Sep 2023 10:04:24 -0700 (PDT) Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-503f39d3236so2097994e87.0 for ; Thu, 21 Sep 2023 10:04:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1695315763; x=1695920563; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=y5XZRvh5FJ3F9RXkqi8NbBrwtIOGm1RUjmAFGYn0SWM=; b=JdpOrZX9ujV0U2ciOIMBSCUTjIEeoVLoYKzv1A/P50NlQx0NoDH8jSrtNeMDT/qDSU pyFK90T8gbCNetzY21+QjfJVLihkMS2F8qNShxnHsMo+5ZhuSiORoQq32zHIIzTU/Olv 3BJ6gE6yB+AQwkRKdBRx1MjVCdEmvQWBpkPcrMurzlCslvBo07AbYynyWaUNdmNL3zXp cD0LE8HCIMp0tJtgGefjiCl6+nrqNz5X/SBZEUdW9llW7ciojUAbuQN73R85AtFWkjNk BCRDcaVpb2qPcfxOH4UnaDM3OqwGK2xMq6C45mGIoBn7K6BlqZT1B7ORXil/PKWd5Kma bYOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695315763; x=1695920563; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y5XZRvh5FJ3F9RXkqi8NbBrwtIOGm1RUjmAFGYn0SWM=; b=EboRr5giaVdFB1Opfuck56Ma3P5qvJW3D0M8M6Kf352DLRWTXpIwmYnHnvlpxKXWVV 0aID+nksOksQaMvOolWGcpvdy7CEg2fYlJO9TwBKu0forg2q6/BuOPVddSMkceYgBy8C 0n/Wtz1YX3QLDe3yi3tBl1pPdJ32Wt7WzK+bSvp2+RD7zNunH2oUyIHiZtx8goJKp86y 6fTcyGhdikRQpVuo7/6j+mCl3PnERQRkgTG/8WaL2b9D7sqYZ2eiYWjayp/gQuPNLViz vu0zmzRh6a305k8lmYgH+7iMghwy/rl3iTtWrAG0gKeb1BF8JSqe7bOAfS1N3TAW1OKJ zbIA== X-Gm-Message-State: AOJu0YxeF4F7e3Wy+3QO4k34EgAeQsYQ7ndn57GRD1a5CInGR3NKJAZa LaXrvkLBdyhuwc/0Br0JIHZKofGFIy1xQ3Wam/YG9pMl X-Google-Smtp-Source: AGHT+IGCZngJGw2TLbVAmHBkA5Ct02TLdu6cufs/nlp002BSIPnQTHy4JPAWFAoql4McGwV/17mztQ== X-Received: by 2002:a05:600c:2117:b0:3fe:e7b2:c97f with SMTP id u23-20020a05600c211700b003fee7b2c97fmr5472970wml.36.1695306168409; Thu, 21 Sep 2023 07:22:48 -0700 (PDT) Received: from localhost.localdomain (abordeaux-655-1-129-86.w90-5.abo.wanadoo.fr. [90.5.10.86]) by smtp.gmail.com with ESMTPSA id n11-20020a5d4c4b000000b0031fbbe347ebsm1901426wrt.22.2023.09.21.07.22.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 07:22:48 -0700 (PDT) From: David Lechner To: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-staging@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , =?UTF-8?q?Nuno=20S=C3=A1?= , Axel Haslam , Philip Molloy , David Lechner Subject: [v2 18/19] staging: iio: resolver: ad2s1210: add phase_lock_range attributes Date: Thu, 21 Sep 2023 09:19:46 -0500 Message-Id: <20230921141947.57784-21-dlechner@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921141947.57784-1-dlechner@baylibre.com> References: <20230921141947.57784-1-dlechner@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This adds new phase_lock_range and phase_lock_range_available attributes to the ad2s1210 resolver driver. These attributes allow the user to set the phase lock range bit in the control register to modify the behavior of the resolver to digital converter. Signed-off-by: David Lechner --- drivers/staging/iio/resolver/ad2s1210.c | 58 +++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/= resolver/ad2s1210.c index 71f0913b7e2e..f5b8b290e860 100644 --- a/drivers/staging/iio/resolver/ad2s1210.c +++ b/drivers/staging/iio/resolver/ad2s1210.c @@ -259,6 +259,60 @@ static ssize_t excitation_frequency_store(struct devic= e *dev, return ret; } =20 +static ssize_t phase_lock_range_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct ad2s1210_state *st =3D iio_priv(dev_to_iio_dev(dev)); + int ret; + + mutex_lock(&st->lock); + ret =3D regmap_test_bits(st->regmap, AD2S1210_REG_CONTROL, + AD2S1210_PHASE_LOCK_RANGE_44); + if (ret < 0) + goto error_ret; + + ret =3D sprintf(buf, "%d\n", ret ? 44 : 360); + +error_ret: + mutex_unlock(&st->lock); + return ret; +} + +static ssize_t phase_lock_range_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t len) +{ + struct ad2s1210_state *st =3D iio_priv(dev_to_iio_dev(dev)); + u16 udata; + int ret; + + ret =3D kstrtou16(buf, 10, &udata); + if (ret < 0 || (udata !=3D 44 && udata !=3D 360)) + return -EINVAL; + + mutex_lock(&st->lock); + + ret =3D regmap_update_bits(st->regmap, AD2S1210_REG_CONTROL, + AD2S1210_PHASE_LOCK_RANGE_44, + udata =3D=3D 44 ? AD2S1210_PHASE_LOCK_RANGE_44 : 0); + if (ret < 0) + goto error_ret; + + ret =3D len; + +error_ret: + mutex_unlock(&st->lock); + return ret; +} + +static ssize_t phase_lock_range_available_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + return sprintf(buf, "44 360\n"); +} + /* read the fault register since last sample */ static ssize_t ad2s1210_show_fault(struct device *dev, struct device_attribute *attr, char *buf) @@ -506,6 +560,8 @@ static int ad2s1210_write_raw(struct iio_dev *indio_dev, } =20 static IIO_DEVICE_ATTR_RW(excitation_frequency, 0); +static IIO_DEVICE_ATTR_RW(phase_lock_range, 0); +static IIO_DEVICE_ATTR_RO(phase_lock_range_available, 0); static IIO_DEVICE_ATTR(fault, 0644, ad2s1210_show_fault, ad2s1210_clear_fault, 0); =20 @@ -552,6 +608,8 @@ static const struct iio_chan_spec ad2s1210_channels[] = =3D { =20 static struct attribute *ad2s1210_attributes[] =3D { &iio_dev_attr_excitation_frequency.dev_attr.attr, + &iio_dev_attr_phase_lock_range.dev_attr.attr, + &iio_dev_attr_phase_lock_range_available.dev_attr.attr, &iio_dev_attr_fault.dev_attr.attr, &iio_dev_attr_los_thrd.dev_attr.attr, &iio_dev_attr_dos_ovr_thrd.dev_attr.attr, --=20 2.34.1 From nobody Fri Feb 13 17:30:43 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 190C1E7D0A2 for ; Thu, 21 Sep 2023 20:17:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231395AbjIUURr (ORCPT ); Thu, 21 Sep 2023 16:17:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230264AbjIUURZ (ORCPT ); Thu, 21 Sep 2023 16:17:25 -0400 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 889172AC7B for ; Thu, 21 Sep 2023 10:11:51 -0700 (PDT) Received: by mail-lf1-x12c.google.com with SMTP id 2adb3069b0e04-503065c4b25so2031942e87.1 for ; Thu, 21 Sep 2023 10:11:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1695316309; x=1695921109; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BurSNjw3LRUUcMvXtonPsGB5QUx7CZPo8/XQKc8tXvQ=; b=uiLmDGcttQJgaI/M2kAy7HFwgIPiSKH5E6F19w4Lye68JpcawYXP7vHWNeIWzLAXtg fAxIQB4Vb2d6da7+OptTvdzFJiw4ItaTkCEH/of2VitRFelmI7xXl25RDJWS2FyN222z jOUUrq8VxAZdmEpS/6M2IBzQsglOz2Q1gWaZwq8lF4uo9tHCeCaCOKvpp6+tjuQSvmju g4YKvWnerCLz6UXksxrDjfqaeNJOiHQ/lyGDSHhZwv6kgH5lGFdiVN6oaMqs8QTYgXQC OkBh3VZWd2+BP9xPePZmUezk8Y48s2VET/tD6v1+E/UF2jeWprMINiKHr+jwnpxsAeC3 r6rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695316309; x=1695921109; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BurSNjw3LRUUcMvXtonPsGB5QUx7CZPo8/XQKc8tXvQ=; b=EHi0WFmP0qIdHKaWzI0zAH1aJyIJVjz0zDTNbqtEHXwY3fy+QJgjaQuMjxp+RG+W4f OmGxBbiMfFRNB5yNoZyKohRNfbVvPZwZXBRZSW9iMOEtqeN5k4dmsvazNBTQ66+SfNYS uLDZ4ouFUxeCQ+X2XaCPyrpAlgkoQx+WtxdI5Guz42M2rFy3nZ/PD/kkE+35wONdxbu5 u8r3BqBSDAbKeNLSeeEXGUdOCTYM4s0faS9uoXCFKVQJVvhs5QPE8nr7UR5TBpRpJbEl bZtrN4bvLHzz/2JRmeEnZlwzePBk+YCVeiuyYiywAr0A7qsacbTqH7MWdYHlLqIEJlwJ pRfg== X-Gm-Message-State: AOJu0YwL0kV3ftgsEp4w51ZaEf/UoY+F/7TCg1cngO3OSftlyzZZ8QbB TmQRQuCozdNKnnQVq67OdGSCD8+HdHlgKEwtIw3uFYvS X-Google-Smtp-Source: AGHT+IE3B+SaoX0g3CMJ9V5Y/q70jyzL1xViK2W3Iiv0NWLiHVmRrng5O6gT7YrWiM082uoyEj3L0A== X-Received: by 2002:a05:600c:152:b0:404:2dbb:8943 with SMTP id w18-20020a05600c015200b004042dbb8943mr5663278wmm.2.1695306169283; Thu, 21 Sep 2023 07:22:49 -0700 (PDT) Received: from localhost.localdomain (abordeaux-655-1-129-86.w90-5.abo.wanadoo.fr. [90.5.10.86]) by smtp.gmail.com with ESMTPSA id n11-20020a5d4c4b000000b0031fbbe347ebsm1901426wrt.22.2023.09.21.07.22.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 07:22:49 -0700 (PDT) From: David Lechner To: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-staging@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , =?UTF-8?q?Nuno=20S=C3=A1?= , Axel Haslam , Philip Molloy , David Lechner Subject: [v2 19/19] staging: iio: resolver: ad2s1210: add triggered buffer support Date: Thu, 21 Sep 2023 09:19:47 -0500 Message-Id: <20230921141947.57784-22-dlechner@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921141947.57784-1-dlechner@baylibre.com> References: <20230921141947.57784-1-dlechner@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This adds support for triggered buffers to the AD2S1210 resolver driver. Signed-off-by: David Lechner --- drivers/staging/iio/resolver/ad2s1210.c | 84 ++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/= resolver/ad2s1210.c index f5b8b290e860..44a2ecaeeeff 100644 --- a/drivers/staging/iio/resolver/ad2s1210.c +++ b/drivers/staging/iio/resolver/ad2s1210.c @@ -19,8 +19,11 @@ #include #include =20 +#include #include #include +#include +#include =20 #define DRV_NAME "ad2s1210" =20 @@ -85,6 +88,12 @@ struct ad2s1210_state { unsigned long fclkin; /** The selected resolution */ enum ad2s1210_resolution resolution; + /** Scan buffer */ + struct { + __be16 chan[2]; + /* Ensure timestamp is naturally aligned. */ + s64 timestamp __aligned(8); + } scan; u8 rx[2] __aligned(IIO_DMA_MINALIGN); u8 tx[2]; }; @@ -592,18 +601,35 @@ static const struct iio_chan_spec ad2s1210_channels[]= =3D { .type =3D IIO_ANGL, .indexed =3D 1, .channel =3D 0, + .scan_index =3D 0, + .scan_type =3D { + .sign =3D 'u', + .realbits =3D 16, + .storagebits =3D 16, + .endianness =3D IIO_BE, + }, .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE) | BIT(IIO_CHAN_INFO_HYSTERESIS), .info_mask_separate_available =3D BIT(IIO_CHAN_INFO_HYSTERESIS), + .datasheet_name =3D "position", }, { .type =3D IIO_ANGL_VEL, .indexed =3D 1, .channel =3D 0, + .scan_index =3D 1, + .scan_type =3D { + .sign =3D 's', + .realbits =3D 16, + .storagebits =3D 16, + .endianness =3D IIO_BE, + }, .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE), - } + .datasheet_name =3D "velocity", + }, + IIO_CHAN_SOFT_TIMESTAMP(2), }; =20 static struct attribute *ad2s1210_attributes[] =3D { @@ -665,6 +691,55 @@ static int ad2s1210_debugfs_reg_access(struct iio_dev = *indio_dev, return ret; } =20 +static irqreturn_t ad2s1210_trigger_handler(int irq, void *p) +{ + struct iio_poll_func *pf =3D p; + struct iio_dev *indio_dev =3D pf->indio_dev; + struct ad2s1210_state *st =3D iio_priv(indio_dev); + size_t chan =3D 0; + int ret; + + mutex_lock(&st->lock); + + memset(&st->scan, 0, sizeof(st->scan)); + gpiod_set_value(st->sample_gpio, 1); + + if (test_bit(0, indio_dev->active_scan_mask)) { + ret =3D ad2s1210_set_mode(st, MOD_POS); + if (ret < 0) + goto error_ret; + + /* REVIST: we can read 3 bytes here and also get fault flags */ + ret =3D spi_read(st->sdev, st->rx, 2); + if (ret < 0) + goto error_ret; + + memcpy(&st->scan.chan[chan++], st->rx, 2); + } + + if (test_bit(1, indio_dev->active_scan_mask)) { + ret =3D ad2s1210_set_mode(st, MOD_VEL); + if (ret < 0) + goto error_ret; + + /* REVIST: we can read 3 bytes here and also get fault flags */ + ret =3D spi_read(st->sdev, st->rx, 2); + if (ret < 0) + goto error_ret; + + memcpy(&st->scan.chan[chan++], st->rx, 2); + } + + iio_push_to_buffers_with_timestamp(indio_dev, &st->scan, pf->timestamp); + +error_ret: + gpiod_set_value(st->sample_gpio, 0); + mutex_unlock(&st->lock); + iio_trigger_notify_done(indio_dev->trig); + + return IRQ_HANDLED; +} + static const struct iio_info ad2s1210_info =3D { .read_raw =3D ad2s1210_read_raw, .read_avail =3D ad2s1210_read_avail, @@ -850,6 +925,13 @@ static int ad2s1210_probe(struct spi_device *spi) indio_dev->num_channels =3D ARRAY_SIZE(ad2s1210_channels); indio_dev->name =3D spi_get_device_id(spi)->name; =20 + ret =3D devm_iio_triggered_buffer_setup(&spi->dev, indio_dev, + &iio_pollfunc_store_time, + &ad2s1210_trigger_handler, NULL); + if (ret < 0) + return dev_err_probe(&spi->dev, ret, + "iio triggered buffer setup failed\n"); + return devm_iio_device_register(&spi->dev, indio_dev); } =20 --=20 2.34.1