Skip to content

Commit ec15e50

Browse files
morimotobroonie
morimoto
authored and
broonie
committed
ASoC: mediatek: remove dpcm_xxx flags
dpcm_xxx flags are no longer needed. It converts dpcm_xxx flag to xxx_only if needed. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Link: https://patch.msgid.link/87cyju9vhu.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent fa9c4b4 commit ec15e50

15 files changed

Lines changed: 185 additions & 267 deletions

‎sound/soc/mediatek/mt2701/mt2701-cs42448.c‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = {
221221
SND_SOC_DPCM_TRIGGER_POST},
222222
.ops = &mt2701_cs42448_48k_fe_ops,
223223
.dynamic = 1,
224-
.dpcm_playback = 1,
224+
.playback_only = 1,
225225
SND_SOC_DAILINK_REG(fe_multi_ch_out),
226226
},
227227
[DAI_LINK_FE_PCM0_IN] = {
@@ -231,7 +231,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = {
231231
SND_SOC_DPCM_TRIGGER_POST},
232232
.ops = &mt2701_cs42448_48k_fe_ops,
233233
.dynamic = 1,
234-
.dpcm_capture = 1,
234+
.capture_only = 1,
235235
SND_SOC_DAILINK_REG(fe_pcm0_in),
236236
},
237237
[DAI_LINK_FE_PCM1_IN] = {
@@ -241,7 +241,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = {
241241
SND_SOC_DPCM_TRIGGER_POST},
242242
.ops = &mt2701_cs42448_48k_fe_ops,
243243
.dynamic = 1,
244-
.dpcm_capture = 1,
244+
.capture_only = 1,
245245
SND_SOC_DAILINK_REG(fe_pcm1_in),
246246
},
247247
[DAI_LINK_FE_BT_OUT] = {
@@ -250,7 +250,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = {
250250
.trigger = {SND_SOC_DPCM_TRIGGER_POST,
251251
SND_SOC_DPCM_TRIGGER_POST},
252252
.dynamic = 1,
253-
.dpcm_playback = 1,
253+
.playback_only = 1,
254254
SND_SOC_DAILINK_REG(fe_bt_out),
255255
},
256256
[DAI_LINK_FE_BT_IN] = {
@@ -259,7 +259,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = {
259259
.trigger = {SND_SOC_DPCM_TRIGGER_POST,
260260
SND_SOC_DPCM_TRIGGER_POST},
261261
.dynamic = 1,
262-
.dpcm_capture = 1,
262+
.capture_only = 1,
263263
SND_SOC_DAILINK_REG(fe_bt_in),
264264
},
265265
/* BE */
@@ -269,8 +269,6 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = {
269269
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS
270270
| SND_SOC_DAIFMT_GATED,
271271
.ops = &mt2701_cs42448_be_ops,
272-
.dpcm_playback = 1,
273-
.dpcm_capture = 1,
274272
SND_SOC_DAILINK_REG(be_i2s0),
275273
},
276274
[DAI_LINK_BE_I2S1] = {
@@ -279,8 +277,6 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = {
279277
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS
280278
| SND_SOC_DAIFMT_GATED,
281279
.ops = &mt2701_cs42448_be_ops,
282-
.dpcm_playback = 1,
283-
.dpcm_capture = 1,
284280
SND_SOC_DAILINK_REG(be_i2s1),
285281
},
286282
[DAI_LINK_BE_I2S2] = {
@@ -289,8 +285,6 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = {
289285
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS
290286
| SND_SOC_DAIFMT_GATED,
291287
.ops = &mt2701_cs42448_be_ops,
292-
.dpcm_playback = 1,
293-
.dpcm_capture = 1,
294288
SND_SOC_DAILINK_REG(be_i2s2),
295289
},
296290
[DAI_LINK_BE_I2S3] = {
@@ -299,15 +293,11 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = {
299293
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS
300294
| SND_SOC_DAIFMT_GATED,
301295
.ops = &mt2701_cs42448_be_ops,
302-
.dpcm_playback = 1,
303-
.dpcm_capture = 1,
304296
SND_SOC_DAILINK_REG(be_i2s3),
305297
},
306298
[DAI_LINK_BE_MRG_BT] = {
307299
.name = "mt2701-cs42448-MRG-BT",
308300
.no_pcm = 1,
309-
.dpcm_playback = 1,
310-
.dpcm_capture = 1,
311301
SND_SOC_DAILINK_REG(be_mrg_bt),
312302
},
313303
};

‎sound/soc/mediatek/mt2701/mt2701-wm8960.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static struct snd_soc_dai_link mt2701_wm8960_dai_links[] = {
6767
.trigger = {SND_SOC_DPCM_TRIGGER_POST,
6868
SND_SOC_DPCM_TRIGGER_POST},
6969
.dynamic = 1,
70-
.dpcm_playback = 1,
70+
.playback_only = 1,
7171
SND_SOC_DAILINK_REG(playback),
7272
},
7373
{
@@ -76,7 +76,7 @@ static struct snd_soc_dai_link mt2701_wm8960_dai_links[] = {
7676
.trigger = {SND_SOC_DPCM_TRIGGER_POST,
7777
SND_SOC_DPCM_TRIGGER_POST},
7878
.dynamic = 1,
79-
.dpcm_capture = 1,
79+
.capture_only = 1,
8080
SND_SOC_DAILINK_REG(capture),
8181
},
8282
/* BE */
@@ -86,8 +86,6 @@ static struct snd_soc_dai_link mt2701_wm8960_dai_links[] = {
8686
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS
8787
| SND_SOC_DAIFMT_GATED,
8888
.ops = &mt2701_wm8960_be_ops,
89-
.dpcm_playback = 1,
90-
.dpcm_capture = 1,
9189
SND_SOC_DAILINK_REG(codec),
9290
},
9391
};

‎sound/soc/mediatek/mt6797/mt6797-mt6351.c‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = {
7878
.trigger = {SND_SOC_DPCM_TRIGGER_PRE,
7979
SND_SOC_DPCM_TRIGGER_PRE},
8080
.dynamic = 1,
81-
.dpcm_playback = 1,
81+
.playback_only = 1,
8282
SND_SOC_DAILINK_REG(playback_1),
8383
},
8484
{
@@ -87,7 +87,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = {
8787
.trigger = {SND_SOC_DPCM_TRIGGER_PRE,
8888
SND_SOC_DPCM_TRIGGER_PRE},
8989
.dynamic = 1,
90-
.dpcm_playback = 1,
90+
.playback_only = 1,
9191
SND_SOC_DAILINK_REG(playback_2),
9292
},
9393
{
@@ -96,7 +96,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = {
9696
.trigger = {SND_SOC_DPCM_TRIGGER_PRE,
9797
SND_SOC_DPCM_TRIGGER_PRE},
9898
.dynamic = 1,
99-
.dpcm_playback = 1,
99+
.playback_only = 1,
100100
SND_SOC_DAILINK_REG(playback_3),
101101
},
102102
{
@@ -105,7 +105,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = {
105105
.trigger = {SND_SOC_DPCM_TRIGGER_PRE,
106106
SND_SOC_DPCM_TRIGGER_PRE},
107107
.dynamic = 1,
108-
.dpcm_capture = 1,
108+
.capture_only = 1,
109109
SND_SOC_DAILINK_REG(capture_1),
110110
},
111111
{
@@ -114,7 +114,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = {
114114
.trigger = {SND_SOC_DPCM_TRIGGER_PRE,
115115
SND_SOC_DPCM_TRIGGER_PRE},
116116
.dynamic = 1,
117-
.dpcm_capture = 1,
117+
.capture_only = 1,
118118
SND_SOC_DAILINK_REG(capture_2),
119119
},
120120
{
@@ -123,7 +123,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = {
123123
.trigger = {SND_SOC_DPCM_TRIGGER_PRE,
124124
SND_SOC_DPCM_TRIGGER_PRE},
125125
.dynamic = 1,
126-
.dpcm_capture = 1,
126+
.capture_only = 1,
127127
SND_SOC_DAILINK_REG(capture_3),
128128
},
129129
{
@@ -132,7 +132,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = {
132132
.trigger = {SND_SOC_DPCM_TRIGGER_PRE,
133133
SND_SOC_DPCM_TRIGGER_PRE},
134134
.dynamic = 1,
135-
.dpcm_capture = 1,
135+
.capture_only = 1,
136136
SND_SOC_DAILINK_REG(capture_mono_1),
137137
},
138138
{
@@ -141,8 +141,6 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = {
141141
.trigger = {SND_SOC_DPCM_TRIGGER_PRE,
142142
SND_SOC_DPCM_TRIGGER_PRE},
143143
.dynamic = 1,
144-
.dpcm_playback = 1,
145-
.dpcm_capture = 1,
146144
.ignore_suspend = 1,
147145
SND_SOC_DAILINK_REG(hostless_lpbk),
148146
},
@@ -152,33 +150,25 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = {
152150
.trigger = {SND_SOC_DPCM_TRIGGER_PRE,
153151
SND_SOC_DPCM_TRIGGER_PRE},
154152
.dynamic = 1,
155-
.dpcm_playback = 1,
156-
.dpcm_capture = 1,
157153
.ignore_suspend = 1,
158154
SND_SOC_DAILINK_REG(hostless_speech),
159155
},
160156
/* BE */
161157
{
162158
.name = "Primary Codec",
163159
.no_pcm = 1,
164-
.dpcm_playback = 1,
165-
.dpcm_capture = 1,
166160
.ignore_suspend = 1,
167161
SND_SOC_DAILINK_REG(primary_codec),
168162
},
169163
{
170164
.name = "PCM 1",
171165
.no_pcm = 1,
172-
.dpcm_playback = 1,
173-
.dpcm_capture = 1,
174166
.ignore_suspend = 1,
175167
SND_SOC_DAILINK_REG(pcm1),
176168
},
177169
{
178170
.name = "PCM 2",
179171
.no_pcm = 1,
180-
.dpcm_playback = 1,
181-
.dpcm_capture = 1,
182172
.ignore_suspend = 1,
183173
SND_SOC_DAILINK_REG(pcm2),
184174
},

‎sound/soc/mediatek/mt7986/mt7986-wm8960.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ static struct snd_soc_dai_link mt7986_wm8960_dai_links[] = {
4545
.trigger = {SND_SOC_DPCM_TRIGGER_POST,
4646
SND_SOC_DPCM_TRIGGER_POST},
4747
.dynamic = 1,
48-
.dpcm_playback = 1,
48+
.playback_only = 1,
4949
SND_SOC_DAILINK_REG(playback),
5050
},
5151
{
@@ -54,7 +54,7 @@ static struct snd_soc_dai_link mt7986_wm8960_dai_links[] = {
5454
.trigger = {SND_SOC_DPCM_TRIGGER_POST,
5555
SND_SOC_DPCM_TRIGGER_POST},
5656
.dynamic = 1,
57-
.dpcm_capture = 1,
57+
.capture_only = 1,
5858
SND_SOC_DAILINK_REG(capture),
5959
},
6060
/* BE */
@@ -65,8 +65,6 @@ static struct snd_soc_dai_link mt7986_wm8960_dai_links[] = {
6565
SND_SOC_DAIFMT_NB_NF |
6666
SND_SOC_DAIFMT_CBS_CFS |
6767
SND_SOC_DAIFMT_GATED,
68-
.dpcm_playback = 1,
69-
.dpcm_capture = 1,
7068
SND_SOC_DAILINK_REG(codec),
7169
},
7270
};

‎sound/soc/mediatek/mt8173/mt8173-max98090.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,15 @@ static struct snd_soc_dai_link mt8173_max98090_dais[] = {
104104
.stream_name = "MAX98090 Playback",
105105
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
106106
.dynamic = 1,
107-
.dpcm_playback = 1,
107+
.playback_only = 1,
108108
SND_SOC_DAILINK_REG(playback),
109109
},
110110
{
111111
.name = "MAX98090 Capture",
112112
.stream_name = "MAX98090 Capture",
113113
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
114114
.dynamic = 1,
115-
.dpcm_capture = 1,
115+
.capture_only = 1,
116116
SND_SOC_DAILINK_REG(capture),
117117
},
118118
/* Back End DAI links */
@@ -123,8 +123,6 @@ static struct snd_soc_dai_link mt8173_max98090_dais[] = {
123123
.ops = &mt8173_max98090_ops,
124124
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
125125
SND_SOC_DAIFMT_CBS_CFS,
126-
.dpcm_playback = 1,
127-
.dpcm_capture = 1,
128126
SND_SOC_DAILINK_REG(hifi),
129127
},
130128
};

‎sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,15 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5514_dais[] = {
139139
.stream_name = "rt5650_rt5514 Playback",
140140
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
141141
.dynamic = 1,
142-
.dpcm_playback = 1,
142+
.playback_only = 1,
143143
SND_SOC_DAILINK_REG(playback),
144144
},
145145
[DAI_LINK_CAPTURE] = {
146146
.name = "rt5650_rt5514 Capture",
147147
.stream_name = "rt5650_rt5514 Capture",
148148
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
149149
.dynamic = 1,
150-
.dpcm_capture = 1,
150+
.capture_only = 1,
151151
SND_SOC_DAILINK_REG(capture),
152152
},
153153
/* Back End DAI links */
@@ -159,8 +159,6 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5514_dais[] = {
159159
SND_SOC_DAIFMT_CBS_CFS,
160160
.ops = &mt8173_rt5650_rt5514_ops,
161161
.ignore_pmdown_time = 1,
162-
.dpcm_playback = 1,
163-
.dpcm_capture = 1,
164162
SND_SOC_DAILINK_REG(codec),
165163
},
166164
};

‎sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,23 +171,23 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = {
171171
.stream_name = "rt5650_rt5676 Playback",
172172
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
173173
.dynamic = 1,
174-
.dpcm_playback = 1,
174+
.playback_only = 1,
175175
SND_SOC_DAILINK_REG(playback),
176176
},
177177
[DAI_LINK_CAPTURE] = {
178178
.name = "rt5650_rt5676 Capture",
179179
.stream_name = "rt5650_rt5676 Capture",
180180
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
181181
.dynamic = 1,
182-
.dpcm_capture = 1,
182+
.capture_only = 1,
183183
SND_SOC_DAILINK_REG(capture),
184184
},
185185
[DAI_LINK_HDMI] = {
186186
.name = "HDMI",
187187
.stream_name = "HDMI PCM",
188188
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
189189
.dynamic = 1,
190-
.dpcm_playback = 1,
190+
.playback_only = 1,
191191
SND_SOC_DAILINK_REG(hdmi_pcm),
192192
},
193193

@@ -200,14 +200,12 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = {
200200
SND_SOC_DAIFMT_CBS_CFS,
201201
.ops = &mt8173_rt5650_rt5676_ops,
202202
.ignore_pmdown_time = 1,
203-
.dpcm_playback = 1,
204-
.dpcm_capture = 1,
205203
SND_SOC_DAILINK_REG(codec),
206204
},
207205
[DAI_LINK_HDMI_I2S] = {
208206
.name = "HDMI BE",
209207
.no_pcm = 1,
210-
.dpcm_playback = 1,
208+
.playback_only = 1,
211209
SND_SOC_DAILINK_REG(hdmi_be),
212210
},
213211
/* rt5676 <-> rt5650 intercodec link: Sets rt5676 I2S2 as master */

‎sound/soc/mediatek/mt8173/mt8173-rt5650.c‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -210,23 +210,23 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = {
210210
.stream_name = "rt5650 Playback",
211211
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
212212
.dynamic = 1,
213-
.dpcm_playback = 1,
213+
.playback_only = 1,
214214
SND_SOC_DAILINK_REG(playback),
215215
},
216216
[DAI_LINK_CAPTURE] = {
217217
.name = "rt5650 Capture",
218218
.stream_name = "rt5650 Capture",
219219
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
220220
.dynamic = 1,
221-
.dpcm_capture = 1,
221+
.capture_only = 1,
222222
SND_SOC_DAILINK_REG(capture),
223223
},
224224
[DAI_LINK_HDMI] = {
225225
.name = "HDMI",
226226
.stream_name = "HDMI PCM",
227227
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
228228
.dynamic = 1,
229-
.dpcm_playback = 1,
229+
.playback_only = 1,
230230
SND_SOC_DAILINK_REG(hdmi_pcm),
231231
},
232232
/* Back End DAI links */
@@ -238,14 +238,12 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = {
238238
SND_SOC_DAIFMT_CBS_CFS,
239239
.ops = &mt8173_rt5650_ops,
240240
.ignore_pmdown_time = 1,
241-
.dpcm_playback = 1,
242-
.dpcm_capture = 1,
243241
SND_SOC_DAILINK_REG(codec),
244242
},
245243
[DAI_LINK_HDMI_I2S] = {
246244
.name = "HDMI BE",
247245
.no_pcm = 1,
248-
.dpcm_playback = 1,
246+
.playback_only = 1,
249247
.init = mt8173_rt5650_hdmi_init,
250248
SND_SOC_DAILINK_REG(hdmi_be),
251249
},

0 commit comments

Comments
 (0)