Skip to content

Commit 711f5a7

Browse files
jkysela-rhjkysela-rh
committed
ASoC: use playback_only/capture_only instead dpcm_playback/dpcm_capture flags
JIRA: https://issues.redhat.com/browse/RHEL-80681 Upstream-status: RHEL-only The former flags were obsoleted in upstream commit c7ae655 ("ASoC: soc-pcm: remove dpcm_xxx flags"). Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
1 parent 1a6c53b commit 711f5a7

12 files changed

+189
-189
lines changed

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
470470
.init = broxton_da7219_fe_init,
471471
.trigger = {
472472
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
473-
.dpcm_playback = 1,
473+
.playback_only = 1,
474474
.ops = &broxton_da7219_fe_ops,
475475
SND_SOC_DAILINK_REG(system, dummy, platform),
476476
},
@@ -482,7 +482,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
482482
.nonatomic = 1,
483483
.trigger = {
484484
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
485-
.dpcm_capture = 1,
485+
.capture_only = 1,
486486
.ops = &broxton_da7219_fe_ops,
487487
SND_SOC_DAILINK_REG(system, dummy, platform),
488488
},
@@ -493,7 +493,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
493493
.nonatomic = 1,
494494
.trigger = {
495495
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
496-
.dpcm_playback = 1,
496+
.playback_only = 1,
497497
.ops = &broxton_da7219_fe_ops,
498498
SND_SOC_DAILINK_REG(system2, dummy, platform),
499499
},
@@ -502,7 +502,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
502502
.name = "Bxt Audio Reference cap",
503503
.stream_name = "Refcap",
504504
.init = NULL,
505-
.dpcm_capture = 1,
505+
.capture_only = 1,
506506
.nonatomic = 1,
507507
.dynamic = 1,
508508
.ops = &broxton_refcap_ops,
@@ -513,7 +513,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
513513
.name = "Bxt Audio DMIC cap",
514514
.stream_name = "dmiccap",
515515
.init = NULL,
516-
.dpcm_capture = 1,
516+
.capture_only = 1,
517517
.nonatomic = 1,
518518
.dynamic = 1,
519519
.ops = &broxton_dmic_ops,
@@ -523,7 +523,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
523523
{
524524
.name = "Bxt HDMI Port1",
525525
.stream_name = "Hdmi1",
526-
.dpcm_playback = 1,
526+
.playback_only = 1,
527527
.init = NULL,
528528
.nonatomic = 1,
529529
.dynamic = 1,
@@ -533,7 +533,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
533533
{
534534
.name = "Bxt HDMI Port2",
535535
.stream_name = "Hdmi2",
536-
.dpcm_playback = 1,
536+
.playback_only = 1,
537537
.init = NULL,
538538
.nonatomic = 1,
539539
.dynamic = 1,
@@ -543,7 +543,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
543543
{
544544
.name = "Bxt HDMI Port3",
545545
.stream_name = "Hdmi3",
546-
.dpcm_playback = 1,
546+
.playback_only = 1,
547547
.init = NULL,
548548
.nonatomic = 1,
549549
.dynamic = 1,
@@ -560,7 +560,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
560560
SND_SOC_DAIFMT_CBC_CFC,
561561
.ignore_pmdown_time = 1,
562562
.be_hw_params_fixup = broxton_ssp_fixup,
563-
.dpcm_playback = 1,
563+
.playback_only = 1,
564564
SND_SOC_DAILINK_REG(ssp5_pin, ssp5_codec, platform),
565565
},
566566
{
@@ -573,48 +573,48 @@ static struct snd_soc_dai_link broxton_dais[] = {
573573
SND_SOC_DAIFMT_CBC_CFC,
574574
.ignore_pmdown_time = 1,
575575
.be_hw_params_fixup = broxton_ssp_fixup,
576-
.dpcm_playback = 1,
577-
.dpcm_capture = 1,
576+
.playback_only = 1,
577+
.capture_only = 1,
578578
SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform),
579579
},
580580
{
581581
.name = "dmic01",
582582
.id = 2,
583583
.ignore_suspend = 1,
584584
.be_hw_params_fixup = broxton_dmic_fixup,
585-
.dpcm_capture = 1,
585+
.capture_only = 1,
586586
.no_pcm = 1,
587587
SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform),
588588
},
589589
{
590590
.name = "iDisp1",
591591
.id = 3,
592592
.init = broxton_hdmi_init,
593-
.dpcm_playback = 1,
593+
.playback_only = 1,
594594
.no_pcm = 1,
595595
SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
596596
},
597597
{
598598
.name = "iDisp2",
599599
.id = 4,
600600
.init = broxton_hdmi_init,
601-
.dpcm_playback = 1,
601+
.playback_only = 1,
602602
.no_pcm = 1,
603603
SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform),
604604
},
605605
{
606606
.name = "iDisp3",
607607
.id = 5,
608608
.init = broxton_hdmi_init,
609-
.dpcm_playback = 1,
609+
.playback_only = 1,
610610
.no_pcm = 1,
611611
SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform),
612612
},
613613
{
614614
.name = "dmic16k",
615615
.id = 6,
616616
.be_hw_params_fixup = broxton_dmic_fixup,
617-
.dpcm_capture = 1,
617+
.capture_only = 1,
618618
.no_pcm = 1,
619619
SND_SOC_DAILINK_REG(dmic16k_pin, dmic_codec, platform),
620620
},

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
394394
.dynamic = 1,
395395
.init = broxton_rt298_fe_init,
396396
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
397-
.dpcm_playback = 1,
397+
.playback_only = 1,
398398
.ops = &broxton_rt286_fe_ops,
399399
SND_SOC_DAILINK_REG(system, dummy, platform),
400400
},
@@ -405,7 +405,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
405405
.nonatomic = 1,
406406
.dynamic = 1,
407407
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
408-
.dpcm_capture = 1,
408+
.capture_only = 1,
409409
.ops = &broxton_rt286_fe_ops,
410410
SND_SOC_DAILINK_REG(system, dummy, platform),
411411
},
@@ -414,7 +414,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
414414
.name = "Bxt Audio Reference cap",
415415
.stream_name = "refcap",
416416
.init = NULL,
417-
.dpcm_capture = 1,
417+
.capture_only = 1,
418418
.nonatomic = 1,
419419
.dynamic = 1,
420420
SND_SOC_DAILINK_REG(reference, dummy, platform),
@@ -424,7 +424,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
424424
.name = "Bxt Audio DMIC cap",
425425
.stream_name = "dmiccap",
426426
.init = NULL,
427-
.dpcm_capture = 1,
427+
.capture_only = 1,
428428
.nonatomic = 1,
429429
.dynamic = 1,
430430
.ops = &broxton_dmic_ops,
@@ -434,7 +434,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
434434
{
435435
.name = "Bxt HDMI Port1",
436436
.stream_name = "Hdmi1",
437-
.dpcm_playback = 1,
437+
.playback_only = 1,
438438
.init = NULL,
439439
.nonatomic = 1,
440440
.dynamic = 1,
@@ -444,7 +444,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
444444
{
445445
.name = "Bxt HDMI Port2",
446446
.stream_name = "Hdmi2",
447-
.dpcm_playback = 1,
447+
.playback_only = 1,
448448
.init = NULL,
449449
.nonatomic = 1,
450450
.dynamic = 1,
@@ -454,7 +454,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
454454
{
455455
.name = "Bxt HDMI Port3",
456456
.stream_name = "Hdmi3",
457-
.dpcm_playback = 1,
457+
.playback_only = 1,
458458
.init = NULL,
459459
.nonatomic = 1,
460460
.dynamic = 1,
@@ -472,16 +472,16 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
472472
.ignore_pmdown_time = 1,
473473
.be_hw_params_fixup = broxton_ssp5_fixup,
474474
.ops = &broxton_rt298_ops,
475-
.dpcm_playback = 1,
476-
.dpcm_capture = 1,
475+
.playback_only = 1,
476+
.capture_only = 1,
477477
SND_SOC_DAILINK_REG(ssp5_pin, ssp5_codec, platform),
478478
},
479479
{
480480
.name = "dmic01",
481481
.id = 1,
482482
.be_hw_params_fixup = broxton_dmic_fixup,
483483
.ignore_suspend = 1,
484-
.dpcm_capture = 1,
484+
.capture_only = 1,
485485
.no_pcm = 1,
486486
SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform),
487487
},
@@ -490,31 +490,31 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
490490
.id = 2,
491491
.be_hw_params_fixup = broxton_dmic_fixup,
492492
.ignore_suspend = 1,
493-
.dpcm_capture = 1,
493+
.capture_only = 1,
494494
.no_pcm = 1,
495495
SND_SOC_DAILINK_REG(dmic16k, dmic_codec, platform),
496496
},
497497
{
498498
.name = "iDisp1",
499499
.id = 3,
500500
.init = broxton_hdmi_init,
501-
.dpcm_playback = 1,
501+
.playback_only = 1,
502502
.no_pcm = 1,
503503
SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
504504
},
505505
{
506506
.name = "iDisp2",
507507
.id = 4,
508508
.init = broxton_hdmi_init,
509-
.dpcm_playback = 1,
509+
.playback_only = 1,
510510
.no_pcm = 1,
511511
SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform),
512512
},
513513
{
514514
.name = "iDisp3",
515515
.id = 5,
516516
.init = broxton_hdmi_init,
517-
.dpcm_playback = 1,
517+
.playback_only = 1,
518518
.no_pcm = 1,
519519
SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform),
520520
},

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -443,48 +443,48 @@ static struct snd_soc_dai_link cml_rt1011_rt5682_dailink[] = {
443443
.exit = cml_rt5682_codec_exit,
444444
.ignore_pmdown_time = 1,
445445
.ops = &cml_rt5682_ops,
446-
.dpcm_playback = 1,
447-
.dpcm_capture = 1,
446+
.playback_only = 1,
447+
.capture_only = 1,
448448
.no_pcm = 1,
449449
SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform),
450450
},
451451
{
452452
.name = "dmic01",
453453
.id = 1,
454454
.ignore_suspend = 1,
455-
.dpcm_capture = 1,
455+
.capture_only = 1,
456456
.no_pcm = 1,
457457
SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform),
458458
},
459459
{
460460
.name = "dmic16k",
461461
.id = 2,
462462
.ignore_suspend = 1,
463-
.dpcm_capture = 1,
463+
.capture_only = 1,
464464
.no_pcm = 1,
465465
SND_SOC_DAILINK_REG(dmic16k_pin, dmic_codec, platform),
466466
},
467467
{
468468
.name = "iDisp1",
469469
.id = 3,
470470
.init = hdmi_init,
471-
.dpcm_playback = 1,
471+
.playback_only = 1,
472472
.no_pcm = 1,
473473
SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
474474
},
475475
{
476476
.name = "iDisp2",
477477
.id = 4,
478478
.init = hdmi_init,
479-
.dpcm_playback = 1,
479+
.playback_only = 1,
480480
.no_pcm = 1,
481481
SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform),
482482
},
483483
{
484484
.name = "iDisp3",
485485
.id = 5,
486486
.init = hdmi_init,
487-
.dpcm_playback = 1,
487+
.playback_only = 1,
488488
.no_pcm = 1,
489489
SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform),
490490
},
@@ -496,8 +496,8 @@ static struct snd_soc_dai_link cml_rt1011_rt5682_dailink[] = {
496496
*/
497497
.name = "SSP1-Codec",
498498
.id = 6,
499-
.dpcm_playback = 1,
500-
.dpcm_capture = 1, /* Capture stream provides Feedback */
499+
.playback_only = 1,
500+
.capture_only = 1, /* Capture stream provides Feedback */
501501
.no_pcm = 1,
502502
.init = cml_rt1011_spk_init,
503503
.ops = &cml_rt1011_ops,

0 commit comments

Comments
 (0)