* [PATCH v2 0/5] iio: ad3552r-hs: add support for internal ramp generator
@ 2025-03-31 19:02 Angelo Dureghello
2025-03-31 19:02 ` [PATCH v2 1/5] iio: dac: adi-axi-dac: add cntrl chan check Angelo Dureghello
` (4 more replies)
0 siblings, 5 replies; 8+ messages in thread
From: Angelo Dureghello @ 2025-03-31 19:02 UTC (permalink / raw)
To: Nuno Sá, Jonathan Cameron, Lars-Peter Clausen,
Jonathan Corbet, Olivier Moysan, Michael Hennerich
Cc: linux-iio, linux-doc, linux-kernel, Angelo Dureghello
Add support to enable the HDL IP core internal ramp generator,
actually managed by the adi-axi-dac backend.
It works this way:
/sys/bus/iio/devices/iio:device0# echo 1 > buffer0/out_voltage0_en
/sys/bus/iio/devices/iio:device0# echo 1 > buffer0/out_voltage1_en
/sys/bus/iio/devices/iio:device0# echo 1 > buffer0/enable
Activating ramp generator:
/sys/kernel/debug/iio/iio:device0# echo -n backend-ramp-generator > data_source
Deactivating:
/sys/kernel/debug/iio/iio:device0# echo -n iio-buffer > data_source
Signed-off-by: Angelo Dureghello <adureghello@baylibre.com>
---
Changes in v2:
- doc, add few words for generic spi driver version,
- axi-dac, add a separate patch to check cntrl chan validity,
- axi-dac, return EIO on a wrong source on get,
- add a lock on debugfs file access,
- use const strings and strlen on file access.
- Link to v1: https://lore.kernel.org/r/20250321-wip-bl-ad3552r-fixes-v1-0-3c1aa249d163@baylibre.com
---
Angelo Dureghello (5):
iio: dac: adi-axi-dac: add cntrl chan check
docs: iio: add documentation for ad3552r driver
iio: backend: add support for data source get
iio: dac: adi-axi-dac: add data source get
iio: dac: ad3552r-hs: add support for internal ramp
Documentation/iio/ad3552r.rst | 72 ++++++++++++++++++++++
Documentation/iio/index.rst | 1 +
MAINTAINERS | 1 +
drivers/iio/dac/ad3552r-hs.c | 122 +++++++++++++++++++++++++++++++++++--
drivers/iio/dac/adi-axi-dac.c | 54 ++++++++++++++++
drivers/iio/industrialio-backend.c | 28 +++++++++
include/linux/iio/backend.h | 5 ++
7 files changed, 277 insertions(+), 6 deletions(-)
---
base-commit: eb870a5af7db1e5ca59330875125230b28e630f9
change-id: 20250321-wip-bl-ad3552r-fixes-4a386944c170
Best regards,
--
Angelo Dureghello <adureghello@baylibre.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 1/5] iio: dac: adi-axi-dac: add cntrl chan check
2025-03-31 19:02 [PATCH v2 0/5] iio: ad3552r-hs: add support for internal ramp generator Angelo Dureghello
@ 2025-03-31 19:02 ` Angelo Dureghello
2025-03-31 19:02 ` [PATCH v2 2/5] docs: iio: add documentation for ad3552r driver Angelo Dureghello
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Angelo Dureghello @ 2025-03-31 19:02 UTC (permalink / raw)
To: Nuno Sá, Jonathan Cameron, Lars-Peter Clausen,
Jonathan Corbet, Olivier Moysan, Michael Hennerich
Cc: linux-iio, linux-doc, linux-kernel, Angelo Dureghello
From: Angelo Dureghello <adureghello@baylibre.com>
Add validity check on CNTRL_X channels (valid as 0 to 15).
Signed-off-by: Angelo Dureghello <adureghello@baylibre.com>
---
drivers/iio/dac/adi-axi-dac.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/drivers/iio/dac/adi-axi-dac.c b/drivers/iio/dac/adi-axi-dac.c
index 892d770aec69c4259de777058801c9ab33c79923..f86acb98b0cffb09bf4d4626f932bf1edc911e2b 100644
--- a/drivers/iio/dac/adi-axi-dac.c
+++ b/drivers/iio/dac/adi-axi-dac.c
@@ -84,6 +84,7 @@
#define AXI_DAC_CHAN_CNTRL_7_REG(c) (0x0418 + (c) * 0x40)
#define AXI_DAC_CHAN_CNTRL_7_DATA_SEL GENMASK(3, 0)
+#define AXI_DAC_CHAN_CNTRL_MAX 15
#define AXI_DAC_RD_ADDR(x) (BIT(7) | (x))
/* 360 degrees in rad */
@@ -186,6 +187,9 @@ static int __axi_dac_frequency_get(struct axi_dac_state *st, unsigned int chan,
u32 reg, raw;
int ret;
+ if (chan > AXI_DAC_CHAN_CNTRL_MAX)
+ return -EINVAL;
+
if (!st->dac_clk) {
dev_err(st->dev, "Sampling rate is 0...\n");
return -EINVAL;
@@ -230,6 +234,9 @@ static int axi_dac_scale_get(struct axi_dac_state *st,
int ret, vals[2];
u32 reg, raw;
+ if (chan->channel > AXI_DAC_CHAN_CNTRL_MAX)
+ return -EINVAL;
+
if (tone_2)
reg = AXI_DAC_CHAN_CNTRL_3_REG(chan->channel);
else
@@ -264,6 +271,9 @@ static int axi_dac_phase_get(struct axi_dac_state *st,
u32 reg, raw, phase;
int ret, vals[2];
+ if (chan->channel > AXI_DAC_CHAN_CNTRL_MAX)
+ return -EINVAL;
+
if (tone_2)
reg = AXI_DAC_CHAN_CNTRL_4_REG(chan->channel);
else
@@ -291,6 +301,9 @@ static int __axi_dac_frequency_set(struct axi_dac_state *st, unsigned int chan,
u16 raw;
int ret;
+ if (chan > AXI_DAC_CHAN_CNTRL_MAX)
+ return -EINVAL;
+
if (!sample_rate || freq > sample_rate / 2) {
dev_err(st->dev, "Invalid frequency(%u) dac_clk(%llu)\n",
freq, sample_rate);
@@ -342,6 +355,9 @@ static int axi_dac_scale_set(struct axi_dac_state *st,
u32 raw = 0, reg;
int ret;
+ if (chan->channel > AXI_DAC_CHAN_CNTRL_MAX)
+ return -EINVAL;
+
ret = iio_str_to_fixpoint(buf, 100000, &integer, &frac);
if (ret)
return ret;
@@ -385,6 +401,9 @@ static int axi_dac_phase_set(struct axi_dac_state *st,
u32 raw, reg;
int ret;
+ if (chan->channel > AXI_DAC_CHAN_CNTRL_MAX)
+ return -EINVAL;
+
ret = iio_str_to_fixpoint(buf, 100000, &integer, &frac);
if (ret)
return ret;
@@ -493,6 +512,9 @@ static int axi_dac_data_source_set(struct iio_backend *back, unsigned int chan,
{
struct axi_dac_state *st = iio_backend_get_priv(back);
+ if (chan > AXI_DAC_CHAN_CNTRL_MAX)
+ return -EINVAL;
+
switch (data) {
case IIO_BACKEND_INTERNAL_CONTINUOUS_WAVE:
return regmap_update_bits(st->regmap,
@@ -521,6 +543,8 @@ static int axi_dac_set_sample_rate(struct iio_backend *back, unsigned int chan,
unsigned int freq;
int ret, tone;
+ if (chan > AXI_DAC_CHAN_CNTRL_MAX)
+ return -EINVAL;
if (!sample_rate)
return -EINVAL;
if (st->reg_config & AXI_DAC_CONFIG_DDS_DISABLE)
--
2.49.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 2/5] docs: iio: add documentation for ad3552r driver
2025-03-31 19:02 [PATCH v2 0/5] iio: ad3552r-hs: add support for internal ramp generator Angelo Dureghello
2025-03-31 19:02 ` [PATCH v2 1/5] iio: dac: adi-axi-dac: add cntrl chan check Angelo Dureghello
@ 2025-03-31 19:02 ` Angelo Dureghello
2025-03-31 19:02 ` [PATCH v2 3/5] iio: backend: add support for data source get Angelo Dureghello
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Angelo Dureghello @ 2025-03-31 19:02 UTC (permalink / raw)
To: Nuno Sá, Jonathan Cameron, Lars-Peter Clausen,
Jonathan Corbet, Olivier Moysan, Michael Hennerich
Cc: linux-iio, linux-doc, linux-kernel, Angelo Dureghello
From: Angelo Dureghello <adureghello@baylibre.com>
Add documentation for ad3552r driver, needed to describe the high-speed
driver debugfs attributes and shows how the user may use them.
Signed-off-by: Angelo Dureghello <adureghello@baylibre.com>
---
Documentation/iio/ad3552r.rst | 72 +++++++++++++++++++++++++++++++++++++++++++
Documentation/iio/index.rst | 1 +
MAINTAINERS | 1 +
3 files changed, 74 insertions(+)
diff --git a/Documentation/iio/ad3552r.rst b/Documentation/iio/ad3552r.rst
new file mode 100644
index 0000000000000000000000000000000000000000..2af24cfe886f1f4c1b86ac679fd19b83635b6771
--- /dev/null
+++ b/Documentation/iio/ad3552r.rst
@@ -0,0 +1,72 @@
+.. SPDX-License-Identifier: GPL-2.0-only
+
+==============
+AD3552R driver
+==============
+
+Device driver for Analog Devices Inc. AD35XXR series of DACs. The module name
+is ``ad3552r``.
+With the same module name, two different driver variants are available, the
+``generic spi`` variant, to be used with any classic SPI controllers, and the
+``hs`` (high speed) variant, for an ADI ``axi-dac`` (IP core) based controller
+that allows to reach the maximum sample rate supported from the DACs, using the
+DMA transfer and all the SPI lines available (D/QDSPI)..
+The high speed driver variant is intended to be used with the ``adi-axi-dac``
+backend support enabled, that is enabled by default when the driver is selected.
+
+Supported devices
+=================
+
+* `AD3541R <https://www.analog.com/en/products/ad3541r.html>`_
+* `AD3542R <https://www.analog.com/en/products/ad3542r.html>`_
+* `AD3551R <https://www.analog.com/en/products/ad3551r.html>`_
+* `AD3552R <https://www.analog.com/en/products/ad3552r.html>`_
+
+Wiring connections
+==================
+
+Generic SPI
+-----------
+Use the classic SPI S_CLK/CS/SDO/SDI connection.
+
+High speed (using axi-dac backend)
+----------------------------------
+
+::
+
+ .-----------------. .-------.
+ | |--- D/QSPI -----| |
+ | DAC IP CORE |--- SPI S_CLK --| DAC |
+ | |--- SPI CS -----| |
+ | |--- LDAC -------| |
+ | |--- RESET ------| |
+ |_________________| |_______|
+
+
+High speed features
+===================
+
+Device attributes
+-----------------
+
+The following table shows the ad35xxr related device debug files, found in the
+specific device debug folder path ``/sys/kernel/debug/iio/iio:deviceX``.
+
++----------------------+-------------------------------------------------------+
+| Debugfs device files | Description |
++----------------------+-------------------------------------------------------+
+| data_source | The used data source, |
+| | as ``iio-buffer`` or ``backend-ramp-generator``. |
++----------------------+-------------------------------------------------------+
+
+Usage examples
+--------------
+
+. code-block:: bash
+ root:/sys/bus/iio/devices/iio:device0# cat data_source
+ iio-buffer
+ root:/sys/bus/iio/devices/iio:device0# echo -n backend-ramp-generator > data_source
+ root:/sys/bus/iio/devices/iio:device0# cat data_source
+ backend-ramp-generator
+
+
diff --git a/Documentation/iio/index.rst b/Documentation/iio/index.rst
index bbb2edce8272e7483acca500d1a757bbcc11c1e0..2d6afc5a8ed54a90cd8d5723f0dc5212b8593d16 100644
--- a/Documentation/iio/index.rst
+++ b/Documentation/iio/index.rst
@@ -19,6 +19,7 @@ Industrial I/O Kernel Drivers
.. toctree::
:maxdepth: 1
+ ad3552r
ad4000
ad4030
ad4695
diff --git a/MAINTAINERS b/MAINTAINERS
index 57eaab00f6cb53df52a4799eb2c1afbbd1e77a1e..52bc56a9ee22c66b90555681c4757ea4399adae1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1295,6 +1295,7 @@ L: linux-iio@vger.kernel.org
S: Supported
W: https://ez.analog.com/linux-software-drivers
F: Documentation/devicetree/bindings/iio/dac/adi,ad3552r.yaml
+F: Documentation/iio/ad3552r.rst
F: drivers/iio/dac/ad3552r.c
ANALOG DEVICES INC AD4000 DRIVER
--
2.49.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 3/5] iio: backend: add support for data source get
2025-03-31 19:02 [PATCH v2 0/5] iio: ad3552r-hs: add support for internal ramp generator Angelo Dureghello
2025-03-31 19:02 ` [PATCH v2 1/5] iio: dac: adi-axi-dac: add cntrl chan check Angelo Dureghello
2025-03-31 19:02 ` [PATCH v2 2/5] docs: iio: add documentation for ad3552r driver Angelo Dureghello
@ 2025-03-31 19:02 ` Angelo Dureghello
2025-04-06 9:15 ` Jonathan Cameron
2025-03-31 19:02 ` [PATCH v2 4/5] iio: dac: adi-axi-dac: add " Angelo Dureghello
2025-03-31 19:02 ` [PATCH v2 5/5] iio: dac: ad3552r-hs: add support for internal ramp Angelo Dureghello
4 siblings, 1 reply; 8+ messages in thread
From: Angelo Dureghello @ 2025-03-31 19:02 UTC (permalink / raw)
To: Nuno Sá, Jonathan Cameron, Lars-Peter Clausen,
Jonathan Corbet, Olivier Moysan, Michael Hennerich
Cc: linux-iio, linux-doc, linux-kernel, Angelo Dureghello
From: Angelo Dureghello <adureghello@baylibre.com>
Add backend support for getting the data source used.
The ad3552r HDL implements an internal ramp generator, so adding the
getter to allow data source get/set by debugfs.
Signed-off-by: Angelo Dureghello <adureghello@baylibre.com>
---
drivers/iio/industrialio-backend.c | 28 ++++++++++++++++++++++++++++
include/linux/iio/backend.h | 5 +++++
2 files changed, 33 insertions(+)
diff --git a/drivers/iio/industrialio-backend.c b/drivers/iio/industrialio-backend.c
index a43c8d1bb3d0f4dda4277cac94b0ea9232c071e4..c1eb9ef9db08aec8437d0d00cf77914ad6611b72 100644
--- a/drivers/iio/industrialio-backend.c
+++ b/drivers/iio/industrialio-backend.c
@@ -380,6 +380,34 @@ int iio_backend_data_source_set(struct iio_backend *back, unsigned int chan,
}
EXPORT_SYMBOL_NS_GPL(iio_backend_data_source_set, "IIO_BACKEND");
+/**
+ * iio_backend_data_source_get - Get current data source
+ * @back: Backend device
+ * @chan: Channel number
+ * @data: Pointer to receive the current source value
+ *
+ * A given backend may have different sources to stream/sync data. This allows
+ * to know what source is in use.
+ *
+ * RETURNS:
+ * 0 on success, negative error number on failure.
+ */
+int iio_backend_data_source_get(struct iio_backend *back, unsigned int chan,
+ enum iio_backend_data_source *data)
+{
+ int ret;
+
+ ret = iio_backend_op_call(back, data_source_get, chan, data);
+ if (ret)
+ return ret;
+
+ if (*data >= IIO_BACKEND_DATA_SOURCE_MAX)
+ return -EINVAL;
+
+ return 0;
+}
+EXPORT_SYMBOL_NS_GPL(iio_backend_data_source_get, "IIO_BACKEND");
+
/**
* iio_backend_set_sampling_freq - Set channel sampling rate
* @back: Backend device
diff --git a/include/linux/iio/backend.h b/include/linux/iio/backend.h
index e45b7dfbec35c094942a3034fc6057a7960b9772..e59d909cb65924b4872cadd4b7e5e894c13c189f 100644
--- a/include/linux/iio/backend.h
+++ b/include/linux/iio/backend.h
@@ -84,6 +84,7 @@ enum iio_backend_interface_type {
* @chan_disable: Disable one channel.
* @data_format_set: Configure the data format for a specific channel.
* @data_source_set: Configure the data source for a specific channel.
+ * @data_source_get: Data source getter for a specific channel.
* @set_sample_rate: Configure the sampling rate for a specific channel.
* @test_pattern_set: Configure a test pattern.
* @chan_status: Get the channel status.
@@ -115,6 +116,8 @@ struct iio_backend_ops {
const struct iio_backend_data_fmt *data);
int (*data_source_set)(struct iio_backend *back, unsigned int chan,
enum iio_backend_data_source data);
+ int (*data_source_get)(struct iio_backend *back, unsigned int chan,
+ enum iio_backend_data_source *data);
int (*set_sample_rate)(struct iio_backend *back, unsigned int chan,
u64 sample_rate_hz);
int (*test_pattern_set)(struct iio_backend *back,
@@ -176,6 +179,8 @@ int iio_backend_data_format_set(struct iio_backend *back, unsigned int chan,
const struct iio_backend_data_fmt *data);
int iio_backend_data_source_set(struct iio_backend *back, unsigned int chan,
enum iio_backend_data_source data);
+int iio_backend_data_source_get(struct iio_backend *back, unsigned int chan,
+ enum iio_backend_data_source *data);
int iio_backend_set_sampling_freq(struct iio_backend *back, unsigned int chan,
u64 sample_rate_hz);
int iio_backend_test_pattern_set(struct iio_backend *back,
--
2.49.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 4/5] iio: dac: adi-axi-dac: add data source get
2025-03-31 19:02 [PATCH v2 0/5] iio: ad3552r-hs: add support for internal ramp generator Angelo Dureghello
` (2 preceding siblings ...)
2025-03-31 19:02 ` [PATCH v2 3/5] iio: backend: add support for data source get Angelo Dureghello
@ 2025-03-31 19:02 ` Angelo Dureghello
2025-03-31 19:02 ` [PATCH v2 5/5] iio: dac: ad3552r-hs: add support for internal ramp Angelo Dureghello
4 siblings, 0 replies; 8+ messages in thread
From: Angelo Dureghello @ 2025-03-31 19:02 UTC (permalink / raw)
To: Nuno Sá, Jonathan Cameron, Lars-Peter Clausen,
Jonathan Corbet, Olivier Moysan, Michael Hennerich
Cc: linux-iio, linux-doc, linux-kernel, Angelo Dureghello
From: Angelo Dureghello <adureghello@baylibre.com>
Add data source getter.
Signed-off-by: Angelo Dureghello <adureghello@baylibre.com>
---
drivers/iio/dac/adi-axi-dac.c | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/drivers/iio/dac/adi-axi-dac.c b/drivers/iio/dac/adi-axi-dac.c
index f86acb98b0cffb09bf4d4626f932bf1edc911e2b..8ed5ad1fa24cef649056bc5f4ca80abbf28b9323 100644
--- a/drivers/iio/dac/adi-axi-dac.c
+++ b/drivers/iio/dac/adi-axi-dac.c
@@ -536,6 +536,35 @@ static int axi_dac_data_source_set(struct iio_backend *back, unsigned int chan,
}
}
+static int axi_dac_data_source_get(struct iio_backend *back, unsigned int chan,
+ enum iio_backend_data_source *data)
+{
+ struct axi_dac_state *st = iio_backend_get_priv(back);
+ int ret;
+ u32 val;
+
+ if (chan > AXI_DAC_CHAN_CNTRL_MAX)
+ return -EINVAL;
+
+ ret = regmap_read(st->regmap, AXI_DAC_CHAN_CNTRL_7_REG(chan), &val);
+ if (ret)
+ return ret;
+
+ switch (val) {
+ case AXI_DAC_DATA_INTERNAL_TONE:
+ *data = IIO_BACKEND_INTERNAL_CONTINUOUS_WAVE;
+ return 0;
+ case AXI_DAC_DATA_DMA:
+ *data = IIO_BACKEND_EXTERNAL;
+ return 0;
+ case AXI_DAC_DATA_INTERNAL_RAMP_16BIT:
+ *data = IIO_BACKEND_INTERNAL_RAMP_16BIT;
+ return 0;
+ default:
+ return -EIO;
+ }
+}
+
static int axi_dac_set_sample_rate(struct iio_backend *back, unsigned int chan,
u64 sample_rate)
{
@@ -818,6 +847,7 @@ static const struct iio_backend_ops axi_ad3552r_ops = {
.request_buffer = axi_dac_request_buffer,
.free_buffer = axi_dac_free_buffer,
.data_source_set = axi_dac_data_source_set,
+ .data_source_get = axi_dac_data_source_get,
.ddr_enable = axi_dac_ddr_enable,
.ddr_disable = axi_dac_ddr_disable,
.data_stream_enable = axi_dac_data_stream_enable,
--
2.49.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 5/5] iio: dac: ad3552r-hs: add support for internal ramp
2025-03-31 19:02 [PATCH v2 0/5] iio: ad3552r-hs: add support for internal ramp generator Angelo Dureghello
` (3 preceding siblings ...)
2025-03-31 19:02 ` [PATCH v2 4/5] iio: dac: adi-axi-dac: add " Angelo Dureghello
@ 2025-03-31 19:02 ` Angelo Dureghello
2025-04-06 9:20 ` Jonathan Cameron
4 siblings, 1 reply; 8+ messages in thread
From: Angelo Dureghello @ 2025-03-31 19:02 UTC (permalink / raw)
To: Nuno Sá, Jonathan Cameron, Lars-Peter Clausen,
Jonathan Corbet, Olivier Moysan, Michael Hennerich
Cc: linux-iio, linux-doc, linux-kernel, Angelo Dureghello
From: Angelo Dureghello <adureghello@baylibre.com>
The ad3552r can be feeded from the HDL controller by an internally
generated 16bit ramp, useful for debug pourposes. Add debugfs a file
to enable or disable it.
Signed-off-by: Angelo Dureghello <adureghello@baylibre.com>
---
drivers/iio/dac/ad3552r-hs.c | 122 ++++++++++++++++++++++++++++++++++++++++---
1 file changed, 116 insertions(+), 6 deletions(-)
diff --git a/drivers/iio/dac/ad3552r-hs.c b/drivers/iio/dac/ad3552r-hs.c
index 37397e188f225a8099745ec03f7c604da76960b1..d4f50b33565f99b90859e30571dc59038d01361c 100644
--- a/drivers/iio/dac/ad3552r-hs.c
+++ b/drivers/iio/dac/ad3552r-hs.c
@@ -7,6 +7,7 @@
*/
#include <linux/bitfield.h>
+#include <linux/debugfs.h>
#include <linux/delay.h>
#include <linux/gpio/consumer.h>
#include <linux/iio/backend.h>
@@ -54,8 +55,12 @@ struct ad3552r_hs_state {
struct ad3552r_hs_platform_data *data;
/* INTERFACE_CONFIG_D register cache, in DDR we cannot read values. */
u32 config_d;
+ struct mutex lock;
};
+static const char dbgfs_src_iio_buffer[] = "iio-buffer";
+static const char dbgfs_src_backend_ramp_gen[] = "backend-ramp-generator";
+
static int ad3552r_hs_reg_read(struct ad3552r_hs_state *st, u32 reg, u32 *val,
size_t xfer_size)
{
@@ -65,6 +70,18 @@ static int ad3552r_hs_reg_read(struct ad3552r_hs_state *st, u32 reg, u32 *val,
return st->data->bus_reg_read(st->back, reg, val, xfer_size);
}
+static int ad3552r_hs_set_data_source(struct ad3552r_hs_state *st,
+ enum iio_backend_data_source type)
+{
+ int ret;
+
+ ret = iio_backend_data_source_set(st->back, 0, type);
+ if (ret)
+ return ret;
+
+ return iio_backend_data_source_set(st->back, 1, type);
+}
+
static int ad3552r_hs_update_reg_bits(struct ad3552r_hs_state *st, u32 reg,
u32 mask, u32 val, size_t xfer_size)
{
@@ -483,6 +500,76 @@ static int ad3552r_hs_reg_access(struct iio_dev *indio_dev, unsigned int reg,
return st->data->bus_reg_write(st->back, reg, writeval, 1);
}
+static ssize_t ad3552r_hs_show_data_source(struct file *f, char __user *userbuf,
+ size_t count, loff_t *ppos)
+{
+ struct ad3552r_hs_state *st = file_inode(f)->i_private;
+ enum iio_backend_data_source type;
+ int ret;
+
+ guard(mutex)(&st->lock);
+
+ ret = iio_backend_data_source_get(st->back, 0, &type);
+ if (ret)
+ return ret;
+
+ switch (type) {
+ case IIO_BACKEND_INTERNAL_RAMP_16BIT:
+ return simple_read_from_buffer(userbuf, count, ppos,
+ dbgfs_src_backend_ramp_gen,
+ strlen(dbgfs_src_backend_ramp_gen));
+ case IIO_BACKEND_EXTERNAL:
+ return simple_read_from_buffer(userbuf, count, ppos,
+ dbgfs_src_iio_buffer, strlen(dbgfs_src_iio_buffer));
+ default:
+ return -EINVAL;
+ }
+}
+
+static ssize_t ad3552r_hs_write_data_source(struct file *f,
+ const char __user *userbuf,
+ size_t count, loff_t *ppos)
+{
+ struct ad3552r_hs_state *st = file_inode(f)->i_private;
+ char buf[64];
+ int ret, len;
+
+ guard(mutex)(&st->lock);
+
+ ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, userbuf,
+ count);
+ if (ret < 0)
+ return ret;
+
+ len = strlen(dbgfs_src_iio_buffer);
+ if (count == len && !strncmp(buf, dbgfs_src_iio_buffer, len)) {
+ ret = ad3552r_hs_set_data_source(st, IIO_BACKEND_EXTERNAL);
+ if (ret)
+ return ret;
+ goto exit_ok;
+ }
+
+ len = strlen(dbgfs_src_backend_ramp_gen);
+ if (count == len && !strncmp(buf, dbgfs_src_backend_ramp_gen, len)) {
+ ret = ad3552r_hs_set_data_source(st,
+ IIO_BACKEND_INTERNAL_RAMP_16BIT);
+ if (ret)
+ return ret;
+ goto exit_ok;
+ }
+
+ return -EINVAL;
+
+exit_ok:
+ return count;
+}
+
+static const struct file_operations ad3552r_hs_data_source_fops = {
+ .owner = THIS_MODULE,
+ .write = ad3552r_hs_write_data_source,
+ .read = ad3552r_hs_show_data_source,
+};
+
static int ad3552r_hs_setup(struct ad3552r_hs_state *st)
{
u16 id;
@@ -550,11 +637,7 @@ static int ad3552r_hs_setup(struct ad3552r_hs_state *st)
if (ret)
return ret;
- ret = iio_backend_data_source_set(st->back, 0, IIO_BACKEND_EXTERNAL);
- if (ret)
- return ret;
-
- ret = iio_backend_data_source_set(st->back, 1, IIO_BACKEND_EXTERNAL);
+ ret = ad3552r_hs_set_data_source(st, IIO_BACKEND_EXTERNAL);
if (ret)
return ret;
@@ -661,6 +744,24 @@ static const struct iio_info ad3552r_hs_info = {
.debugfs_reg_access = &ad3552r_hs_reg_access,
};
+static void ad3552r_hs_debugfs_init(struct iio_dev *indio_dev)
+{
+ struct ad3552r_hs_state *st = iio_priv(indio_dev);
+ struct dentry *d = iio_get_debugfs_dentry(indio_dev);
+
+ if (!IS_ENABLED(CONFIG_DEBUG_FS))
+ return;
+
+ d = iio_get_debugfs_dentry(indio_dev);
+ if (!d) {
+ dev_warn(st->dev, "can't set debugfs in driver dir\n");
+ return;
+ }
+
+ debugfs_create_file("data_source", 0600, d, st,
+ &ad3552r_hs_data_source_fops);
+}
+
static int ad3552r_hs_probe(struct platform_device *pdev)
{
struct ad3552r_hs_state *st;
@@ -705,7 +806,16 @@ static int ad3552r_hs_probe(struct platform_device *pdev)
if (ret)
return ret;
- return devm_iio_device_register(&pdev->dev, indio_dev);
+ ret = devm_iio_device_register(&pdev->dev, indio_dev);
+ if (ret)
+ return ret;
+
+ mutex_init(&st->lock);
+
+ ad3552r_hs_debugfs_init(indio_dev);
+
+ return ret;
+
}
static const struct of_device_id ad3552r_hs_of_id[] = {
--
2.49.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 3/5] iio: backend: add support for data source get
2025-03-31 19:02 ` [PATCH v2 3/5] iio: backend: add support for data source get Angelo Dureghello
@ 2025-04-06 9:15 ` Jonathan Cameron
0 siblings, 0 replies; 8+ messages in thread
From: Jonathan Cameron @ 2025-04-06 9:15 UTC (permalink / raw)
To: Angelo Dureghello
Cc: Nuno Sá, Lars-Peter Clausen, Jonathan Corbet, Olivier Moysan,
Michael Hennerich, linux-iio, linux-doc, linux-kernel
On Mon, 31 Mar 2025 21:02:46 +0200
Angelo Dureghello <adureghello@baylibre.com> wrote:
> From: Angelo Dureghello <adureghello@baylibre.com>
>
> Add backend support for getting the data source used.
>
> The ad3552r HDL implements an internal ramp generator, so adding the
> getter to allow data source get/set by debugfs.
>
> Signed-off-by: Angelo Dureghello <adureghello@baylibre.com>
Looking for a Nuno Ack on this one.
> ---
> drivers/iio/industrialio-backend.c | 28 ++++++++++++++++++++++++++++
> include/linux/iio/backend.h | 5 +++++
> 2 files changed, 33 insertions(+)
>
> diff --git a/drivers/iio/industrialio-backend.c b/drivers/iio/industrialio-backend.c
> index a43c8d1bb3d0f4dda4277cac94b0ea9232c071e4..c1eb9ef9db08aec8437d0d00cf77914ad6611b72 100644
> --- a/drivers/iio/industrialio-backend.c
> +++ b/drivers/iio/industrialio-backend.c
> @@ -380,6 +380,34 @@ int iio_backend_data_source_set(struct iio_backend *back, unsigned int chan,
> }
> EXPORT_SYMBOL_NS_GPL(iio_backend_data_source_set, "IIO_BACKEND");
>
> +/**
> + * iio_backend_data_source_get - Get current data source
> + * @back: Backend device
> + * @chan: Channel number
> + * @data: Pointer to receive the current source value
> + *
> + * A given backend may have different sources to stream/sync data. This allows
> + * to know what source is in use.
> + *
> + * RETURNS:
> + * 0 on success, negative error number on failure.
> + */
> +int iio_backend_data_source_get(struct iio_backend *back, unsigned int chan,
> + enum iio_backend_data_source *data)
> +{
> + int ret;
> +
> + ret = iio_backend_op_call(back, data_source_get, chan, data);
> + if (ret)
> + return ret;
> +
> + if (*data >= IIO_BACKEND_DATA_SOURCE_MAX)
> + return -EINVAL;
> +
> + return 0;
> +}
> +EXPORT_SYMBOL_NS_GPL(iio_backend_data_source_get, "IIO_BACKEND");
> +
> /**
> * iio_backend_set_sampling_freq - Set channel sampling rate
> * @back: Backend device
> diff --git a/include/linux/iio/backend.h b/include/linux/iio/backend.h
> index e45b7dfbec35c094942a3034fc6057a7960b9772..e59d909cb65924b4872cadd4b7e5e894c13c189f 100644
> --- a/include/linux/iio/backend.h
> +++ b/include/linux/iio/backend.h
> @@ -84,6 +84,7 @@ enum iio_backend_interface_type {
> * @chan_disable: Disable one channel.
> * @data_format_set: Configure the data format for a specific channel.
> * @data_source_set: Configure the data source for a specific channel.
> + * @data_source_get: Data source getter for a specific channel.
> * @set_sample_rate: Configure the sampling rate for a specific channel.
> * @test_pattern_set: Configure a test pattern.
> * @chan_status: Get the channel status.
> @@ -115,6 +116,8 @@ struct iio_backend_ops {
> const struct iio_backend_data_fmt *data);
> int (*data_source_set)(struct iio_backend *back, unsigned int chan,
> enum iio_backend_data_source data);
> + int (*data_source_get)(struct iio_backend *back, unsigned int chan,
> + enum iio_backend_data_source *data);
> int (*set_sample_rate)(struct iio_backend *back, unsigned int chan,
> u64 sample_rate_hz);
> int (*test_pattern_set)(struct iio_backend *back,
> @@ -176,6 +179,8 @@ int iio_backend_data_format_set(struct iio_backend *back, unsigned int chan,
> const struct iio_backend_data_fmt *data);
> int iio_backend_data_source_set(struct iio_backend *back, unsigned int chan,
> enum iio_backend_data_source data);
> +int iio_backend_data_source_get(struct iio_backend *back, unsigned int chan,
> + enum iio_backend_data_source *data);
> int iio_backend_set_sampling_freq(struct iio_backend *back, unsigned int chan,
> u64 sample_rate_hz);
> int iio_backend_test_pattern_set(struct iio_backend *back,
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 5/5] iio: dac: ad3552r-hs: add support for internal ramp
2025-03-31 19:02 ` [PATCH v2 5/5] iio: dac: ad3552r-hs: add support for internal ramp Angelo Dureghello
@ 2025-04-06 9:20 ` Jonathan Cameron
0 siblings, 0 replies; 8+ messages in thread
From: Jonathan Cameron @ 2025-04-06 9:20 UTC (permalink / raw)
To: Angelo Dureghello
Cc: Nuno Sá, Lars-Peter Clausen, Jonathan Corbet, Olivier Moysan,
Michael Hennerich, linux-iio, linux-doc, linux-kernel
On Mon, 31 Mar 2025 21:02:48 +0200
Angelo Dureghello <adureghello@baylibre.com> wrote:
> From: Angelo Dureghello <adureghello@baylibre.com>
>
> The ad3552r can be feeded from the HDL controller by an internally
> generated 16bit ramp, useful for debug pourposes. Add debugfs a file
> to enable or disable it.
>
> Signed-off-by: Angelo Dureghello <adureghello@baylibre.com>
A couple of really minor things inline.
> ---
> drivers/iio/dac/ad3552r-hs.c | 122 ++++++++++++++++++++++++++++++++++++++++---
> 1 file changed, 116 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/iio/dac/ad3552r-hs.c b/drivers/iio/dac/ad3552r-hs.c
> index 37397e188f225a8099745ec03f7c604da76960b1..d4f50b33565f99b90859e30571dc59038d01361c 100644
> --- a/drivers/iio/dac/ad3552r-hs.c
> +++ b/drivers/iio/dac/ad3552r-hs.c
> @@ -7,6 +7,7 @@
> */
>
> #include <linux/bitfield.h>
> +#include <linux/debugfs.h>
> #include <linux/delay.h>
> #include <linux/gpio/consumer.h>
> #include <linux/iio/backend.h>
> @@ -54,8 +55,12 @@ struct ad3552r_hs_state {
> struct ad3552r_hs_platform_data *data;
> /* INTERFACE_CONFIG_D register cache, in DDR we cannot read values. */
> u32 config_d;
> + struct mutex lock;
Minor thing but all locks need comments. What data is this lock protecting?
> };
...
> static int ad3552r_hs_probe(struct platform_device *pdev)
> {
> struct ad3552r_hs_state *st;
> @@ -705,7 +806,16 @@ static int ad3552r_hs_probe(struct platform_device *pdev)
> if (ret)
> return ret;
>
> - return devm_iio_device_register(&pdev->dev, indio_dev);
> + ret = devm_iio_device_register(&pdev->dev, indio_dev);
> + if (ret)
> + return ret;
> +
> + mutex_init(&st->lock);
For new code, I'd prefer
ret = devm_mutex_init(&st->lock);
if (ret)
return ret;
Brings only a small advantage, but give the complexity cost is also small
we might as well use it!
> +
> + ad3552r_hs_debugfs_init(indio_dev);
> +
> + return ret;
> +
> }
>
> static const struct of_device_id ad3552r_hs_of_id[] = {
>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2025-04-06 9:20 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-31 19:02 [PATCH v2 0/5] iio: ad3552r-hs: add support for internal ramp generator Angelo Dureghello
2025-03-31 19:02 ` [PATCH v2 1/5] iio: dac: adi-axi-dac: add cntrl chan check Angelo Dureghello
2025-03-31 19:02 ` [PATCH v2 2/5] docs: iio: add documentation for ad3552r driver Angelo Dureghello
2025-03-31 19:02 ` [PATCH v2 3/5] iio: backend: add support for data source get Angelo Dureghello
2025-04-06 9:15 ` Jonathan Cameron
2025-03-31 19:02 ` [PATCH v2 4/5] iio: dac: adi-axi-dac: add " Angelo Dureghello
2025-03-31 19:02 ` [PATCH v2 5/5] iio: dac: ad3552r-hs: add support for internal ramp Angelo Dureghello
2025-04-06 9:20 ` 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).