diff options
author | Arnaud Pouliquen <arnaud.pouliquen@st.com> | 2016-09-13 03:58:24 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-09-14 13:15:07 -0400 |
commit | 04adc0842f5accf99e9757930fc429bf7788cfb3 (patch) | |
tree | e609258c761a00873c4ad4efb2643f63c602bad2 | |
parent | 5a4326d1c21bc9aa958d5e621e06cd1b13e50711 (diff) |
ASoC: sti: suppress inappropriate fields for sti sound card
Suppress fields that can be handled in driver using compatible string.
Rename compatibility strings accordingly.
Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@st.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt | 52 |
1 files changed, 16 insertions, 36 deletions
diff --git a/Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt b/Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt index 16bcdfb6760e..745dc62f76ea 100644 --- a/Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt +++ b/Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt | |||
@@ -11,7 +11,9 @@ Documentation/devicetree/bindings/sound/simple-card.txt. | |||
11 | --------------------------------------- | 11 | --------------------------------------- |
12 | 12 | ||
13 | Required properties: | 13 | Required properties: |
14 | - compatible: "st,sti-uni-player" or "st,sti-uni-reader" | 14 | - compatible: "st,stih407-uni-player-hdmi", "st,stih407-uni-player-pcm-out", |
15 | "st,stih407-uni-player-dac", "st,stih407-uni-player-spdif", | ||
16 | "st,stih407-uni-reader-pcm_in", "st,stih407-uni-reader-hdmi", | ||
15 | 17 | ||
16 | - st,syscfg: phandle to boot-device system configuration registers | 18 | - st,syscfg: phandle to boot-device system configuration registers |
17 | 19 | ||
@@ -33,32 +35,24 @@ Required properties: | |||
33 | "tx" for "st,sti-uni-player" compatibility | 35 | "tx" for "st,sti-uni-player" compatibility |
34 | "rx" for "st,sti-uni-reader" compatibility | 36 | "rx" for "st,sti-uni-reader" compatibility |
35 | 37 | ||
36 | - st,version: IP version integrated in SOC. | ||
37 | |||
38 | - dai-name: DAI name that describes the IP. | ||
39 | |||
40 | - st,mode: IP working mode depending on associated codec. | ||
41 | "HDMI" connected to HDMI codec and support IEC HDMI formats (player only). | ||
42 | "SPDIF" connected to SPDIF codec and support SPDIF formats (player only). | ||
43 | "PCM" PCM standard mode for I2S or TDM bus. | ||
44 | "TDM" TDM mode for TDM bus. | ||
45 | |||
46 | Required properties ("st,sti-uni-player" compatibility only): | 38 | Required properties ("st,sti-uni-player" compatibility only): |
47 | - clocks: CPU_DAI IP clock source, listed in the same order than the | 39 | - clocks: CPU_DAI IP clock source, listed in the same order than the |
48 | CPU_DAI properties. | 40 | CPU_DAI properties. |
49 | 41 | ||
50 | - st,uniperiph-id: internal SOC IP instance ID. | ||
51 | |||
52 | Optional properties: | 42 | Optional properties: |
53 | - pinctrl-0: defined for CPU_DAI@1 and CPU_DAI@4 to describe I2S PIOs for | 43 | - pinctrl-0: defined for CPU_DAI@1 and CPU_DAI@4 to describe I2S PIOs for |
54 | external codecs connection. | 44 | external codecs connection. |
55 | 45 | ||
56 | - pinctrl-names: should contain only one value - "default". | 46 | - pinctrl-names: should contain only one value - "default". |
57 | 47 | ||
48 | - st,tdm-mode: to declare to set TDM mode for unireader and uniplayer IPs. | ||
49 | Only compartible with IPs in charge of the external I2S/TDM bus. | ||
50 | Should be declared depending on associated codec. | ||
51 | |||
58 | Example: | 52 | Example: |
59 | 53 | ||
60 | sti_uni_player1: sti-uni-player@1 { | 54 | sti_uni_player1: sti-uni-player@0x8D81000 { |
61 | compatible = "st,sti-uni-player"; | 55 | compatible = "st,stih407-uni-player-hdmi"; |
62 | status = "okay"; | 56 | status = "okay"; |
63 | #sound-dai-cells = <0>; | 57 | #sound-dai-cells = <0>; |
64 | st,syscfg = <&syscfg_core>; | 58 | st,syscfg = <&syscfg_core>; |
@@ -66,15 +60,12 @@ Example: | |||
66 | reg = <0x8D81000 0x158>; | 60 | reg = <0x8D81000 0x158>; |
67 | interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>; | 61 | interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>; |
68 | dmas = <&fdma0 3 0 1>; | 62 | dmas = <&fdma0 3 0 1>; |
69 | st,dai-name = "Uni Player #1 (I2S)"; | ||
70 | dma-names = "tx"; | 63 | dma-names = "tx"; |
71 | st,uniperiph-id = <1>; | 64 | st,tdm-mode = <1>; |
72 | st,version = <5>; | ||
73 | st,mode = "TDM"; | ||
74 | }; | 65 | }; |
75 | 66 | ||
76 | sti_uni_player2: sti-uni-player@2 { | 67 | sti_uni_player2: sti-uni-player@0x8D82000 { |
77 | compatible = "st,sti-uni-player"; | 68 | compatible = "st,stih407-uni-player-pcm-out"; |
78 | status = "okay"; | 69 | status = "okay"; |
79 | #sound-dai-cells = <0>; | 70 | #sound-dai-cells = <0>; |
80 | st,syscfg = <&syscfg_core>; | 71 | st,syscfg = <&syscfg_core>; |
@@ -82,15 +73,11 @@ Example: | |||
82 | reg = <0x8D82000 0x158>; | 73 | reg = <0x8D82000 0x158>; |
83 | interrupts = <GIC_SPI 86 IRQ_TYPE_NONE>; | 74 | interrupts = <GIC_SPI 86 IRQ_TYPE_NONE>; |
84 | dmas = <&fdma0 4 0 1>; | 75 | dmas = <&fdma0 4 0 1>; |
85 | dai-name = "Uni Player #2 (DAC)"; | ||
86 | dma-names = "tx"; | 76 | dma-names = "tx"; |
87 | st,uniperiph-id = <2>; | ||
88 | st,version = <5>; | ||
89 | st,mode = "PCM"; | ||
90 | }; | 77 | }; |
91 | 78 | ||
92 | sti_uni_player3: sti-uni-player@3 { | 79 | sti_uni_player3: sti-uni-player@0x8D85000 { |
93 | compatible = "st,sti-uni-player"; | 80 | compatible = "st,stih407-uni-player-spdif"; |
94 | status = "okay"; | 81 | status = "okay"; |
95 | #sound-dai-cells = <0>; | 82 | #sound-dai-cells = <0>; |
96 | st,syscfg = <&syscfg_core>; | 83 | st,syscfg = <&syscfg_core>; |
@@ -99,14 +86,10 @@ Example: | |||
99 | interrupts = <GIC_SPI 89 IRQ_TYPE_NONE>; | 86 | interrupts = <GIC_SPI 89 IRQ_TYPE_NONE>; |
100 | dmas = <&fdma0 7 0 1>; | 87 | dmas = <&fdma0 7 0 1>; |
101 | dma-names = "tx"; | 88 | dma-names = "tx"; |
102 | dai-name = "Uni Player #3 (SPDIF)"; | ||
103 | st,uniperiph-id = <3>; | ||
104 | st,version = <5>; | ||
105 | st,mode = "SPDIF"; | ||
106 | }; | 89 | }; |
107 | 90 | ||
108 | sti_uni_reader1: sti-uni-reader@1 { | 91 | sti_uni_reader1: sti-uni-reader@0x8D84000 { |
109 | compatible = "st,sti-uni-reader"; | 92 | compatible = "st,stih407-uni-reader-hdmi"; |
110 | status = "disabled"; | 93 | status = "disabled"; |
111 | #sound-dai-cells = <0>; | 94 | #sound-dai-cells = <0>; |
112 | st,syscfg = <&syscfg_core>; | 95 | st,syscfg = <&syscfg_core>; |
@@ -114,9 +97,6 @@ Example: | |||
114 | interrupts = <GIC_SPI 88 IRQ_TYPE_NONE>; | 97 | interrupts = <GIC_SPI 88 IRQ_TYPE_NONE>; |
115 | dmas = <&fdma0 6 0 1>; | 98 | dmas = <&fdma0 6 0 1>; |
116 | dma-names = "rx"; | 99 | dma-names = "rx"; |
117 | dai-name = "Uni Reader #1 (HDMI RX)"; | ||
118 | st,version = <3>; | ||
119 | st,mode = "PCM"; | ||
120 | }; | 100 | }; |
121 | 101 | ||
122 | 2) sti-sas-codec: internal audio codec IPs driver | 102 | 2) sti-sas-codec: internal audio codec IPs driver |