* [PATCH v7 00/12] iio: adc: ad7768-1: Add features, improvements, and fixes
@ 2025-05-08 17:02 Jonathan Santos
2025-05-08 17:03 ` [PATCH v7 01/12] iio: adc: ad7768-1: reorganize driver headers Jonathan Santos
` (12 more replies)
0 siblings, 13 replies; 27+ messages in thread
From: Jonathan Santos @ 2025-05-08 17:02 UTC (permalink / raw)
To: linux-iio, devicetree, linux-kernel, linux-gpio
Cc: Jonathan Santos, andy, nuno.sa, Michael.Hennerich,
marcelo.schmitt, jic23, robh, krzk+dt, conor+dt, marcelo.schmitt1,
linus.walleij, brgl, lgirdwood, broonie, jonath4nns, dlechner
This patch series introduces some new features, improvements,
and fixes for the AD7768-1 ADC driver.
The goal is to support all key functionalities listed in the device
datasheet, including filter mode selection, common mode voltage output
configuration and GPIO support. Additionally, this includes fixes
for SPI communication and for IIO interface, and also code improvements
to enhance maintainability and readability.
---
Changes in v7:
* Added a new patch to reorganize driver headers.
* Added the new files to MAINTAINERS.
* Added dependencies to constrain the use of trigger-sources and
adi,sync-in-gpios properties at the same time.
* Self triggering is enabled only when the trigger-sources property is
not defined. Added TODO to support other trigger sources when the subsystem
is available.
* Refactor code to avoid forward declarations.
* Mentioned that sampling frequency changes is not allowed in
buffered mode.
* Addressed review comments, see individual pacthes.
* Link to v6: https://lore.kernel.org/linux-iio/cover.1745605382.git.Jonathan.Santos@analog.com/T/#t
Changes in v6:
* Changed description and addressed other nits in the gpio-trigger patch.
* Rewrote the #trigger-sources-cells description and removed mentions
to offload engine.
* Added adi,ad7768-1.h header with macros for the trigger source cells.
* removed of_match_ptr() from regulator_desc.
* Replaced deprecated .set callback with .set_rv in the gpio controller
patch.
* Use `trigger-sources` as an alternative to `adi,sync-in-gpios`
(now optional), instead of replacing it.
* Check trigger source by the compatible string (and the dev node for the
self triggering).
* Addressed review comments, see individual pacthes.
* Link to v5: https://lore.kernel.org/linux-iio/cover.1744325346.git.Jonathan.Santos@analog.com/T/#t
Changes in v5:
* Added gpio-trigger binding patch.
* Include START pin and DRDY in the trigger-sources description.
* increased trigger-source-cells to 1: this cell will define the trigger
source type.
* Fixed the holes in the regmap ranges.
* replace old iio_device_claim_direct_mode() for the new
iio_device_claim/release_direct() functions.
* Changed some commit messages.
* Link to v4: https://lore.kernel.org/linux-iio/cover.1741268122.git.Jonathan.Santos@analog.com/T/#t
Changes in v4:
* Added missing `select REGMAP_SPI` and `select REGULATOR` to the device's Kconfig.
* VCM output regulator property renamed.
* Added direct mode conditional locks to regulator controller callbacks.
* Renamed regulator controller.
* Created helper function to precalculate the sampling frequency table and avoid
race conditions.
* Link to v3: https://lore.kernel.org/linux-iio/cover.1739368121.git.Jonathan.Santos@analog.com/T/#t
Changes in v3:
* Fixed irregular or missing SoBs.
* Moved MOSI idle state patch to the start of the patch, as the other fix.
* fixed dt-binding errors.
* Trigger-sources is handled in a different way, as an alternative to sync-in-gpio.
(this way we avoid breaking old applications).
* VCM output is controlled by the regulator framework.
* Added a second regmap for 24-bit register values.
* Add new preparatory patch replacing the manual attribute declarations for
the read_avail from struct iio_info.
* included sinc3+rej60 filter type.
* Addressed review comments, see individual pacthes.
* Link to v2: https://lore.kernel.org/linux-iio/cover.1737985435.git.Jonathan.Santos@analog.com/T/#u
Changes in v2:
* Removed synchronization over SPI property and replaced it for trigger-sources.
* Added GPIO controller documentation.
* VCM output control changed from an IIO attribute to a devicetree property (static value).
* Converted driver to use regmap and dropped spi_read_reg and spi_write_reg pacthes.
* replaced decimation_rate attribute for oversampling_ratio and dropped device specific documentation patch.
* Added low pass -3dB cutoff attribute.
* Addressed review comments, see individual pacthes.
* Link to v1: https://lore.kernel.org/linux-iio/cover.1736201898.git.Jonathan.Santos@analog.com/T/#t
Jonathan Santos (11):
iio: adc: ad7768-1: reorganize driver headers
dt-bindings: trigger-source: add generic GPIO trigger source
dt-bindings: iio: adc: ad7768-1: add trigger-sources property
dt-bindings: iio: adc: ad7768-1: Document GPIO controller
dt-bindings: iio: adc: ad7768-1: document regulator provider property
iio: adc: ad7768-1: add regulator to control VCM output
iio: adc: ad7768-1: add multiple scan types to support 16-bits mode
iio: adc: ad7768-1: add support for Synchronization over SPI
iio: adc: ad7768-1: replace manual attribute declaration
iio: adc: ad7768-1: add filter type and oversampling ratio attributes
iio: adc: ad7768-1: add low pass -3dB cutoff attribute
Sergiu Cuciurean (1):
iio: adc: ad7768-1: Add GPIO controller support
.../bindings/iio/adc/adi,ad7768-1.yaml | 68 +-
.../bindings/trigger-source/gpio-trigger.yaml | 40 +
MAINTAINERS | 4 +-
drivers/iio/adc/Kconfig | 1 +
drivers/iio/adc/ad7768-1.c | 905 +++++++++++++++---
include/dt-bindings/iio/adc/adi,ad7768-1.h | 10 +
6 files changed, 918 insertions(+), 110 deletions(-)
create mode 100644 Documentation/devicetree/bindings/trigger-source/gpio-trigger.yaml
create mode 100644 include/dt-bindings/iio/adc/adi,ad7768-1.h
base-commit: 9415c8b5b9b7ba927d98f80022a2890e8639e9e4
prerequisite-patch-id: fbb33747cd0293bacd5b6d801d6cfc087449a28e
--
2.34.1
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH v7 01/12] iio: adc: ad7768-1: reorganize driver headers
2025-05-08 17:02 [PATCH v7 00/12] iio: adc: ad7768-1: Add features, improvements, and fixes Jonathan Santos
@ 2025-05-08 17:03 ` Jonathan Santos
2025-05-08 19:22 ` Andy Shevchenko
2025-05-08 17:03 ` [PATCH v7 02/12] dt-bindings: trigger-source: add generic GPIO trigger source Jonathan Santos
` (11 subsequent siblings)
12 siblings, 1 reply; 27+ messages in thread
From: Jonathan Santos @ 2025-05-08 17:03 UTC (permalink / raw)
To: linux-iio, devicetree, linux-kernel, linux-gpio
Cc: Jonathan Santos, andy, nuno.sa, Michael.Hennerich,
marcelo.schmitt, jic23, robh, krzk+dt, conor+dt, marcelo.schmitt1,
linus.walleij, brgl, lgirdwood, broonie, jonath4nns, dlechner
Remove kernel.h since it adds a lot of unnecessary dependencies.
Add specific headers to ensure all functions and macros used in the driver
are directly declared.
Signed-off-by: Jonathan Santos <Jonathan.Santos@analog.com>
---
v7 Changes:
* New patch.
---
drivers/iio/adc/ad7768-1.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/adc/ad7768-1.c b/drivers/iio/adc/ad7768-1.c
index 09e4ab76e2b6..e90bb5d50076 100644
--- a/drivers/iio/adc/ad7768-1.c
+++ b/drivers/iio/adc/ad7768-1.c
@@ -4,13 +4,15 @@
*
* Copyright 2017 Analog Devices Inc.
*/
+#include <linux/array_size.h>
#include <linux/bitfield.h>
#include <linux/clk.h>
+#include <linux/completion.h>
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/err.h>
#include <linux/gpio/consumer.h>
-#include <linux/kernel.h>
+#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/regmap.h>
#include <linux/regulator/consumer.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v7 02/12] dt-bindings: trigger-source: add generic GPIO trigger source
2025-05-08 17:02 [PATCH v7 00/12] iio: adc: ad7768-1: Add features, improvements, and fixes Jonathan Santos
2025-05-08 17:03 ` [PATCH v7 01/12] iio: adc: ad7768-1: reorganize driver headers Jonathan Santos
@ 2025-05-08 17:03 ` Jonathan Santos
2025-05-08 17:56 ` David Lechner
` (2 more replies)
2025-05-08 17:03 ` [PATCH v7 03/12] dt-bindings: iio: adc: ad7768-1: add trigger-sources property Jonathan Santos
` (10 subsequent siblings)
12 siblings, 3 replies; 27+ messages in thread
From: Jonathan Santos @ 2025-05-08 17:03 UTC (permalink / raw)
To: linux-iio, devicetree, linux-kernel, linux-gpio
Cc: Jonathan Santos, andy, nuno.sa, Michael.Hennerich,
marcelo.schmitt, jic23, robh, krzk+dt, conor+dt, marcelo.schmitt1,
linus.walleij, brgl, lgirdwood, broonie, jonath4nns, dlechner
Inspired by pwm-trigger, create a new binding for using a GPIO
line as a trigger source.
Link: https://lore.kernel.org/linux-iio/20250207-dlech-mainline-spi-engine-offload-2-v8-3-e48a489be48c@baylibre.com/
Reviewed-by: David Lechner <dlechner@baylibre.com>
Signed-off-by: Jonathan Santos <Jonathan.Santos@analog.com>
---
v7 Changes:
* File added to MAINTAINERS and Made trigger source generic to include both pwm and gpio.
v6 Changes:
* Changed description.
* Fixed typos and replaced GPIO pin with GPIO line.
* Added link reference for pwm-trigger.
v5 Changes:
* New patch in v5.
---
.../bindings/trigger-source/gpio-trigger.yaml | 40 +++++++++++++++++++
MAINTAINERS | 3 +-
2 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 Documentation/devicetree/bindings/trigger-source/gpio-trigger.yaml
diff --git a/Documentation/devicetree/bindings/trigger-source/gpio-trigger.yaml b/Documentation/devicetree/bindings/trigger-source/gpio-trigger.yaml
new file mode 100644
index 000000000000..1331d153ee82
--- /dev/null
+++ b/Documentation/devicetree/bindings/trigger-source/gpio-trigger.yaml
@@ -0,0 +1,40 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/trigger-source/gpio-trigger.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Generic trigger source using GPIO
+
+description: A GPIO used as a trigger source.
+
+maintainers:
+ - Jonathan Santos <Jonathan.Santos@analog.com>
+
+properties:
+ compatible:
+ const: gpio-trigger
+
+ '#trigger-source-cells':
+ const: 0
+
+ gpios:
+ maxItems: 1
+ description: GPIO to be used as a trigger source.
+
+required:
+ - compatible
+ - '#trigger-source-cells'
+ - gpios
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/gpio/gpio.h>
+
+ trigger {
+ compatible = "gpio-trigger";
+ #trigger-source-cells = <0>;
+ gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
+ };
diff --git a/MAINTAINERS b/MAINTAINERS
index 01079a189c93..9b2e9a9dd8bc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -24569,9 +24569,10 @@ W: https://github.com/srcres258/linux-doc
T: git git://github.com/srcres258/linux-doc.git doc-zh-tw
F: Documentation/translations/zh_TW/
-TRIGGER SOURCE - PWM
+TRIGGER SOURCE
M: David Lechner <dlechner@baylibre.com>
S: Maintained
+F: Documentation/devicetree/bindings/trigger-source/gpio-trigger.yaml
F: Documentation/devicetree/bindings/trigger-source/pwm-trigger.yaml
TRUSTED SECURITY MODULE (TSM) ATTESTATION REPORTS
--
2.34.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v7 03/12] dt-bindings: iio: adc: ad7768-1: add trigger-sources property
2025-05-08 17:02 [PATCH v7 00/12] iio: adc: ad7768-1: Add features, improvements, and fixes Jonathan Santos
2025-05-08 17:03 ` [PATCH v7 01/12] iio: adc: ad7768-1: reorganize driver headers Jonathan Santos
2025-05-08 17:03 ` [PATCH v7 02/12] dt-bindings: trigger-source: add generic GPIO trigger source Jonathan Santos
@ 2025-05-08 17:03 ` Jonathan Santos
2025-05-09 16:12 ` Conor Dooley
2025-05-09 16:18 ` Conor Dooley
2025-05-08 17:03 ` [PATCH v7 04/12] dt-bindings: iio: adc: ad7768-1: Document GPIO controller Jonathan Santos
` (9 subsequent siblings)
12 siblings, 2 replies; 27+ messages in thread
From: Jonathan Santos @ 2025-05-08 17:03 UTC (permalink / raw)
To: linux-iio, devicetree, linux-kernel, linux-gpio
Cc: Jonathan Santos, andy, nuno.sa, Michael.Hennerich,
marcelo.schmitt, jic23, robh, krzk+dt, conor+dt, marcelo.schmitt1,
linus.walleij, brgl, lgirdwood, broonie, jonath4nns, dlechner,
David Lechner
In addition to GPIO synchronization, The AD7768-1 also supports
synchronization over SPI, which use is recommended when the GPIO
cannot provide a pulse synchronous with the base MCLK signal. It
consists of looping back the SYNC_OUT to the SYNC_IN pin and send
a command via SPI to trigger the synchronization.
Introduce the 'trigger-sources' property to enable SPI-based
synchronization via SYNC_OUT pin, along with additional optional
entries for GPIO3 and DRDY pins.
Also create #trigger-source-cells property to differentiate the trigger
sources provided by the ADC. To improve readability, create a
adi,ad7768-1.h header with the macros for the cell values.
While at it, add description to the interrupts property.
Reviewed-by: David Lechner <dlechner@baylirbe.com>
Signed-off-by: Jonathan Santos <Jonathan.Santos@analog.com>
---
v7 Changes:
* added new file to the MAINTAINERS entry.
* Made interrupts description more concise.
* Added dependencies to constrain the use of trigger-sources and
adi,sync-in-gpios properties at the same time.
v6 Changes:
* Removed references to offload.
* Changed trigger-sources-cells description. Each cell value indicates
a gpio line from the ADC.
* Added adi,ad7768-1.h header with macros for the trigger source cells.
* Removed offload trigger entry from trigger-sources.
v5 Changes:
* Include START pin and DRDY in the trigger-sources description.
* Fixed "#trigger-source-cells" value and description.
* sync-in-gpios is represented in the trigger-sources property.
v4 Changes:
* none
v3 Changes:
* Fixed dt-bindings errors.
* Trigger-source is set as an alternative to sync-in-gpios, so we
don't break the previous ABI.
* increased maxItems from trigger-sources to 2.
v2 Changes:
* Patch added as replacement for adi,sync-in-spi patch.
* addressed the request for a description to interrupts property.
---
.../bindings/iio/adc/adi,ad7768-1.yaml | 39 ++++++++++++++++++-
MAINTAINERS | 1 +
include/dt-bindings/iio/adc/adi,ad7768-1.h | 10 +++++
3 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 include/dt-bindings/iio/adc/adi,ad7768-1.h
diff --git a/Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.yaml b/Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.yaml
index 3ce59d4d065f..9a6df931edc3 100644
--- a/Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.yaml
+++ b/Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.yaml
@@ -26,7 +26,26 @@ properties:
clock-names:
const: mclk
+ trigger-sources:
+ $ref: /schemas/types.yaml#/definitions/phandle-array
+ minItems: 1
+ maxItems: 2
+ description: |
+ A list of phandles referencing trigger source providers. Each entry
+ represents a trigger source for the ADC:
+
+ - First entry specifies the device responsible for driving the
+ synchronization (SYNC_IN) pin, as an alternative to adi,sync-in-gpios.
+ This can be a `gpio-trigger` or another `ad7768-1` device. If the
+ device's own SYNC_OUT pin is internally connected to its SYNC_IN pin,
+ reference the device itself or omit this property.
+ - Second entry optionally defines a GPIO3 pin used as a START signal trigger.
+
+ Use the accompanying trigger source cell to identify the type of each entry.
+
interrupts:
+ description:
+ DRDY (Data Ready) pin, which signals conversion results are available.
maxItems: 1
'#address-cells':
@@ -57,6 +76,15 @@ properties:
"#io-channel-cells":
const: 1
+ "#trigger-source-cells":
+ description: |
+ Cell indicates the trigger output signal: 0 = SYNC_OUT, 1 = GPIO3,
+ 2 = DRDY.
+
+ For better readability, macros for these values are available in
+ dt-bindings/iio/adc/adi,ad7768-1.h.
+ const: 1
+
required:
- compatible
- reg
@@ -65,7 +93,16 @@ required:
- vref-supply
- spi-cpol
- spi-cpha
- - adi,sync-in-gpios
+
+dependencies:
+ adi,sync-in-gpios:
+ not:
+ required:
+ - trigger-sources
+ trigger-sources:
+ not:
+ required:
+ - adi,sync-in-gpios
patternProperties:
"^channel@([0-9]|1[0-5])$":
diff --git a/MAINTAINERS b/MAINTAINERS
index 9b2e9a9dd8bc..be07926f6666 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1426,6 +1426,7 @@ S: Supported
W: https://ez.analog.com/linux-software-drivers
F: Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.yaml
F: drivers/iio/adc/ad7768-1.c
+F: include/dt-bindings/iio/adc/adi,ad7768-1.h
ANALOG DEVICES INC AD7780 DRIVER
M: Michael Hennerich <Michael.Hennerich@analog.com>
diff --git a/include/dt-bindings/iio/adc/adi,ad7768-1.h b/include/dt-bindings/iio/adc/adi,ad7768-1.h
new file mode 100644
index 000000000000..34d92856a50b
--- /dev/null
+++ b/include/dt-bindings/iio/adc/adi,ad7768-1.h
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
+
+#ifndef _DT_BINDINGS_ADI_AD7768_1_H
+#define _DT_BINDINGS_ADI_AD7768_1_H
+
+#define AD7768_TRIGGER_SOURCE_SYNC_OUT 0
+#define AD7768_TRIGGER_SOURCE_GPIO3 1
+#define AD7768_TRIGGER_SOURCE_DRDY 2
+
+#endif /* _DT_BINDINGS_ADI_AD7768_1_H */
--
2.34.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v7 04/12] dt-bindings: iio: adc: ad7768-1: Document GPIO controller
2025-05-08 17:02 [PATCH v7 00/12] iio: adc: ad7768-1: Add features, improvements, and fixes Jonathan Santos
` (2 preceding siblings ...)
2025-05-08 17:03 ` [PATCH v7 03/12] dt-bindings: iio: adc: ad7768-1: add trigger-sources property Jonathan Santos
@ 2025-05-08 17:03 ` Jonathan Santos
2025-05-08 17:03 ` [PATCH v7 05/12] dt-bindings: iio: adc: ad7768-1: document regulator provider property Jonathan Santos
` (8 subsequent siblings)
12 siblings, 0 replies; 27+ messages in thread
From: Jonathan Santos @ 2025-05-08 17:03 UTC (permalink / raw)
To: linux-iio, devicetree, linux-kernel, linux-gpio
Cc: Jonathan Santos, andy, nuno.sa, Michael.Hennerich,
marcelo.schmitt, jic23, robh, krzk+dt, conor+dt, marcelo.schmitt1,
linus.walleij, brgl, lgirdwood, broonie, jonath4nns, dlechner,
Bartosz Golaszewski
The AD7768-1 ADC exports four bidirectional GPIOs accessible
via register map.
Document GPIO properties necessary to enable GPIO controller for this
device.
Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Rob Herring (Arm) <robh@kernel.org>
Signed-off-by: Jonathan Santos <Jonathan.Santos@analog.com>
---
v7 Changes:
* none.
v6 Changes:
* none.
v5 Changes:
* none.
v4 Changes:
* none.
v3 Changes:
* none.
v2 Changes:
* New
---
.../devicetree/bindings/iio/adc/adi,ad7768-1.yaml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.yaml b/Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.yaml
index 9a6df931edc3..18f93586fcdf 100644
--- a/Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.yaml
+++ b/Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.yaml
@@ -85,6 +85,14 @@ properties:
dt-bindings/iio/adc/adi,ad7768-1.h.
const: 1
+ gpio-controller: true
+
+ "#gpio-cells":
+ const: 2
+ description: |
+ The first cell is for the GPIO number: 0 to 3.
+ The second cell takes standard GPIO flags.
+
required:
- compatible
- reg
@@ -142,6 +150,8 @@ examples:
spi-max-frequency = <2000000>;
spi-cpol;
spi-cpha;
+ gpio-controller;
+ #gpio-cells = <2>;
vref-supply = <&adc_vref>;
interrupts = <25 IRQ_TYPE_EDGE_RISING>;
interrupt-parent = <&gpio>;
--
2.34.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v7 05/12] dt-bindings: iio: adc: ad7768-1: document regulator provider property
2025-05-08 17:02 [PATCH v7 00/12] iio: adc: ad7768-1: Add features, improvements, and fixes Jonathan Santos
` (3 preceding siblings ...)
2025-05-08 17:03 ` [PATCH v7 04/12] dt-bindings: iio: adc: ad7768-1: Document GPIO controller Jonathan Santos
@ 2025-05-08 17:03 ` Jonathan Santos
2025-05-08 17:04 ` [PATCH v7 06/12] iio: adc: ad7768-1: add regulator to control VCM output Jonathan Santos
` (7 subsequent siblings)
12 siblings, 0 replies; 27+ messages in thread
From: Jonathan Santos @ 2025-05-08 17:03 UTC (permalink / raw)
To: linux-iio, devicetree, linux-kernel, linux-gpio
Cc: Jonathan Santos, andy, nuno.sa, Michael.Hennerich,
marcelo.schmitt, jic23, robh, krzk+dt, conor+dt, marcelo.schmitt1,
linus.walleij, brgl, lgirdwood, broonie, jonath4nns, dlechner,
Conor Dooley
The AD7768-1 provides a buffered common-mode voltage output
on the VCM pin that can be used to bias analog input signals.
Add regulators property to enable the use of the VCM output,
referenced here as vcm-output, by any other device.
Acked-by: Conor Dooley <conor.dooley@microchip.com>
Signed-off-by: Jonathan Santos <Jonathan.Santos@analog.com>
---
v7 Changes:
* none.
v6 Changes:
* None.
v5 Changes:
* removed `regulator-min-microvolt` and `regulator-max-microvolt`.
v4 Changes:
* replace "vcm_output" property name for "vcm-output".
v3 Changes:
* VCM is now provided as a regulator within the device, instead of a
custom property.
v2 Changes:
* New patch in v2.
---
.../bindings/iio/adc/adi,ad7768-1.yaml | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.yaml b/Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.yaml
index 18f93586fcdf..c06d0fc791d3 100644
--- a/Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.yaml
+++ b/Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.yaml
@@ -66,6 +66,19 @@ properties:
in any way, for example if the filter decimation rate changes.
As the line is active low, it should be marked GPIO_ACTIVE_LOW.
+ regulators:
+ type: object
+ description:
+ list of regulators provided by this controller.
+
+ properties:
+ vcm-output:
+ $ref: /schemas/regulator/regulator.yaml#
+ type: object
+ unevaluatedProperties: false
+
+ additionalProperties: false
+
reset-gpios:
maxItems: 1
@@ -167,6 +180,12 @@ examples:
reg = <0>;
label = "channel_0";
};
+
+ regulators {
+ vcm_reg: vcm-output {
+ regulator-name = "ad7768-1-vcm";
+ };
+ };
};
};
...
--
2.34.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v7 06/12] iio: adc: ad7768-1: add regulator to control VCM output
2025-05-08 17:02 [PATCH v7 00/12] iio: adc: ad7768-1: Add features, improvements, and fixes Jonathan Santos
` (4 preceding siblings ...)
2025-05-08 17:03 ` [PATCH v7 05/12] dt-bindings: iio: adc: ad7768-1: document regulator provider property Jonathan Santos
@ 2025-05-08 17:04 ` Jonathan Santos
2025-05-08 17:04 ` [PATCH v7 07/12] iio: adc: ad7768-1: Add GPIO controller support Jonathan Santos
` (6 subsequent siblings)
12 siblings, 0 replies; 27+ messages in thread
From: Jonathan Santos @ 2025-05-08 17:04 UTC (permalink / raw)
To: linux-iio, devicetree, linux-kernel, linux-gpio
Cc: Jonathan Santos, andy, nuno.sa, Michael.Hennerich,
marcelo.schmitt, jic23, robh, krzk+dt, conor+dt, marcelo.schmitt1,
linus.walleij, brgl, lgirdwood, broonie, jonath4nns, dlechner
The VCM output voltage can be used as a common-mode voltage within the
amplifier preconditioning circuits external to the AD7768-1.
This change allows the user to configure VCM output using the regulator
framework.
Acked-by: Marcelo Schmitt <marcelo.schmitt@analog.com>
Reviewed-by: David Lechner <dlechner@baylibre.com>
Signed-off-by: Jonathan Santos <Jonathan.Santos@analog.com>
---
v7 Changes:
* removed dead code.
* removed of.h header.
* removed explicit casting in the clamp function.
v6 Changes:
* Rearranged iio_device_release_direct() calls to avoid
some gotos.
* removed of_match_ptr() from regulator_desc.
* Addressed other nits.
v5 Changes:
* enforce AD7768_REG_ANALOG2_VCM macro argument evaluation.
* switched to the new iio_device_claim/release_direct() functions.
v4 Changes:
* Added iio_device_claim_direct_mode() to regulator callbacks to avoid register access
while in buffered mode.
* Changed regulator name to "ad7768-1-vcm".
* When regulator enable is called, it will set the last voltage selector configured.
* Disabled regulator before configuring it.
* Addressed other nits.
v3 Changes:
* Register VCM output via the regulator framework for improved flexibility
and external integration.
v2 Changes:
* VCM output support is now defined by a devicetree property, instead of
and IIO attribute.
---
drivers/iio/adc/Kconfig | 1 +
drivers/iio/adc/ad7768-1.c | 159 +++++++++++++++++++++++++++++++++++++
2 files changed, 160 insertions(+)
diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index ad06cf556785..8dc4cc4c25af 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -329,6 +329,7 @@ config AD7766
config AD7768_1
tristate "Analog Devices AD7768-1 ADC driver"
depends on SPI
+ select REGULATOR
select REGMAP_SPI
select IIO_BUFFER
select IIO_TRIGGER
diff --git a/drivers/iio/adc/ad7768-1.c b/drivers/iio/adc/ad7768-1.c
index e90bb5d50076..cd5ce774df72 100644
--- a/drivers/iio/adc/ad7768-1.c
+++ b/drivers/iio/adc/ad7768-1.c
@@ -13,9 +13,11 @@
#include <linux/err.h>
#include <linux/gpio/consumer.h>
#include <linux/interrupt.h>
+#include <linux/minmax.h>
#include <linux/module.h>
#include <linux/regmap.h>
#include <linux/regulator/consumer.h>
+#include <linux/regulator/driver.h>
#include <linux/sysfs.h>
#include <linux/spi/spi.h>
@@ -82,6 +84,12 @@
#define AD7768_CONV_MODE_MSK GENMASK(2, 0)
#define AD7768_CONV_MODE(x) FIELD_PREP(AD7768_CONV_MODE_MSK, x)
+/* AD7768_REG_ANALOG2 */
+#define AD7768_REG_ANALOG2_VCM_MSK GENMASK(2, 0)
+#define AD7768_REG_ANALOG2_VCM(x) FIELD_PREP(AD7768_REG_ANALOG2_VCM_MSK, (x))
+
+#define AD7768_VCM_OFF 0x07
+
enum ad7768_conv_mode {
AD7768_CONTINUOUS,
AD7768_ONE_SHOT,
@@ -159,6 +167,8 @@ struct ad7768_state {
struct regmap *regmap;
struct regmap *regmap24;
struct regulator *vref;
+ struct regulator_dev *vcm_rdev;
+ unsigned int vcm_output_sel;
struct clk *mclk;
unsigned int mclk_freq;
unsigned int samp_freq;
@@ -646,6 +656,150 @@ static int ad7768_triggered_buffer_alloc(struct iio_dev *indio_dev)
&ad7768_buffer_ops);
}
+static int ad7768_vcm_enable(struct regulator_dev *rdev)
+{
+ struct iio_dev *indio_dev = rdev_get_drvdata(rdev);
+ struct ad7768_state *st = iio_priv(indio_dev);
+ int ret, regval;
+
+ if (!iio_device_claim_direct(indio_dev))
+ return -EBUSY;
+
+ /* To enable, set the last selected output */
+ regval = AD7768_REG_ANALOG2_VCM(st->vcm_output_sel + 1);
+ ret = regmap_update_bits(st->regmap, AD7768_REG_ANALOG2,
+ AD7768_REG_ANALOG2_VCM_MSK, regval);
+ iio_device_release_direct(indio_dev);
+
+ return ret;
+}
+
+static int ad7768_vcm_disable(struct regulator_dev *rdev)
+{
+ struct iio_dev *indio_dev = rdev_get_drvdata(rdev);
+ struct ad7768_state *st = iio_priv(indio_dev);
+ int ret;
+
+ if (!iio_device_claim_direct(indio_dev))
+ return -EBUSY;
+
+ ret = regmap_update_bits(st->regmap, AD7768_REG_ANALOG2,
+ AD7768_REG_ANALOG2_VCM_MSK, AD7768_VCM_OFF);
+ iio_device_release_direct(indio_dev);
+
+ return ret;
+}
+
+static int ad7768_vcm_is_enabled(struct regulator_dev *rdev)
+{
+ struct iio_dev *indio_dev = rdev_get_drvdata(rdev);
+ struct ad7768_state *st = iio_priv(indio_dev);
+ int ret, val;
+
+ if (!iio_device_claim_direct(indio_dev))
+ return -EBUSY;
+
+ ret = regmap_read(st->regmap, AD7768_REG_ANALOG2, &val);
+ iio_device_release_direct(indio_dev);
+ if (ret)
+ return ret;
+
+ return FIELD_GET(AD7768_REG_ANALOG2_VCM_MSK, val) != AD7768_VCM_OFF;
+}
+
+static int ad7768_set_voltage_sel(struct regulator_dev *rdev,
+ unsigned int selector)
+{
+ unsigned int regval = AD7768_REG_ANALOG2_VCM(selector + 1);
+ struct iio_dev *indio_dev = rdev_get_drvdata(rdev);
+ struct ad7768_state *st = iio_priv(indio_dev);
+ int ret;
+
+ if (!iio_device_claim_direct(indio_dev))
+ return -EBUSY;
+
+ ret = regmap_update_bits(st->regmap, AD7768_REG_ANALOG2,
+ AD7768_REG_ANALOG2_VCM_MSK, regval);
+ iio_device_release_direct(indio_dev);
+ if (ret)
+ return ret;
+
+ st->vcm_output_sel = selector;
+
+ return 0;
+}
+
+static int ad7768_get_voltage_sel(struct regulator_dev *rdev)
+{
+ struct iio_dev *indio_dev = rdev_get_drvdata(rdev);
+ struct ad7768_state *st = iio_priv(indio_dev);
+ int ret, val;
+
+ if (!iio_device_claim_direct(indio_dev))
+ return -EBUSY;
+
+ ret = regmap_read(st->regmap, AD7768_REG_ANALOG2, &val);
+ iio_device_release_direct(indio_dev);
+ if (ret)
+ return ret;
+
+ val = FIELD_GET(AD7768_REG_ANALOG2_VCM_MSK, val);
+
+ return clamp(val, 1, rdev->desc->n_voltages) - 1;
+}
+
+static const struct regulator_ops vcm_regulator_ops = {
+ .enable = ad7768_vcm_enable,
+ .disable = ad7768_vcm_disable,
+ .is_enabled = ad7768_vcm_is_enabled,
+ .list_voltage = regulator_list_voltage_table,
+ .set_voltage_sel = ad7768_set_voltage_sel,
+ .get_voltage_sel = ad7768_get_voltage_sel,
+};
+
+static const unsigned int vcm_voltage_table[] = {
+ 2500000,
+ 2050000,
+ 1650000,
+ 1900000,
+ 1100000,
+ 900000,
+};
+
+static const struct regulator_desc vcm_desc = {
+ .name = "ad7768-1-vcm",
+ .of_match = "vcm-output",
+ .regulators_node = "regulators",
+ .n_voltages = ARRAY_SIZE(vcm_voltage_table),
+ .volt_table = vcm_voltage_table,
+ .ops = &vcm_regulator_ops,
+ .type = REGULATOR_VOLTAGE,
+ .owner = THIS_MODULE,
+};
+
+static int ad7768_register_regulators(struct device *dev, struct ad7768_state *st,
+ struct iio_dev *indio_dev)
+{
+ struct regulator_config config = {
+ .dev = dev,
+ .driver_data = indio_dev,
+ };
+ int ret;
+
+ /* Disable the regulator before registering it */
+ ret = regmap_update_bits(st->regmap, AD7768_REG_ANALOG2,
+ AD7768_REG_ANALOG2_VCM_MSK, AD7768_VCM_OFF);
+ if (ret)
+ return ret;
+
+ st->vcm_rdev = devm_regulator_register(dev, &vcm_desc, &config);
+ if (IS_ERR(st->vcm_rdev))
+ return dev_err_probe(dev, PTR_ERR(st->vcm_rdev),
+ "failed to register VCM regulator\n");
+
+ return 0;
+}
+
static int ad7768_probe(struct spi_device *spi)
{
struct ad7768_state *st;
@@ -710,6 +864,11 @@ static int ad7768_probe(struct spi_device *spi)
indio_dev->info = &ad7768_info;
indio_dev->modes = INDIO_DIRECT_MODE;
+ /* Register VCM output regulator */
+ ret = ad7768_register_regulators(&spi->dev, st, indio_dev);
+ if (ret)
+ return ret;
+
ret = ad7768_setup(st);
if (ret < 0) {
dev_err(&spi->dev, "AD7768 setup failed\n");
--
2.34.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v7 07/12] iio: adc: ad7768-1: Add GPIO controller support
2025-05-08 17:02 [PATCH v7 00/12] iio: adc: ad7768-1: Add features, improvements, and fixes Jonathan Santos
` (5 preceding siblings ...)
2025-05-08 17:04 ` [PATCH v7 06/12] iio: adc: ad7768-1: add regulator to control VCM output Jonathan Santos
@ 2025-05-08 17:04 ` Jonathan Santos
2025-05-08 17:04 ` [PATCH v7 08/12] iio: adc: ad7768-1: add multiple scan types to support 16-bits mode Jonathan Santos
` (5 subsequent siblings)
12 siblings, 0 replies; 27+ messages in thread
From: Jonathan Santos @ 2025-05-08 17:04 UTC (permalink / raw)
To: linux-iio, devicetree, linux-kernel, linux-gpio
Cc: Sergiu Cuciurean, andy, nuno.sa, Michael.Hennerich,
marcelo.schmitt, jic23, robh, krzk+dt, conor+dt, marcelo.schmitt1,
linus.walleij, brgl, lgirdwood, broonie, jonath4nns, dlechner,
Bartosz Golaszewski, Jonathan Santos
From: Sergiu Cuciurean <sergiu.cuciurean@analog.com>
The AD7768-1 has the ability to control other local hardware (such as gain
stages),to power down other blocks in the signal chain, or read local
status signals over the SPI interface.
Add direct mode conditional locks in the gpio callbacks to prevent register
access when the device is in buffered mode.
This change exports the AD7768-1's four gpios and makes them accessible
at an upper layer.
Reviewed-by: Marcelo Schmitt <marcelo.schmitt@analog.com>
Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sergiu Cuciurean <sergiu.cuciurean@analog.com>
Co-developed-by: Jonathan Santos <Jonathan.Santos@analog.com>
Signed-off-by: Jonathan Santos <Jonathan.Santos@analog.com>
---
v7 Changes:
* moved gpiochip field in the ad7768_state struct.
* replaced regmap_update_bits() for regmap_assign_bits() in the gpio_set() function.
* other nits.
* removed gpio.h header.
v6 Changes:
* Replaced deprecated .set callback with .set_rv.
v5 Changes:
* Use the new new iio_device_claim/release_direct() functions.
* replaced gpiochip_add_data() for devm_gpiochip_add_data().
v4 Changes:
* Mentioned in the commit message that we cannot tweak the GPIO controller
when the device is not in direct mode.
v3 Changes:
* Fixed SoB order.
* Added missing iio_device_release_direct_mode().
* Simplified some regmap writes.
* Removed ad7768_gpio_request() callback.
* Fixed line wrapping.
v2 Changes:
* Replaced mutex for iio_device_claim_direct_mode().
* Use gpio-controller property to conditionally enable the
GPIO support.
* OBS: when the GPIO is configured as output, we should read
the current state value from AD7768_REG_GPIO_WRITE.
---
drivers/iio/adc/ad7768-1.c | 140 ++++++++++++++++++++++++++++++++++++-
1 file changed, 138 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/adc/ad7768-1.c b/drivers/iio/adc/ad7768-1.c
index cd5ce774df72..d0366d570c14 100644
--- a/drivers/iio/adc/ad7768-1.c
+++ b/drivers/iio/adc/ad7768-1.c
@@ -11,6 +11,7 @@
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/err.h>
+#include <linux/gpio/driver.h>
#include <linux/gpio/consumer.h>
#include <linux/interrupt.h>
#include <linux/minmax.h>
@@ -88,6 +89,16 @@
#define AD7768_REG_ANALOG2_VCM_MSK GENMASK(2, 0)
#define AD7768_REG_ANALOG2_VCM(x) FIELD_PREP(AD7768_REG_ANALOG2_VCM_MSK, (x))
+/* AD7768_REG_GPIO_CONTROL */
+#define AD7768_GPIO_UNIVERSAL_EN BIT(7)
+#define AD7768_GPIO_CONTROL_MSK GENMASK(3, 0)
+
+/* AD7768_REG_GPIO_WRITE */
+#define AD7768_GPIO_WRITE_MSK GENMASK(3, 0)
+
+/* AD7768_REG_GPIO_READ */
+#define AD7768_GPIO_READ_MSK GENMASK(3, 0)
+
#define AD7768_VCM_OFF 0x07
enum ad7768_conv_mode {
@@ -177,6 +188,7 @@ struct ad7768_state {
struct gpio_desc *gpio_sync_in;
struct gpio_desc *gpio_reset;
const char *labels[ARRAY_SIZE(ad7768_channels)];
+ struct gpio_chip gpiochip;
/*
* DMA (thus cache coherency maintenance) may require the
* transfer buffers to live in their own cache lines.
@@ -355,6 +367,122 @@ static int ad7768_set_dig_fil(struct ad7768_state *st,
return 0;
}
+static int ad7768_gpio_direction_input(struct gpio_chip *chip, unsigned int offset)
+{
+ struct iio_dev *indio_dev = gpiochip_get_data(chip);
+ struct ad7768_state *st = iio_priv(indio_dev);
+ int ret;
+
+ if (!iio_device_claim_direct(indio_dev))
+ return -EBUSY;
+
+ ret = regmap_clear_bits(st->regmap, AD7768_REG_GPIO_CONTROL,
+ BIT(offset));
+ iio_device_release_direct(indio_dev);
+
+ return ret;
+}
+
+static int ad7768_gpio_direction_output(struct gpio_chip *chip,
+ unsigned int offset, int value)
+{
+ struct iio_dev *indio_dev = gpiochip_get_data(chip);
+ struct ad7768_state *st = iio_priv(indio_dev);
+ int ret;
+
+ if (!iio_device_claim_direct(indio_dev))
+ return -EBUSY;
+
+ ret = regmap_set_bits(st->regmap, AD7768_REG_GPIO_CONTROL,
+ BIT(offset));
+ iio_device_release_direct(indio_dev);
+
+ return ret;
+}
+
+static int ad7768_gpio_get(struct gpio_chip *chip, unsigned int offset)
+{
+ struct iio_dev *indio_dev = gpiochip_get_data(chip);
+ struct ad7768_state *st = iio_priv(indio_dev);
+ unsigned int val;
+ int ret;
+
+ if (!iio_device_claim_direct(indio_dev))
+ return -EBUSY;
+
+ ret = regmap_read(st->regmap, AD7768_REG_GPIO_CONTROL, &val);
+ if (ret)
+ goto err_release;
+
+ /*
+ * If the GPIO is configured as an output, read the current value from
+ * AD7768_REG_GPIO_WRITE. Otherwise, read the input value from
+ * AD7768_REG_GPIO_READ.
+ */
+ if (val & BIT(offset))
+ ret = regmap_read(st->regmap, AD7768_REG_GPIO_WRITE, &val);
+ else
+ ret = regmap_read(st->regmap, AD7768_REG_GPIO_READ, &val);
+ if (ret)
+ goto err_release;
+
+ ret = !!(val & BIT(offset));
+err_release:
+ iio_device_release_direct(indio_dev);
+
+ return ret;
+}
+
+static int ad7768_gpio_set(struct gpio_chip *chip, unsigned int offset, int value)
+{
+ struct iio_dev *indio_dev = gpiochip_get_data(chip);
+ struct ad7768_state *st = iio_priv(indio_dev);
+ unsigned int val;
+ int ret;
+
+ if (!iio_device_claim_direct(indio_dev))
+ return -EBUSY;
+
+ ret = regmap_read(st->regmap, AD7768_REG_GPIO_CONTROL, &val);
+ if (ret)
+ goto err_release;
+
+ if (val & BIT(offset))
+ ret = regmap_assign_bits(st->regmap, AD7768_REG_GPIO_WRITE,
+ BIT(offset), value);
+
+err_release:
+ iio_device_release_direct(indio_dev);
+
+ return ret;
+}
+
+static int ad7768_gpio_init(struct iio_dev *indio_dev)
+{
+ struct ad7768_state *st = iio_priv(indio_dev);
+ int ret;
+
+ ret = regmap_write(st->regmap, AD7768_REG_GPIO_CONTROL,
+ AD7768_GPIO_UNIVERSAL_EN);
+ if (ret)
+ return ret;
+
+ st->gpiochip = (struct gpio_chip) {
+ .label = "ad7768_1_gpios",
+ .base = -1,
+ .ngpio = 4,
+ .parent = &st->spi->dev,
+ .can_sleep = true,
+ .direction_input = ad7768_gpio_direction_input,
+ .direction_output = ad7768_gpio_direction_output,
+ .get = ad7768_gpio_get,
+ .set_rv = ad7768_gpio_set,
+ .owner = THIS_MODULE,
+ };
+
+ return devm_gpiochip_add_data(&st->spi->dev, &st->gpiochip, indio_dev);
+}
+
static int ad7768_set_freq(struct ad7768_state *st,
unsigned int freq)
{
@@ -496,8 +624,9 @@ static const struct iio_info ad7768_info = {
.debugfs_reg_access = &ad7768_reg_access,
};
-static int ad7768_setup(struct ad7768_state *st)
+static int ad7768_setup(struct iio_dev *indio_dev)
{
+ struct ad7768_state *st = iio_priv(indio_dev);
int ret;
st->gpio_reset = devm_gpiod_get_optional(&st->spi->dev, "reset",
@@ -530,6 +659,13 @@ static int ad7768_setup(struct ad7768_state *st)
if (IS_ERR(st->gpio_sync_in))
return PTR_ERR(st->gpio_sync_in);
+ /* Only create a Chip GPIO if flagged for it */
+ if (device_property_read_bool(&st->spi->dev, "gpio-controller")) {
+ ret = ad7768_gpio_init(indio_dev);
+ if (ret)
+ return ret;
+ }
+
/* Set the default sampling frequency to 32000 kSPS */
return ad7768_set_freq(st, 32000);
}
@@ -869,7 +1005,7 @@ static int ad7768_probe(struct spi_device *spi)
if (ret)
return ret;
- ret = ad7768_setup(st);
+ ret = ad7768_setup(indio_dev);
if (ret < 0) {
dev_err(&spi->dev, "AD7768 setup failed\n");
return ret;
--
2.34.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v7 08/12] iio: adc: ad7768-1: add multiple scan types to support 16-bits mode
2025-05-08 17:02 [PATCH v7 00/12] iio: adc: ad7768-1: Add features, improvements, and fixes Jonathan Santos
` (6 preceding siblings ...)
2025-05-08 17:04 ` [PATCH v7 07/12] iio: adc: ad7768-1: Add GPIO controller support Jonathan Santos
@ 2025-05-08 17:04 ` Jonathan Santos
2025-05-08 18:01 ` David Lechner
2025-05-08 18:03 ` David Lechner
2025-05-08 17:04 ` [PATCH v7 09/12] iio: adc: ad7768-1: add support for Synchronization over SPI Jonathan Santos
` (4 subsequent siblings)
12 siblings, 2 replies; 27+ messages in thread
From: Jonathan Santos @ 2025-05-08 17:04 UTC (permalink / raw)
To: linux-iio, devicetree, linux-kernel, linux-gpio
Cc: Jonathan Santos, andy, nuno.sa, Michael.Hennerich,
marcelo.schmitt, jic23, robh, krzk+dt, conor+dt, marcelo.schmitt1,
linus.walleij, brgl, lgirdwood, broonie, jonath4nns, dlechner,
David Lechner
When the device is configured to decimation x8, only possible in the
sinc5 filter, output data is reduced to 16-bits in order to support
1 MHz of sampling frequency due to clock limitation.
Use multiple scan types feature to enable the driver to switch
scan type at runtime, making it possible to support both 24-bit and
16-bit resolution.
Reviewed-by: Marcelo Schmitt <marcelo.schmitt@analog.com>
Reviewed-by: David Lechner <dlechner@baylire.com>
Signed-off-by: Jonathan Santos <Jonathan.Santos@analog.com>
---
v7 Changes:
* Added TODO comment to use spi_bpw_to_bytes() helper function.
* Minor commit description changes.
v6 Changes:
* None.
v5 Changes:
* None.
v4 Changes:
* None.
v3 Changes:
* Decreased storagebits to 16 for AD7768_SCAN_TYPE_HIGH_SPEED
scan type.
v2 Changes:
* Included the ".shift" value back to scan_type.
* Changed the number of bytes from regmap_read instead of shifting the
ADC sample value when the word size is lower (16-bits).
---
drivers/iio/adc/ad7768-1.c | 75 +++++++++++++++++++++++++++++++++-----
1 file changed, 65 insertions(+), 10 deletions(-)
diff --git a/drivers/iio/adc/ad7768-1.c b/drivers/iio/adc/ad7768-1.c
index d0366d570c14..19b9744dfd1b 100644
--- a/drivers/iio/adc/ad7768-1.c
+++ b/drivers/iio/adc/ad7768-1.c
@@ -140,6 +140,15 @@ struct ad7768_clk_configuration {
enum ad7768_pwrmode pwrmode;
};
+enum ad7768_scan_type {
+ AD7768_SCAN_TYPE_NORMAL,
+ AD7768_SCAN_TYPE_HIGH_SPEED,
+};
+
+static const int ad7768_mclk_div_rates[] = {
+ 16, 8, 4, 2,
+};
+
static const struct ad7768_clk_configuration ad7768_clk_config[] = {
{ AD7768_MCLK_DIV_2, AD7768_DEC_RATE_8, 16, AD7768_FAST_MODE },
{ AD7768_MCLK_DIV_2, AD7768_DEC_RATE_16, 32, AD7768_FAST_MODE },
@@ -154,6 +163,22 @@ static const struct ad7768_clk_configuration ad7768_clk_config[] = {
{ AD7768_MCLK_DIV_16, AD7768_DEC_RATE_1024, 16384, AD7768_ECO_MODE },
};
+static const struct iio_scan_type ad7768_scan_type[] = {
+ [AD7768_SCAN_TYPE_NORMAL] = {
+ .sign = 's',
+ .realbits = 24,
+ .storagebits = 32,
+ .shift = 8,
+ .endianness = IIO_BE,
+ },
+ [AD7768_SCAN_TYPE_HIGH_SPEED] = {
+ .sign = 's',
+ .realbits = 16,
+ .storagebits = 16,
+ .endianness = IIO_BE,
+ },
+};
+
static const struct iio_chan_spec ad7768_channels[] = {
{
.type = IIO_VOLTAGE,
@@ -163,13 +188,9 @@ static const struct iio_chan_spec ad7768_channels[] = {
.indexed = 1,
.channel = 0,
.scan_index = 0,
- .scan_type = {
- .sign = 's',
- .realbits = 24,
- .storagebits = 32,
- .shift = 8,
- .endianness = IIO_BE,
- },
+ .has_ext_scan_type = 1,
+ .ext_scan_type = ad7768_scan_type,
+ .num_ext_scan_type = ARRAY_SIZE(ad7768_scan_type),
},
};
@@ -182,6 +203,7 @@ struct ad7768_state {
unsigned int vcm_output_sel;
struct clk *mclk;
unsigned int mclk_freq;
+ unsigned int dec_rate;
unsigned int samp_freq;
struct completion completion;
struct iio_trigger *trig;
@@ -301,6 +323,15 @@ static int ad7768_scan_direct(struct iio_dev *indio_dev)
if (ret)
return ret;
+ /*
+ * When the decimation rate is set to x8, the ADC data precision is
+ * reduced from 24 bits to 16 bits. Since the AD7768_REG_ADC_DATA
+ * register provides 24-bit data, the precision is reduced by
+ * right-shifting the read value by 8 bits.
+ */
+ if (st->dec_rate == 8)
+ readval >>= 8;
+
/*
* Any SPI configuration of the AD7768-1 can only be
* performed in continuous conversion mode.
@@ -517,6 +548,8 @@ static int ad7768_set_freq(struct ad7768_state *st,
if (ret < 0)
return ret;
+ st->dec_rate = ad7768_clk_config[idx].clk_div /
+ ad7768_mclk_div_rates[ad7768_clk_config[idx].mclk_div];
st->samp_freq = DIV_ROUND_CLOSEST(st->mclk_freq,
ad7768_clk_config[idx].clk_div);
@@ -550,8 +583,13 @@ static int ad7768_read_raw(struct iio_dev *indio_dev,
int *val, int *val2, long info)
{
struct ad7768_state *st = iio_priv(indio_dev);
+ const struct iio_scan_type *scan_type;
int scale_uv, ret;
+ scan_type = iio_get_current_scan_type(indio_dev, chan);
+ if (IS_ERR(scan_type))
+ return PTR_ERR(scan_type);
+
switch (info) {
case IIO_CHAN_INFO_RAW:
if (!iio_device_claim_direct(indio_dev))
@@ -562,7 +600,7 @@ static int ad7768_read_raw(struct iio_dev *indio_dev,
iio_device_release_direct(indio_dev);
if (ret < 0)
return ret;
- *val = sign_extend32(ret, chan->scan_type.realbits - 1);
+ *val = sign_extend32(ret, scan_type->realbits - 1);
return IIO_VAL_INT;
@@ -572,7 +610,7 @@ static int ad7768_read_raw(struct iio_dev *indio_dev,
return scale_uv;
*val = (scale_uv * 2) / 1000;
- *val2 = chan->scan_type.realbits;
+ *val2 = scan_type->realbits;
return IIO_VAL_FRACTIONAL_LOG2;
@@ -616,11 +654,21 @@ static const struct attribute_group ad7768_group = {
.attrs = ad7768_attributes,
};
+static int ad7768_get_current_scan_type(const struct iio_dev *indio_dev,
+ const struct iio_chan_spec *chan)
+{
+ struct ad7768_state *st = iio_priv(indio_dev);
+
+ return st->dec_rate == 8 ? AD7768_SCAN_TYPE_HIGH_SPEED :
+ AD7768_SCAN_TYPE_NORMAL;
+}
+
static const struct iio_info ad7768_info = {
.attrs = &ad7768_group,
.read_raw = &ad7768_read_raw,
.write_raw = &ad7768_write_raw,
.read_label = ad7768_read_label,
+ .get_current_scan_type = &ad7768_get_current_scan_type,
.debugfs_reg_access = &ad7768_reg_access,
};
@@ -675,9 +723,16 @@ static irqreturn_t ad7768_trigger_handler(int irq, void *p)
struct iio_poll_func *pf = p;
struct iio_dev *indio_dev = pf->indio_dev;
struct ad7768_state *st = iio_priv(indio_dev);
+ const struct iio_scan_type *scan_type;
int ret;
- ret = spi_read(st->spi, &st->data.scan.chan, 3);
+ scan_type = iio_get_current_scan_type(indio_dev, &indio_dev->channels[0]);
+ if (IS_ERR(scan_type))
+ goto out;
+
+ /* TODO: Use spi_bpw_to_bytes() helper function. */
+ ret = spi_read(st->spi, &st->data.scan.chan,
+ BITS_TO_BYTES(scan_type->realbits));
if (ret < 0)
goto out;
--
2.34.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v7 09/12] iio: adc: ad7768-1: add support for Synchronization over SPI
2025-05-08 17:02 [PATCH v7 00/12] iio: adc: ad7768-1: Add features, improvements, and fixes Jonathan Santos
` (7 preceding siblings ...)
2025-05-08 17:04 ` [PATCH v7 08/12] iio: adc: ad7768-1: add multiple scan types to support 16-bits mode Jonathan Santos
@ 2025-05-08 17:04 ` Jonathan Santos
2025-05-08 18:45 ` David Lechner
2025-05-08 17:05 ` [PATCH v7 10/12] iio: adc: ad7768-1: replace manual attribute declaration Jonathan Santos
` (3 subsequent siblings)
12 siblings, 1 reply; 27+ messages in thread
From: Jonathan Santos @ 2025-05-08 17:04 UTC (permalink / raw)
To: linux-iio, devicetree, linux-kernel, linux-gpio
Cc: Jonathan Santos, andy, nuno.sa, Michael.Hennerich,
marcelo.schmitt, jic23, robh, krzk+dt, conor+dt, marcelo.schmitt1,
linus.walleij, brgl, lgirdwood, broonie, jonath4nns, dlechner
The synchronization method using GPIO requires the generated pulse to be
truly synchronous with the base MCLK signal. When it is not possible to
do that in hardware, the datasheet recommends using synchronization over
SPI, where the generated pulse is already synchronous with MCLK. This
requires the SYNC_OUT pin to be connected to the SYNC_IN pin.
Use trigger-sources property to enable device synchronization over SPI
and multi-device synchronization while replacing sync-in-gpios property.
Signed-off-by: Jonathan Santos <Jonathan.Santos@analog.com>
---
v7 Changes:
* Added delay in the synchronization pulse via GPIO.
* replaced device_property_present() for fwnode_property_present().
* Refactored ad7768_trigger_sources_get_sync() to avoid excessive jumps.
* Self triggering is enabled only when the trigger-sources property is
not defined. Added TODO to support other trigger sources when the subsystem
is available.
v6 Changes:
* Created macro for the SYNC index from trigger-sources.
* Check trigger source by the compatible string (and the dev node for the
self triggering).
* Check nargs before accessing the args array.
* Use `trigger-sources` as an alternative to `adi,sync-in-gpios`
(now optional), instead of replacing it.
v5 Changes:
* Allow omitting trigger-sources property.
* include gpio-trigger to trigger-sources to replace adi,sync-in-gpios
property.
* Read trigger-sources cell value to differentiate the trigger type.
v4 Changes:
* None.
v3 Changes:
* Fixed args.fwnode leakage in the trigger-sources parsing.
* Synchronization over spi is enabled when the trigger-sources
references the own device.
* Synchronization is kept within the device, and return error if the
gpio is not defined and the trigger-sources reference does not match
the current device.
v2 Changes:
* Synchronization via SPI is enabled when the Sync GPIO is not defined.
* now trigger-sources property indicates the synchronization provider or
main device. The main device will be used to drive the SYNC_IN when
requested (via GPIO or SPI).
---
drivers/iio/adc/ad7768-1.c | 111 +++++++++++++++++++++++++++++++++++--
1 file changed, 105 insertions(+), 6 deletions(-)
diff --git a/drivers/iio/adc/ad7768-1.c b/drivers/iio/adc/ad7768-1.c
index 19b9744dfd1b..cdcc77ca04fa 100644
--- a/drivers/iio/adc/ad7768-1.c
+++ b/drivers/iio/adc/ad7768-1.c
@@ -29,6 +29,8 @@
#include <linux/iio/triggered_buffer.h>
#include <linux/iio/trigger_consumer.h>
+#include <dt-bindings/iio/adc/adi,ad7768-1.h>
+
/* AD7768 registers definition */
#define AD7768_REG_CHIP_TYPE 0x3
#define AD7768_REG_PROD_ID_L 0x4
@@ -101,6 +103,8 @@
#define AD7768_VCM_OFF 0x07
+#define AD7768_TRIGGER_SOURCE_SYNC_IDX 0
+
enum ad7768_conv_mode {
AD7768_CONTINUOUS,
AD7768_ONE_SHOT,
@@ -209,6 +213,7 @@ struct ad7768_state {
struct iio_trigger *trig;
struct gpio_desc *gpio_sync_in;
struct gpio_desc *gpio_reset;
+ bool en_spi_sync;
const char *labels[ARRAY_SIZE(ad7768_channels)];
struct gpio_chip gpiochip;
/*
@@ -296,6 +301,27 @@ static const struct regmap_config ad7768_regmap24_config = {
.max_register = AD7768_REG24_COEFF_DATA,
};
+static int ad7768_send_sync_pulse(struct ad7768_state *st)
+{
+ if (st->en_spi_sync)
+ return regmap_write(st->regmap, AD7768_REG_SYNC_RESET, 0x00);
+
+ /*
+ * The datasheet specifies a minimum SYNC_IN pulse width of 1.5 × Tmclk,
+ * where Tmclk is the MCLK period. The supported MCLK frequencies range
+ * from 0.6 MHz to 17 MHz, which corresponds to a minimum SYNC_IN pulse
+ * width of approximately 2.5 µs in the worst-case scenario (0.6 MHz).
+ *
+ * Add a delay to ensure the pulse width is always sufficient to
+ * trigger synchronization.
+ */
+ gpiod_set_value_cansleep(st->gpio_sync_in, 1);
+ fsleep(3);
+ gpiod_set_value_cansleep(st->gpio_sync_in, 0);
+
+ return 0;
+}
+
static int ad7768_set_mode(struct ad7768_state *st,
enum ad7768_conv_mode mode)
{
@@ -392,10 +418,7 @@ static int ad7768_set_dig_fil(struct ad7768_state *st,
return ret;
/* A sync-in pulse is required every time the filter dec rate changes */
- gpiod_set_value(st->gpio_sync_in, 1);
- gpiod_set_value(st->gpio_sync_in, 0);
-
- return 0;
+ return ad7768_send_sync_pulse(st);
}
static int ad7768_gpio_direction_input(struct gpio_chip *chip, unsigned int offset)
@@ -672,6 +695,71 @@ static const struct iio_info ad7768_info = {
.debugfs_reg_access = &ad7768_reg_access,
};
+static struct gpio_desc *ad7768_trigger_source_get_gpio(struct device *dev,
+ struct fwnode_handle *fwnode)
+{
+ if (!fwnode_device_is_compatible(fwnode, "gpio-trigger"))
+ return ERR_PTR(-EINVAL);
+
+ return devm_fwnode_gpiod_get_index(dev, fwnode, NULL, 0,
+ GPIOD_OUT_LOW, "sync-in");
+}
+
+static int ad7768_trigger_sources_get_sync(struct device *dev,
+ struct ad7768_state *st)
+{
+ struct fwnode_reference_args args;
+ struct fwnode_handle *fwnode = dev_fwnode(dev);
+ int ret;
+
+ /*
+ * The AD7768-1 allows two primary methods for driving the SYNC_IN pin
+ * to synchronize one or more devices:
+ * 1. Using an external GPIO.
+ * 2. Using a SPI command, where the SYNC_OUT pin generates a
+ * synchronization pulse that drives the SYNC_IN pin.
+ */
+ if (!fwnode_property_present(fwnode, "trigger-sources")) {
+ /*
+ * In the absence of trigger-sources property, enable self
+ * synchronization over SPI (SYNC_OUT).
+ */
+ st->en_spi_sync = true;
+ return 0;
+ }
+
+ ret = fwnode_property_get_reference_args(fwnode,
+ "trigger-sources",
+ "#trigger-source-cells",
+ 0,
+ AD7768_TRIGGER_SOURCE_SYNC_IDX,
+ &args);
+ if (ret)
+ return ret;
+
+ fwnode = args.fwnode;
+ /*
+ * First, try getting the GPIO trigger source and fallback to
+ * synchronization over SPI in case of failure.
+ */
+ st->gpio_sync_in = ad7768_trigger_source_get_gpio(dev, fwnode);
+ if (!IS_ERR(st->gpio_sync_in))
+ goto out_put_node;
+
+ /*
+ * TODO: Support the other cases when we have a trigger subsystem to
+ * reliably handle other types of devices as trigger sources.
+ *
+ * For now, return an error message. For self triggering, omit the
+ * trigger-sources property.
+ */
+ ret = dev_err_probe(dev, -EOPNOTSUPP, "Invalid synchronization trigger source\n");
+
+out_put_node:
+ fwnode_handle_put(args.fwnode);
+ return ret;
+}
+
static int ad7768_setup(struct iio_dev *indio_dev)
{
struct ad7768_state *st = iio_priv(indio_dev);
@@ -702,11 +790,22 @@ static int ad7768_setup(struct iio_dev *indio_dev)
return ret;
}
- st->gpio_sync_in = devm_gpiod_get(&st->spi->dev, "adi,sync-in",
- GPIOD_OUT_LOW);
+ /* For backwards compatibility, try the adi,sync-in-gpios property */
+ st->gpio_sync_in = devm_gpiod_get_optional(&st->spi->dev, "adi,sync-in",
+ GPIOD_OUT_LOW);
if (IS_ERR(st->gpio_sync_in))
return PTR_ERR(st->gpio_sync_in);
+ /*
+ * If the synchronization is not defined by adi,sync-in-gpios, try the
+ * trigger-sources.
+ */
+ if (!st->gpio_sync_in) {
+ ret = ad7768_trigger_sources_get_sync(&st->spi->dev, st);
+ if (ret)
+ return ret;
+ }
+
/* Only create a Chip GPIO if flagged for it */
if (device_property_read_bool(&st->spi->dev, "gpio-controller")) {
ret = ad7768_gpio_init(indio_dev);
--
2.34.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v7 10/12] iio: adc: ad7768-1: replace manual attribute declaration
2025-05-08 17:02 [PATCH v7 00/12] iio: adc: ad7768-1: Add features, improvements, and fixes Jonathan Santos
` (8 preceding siblings ...)
2025-05-08 17:04 ` [PATCH v7 09/12] iio: adc: ad7768-1: add support for Synchronization over SPI Jonathan Santos
@ 2025-05-08 17:05 ` Jonathan Santos
2025-05-08 19:31 ` Andy Shevchenko
2025-05-08 17:05 ` [PATCH v7 11/12] iio: adc: ad7768-1: add filter type and oversampling ratio attributes Jonathan Santos
` (2 subsequent siblings)
12 siblings, 1 reply; 27+ messages in thread
From: Jonathan Santos @ 2025-05-08 17:05 UTC (permalink / raw)
To: linux-iio, devicetree, linux-kernel, linux-gpio
Cc: Jonathan Santos, andy, nuno.sa, Michael.Hennerich,
marcelo.schmitt, jic23, robh, krzk+dt, conor+dt, marcelo.schmitt1,
linus.walleij, brgl, lgirdwood, broonie, jonath4nns, dlechner
Use read_avail callback from struct iio_info to replace the manual
declaration of sampling_frequency_available attribute.
Reviewed-by: David Lechner <dlechner@baylibre.com>
Reviewed-by: Marcelo Schmitt <marcelo.schmitt@analog.com>
Signed-off-by: Jonathan Santos <Jonathan.Santos@analog.com>
---
v7 Changes:
* Iteractor changed to unsigned in the ad7768_fill_samp_freq_tbl()
function.
v6 Changes:
* none.
v5 Changes:
* none.
v4 Changes:
* Added ad7768_fill_samp_freq_tbl() helper function.
* Sampling frequency table is precomputed at probe.
v3 Changes:
* New patch in v3.
---
drivers/iio/adc/ad7768-1.c | 63 +++++++++++++++++++-------------------
1 file changed, 31 insertions(+), 32 deletions(-)
diff --git a/drivers/iio/adc/ad7768-1.c b/drivers/iio/adc/ad7768-1.c
index cdcc77ca04fa..260eed41e504 100644
--- a/drivers/iio/adc/ad7768-1.c
+++ b/drivers/iio/adc/ad7768-1.c
@@ -189,6 +189,7 @@ static const struct iio_chan_spec ad7768_channels[] = {
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
.info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
+ .info_mask_shared_by_all_available = BIT(IIO_CHAN_INFO_SAMP_FREQ),
.indexed = 1,
.channel = 0,
.scan_index = 0,
@@ -209,6 +210,7 @@ struct ad7768_state {
unsigned int mclk_freq;
unsigned int dec_rate;
unsigned int samp_freq;
+ unsigned int samp_freq_avail[ARRAY_SIZE(ad7768_clk_config)];
struct completion completion;
struct iio_trigger *trig;
struct gpio_desc *gpio_sync_in;
@@ -322,6 +324,15 @@ static int ad7768_send_sync_pulse(struct ad7768_state *st)
return 0;
}
+static void ad7768_fill_samp_freq_tbl(struct ad7768_state *st)
+{
+ unsigned int i;
+
+ for (i = 0; i < ARRAY_SIZE(ad7768_clk_config); i++)
+ st->samp_freq_avail[i] = DIV_ROUND_CLOSEST(st->mclk_freq,
+ ad7768_clk_config[i].clk_div);
+}
+
static int ad7768_set_mode(struct ad7768_state *st,
enum ad7768_conv_mode mode)
{
@@ -579,28 +590,6 @@ static int ad7768_set_freq(struct ad7768_state *st,
return 0;
}
-static ssize_t ad7768_sampling_freq_avail(struct device *dev,
- struct device_attribute *attr,
- char *buf)
-{
- struct iio_dev *indio_dev = dev_to_iio_dev(dev);
- struct ad7768_state *st = iio_priv(indio_dev);
- unsigned int freq;
- int i, len = 0;
-
- for (i = 0; i < ARRAY_SIZE(ad7768_clk_config); i++) {
- freq = DIV_ROUND_CLOSEST(st->mclk_freq,
- ad7768_clk_config[i].clk_div);
- len += scnprintf(buf + len, PAGE_SIZE - len, "%d ", freq);
- }
-
- buf[len - 1] = '\n';
-
- return len;
-}
-
-static IIO_DEV_ATTR_SAMP_FREQ_AVAIL(ad7768_sampling_freq_avail);
-
static int ad7768_read_raw(struct iio_dev *indio_dev,
struct iio_chan_spec const *chan,
int *val, int *val2, long info)
@@ -646,6 +635,24 @@ static int ad7768_read_raw(struct iio_dev *indio_dev,
return -EINVAL;
}
+static int ad7768_read_avail(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ const int **vals, int *type, int *length,
+ long info)
+{
+ struct ad7768_state *st = iio_priv(indio_dev);
+
+ switch (info) {
+ case IIO_CHAN_INFO_SAMP_FREQ:
+ *vals = (int *)st->samp_freq_avail;
+ *length = ARRAY_SIZE(ad7768_clk_config);
+ *type = IIO_VAL_INT;
+ return IIO_AVAIL_LIST;
+ default:
+ return -EINVAL;
+ }
+}
+
static int ad7768_write_raw(struct iio_dev *indio_dev,
struct iio_chan_spec const *chan,
int val, int val2, long info)
@@ -668,15 +675,6 @@ static int ad7768_read_label(struct iio_dev *indio_dev,
return sprintf(label, "%s\n", st->labels[chan->channel]);
}
-static struct attribute *ad7768_attributes[] = {
- &iio_dev_attr_sampling_frequency_available.dev_attr.attr,
- NULL
-};
-
-static const struct attribute_group ad7768_group = {
- .attrs = ad7768_attributes,
-};
-
static int ad7768_get_current_scan_type(const struct iio_dev *indio_dev,
const struct iio_chan_spec *chan)
{
@@ -687,8 +685,8 @@ static int ad7768_get_current_scan_type(const struct iio_dev *indio_dev,
}
static const struct iio_info ad7768_info = {
- .attrs = &ad7768_group,
.read_raw = &ad7768_read_raw,
+ .read_avail = &ad7768_read_avail,
.write_raw = &ad7768_write_raw,
.read_label = ad7768_read_label,
.get_current_scan_type = &ad7768_get_current_scan_type,
@@ -1147,6 +1145,7 @@ static int ad7768_probe(struct spi_device *spi)
return PTR_ERR(st->mclk);
st->mclk_freq = clk_get_rate(st->mclk);
+ ad7768_fill_samp_freq_tbl(st);
indio_dev->channels = ad7768_channels;
indio_dev->num_channels = ARRAY_SIZE(ad7768_channels);
--
2.34.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v7 11/12] iio: adc: ad7768-1: add filter type and oversampling ratio attributes
2025-05-08 17:02 [PATCH v7 00/12] iio: adc: ad7768-1: Add features, improvements, and fixes Jonathan Santos
` (9 preceding siblings ...)
2025-05-08 17:05 ` [PATCH v7 10/12] iio: adc: ad7768-1: replace manual attribute declaration Jonathan Santos
@ 2025-05-08 17:05 ` Jonathan Santos
2025-05-08 19:39 ` Andy Shevchenko
2025-05-08 17:05 ` [PATCH v7 12/12] iio: adc: ad7768-1: add low pass -3dB cutoff attribute Jonathan Santos
2025-05-11 15:11 ` [PATCH v7 00/12] iio: adc: ad7768-1: Add features, improvements, and fixes Jonathan Cameron
12 siblings, 1 reply; 27+ messages in thread
From: Jonathan Santos @ 2025-05-08 17:05 UTC (permalink / raw)
To: linux-iio, devicetree, linux-kernel, linux-gpio
Cc: Jonathan Santos, andy, nuno.sa, Michael.Hennerich,
marcelo.schmitt, jic23, robh, krzk+dt, conor+dt, marcelo.schmitt1,
linus.walleij, brgl, lgirdwood, broonie, jonath4nns, dlechner,
Pop Paul
Separate filter type and decimation rate from the sampling frequency
attribute. The new filter type attribute enables sinc3, sinc3+rej60
and wideband filters, which were previously unavailable.
Previously, combining decimation and MCLK divider in the sampling
frequency obscured performance trade-offs. Lower MCLK divider
settings increase power usage, while lower decimation rates reduce
precision by decreasing averaging. By creating an oversampling
attribute, which controls the decimation, users gain finer control
over performance.
The addition of those attributes allows a wider range of sampling
frequencies and more access to the device features. Sampling frequency
table is updated after every digital filter parameter change.
Changes in the sampling frequency are not allowed anymore while in
buffered mode.
Reviewed-by: David Lechner <dlechner@baylibre.com>
Co-developed-by: Pop Paul <paul.pop@analog.com>
Signed-off-by: Pop Paul <paul.pop@analog.com>
Signed-off-by: Jonathan Santos <Jonathan.Santos@analog.com>
---
v7 Changes:
* Refactor code to avoid forward declarations.
* replaced clamp_t() for clamp();
* Mentioned that sampling frequency changes is not allowed in
buffered mode.
* removed 60Hz rejection enable from the filter mask and create
AD7768_DIG_FIL_EN_60HZ_REJ for it.
* addressed other nits.
v6 Changes:
* Made sinc3 decimation rate calculation clearer as requested.
* Renamed some filter functions to clarify the purpose.
* Other nits.
v5 Changes:
* Addressed some nits.
* Use the new new iio_device_claim/release_direct() functions.
v4 Changes:
* Sampling frequency table is dynamically updated after every
filter configuration.
v3 Changes:
* removed unused variables.
* included sinc3+rej60 filter type.
* oversampling_ratio moved to info_mask_shared_by_type.
* reordered functions to avoid forward declaration.
* simplified regmap writes.
* Removed locking.
* replaced some helper functions for direct regmap_update_bits
calls.
* Addressed other nits.
v2 Changes:
* Decimation_rate attribute replaced for oversampling_ratio.
---
drivers/iio/adc/ad7768-1.c | 391 +++++++++++++++++++++++++++++--------
1 file changed, 306 insertions(+), 85 deletions(-)
diff --git a/drivers/iio/adc/ad7768-1.c b/drivers/iio/adc/ad7768-1.c
index 260eed41e504..28998cb02761 100644
--- a/drivers/iio/adc/ad7768-1.c
+++ b/drivers/iio/adc/ad7768-1.c
@@ -21,6 +21,8 @@
#include <linux/regulator/driver.h>
#include <linux/sysfs.h>
#include <linux/spi/spi.h>
+#include <linux/unaligned.h>
+#include <linux/util_macros.h>
#include <linux/iio/buffer.h>
#include <linux/iio/iio.h>
@@ -78,6 +80,7 @@
#define AD7768_PWR_PWRMODE(x) FIELD_PREP(AD7768_PWR_PWRMODE_MSK, x)
/* AD7768_REG_DIGITAL_FILTER */
+#define AD7768_DIG_FIL_EN_60HZ_REJ BIT(7)
#define AD7768_DIG_FIL_FIL_MSK GENMASK(6, 4)
#define AD7768_DIG_FIL_FIL(x) FIELD_PREP(AD7768_DIG_FIL_FIL_MSK, x)
#define AD7768_DIG_FIL_DEC_MSK GENMASK(2, 0)
@@ -105,6 +108,8 @@
#define AD7768_TRIGGER_SOURCE_SYNC_IDX 0
+#define AD7768_MAX_CHANNELS 1
+
enum ad7768_conv_mode {
AD7768_CONTINUOUS,
AD7768_ONE_SHOT,
@@ -126,22 +131,20 @@ enum ad7768_mclk_div {
AD7768_MCLK_DIV_2
};
-enum ad7768_dec_rate {
- AD7768_DEC_RATE_32 = 0,
- AD7768_DEC_RATE_64 = 1,
- AD7768_DEC_RATE_128 = 2,
- AD7768_DEC_RATE_256 = 3,
- AD7768_DEC_RATE_512 = 4,
- AD7768_DEC_RATE_1024 = 5,
- AD7768_DEC_RATE_8 = 9,
- AD7768_DEC_RATE_16 = 10
+enum ad7768_filter_type {
+ AD7768_FILTER_SINC5,
+ AD7768_FILTER_SINC3,
+ AD7768_FILTER_WIDEBAND,
+ AD7768_FILTER_SINC3_REJ60,
};
-struct ad7768_clk_configuration {
- enum ad7768_mclk_div mclk_div;
- enum ad7768_dec_rate dec_rate;
- unsigned int clk_div;
- enum ad7768_pwrmode pwrmode;
+enum ad7768_filter_regval {
+ AD7768_FILTER_REGVAL_SINC5 = 0,
+ AD7768_FILTER_REGVAL_SINC5_X8 = 1,
+ AD7768_FILTER_REGVAL_SINC5_X16 = 2,
+ AD7768_FILTER_REGVAL_SINC3 = 3,
+ AD7768_FILTER_REGVAL_WIDEBAND = 4,
+ AD7768_FILTER_REGVAL_SINC3_REJ60 = 11,
};
enum ad7768_scan_type {
@@ -153,18 +156,39 @@ static const int ad7768_mclk_div_rates[] = {
16, 8, 4, 2,
};
-static const struct ad7768_clk_configuration ad7768_clk_config[] = {
- { AD7768_MCLK_DIV_2, AD7768_DEC_RATE_8, 16, AD7768_FAST_MODE },
- { AD7768_MCLK_DIV_2, AD7768_DEC_RATE_16, 32, AD7768_FAST_MODE },
- { AD7768_MCLK_DIV_2, AD7768_DEC_RATE_32, 64, AD7768_FAST_MODE },
- { AD7768_MCLK_DIV_2, AD7768_DEC_RATE_64, 128, AD7768_FAST_MODE },
- { AD7768_MCLK_DIV_2, AD7768_DEC_RATE_128, 256, AD7768_FAST_MODE },
- { AD7768_MCLK_DIV_4, AD7768_DEC_RATE_128, 512, AD7768_MED_MODE },
- { AD7768_MCLK_DIV_4, AD7768_DEC_RATE_256, 1024, AD7768_MED_MODE },
- { AD7768_MCLK_DIV_4, AD7768_DEC_RATE_512, 2048, AD7768_MED_MODE },
- { AD7768_MCLK_DIV_4, AD7768_DEC_RATE_1024, 4096, AD7768_MED_MODE },
- { AD7768_MCLK_DIV_8, AD7768_DEC_RATE_1024, 8192, AD7768_MED_MODE },
- { AD7768_MCLK_DIV_16, AD7768_DEC_RATE_1024, 16384, AD7768_ECO_MODE },
+static const int ad7768_dec_rate_values[8] = {
+ 8, 16, 32, 64, 128, 256, 512, 1024,
+};
+
+/* Decimation Rate range for each filter type */
+static const int ad7768_dec_rate_range[][3] = {
+ [AD7768_FILTER_SINC5] = { 8, 8, 1024 },
+ [AD7768_FILTER_SINC3] = { 32, 32, 163840 },
+ [AD7768_FILTER_WIDEBAND] = { 32, 32, 1024 },
+ [AD7768_FILTER_SINC3_REJ60] = { 32, 32, 163840 },
+};
+
+/*
+ * The AD7768-1 supports three primary filter types:
+ * Sinc5, Sinc3, and Wideband.
+ * However, the filter register values can also encode additional parameters
+ * such as decimation rates and 60Hz rejection. This utility array separates
+ * the filter type from these parameters.
+ */
+static const int ad7768_filter_regval_to_type[] = {
+ [AD7768_FILTER_REGVAL_SINC5] = AD7768_FILTER_SINC5,
+ [AD7768_FILTER_REGVAL_SINC5_X8] = AD7768_FILTER_SINC5,
+ [AD7768_FILTER_REGVAL_SINC5_X16] = AD7768_FILTER_SINC5,
+ [AD7768_FILTER_REGVAL_SINC3] = AD7768_FILTER_SINC3,
+ [AD7768_FILTER_REGVAL_WIDEBAND] = AD7768_FILTER_WIDEBAND,
+ [AD7768_FILTER_REGVAL_SINC3_REJ60] = AD7768_FILTER_SINC3_REJ60,
+};
+
+static const char * const ad7768_filter_enum[] = {
+ [AD7768_FILTER_SINC5] = "sinc5",
+ [AD7768_FILTER_SINC3] = "sinc3",
+ [AD7768_FILTER_WIDEBAND] = "wideband",
+ [AD7768_FILTER_SINC3_REJ60] = "sinc3+rej60"
};
static const struct iio_scan_type ad7768_scan_type[] = {
@@ -183,22 +207,6 @@ static const struct iio_scan_type ad7768_scan_type[] = {
},
};
-static const struct iio_chan_spec ad7768_channels[] = {
- {
- .type = IIO_VOLTAGE,
- .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
- .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
- .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
- .info_mask_shared_by_all_available = BIT(IIO_CHAN_INFO_SAMP_FREQ),
- .indexed = 1,
- .channel = 0,
- .scan_index = 0,
- .has_ext_scan_type = 1,
- .ext_scan_type = ad7768_scan_type,
- .num_ext_scan_type = ARRAY_SIZE(ad7768_scan_type),
- },
-};
-
struct ad7768_state {
struct spi_device *spi;
struct regmap *regmap;
@@ -208,15 +216,18 @@ struct ad7768_state {
unsigned int vcm_output_sel;
struct clk *mclk;
unsigned int mclk_freq;
- unsigned int dec_rate;
+ unsigned int mclk_div;
+ unsigned int oversampling_ratio;
+ enum ad7768_filter_type filter_type;
unsigned int samp_freq;
- unsigned int samp_freq_avail[ARRAY_SIZE(ad7768_clk_config)];
+ unsigned int samp_freq_avail[ARRAY_SIZE(ad7768_mclk_div_rates)];
+ unsigned int samp_freq_avail_len;
struct completion completion;
struct iio_trigger *trig;
struct gpio_desc *gpio_sync_in;
struct gpio_desc *gpio_reset;
bool en_spi_sync;
- const char *labels[ARRAY_SIZE(ad7768_channels)];
+ const char *labels[AD7768_MAX_CHANNELS];
struct gpio_chip gpiochip;
/*
* DMA (thus cache coherency maintenance) may require the
@@ -326,11 +337,36 @@ static int ad7768_send_sync_pulse(struct ad7768_state *st)
static void ad7768_fill_samp_freq_tbl(struct ad7768_state *st)
{
- unsigned int i;
+ unsigned int i, freq_filtered, len = 0;
+
+ freq_filtered = DIV_ROUND_CLOSEST(st->mclk_freq, st->oversampling_ratio);
+ for (i = 0; i < ARRAY_SIZE(ad7768_mclk_div_rates); i++) {
+ st->samp_freq_avail[len] = DIV_ROUND_CLOSEST(freq_filtered,
+ ad7768_mclk_div_rates[i]);
+ /* Sampling frequency cannot be lower than the minimum of 50 SPS */
+ if (st->samp_freq_avail[len] >= 50)
+ len++;
+ }
+
+ st->samp_freq_avail_len = len;
+}
+
+static int ad7768_set_mclk_div(struct ad7768_state *st, unsigned int mclk_div)
+{
+ unsigned int mclk_div_value;
+
+ mclk_div_value = AD7768_PWR_MCLK_DIV(mclk_div);
+ /*
+ * Set power mode based on mclk_div value.
+ * ECO_MODE is only recommended for MCLK_DIV 16
+ */
+ mclk_div_value |= mclk_div > AD7768_MCLK_DIV_16 ?
+ AD7768_PWR_PWRMODE(AD7768_FAST_MODE) :
+ AD7768_PWR_PWRMODE(AD7768_ECO_MODE);
- for (i = 0; i < ARRAY_SIZE(ad7768_clk_config); i++)
- st->samp_freq_avail[i] = DIV_ROUND_CLOSEST(st->mclk_freq,
- ad7768_clk_config[i].clk_div);
+ return regmap_update_bits(st->regmap, AD7768_REG_POWER_CLOCK,
+ AD7768_PWR_MCLK_DIV_MSK | AD7768_PWR_PWRMODE_MSK,
+ mclk_div_value);
}
static int ad7768_set_mode(struct ad7768_state *st,
@@ -366,7 +402,7 @@ static int ad7768_scan_direct(struct iio_dev *indio_dev)
* register provides 24-bit data, the precision is reduced by
* right-shifting the read value by 8 bits.
*/
- if (st->dec_rate == 8)
+ if (st->oversampling_ratio == 8)
readval >>= 8;
/*
@@ -413,22 +449,110 @@ static int ad7768_reg_access(struct iio_dev *indio_dev,
return ret;
}
-static int ad7768_set_dig_fil(struct ad7768_state *st,
- enum ad7768_dec_rate dec_rate)
+static int ad7768_set_sinc3_dec_rate(struct ad7768_state *st,
+ unsigned int dec_rate)
{
- unsigned int mode;
+ unsigned int max_dec_rate;
+ u8 dec_rate_reg[2];
+ u16 regval;
int ret;
- if (dec_rate == AD7768_DEC_RATE_8 || dec_rate == AD7768_DEC_RATE_16)
- mode = AD7768_DIG_FIL_FIL(dec_rate);
- else
- mode = AD7768_DIG_FIL_DEC_RATE(dec_rate);
+ /*
+ * Maximum dec_rate is limited by the MCLK_DIV value and by the ODR.
+ * The edge case is for MCLK_DIV = 2, ODR = 50 SPS.
+ * max_dec_rate <= MCLK / (2 * 50)
+ */
+ max_dec_rate = st->mclk_freq / 100;
+ dec_rate = clamp(dec_rate, 32, max_dec_rate);
+ /*
+ * Calculate the equivalent value to sinc3 decimation ratio
+ * to be written on the SINC3_DEC_RATE register:
+ * Value = (DEC_RATE / 32) -1
+ */
+ dec_rate = DIV_ROUND_UP(dec_rate, 32) - 1;
- ret = regmap_write(st->regmap, AD7768_REG_DIGITAL_FILTER, mode);
- if (ret < 0)
+ /*
+ * The SINC3_DEC_RATE value is a 13-bit value split across two
+ * registers: MSB [12:8] and LSB [7:0]. Prepare the 13-bit value using
+ * FIELD_PREP and store it with the right endianness in dec_rate_reg.
+ */
+ regval = FIELD_PREP(GENMASK(12, 0), dec_rate);
+ put_unaligned_be16(regval, dec_rate_reg);
+ ret = regmap_bulk_write(st->regmap, AD7768_REG_SINC3_DEC_RATE_MSB,
+ dec_rate_reg, 2);
+ if (ret)
return ret;
- /* A sync-in pulse is required every time the filter dec rate changes */
+ st->oversampling_ratio = (dec_rate + 1) * 32;
+
+ return 0;
+}
+
+static int ad7768_configure_dig_fil(struct iio_dev *dev,
+ enum ad7768_filter_type filter_type,
+ unsigned int dec_rate)
+{
+ struct ad7768_state *st = iio_priv(dev);
+ unsigned int dec_rate_idx, dig_filter_regval;
+ int ret;
+
+ switch (filter_type) {
+ case AD7768_FILTER_SINC3:
+ dig_filter_regval = AD7768_DIG_FIL_FIL(AD7768_FILTER_REGVAL_SINC3);
+ break;
+ case AD7768_FILTER_SINC3_REJ60:
+ dig_filter_regval = AD7768_DIG_FIL_FIL(AD7768_FILTER_REGVAL_SINC3) |
+ AD7768_DIG_FIL_EN_60HZ_REJ;
+ break;
+ case AD7768_FILTER_WIDEBAND:
+ /* Skip decimations 8 and 16, not supported by the wideband filter */
+ dec_rate_idx = find_closest(dec_rate, &ad7768_dec_rate_values[2],
+ ARRAY_SIZE(ad7768_dec_rate_values) - 2);
+ dig_filter_regval = AD7768_DIG_FIL_FIL(AD7768_FILTER_REGVAL_WIDEBAND) |
+ AD7768_DIG_FIL_DEC_RATE(dec_rate_idx);
+ /* Correct the index offset */
+ dec_rate_idx += 2;
+ break;
+ case AD7768_FILTER_SINC5:
+ dec_rate_idx = find_closest(dec_rate, ad7768_dec_rate_values,
+ ARRAY_SIZE(ad7768_dec_rate_values));
+
+ /*
+ * Decimations 8 (idx 0) and 16 (idx 1) are set in the
+ * FILTER[6:4] field. The other decimations are set in the
+ * DEC_RATE[2:0] field, and the idx needs to be offsetted by two.
+ */
+ if (dec_rate_idx == 0)
+ dig_filter_regval = AD7768_DIG_FIL_FIL(AD7768_FILTER_REGVAL_SINC5_X8);
+ else if (dec_rate_idx == 1)
+ dig_filter_regval = AD7768_DIG_FIL_FIL(AD7768_FILTER_REGVAL_SINC5_X16);
+ else
+ dig_filter_regval = AD7768_DIG_FIL_FIL(AD7768_FILTER_REGVAL_SINC5) |
+ AD7768_DIG_FIL_DEC_RATE(dec_rate_idx - 2);
+ break;
+ }
+
+ ret = regmap_write(st->regmap, AD7768_REG_DIGITAL_FILTER, dig_filter_regval);
+ if (ret)
+ return ret;
+
+ st->filter_type = filter_type;
+ /*
+ * The decimation for SINC3 filters are configured in different
+ * registers.
+ */
+ if (filter_type == AD7768_FILTER_SINC3 ||
+ filter_type == AD7768_FILTER_SINC3_REJ60) {
+ ret = ad7768_set_sinc3_dec_rate(st, dec_rate);
+ if (ret)
+ return ret;
+ } else {
+ st->oversampling_ratio = ad7768_dec_rate_values[dec_rate_idx];
+ }
+
+ ad7768_fill_samp_freq_tbl(st);
+
+ /* A sync-in pulse is required after every configuration change */
return ad7768_send_sync_pulse(st);
}
@@ -551,45 +675,102 @@ static int ad7768_gpio_init(struct iio_dev *indio_dev)
static int ad7768_set_freq(struct ad7768_state *st,
unsigned int freq)
{
- unsigned int diff_new, diff_old, pwr_mode, i, idx;
+ unsigned int diff_new, diff_old, i, idx;
int res, ret;
+ freq = clamp(freq, 50, 1024000);
diff_old = U32_MAX;
idx = 0;
- res = DIV_ROUND_CLOSEST(st->mclk_freq, freq);
+ if (freq == 0)
+ return -EINVAL;
+
+ res = DIV_ROUND_CLOSEST(st->mclk_freq, freq * st->oversampling_ratio);
/* Find the closest match for the desired sampling frequency */
- for (i = 0; i < ARRAY_SIZE(ad7768_clk_config); i++) {
- diff_new = abs(res - ad7768_clk_config[i].clk_div);
+ for (i = 0; i < ARRAY_SIZE(ad7768_mclk_div_rates); i++) {
+ diff_new = abs(res - ad7768_mclk_div_rates[i]);
if (diff_new < diff_old) {
diff_old = diff_new;
idx = i;
}
}
- /*
- * Set both the mclk_div and pwrmode with a single write to the
- * POWER_CLOCK register
- */
- pwr_mode = AD7768_PWR_MCLK_DIV(ad7768_clk_config[idx].mclk_div) |
- AD7768_PWR_PWRMODE(ad7768_clk_config[idx].pwrmode);
- ret = regmap_write(st->regmap, AD7768_REG_POWER_CLOCK, pwr_mode);
- if (ret < 0)
+ /* Set both the mclk_div and pwrmode */
+ ret = ad7768_set_mclk_div(st, idx);
+ if (ret)
return ret;
- ret = ad7768_set_dig_fil(st, ad7768_clk_config[idx].dec_rate);
- if (ret < 0)
+ st->samp_freq = DIV_ROUND_CLOSEST(st->mclk_freq,
+ ad7768_mclk_div_rates[idx] * st->oversampling_ratio);
+
+ /* A sync-in pulse is required after every configuration change */
+ return ad7768_send_sync_pulse(st);
+}
+
+static int ad7768_set_filter_type_attr(struct iio_dev *dev,
+ const struct iio_chan_spec *chan,
+ unsigned int filter)
+{
+ struct ad7768_state *st = iio_priv(dev);
+ int ret;
+
+ ret = ad7768_configure_dig_fil(dev, filter, st->oversampling_ratio);
+ if (ret)
return ret;
- st->dec_rate = ad7768_clk_config[idx].clk_div /
- ad7768_mclk_div_rates[ad7768_clk_config[idx].mclk_div];
- st->samp_freq = DIV_ROUND_CLOSEST(st->mclk_freq,
- ad7768_clk_config[idx].clk_div);
+ /* Update sampling frequency */
+ return ad7768_set_freq(st, st->samp_freq);
+}
- return 0;
+static int ad7768_get_filter_type_attr(struct iio_dev *dev,
+ const struct iio_chan_spec *chan)
+{
+ struct ad7768_state *st = iio_priv(dev);
+ int ret;
+ unsigned int mode, mask;
+
+ ret = regmap_read(st->regmap, AD7768_REG_DIGITAL_FILTER, &mode);
+ if (ret)
+ return ret;
+
+ mask = AD7768_DIG_FIL_EN_60HZ_REJ | AD7768_DIG_FIL_FIL_MSK;
+ /* From the register value, get the corresponding filter type */
+ return ad7768_filter_regval_to_type[FIELD_GET(mask, mode)];
}
+static const struct iio_enum ad7768_filter_type_iio_enum = {
+ .items = ad7768_filter_enum,
+ .num_items = ARRAY_SIZE(ad7768_filter_enum),
+ .set = ad7768_set_filter_type_attr,
+ .get = ad7768_get_filter_type_attr,
+};
+
+static const struct iio_chan_spec_ext_info ad7768_ext_info[] = {
+ IIO_ENUM("filter_type", IIO_SHARED_BY_ALL, &ad7768_filter_type_iio_enum),
+ IIO_ENUM_AVAILABLE("filter_type", IIO_SHARED_BY_ALL, &ad7768_filter_type_iio_enum),
+ { }
+};
+
+static const struct iio_chan_spec ad7768_channels[] = {
+ {
+ .type = IIO_VOLTAGE,
+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
+ .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) |
+ BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO),
+ .info_mask_shared_by_type_available = BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO),
+ .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
+ .info_mask_shared_by_all_available = BIT(IIO_CHAN_INFO_SAMP_FREQ),
+ .ext_info = ad7768_ext_info,
+ .indexed = 1,
+ .channel = 0,
+ .scan_index = 0,
+ .has_ext_scan_type = 1,
+ .ext_scan_type = ad7768_scan_type,
+ .num_ext_scan_type = ARRAY_SIZE(ad7768_scan_type),
+ },
+};
+
static int ad7768_read_raw(struct iio_dev *indio_dev,
struct iio_chan_spec const *chan,
int *val, int *val2, long info)
@@ -629,6 +810,11 @@ static int ad7768_read_raw(struct iio_dev *indio_dev,
case IIO_CHAN_INFO_SAMP_FREQ:
*val = st->samp_freq;
+ return IIO_VAL_INT;
+
+ case IIO_CHAN_INFO_OVERSAMPLING_RATIO:
+ *val = st->oversampling_ratio;
+
return IIO_VAL_INT;
}
@@ -643,9 +829,13 @@ static int ad7768_read_avail(struct iio_dev *indio_dev,
struct ad7768_state *st = iio_priv(indio_dev);
switch (info) {
+ case IIO_CHAN_INFO_OVERSAMPLING_RATIO:
+ *vals = (int *)ad7768_dec_rate_range[st->filter_type];
+ *type = IIO_VAL_INT;
+ return IIO_AVAIL_RANGE;
case IIO_CHAN_INFO_SAMP_FREQ:
*vals = (int *)st->samp_freq_avail;
- *length = ARRAY_SIZE(ad7768_clk_config);
+ *length = st->samp_freq_avail_len;
*type = IIO_VAL_INT;
return IIO_AVAIL_LIST;
default:
@@ -653,20 +843,44 @@ static int ad7768_read_avail(struct iio_dev *indio_dev,
}
}
-static int ad7768_write_raw(struct iio_dev *indio_dev,
- struct iio_chan_spec const *chan,
- int val, int val2, long info)
+static int __ad7768_write_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int val, int val2, long info)
{
struct ad7768_state *st = iio_priv(indio_dev);
+ int ret;
switch (info) {
case IIO_CHAN_INFO_SAMP_FREQ:
return ad7768_set_freq(st, val);
+
+ case IIO_CHAN_INFO_OVERSAMPLING_RATIO:
+ ret = ad7768_configure_dig_fil(indio_dev, st->filter_type, val);
+ if (ret)
+ return ret;
+
+ /* Update sampling frequency */
+ return ad7768_set_freq(st, st->samp_freq);
default:
return -EINVAL;
}
}
+static int ad7768_write_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int val, int val2, long info)
+{
+ int ret;
+
+ if (!iio_device_claim_direct(indio_dev))
+ return -EBUSY;
+
+ ret = __ad7768_write_raw(indio_dev, chan, val, val2, info);
+ iio_device_release_direct(indio_dev);
+
+ return ret;
+}
+
static int ad7768_read_label(struct iio_dev *indio_dev,
const struct iio_chan_spec *chan, char *label)
{
@@ -680,7 +894,7 @@ static int ad7768_get_current_scan_type(const struct iio_dev *indio_dev,
{
struct ad7768_state *st = iio_priv(indio_dev);
- return st->dec_rate == 8 ? AD7768_SCAN_TYPE_HIGH_SPEED :
+ return st->oversampling_ratio == 8 ? AD7768_SCAN_TYPE_HIGH_SPEED :
AD7768_SCAN_TYPE_NORMAL;
}
@@ -811,6 +1025,14 @@ static int ad7768_setup(struct iio_dev *indio_dev)
return ret;
}
+ /*
+ * Set Default Digital Filter configuration:
+ * SINC5 filter with x32 Decimation rate
+ */
+ ret = ad7768_configure_dig_fil(indio_dev, AD7768_FILTER_SINC5, 32);
+ if (ret)
+ return ret;
+
/* Set the default sampling frequency to 32000 kSPS */
return ad7768_set_freq(st, 32000);
}
@@ -1145,7 +1367,6 @@ static int ad7768_probe(struct spi_device *spi)
return PTR_ERR(st->mclk);
st->mclk_freq = clk_get_rate(st->mclk);
- ad7768_fill_samp_freq_tbl(st);
indio_dev->channels = ad7768_channels;
indio_dev->num_channels = ARRAY_SIZE(ad7768_channels);
--
2.34.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v7 12/12] iio: adc: ad7768-1: add low pass -3dB cutoff attribute
2025-05-08 17:02 [PATCH v7 00/12] iio: adc: ad7768-1: Add features, improvements, and fixes Jonathan Santos
` (10 preceding siblings ...)
2025-05-08 17:05 ` [PATCH v7 11/12] iio: adc: ad7768-1: add filter type and oversampling ratio attributes Jonathan Santos
@ 2025-05-08 17:05 ` Jonathan Santos
2025-05-11 15:11 ` [PATCH v7 00/12] iio: adc: ad7768-1: Add features, improvements, and fixes Jonathan Cameron
12 siblings, 0 replies; 27+ messages in thread
From: Jonathan Santos @ 2025-05-08 17:05 UTC (permalink / raw)
To: linux-iio, devicetree, linux-kernel, linux-gpio
Cc: Jonathan Santos, andy, nuno.sa, Michael.Hennerich,
marcelo.schmitt, jic23, robh, krzk+dt, conor+dt, marcelo.schmitt1,
linus.walleij, brgl, lgirdwood, broonie, jonath4nns, dlechner
Ad7768-1 has a different -3db frequency multiplier depending on
the filter type configured. The cutoff frequency also varies according
to the current ODR.
Add a readonly low pass -3dB frequency cutoff attribute to clarify to
the user which bandwidth is being allowed depending on the filter
configurations.
Reviewed-by: Marcelo Schmitt <marcelo.schmitt@analog.com>
Reviewed-by: David Lechner <dlechner@baylibre.com>
Signed-off-by: Jonathan Santos <Jonathan.Santos@analog.com>
---
v7 Changes:
* None
v6 Changes:
* None
v5 Changes:
* None
v4 Changes:
* None
v3 Changes:
* None
v2 Changes:
* New patch in v2.
---
drivers/iio/adc/ad7768-1.c | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/adc/ad7768-1.c b/drivers/iio/adc/ad7768-1.c
index 28998cb02761..335612bce3bd 100644
--- a/drivers/iio/adc/ad7768-1.c
+++ b/drivers/iio/adc/ad7768-1.c
@@ -152,6 +152,17 @@ enum ad7768_scan_type {
AD7768_SCAN_TYPE_HIGH_SPEED,
};
+/*
+ * -3dB cutoff frequency multipliers (relative to ODR) for
+ * each filter type. Values are multiplied by 1000.
+ */
+static const int ad7768_filter_3db_odr_multiplier[] = {
+ [AD7768_FILTER_SINC5] = 204,
+ [AD7768_FILTER_SINC3] = 262,
+ [AD7768_FILTER_SINC3_REJ60] = 262,
+ [AD7768_FILTER_WIDEBAND] = 433,
+};
+
static const int ad7768_mclk_div_rates[] = {
16, 8, 4, 2,
};
@@ -757,7 +768,8 @@ static const struct iio_chan_spec ad7768_channels[] = {
.type = IIO_VOLTAGE,
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) |
- BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO),
+ BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO) |
+ BIT(IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY),
.info_mask_shared_by_type_available = BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO),
.info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
.info_mask_shared_by_all_available = BIT(IIO_CHAN_INFO_SAMP_FREQ),
@@ -777,7 +789,7 @@ static int ad7768_read_raw(struct iio_dev *indio_dev,
{
struct ad7768_state *st = iio_priv(indio_dev);
const struct iio_scan_type *scan_type;
- int scale_uv, ret;
+ int scale_uv, ret, temp;
scan_type = iio_get_current_scan_type(indio_dev, chan);
if (IS_ERR(scan_type))
@@ -815,6 +827,12 @@ static int ad7768_read_raw(struct iio_dev *indio_dev,
case IIO_CHAN_INFO_OVERSAMPLING_RATIO:
*val = st->oversampling_ratio;
+ return IIO_VAL_INT;
+
+ case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY:
+ temp = st->samp_freq * ad7768_filter_3db_odr_multiplier[st->filter_type];
+ *val = DIV_ROUND_CLOSEST(temp, 1000);
+
return IIO_VAL_INT;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* Re: [PATCH v7 02/12] dt-bindings: trigger-source: add generic GPIO trigger source
2025-05-08 17:03 ` [PATCH v7 02/12] dt-bindings: trigger-source: add generic GPIO trigger source Jonathan Santos
@ 2025-05-08 17:56 ` David Lechner
2025-05-09 16:11 ` Conor Dooley
2025-05-13 13:24 ` Linus Walleij
2 siblings, 0 replies; 27+ messages in thread
From: David Lechner @ 2025-05-08 17:56 UTC (permalink / raw)
To: Jonathan Santos, linux-iio, devicetree, linux-kernel, linux-gpio
Cc: andy, nuno.sa, Michael.Hennerich, marcelo.schmitt, jic23, robh,
krzk+dt, conor+dt, marcelo.schmitt1, linus.walleij, brgl,
lgirdwood, broonie, jonath4nns
On 5/8/25 12:03 PM, Jonathan Santos wrote:
> Inspired by pwm-trigger, create a new binding for using a GPIO
> line as a trigger source.
>
> Link: https://lore.kernel.org/linux-iio/20250207-dlech-mainline-spi-engine-offload-2-v8-3-e48a489be48c@baylibre.com/
> Reviewed-by: David Lechner <dlechner@baylibre.com>
> Signed-off-by: Jonathan Santos <Jonathan.Santos@analog.com>
> ---
> v7 Changes:
> * File added to MAINTAINERS and Made trigger source generic to include both pwm and gpio.
>
> v6 Changes:
> * Changed description.
> * Fixed typos and replaced GPIO pin with GPIO line.
> * Added link reference for pwm-trigger.
>
> v5 Changes:
> * New patch in v5.
> ---
> .../bindings/trigger-source/gpio-trigger.yaml | 40 +++++++++++++++++++
> MAINTAINERS | 3 +-
> 2 files changed, 42 insertions(+), 1 deletion(-)
> create mode 100644 Documentation/devicetree/bindings/trigger-source/gpio-trigger.yaml
>
> diff --git a/Documentation/devicetree/bindings/trigger-source/gpio-trigger.yaml b/Documentation/devicetree/bindings/trigger-source/gpio-trigger.yaml
> new file mode 100644
> index 000000000000..1331d153ee82
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/trigger-source/gpio-trigger.yaml
> @@ -0,0 +1,40 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/trigger-source/gpio-trigger.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Generic trigger source using GPIO
> +
> +description: A GPIO used as a trigger source.
> +
> +maintainers:
> + - Jonathan Santos <Jonathan.Santos@analog.com>
> +
> +properties:
> + compatible:
> + const: gpio-trigger
> +
> + '#trigger-source-cells':
> + const: 0
> +
> + gpios:
> + maxItems: 1
> + description: GPIO to be used as a trigger source.
> +
> +required:
> + - compatible
> + - '#trigger-source-cells'
> + - gpios
> +
> +additionalProperties: false
> +
> +examples:
> + - |
> + #include <dt-bindings/gpio/gpio.h>
> +
> + trigger {
> + compatible = "gpio-trigger";
> + #trigger-source-cells = <0>;
> + gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
> + };
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 01079a189c93..9b2e9a9dd8bc 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -24569,9 +24569,10 @@ W: https://github.com/srcres258/linux-doc
> T: git git://github.com/srcres258/linux-doc.git doc-zh-tw
> F: Documentation/translations/zh_TW/
>
> -TRIGGER SOURCE - PWM
> +TRIGGER SOURCE
> M: David Lechner <dlechner@baylibre.com>
> S: Maintained
> +F: Documentation/devicetree/bindings/trigger-source/gpio-trigger.yaml
> F: Documentation/devicetree/bindings/trigger-source/pwm-trigger.yaml
>
> TRUSTED SECURITY MODULE (TSM) ATTESTATION REPORTS
Acked-by: David Lechner <dlechner@baylibre.com>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v7 08/12] iio: adc: ad7768-1: add multiple scan types to support 16-bits mode
2025-05-08 17:04 ` [PATCH v7 08/12] iio: adc: ad7768-1: add multiple scan types to support 16-bits mode Jonathan Santos
@ 2025-05-08 18:01 ` David Lechner
2025-05-08 18:03 ` David Lechner
1 sibling, 0 replies; 27+ messages in thread
From: David Lechner @ 2025-05-08 18:01 UTC (permalink / raw)
To: Jonathan Santos, linux-iio, devicetree, linux-kernel, linux-gpio
Cc: andy, nuno.sa, Michael.Hennerich, marcelo.schmitt, jic23, robh,
krzk+dt, conor+dt, marcelo.schmitt1, linus.walleij, brgl,
lgirdwood, broonie, jonath4nns, David Lechner
On 5/8/25 12:04 PM, Jonathan Santos wrote:
> When the device is configured to decimation x8, only possible in the
> sinc5 filter, output data is reduced to 16-bits in order to support
> 1 MHz of sampling frequency due to clock limitation.
>
> Use multiple scan types feature to enable the driver to switch
> scan type at runtime, making it possible to support both 24-bit and
> 16-bit resolution.
>
> Reviewed-by: Marcelo Schmitt <marcelo.schmitt@analog.com>
> Reviewed-by: David Lechner <dlechner@baylire.com>
> Signed-off-by: Jonathan Santos <Jonathan.Santos@analog.com>
> ---
> v7 Changes:
> * Added TODO comment to use spi_bpw_to_bytes() helper function.
> * Minor commit description changes.
>
...
> @@ -675,9 +723,16 @@ static irqreturn_t ad7768_trigger_handler(int irq, void *p)
> struct iio_poll_func *pf = p;
> struct iio_dev *indio_dev = pf->indio_dev;
> struct ad7768_state *st = iio_priv(indio_dev);
> + const struct iio_scan_type *scan_type;
> int ret;
>
> - ret = spi_read(st->spi, &st->data.scan.chan, 3);
> + scan_type = iio_get_current_scan_type(indio_dev, &indio_dev->channels[0]);
> + if (IS_ERR(scan_type))
> + goto out;
> +
> + /* TODO: Use spi_bpw_to_bytes() helper function. */
spi_bpw_to_bytes() is to get buffer size when setting bits_per_word. It doesn't
apply to spi_read(). So we should drop this comment.
> + ret = spi_read(st->spi, &st->data.scan.chan,
> + BITS_TO_BYTES(scan_type->realbits));
If we replaced BITS_TO_BYTES() with spi_bpw_to_bytes(), then it would read 4
bytes instead of 3 when realbits == 24, which isn't what we want.
> if (ret < 0)
> goto out;
>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v7 08/12] iio: adc: ad7768-1: add multiple scan types to support 16-bits mode
2025-05-08 17:04 ` [PATCH v7 08/12] iio: adc: ad7768-1: add multiple scan types to support 16-bits mode Jonathan Santos
2025-05-08 18:01 ` David Lechner
@ 2025-05-08 18:03 ` David Lechner
1 sibling, 0 replies; 27+ messages in thread
From: David Lechner @ 2025-05-08 18:03 UTC (permalink / raw)
To: Jonathan Santos, linux-iio, devicetree, linux-kernel, linux-gpio
Cc: andy, nuno.sa, Michael.Hennerich, marcelo.schmitt, jic23, robh,
krzk+dt, conor+dt, marcelo.schmitt1, linus.walleij, brgl,
lgirdwood, broonie, jonath4nns, David Lechner
On 5/8/25 12:04 PM, Jonathan Santos wrote:
> When the device is configured to decimation x8, only possible in the
> sinc5 filter, output data is reduced to 16-bits in order to support
> 1 MHz of sampling frequency due to clock limitation.
>
> Use multiple scan types feature to enable the driver to switch
> scan type at runtime, making it possible to support both 24-bit and
> 16-bit resolution.
>
> Reviewed-by: Marcelo Schmitt <marcelo.schmitt@analog.com>
> Reviewed-by: David Lechner <dlechner@baylire.com>
Typo in my email: baylibre.com
> Signed-off-by: Jonathan Santos <Jonathan.Santos@analog.com>
> ---
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v7 09/12] iio: adc: ad7768-1: add support for Synchronization over SPI
2025-05-08 17:04 ` [PATCH v7 09/12] iio: adc: ad7768-1: add support for Synchronization over SPI Jonathan Santos
@ 2025-05-08 18:45 ` David Lechner
0 siblings, 0 replies; 27+ messages in thread
From: David Lechner @ 2025-05-08 18:45 UTC (permalink / raw)
To: Jonathan Santos, linux-iio, devicetree, linux-kernel, linux-gpio
Cc: andy, nuno.sa, Michael.Hennerich, marcelo.schmitt, jic23, robh,
krzk+dt, conor+dt, marcelo.schmitt1, linus.walleij, brgl,
lgirdwood, broonie, jonath4nns
On 5/8/25 12:04 PM, Jonathan Santos wrote:
> The synchronization method using GPIO requires the generated pulse to be
> truly synchronous with the base MCLK signal. When it is not possible to
> do that in hardware, the datasheet recommends using synchronization over
> SPI, where the generated pulse is already synchronous with MCLK. This
> requires the SYNC_OUT pin to be connected to the SYNC_IN pin.
>
> Use trigger-sources property to enable device synchronization over SPI
> and multi-device synchronization while replacing sync-in-gpios property.
>
> Signed-off-by: Jonathan Santos <Jonathan.Santos@analog.com>
> ---
...
> +static int ad7768_trigger_sources_get_sync(struct device *dev,
> + struct ad7768_state *st)
> +{
> + struct fwnode_reference_args args;
> + struct fwnode_handle *fwnode = dev_fwnode(dev);
> + int ret;
> +
> + /*
> + * The AD7768-1 allows two primary methods for driving the SYNC_IN pin
> + * to synchronize one or more devices:
> + * 1. Using an external GPIO.
> + * 2. Using a SPI command, where the SYNC_OUT pin generates a
> + * synchronization pulse that drives the SYNC_IN pin.
> + */
> + if (!fwnode_property_present(fwnode, "trigger-sources")) {
> + /*
> + * In the absence of trigger-sources property, enable self
> + * synchronization over SPI (SYNC_OUT).
> + */
> + st->en_spi_sync = true;
> + return 0;
> + }
> +
> + ret = fwnode_property_get_reference_args(fwnode,
> + "trigger-sources",
> + "#trigger-source-cells",
> + 0,
> + AD7768_TRIGGER_SOURCE_SYNC_IDX,
> + &args);
> + if (ret)
> + return ret;
> +
> + fwnode = args.fwnode;
> + /*
> + * First, try getting the GPIO trigger source and fallback to
> + * synchronization over SPI in case of failure.
> + */
> + st->gpio_sync_in = ad7768_trigger_source_get_gpio(dev, fwnode);
> + if (!IS_ERR(st->gpio_sync_in))
> + goto out_put_node;
I think we want to return the error in some cases here, e.g. deferred probe
so rather:
st->gpio_sync_in = ad7768_trigger_source_get_gpio(dev, fwnode);
ret = PTR_ERR_OR_ZERO(st->gpio_sync_in);
if (ret != -EINVAL)
goto out_put_node;
/*
* EINVAL means that the trigger was not a gpio trigger and we should
* try something else.
*/
This is assuming devm_fwnode_gpiod_get_index() doesn't return EINVAL which
could be confused as the return value for ad7768_trigger_source_get_gpio().
Or just inline ad7768_trigger_source_get_gpio() here and avoid that possibility.
> +
> + /*
> + * TODO: Support the other cases when we have a trigger subsystem to
> + * reliably handle other types of devices as trigger sources.
> + *
> + * For now, return an error message. For self triggering, omit the
> + * trigger-sources property.
> + */
> + ret = dev_err_probe(dev, -EOPNOTSUPP, "Invalid synchronization trigger source\n");
> +
> +out_put_node:
> + fwnode_handle_put(args.fwnode);
> + return ret;
> +}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v7 01/12] iio: adc: ad7768-1: reorganize driver headers
2025-05-08 17:03 ` [PATCH v7 01/12] iio: adc: ad7768-1: reorganize driver headers Jonathan Santos
@ 2025-05-08 19:22 ` Andy Shevchenko
2025-05-11 15:05 ` Jonathan Cameron
0 siblings, 1 reply; 27+ messages in thread
From: Andy Shevchenko @ 2025-05-08 19:22 UTC (permalink / raw)
To: Jonathan Santos
Cc: linux-iio, devicetree, linux-kernel, linux-gpio, nuno.sa,
Michael.Hennerich, marcelo.schmitt, jic23, robh, krzk+dt,
conor+dt, marcelo.schmitt1, linus.walleij, brgl, lgirdwood,
broonie, jonath4nns, dlechner
On Thu, May 08, 2025 at 02:03:04PM -0300, Jonathan Santos wrote:
> Remove kernel.h since it adds a lot of unnecessary dependencies.
> Add specific headers to ensure all functions and macros used in the driver
> are directly declared.
Suggested-by: ?
Nevertheless,
Reviewed-by: Andy Shevchenko <andy@kernel.org>
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v7 10/12] iio: adc: ad7768-1: replace manual attribute declaration
2025-05-08 17:05 ` [PATCH v7 10/12] iio: adc: ad7768-1: replace manual attribute declaration Jonathan Santos
@ 2025-05-08 19:31 ` Andy Shevchenko
0 siblings, 0 replies; 27+ messages in thread
From: Andy Shevchenko @ 2025-05-08 19:31 UTC (permalink / raw)
To: Jonathan Santos
Cc: linux-iio, devicetree, linux-kernel, linux-gpio, nuno.sa,
Michael.Hennerich, marcelo.schmitt, jic23, robh, krzk+dt,
conor+dt, marcelo.schmitt1, linus.walleij, brgl, lgirdwood,
broonie, jonath4nns, dlechner
On Thu, May 08, 2025 at 02:05:13PM -0300, Jonathan Santos wrote:
> Use read_avail callback from struct iio_info to replace the manual
> declaration of sampling_frequency_available attribute.
...
> +static void ad7768_fill_samp_freq_tbl(struct ad7768_state *st)
> +{
> + unsigned int i;
> +
> + for (i = 0; i < ARRAY_SIZE(ad7768_clk_config); i++)
> + st->samp_freq_avail[i] = DIV_ROUND_CLOSEST(st->mclk_freq,
> + ad7768_clk_config[i].clk_div);
st->samp_freq_avail[i] =
DIV_ROUND_CLOSEST(st->mclk_freq, ad7768_clk_config[i].clk_div);
is slightly better formatting for this.
> +}
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v7 11/12] iio: adc: ad7768-1: add filter type and oversampling ratio attributes
2025-05-08 17:05 ` [PATCH v7 11/12] iio: adc: ad7768-1: add filter type and oversampling ratio attributes Jonathan Santos
@ 2025-05-08 19:39 ` Andy Shevchenko
0 siblings, 0 replies; 27+ messages in thread
From: Andy Shevchenko @ 2025-05-08 19:39 UTC (permalink / raw)
To: Jonathan Santos
Cc: linux-iio, devicetree, linux-kernel, linux-gpio, nuno.sa,
Michael.Hennerich, marcelo.schmitt, jic23, robh, krzk+dt,
conor+dt, marcelo.schmitt1, linus.walleij, brgl, lgirdwood,
broonie, jonath4nns, dlechner, Pop Paul
On Thu, May 08, 2025 at 02:05:26PM -0300, Jonathan Santos wrote:
> Separate filter type and decimation rate from the sampling frequency
> attribute. The new filter type attribute enables sinc3, sinc3+rej60
> and wideband filters, which were previously unavailable.
>
> Previously, combining decimation and MCLK divider in the sampling
> frequency obscured performance trade-offs. Lower MCLK divider
> settings increase power usage, while lower decimation rates reduce
> precision by decreasing averaging. By creating an oversampling
> attribute, which controls the decimation, users gain finer control
> over performance.
>
> The addition of those attributes allows a wider range of sampling
> frequencies and more access to the device features. Sampling frequency
> table is updated after every digital filter parameter change.
>
> Changes in the sampling frequency are not allowed anymore while in
> buffered mode.
...
> static void ad7768_fill_samp_freq_tbl(struct ad7768_state *st)
> {
> - unsigned int i;
> + unsigned int i, freq_filtered, len = 0;
> +
> + freq_filtered = DIV_ROUND_CLOSEST(st->mclk_freq, st->oversampling_ratio);
> + for (i = 0; i < ARRAY_SIZE(ad7768_mclk_div_rates); i++) {
> + st->samp_freq_avail[len] = DIV_ROUND_CLOSEST(freq_filtered,
> + ad7768_mclk_div_rates[i]);
Same comment as per previous patch.
> + /* Sampling frequency cannot be lower than the minimum of 50 SPS */
> + if (st->samp_freq_avail[len] >= 50)
> + len++;
Actually I would rather see the assignment once.
... samp_freq_avail;
for (i = 0; i < ARRAY_SIZE(ad7768_mclk_div_rates); i++) {
/* Sampling frequency cannot be lower than the minimum of 50 SPS */
samp_freq_avail = DIV_ROUND_CLOSEST(freq_filtered, ad7768_mclk_div_rates[i]);
if (samp_freq_avail < 50)
continue;
st->samp_freq_avail[len++] = samp_freq_avail;
}
> + }
> +
> + st->samp_freq_avail_len = len;
> +}
...
> + res = DIV_ROUND_CLOSEST(st->mclk_freq, freq * st->oversampling_ratio);
>
> /* Find the closest match for the desired sampling frequency */
> + for (i = 0; i < ARRAY_SIZE(ad7768_mclk_div_rates); i++) {
> + diff_new = abs(res - ad7768_mclk_div_rates[i]);
> if (diff_new < diff_old) {
> diff_old = diff_new;
> idx = i;
> }
> }
Hmm... Wasn't the point to include util_macros.h to replace the above?
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v7 02/12] dt-bindings: trigger-source: add generic GPIO trigger source
2025-05-08 17:03 ` [PATCH v7 02/12] dt-bindings: trigger-source: add generic GPIO trigger source Jonathan Santos
2025-05-08 17:56 ` David Lechner
@ 2025-05-09 16:11 ` Conor Dooley
2025-05-13 13:24 ` Linus Walleij
2 siblings, 0 replies; 27+ messages in thread
From: Conor Dooley @ 2025-05-09 16:11 UTC (permalink / raw)
To: Jonathan Santos
Cc: linux-iio, devicetree, linux-kernel, linux-gpio, andy, nuno.sa,
Michael.Hennerich, marcelo.schmitt, jic23, robh, krzk+dt,
conor+dt, marcelo.schmitt1, linus.walleij, brgl, lgirdwood,
broonie, jonath4nns, dlechner
[-- Attachment #1: Type: text/plain, Size: 457 bytes --]
On Thu, May 08, 2025 at 02:03:17PM -0300, Jonathan Santos wrote:
> Inspired by pwm-trigger, create a new binding for using a GPIO
> line as a trigger source.
>
> Link: https://lore.kernel.org/linux-iio/20250207-dlech-mainline-spi-engine-offload-2-v8-3-e48a489be48c@baylibre.com/
> Reviewed-by: David Lechner <dlechner@baylibre.com>
> Signed-off-by: Jonathan Santos <Jonathan.Santos@analog.com>
Acked-by: Conor Dooley <conor.dooley@microchip.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v7 03/12] dt-bindings: iio: adc: ad7768-1: add trigger-sources property
2025-05-08 17:03 ` [PATCH v7 03/12] dt-bindings: iio: adc: ad7768-1: add trigger-sources property Jonathan Santos
@ 2025-05-09 16:12 ` Conor Dooley
2025-05-09 16:18 ` Conor Dooley
1 sibling, 0 replies; 27+ messages in thread
From: Conor Dooley @ 2025-05-09 16:12 UTC (permalink / raw)
To: Jonathan Santos
Cc: linux-iio, devicetree, linux-kernel, linux-gpio, andy, nuno.sa,
Michael.Hennerich, marcelo.schmitt, jic23, robh, krzk+dt,
conor+dt, marcelo.schmitt1, linus.walleij, brgl, lgirdwood,
broonie, jonath4nns, dlechner, David Lechner
[-- Attachment #1: Type: text/plain, Size: 1009 bytes --]
On Thu, May 08, 2025 at 02:03:30PM -0300, Jonathan Santos wrote:
> In addition to GPIO synchronization, The AD7768-1 also supports
> synchronization over SPI, which use is recommended when the GPIO
> cannot provide a pulse synchronous with the base MCLK signal. It
> consists of looping back the SYNC_OUT to the SYNC_IN pin and send
> a command via SPI to trigger the synchronization.
>
> Introduce the 'trigger-sources' property to enable SPI-based
> synchronization via SYNC_OUT pin, along with additional optional
> entries for GPIO3 and DRDY pins.
>
> Also create #trigger-source-cells property to differentiate the trigger
> sources provided by the ADC. To improve readability, create a
> adi,ad7768-1.h header with the macros for the cell values.
>
> While at it, add description to the interrupts property.
>
> Reviewed-by: David Lechner <dlechner@baylirbe.com>
> Signed-off-by: Jonathan Santos <Jonathan.Santos@analog.com>
Acked-by: Conor Dooley <conor.dooley@microchip.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v7 03/12] dt-bindings: iio: adc: ad7768-1: add trigger-sources property
2025-05-08 17:03 ` [PATCH v7 03/12] dt-bindings: iio: adc: ad7768-1: add trigger-sources property Jonathan Santos
2025-05-09 16:12 ` Conor Dooley
@ 2025-05-09 16:18 ` Conor Dooley
2025-05-12 12:59 ` Rob Herring
1 sibling, 1 reply; 27+ messages in thread
From: Conor Dooley @ 2025-05-09 16:18 UTC (permalink / raw)
To: Jonathan Santos
Cc: linux-iio, devicetree, linux-kernel, linux-gpio, andy, nuno.sa,
Michael.Hennerich, marcelo.schmitt, jic23, robh, krzk+dt,
conor+dt, marcelo.schmitt1, linus.walleij, brgl, lgirdwood,
broonie, jonath4nns, dlechner, David Lechner
[-- Attachment #1: Type: text/plain, Size: 473 bytes --]
On Thu, May 08, 2025 at 02:03:30PM -0300, Jonathan Santos wrote:
> +dependencies:
> + adi,sync-in-gpios:
> + not:
> + required:
> + - trigger-sources
> + trigger-sources:
> + not:
> + required:
> + - adi,sync-in-gpios
Actually, this is normally not written like this. Usually it is done as
an allOf entry:
- if:
required:
- maxim,gpio-poc
then:
properties:
poc-supply: false
gpio-controller: false
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v7 01/12] iio: adc: ad7768-1: reorganize driver headers
2025-05-08 19:22 ` Andy Shevchenko
@ 2025-05-11 15:05 ` Jonathan Cameron
0 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2025-05-11 15:05 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Jonathan Santos, linux-iio, devicetree, linux-kernel, linux-gpio,
nuno.sa, Michael.Hennerich, marcelo.schmitt, robh, krzk+dt,
conor+dt, marcelo.schmitt1, linus.walleij, brgl, lgirdwood,
broonie, jonath4nns, dlechner
On Thu, 8 May 2025 22:22:46 +0300
Andy Shevchenko <andy@kernel.org> wrote:
> On Thu, May 08, 2025 at 02:03:04PM -0300, Jonathan Santos wrote:
> > Remove kernel.h since it adds a lot of unnecessary dependencies.
> > Add specific headers to ensure all functions and macros used in the driver
> > are directly declared.
>
> Suggested-by: ?
Blamed-on: :)
Anyhow, I added it and picked this one up as good change on it's own
even if maybe some other bits of this series need a little more work.
>
> Nevertheless,
> Reviewed-by: Andy Shevchenko <andy@kernel.org>
>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v7 00/12] iio: adc: ad7768-1: Add features, improvements, and fixes
2025-05-08 17:02 [PATCH v7 00/12] iio: adc: ad7768-1: Add features, improvements, and fixes Jonathan Santos
` (11 preceding siblings ...)
2025-05-08 17:05 ` [PATCH v7 12/12] iio: adc: ad7768-1: add low pass -3dB cutoff attribute Jonathan Santos
@ 2025-05-11 15:11 ` Jonathan Cameron
12 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2025-05-11 15:11 UTC (permalink / raw)
To: Jonathan Santos
Cc: linux-iio, devicetree, linux-kernel, linux-gpio, andy, nuno.sa,
Michael.Hennerich, marcelo.schmitt, robh, krzk+dt, conor+dt,
marcelo.schmitt1, linus.walleij, brgl, lgirdwood, broonie,
jonath4nns, dlechner
On Thu, 8 May 2025 14:02:50 -0300
Jonathan Santos <Jonathan.Santos@analog.com> wrote:
> This patch series introduces some new features, improvements,
> and fixes for the AD7768-1 ADC driver.
>
> The goal is to support all key functionalities listed in the device
> datasheet, including filter mode selection, common mode voltage output
> configuration and GPIO support. Additionally, this includes fixes
> for SPI communication and for IIO interface, and also code improvements
> to enhance maintainability and readability.
>
Hi Jonathan,
Looks like the remaining feedback is minor (and had none to add),
so this might make this cycle. Unfortunately I'm travelling this week
but I'll try and grab some time to pick up a few things that are very
nearly ready like this. Anyhow, hopefully v8 is the magic one.
Thanks,
Jonathan
> ---
> Changes in v7:
> * Added a new patch to reorganize driver headers.
> * Added the new files to MAINTAINERS.
> * Added dependencies to constrain the use of trigger-sources and
> adi,sync-in-gpios properties at the same time.
> * Self triggering is enabled only when the trigger-sources property is
> not defined. Added TODO to support other trigger sources when the subsystem
> is available.
> * Refactor code to avoid forward declarations.
> * Mentioned that sampling frequency changes is not allowed in
> buffered mode.
> * Addressed review comments, see individual pacthes.
> * Link to v6: https://lore.kernel.org/linux-iio/cover.1745605382.git.Jonathan.Santos@analog.com/T/#t
>
> Changes in v6:
> * Changed description and addressed other nits in the gpio-trigger patch.
> * Rewrote the #trigger-sources-cells description and removed mentions
> to offload engine.
> * Added adi,ad7768-1.h header with macros for the trigger source cells.
> * removed of_match_ptr() from regulator_desc.
> * Replaced deprecated .set callback with .set_rv in the gpio controller
> patch.
> * Use `trigger-sources` as an alternative to `adi,sync-in-gpios`
> (now optional), instead of replacing it.
> * Check trigger source by the compatible string (and the dev node for the
> self triggering).
> * Addressed review comments, see individual pacthes.
> * Link to v5: https://lore.kernel.org/linux-iio/cover.1744325346.git.Jonathan.Santos@analog.com/T/#t
>
> Changes in v5:
> * Added gpio-trigger binding patch.
> * Include START pin and DRDY in the trigger-sources description.
> * increased trigger-source-cells to 1: this cell will define the trigger
> source type.
> * Fixed the holes in the regmap ranges.
> * replace old iio_device_claim_direct_mode() for the new
> iio_device_claim/release_direct() functions.
> * Changed some commit messages.
> * Link to v4: https://lore.kernel.org/linux-iio/cover.1741268122.git.Jonathan.Santos@analog.com/T/#t
>
> Changes in v4:
> * Added missing `select REGMAP_SPI` and `select REGULATOR` to the device's Kconfig.
> * VCM output regulator property renamed.
> * Added direct mode conditional locks to regulator controller callbacks.
> * Renamed regulator controller.
> * Created helper function to precalculate the sampling frequency table and avoid
> race conditions.
> * Link to v3: https://lore.kernel.org/linux-iio/cover.1739368121.git.Jonathan.Santos@analog.com/T/#t
>
> Changes in v3:
> * Fixed irregular or missing SoBs.
> * Moved MOSI idle state patch to the start of the patch, as the other fix.
> * fixed dt-binding errors.
> * Trigger-sources is handled in a different way, as an alternative to sync-in-gpio.
> (this way we avoid breaking old applications).
> * VCM output is controlled by the regulator framework.
> * Added a second regmap for 24-bit register values.
> * Add new preparatory patch replacing the manual attribute declarations for
> the read_avail from struct iio_info.
> * included sinc3+rej60 filter type.
> * Addressed review comments, see individual pacthes.
> * Link to v2: https://lore.kernel.org/linux-iio/cover.1737985435.git.Jonathan.Santos@analog.com/T/#u
>
> Changes in v2:
> * Removed synchronization over SPI property and replaced it for trigger-sources.
> * Added GPIO controller documentation.
> * VCM output control changed from an IIO attribute to a devicetree property (static value).
> * Converted driver to use regmap and dropped spi_read_reg and spi_write_reg pacthes.
> * replaced decimation_rate attribute for oversampling_ratio and dropped device specific documentation patch.
> * Added low pass -3dB cutoff attribute.
> * Addressed review comments, see individual pacthes.
> * Link to v1: https://lore.kernel.org/linux-iio/cover.1736201898.git.Jonathan.Santos@analog.com/T/#t
>
> Jonathan Santos (11):
> iio: adc: ad7768-1: reorganize driver headers
> dt-bindings: trigger-source: add generic GPIO trigger source
> dt-bindings: iio: adc: ad7768-1: add trigger-sources property
> dt-bindings: iio: adc: ad7768-1: Document GPIO controller
> dt-bindings: iio: adc: ad7768-1: document regulator provider property
> iio: adc: ad7768-1: add regulator to control VCM output
> iio: adc: ad7768-1: add multiple scan types to support 16-bits mode
> iio: adc: ad7768-1: add support for Synchronization over SPI
> iio: adc: ad7768-1: replace manual attribute declaration
> iio: adc: ad7768-1: add filter type and oversampling ratio attributes
> iio: adc: ad7768-1: add low pass -3dB cutoff attribute
>
> Sergiu Cuciurean (1):
> iio: adc: ad7768-1: Add GPIO controller support
>
> .../bindings/iio/adc/adi,ad7768-1.yaml | 68 +-
> .../bindings/trigger-source/gpio-trigger.yaml | 40 +
> MAINTAINERS | 4 +-
> drivers/iio/adc/Kconfig | 1 +
> drivers/iio/adc/ad7768-1.c | 905 +++++++++++++++---
> include/dt-bindings/iio/adc/adi,ad7768-1.h | 10 +
> 6 files changed, 918 insertions(+), 110 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/trigger-source/gpio-trigger.yaml
> create mode 100644 include/dt-bindings/iio/adc/adi,ad7768-1.h
>
>
> base-commit: 9415c8b5b9b7ba927d98f80022a2890e8639e9e4
> prerequisite-patch-id: fbb33747cd0293bacd5b6d801d6cfc087449a28e
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v7 03/12] dt-bindings: iio: adc: ad7768-1: add trigger-sources property
2025-05-09 16:18 ` Conor Dooley
@ 2025-05-12 12:59 ` Rob Herring
0 siblings, 0 replies; 27+ messages in thread
From: Rob Herring @ 2025-05-12 12:59 UTC (permalink / raw)
To: Conor Dooley
Cc: Jonathan Santos, linux-iio, devicetree, linux-kernel, linux-gpio,
andy, nuno.sa, Michael.Hennerich, marcelo.schmitt, jic23, krzk+dt,
conor+dt, marcelo.schmitt1, linus.walleij, brgl, lgirdwood,
broonie, jonath4nns, dlechner, David Lechner
On Fri, May 09, 2025 at 05:18:55PM +0100, Conor Dooley wrote:
> On Thu, May 08, 2025 at 02:03:30PM -0300, Jonathan Santos wrote:
> > +dependencies:
> > + adi,sync-in-gpios:
> > + not:
> > + required:
> > + - trigger-sources
> > + trigger-sources:
> > + not:
> > + required:
> > + - adi,sync-in-gpios
>
> Actually, this is normally not written like this. Usually it is done as
> an allOf entry:
> - if:
> required:
> - maxim,gpio-poc
> then:
> properties:
> poc-supply: false
> gpio-controller: false
Using 'dependencies' is fine here. It's actually shorter.
Rob
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v7 02/12] dt-bindings: trigger-source: add generic GPIO trigger source
2025-05-08 17:03 ` [PATCH v7 02/12] dt-bindings: trigger-source: add generic GPIO trigger source Jonathan Santos
2025-05-08 17:56 ` David Lechner
2025-05-09 16:11 ` Conor Dooley
@ 2025-05-13 13:24 ` Linus Walleij
2 siblings, 0 replies; 27+ messages in thread
From: Linus Walleij @ 2025-05-13 13:24 UTC (permalink / raw)
To: Jonathan Santos
Cc: linux-iio, devicetree, linux-kernel, linux-gpio, andy, nuno.sa,
Michael.Hennerich, marcelo.schmitt, jic23, robh, krzk+dt,
conor+dt, marcelo.schmitt1, brgl, lgirdwood, broonie, jonath4nns,
dlechner
On Thu, May 8, 2025 at 7:03 PM Jonathan Santos
<Jonathan.Santos@analog.com> wrote:
> Inspired by pwm-trigger, create a new binding for using a GPIO
> line as a trigger source.
>
> Link: https://lore.kernel.org/linux-iio/20250207-dlech-mainline-spi-engine-offload-2-v8-3-e48a489be48c@baylibre.com/
> Reviewed-by: David Lechner <dlechner@baylibre.com>
> Signed-off-by: Jonathan Santos <Jonathan.Santos@analog.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 27+ messages in thread
end of thread, other threads:[~2025-05-13 13:25 UTC | newest]
Thread overview: 27+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-08 17:02 [PATCH v7 00/12] iio: adc: ad7768-1: Add features, improvements, and fixes Jonathan Santos
2025-05-08 17:03 ` [PATCH v7 01/12] iio: adc: ad7768-1: reorganize driver headers Jonathan Santos
2025-05-08 19:22 ` Andy Shevchenko
2025-05-11 15:05 ` Jonathan Cameron
2025-05-08 17:03 ` [PATCH v7 02/12] dt-bindings: trigger-source: add generic GPIO trigger source Jonathan Santos
2025-05-08 17:56 ` David Lechner
2025-05-09 16:11 ` Conor Dooley
2025-05-13 13:24 ` Linus Walleij
2025-05-08 17:03 ` [PATCH v7 03/12] dt-bindings: iio: adc: ad7768-1: add trigger-sources property Jonathan Santos
2025-05-09 16:12 ` Conor Dooley
2025-05-09 16:18 ` Conor Dooley
2025-05-12 12:59 ` Rob Herring
2025-05-08 17:03 ` [PATCH v7 04/12] dt-bindings: iio: adc: ad7768-1: Document GPIO controller Jonathan Santos
2025-05-08 17:03 ` [PATCH v7 05/12] dt-bindings: iio: adc: ad7768-1: document regulator provider property Jonathan Santos
2025-05-08 17:04 ` [PATCH v7 06/12] iio: adc: ad7768-1: add regulator to control VCM output Jonathan Santos
2025-05-08 17:04 ` [PATCH v7 07/12] iio: adc: ad7768-1: Add GPIO controller support Jonathan Santos
2025-05-08 17:04 ` [PATCH v7 08/12] iio: adc: ad7768-1: add multiple scan types to support 16-bits mode Jonathan Santos
2025-05-08 18:01 ` David Lechner
2025-05-08 18:03 ` David Lechner
2025-05-08 17:04 ` [PATCH v7 09/12] iio: adc: ad7768-1: add support for Synchronization over SPI Jonathan Santos
2025-05-08 18:45 ` David Lechner
2025-05-08 17:05 ` [PATCH v7 10/12] iio: adc: ad7768-1: replace manual attribute declaration Jonathan Santos
2025-05-08 19:31 ` Andy Shevchenko
2025-05-08 17:05 ` [PATCH v7 11/12] iio: adc: ad7768-1: add filter type and oversampling ratio attributes Jonathan Santos
2025-05-08 19:39 ` Andy Shevchenko
2025-05-08 17:05 ` [PATCH v7 12/12] iio: adc: ad7768-1: add low pass -3dB cutoff attribute Jonathan Santos
2025-05-11 15:11 ` [PATCH v7 00/12] iio: adc: ad7768-1: Add features, improvements, and fixes Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).