aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2006-10-13 14:09:59 -0400
committerJaroslav Kysela <perex@suse.cz>2007-02-09 03:00:56 -0500
commitb3b9c1cbb35125f7e43a323ebe89e7a74e3c1ac2 (patch)
tree74a74811a31263e25e64b67411561e336b7d3c68 /sound
parentb5c5fd24b9d34e4670cb339e546bfae7ad316354 (diff)
[ALSA] Remove trailing whitespaces from soc/* files
Remove trailing whitespaces from soc/* files added by the conversion to C99-style initialization. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/at91/at91rm9200-i2s.c34
-rw-r--r--sound/soc/codecs/wm8731.c94
-rw-r--r--sound/soc/codecs/wm8750.c210
-rw-r--r--sound/soc/pxa/pxa2xx-i2s.c58
4 files changed, 198 insertions, 198 deletions
diff --git a/sound/soc/at91/at91rm9200-i2s.c b/sound/soc/at91/at91rm9200-i2s.c
index 91f1daa44f19..8c4d3b999053 100644
--- a/sound/soc/at91/at91rm9200-i2s.c
+++ b/sound/soc/at91/at91rm9200-i2s.c
@@ -52,9 +52,9 @@ static struct snd_soc_dai_mode at91rm9200_i2s[] = {
52 52
53 /* 8k: BCLK = (MCLK/10) = (60MHz/50) = 1.2MHz */ 53 /* 8k: BCLK = (MCLK/10) = (60MHz/50) = 1.2MHz */
54 { 54 {
55 .fmt = AT91RM9200_I2S_DAIFMT, 55 .fmt = AT91RM9200_I2S_DAIFMT,
56 .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, 56 .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
57 .pcmrate = SNDRV_PCM_RATE_8000, 57 .pcmrate = SNDRV_PCM_RATE_8000,
58 .pcmdir = AT91RM9200_I2S_DIR, 58 .pcmdir = AT91RM9200_I2S_DIR,
59 .flags = SND_SOC_DAI_BFS_DIV, 59 .flags = SND_SOC_DAI_BFS_DIV,
60 .fs = 1500, 60 .fs = 1500,
@@ -63,38 +63,38 @@ static struct snd_soc_dai_mode at91rm9200_i2s[] = {
63 }, 63 },
64 64
65 /* 16k: BCLK = (MCLK/3) ~= (60MHz/14) = 4.285714MHz */ 65 /* 16k: BCLK = (MCLK/3) ~= (60MHz/14) = 4.285714MHz */
66 { 66 {
67 .fmt = AT91RM9200_I2S_DAIFMT, 67 .fmt = AT91RM9200_I2S_DAIFMT,
68 .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, 68 .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
69 .pcmrate = SNDRV_PCM_RATE_16000, 69 .pcmrate = SNDRV_PCM_RATE_16000,
70 .pcmdir = AT91RM9200_I2S_DIR, 70 .pcmdir = AT91RM9200_I2S_DIR,
71 .flags = SND_SOC_DAI_BFS_DIV, 71 .flags = SND_SOC_DAI_BFS_DIV,
72 .fs = 750, 72 .fs = 750,
73 .bfs = SND_SOC_FSBD(3), 73 .bfs = SND_SOC_FSBD(3),
74 .flags (7 << 16 | 133), 74 .flags (7 << 16 | 133),
75 }, 75 },
76 76
77 /* 24k: BCLK = (MCLK/10) = (60MHz/50) = 1.2MHz */ 77 /* 24k: BCLK = (MCLK/10) = (60MHz/50) = 1.2MHz */
78 { 78 {
79 .fmt = AT91RM9200_I2S_DAIFMT, 79 .fmt = AT91RM9200_I2S_DAIFMT,
80 .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, 80 .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
81 .pcmrate = SNDRV_PCM_RATE_22050, 81 .pcmrate = SNDRV_PCM_RATE_22050,
82 .pcmdir = AT91RM9200_I2S_DIR, 82 .pcmdir = AT91RM9200_I2S_DIR,
83 .flags = SND_SOC_DAI_BFS_DIV, 83 .flags = SND_SOC_DAI_BFS_DIV,
84 .fs = 500, 84 .fs = 500,
85 .bfs = SND_SOC_FSBD(10), 85 .bfs = SND_SOC_FSBD(10),
86 .priv = (25 << 16 | 24), 86 .priv = (25 << 16 | 24),
87 }, 87 },
88 88
89 /* 48kHz: BCLK = (MCLK/5) ~= (60MHz/26) = 2.3076923MHz */ 89 /* 48kHz: BCLK = (MCLK/5) ~= (60MHz/26) = 2.3076923MHz */
90 { 90 {
91 .fmt = AT91RM9200_I2S_DAIFMT, 91 .fmt = AT91RM9200_I2S_DAIFMT,
92 .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, 92 .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
93 .pcmrate = SNDRV_PCM_RATE_48000, 93 .pcmrate = SNDRV_PCM_RATE_48000,
94 .pcmdir = AT91RM9200_I2S_DIR, 94 .pcmdir = AT91RM9200_I2S_DIR,
95 .flags = SND_SOC_DAI_BFS_DIV, 95 .flags = SND_SOC_DAI_BFS_DIV,
96 .fs = 250, 96 .fs = 250,
97 .bfs SND_SOC_FSBD(5), 97 .bfs SND_SOC_FSBD(5),
98 .priv = (13 << 16 | 23), 98 .priv = (13 << 16 | 23),
99 }, 99 },
100}; 100};
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index 03a6bb9b8773..9adbd2d401c4 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -87,89 +87,89 @@ static struct snd_soc_dai_mode wm8731_modes[] = {
87 /* 8k */ 87 /* 8k */
88 { 88 {
89 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 89 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
90 .pcmfmt = WM8731_HIFI_BITS, 90 .pcmfmt = WM8731_HIFI_BITS,
91 .pcmrate = SNDRV_PCM_RATE_8000, 91 .pcmrate = SNDRV_PCM_RATE_8000,
92 .pcmdir = WM8731_DIR, 92 .pcmdir = WM8731_DIR,
93 .fs = 1536, 93 .fs = 1536,
94 .bfs = SND_SOC_FSB(64), 94 .bfs = SND_SOC_FSB(64),
95 }, 95 },
96 { 96 {
97 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 97 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
98 .pcmfmt = WM8731_HIFI_BITS, 98 .pcmfmt = WM8731_HIFI_BITS,
99 .pcmrate = SNDRV_PCM_RATE_8000, 99 .pcmrate = SNDRV_PCM_RATE_8000,
100 .pcmdir = WM8731_DIR, 100 .pcmdir = WM8731_DIR,
101 .fs = 2304, 101 .fs = 2304,
102 .bfs = SND_SOC_FSB(64), 102 .bfs = SND_SOC_FSB(64),
103 }, 103 },
104 { 104 {
105 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 105 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
106 .pcmfmt = WM8731_HIFI_BITS, 106 .pcmfmt = WM8731_HIFI_BITS,
107 .pcmrate = SNDRV_PCM_RATE_8000, 107 .pcmrate = SNDRV_PCM_RATE_8000,
108 .pcmdir = WM8731_DIR, 108 .pcmdir = WM8731_DIR,
109 .fs = 1408, 109 .fs = 1408,
110 .bfs = SND_SOC_FSB(64), 110 .bfs = SND_SOC_FSB(64),
111 }, 111 },
112 { 112 {
113 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 113 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
114 .pcmfmt = WM8731_HIFI_BITS, 114 .pcmfmt = WM8731_HIFI_BITS,
115 .pcmrate = SNDRV_PCM_RATE_8000, 115 .pcmrate = SNDRV_PCM_RATE_8000,
116 .pcmdir = WM8731_DIR, 116 .pcmdir = WM8731_DIR,
117 .fs = 2112, 117 .fs = 2112,
118 .bfs = SND_SOC_FSB(64), 118 .bfs = SND_SOC_FSB(64),
119 }, 119 },
120 120
121 /* 32k */ 121 /* 32k */
122 { 122 {
123 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 123 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
124 .pcmfmt = WM8731_HIFI_BITS, 124 .pcmfmt = WM8731_HIFI_BITS,
125 .pcmrate = SNDRV_PCM_RATE_32000, 125 .pcmrate = SNDRV_PCM_RATE_32000,
126 .pcmdir = WM8731_DIR, 126 .pcmdir = WM8731_DIR,
127 .fs = 384, 127 .fs = 384,
128 .bfs = SND_SOC_FSB(64), 128 .bfs = SND_SOC_FSB(64),
129 }, 129 },
130 { 130 {
131 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 131 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
132 .pcmfmt = WM8731_HIFI_BITS, 132 .pcmfmt = WM8731_HIFI_BITS,
133 .pcmrate = SNDRV_PCM_RATE_32000, 133 .pcmrate = SNDRV_PCM_RATE_32000,
134 .pcmdir = WM8731_DIR, 134 .pcmdir = WM8731_DIR,
135 .fs = 576, 135 .fs = 576,
136 .bfs = SND_SOC_FSB(64), 136 .bfs = SND_SOC_FSB(64),
137 }, 137 },
138 138
139 /* 44.1k & 48k */ 139 /* 44.1k & 48k */
140 { 140 {
141 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 141 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
142 .pcmfmt = WM8731_HIFI_BITS, 142 .pcmfmt = WM8731_HIFI_BITS,
143 .pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000, 143 .pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
144 .pcmdir = WM8731_DIR, 144 .pcmdir = WM8731_DIR,
145 .fs = 256, 145 .fs = 256,
146 .bfs = SND_SOC_FSB(64), 146 .bfs = SND_SOC_FSB(64),
147 }, 147 },
148 { 148 {
149 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 149 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
150 .pcmfmt = WM8731_HIFI_BITS, 150 .pcmfmt = WM8731_HIFI_BITS,
151 .pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000, 151 .pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
152 .pcmdir = WM8731_DIR, 152 .pcmdir = WM8731_DIR,
153 .fs = 384, 153 .fs = 384,
154 .bfs = SND_SOC_FSB(64), 154 .bfs = SND_SOC_FSB(64),
155 }, 155 },
156 156
157 /* 88.2 & 96k */ 157 /* 88.2 & 96k */
158 { 158 {
159 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 159 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
160 .pcmfmt = WM8731_HIFI_BITS, 160 .pcmfmt = WM8731_HIFI_BITS,
161 .pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000, 161 .pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000,
162 .pcmdir = WM8731_DIR, 162 .pcmdir = WM8731_DIR,
163 .fs = 128, 163 .fs = 128,
164 .bfs = SND_SOC_FSB(64), 164 .bfs = SND_SOC_FSB(64),
165 165
166 }, 166 },
167 { 167 {
168 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 168 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
169 .pcmfmt = WM8731_HIFI_BITS, 169 .pcmfmt = WM8731_HIFI_BITS,
170 .pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000, 170 .pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000,
171 .pcmdir = WM8731_DIR, 171 .pcmdir = WM8731_DIR,
172 .fs = 192, 172 .fs = 192,
173 .bfs = SND_SOC_FSB(64), 173 .bfs = SND_SOC_FSB(64),
174 }, 174 },
175 175
@@ -177,66 +177,66 @@ static struct snd_soc_dai_mode wm8731_modes[] = {
177 /* 8k */ 177 /* 8k */
178 { 178 {
179 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 179 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
180 .pcmfmt = WM8731_HIFI_BITS, 180 .pcmfmt = WM8731_HIFI_BITS,
181 .pcmrate = SNDRV_PCM_RATE_8000, 181 .pcmrate = SNDRV_PCM_RATE_8000,
182 .pcmdir = WM8731_DIR, 182 .pcmdir = WM8731_DIR,
183 .flags = SND_SOC_DAI_BFS_DIV, 183 .flags = SND_SOC_DAI_BFS_DIV,
184 .fs = 1500, 184 .fs = 1500,
185 .bfs = SND_SOC_FSBD(1), 185 .bfs = SND_SOC_FSBD(1),
186 }, 186 },
187 187
188 /* 44.1k */ 188 /* 44.1k */
189 { 189 {
190 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 190 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
191 .pcmfmt = WM8731_HIFI_BITS, 191 .pcmfmt = WM8731_HIFI_BITS,
192 .pcmrate = SNDRV_PCM_RATE_44100, 192 .pcmrate = SNDRV_PCM_RATE_44100,
193 .pcmdir = WM8731_DIR, 193 .pcmdir = WM8731_DIR,
194 .flags = SND_SOC_DAI_BFS_DIV, 194 .flags = SND_SOC_DAI_BFS_DIV,
195 .fs = 272, 195 .fs = 272,
196 .bfs = SND_SOC_FSBD(1), 196 .bfs = SND_SOC_FSBD(1),
197 }, 197 },
198 198
199 /* 48k */ 199 /* 48k */
200 { 200 {
201 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 201 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
202 .pcmfmt = WM8731_HIFI_BITS, 202 .pcmfmt = WM8731_HIFI_BITS,
203 .pcmrate = SNDRV_PCM_RATE_48000, 203 .pcmrate = SNDRV_PCM_RATE_48000,
204 .pcmdir = WM8731_DIR, 204 .pcmdir = WM8731_DIR,
205 .flags = SND_SOC_DAI_BFS_DIV, 205 .flags = SND_SOC_DAI_BFS_DIV,
206 .fs = 250, 206 .fs = 250,
207 .bfs = SND_SOC_FSBD(1), 207 .bfs = SND_SOC_FSBD(1),
208 }, 208 },
209 209
210 /* 88.2k */ 210 /* 88.2k */
211 { 211 {
212 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 212 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
213 .pcmfmt = WM8731_HIFI_BITS, 213 .pcmfmt = WM8731_HIFI_BITS,
214 .pcmrate = SNDRV_PCM_RATE_88200, 214 .pcmrate = SNDRV_PCM_RATE_88200,
215 .pcmdir = WM8731_DIR, 215 .pcmdir = WM8731_DIR,
216 .flags = SND_SOC_DAI_BFS_DIV, 216 .flags = SND_SOC_DAI_BFS_DIV,
217 .fs = 136, 217 .fs = 136,
218 .bfs = SND_SOC_FSBD(1), 218 .bfs = SND_SOC_FSBD(1),
219 }, 219 },
220 220
221 /* 96k */ 221 /* 96k */
222 { 222 {
223 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 223 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
224 .pcmfmt = WM8731_HIFI_BITS, 224 .pcmfmt = WM8731_HIFI_BITS,
225 .pcmrate = SNDRV_PCM_RATE_96000, 225 .pcmrate = SNDRV_PCM_RATE_96000,
226 .pcmdir = WM8731_DIR, 226 .pcmdir = WM8731_DIR,
227 .flags = SND_SOC_DAI_BFS_DIV, 227 .flags = SND_SOC_DAI_BFS_DIV,
228 .fs = 125, 228 .fs = 125,
229 .bfs = SND_SOC_FSBD(1), 229 .bfs = SND_SOC_FSBD(1),
230 }, 230 },
231 231
232 /* codec frame and clock slave modes */ 232 /* codec frame and clock slave modes */
233 { 233 {
234 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBS_CFS, 234 .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
235 .pcmfmt = WM8731_HIFI_BITS, 235 .pcmfmt = WM8731_HIFI_BITS,
236 .pcmrate = WM8731_RATES, 236 .pcmrate = WM8731_RATES,
237 .pcmdir = WM8731_DIR, 237 .pcmdir = WM8731_DIR,
238 .flags = SND_SOC_DAI_BFS_DIV, 238 .flags = SND_SOC_DAI_BFS_DIV,
239 .fs = SND_SOC_FS_ALL, 239 .fs = SND_SOC_FS_ALL,
240 .bfs = SND_SOC_FSBD_ALL, 240 .bfs = SND_SOC_FSBD_ALL,
241 }, 241 },
242}; 242};
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index b07a6ed6aa66..243da712d9c1 100644
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -99,250 +99,250 @@ static struct snd_soc_dai_mode wm8750_modes[] = {
99 /* 8k */ 99 /* 8k */
100 { 100 {
101 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 101 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
102 .pcmfmt = WM8750_HIFI_BITS, 102 .pcmfmt = WM8750_HIFI_BITS,
103 .pcmrate = SNDRV_PCM_RATE_8000, 103 .pcmrate = SNDRV_PCM_RATE_8000,
104 .pcmdir = WM8750_DIR, 104 .pcmdir = WM8750_DIR,
105 .flags = SND_SOC_DAI_BFS_DIV, 105 .flags = SND_SOC_DAI_BFS_DIV,
106 .fs = 1536, 106 .fs = 1536,
107 .bfs = WM8750_HIFI_FSB, 107 .bfs = WM8750_HIFI_FSB,
108 }, 108 },
109 { 109 {
110 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 110 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
111 .pcmfmt = WM8750_HIFI_BITS, 111 .pcmfmt = WM8750_HIFI_BITS,
112 .pcmrate = SNDRV_PCM_RATE_8000, 112 .pcmrate = SNDRV_PCM_RATE_8000,
113 .pcmdir = WM8750_DIR, 113 .pcmdir = WM8750_DIR,
114 .flags = SND_SOC_DAI_BFS_DIV, 114 .flags = SND_SOC_DAI_BFS_DIV,
115 .fs = 1408, 115 .fs = 1408,
116 .bfs = WM8750_HIFI_FSB, 116 .bfs = WM8750_HIFI_FSB,
117 }, 117 },
118 { 118 {
119 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 119 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
120 .pcmfmt = WM8750_HIFI_BITS, 120 .pcmfmt = WM8750_HIFI_BITS,
121 .pcmrate = SNDRV_PCM_RATE_8000, 121 .pcmrate = SNDRV_PCM_RATE_8000,
122 .pcmdir = WM8750_DIR, 122 .pcmdir = WM8750_DIR,
123 .flags = SND_SOC_DAI_BFS_DIV, 123 .flags = SND_SOC_DAI_BFS_DIV,
124 .fs = 2304, 124 .fs = 2304,
125 .bfs = WM8750_HIFI_FSB, 125 .bfs = WM8750_HIFI_FSB,
126 }, 126 },
127 { 127 {
128 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 128 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
129 .pcmfmt = WM8750_HIFI_BITS, 129 .pcmfmt = WM8750_HIFI_BITS,
130 .pcmrate = SNDRV_PCM_RATE_8000, 130 .pcmrate = SNDRV_PCM_RATE_8000,
131 .pcmdir = WM8750_DIR, 131 .pcmdir = WM8750_DIR,
132 .flags = SND_SOC_DAI_BFS_DIV, 132 .flags = SND_SOC_DAI_BFS_DIV,
133 .fs = 2112, 133 .fs = 2112,
134 .bfs = WM8750_HIFI_FSB, 134 .bfs = WM8750_HIFI_FSB,
135 }, 135 },
136 { 136 {
137 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 137 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
138 .pcmfmt = WM8750_HIFI_BITS, 138 .pcmfmt = WM8750_HIFI_BITS,
139 .pcmrate = SNDRV_PCM_RATE_8000, 139 .pcmrate = SNDRV_PCM_RATE_8000,
140 .pcmdir = WM8750_DIR, 140 .pcmdir = WM8750_DIR,
141 .flags = SND_SOC_DAI_BFS_DIV, 141 .flags = SND_SOC_DAI_BFS_DIV,
142 .fs = 1500, 142 .fs = 1500,
143 .bfs = WM8750_HIFI_FSB, 143 .bfs = WM8750_HIFI_FSB,
144 }, 144 },
145 145
146 /* 11.025k */ 146 /* 11.025k */
147 { 147 {
148 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 148 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
149 .pcmfmt = WM8750_HIFI_BITS, 149 .pcmfmt = WM8750_HIFI_BITS,
150 .pcmrate = SNDRV_PCM_RATE_11025, 150 .pcmrate = SNDRV_PCM_RATE_11025,
151 .pcmdir = WM8750_DIR, 151 .pcmdir = WM8750_DIR,
152 .flags = SND_SOC_DAI_BFS_DIV, 152 .flags = SND_SOC_DAI_BFS_DIV,
153 .fs = 1024, 153 .fs = 1024,
154 .bfs = WM8750_HIFI_FSB, 154 .bfs = WM8750_HIFI_FSB,
155 }, 155 },
156 { 156 {
157 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 157 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
158 .pcmfmt = WM8750_HIFI_BITS, 158 .pcmfmt = WM8750_HIFI_BITS,
159 .pcmrate = SNDRV_PCM_RATE_11025, 159 .pcmrate = SNDRV_PCM_RATE_11025,
160 .pcmdir = WM8750_DIR, 160 .pcmdir = WM8750_DIR,
161 .flags = SND_SOC_DAI_BFS_DIV, 161 .flags = SND_SOC_DAI_BFS_DIV,
162 .fs = 1536, 162 .fs = 1536,
163 .bfs = WM8750_HIFI_FSB, 163 .bfs = WM8750_HIFI_FSB,
164 }, 164 },
165 { 165 {
166 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 166 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
167 .pcmfmt = WM8750_HIFI_BITS, 167 .pcmfmt = WM8750_HIFI_BITS,
168 .pcmrate = SNDRV_PCM_RATE_11025, 168 .pcmrate = SNDRV_PCM_RATE_11025,
169 .pcmdir = WM8750_DIR, 169 .pcmdir = WM8750_DIR,
170 .flags = SND_SOC_DAI_BFS_DIV, 170 .flags = SND_SOC_DAI_BFS_DIV,
171 .fs = 1088, 171 .fs = 1088,
172 .bfs = WM8750_HIFI_FSB, 172 .bfs = WM8750_HIFI_FSB,
173 }, 173 },
174 174
175 /* 16k */ 175 /* 16k */
176 { 176 {
177 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 177 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
178 .pcmfmt = WM8750_HIFI_BITS, 178 .pcmfmt = WM8750_HIFI_BITS,
179 .pcmrate = SNDRV_PCM_RATE_16000, 179 .pcmrate = SNDRV_PCM_RATE_16000,
180 .pcmdir = WM8750_DIR, 180 .pcmdir = WM8750_DIR,
181 .flags = SND_SOC_DAI_BFS_DIV, 181 .flags = SND_SOC_DAI_BFS_DIV,
182 .fs = 768, 182 .fs = 768,
183 .bfs = WM8750_HIFI_FSB, 183 .bfs = WM8750_HIFI_FSB,
184 }, 184 },
185 { 185 {
186 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 186 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
187 .pcmfmt = WM8750_HIFI_BITS, 187 .pcmfmt = WM8750_HIFI_BITS,
188 .pcmrate = SNDRV_PCM_RATE_16000, 188 .pcmrate = SNDRV_PCM_RATE_16000,
189 .pcmdir = WM8750_DIR, 189 .pcmdir = WM8750_DIR,
190 .flags = SND_SOC_DAI_BFS_DIV, 190 .flags = SND_SOC_DAI_BFS_DIV,
191 .fs = 1152, 191 .fs = 1152,
192 .bfs = WM8750_HIFI_FSB 192 .bfs = WM8750_HIFI_FSB
193 }, 193 },
194 { 194 {
195 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 195 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
196 .pcmfmt = WM8750_HIFI_BITS, 196 .pcmfmt = WM8750_HIFI_BITS,
197 .pcmrate = SNDRV_PCM_RATE_16000, 197 .pcmrate = SNDRV_PCM_RATE_16000,
198 .pcmdir = WM8750_DIR, 198 .pcmdir = WM8750_DIR,
199 .flags = SND_SOC_DAI_BFS_DIV, 199 .flags = SND_SOC_DAI_BFS_DIV,
200 .fs = 750, 200 .fs = 750,
201 .bfs = WM8750_HIFI_FSB, 201 .bfs = WM8750_HIFI_FSB,
202 }, 202 },
203 203
204 /* 22.05k */ 204 /* 22.05k */
205 { 205 {
206 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 206 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
207 .pcmfmt = WM8750_HIFI_BITS, 207 .pcmfmt = WM8750_HIFI_BITS,
208 .pcmrate = SNDRV_PCM_RATE_22050, 208 .pcmrate = SNDRV_PCM_RATE_22050,
209 .pcmdir = WM8750_DIR, 209 .pcmdir = WM8750_DIR,
210 .flags = SND_SOC_DAI_BFS_DIV, 210 .flags = SND_SOC_DAI_BFS_DIV,
211 .fs = 512, 211 .fs = 512,
212 .bfs = WM8750_HIFI_FSB, 212 .bfs = WM8750_HIFI_FSB,
213 }, 213 },
214 { 214 {
215 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 215 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
216 .pcmfmt = WM8750_HIFI_BITS, 216 .pcmfmt = WM8750_HIFI_BITS,
217 .pcmrate = SNDRV_PCM_RATE_22050, 217 .pcmrate = SNDRV_PCM_RATE_22050,
218 .pcmdir = WM8750_DIR, 218 .pcmdir = WM8750_DIR,
219 .flags = SND_SOC_DAI_BFS_DIV, 219 .flags = SND_SOC_DAI_BFS_DIV,
220 .fs = 768, 220 .fs = 768,
221 .bfs = WM8750_HIFI_FSB, 221 .bfs = WM8750_HIFI_FSB,
222 }, 222 },
223 { 223 {
224 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 224 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
225 .pcmfmt = WM8750_HIFI_BITS, 225 .pcmfmt = WM8750_HIFI_BITS,
226 .pcmrate = SNDRV_PCM_RATE_22050, 226 .pcmrate = SNDRV_PCM_RATE_22050,
227 .pcmdir = WM8750_DIR, 227 .pcmdir = WM8750_DIR,
228 .flags = SND_SOC_DAI_BFS_DIV, 228 .flags = SND_SOC_DAI_BFS_DIV,
229 .fs = 544, 229 .fs = 544,
230 .bfs = WM8750_HIFI_FSB, 230 .bfs = WM8750_HIFI_FSB,
231 }, 231 },
232 232
233 /* 32k */ 233 /* 32k */
234 { 234 {
235 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 235 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
236 .pcmfmt = WM8750_HIFI_BITS, 236 .pcmfmt = WM8750_HIFI_BITS,
237 .pcmrate = SNDRV_PCM_RATE_32000, 237 .pcmrate = SNDRV_PCM_RATE_32000,
238 .pcmdir = WM8750_DIR, 238 .pcmdir = WM8750_DIR,
239 .flags = SND_SOC_DAI_BFS_DIV, 239 .flags = SND_SOC_DAI_BFS_DIV,
240 .fs = 384, 240 .fs = 384,
241 .bfs = WM8750_HIFI_FSB, 241 .bfs = WM8750_HIFI_FSB,
242 }, 242 },
243 { 243 {
244 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 244 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
245 .pcmfmt = WM8750_HIFI_BITS, 245 .pcmfmt = WM8750_HIFI_BITS,
246 .pcmrate = SNDRV_PCM_RATE_32000, 246 .pcmrate = SNDRV_PCM_RATE_32000,
247 .pcmdir = WM8750_DIR, 247 .pcmdir = WM8750_DIR,
248 .flags = SND_SOC_DAI_BFS_DIV, 248 .flags = SND_SOC_DAI_BFS_DIV,
249 .fs = 576, 249 .fs = 576,
250 .bfs = WM8750_HIFI_FSB, 250 .bfs = WM8750_HIFI_FSB,
251 }, 251 },
252 { 252 {
253 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 253 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
254 .pcmfmt = WM8750_HIFI_BITS, 254 .pcmfmt = WM8750_HIFI_BITS,
255 .pcmrate = SNDRV_PCM_RATE_32000, 255 .pcmrate = SNDRV_PCM_RATE_32000,
256 .pcmdir = WM8750_DIR, 256 .pcmdir = WM8750_DIR,
257 .flags = SND_SOC_DAI_BFS_DIV, 257 .flags = SND_SOC_DAI_BFS_DIV,
258 .fs = 375, 258 .fs = 375,
259 .bfs = WM8750_HIFI_FSB, 259 .bfs = WM8750_HIFI_FSB,
260 }, 260 },
261 261
262 /* 44.1k & 48k */ 262 /* 44.1k & 48k */
263 { 263 {
264 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 264 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
265 .pcmfmt = WM8750_HIFI_BITS, 265 .pcmfmt = WM8750_HIFI_BITS,
266 .pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000, 266 .pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
267 .pcmdir = WM8750_DIR, 267 .pcmdir = WM8750_DIR,
268 .flags = SND_SOC_DAI_BFS_DIV, 268 .flags = SND_SOC_DAI_BFS_DIV,
269 .fs = 256, 269 .fs = 256,
270 .bfs = WM8750_HIFI_FSB, 270 .bfs = WM8750_HIFI_FSB,
271 }, 271 },
272 { 272 {
273 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 273 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
274 .pcmfmt = WM8750_HIFI_BITS, 274 .pcmfmt = WM8750_HIFI_BITS,
275 .pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000, 275 .pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
276 .pcmdir = WM8750_DIR, 276 .pcmdir = WM8750_DIR,
277 .flags = SND_SOC_DAI_BFS_DIV, 277 .flags = SND_SOC_DAI_BFS_DIV,
278 .fs = 384, 278 .fs = 384,
279 .bfs = WM8750_HIFI_FSB, 279 .bfs = WM8750_HIFI_FSB,
280 }, 280 },
281 { 281 {
282 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 282 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
283 .pcmfmt = WM8750_HIFI_BITS, 283 .pcmfmt = WM8750_HIFI_BITS,
284 .pcmrate = SNDRV_PCM_RATE_44100, 284 .pcmrate = SNDRV_PCM_RATE_44100,
285 .pcmdir = WM8750_DIR, 285 .pcmdir = WM8750_DIR,
286 .flags = SND_SOC_DAI_BFS_DIV, 286 .flags = SND_SOC_DAI_BFS_DIV,
287 .fs = 272, 287 .fs = 272,
288 .bfs = WM8750_HIFI_FSB, 288 .bfs = WM8750_HIFI_FSB,
289 }, 289 },
290 { 290 {
291 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 291 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
292 .pcmfmt = WM8750_HIFI_BITS, 292 .pcmfmt = WM8750_HIFI_BITS,
293 .pcmrate = SNDRV_PCM_RATE_48000, 293 .pcmrate = SNDRV_PCM_RATE_48000,
294 .pcmdir = WM8750_DIR, 294 .pcmdir = WM8750_DIR,
295 .flags = SND_SOC_DAI_BFS_DIV, 295 .flags = SND_SOC_DAI_BFS_DIV,
296 .fs = 250, 296 .fs = 250,
297 .bfs = WM8750_HIFI_FSB, 297 .bfs = WM8750_HIFI_FSB,
298 }, 298 },
299 299
300 /* 88.2k & 96k */ 300 /* 88.2k & 96k */
301 { 301 {
302 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 302 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
303 .pcmfmt = WM8750_HIFI_BITS, 303 .pcmfmt = WM8750_HIFI_BITS,
304 .pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000, 304 .pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000,
305 .pcmdir = WM8750_DIR, 305 .pcmdir = WM8750_DIR,
306 .flags = SND_SOC_DAI_BFS_DIV, 306 .flags = SND_SOC_DAI_BFS_DIV,
307 .fs = 128, 307 .fs = 128,
308 .bfs = WM8750_HIFI_FSB, 308 .bfs = WM8750_HIFI_FSB,
309 }, 309 },
310 { 310 {
311 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 311 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
312 .pcmfmt = WM8750_HIFI_BITS, 312 .pcmfmt = WM8750_HIFI_BITS,
313 .pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000, 313 .pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000,
314 .pcmdir = WM8750_DIR, 314 .pcmdir = WM8750_DIR,
315 .flags = SND_SOC_DAI_BFS_DIV, 315 .flags = SND_SOC_DAI_BFS_DIV,
316 .fs = 192, 316 .fs = 192,
317 .bfs = WM8750_HIFI_FSB, 317 .bfs = WM8750_HIFI_FSB,
318 }, 318 },
319 { 319 {
320 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 320 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
321 .pcmfmt = WM8750_HIFI_BITS, 321 .pcmfmt = WM8750_HIFI_BITS,
322 .pcmrate = SNDRV_PCM_RATE_88200, 322 .pcmrate = SNDRV_PCM_RATE_88200,
323 .pcmdir = WM8750_DIR, 323 .pcmdir = WM8750_DIR,
324 .flags = SND_SOC_DAI_BFS_DIV, 324 .flags = SND_SOC_DAI_BFS_DIV,
325 .fs = 136, 325 .fs = 136,
326 .bfs = WM8750_HIFI_FSB, 326 .bfs = WM8750_HIFI_FSB,
327 }, 327 },
328 { 328 {
329 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 329 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
330 .pcmfmt = WM8750_HIFI_BITS, 330 .pcmfmt = WM8750_HIFI_BITS,
331 .pcmrate = SNDRV_PCM_RATE_96000, 331 .pcmrate = SNDRV_PCM_RATE_96000,
332 .pcmdir = WM8750_DIR, 332 .pcmdir = WM8750_DIR,
333 .flags = SND_SOC_DAI_BFS_DIV, 333 .flags = SND_SOC_DAI_BFS_DIV,
334 .fs = 125, 334 .fs = 125,
335 .bfs = WM8750_HIFI_FSB, 335 .bfs = WM8750_HIFI_FSB,
336 }, 336 },
337 337
338 /* codec frame and clock slave modes */ 338 /* codec frame and clock slave modes */
339 { 339 {
340 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBS_CFS, 340 .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
341 .pcmfmt = WM8750_HIFI_BITS, 341 .pcmfmt = WM8750_HIFI_BITS,
342 .pcmrate = WM8750_HIFI_RATES, 342 .pcmrate = WM8750_HIFI_RATES,
343 .pcmdir = WM8750_DIR, 343 .pcmdir = WM8750_DIR,
344 .flags = SND_SOC_DAI_BFS_DIV, 344 .flags = SND_SOC_DAI_BFS_DIV,
345 .fs = SND_SOC_FS_ALL, 345 .fs = SND_SOC_FS_ALL,
346 .bfs = SND_SOC_FSBD_ALL, 346 .bfs = SND_SOC_FSBD_ALL,
347 }, 347 },
348}; 348};
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index db2310f87fbe..99f1da32744b 100644
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -60,61 +60,61 @@ static struct snd_soc_dai_mode pxa2xx_i2s_modes[] = {
60 /* pxa2xx I2S frame and clock master modes */ 60 /* pxa2xx I2S frame and clock master modes */
61 { 61 {
62 .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS, 62 .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
63 .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, 63 .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
64 .pcmrate = SNDRV_PCM_RATE_8000, 64 .pcmrate = SNDRV_PCM_RATE_8000,
65 .pcmdir = PXA_I2S_DIR, 65 .pcmdir = PXA_I2S_DIR,
66 .flags = SND_SOC_DAI_BFS_DIV, 66 .flags = SND_SOC_DAI_BFS_DIV,
67 .fs = 256, 67 .fs = 256,
68 .bfs = SND_SOC_FSBD(4), 68 .bfs = SND_SOC_FSBD(4),
69 .priv = 0x48, 69 .priv = 0x48,
70 }, 70 },
71 { 71 {
72 .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS, 72 .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
73 .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, 73 .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
74 .pcmrate = SNDRV_PCM_RATE_11025, 74 .pcmrate = SNDRV_PCM_RATE_11025,
75 .pcmdir = PXA_I2S_DIR, 75 .pcmdir = PXA_I2S_DIR,
76 .flags = SND_SOC_DAI_BFS_DIV, 76 .flags = SND_SOC_DAI_BFS_DIV,
77 .fs = 256, 77 .fs = 256,
78 .bfs = SND_SOC_FSBD(4), 78 .bfs = SND_SOC_FSBD(4),
79 .priv = 0x34, 79 .priv = 0x34,
80 }, 80 },
81 { 81 {
82 .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS, 82 .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
83 .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, 83 .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
84 .pcmrate = SNDRV_PCM_RATE_16000, 84 .pcmrate = SNDRV_PCM_RATE_16000,
85 .pcmdir = PXA_I2S_DIR, 85 .pcmdir = PXA_I2S_DIR,
86 .flags = SND_SOC_DAI_BFS_DIV, 86 .flags = SND_SOC_DAI_BFS_DIV,
87 .fs = 256, 87 .fs = 256,
88 .bfs = SND_SOC_FSBD(4), 88 .bfs = SND_SOC_FSBD(4),
89 .priv = 0x24, 89 .priv = 0x24,
90 }, 90 },
91 { 91 {
92 .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS, 92 .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
93 .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, 93 .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
94 .pcmrate = SNDRV_PCM_RATE_22050, 94 .pcmrate = SNDRV_PCM_RATE_22050,
95 .pcmdir = PXA_I2S_DIR, 95 .pcmdir = PXA_I2S_DIR,
96 .flags = SND_SOC_DAI_BFS_DIV, 96 .flags = SND_SOC_DAI_BFS_DIV,
97 .fs = 256, 97 .fs = 256,
98 .bfs = SND_SOC_FSBD(4), 98 .bfs = SND_SOC_FSBD(4),
99 .priv = 0x1a, 99 .priv = 0x1a,
100 }, 100 },
101 { 101 {
102 .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS, 102 .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
103 .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, 103 .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
104 .pcmrate = SNDRV_PCM_RATE_44100, 104 .pcmrate = SNDRV_PCM_RATE_44100,
105 .pcmdir = PXA_I2S_DIR, 105 .pcmdir = PXA_I2S_DIR,
106 .flags = SND_SOC_DAI_BFS_DIV, 106 .flags = SND_SOC_DAI_BFS_DIV,
107 .fs = 256, 107 .fs = 256,
108 .bfs = SND_SOC_FSBD(4), 108 .bfs = SND_SOC_FSBD(4),
109 .priv = 0xd, 109 .priv = 0xd,
110 }, 110 },
111 { 111 {
112 .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS, 112 .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
113 .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, 113 .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
114 .pcmrate = SNDRV_PCM_RATE_48000, 114 .pcmrate = SNDRV_PCM_RATE_48000,
115 .pcmdir = PXA_I2S_DIR, 115 .pcmdir = PXA_I2S_DIR,
116 .flags = SND_SOC_DAI_BFS_DIV, 116 .flags = SND_SOC_DAI_BFS_DIV,
117 .fs = 256, 117 .fs = 256,
118 .bfs = SND_SOC_FSBD(4), 118 .bfs = SND_SOC_FSBD(4),
119 .priv = 0xc, 119 .priv = 0xc,
120 }, 120 },
@@ -122,11 +122,11 @@ static struct snd_soc_dai_mode pxa2xx_i2s_modes[] = {
122 /* pxa2xx I2S frame master and clock slave mode */ 122 /* pxa2xx I2S frame master and clock slave mode */
123 { 123 {
124 .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBM_CFS, 124 .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBM_CFS,
125 .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, 125 .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
126 .pcmrate = PXA_I2S_RATES, 126 .pcmrate = PXA_I2S_RATES,
127 .pcmdir = PXA_I2S_DIR, 127 .pcmdir = PXA_I2S_DIR,
128 .fs = SND_SOC_FS_ALL, 128 .fs = SND_SOC_FS_ALL,
129 .bfs = SND_SOC_FSB(64), 129 .bfs = SND_SOC_FSB(64),
130 .priv = 0x48, 130 .priv = 0x48,
131 }, 131 },
132}; 132};
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-14 04:55:03 -0500