Skip to content

Commit ae0967d

Browse files
morimotobroonie
morimoto
authored and
broonie
committed
ASoC: intel: boards: 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/877ca29vh9.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 44b6f24 commit ae0967d

20 files changed

Lines changed: 34 additions & 108 deletions

‎sound/soc/intel/boards/bdw-rt5650.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,6 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = {
239239
SND_SOC_DPCM_TRIGGER_POST,
240240
SND_SOC_DPCM_TRIGGER_POST
241241
},
242-
.dpcm_playback = 1,
243-
.dpcm_capture = 1,
244242
SND_SOC_DAILINK_REG(fe, dummy, platform),
245243
},
246244

@@ -256,8 +254,6 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = {
256254
.ignore_pmdown_time = 1,
257255
.be_hw_params_fixup = broadwell_ssp0_fixup,
258256
.ops = &bdw_rt5650_ops,
259-
.dpcm_playback = 1,
260-
.dpcm_capture = 1,
261257
.init = bdw_rt5650_init,
262258
SND_SOC_DAILINK_REG(ssp0_port, be, platform),
263259
},

‎sound/soc/intel/boards/bdw-rt5677.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,6 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = {
329329
SND_SOC_DPCM_TRIGGER_POST,
330330
SND_SOC_DPCM_TRIGGER_POST
331331
},
332-
.dpcm_capture = 1,
333-
.dpcm_playback = 1,
334332
.ops = &bdw_rt5677_fe_ops,
335333
SND_SOC_DAILINK_REG(fe, dummy, platform),
336334
},
@@ -356,8 +354,6 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = {
356354
.ignore_pmdown_time = 1,
357355
.be_hw_params_fixup = broadwell_ssp0_fixup,
358356
.ops = &bdw_rt5677_ops,
359-
.dpcm_playback = 1,
360-
.dpcm_capture = 1,
361357
.init = bdw_rt5677_init,
362358
.exit = bdw_rt5677_exit,
363359
SND_SOC_DAILINK_REG(ssp0_port, be, platform),

‎sound/soc/intel/boards/bdw_rt286.c‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,6 @@ static struct snd_soc_dai_link card_dai_links[] = {
133133
.nonatomic = 1,
134134
.dynamic = 1,
135135
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
136-
.dpcm_playback = 1,
137-
.dpcm_capture = 1,
138136
SND_SOC_DAILINK_REG(system, dummy, platform),
139137
},
140138
{
@@ -143,7 +141,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
143141
.nonatomic = 1,
144142
.dynamic = 1,
145143
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
146-
.dpcm_playback = 1,
144+
.playback_only = 1,
147145
SND_SOC_DAILINK_REG(offload0, dummy, platform),
148146
},
149147
{
@@ -152,7 +150,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
152150
.nonatomic = 1,
153151
.dynamic = 1,
154152
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
155-
.dpcm_playback = 1,
153+
.playback_only = 1,
156154
SND_SOC_DAILINK_REG(offload1, dummy, platform),
157155
},
158156
{
@@ -161,7 +159,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
161159
.nonatomic = 1,
162160
.dynamic = 1,
163161
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
164-
.dpcm_capture = 1,
162+
.capture_only = 1,
165163
SND_SOC_DAILINK_REG(loopback, dummy, platform),
166164
},
167165
/* Back End DAI links */
@@ -177,8 +175,6 @@ static struct snd_soc_dai_link card_dai_links[] = {
177175
.ignore_pmdown_time = 1,
178176
.be_hw_params_fixup = codec_link_hw_params_fixup,
179177
.ops = &codec_link_ops,
180-
.dpcm_playback = 1,
181-
.dpcm_capture = 1,
182178
SND_SOC_DAILINK_REG(ssp0_port, codec, platform),
183179
},
184180
};

