[alsa-devel] [PATCH v2] ASoC: dt-bindings: stm32: convert spdfirx to json-schema
Convert the STM32 SPDIFRX bindings to DT schema format using json-schema.
Signed-off-by: Olivier Moysan olivier.moysan@st.com --- Changes in v2: - Add "additionalProperties: false" - Also change minItems to 2 for dmas property, as both DMAs are required. --- .../bindings/sound/st,stm32-spdifrx.txt | 56 ------------- .../bindings/sound/st,stm32-spdifrx.yaml | 84 +++++++++++++++++++ 2 files changed, 84 insertions(+), 56 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-spdifrx.yaml
diff --git a/Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt b/Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt deleted file mode 100644 index 33826f2459fa..000000000000 --- a/Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt +++ /dev/null @@ -1,56 +0,0 @@ -STMicroelectronics STM32 S/PDIF receiver (SPDIFRX). - -The SPDIFRX peripheral, is designed to receive an S/PDIF flow compliant with -IEC-60958 and IEC-61937. - -Required properties: - - compatible: should be "st,stm32h7-spdifrx" - - reg: cpu DAI IP base address and size - - clocks: must contain an entry for kclk (used as S/PDIF signal reference) - - clock-names: must contain "kclk" - - interrupts: cpu DAI interrupt line - - dmas: DMA specifiers for audio data DMA and iec control flow DMA - See STM32 DMA bindings, Documentation/devicetree/bindings/dma/stm32-dma.txt - - dma-names: two dmas have to be defined, "rx" and "rx-ctrl" - -Optional properties: - - resets: Reference to a reset controller asserting the SPDIFRX - -The device node should contain one 'port' child node with one child 'endpoint' -node, according to the bindings defined in Documentation/devicetree/bindings/ -graph.txt. - -Example: -spdifrx: spdifrx@40004000 { - compatible = "st,stm32h7-spdifrx"; - reg = <0x40004000 0x400>; - clocks = <&rcc SPDIFRX_CK>; - clock-names = "kclk"; - interrupts = <97>; - dmas = <&dmamux1 2 93 0x400 0x0>, - <&dmamux1 3 94 0x400 0x0>; - dma-names = "rx", "rx-ctrl"; - pinctrl-0 = <&spdifrx_pins>; - pinctrl-names = "default"; - - spdifrx_port: port { - cpu_endpoint: endpoint { - remote-endpoint = <&codec_endpoint>; - }; - }; -}; - -spdif_in: spdif-in { - compatible = "linux,spdif-dir"; - - codec_port: port { - codec_endpoint: endpoint { - remote-endpoint = <&cpu_endpoint>; - }; - }; -}; - -soundcard { - compatible = "audio-graph-card"; - dais = <&spdifrx_port>; -}; diff --git a/Documentation/devicetree/bindings/sound/st,stm32-spdifrx.yaml b/Documentation/devicetree/bindings/sound/st,stm32-spdifrx.yaml new file mode 100644 index 000000000000..e19313e7a552 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/st,stm32-spdifrx.yaml @@ -0,0 +1,84 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/st,stm32-spdifrx.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: STMicroelectronics STM32 S/PDIF receiver (SPDIFRX) + +maintainers: + - Olivier Moysan olivier.moysan@st.com + +description: | + The SPDIFRX peripheral, is designed to receive an S/PDIF flow compliant with + IEC-60958 and IEC-61937. + +properties: + compatible: + enum: + - st,stm32h7-spdifrx + + "#sound-dai-cells": + const: 0 + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + + clock-names: + items: + - const: kclk + + interrupts: + maxItems: 1 + + dmas: + description: | + Two DMA channel specifiers are requested: + - audio data capture DMA + - IEC status bits capture DMA + See STM32 DMA bindings /bindings/dma/stm32-dma.txt. + minItems: 2 + maxItems: 2 + + dma-names: + items: + - const: rx + - const: rx-ctrl + + resets: + maxItems: 1 + +required: + - compatible + - "#sound-dai-cells" + - reg + - clocks + - clock-names + - interrupts + - dmas + - dma-names + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/clock/stm32mp1-clks.h> + spdifrx: spdifrx@40004000 { + compatible = "st,stm32h7-spdifrx"; + #sound-dai-cells = <0>; + reg = <0x40004000 0x400>; + clocks = <&rcc SPDIF_K>; + clock-names = "kclk"; + interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&dmamux1 2 93 0x400 0x0>, + <&dmamux1 3 94 0x400 0x0>; + dma-names = "rx", "rx-ctrl"; + pinctrl-0 = <&spdifrx_pins>; + pinctrl-names = "default"; + }; + +...
On Thu, Jan 16, 2020 at 11:52:44AM +0100, Olivier Moysan wrote:
Convert the STM32 SPDIFRX bindings to DT schema format using json-schema.
Signed-off-by: Olivier Moysan olivier.moysan@st.com
Changes in v2:
- Add "additionalProperties: false"
- Also change minItems to 2 for dmas property, as both DMAs are required.
.../bindings/sound/st,stm32-spdifrx.txt | 56 ------------- .../bindings/sound/st,stm32-spdifrx.yaml | 84 +++++++++++++++++++ 2 files changed, 84 insertions(+), 56 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-spdifrx.yaml
diff --git a/Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt b/Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt deleted file mode 100644 index 33826f2459fa..000000000000 --- a/Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt +++ /dev/null @@ -1,56 +0,0 @@ -STMicroelectronics STM32 S/PDIF receiver (SPDIFRX).
-The SPDIFRX peripheral, is designed to receive an S/PDIF flow compliant with -IEC-60958 and IEC-61937.
-Required properties:
- compatible: should be "st,stm32h7-spdifrx"
- reg: cpu DAI IP base address and size
- clocks: must contain an entry for kclk (used as S/PDIF signal reference)
- clock-names: must contain "kclk"
- interrupts: cpu DAI interrupt line
- dmas: DMA specifiers for audio data DMA and iec control flow DMA
- See STM32 DMA bindings, Documentation/devicetree/bindings/dma/stm32-dma.txt
- dma-names: two dmas have to be defined, "rx" and "rx-ctrl"
-Optional properties:
- resets: Reference to a reset controller asserting the SPDIFRX
-The device node should contain one 'port' child node with one child 'endpoint' -node, according to the bindings defined in Documentation/devicetree/bindings/ -graph.txt.
-Example: -spdifrx: spdifrx@40004000 {
- compatible = "st,stm32h7-spdifrx";
- reg = <0x40004000 0x400>;
- clocks = <&rcc SPDIFRX_CK>;
- clock-names = "kclk";
- interrupts = <97>;
- dmas = <&dmamux1 2 93 0x400 0x0>,
<&dmamux1 3 94 0x400 0x0>;- dma-names = "rx", "rx-ctrl";
- pinctrl-0 = <&spdifrx_pins>;
- pinctrl-names = "default";
- spdifrx_port: port {
cpu_endpoint: endpoint {remote-endpoint = <&codec_endpoint>;};- };
-};
-spdif_in: spdif-in {
- compatible = "linux,spdif-dir";
- codec_port: port {
codec_endpoint: endpoint {remote-endpoint = <&cpu_endpoint>;};- };
-};
-soundcard {
- compatible = "audio-graph-card";
- dais = <&spdifrx_port>;
-}; diff --git a/Documentation/devicetree/bindings/sound/st,stm32-spdifrx.yaml b/Documentation/devicetree/bindings/sound/st,stm32-spdifrx.yaml new file mode 100644 index 000000000000..e19313e7a552 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/st,stm32-spdifrx.yaml @@ -0,0 +1,84 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/st,stm32-spdifrx.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml#
+title: STMicroelectronics STM32 S/PDIF receiver (SPDIFRX)
+maintainers:
- Olivier Moysan olivier.moysan@st.com
+description: |
- The SPDIFRX peripheral, is designed to receive an S/PDIF flow compliant with
- IEC-60958 and IEC-61937.
+properties:
- compatible:
- enum:
- st,stm32h7-spdifrx- "#sound-dai-cells":
- const: 0
- reg:
- maxItems: 1
- clocks:
- maxItems: 1
- clock-names:
- items:
- const: kclk- interrupts:
- maxItems: 1
- dmas:
- description: |
Two DMA channel specifiers are requested:- audio data capture DMA- IEC status bits capture DMASee STM32 DMA bindings /bindings/dma/stm32-dma.txt.- minItems: 2
- maxItems: 2
dmas: items: - description: audio data capture DMA - description: IEC status bits capture DMA
And minItems/maxItems aren't necessary.
I'd probably just drop 'See STM32 DMA bindings /bindings/dma/stm32-dma.txt' too, so we don't have to update this when that file is converted to schema.
- dma-names:
- items:
- const: rx- const: rx-ctrl- resets:
- maxItems: 1
+required:
- compatible
- "#sound-dai-cells"
- reg
- clocks
- clock-names
- interrupts
- dmas
- dma-names
+additionalProperties: false
+examples:
- |
- #include <dt-bindings/interrupt-controller/arm-gic.h>
- #include <dt-bindings/clock/stm32mp1-clks.h>
- spdifrx: spdifrx@40004000 {
compatible = "st,stm32h7-spdifrx";#sound-dai-cells = <0>;reg = <0x40004000 0x400>;clocks = <&rcc SPDIF_K>;clock-names = "kclk";interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;dmas = <&dmamux1 2 93 0x400 0x0>,<&dmamux1 3 94 0x400 0x0>;dma-names = "rx", "rx-ctrl";pinctrl-0 = <&spdifrx_pins>;pinctrl-names = "default";- };
+...
2.17.1
participants (2)
-
Olivier Moysan -
Rob Herring