-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'asoc/topic/inte' into asoc-next
- Loading branch information
Showing
64 changed files
with
4,398 additions
and
499 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| * Rockchip PDM controller | ||
|
|
||
| Required properties: | ||
|
|
||
| - compatible: "rockchip,pdm" | ||
| - reg: physical base address of the controller and length of memory mapped | ||
| region. | ||
| - dmas: DMA specifiers for rx dma. See the DMA client binding, | ||
| Documentation/devicetree/bindings/dma/dma.txt | ||
| - dma-names: should include "rx". | ||
| - clocks: a list of phandle + clock-specifer pairs, one for each entry in clock-names. | ||
| - clock-names: should contain following: | ||
| - "pdm_hclk": clock for PDM BUS | ||
| - "pdm_clk" : clock for PDM controller | ||
| - pinctrl-names: Must contain a "default" entry. | ||
| - pinctrl-N: One property must exist for each entry in | ||
| pinctrl-names. See ../pinctrl/pinctrl-bindings.txt | ||
| for details of the property values. | ||
|
|
||
| Example for rk3328 PDM controller: | ||
|
|
||
| pdm: pdm@ff040000 { | ||
| compatible = "rockchip,pdm"; | ||
| reg = <0x0 0xff040000 0x0 0x1000>; | ||
| clocks = <&clk_pdm>, <&clk_gates28 0>; | ||
| clock-names = "pdm_clk", "pdm_hclk"; | ||
| dmas = <&pdma 16>; | ||
| #dma-cells = <1>; | ||
| dma-names = "rx"; | ||
| pinctrl-names = "default", "sleep"; | ||
| pinctrl-0 = <&pdmm0_clk | ||
| &pdmm0_fsync | ||
| &pdmm0_sdi0 | ||
| &pdmm0_sdi1 | ||
| &pdmm0_sdi2 | ||
| &pdmm0_sdi3>; | ||
| pinctrl-1 = <&pdmm0_sleep>; | ||
| status = "disabled"; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| STMicroelectronics STM32 SPI/I2S Controller | ||
|
|
||
| The SPI/I2S block supports I2S/PCM protocols when configured on I2S mode. | ||
| Only some SPI instances support I2S. | ||
|
|
||
| Required properties: | ||
| - compatible: Must be "st,stm32h7-i2s" | ||
| - reg: Offset and length of the device's register set. | ||
| - interrupts: Must contain the interrupt line id. | ||
| - clocks: Must contain phandle and clock specifier pairs for each entry | ||
| in clock-names. | ||
| - clock-names: Must contain "i2sclk", "pclk", "x8k" and "x11k". | ||
| "i2sclk": clock which feeds the internal clock generator | ||
| "pclk": clock which feeds the peripheral bus interface | ||
| "x8k": I2S parent clock for sampling rates multiple of 8kHz. | ||
| "x11k": I2S parent clock for sampling rates multiple of 11.025kHz. | ||
| - dmas: DMA specifiers for tx and rx dma. | ||
| See Documentation/devicetree/bindings/dma/stm32-dma.txt. | ||
| - dma-names: Identifier for each DMA request line. Must be "tx" and "rx". | ||
| - pinctrl-names: should contain only value "default" | ||
| - pinctrl-0: see Documentation/devicetree/bindings/pinctrl/pinctrl-stm32.txt | ||
|
|
||
| Optional properties: | ||
| - resets: Reference to a reset controller asserting the reset controller | ||
|
|
||
| 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: | ||
| sound_card { | ||
| compatible = "audio-graph-card"; | ||
| dais = <&i2s2_port>; | ||
| }; | ||
|
|
||
| i2s2: audio-controller@40003800 { | ||
| compatible = "st,stm32h7-i2s"; | ||
| reg = <0x40003800 0x400>; | ||
| interrupts = <36>; | ||
| clocks = <&rcc PCLK1>, <&rcc SPI2_CK>, <&rcc PLL1_Q>, <&rcc PLL2_P>; | ||
| clock-names = "pclk", "i2sclk", "x8k", "x11k"; | ||
| dmas = <&dmamux2 2 39 0x400 0x1>, | ||
| <&dmamux2 3 40 0x400 0x1>; | ||
| dma-names = "rx", "tx"; | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&pinctrl_i2s2>; | ||
|
|
||
| i2s2_port: port@0 { | ||
| cpu_endpoint: endpoint { | ||
| remote-endpoint = <&codec_endpoint>; | ||
| format = "i2s"; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| audio-codec { | ||
| codec_port: port@0 { | ||
| codec_endpoint: endpoint { | ||
| remote-endpoint = <&cpu_endpoint>; | ||
| }; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| 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>; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.