Unverified Commit 81437cc3 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "dt-bindings: stm32: convert audio dfsdm to json-schema" from... 

Merge series "dt-bindings: stm32: convert audio dfsdm to json-schema" from Olivier Moysan <olivier.moysan@st.com>:

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

--
2.17.1
parents 1bfa3eaa ea865073

Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml

+5 −2
Original line number Diff line number Diff line
@@ -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

Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt

deleted100644 → 0
+0 −63
Original line number Diff line number Diff line 
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>;

			};

		};

	};