‎sound/soc/intel/boards/bytcht_cx2072x.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,6 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = {
175175
.stream_name = "Audio",
176176
.nonatomic = true,
177177
.dynamic = 1,
178-
.dpcm_playback = 1,
179-
.dpcm_capture = 1,
180178
.ops = &byt_cht_cx2072x_aif1_ops,
181179
SND_SOC_DAILINK_REG(media, dummy, platform),
182180
},
@@ -185,7 +183,7 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = {
185183
.stream_name = "Deep-Buffer Audio",
186184
.nonatomic = true,
187185
.dynamic = 1,
188-
.dpcm_playback = 1,
186+
.playback_only = 1,
189187
.ops = &byt_cht_cx2072x_aif1_ops,
190188
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
191189
},
@@ -198,8 +196,6 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = {
198196
| SND_SOC_DAIFMT_CBC_CFC,
199197
.init = byt_cht_cx2072x_init,
200198
.be_hw_params_fixup = byt_cht_cx2072x_fixup,
201-
.dpcm_playback = 1,
202-
.dpcm_capture = 1,
203199
SND_SOC_DAILINK_REG(ssp2, cx2072x, platform),
204200
},
205201
};

‎sound/soc/intel/boards/bytcht_da7213.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,6 @@ static struct snd_soc_dai_link dailink[] = {
174174
.stream_name = "Audio",
175175
.nonatomic = true,
176176
.dynamic = 1,
177-
.dpcm_playback = 1,
178-
.dpcm_capture = 1,
179177
.ops = &aif1_ops,
180178
SND_SOC_DAILINK_REG(media, dummy, platform),
181179
},
@@ -184,7 +182,7 @@ static struct snd_soc_dai_link dailink[] = {
184182
.stream_name = "Deep-Buffer Audio",
185183
.nonatomic = true,
186184
.dynamic = 1,
187-
.dpcm_playback = 1,
185+
.playback_only = 1,
188186
.ops = &aif1_ops,
189187
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
190188
},
@@ -197,8 +195,6 @@ static struct snd_soc_dai_link dailink[] = {
197195
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
198196
| SND_SOC_DAIFMT_CBC_CFC,
199197
.be_hw_params_fixup = codec_fixup,
200-
.dpcm_playback = 1,
201-
.dpcm_capture = 1,
202198
.ops = &ssp2_ops,
203199
SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),
204200
},

‎sound/soc/intel/boards/bytcht_es8316.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -315,8 +315,6 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = {
315315
.stream_name = "Audio",
316316
.nonatomic = true,
317317
.dynamic = 1,
318-
.dpcm_playback = 1,
319-
.dpcm_capture = 1,
320318
.ops = &byt_cht_es8316_aif1_ops,
321319
SND_SOC_DAILINK_REG(media, dummy, platform),
322320
},
@@ -326,7 +324,7 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = {
326324
.stream_name = "Deep-Buffer Audio",
327325
.nonatomic = true,
328326
.dynamic = 1,
329-
.dpcm_playback = 1,
327+
.playback_only = 1,
330328
.ops = &byt_cht_es8316_aif1_ops,
331329
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
332330
},
@@ -339,8 +337,6 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = {
339337
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
340338
| SND_SOC_DAIFMT_CBC_CFC,
341339
.be_hw_params_fixup = byt_cht_es8316_codec_fixup,
342-
.dpcm_playback = 1,
343-
.dpcm_capture = 1,
344340
.init = byt_cht_es8316_init,
345341
SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),
346342
},

‎sound/soc/intel/boards/bytcht_nocodec.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,6 @@ static struct snd_soc_dai_link dais[] = {
119119
.ignore_suspend = 1,
120120
.nonatomic = true,
121121
.dynamic = 1,
122-
.dpcm_playback = 1,
123-
.dpcm_capture = 1,
124122
.ops = &aif1_ops,
125123
SND_SOC_DAILINK_REG(media, dummy, platform),
126124
},
@@ -130,7 +128,7 @@ static struct snd_soc_dai_link dais[] = {
130128
.ignore_suspend = 1,
131129
.nonatomic = true,
132130
.dynamic = 1,
133-
.dpcm_playback = 1,
131+
.playback_only = 1,
134132
.ops = &aif1_ops,
135133
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
136134
},
@@ -144,8 +142,6 @@ static struct snd_soc_dai_link dais[] = {
144142
| SND_SOC_DAIFMT_CBC_CFC,
145143
.be_hw_params_fixup = codec_fixup,
146144
.ignore_suspend = 1,
147-
.dpcm_playback = 1,
148-
.dpcm_capture = 1,
149145
SND_SOC_DAILINK_REG(ssp2_port, dummy, platform),
150146
},
151147
};

