[PATCH v2 0/2] dt-bindings: stm32: convert audio dfsdm to json-schema
Some audio properties documented in st,stm32-adfsdm.txt are already documented in Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml bindings. Move remaining properties from st,stm32-adfsdm.txt to st,stm32-dfsdm-adc.yaml, and remove st,stm32-adfsdm.txt.
Changes in v2: - Complete st,stm32-dfsdm-adc.yaml rather than converting st,stm32-adfsdm.txt
Olivier Moysan (2): dt-bindings: stm32: dfsdm: update audio properties dt-bindings: stm32: dfsdm: remove stm32-adfsdm.txt binding
.../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 7 ++- .../bindings/sound/st,stm32-adfsdm.txt | 63 ------------------- 2 files changed, 5 insertions(+), 65 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt
- Add missing compatible property in audio node. - Remove obsolete "st,stm32-dfsdm-pdm" compatible. - Remove useless comment in adc io-channels description.
Signed-off-by: Olivier Moysan olivier.moysan@st.com --- .../devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 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 d61bc011e820..6f2398cdc82d 100644 --- a/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml +++ b/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml @@ -199,8 +199,6 @@ patternProperties: description: From common IIO binding. Used to pipe external sigma delta modulator or internal ADC output to DFSDM channel. - This is not required for "st,stm32-dfsdm-pdm" compatibility as - PDM microphone is binded in Audio DT node.
required: - io-channels @@ -235,6 +233,10 @@ patternProperties: description: child node
properties: + compatible: + enum: + - st,stm32h7-dfsdm-dai + "#sound-dai-cells": const: 0
@@ -244,6 +246,7 @@ patternProperties: modulator or internal ADC output to DFSDM channel.
required: + - compatible - "#sound-dai-cells" - io-channels
On Tue, 20 Oct 2020 17:57:08 +0200, Olivier Moysan wrote:
- Add missing compatible property in audio node.
- Remove obsolete "st,stm32-dfsdm-pdm" compatible.
- Remove useless comment in adc io-channels description.
Signed-off-by: Olivier Moysan olivier.moysan@st.com
.../devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
Reviewed-by: Rob Herring robh@kernel.org
Device tree audio configuration for STM32 DFSDM is already covered in the following binding: Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml Remove stm32-adfsdm.txt obsolete binding.
Signed-off-by: Olivier Moysan olivier.moysan@st.com --- .../bindings/sound/st,stm32-adfsdm.txt | 63 ------------------- 1 file changed, 63 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt
diff --git a/Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt b/Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt deleted file mode 100644 index 864f5b00b031..000000000000 --- a/Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt +++ /dev/null @@ -1,63 +0,0 @@ -STMicroelectronics Audio Digital Filter Sigma Delta modulators(DFSDM) - -The DFSDM allows PDM microphones capture through SPI interface. The Audio -interface is seems as a sub block of the DFSDM device. -For details on DFSDM bindings refer to ../iio/adc/st,stm32-dfsdm-adc.txt - -Required properties: - - compatible: "st,stm32h7-dfsdm-dai". - - - #sound-dai-cells : Must be equal to 0 - - - io-channels : phandle to iio dfsdm instance node. - -Example of a sound card using audio DFSDM node. - - sound_card { - compatible = "audio-graph-card"; - - dais = <&cpu_port>; - }; - - dfsdm: dfsdm@40017000 { - compatible = "st,stm32h7-dfsdm"; - reg = <0x40017000 0x400>; - clocks = <&rcc DFSDM1_CK>; - clock-names = "dfsdm"; - #interrupt-cells = <1>; - #address-cells = <1>; - #size-cells = <0>; - - dfsdm_adc0: filter@0 { - compatible = "st,stm32-dfsdm-dmic"; - reg = <0>; - interrupts = <110>; - dmas = <&dmamux1 101 0x400 0x00>; - dma-names = "rx"; - 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>; - - dfsdm_dai0: dfsdm-dai { - compatible = "st,stm32h7-dfsdm-dai"; - #sound-dai-cells = <0>; - io-channels = <&dfsdm_adc0 0>; - cpu_port: port { - dfsdm_endpoint: endpoint { - remote-endpoint = <&dmic0_endpoint>; - }; - }; - }; - }; - - dmic0: dmic@0 { - compatible = "dmic-codec"; - #sound-dai-cells = <0>; - port { - dmic0_endpoint: endpoint { - remote-endpoint = <&dfsdm_endpoint>; - }; - }; - };
On Tue, 20 Oct 2020 17:57:09 +0200, Olivier Moysan wrote:
Device tree audio configuration for STM32 DFSDM is already covered in the following binding: Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml Remove stm32-adfsdm.txt obsolete binding.
Signed-off-by: Olivier Moysan olivier.moysan@st.com
.../bindings/sound/st,stm32-adfsdm.txt | 63 ------------------- 1 file changed, 63 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt
Reviewed-by: Rob Herring robh@kernel.org
On Tue, Oct 20, 2020 at 05:57:09PM +0200, Olivier Moysan wrote:
Device tree audio configuration for STM32 DFSDM is already covered in the following binding: Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml Remove stm32-adfsdm.txt obsolete binding.
Please submit patches using subject lines reflecting the style for the subsystem, this makes it easier for people to identify relevant patches. Look at what existing commits in the area you're changing are doing and make sure your subject lines visually resemble what they're doing. There's no need to resubmit to fix this alone.
On Tue, 20 Oct 2020 17:57:07 +0200, Olivier Moysan wrote:
Some audio properties documented in st,stm32-adfsdm.txt are already documented in Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml bindings. Move remaining properties from st,stm32-adfsdm.txt to st,stm32-dfsdm-adc.yaml, and remove st,stm32-adfsdm.txt.
Changes in v2:
- Complete st,stm32-dfsdm-adc.yaml rather than converting st,stm32-adfsdm.txt
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] dt-bindings: stm32: dfsdm: update audio properties commit: f24fd10bea5961629f22e1da0f56e8c918bdb2da [2/2] ASoC: dt-bindings: stm32: dfsdm: remove stm32-adfsdm.txt binding commit: ea8650730332ee3c707883a2de37756ea9122981
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
participants (3)
-
Mark Brown
-
Olivier Moysan
-
Rob Herring