* [RFC v2 00/11] iio: add iio backend device type
@ 2023-07-27 15:03 Olivier Moysan
2023-07-27 15:03 ` [RFC v2 03/11] dt-bindings: iio: stm32-dfsdm-adc: add scaling support Olivier Moysan
` (6 more replies)
0 siblings, 7 replies; 10+ messages in thread
From: Olivier Moysan @ 2023-07-27 15:03 UTC (permalink / raw)
To: Jonathan Cameron, Lars-Peter Clausen, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Olivier Moysan,
Arnaud Pouliquen, Maxime Coquelin, Alexandre Torgue, Frank Rowand,
Liam Girdwood, Mark Brown, Fabrice Gasnier
Cc: linux-iio, devicetree, linux-kernel, alsa-devel, linux-stm32,
linux-arm-kernel
This v2 is an addon to initial RFC:
https://lore.kernel.org/lkml/20230623140944.2613002-1-olivier.moysan@foss.st.com/
Despite the "IIO backend" naming has to be changed (as pointed out by
Jonathan previously), it has been kept here, for time being. The
appropriated naming still has to be discussed later on.
In the previous RFC the "IIO backend" concept was proposed through
a set of template APIs.
This v2 implements a functionnal exemple based on STM32 DFSDM,
to bring scaling support to this peripheral.
Olivier Moysan (11):
iio: introduce iio backend device
of: property: add device link support for io-backends
dt-bindings: iio: stm32-dfsdm-adc: add scaling support
dt-bindings: iio: adc: add scaling support to sd modulator
iio: adc: stm32-dfsdm: manage dfsdm as a channel provider
iio: adc: stm32-dfsdm: adopt generic channel bindings
iio: adc: stm32-dfsdm: add scaling support to dfsdm
iio: adc: sd modulator: add scale and offset support
ARM: dts: stm32: adopt new dfsdm bindings on stm32mp151
ARM: dts: stm32: add dfsdm pins muxing on stm32mp15
ARM: dts: stm32: add dfsdm iio support on stm32mp157c-ev
.../iio/adc/sigma-delta-modulator.yaml | 9 +-
.../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 189 ++++++------------
arch/arm/boot/dts/st/stm32mp15-pinctrl.dtsi | 39 ++++
arch/arm/boot/dts/st/stm32mp151.dtsi | 18 +-
arch/arm/boot/dts/st/stm32mp157c-ev1.dts | 68 +++++++
drivers/iio/Makefile | 1 +
drivers/iio/adc/sd_adc_modulator.c | 106 ++++++++--
drivers/iio/adc/stm32-dfsdm-adc.c | 187 +++++++++++------
drivers/iio/industrialio-backend.c | 107 ++++++++++
drivers/of/property.c | 2 +
include/linux/iio/backend.h | 56 ++++++
11 files changed, 561 insertions(+), 221 deletions(-)
create mode 100644 drivers/iio/industrialio-backend.c
create mode 100644 include/linux/iio/backend.h
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread
* [RFC v2 03/11] dt-bindings: iio: stm32-dfsdm-adc: add scaling support
2023-07-27 15:03 [RFC v2 00/11] iio: add iio backend device type Olivier Moysan
@ 2023-07-27 15:03 ` Olivier Moysan
2023-08-11 17:10 ` Rob Herring
2023-07-27 15:03 ` [RFC v2 05/11] iio: adc: stm32-dfsdm: manage dfsdm as a channel provider Olivier Moysan
` (5 subsequent siblings)
6 siblings, 1 reply; 10+ messages in thread
From: Olivier Moysan @ 2023-07-27 15:03 UTC (permalink / raw)
To: Olivier Moysan, Arnaud Pouliquen, Jonathan Cameron,
Lars-Peter Clausen, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Maxime Coquelin, Alexandre Torgue, Fabrice Gasnier
Cc: alsa-devel, linux-iio, devicetree, linux-stm32, linux-arm-kernel,
linux-kernel
Add scaling support to STM32 DFSDM.
This introduces the following changes:
- Add ADC generic channel binding and remove support of deprecated
channel bindings.
- DFSDM is now implemented as a channel provider, so remove io-channels
properties.
- Add iio-backend property to connect DFSDM to an SD modulator.
Signed-off-by: Olivier Moysan <olivier.moysan@foss.st.com>
---
.../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 189 ++++++------------
1 file changed, 63 insertions(+), 126 deletions(-)
diff --git a/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml b/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml
index 1970503389aa..128545cedc7f 100644
--- a/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml
+++ b/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml
@@ -85,22 +85,14 @@ patternProperties:
description: Specifies the DFSDM filter instance used.
maxItems: 1
- interrupts:
- maxItems: 1
+ '#address-cells':
+ const: 1
- st,adc-channels:
- description: |
- List of single-ended channels muxed for this ADC.
- On stm32h7 and stm32mp1:
- - For st,stm32-dfsdm-adc: up to 8 channels numbered from 0 to 7.
- - For st,stm32-dfsdm-dmic: 1 channel numbered from 0 to 7.
- $ref: /schemas/types.yaml#/definitions/uint32-array
- items:
- minimum: 0
- maximum: 7
+ '#size-cells':
+ const: 0
- st,adc-channel-names:
- description: List of single-ended channel names.
+ interrupts:
+ maxItems: 1
st,filter-order:
description: |
@@ -111,39 +103,6 @@ patternProperties:
$ref: /schemas/types.yaml#/definitions/uint32
maximum: 5
- "#io-channel-cells":
- const: 1
-
- st,adc-channel-types:
- description: |
- Single-ended channel input type.
- - "SPI_R": SPI with data on rising edge (default)
- - "SPI_F": SPI with data on falling edge
- - "MANCH_R": manchester codec, rising edge = logic 0, falling edge = logic 1
- - "MANCH_F": manchester codec, rising edge = logic 1, falling edge = logic 0
- items:
- enum: [ SPI_R, SPI_F, MANCH_R, MANCH_F ]
- $ref: /schemas/types.yaml#/definitions/non-unique-string-array
-
- st,adc-channel-clk-src:
- description: |
- Conversion clock source.
- - "CLKIN": external SPI clock (CLKIN x)
- - "CLKOUT": internal SPI clock (CLKOUT) (default)
- - "CLKOUT_F": internal SPI clock divided by 2 (falling edge).
- - "CLKOUT_R": internal SPI clock divided by 2 (rising edge).
- items:
- enum: [ CLKIN, CLKOUT, CLKOUT_F, CLKOUT_R ]
- $ref: /schemas/types.yaml#/definitions/non-unique-string-array
-
- st,adc-alt-channel:
- description:
- Must be defined if two sigma delta modulators are
- connected on same SPI input.
- If not set, channel n is connected to SPI input n.
- If set, channel n is connected to SPI input n + 1.
- type: boolean
-
st,filter0-sync:
description:
Set to 1 to synchronize with DFSDM filter instance 0.
@@ -157,14 +116,68 @@ patternProperties:
items:
- const: rx
+ patternProperties:
+ "^channel@([0-9]|1[0-9])$":
+ type: object
+ $ref: "adc.yaml"
+ description: Represents the external channels which are connected to the DFSDM.
+
+ properties:
+ reg:
+ items:
+ minimum: 0
+ maximum: 19
+
+ label:
+ description: |
+ Unique name to identify channel.
+
+ st,adc-channel-types:
+ description: |
+ Single-ended channel input type.
+ - "SPI_R": SPI with data on rising edge (default)
+ - "SPI_F": SPI with data on falling edge
+ - "MANCH_R": manchester codec, rising edge = logic 0, falling edge = logic 1
+ - "MANCH_F": manchester codec, rising edge = logic 1, falling edge = logic 0
+ items:
+ enum: [ SPI_R, SPI_F, MANCH_R, MANCH_F ]
+ $ref: /schemas/types.yaml#/definitions/non-unique-string-array
+
+ st,adc-channel-clk-src:
+ description: |
+ Conversion clock source.
+ - "CLKIN": external SPI clock (CLKIN x)
+ - "CLKOUT": internal SPI clock (CLKOUT) (default)
+ - "CLKOUT_F": internal SPI clock divided by 2 (falling edge).
+ - "CLKOUT_R": internal SPI clock divided by 2 (rising edge).
+ items:
+ enum: [ CLKIN, CLKOUT, CLKOUT_F, CLKOUT_R ]
+ $ref: /schemas/types.yaml#/definitions/non-unique-string-array
+
+ st,adc-alt-channel:
+ description:
+ Must be defined if two sigma delta modulators are
+ connected on same SPI input.
+ If not set, channel n is connected to SPI input n.
+ If set, channel n is connected to SPI input n + 1.
+ type: boolean
+
+ io-backends:
+ description: |
+ phandle to an external sigma delta modulator or internal ADC output.
+ $ref: /schemas/types.yaml#/definitions/phandle
+
+ required:
+ - reg
+ - io-backends
+
+ additionalProperties: false
+
required:
- compatible
- reg
- interrupts
- - st,adc-channels
- - st,adc-channel-names
- st,filter-order
- - "#io-channel-cells"
allOf:
- if:
@@ -175,14 +188,6 @@ patternProperties:
then:
properties:
- st,adc-channels:
- minItems: 1
- maxItems: 8
-
- st,adc-channel-names:
- minItems: 1
- maxItems: 8
-
st,adc-channel-types:
minItems: 1
maxItems: 8
@@ -191,14 +196,6 @@ patternProperties:
minItems: 1
maxItems: 8
- io-channels:
- description:
- From common IIO binding. Used to pipe external sigma delta
- modulator or internal ADC output to DFSDM channel.
-
- required:
- - io-channels
-
- if:
properties:
compatible:
@@ -207,12 +204,6 @@ patternProperties:
then:
properties:
- st,adc-channels:
- maxItems: 1
-
- st,adc-channel-names:
- maxItems: 1
-
st,adc-channel-types:
maxItems: 1
@@ -237,15 +228,9 @@ patternProperties:
"#sound-dai-cells":
const: 0
- io-channels:
- description:
- From common IIO binding. Used to pipe external sigma delta
- modulator or internal ADC output to DFSDM channel.
-
required:
- compatible
- "#sound-dai-cells"
- - io-channels
allOf:
- if:
@@ -278,52 +263,4 @@ allOf:
minimum: 0
maximum: 5
-examples:
- - |
- #include <dt-bindings/interrupt-controller/arm-gic.h>
- #include <dt-bindings/clock/stm32mp1-clks.h>
- dfsdm: dfsdm@4400d000 {
- compatible = "st,stm32mp1-dfsdm";
- reg = <0x4400d000 0x800>;
- clocks = <&rcc DFSDM_K>, <&rcc ADFSDM_K>;
- clock-names = "dfsdm", "audio";
- #address-cells = <1>;
- #size-cells = <0>;
-
- dfsdm0: filter@0 {
- compatible = "st,stm32-dfsdm-dmic";
- reg = <0>;
- interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
- dmas = <&dmamux1 101 0x400 0x01>;
- dma-names = "rx";
- #io-channel-cells = <1>;
- st,adc-channels = <1>;
- st,adc-channel-names = "dmic0";
- st,adc-channel-types = "SPI_R";
- st,adc-channel-clk-src = "CLKOUT";
- st,filter-order = <5>;
-
- asoc_pdm0: dfsdm-dai {
- compatible = "st,stm32h7-dfsdm-dai";
- #sound-dai-cells = <0>;
- io-channels = <&dfsdm0 0>;
- };
- };
-
- dfsdm_pdm1: filter@1 {
- compatible = "st,stm32-dfsdm-adc";
- reg = <1>;
- interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
- dmas = <&dmamux1 102 0x400 0x01>;
- dma-names = "rx";
- #io-channel-cells = <1>;
- st,adc-channels = <2 3>;
- st,adc-channel-names = "in2", "in3";
- st,adc-channel-types = "SPI_R", "SPI_R";
- st,adc-channel-clk-src = "CLKOUT_F", "CLKOUT_F";
- io-channels = <&sd_adc2 &sd_adc3>;
- st,filter-order = <1>;
- };
- };
-
...
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [RFC v2 05/11] iio: adc: stm32-dfsdm: manage dfsdm as a channel provider
2023-07-27 15:03 [RFC v2 00/11] iio: add iio backend device type Olivier Moysan
2023-07-27 15:03 ` [RFC v2 03/11] dt-bindings: iio: stm32-dfsdm-adc: add scaling support Olivier Moysan
@ 2023-07-27 15:03 ` Olivier Moysan
2023-07-27 15:03 ` [RFC v2 06/11] iio: adc: stm32-dfsdm: adopt generic channel bindings Olivier Moysan
` (4 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Olivier Moysan @ 2023-07-27 15:03 UTC (permalink / raw)
To: Jonathan Cameron, Lars-Peter Clausen, Maxime Coquelin,
Alexandre Torgue
Cc: Olivier Moysan, linux-iio, linux-stm32, linux-arm-kernel,
linux-kernel
The STM32 is currently implemented as a channels consumer
of the sigma delta modulator.
Change the topology to expose a single IIO device for DFSDM
and remove the IIO device associated to the SD modulator.
Manage the DFSDM as a channel provider to allow this change.
Signed-off-by: Olivier Moysan <olivier.moysan@foss.st.com>
---
drivers/iio/adc/stm32-dfsdm-adc.c | 19 -------------------
1 file changed, 19 deletions(-)
diff --git a/drivers/iio/adc/stm32-dfsdm-adc.c b/drivers/iio/adc/stm32-dfsdm-adc.c
index b5cc43d12b6f..20f7dffcecdd 100644
--- a/drivers/iio/adc/stm32-dfsdm-adc.c
+++ b/drivers/iio/adc/stm32-dfsdm-adc.c
@@ -77,7 +77,6 @@ struct stm32_dfsdm_adc {
/* ADC specific */
unsigned int oversamp;
- struct iio_hw_consumer *hwc;
struct completion completion;
u32 *buffer;
@@ -1007,12 +1006,6 @@ static int stm32_dfsdm_postenable(struct iio_dev *indio_dev)
/* Reset adc buffer index */
adc->bufi = 0;
- if (adc->hwc) {
- ret = iio_hw_consumer_enable(adc->hwc);
- if (ret < 0)
- return ret;
- }
-
ret = stm32_dfsdm_start_dfsdm(adc->dfsdm);
if (ret < 0)
goto err_stop_hwc;
@@ -1036,8 +1029,6 @@ static int stm32_dfsdm_postenable(struct iio_dev *indio_dev)
stop_dfsdm:
stm32_dfsdm_stop_dfsdm(adc->dfsdm);
err_stop_hwc:
- if (adc->hwc)
- iio_hw_consumer_disable(adc->hwc);
return ret;
}
@@ -1052,9 +1043,6 @@ static int stm32_dfsdm_predisable(struct iio_dev *indio_dev)
stm32_dfsdm_stop_dfsdm(adc->dfsdm);
- if (adc->hwc)
- iio_hw_consumer_disable(adc->hwc);
-
return 0;
}
@@ -1231,7 +1219,6 @@ static int stm32_dfsdm_read_raw(struct iio_dev *indio_dev,
ret = iio_device_claim_direct_mode(indio_dev);
if (ret)
return ret;
- ret = iio_hw_consumer_enable(adc->hwc);
if (ret < 0) {
dev_err(&indio_dev->dev,
"%s: IIO enable failed (channel %d)\n",
@@ -1240,7 +1227,6 @@ static int stm32_dfsdm_read_raw(struct iio_dev *indio_dev,
return ret;
}
ret = stm32_dfsdm_single_conv(indio_dev, chan, val);
- iio_hw_consumer_disable(adc->hwc);
if (ret < 0) {
dev_err(&indio_dev->dev,
"%s: Conversion failed (channel %d)\n",
@@ -1450,11 +1436,6 @@ static int stm32_dfsdm_adc_init(struct device *dev, struct iio_dev *indio_dev)
return num_ch < 0 ? num_ch : -EINVAL;
}
- /* Bind to SD modulator IIO device */
- adc->hwc = devm_iio_hw_consumer_alloc(&indio_dev->dev);
- if (IS_ERR(adc->hwc))
- return -EPROBE_DEFER;
-
ch = devm_kcalloc(&indio_dev->dev, num_ch, sizeof(*ch),
GFP_KERNEL);
if (!ch)
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [RFC v2 06/11] iio: adc: stm32-dfsdm: adopt generic channel bindings
2023-07-27 15:03 [RFC v2 00/11] iio: add iio backend device type Olivier Moysan
2023-07-27 15:03 ` [RFC v2 03/11] dt-bindings: iio: stm32-dfsdm-adc: add scaling support Olivier Moysan
2023-07-27 15:03 ` [RFC v2 05/11] iio: adc: stm32-dfsdm: manage dfsdm as a channel provider Olivier Moysan
@ 2023-07-27 15:03 ` Olivier Moysan
2023-07-27 15:03 ` [RFC v2 07/11] iio: adc: stm32-dfsdm: add scaling support to dfsdm Olivier Moysan
` (3 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Olivier Moysan @ 2023-07-27 15:03 UTC (permalink / raw)
To: Jonathan Cameron, Lars-Peter Clausen, Maxime Coquelin,
Alexandre Torgue
Cc: Olivier Moysan, linux-iio, linux-stm32, linux-arm-kernel,
linux-kernel
Adopt the generic channel bindings to ease the configuration
of the DFSDM channels as consumers of the SD modulator backend device.
Also adopt unified device property API in the same patch for this RFC.
Signed-off-by: Olivier Moysan <olivier.moysan@foss.st.com>
---
drivers/iio/adc/stm32-dfsdm-adc.c | 93 ++++++++++++++++---------------
1 file changed, 49 insertions(+), 44 deletions(-)
diff --git a/drivers/iio/adc/stm32-dfsdm-adc.c b/drivers/iio/adc/stm32-dfsdm-adc.c
index 20f7dffcecdd..96f4e0c64cdc 100644
--- a/drivers/iio/adc/stm32-dfsdm-adc.c
+++ b/drivers/iio/adc/stm32-dfsdm-adc.c
@@ -596,45 +596,35 @@ static int stm32_dfsdm_filter_configure(struct iio_dev *indio_dev,
static int stm32_dfsdm_channel_parse_of(struct stm32_dfsdm *dfsdm,
struct iio_dev *indio_dev,
+ struct fwnode_handle *node,
struct iio_chan_spec *ch)
{
struct stm32_dfsdm_channel *df_ch;
const char *of_str;
- int chan_idx = ch->scan_index;
int ret, val;
- ret = of_property_read_u32_index(indio_dev->dev.of_node,
- "st,adc-channels", chan_idx,
- &ch->channel);
+ ret = fwnode_property_read_u32(node, "reg", &ch->channel);
if (ret < 0) {
- dev_err(&indio_dev->dev,
- " Error parsing 'st,adc-channels' for idx %d\n",
- chan_idx);
+ dev_err(&indio_dev->dev, "Missing channel index %d\n", ret);
return ret;
}
if (ch->channel >= dfsdm->num_chs) {
- dev_err(&indio_dev->dev,
- " Error bad channel number %d (max = %d)\n",
+ dev_err(&indio_dev->dev, " Error bad channel number %d (max = %d)\n",
ch->channel, dfsdm->num_chs);
return -EINVAL;
}
- ret = of_property_read_string_index(indio_dev->dev.of_node,
- "st,adc-channel-names", chan_idx,
- &ch->datasheet_name);
+ ret = fwnode_property_read_string(node, "label", &ch->datasheet_name);
if (ret < 0) {
dev_err(&indio_dev->dev,
- " Error parsing 'st,adc-channel-names' for idx %d\n",
- chan_idx);
+ " Error parsing 'label' for idx %d\n", ch->channel);
return ret;
}
df_ch = &dfsdm->ch_list[ch->channel];
df_ch->id = ch->channel;
- ret = of_property_read_string_index(indio_dev->dev.of_node,
- "st,adc-channel-types", chan_idx,
- &of_str);
+ ret = fwnode_property_read_string(node, "st,adc-channel-types", &of_str);
if (!ret) {
val = stm32_dfsdm_str2val(of_str, stm32_dfsdm_chan_type);
if (val < 0)
@@ -644,9 +634,7 @@ static int stm32_dfsdm_channel_parse_of(struct stm32_dfsdm *dfsdm,
}
df_ch->type = val;
- ret = of_property_read_string_index(indio_dev->dev.of_node,
- "st,adc-channel-clk-src", chan_idx,
- &of_str);
+ ret = fwnode_property_read_string(node, "st,adc-channel-clk-src", &of_str);
if (!ret) {
val = stm32_dfsdm_str2val(of_str, stm32_dfsdm_chan_src);
if (val < 0)
@@ -656,10 +644,8 @@ static int stm32_dfsdm_channel_parse_of(struct stm32_dfsdm *dfsdm,
}
df_ch->src = val;
- ret = of_property_read_u32_index(indio_dev->dev.of_node,
- "st,adc-alt-channel", chan_idx,
- &df_ch->alt_si);
- if (ret < 0)
+ ret = fwnode_property_read_u32(node, "st,adc-alt-channel", &df_ch->alt_si);
+ if (ret != -EINVAL)
df_ch->alt_si = 0;
return 0;
@@ -1354,17 +1340,21 @@ static int stm32_dfsdm_dma_request(struct device *dev,
}
static int stm32_dfsdm_adc_chan_init_one(struct iio_dev *indio_dev,
+ struct fwnode_handle *child,
struct iio_chan_spec *ch)
{
struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
int ret;
- ret = stm32_dfsdm_channel_parse_of(adc->dfsdm, indio_dev, ch);
- if (ret < 0)
+ ret = stm32_dfsdm_channel_parse_of(adc->dfsdm, indio_dev, child, ch);
+ if (ret < 0) {
+ dev_err(&indio_dev->dev, "Failed to parse channel\n");
return ret;
+ }
ch->type = IIO_VOLTAGE;
ch->indexed = 1;
+ ch->scan_index = ch->channel;
/*
* IIO_CHAN_INFO_RAW: used to compute regular conversion
@@ -1387,6 +1377,30 @@ static int stm32_dfsdm_adc_chan_init_one(struct iio_dev *indio_dev,
&adc->dfsdm->ch_list[ch->channel]);
}
+static int stm32_dfsdm_generic_chan_init(struct iio_dev *indio_dev, struct stm32_dfsdm_adc *adc,
+ struct iio_chan_spec *channels)
+{
+ struct fwnode_handle *child;
+ int chan_idx = 0, ret;
+
+ device_for_each_child_node(&indio_dev->dev, child) {
+ ret = stm32_dfsdm_adc_chan_init_one(indio_dev, child, &channels[chan_idx]);
+ if (ret < 0) {
+ dev_err(&indio_dev->dev, "Channels init failed\n");
+ goto err;
+ }
+
+ chan_idx++;
+ }
+
+ return chan_idx;
+
+err:
+ fwnode_handle_put(child);
+
+ return ret;
+}
+
static int stm32_dfsdm_audio_init(struct device *dev, struct iio_dev *indio_dev)
{
struct iio_chan_spec *ch;
@@ -1400,7 +1414,7 @@ static int stm32_dfsdm_audio_init(struct device *dev, struct iio_dev *indio_dev)
ch->scan_index = 0;
- ret = stm32_dfsdm_adc_chan_init_one(indio_dev, ch);
+ ret = stm32_dfsdm_generic_chan_init(indio_dev, adc, ch);
if (ret < 0) {
dev_err(&indio_dev->dev, "Channels init failed\n");
return ret;
@@ -1422,33 +1436,24 @@ static int stm32_dfsdm_adc_init(struct device *dev, struct iio_dev *indio_dev)
struct iio_chan_spec *ch;
struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
int num_ch;
- int ret, chan_idx;
+ int ret;
adc->oversamp = DFSDM_DEFAULT_OVERSAMPLING;
ret = stm32_dfsdm_compute_all_osrs(indio_dev, adc->oversamp);
if (ret < 0)
return ret;
- num_ch = of_property_count_u32_elems(indio_dev->dev.of_node,
- "st,adc-channels");
- if (num_ch < 0 || num_ch > adc->dfsdm->num_chs) {
- dev_err(&indio_dev->dev, "Bad st,adc-channels\n");
- return num_ch < 0 ? num_ch : -EINVAL;
- }
+ num_ch = device_get_child_node_count(&indio_dev->dev);
+ if (!num_ch)
+ return -EINVAL;
- ch = devm_kcalloc(&indio_dev->dev, num_ch, sizeof(*ch),
- GFP_KERNEL);
+ ch = devm_kcalloc(&indio_dev->dev, num_ch, sizeof(*ch), GFP_KERNEL);
if (!ch)
return -ENOMEM;
- for (chan_idx = 0; chan_idx < num_ch; chan_idx++) {
- ch[chan_idx].scan_index = chan_idx;
- ret = stm32_dfsdm_adc_chan_init_one(indio_dev, &ch[chan_idx]);
- if (ret < 0) {
- dev_err(&indio_dev->dev, "Channels init failed\n");
- return ret;
- }
- }
+ stm32_dfsdm_generic_chan_init(indio_dev, adc, ch);
+ if (ret < 0)
+ return ret;
indio_dev->num_channels = num_ch;
indio_dev->channels = ch;
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [RFC v2 07/11] iio: adc: stm32-dfsdm: add scaling support to dfsdm
2023-07-27 15:03 [RFC v2 00/11] iio: add iio backend device type Olivier Moysan
` (2 preceding siblings ...)
2023-07-27 15:03 ` [RFC v2 06/11] iio: adc: stm32-dfsdm: adopt generic channel bindings Olivier Moysan
@ 2023-07-27 15:03 ` Olivier Moysan
2023-07-27 15:03 ` [RFC v2 09/11] ARM: dts: stm32: adopt new dfsdm bindings on stm32mp151 Olivier Moysan
` (2 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Olivier Moysan @ 2023-07-27 15:03 UTC (permalink / raw)
To: Jonathan Cameron, Lars-Peter Clausen, Maxime Coquelin,
Alexandre Torgue
Cc: Olivier Moysan, linux-iio, linux-stm32, linux-arm-kernel,
linux-kernel
Add scaling support to STM32 DFSDM.
Signed-off-by: Olivier Moysan <olivier.moysan@foss.st.com>
---
drivers/iio/adc/stm32-dfsdm-adc.c | 77 +++++++++++++++++++++++++++++--
1 file changed, 73 insertions(+), 4 deletions(-)
diff --git a/drivers/iio/adc/stm32-dfsdm-adc.c b/drivers/iio/adc/stm32-dfsdm-adc.c
index 96f4e0c64cdc..dba1a8ef5451 100644
--- a/drivers/iio/adc/stm32-dfsdm-adc.c
+++ b/drivers/iio/adc/stm32-dfsdm-adc.c
@@ -9,6 +9,7 @@
#include <linux/dmaengine.h>
#include <linux/dma-mapping.h>
#include <linux/iio/adc/stm32-dfsdm-adc.h>
+#include <linux/iio/backend.h>
#include <linux/iio/buffer.h>
#include <linux/iio/hw-consumer.h>
#include <linux/iio/sysfs.h>
@@ -77,6 +78,7 @@ struct stm32_dfsdm_adc {
/* ADC specific */
unsigned int oversamp;
+ struct iio_backend **backend;
struct completion completion;
u32 *buffer;
@@ -600,6 +602,8 @@ static int stm32_dfsdm_channel_parse_of(struct stm32_dfsdm *dfsdm,
struct iio_chan_spec *ch)
{
struct stm32_dfsdm_channel *df_ch;
+ struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
+ struct iio_backend *backend;
const char *of_str;
int ret, val;
@@ -648,6 +652,12 @@ static int stm32_dfsdm_channel_parse_of(struct stm32_dfsdm *dfsdm,
if (ret != -EINVAL)
df_ch->alt_si = 0;
+ backend = fwnode_iio_backend_get(node, 0);
+ if (IS_ERR(backend))
+ return dev_err_probe(&indio_dev->dev, PTR_ERR(backend), "Failed to get backend\n");
+
+ adc->backend[df_ch->id] = backend;
+
return 0;
}
@@ -1091,7 +1101,7 @@ static int stm32_dfsdm_single_conv(struct iio_dev *indio_dev,
{
struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
long timeout;
- int ret;
+ int ret, idx = chan->scan_index;
reinit_completion(&adc->completion);
@@ -1101,6 +1111,13 @@ static int stm32_dfsdm_single_conv(struct iio_dev *indio_dev,
if (ret < 0)
return ret;
+ if (!adc->backend[idx]->ops->enable)
+ return -EINVAL;
+
+ ret = adc->backend[idx]->ops->enable(adc->backend[idx]);
+ if (ret < 0)
+ return ret;
+
ret = regmap_update_bits(adc->dfsdm->regmap, DFSDM_CR2(adc->fl_id),
DFSDM_CR2_REOCIE_MASK, DFSDM_CR2_REOCIE(1));
if (ret < 0)
@@ -1134,6 +1151,8 @@ static int stm32_dfsdm_single_conv(struct iio_dev *indio_dev,
stm32_dfsdm_process_data(adc, res);
stop_dfsdm:
+ ret = adc->backend[idx]->ops->disable(adc->backend[idx]);
+
stm32_dfsdm_stop_dfsdm(adc->dfsdm);
return ret;
@@ -1198,7 +1217,14 @@ static int stm32_dfsdm_read_raw(struct iio_dev *indio_dev,
int *val2, long mask)
{
struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
- int ret;
+
+ struct stm32_dfsdm_filter *fl = &adc->dfsdm->fl_list[adc->fl_id];
+ struct stm32_dfsdm_filter_osr *flo = &fl->flo[fl->fast];
+ u32 max = flo->max << (flo->lshift - chan->scan_type.shift);
+ int ret, idx = chan->scan_index;
+
+ if (flo->lshift < chan->scan_type.shift)
+ max = flo->max >> (chan->scan_type.shift - flo->lshift);
switch (mask) {
case IIO_CHAN_INFO_RAW:
@@ -1232,6 +1258,41 @@ static int stm32_dfsdm_read_raw(struct iio_dev *indio_dev,
*val = adc->sample_freq;
return IIO_VAL_INT;
+
+ case IIO_CHAN_INFO_SCALE:
+ /*
+ * Scale is expressed in mV.
+ * When fast mode is disabled, actual resolution may be lower
+ * than 2^n, where n=realbits-1.
+ * This leads to underestimating input voltage. To
+ * compensate this deviation, the voltage reference can be
+ * corrected with a factor = realbits resolution / actual max
+ */
+ adc->backend[idx]->ops->read_raw(adc->backend[idx], val, val2, mask);
+
+ *val = div_u64((u64)*val * (u64)BIT(DFSDM_DATA_RES - 1), max);
+ *val2 = chan->scan_type.realbits;
+ if (chan->differential)
+ *val *= 2;
+ return IIO_VAL_FRACTIONAL_LOG2;
+
+ case IIO_CHAN_INFO_OFFSET:
+ /*
+ * DFSDM output data are in the range [-2^n,2^n],
+ * with n=realbits-1.
+ * - Differential modulator:
+ * Offset correspond to SD modulator offset.
+ * - Single ended modulator:
+ * Input is in [0V,Vref] range, where 0V corresponds to -2^n, and Vref to 2^n.
+ * Add 2^n to offset. (i.e. middle of input range)
+ * offset = offset(sd) * vref / res(sd) * max / vref.
+ */
+ adc->backend[idx]->ops->read_raw(adc->backend[idx], val, val2, mask);
+
+ *val = div_u64((u64)max * *val, BIT(*val2 - 1));
+ if (!chan->differential)
+ *val += max;
+ return IIO_VAL_INT;
}
return -EINVAL;
@@ -1360,7 +1421,10 @@ static int stm32_dfsdm_adc_chan_init_one(struct iio_dev *indio_dev,
* IIO_CHAN_INFO_RAW: used to compute regular conversion
* IIO_CHAN_INFO_OVERSAMPLING_RATIO: used to set oversampling
*/
- ch->info_mask_separate = BIT(IIO_CHAN_INFO_RAW);
+ ch->info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
+ BIT(IIO_CHAN_INFO_SCALE) |
+ BIT(IIO_CHAN_INFO_OFFSET);
+
ch->info_mask_shared_by_all = BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO) |
BIT(IIO_CHAN_INFO_SAMP_FREQ);
@@ -1451,7 +1515,12 @@ static int stm32_dfsdm_adc_init(struct device *dev, struct iio_dev *indio_dev)
if (!ch)
return -ENOMEM;
- stm32_dfsdm_generic_chan_init(indio_dev, adc, ch);
+ adc->backend = devm_kzalloc(&indio_dev->dev, sizeof(*adc->backend) * adc->dfsdm->num_chs,
+ GFP_KERNEL);
+ if (!adc->backend)
+ return -ENOMEM;
+
+ ret = stm32_dfsdm_generic_chan_init(indio_dev, adc, ch);
if (ret < 0)
return ret;
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [RFC v2 09/11] ARM: dts: stm32: adopt new dfsdm bindings on stm32mp151
2023-07-27 15:03 [RFC v2 00/11] iio: add iio backend device type Olivier Moysan
` (3 preceding siblings ...)
2023-07-27 15:03 ` [RFC v2 07/11] iio: adc: stm32-dfsdm: add scaling support to dfsdm Olivier Moysan
@ 2023-07-27 15:03 ` Olivier Moysan
2023-07-27 15:03 ` [RFC v2 10/11] ARM: dts: stm32: add dfsdm pins muxing on stm32mp15 Olivier Moysan
2023-07-27 15:03 ` [RFC v2 11/11] ARM: dts: stm32: add dfsdm iio support on stm32mp157c-ev Olivier Moysan
6 siblings, 0 replies; 10+ messages in thread
From: Olivier Moysan @ 2023-07-27 15:03 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Maxime Coquelin,
Alexandre Torgue
Cc: Olivier Moysan, devicetree, linux-stm32, linux-arm-kernel,
linux-kernel
Adapt STM32MP151 device tree to match DFSDM new bindings.
Signed-off-by: Olivier Moysan <olivier.moysan@foss.st.com>
---
arch/arm/boot/dts/st/stm32mp151.dtsi | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/st/stm32mp151.dtsi b/arch/arm/boot/dts/st/stm32mp151.dtsi
index 61508917521c..338457357248 100644
--- a/arch/arm/boot/dts/st/stm32mp151.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp151.dtsi
@@ -970,7 +970,8 @@ dfsdm: dfsdm@4400d000 {
dfsdm0: filter@0 {
compatible = "st,stm32-dfsdm-adc";
- #io-channel-cells = <1>;
+ #address-cells = <1>;
+ #size-cells = <0>;
reg = <0>;
interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&dmamux1 101 0x400 0x01>;
@@ -980,7 +981,8 @@ dfsdm0: filter@0 {
dfsdm1: filter@1 {
compatible = "st,stm32-dfsdm-adc";
- #io-channel-cells = <1>;
+ #address-cells = <1>;
+ #size-cells = <0>;
reg = <1>;
interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&dmamux1 102 0x400 0x01>;
@@ -990,7 +992,8 @@ dfsdm1: filter@1 {
dfsdm2: filter@2 {
compatible = "st,stm32-dfsdm-adc";
- #io-channel-cells = <1>;
+ #address-cells = <1>;
+ #size-cells = <0>;
reg = <2>;
interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&dmamux1 103 0x400 0x01>;
@@ -1000,7 +1003,8 @@ dfsdm2: filter@2 {
dfsdm3: filter@3 {
compatible = "st,stm32-dfsdm-adc";
- #io-channel-cells = <1>;
+ #address-cells = <1>;
+ #size-cells = <0>;
reg = <3>;
interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&dmamux1 104 0x400 0x01>;
@@ -1010,7 +1014,8 @@ dfsdm3: filter@3 {
dfsdm4: filter@4 {
compatible = "st,stm32-dfsdm-adc";
- #io-channel-cells = <1>;
+ #address-cells = <1>;
+ #size-cells = <0>;
reg = <4>;
interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&dmamux1 91 0x400 0x01>;
@@ -1020,7 +1025,8 @@ dfsdm4: filter@4 {
dfsdm5: filter@5 {
compatible = "st,stm32-dfsdm-adc";
- #io-channel-cells = <1>;
+ #address-cells = <1>;
+ #size-cells = <0>;
reg = <5>;
interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&dmamux1 92 0x400 0x01>;
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [RFC v2 10/11] ARM: dts: stm32: add dfsdm pins muxing on stm32mp15
2023-07-27 15:03 [RFC v2 00/11] iio: add iio backend device type Olivier Moysan
` (4 preceding siblings ...)
2023-07-27 15:03 ` [RFC v2 09/11] ARM: dts: stm32: adopt new dfsdm bindings on stm32mp151 Olivier Moysan
@ 2023-07-27 15:03 ` Olivier Moysan
2023-07-27 15:03 ` [RFC v2 11/11] ARM: dts: stm32: add dfsdm iio support on stm32mp157c-ev Olivier Moysan
6 siblings, 0 replies; 10+ messages in thread
From: Olivier Moysan @ 2023-07-27 15:03 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Maxime Coquelin,
Alexandre Torgue
Cc: Olivier Moysan, devicetree, linux-stm32, linux-arm-kernel,
linux-kernel
Add STM32 DFSDM pin muxings to STM32MP15.
Signed-off-by: Olivier Moysan <olivier.moysan@foss.st.com>
---
arch/arm/boot/dts/st/stm32mp15-pinctrl.dtsi | 39 +++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/arch/arm/boot/dts/st/stm32mp15-pinctrl.dtsi b/arch/arm/boot/dts/st/stm32mp15-pinctrl.dtsi
index 05c9c4f8064c..f4dd46c176f9 100644
--- a/arch/arm/boot/dts/st/stm32mp15-pinctrl.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp15-pinctrl.dtsi
@@ -188,6 +188,45 @@ pins {
};
};
+ dfsdm_clkout_pins_a: dfsdm-clkout-pins-0 {
+ pins {
+ pinmux = <STM32_PINMUX('B', 13, AF3)>; /* DFSDM_CKOUT */
+ bias-disable;
+ drive-push-pull;
+ slew-rate = <0>;
+ };
+ };
+
+ dfsdm_clkout_sleep_pins_a: dfsdm-clkout-sleep-pins-0 {
+ pins {
+ pinmux = <STM32_PINMUX('B', 13, ANALOG)>; /* DFSDM_CKOUT */
+ };
+ };
+
+ dfsdm_data1_pins_a: dfsdm-data1-pins-0 {
+ pins {
+ pinmux = <STM32_PINMUX('C', 3, AF3)>; /* DFSDM_DATA1 */
+ };
+ };
+
+ dfsdm_data1_sleep_pins_a: dfsdm-data1-sleep-pins-0 {
+ pins {
+ pinmux = <STM32_PINMUX('C', 3, ANALOG)>; /* DFSDM_DATA1 */
+ };
+ };
+
+ dfsdm_data3_pins_a: dfsdm-data3-pins-0 {
+ pins {
+ pinmux = <STM32_PINMUX('F', 13, AF6)>; /* DFSDM_DATA3 */
+ };
+ };
+
+ dfsdm_data3_sleep_pins_a: dfsdm-data3-sleep-pins-0 {
+ pins {
+ pinmux = <STM32_PINMUX('F', 13, ANALOG)>; /* DFSDM_DATA3 */
+ };
+ };
+
ethernet0_rgmii_pins_a: rgmii-0 {
pins1 {
pinmux = <STM32_PINMUX('G', 5, AF11)>, /* ETH_RGMII_CLK125 */
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [RFC v2 11/11] ARM: dts: stm32: add dfsdm iio support on stm32mp157c-ev
2023-07-27 15:03 [RFC v2 00/11] iio: add iio backend device type Olivier Moysan
` (5 preceding siblings ...)
2023-07-27 15:03 ` [RFC v2 10/11] ARM: dts: stm32: add dfsdm pins muxing on stm32mp15 Olivier Moysan
@ 2023-07-27 15:03 ` Olivier Moysan
6 siblings, 0 replies; 10+ messages in thread
From: Olivier Moysan @ 2023-07-27 15:03 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Maxime Coquelin,
Alexandre Torgue
Cc: Olivier Moysan, devicetree, linux-stm32, linux-arm-kernel,
linux-kernel
This DT is an example of backend iio device used for STM32 DFSDM.
DFSDM filter1 has a single input channel, while filter0 is configured
to support scan mode with two input channels.
Signed-off-by: Olivier Moysan <olivier.moysan@foss.st.com>
---
arch/arm/boot/dts/st/stm32mp157c-ev1.dts | 68 ++++++++++++++++++++++++
1 file changed, 68 insertions(+)
diff --git a/arch/arm/boot/dts/st/stm32mp157c-ev1.dts b/arch/arm/boot/dts/st/stm32mp157c-ev1.dts
index af3800501875..edeac26f39a4 100644
--- a/arch/arm/boot/dts/st/stm32mp157c-ev1.dts
+++ b/arch/arm/boot/dts/st/stm32mp157c-ev1.dts
@@ -73,6 +73,27 @@ panel_backlight: panel-backlight {
default-on;
status = "okay";
};
+
+ sd_adc0: sd-adc0 {
+ compatible = "sd-modulator";
+ #io-backend-cells = <0>;
+ vref-supply = <&v3v3>;
+ status = "okay";
+ };
+
+ sd_adc1: sd-adc1 {
+ compatible = "sd-modulator";
+ #io-backend-cells = <0>;
+ vref-supply = <&v3v3>;
+ status = "okay";
+ };
+
+ sd_adc2: sd-adc2 {
+ compatible = "sd-modulator";
+ #io-backend-cells = <0>;
+ vref-supply = <&v3v3>;
+ status = "okay";
+ };
};
&cec {
@@ -99,6 +120,53 @@ dcmi_0: endpoint {
};
};
+&dfsdm {
+ pinctrl-names = "default", "sleep";
+ pinctrl-0 = <&dfsdm_clkout_pins_a
+ &dfsdm_data1_pins_a &dfsdm_data3_pins_a>;
+ pinctrl-1 = <&dfsdm_clkout_sleep_pins_a
+ &dfsdm_data1_sleep_pins_a &dfsdm_data3_sleep_pins_a>;
+ spi-max-frequency = <2048000>;
+ status = "okay";
+
+ dfsdm0: filter@0 {
+ compatible = "st,stm32-dfsdm-adc";
+ st,filter-order = <3>;
+ status = "okay";
+
+ channel@0 {
+ reg = <0>;
+ label = "in0";
+ st,adc-channel-types = "SPI_F";
+ st,adc-channel-clk-src = "CLKOUT";
+ st,adc-alt-channel;
+ io-backends = <&sd_adc0>;
+ };
+
+ channel@1 {
+ reg = <1>;
+ label = "in1";
+ st,adc-channel-types = "SPI_R";
+ st,adc-channel-clk-src = "CLKOUT";
+ io-backends = <&sd_adc1>;
+ };
+ };
+
+ dfsdm1: filter@1 {
+ compatible = "st,stm32-dfsdm-adc";
+ st,filter-order = <3>;
+ status = "okay";
+
+ channel@3 {
+ reg = <3>;
+ label = "in3";
+ st,adc-channel-types = "SPI_R";
+ st,adc-channel-clk-src = "CLKOUT";
+ io-backends = <&sd_adc2>;
+ };
+ };
+};
+
&dsi {
phy-dsi-supply = <®18>;
#address-cells = <1>;
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [RFC v2 03/11] dt-bindings: iio: stm32-dfsdm-adc: add scaling support
2023-07-27 15:03 ` [RFC v2 03/11] dt-bindings: iio: stm32-dfsdm-adc: add scaling support Olivier Moysan
@ 2023-08-11 17:10 ` Rob Herring
2023-08-31 15:53 ` Olivier MOYSAN
0 siblings, 1 reply; 10+ messages in thread
From: Rob Herring @ 2023-08-11 17:10 UTC (permalink / raw)
To: Olivier Moysan
Cc: Arnaud Pouliquen, Jonathan Cameron, Lars-Peter Clausen,
Krzysztof Kozlowski, Conor Dooley, Maxime Coquelin,
Alexandre Torgue, Fabrice Gasnier, alsa-devel, linux-iio,
devicetree, linux-stm32, linux-arm-kernel, linux-kernel
On Thu, Jul 27, 2023 at 05:03:14PM +0200, Olivier Moysan wrote:
> Add scaling support to STM32 DFSDM.
>
> This introduces the following changes:
Why?
> - Add ADC generic channel binding and remove support of deprecated
> channel bindings.
When was it deprecated?
> - DFSDM is now implemented as a channel provider, so remove io-channels
> properties.
> - Add iio-backend property to connect DFSDM to an SD modulator.
io-backends
All sorts of ABI issues with this change. Please explain why you don't
care.
>
> Signed-off-by: Olivier Moysan <olivier.moysan@foss.st.com>
> ---
> .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 189 ++++++------------
> 1 file changed, 63 insertions(+), 126 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml b/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml
> index 1970503389aa..128545cedc7f 100644
> --- a/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml
> +++ b/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml
> @@ -85,22 +85,14 @@ patternProperties:
> description: Specifies the DFSDM filter instance used.
> maxItems: 1
>
> - interrupts:
> - maxItems: 1
> + '#address-cells':
> + const: 1
>
> - st,adc-channels:
> - description: |
> - List of single-ended channels muxed for this ADC.
> - On stm32h7 and stm32mp1:
> - - For st,stm32-dfsdm-adc: up to 8 channels numbered from 0 to 7.
> - - For st,stm32-dfsdm-dmic: 1 channel numbered from 0 to 7.
> - $ref: /schemas/types.yaml#/definitions/uint32-array
> - items:
> - minimum: 0
> - maximum: 7
> + '#size-cells':
> + const: 0
>
> - st,adc-channel-names:
> - description: List of single-ended channel names.
> + interrupts:
> + maxItems: 1
>
> st,filter-order:
> description: |
> @@ -111,39 +103,6 @@ patternProperties:
> $ref: /schemas/types.yaml#/definitions/uint32
> maximum: 5
>
> - "#io-channel-cells":
> - const: 1
> -
> - st,adc-channel-types:
> - description: |
> - Single-ended channel input type.
> - - "SPI_R": SPI with data on rising edge (default)
> - - "SPI_F": SPI with data on falling edge
> - - "MANCH_R": manchester codec, rising edge = logic 0, falling edge = logic 1
> - - "MANCH_F": manchester codec, rising edge = logic 1, falling edge = logic 0
> - items:
> - enum: [ SPI_R, SPI_F, MANCH_R, MANCH_F ]
> - $ref: /schemas/types.yaml#/definitions/non-unique-string-array
> -
> - st,adc-channel-clk-src:
> - description: |
> - Conversion clock source.
> - - "CLKIN": external SPI clock (CLKIN x)
> - - "CLKOUT": internal SPI clock (CLKOUT) (default)
> - - "CLKOUT_F": internal SPI clock divided by 2 (falling edge).
> - - "CLKOUT_R": internal SPI clock divided by 2 (rising edge).
> - items:
> - enum: [ CLKIN, CLKOUT, CLKOUT_F, CLKOUT_R ]
> - $ref: /schemas/types.yaml#/definitions/non-unique-string-array
> -
> - st,adc-alt-channel:
> - description:
> - Must be defined if two sigma delta modulators are
> - connected on same SPI input.
> - If not set, channel n is connected to SPI input n.
> - If set, channel n is connected to SPI input n + 1.
> - type: boolean
> -
> st,filter0-sync:
> description:
> Set to 1 to synchronize with DFSDM filter instance 0.
> @@ -157,14 +116,68 @@ patternProperties:
> items:
> - const: rx
>
> + patternProperties:
> + "^channel@([0-9]|1[0-9])$":
> + type: object
> + $ref: "adc.yaml"
> + description: Represents the external channels which are connected to the DFSDM.
> +
> + properties:
> + reg:
> + items:
> + minimum: 0
> + maximum: 19
> +
> + label:
> + description: |
> + Unique name to identify channel.
> +
> + st,adc-channel-types:
> + description: |
> + Single-ended channel input type.
> + - "SPI_R": SPI with data on rising edge (default)
> + - "SPI_F": SPI with data on falling edge
> + - "MANCH_R": manchester codec, rising edge = logic 0, falling edge = logic 1
> + - "MANCH_F": manchester codec, rising edge = logic 1, falling edge = logic 0
> + items:
> + enum: [ SPI_R, SPI_F, MANCH_R, MANCH_F ]
> + $ref: /schemas/types.yaml#/definitions/non-unique-string-array
> +
> + st,adc-channel-clk-src:
> + description: |
> + Conversion clock source.
> + - "CLKIN": external SPI clock (CLKIN x)
> + - "CLKOUT": internal SPI clock (CLKOUT) (default)
> + - "CLKOUT_F": internal SPI clock divided by 2 (falling edge).
> + - "CLKOUT_R": internal SPI clock divided by 2 (rising edge).
> + items:
> + enum: [ CLKIN, CLKOUT, CLKOUT_F, CLKOUT_R ]
> + $ref: /schemas/types.yaml#/definitions/non-unique-string-array
> +
> + st,adc-alt-channel:
> + description:
> + Must be defined if two sigma delta modulators are
> + connected on same SPI input.
> + If not set, channel n is connected to SPI input n.
> + If set, channel n is connected to SPI input n + 1.
> + type: boolean
> +
> + io-backends:
> + description: |
> + phandle to an external sigma delta modulator or internal ADC output.
> + $ref: /schemas/types.yaml#/definitions/phandle
> +
> + required:
> + - reg
> + - io-backends
> +
> + additionalProperties: false
> +
> required:
> - compatible
> - reg
> - interrupts
> - - st,adc-channels
> - - st,adc-channel-names
> - st,filter-order
> - - "#io-channel-cells"
>
> allOf:
> - if:
> @@ -175,14 +188,6 @@ patternProperties:
>
> then:
> properties:
> - st,adc-channels:
> - minItems: 1
> - maxItems: 8
> -
> - st,adc-channel-names:
> - minItems: 1
> - maxItems: 8
> -
> st,adc-channel-types:
> minItems: 1
> maxItems: 8
> @@ -191,14 +196,6 @@ patternProperties:
> minItems: 1
> maxItems: 8
>
> - io-channels:
> - description:
> - From common IIO binding. Used to pipe external sigma delta
> - modulator or internal ADC output to DFSDM channel.
> -
> - required:
> - - io-channels
> -
> - if:
> properties:
> compatible:
> @@ -207,12 +204,6 @@ patternProperties:
>
> then:
> properties:
> - st,adc-channels:
> - maxItems: 1
> -
> - st,adc-channel-names:
> - maxItems: 1
> -
> st,adc-channel-types:
> maxItems: 1
>
> @@ -237,15 +228,9 @@ patternProperties:
> "#sound-dai-cells":
> const: 0
>
> - io-channels:
> - description:
> - From common IIO binding. Used to pipe external sigma delta
> - modulator or internal ADC output to DFSDM channel.
> -
> required:
> - compatible
> - "#sound-dai-cells"
> - - io-channels
>
> allOf:
> - if:
> @@ -278,52 +263,4 @@ allOf:
> minimum: 0
> maximum: 5
>
> -examples:
> - - |
> - #include <dt-bindings/interrupt-controller/arm-gic.h>
> - #include <dt-bindings/clock/stm32mp1-clks.h>
> - dfsdm: dfsdm@4400d000 {
> - compatible = "st,stm32mp1-dfsdm";
> - reg = <0x4400d000 0x800>;
> - clocks = <&rcc DFSDM_K>, <&rcc ADFSDM_K>;
> - clock-names = "dfsdm", "audio";
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - dfsdm0: filter@0 {
> - compatible = "st,stm32-dfsdm-dmic";
> - reg = <0>;
> - interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
> - dmas = <&dmamux1 101 0x400 0x01>;
> - dma-names = "rx";
> - #io-channel-cells = <1>;
> - st,adc-channels = <1>;
> - st,adc-channel-names = "dmic0";
> - st,adc-channel-types = "SPI_R";
> - st,adc-channel-clk-src = "CLKOUT";
> - st,filter-order = <5>;
> -
> - asoc_pdm0: dfsdm-dai {
> - compatible = "st,stm32h7-dfsdm-dai";
> - #sound-dai-cells = <0>;
> - io-channels = <&dfsdm0 0>;
> - };
> - };
> -
> - dfsdm_pdm1: filter@1 {
> - compatible = "st,stm32-dfsdm-adc";
> - reg = <1>;
> - interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
> - dmas = <&dmamux1 102 0x400 0x01>;
> - dma-names = "rx";
> - #io-channel-cells = <1>;
> - st,adc-channels = <2 3>;
> - st,adc-channel-names = "in2", "in3";
> - st,adc-channel-types = "SPI_R", "SPI_R";
> - st,adc-channel-clk-src = "CLKOUT_F", "CLKOUT_F";
> - io-channels = <&sd_adc2 &sd_adc3>;
> - st,filter-order = <1>;
> - };
> - };
> -
> ...
> --
> 2.25.1
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [RFC v2 03/11] dt-bindings: iio: stm32-dfsdm-adc: add scaling support
2023-08-11 17:10 ` Rob Herring
@ 2023-08-31 15:53 ` Olivier MOYSAN
0 siblings, 0 replies; 10+ messages in thread
From: Olivier MOYSAN @ 2023-08-31 15:53 UTC (permalink / raw)
To: Rob Herring
Cc: Arnaud Pouliquen, Jonathan Cameron, Lars-Peter Clausen,
Krzysztof Kozlowski, Conor Dooley, Maxime Coquelin,
Alexandre Torgue, Fabrice Gasnier, alsa-devel, linux-iio,
devicetree, linux-stm32, linux-arm-kernel, linux-kernel
Hi Rob,
On 8/11/23 19:10, Rob Herring wrote:
> On Thu, Jul 27, 2023 at 05:03:14PM +0200, Olivier Moysan wrote:
>> Add scaling support to STM32 DFSDM.
>>
>> This introduces the following changes:
>
> Why?
>
This RFC is an attempt to support scaling through a change in DFSDM
topology.
These changes have some impacts on DFSDM and sd modulator bindings.
To keep things simple in this RFC, I skipped legacy support, to put the
emphasis on the new bindings proposal.
There are two changes here: adoption of the generic IIO bindings and new
"io-backends" property. This needs to be put in two separate patches at
the end, I think (as already done for driver patches)
Anyway, the current bindings would become deprecated with these changes.
I still have to consider how to support these legacy bindings for next
step, However.
BRs
Olivier
>> - Add ADC generic channel binding and remove support of deprecated
>> channel bindings.
>
> When was it deprecated?
>
>> - DFSDM is now implemented as a channel provider, so remove io-channels
>> properties.
>> - Add iio-backend property to connect DFSDM to an SD modulator.
>
> io-backends
>
> All sorts of ABI issues with this change. Please explain why you don't
> care.
>
>>
>> Signed-off-by: Olivier Moysan <olivier.moysan@foss.st.com>
>> ---
>> .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 189 ++++++------------
>> 1 file changed, 63 insertions(+), 126 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml b/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml
>> index 1970503389aa..128545cedc7f 100644
>> --- a/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml
>> +++ b/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml
>> @@ -85,22 +85,14 @@ patternProperties:
>> description: Specifies the DFSDM filter instance used.
>> maxItems: 1
>>
>> - interrupts:
>> - maxItems: 1
>> + '#address-cells':
>> + const: 1
>>
>> - st,adc-channels:
>> - description: |
>> - List of single-ended channels muxed for this ADC.
>> - On stm32h7 and stm32mp1:
>> - - For st,stm32-dfsdm-adc: up to 8 channels numbered from 0 to 7.
>> - - For st,stm32-dfsdm-dmic: 1 channel numbered from 0 to 7.
>> - $ref: /schemas/types.yaml#/definitions/uint32-array
>> - items:
>> - minimum: 0
>> - maximum: 7
>> + '#size-cells':
>> + const: 0
>>
>> - st,adc-channel-names:
>> - description: List of single-ended channel names.
>> + interrupts:
>> + maxItems: 1
>>
>> st,filter-order:
>> description: |
>> @@ -111,39 +103,6 @@ patternProperties:
>> $ref: /schemas/types.yaml#/definitions/uint32
>> maximum: 5
>>
>> - "#io-channel-cells":
>> - const: 1
>> -
>> - st,adc-channel-types:
>> - description: |
>> - Single-ended channel input type.
>> - - "SPI_R": SPI with data on rising edge (default)
>> - - "SPI_F": SPI with data on falling edge
>> - - "MANCH_R": manchester codec, rising edge = logic 0, falling edge = logic 1
>> - - "MANCH_F": manchester codec, rising edge = logic 1, falling edge = logic 0
>> - items:
>> - enum: [ SPI_R, SPI_F, MANCH_R, MANCH_F ]
>> - $ref: /schemas/types.yaml#/definitions/non-unique-string-array
>> -
>> - st,adc-channel-clk-src:
>> - description: |
>> - Conversion clock source.
>> - - "CLKIN": external SPI clock (CLKIN x)
>> - - "CLKOUT": internal SPI clock (CLKOUT) (default)
>> - - "CLKOUT_F": internal SPI clock divided by 2 (falling edge).
>> - - "CLKOUT_R": internal SPI clock divided by 2 (rising edge).
>> - items:
>> - enum: [ CLKIN, CLKOUT, CLKOUT_F, CLKOUT_R ]
>> - $ref: /schemas/types.yaml#/definitions/non-unique-string-array
>> -
>> - st,adc-alt-channel:
>> - description:
>> - Must be defined if two sigma delta modulators are
>> - connected on same SPI input.
>> - If not set, channel n is connected to SPI input n.
>> - If set, channel n is connected to SPI input n + 1.
>> - type: boolean
>> -
>> st,filter0-sync:
>> description:
>> Set to 1 to synchronize with DFSDM filter instance 0.
>> @@ -157,14 +116,68 @@ patternProperties:
>> items:
>> - const: rx
>>
>> + patternProperties:
>> + "^channel@([0-9]|1[0-9])$":
>> + type: object
>> + $ref: "adc.yaml"
>> + description: Represents the external channels which are connected to the DFSDM.
>> +
>> + properties:
>> + reg:
>> + items:
>> + minimum: 0
>> + maximum: 19
>> +
>> + label:
>> + description: |
>> + Unique name to identify channel.
>> +
>> + st,adc-channel-types:
>> + description: |
>> + Single-ended channel input type.
>> + - "SPI_R": SPI with data on rising edge (default)
>> + - "SPI_F": SPI with data on falling edge
>> + - "MANCH_R": manchester codec, rising edge = logic 0, falling edge = logic 1
>> + - "MANCH_F": manchester codec, rising edge = logic 1, falling edge = logic 0
>> + items:
>> + enum: [ SPI_R, SPI_F, MANCH_R, MANCH_F ]
>> + $ref: /schemas/types.yaml#/definitions/non-unique-string-array
>> +
>> + st,adc-channel-clk-src:
>> + description: |
>> + Conversion clock source.
>> + - "CLKIN": external SPI clock (CLKIN x)
>> + - "CLKOUT": internal SPI clock (CLKOUT) (default)
>> + - "CLKOUT_F": internal SPI clock divided by 2 (falling edge).
>> + - "CLKOUT_R": internal SPI clock divided by 2 (rising edge).
>> + items:
>> + enum: [ CLKIN, CLKOUT, CLKOUT_F, CLKOUT_R ]
>> + $ref: /schemas/types.yaml#/definitions/non-unique-string-array
>> +
>> + st,adc-alt-channel:
>> + description:
>> + Must be defined if two sigma delta modulators are
>> + connected on same SPI input.
>> + If not set, channel n is connected to SPI input n.
>> + If set, channel n is connected to SPI input n + 1.
>> + type: boolean
>> +
>> + io-backends:
>> + description: |
>> + phandle to an external sigma delta modulator or internal ADC output.
>> + $ref: /schemas/types.yaml#/definitions/phandle
>> +
>> + required:
>> + - reg
>> + - io-backends
>> +
>> + additionalProperties: false
>> +
>> required:
>> - compatible
>> - reg
>> - interrupts
>> - - st,adc-channels
>> - - st,adc-channel-names
>> - st,filter-order
>> - - "#io-channel-cells"
>>
>> allOf:
>> - if:
>> @@ -175,14 +188,6 @@ patternProperties:
>>
>> then:
>> properties:
>> - st,adc-channels:
>> - minItems: 1
>> - maxItems: 8
>> -
>> - st,adc-channel-names:
>> - minItems: 1
>> - maxItems: 8
>> -
>> st,adc-channel-types:
>> minItems: 1
>> maxItems: 8
>> @@ -191,14 +196,6 @@ patternProperties:
>> minItems: 1
>> maxItems: 8
>>
>> - io-channels:
>> - description:
>> - From common IIO binding. Used to pipe external sigma delta
>> - modulator or internal ADC output to DFSDM channel.
>> -
>> - required:
>> - - io-channels
>> -
>> - if:
>> properties:
>> compatible:
>> @@ -207,12 +204,6 @@ patternProperties:
>>
>> then:
>> properties:
>> - st,adc-channels:
>> - maxItems: 1
>> -
>> - st,adc-channel-names:
>> - maxItems: 1
>> -
>> st,adc-channel-types:
>> maxItems: 1
>>
>> @@ -237,15 +228,9 @@ patternProperties:
>> "#sound-dai-cells":
>> const: 0
>>
>> - io-channels:
>> - description:
>> - From common IIO binding. Used to pipe external sigma delta
>> - modulator or internal ADC output to DFSDM channel.
>> -
>> required:
>> - compatible
>> - "#sound-dai-cells"
>> - - io-channels
>>
>> allOf:
>> - if:
>> @@ -278,52 +263,4 @@ allOf:
>> minimum: 0
>> maximum: 5
>>
>> -examples:
>> - - |
>> - #include <dt-bindings/interrupt-controller/arm-gic.h>
>> - #include <dt-bindings/clock/stm32mp1-clks.h>
>> - dfsdm: dfsdm@4400d000 {
>> - compatible = "st,stm32mp1-dfsdm";
>> - reg = <0x4400d000 0x800>;
>> - clocks = <&rcc DFSDM_K>, <&rcc ADFSDM_K>;
>> - clock-names = "dfsdm", "audio";
>> - #address-cells = <1>;
>> - #size-cells = <0>;
>> -
>> - dfsdm0: filter@0 {
>> - compatible = "st,stm32-dfsdm-dmic";
>> - reg = <0>;
>> - interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
>> - dmas = <&dmamux1 101 0x400 0x01>;
>> - dma-names = "rx";
>> - #io-channel-cells = <1>;
>> - st,adc-channels = <1>;
>> - st,adc-channel-names = "dmic0";
>> - st,adc-channel-types = "SPI_R";
>> - st,adc-channel-clk-src = "CLKOUT";
>> - st,filter-order = <5>;
>> -
>> - asoc_pdm0: dfsdm-dai {
>> - compatible = "st,stm32h7-dfsdm-dai";
>> - #sound-dai-cells = <0>;
>> - io-channels = <&dfsdm0 0>;
>> - };
>> - };
>> -
>> - dfsdm_pdm1: filter@1 {
>> - compatible = "st,stm32-dfsdm-adc";
>> - reg = <1>;
>> - interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
>> - dmas = <&dmamux1 102 0x400 0x01>;
>> - dma-names = "rx";
>> - #io-channel-cells = <1>;
>> - st,adc-channels = <2 3>;
>> - st,adc-channel-names = "in2", "in3";
>> - st,adc-channel-types = "SPI_R", "SPI_R";
>> - st,adc-channel-clk-src = "CLKOUT_F", "CLKOUT_F";
>> - io-channels = <&sd_adc2 &sd_adc3>;
>> - st,filter-order = <1>;
>> - };
>> - };
>> -
>> ...
>> --
>> 2.25.1
>>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-08-31 15:53 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-27 15:03 [RFC v2 00/11] iio: add iio backend device type Olivier Moysan
2023-07-27 15:03 ` [RFC v2 03/11] dt-bindings: iio: stm32-dfsdm-adc: add scaling support Olivier Moysan
2023-08-11 17:10 ` Rob Herring
2023-08-31 15:53 ` Olivier MOYSAN
2023-07-27 15:03 ` [RFC v2 05/11] iio: adc: stm32-dfsdm: manage dfsdm as a channel provider Olivier Moysan
2023-07-27 15:03 ` [RFC v2 06/11] iio: adc: stm32-dfsdm: adopt generic channel bindings Olivier Moysan
2023-07-27 15:03 ` [RFC v2 07/11] iio: adc: stm32-dfsdm: add scaling support to dfsdm Olivier Moysan
2023-07-27 15:03 ` [RFC v2 09/11] ARM: dts: stm32: adopt new dfsdm bindings on stm32mp151 Olivier Moysan
2023-07-27 15:03 ` [RFC v2 10/11] ARM: dts: stm32: add dfsdm pins muxing on stm32mp15 Olivier Moysan
2023-07-27 15:03 ` [RFC v2 11/11] ARM: dts: stm32: add dfsdm iio support on stm32mp157c-ev Olivier Moysan
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).