‎sound/soc/intel/boards/bytcr_rt5640.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1546,8 +1546,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {
15461546
.stream_name = "Baytrail Audio",
15471547
.nonatomic = true,
15481548
.dynamic = 1,
1549-
.dpcm_playback = 1,
1550-
.dpcm_capture = 1,
15511549
.ops = &byt_rt5640_aif1_ops,
15521550
SND_SOC_DAILINK_REG(media, dummy, platform),
15531551
},
@@ -1556,7 +1554,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {
15561554
.stream_name = "Deep-Buffer Audio",
15571555
.nonatomic = true,
15581556
.dynamic = 1,
1559-
.dpcm_playback = 1,
1557+
.playback_only = 1,
15601558
.ops = &byt_rt5640_aif1_ops,
15611559
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
15621560
},
@@ -1568,8 +1566,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {
15681566
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
15691567
| SND_SOC_DAIFMT_CBC_CFC,
15701568
.be_hw_params_fixup = byt_rt5640_codec_fixup,
1571-
.dpcm_playback = 1,
1572-
.dpcm_capture = 1,
15731569
.init = byt_rt5640_init,
15741570
.exit = byt_rt5640_exit,
15751571
.ops = &byt_rt5640_be_ssp2_ops,

‎sound/soc/intel/boards/bytcr_rt5651.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -770,8 +770,6 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = {
770770
.stream_name = "Audio",
771771
.nonatomic = true,
772772
.dynamic = 1,
773-
.dpcm_playback = 1,
774-
.dpcm_capture = 1,
775773
.ops = &byt_rt5651_aif1_ops,
776774
SND_SOC_DAILINK_REG(media, dummy, platform),
777775
},
@@ -780,7 +778,7 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = {
780778
.stream_name = "Deep-Buffer Audio",
781779
.nonatomic = true,
782780
.dynamic = 1,
783-
.dpcm_playback = 1,
781+
.playback_only = 1,
784782
.ops = &byt_rt5651_aif1_ops,
785783
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
786784
},
@@ -793,8 +791,6 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = {
793791
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
794792
| SND_SOC_DAIFMT_CBC_CFC,
795793
.be_hw_params_fixup = byt_rt5651_codec_fixup,
796-
.dpcm_playback = 1,
797-
.dpcm_capture = 1,
798794
.init = byt_rt5651_init,
799795
.ops = &byt_rt5651_be_ssp2_ops,
800796
SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),

‎sound/soc/intel/boards/bytcr_wm5102.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -462,8 +462,6 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = {
462462
.stream_name = "Baytrail Audio",
463463
.nonatomic = true,
464464
.dynamic = 1,
465-
.dpcm_playback = 1,
466-
.dpcm_capture = 1,
467465
.ops = &byt_wm5102_aif1_ops,
468466
SND_SOC_DAILINK_REG(media, dummy, platform),
469467

@@ -473,7 +471,7 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = {
473471
.stream_name = "Deep-Buffer Audio",
474472
.nonatomic = true,
475473
.dynamic = 1,
476-
.dpcm_playback = 1,
474+
.playback_only = 1,
477475
.ops = &byt_wm5102_aif1_ops,
478476
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
479477
},
@@ -490,8 +488,6 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = {
490488
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
491489
| SND_SOC_DAIFMT_CBC_CFC,
492490
.be_hw_params_fixup = byt_wm5102_codec_fixup,
493-
.dpcm_playback = 1,
494-
.dpcm_capture = 1,
495491
.init = byt_wm5102_init,
496492
SND_SOC_DAILINK_REG(ssp0_port, ssp0_codec, platform),
497493
},

0 commit comments

Comments
 (0)