Skip to content

Commit 3570922

Browse files
charleskeepaxbroonie
charleskeepax
authored and
broonie
committed
ASoC: madera: Add channel numbers to AIFs
Set the channel number on each AIF widget to allow unused channels not to be powered up across AIFs. Signed-off-by: Charles Keepax <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 950039f commit 3570922

File tree

5 files changed

+182
-182
lines changed

5 files changed

+182
-182
lines changed

‎sound/soc/codecs/cs47l15.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -540,29 +540,29 @@ SND_SOC_DAPM_PGA("PWM2 Driver", MADERA_PWM_DRIVE_1, MADERA_PWM2_ENA_SHIFT,
540540

541541
SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0,
542542
MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX1_ENA_SHIFT, 0),
543-
SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 0,
543+
SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 1,
544544
MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX2_ENA_SHIFT, 0),
545-
SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 0,
545+
SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 2,
546546
MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX3_ENA_SHIFT, 0),
547-
SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 0,
547+
SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 3,
548548
MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX4_ENA_SHIFT, 0),
549-
SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 0,
549+
SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 4,
550550
MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX5_ENA_SHIFT, 0),
551-
SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 0,
551+
SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 5,
552552
MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX6_ENA_SHIFT, 0),
553553

554554
SND_SOC_DAPM_AIF_OUT("AIF2TX1", NULL, 0,
555555
MADERA_AIF2_TX_ENABLES, MADERA_AIF2TX1_ENA_SHIFT, 0),
556-
SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 0,
556+
SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 1,
557557
MADERA_AIF2_TX_ENABLES, MADERA_AIF2TX2_ENA_SHIFT, 0),
558-
SND_SOC_DAPM_AIF_OUT("AIF2TX3", NULL, 0,
558+
SND_SOC_DAPM_AIF_OUT("AIF2TX3", NULL, 2,
559559
MADERA_AIF2_TX_ENABLES, MADERA_AIF2TX3_ENA_SHIFT, 0),
560-
SND_SOC_DAPM_AIF_OUT("AIF2TX4", NULL, 0,
560+
SND_SOC_DAPM_AIF_OUT("AIF2TX4", NULL, 3,
561561
MADERA_AIF2_TX_ENABLES, MADERA_AIF2TX4_ENA_SHIFT, 0),
562562

563563
SND_SOC_DAPM_AIF_OUT("AIF3TX1", NULL, 0,
564564
MADERA_AIF3_TX_ENABLES, MADERA_AIF3TX1_ENA_SHIFT, 0),
565-
SND_SOC_DAPM_AIF_OUT("AIF3TX2", NULL, 0,
565+
SND_SOC_DAPM_AIF_OUT("AIF3TX2", NULL, 1,
566566
MADERA_AIF3_TX_ENABLES, MADERA_AIF3TX2_ENA_SHIFT, 0),
567567

568568
SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,
@@ -631,29 +631,29 @@ SND_SOC_DAPM_PGA_E("IN2R", MADERA_INPUT_ENABLES, MADERA_IN2R_ENA_SHIFT,
631631

632632
SND_SOC_DAPM_AIF_IN("AIF1RX1", NULL, 0,
633633
MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX1_ENA_SHIFT, 0),
634-
SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 0,
634+
SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 1,
635635
MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX2_ENA_SHIFT, 0),
636-
SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 0,
636+
SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 2,
637637
MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX3_ENA_SHIFT, 0),
638-
SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 0,
638+
SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 3,
639639
MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX4_ENA_SHIFT, 0),
640-
SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 0,
640+
SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 4,
641641
MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX5_ENA_SHIFT, 0),
642-
SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 0,
642+
SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 5,
643643
MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX6_ENA_SHIFT, 0),
644644

645645
SND_SOC_DAPM_AIF_IN("AIF2RX1", NULL, 0,
646646
MADERA_AIF2_RX_ENABLES, MADERA_AIF2RX1_ENA_SHIFT, 0),
647-
SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 0,
647+
SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 1,
648648
MADERA_AIF2_RX_ENABLES, MADERA_AIF2RX2_ENA_SHIFT, 0),
649-
SND_SOC_DAPM_AIF_IN("AIF2RX3", NULL, 0,
649+
SND_SOC_DAPM_AIF_IN("AIF2RX3", NULL, 2,
650650
MADERA_AIF2_RX_ENABLES, MADERA_AIF2RX3_ENA_SHIFT, 0),
651-
SND_SOC_DAPM_AIF_IN("AIF2RX4", NULL, 0,
651+
SND_SOC_DAPM_AIF_IN("AIF2RX4", NULL, 3,
652652
MADERA_AIF2_RX_ENABLES, MADERA_AIF2RX4_ENA_SHIFT, 0),
653653

654654
SND_SOC_DAPM_AIF_IN("AIF3RX1", NULL, 0,
655655
MADERA_AIF3_RX_ENABLES, MADERA_AIF3RX1_ENA_SHIFT, 0),
656-
SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 0,
656+
SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 1,
657657
MADERA_AIF3_RX_ENABLES, MADERA_AIF3RX2_ENA_SHIFT, 0),
658658

659659
SND_SOC_DAPM_PGA("EQ1", MADERA_EQ1_1, MADERA_EQ1_ENA_SHIFT, 0, NULL, 0),

‎sound/soc/codecs/cs47l35.c

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -634,43 +634,43 @@ SND_SOC_DAPM_PGA("PWM2 Driver", MADERA_PWM_DRIVE_1, MADERA_PWM2_ENA_SHIFT,
634634

635635
SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0,
636636
MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX1_ENA_SHIFT, 0),
637-
SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 0,
637+
SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 1,
638638
MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX2_ENA_SHIFT, 0),
639-
SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 0,
639+
SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 2,
640640
MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX3_ENA_SHIFT, 0),
641-
SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 0,
641+
SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 3,
642642
MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX4_ENA_SHIFT, 0),
643-
SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 0,
643+
SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 4,
644644
MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX5_ENA_SHIFT, 0),
645-
SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 0,
645+
SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 5,
646646
MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX6_ENA_SHIFT, 0),
647647

648648
SND_SOC_DAPM_AIF_OUT("AIF2TX1", NULL, 0,
649649
MADERA_AIF2_TX_ENABLES, MADERA_AIF2TX1_ENA_SHIFT, 0),
650-
SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 0,
650+
SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 1,
651651
MADERA_AIF2_TX_ENABLES, MADERA_AIF2TX2_ENA_SHIFT, 0),
652652

653653
SND_SOC_DAPM_AIF_OUT("AIF3TX1", NULL, 0,
654654
MADERA_AIF3_TX_ENABLES, MADERA_AIF3TX1_ENA_SHIFT, 0),
655-
SND_SOC_DAPM_AIF_OUT("AIF3TX2", NULL, 0,
655+
SND_SOC_DAPM_AIF_OUT("AIF3TX2", NULL, 1,
656656
MADERA_AIF3_TX_ENABLES, MADERA_AIF3TX2_ENA_SHIFT, 0),
657657

658658
SND_SOC_DAPM_AIF_OUT("SLIMTX1", NULL, 0,
659659
MADERA_SLIMBUS_TX_CHANNEL_ENABLE,
660660
MADERA_SLIMTX1_ENA_SHIFT, 0),
661-
SND_SOC_DAPM_AIF_OUT("SLIMTX2", NULL, 0,
661+
SND_SOC_DAPM_AIF_OUT("SLIMTX2", NULL, 1,
662662
MADERA_SLIMBUS_TX_CHANNEL_ENABLE,
663663
MADERA_SLIMTX2_ENA_SHIFT, 0),
664-
SND_SOC_DAPM_AIF_OUT("SLIMTX3", NULL, 0,
664+
SND_SOC_DAPM_AIF_OUT("SLIMTX3", NULL, 2,
665665
MADERA_SLIMBUS_TX_CHANNEL_ENABLE,
666666
MADERA_SLIMTX3_ENA_SHIFT, 0),
667-
SND_SOC_DAPM_AIF_OUT("SLIMTX4", NULL, 0,
667+
SND_SOC_DAPM_AIF_OUT("SLIMTX4", NULL, 3,
668668
MADERA_SLIMBUS_TX_CHANNEL_ENABLE,
669669
MADERA_SLIMTX4_ENA_SHIFT, 0),
670-
SND_SOC_DAPM_AIF_OUT("SLIMTX5", NULL, 0,
670+
SND_SOC_DAPM_AIF_OUT("SLIMTX5", NULL, 4,
671671
MADERA_SLIMBUS_TX_CHANNEL_ENABLE,
672672
MADERA_SLIMTX5_ENA_SHIFT, 0),
673-
SND_SOC_DAPM_AIF_OUT("SLIMTX6", NULL, 0,
673+
SND_SOC_DAPM_AIF_OUT("SLIMTX6", NULL, 5,
674674
MADERA_SLIMBUS_TX_CHANNEL_ENABLE,
675675
MADERA_SLIMTX6_ENA_SHIFT, 0),
676676

@@ -741,43 +741,43 @@ SND_SOC_DAPM_PGA_E("IN2R", MADERA_INPUT_ENABLES, MADERA_IN2R_ENA_SHIFT,
741741

742742
SND_SOC_DAPM_AIF_IN("AIF1RX1", NULL, 0,
743743
MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX1_ENA_SHIFT, 0),
744-
SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 0,
744+
SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 1,
745745
MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX2_ENA_SHIFT, 0),
746-
SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 0,
746+
SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 2,
747747
MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX3_ENA_SHIFT, 0),
748-
SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 0,
748+
SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 3,
749749
MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX4_ENA_SHIFT, 0),
750-
SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 0,
750+
SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 4,
751751
MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX5_ENA_SHIFT, 0),
752-
SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 0,
752+
SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 5,
753753
MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX6_ENA_SHIFT, 0),
754754

755755
SND_SOC_DAPM_AIF_IN("AIF2RX1", NULL, 0,
756756
MADERA_AIF2_RX_ENABLES, MADERA_AIF2RX1_ENA_SHIFT, 0),
757-
SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 0,
757+
SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 1,
758758
MADERA_AIF2_RX_ENABLES, MADERA_AIF2RX2_ENA_SHIFT, 0),
759759

760760
SND_SOC_DAPM_AIF_IN("AIF3RX1", NULL, 0,
761761
MADERA_AIF3_RX_ENABLES, MADERA_AIF3RX1_ENA_SHIFT, 0),
762-
SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 0,
762+
SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 1,
763763
MADERA_AIF3_RX_ENABLES, MADERA_AIF3RX2_ENA_SHIFT, 0),
764764

765765
SND_SOC_DAPM_AIF_IN("SLIMRX1", NULL, 0,
766766
MADERA_SLIMBUS_RX_CHANNEL_ENABLE,
767767
MADERA_SLIMRX1_ENA_SHIFT, 0),
768-
SND_SOC_DAPM_AIF_IN("SLIMRX2", NULL, 0,
768+
SND_SOC_DAPM_AIF_IN("SLIMRX2", NULL, 1,
769769
MADERA_SLIMBUS_RX_CHANNEL_ENABLE,
770770
MADERA_SLIMRX2_ENA_SHIFT, 0),
771-
SND_SOC_DAPM_AIF_IN("SLIMRX3", NULL, 0,
771+
SND_SOC_DAPM_AIF_IN("SLIMRX3", NULL, 2,
772772
MADERA_SLIMBUS_RX_CHANNEL_ENABLE,
773773
MADERA_SLIMRX3_ENA_SHIFT, 0),
774-
SND_SOC_DAPM_AIF_IN("SLIMRX4", NULL, 0,
774+
SND_SOC_DAPM_AIF_IN("SLIMRX4", NULL, 3,
775775
MADERA_SLIMBUS_RX_CHANNEL_ENABLE,
776776
MADERA_SLIMRX4_ENA_SHIFT, 0),
777-
SND_SOC_DAPM_AIF_IN("SLIMRX5", NULL, 0,
777+
SND_SOC_DAPM_AIF_IN("SLIMRX5", NULL, 4,
778778
MADERA_SLIMBUS_RX_CHANNEL_ENABLE,
779779
MADERA_SLIMRX5_ENA_SHIFT, 0),
780-
SND_SOC_DAPM_AIF_IN("SLIMRX6", NULL, 0,
780+
SND_SOC_DAPM_AIF_IN("SLIMRX6", NULL, 5,
781781
MADERA_SLIMBUS_RX_CHANNEL_ENABLE,
782782
MADERA_SLIMRX6_ENA_SHIFT, 0),
783783

‎sound/soc/codecs/cs47l85.c

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,71 +1016,71 @@ SND_SOC_DAPM_MUX("SPKDAT2R ANC Source", SND_SOC_NOPM, 0, 0,
10161016

10171017
SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0,
10181018
MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX1_ENA_SHIFT, 0),
1019-
SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 0,
1019+
SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 1,
10201020
MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX2_ENA_SHIFT, 0),
1021-
SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 0,
1021+
SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 2,
10221022
MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX3_ENA_SHIFT, 0),
1023-
SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 0,
1023+
SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 3,
10241024
MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX4_ENA_SHIFT, 0),
1025-
SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 0,
1025+
SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 4,
10261026
MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX5_ENA_SHIFT, 0),
1027-
SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 0,
1027+
SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 5,
10281028
MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX6_ENA_SHIFT, 0),
1029-
SND_SOC_DAPM_AIF_OUT("AIF1TX7", NULL, 0,
1029+
SND_SOC_DAPM_AIF_OUT("AIF1TX7", NULL, 6,
10301030
MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX7_ENA_SHIFT, 0),
1031-
SND_SOC_DAPM_AIF_OUT("AIF1TX8", NULL, 0,
1031+
SND_SOC_DAPM_AIF_OUT("AIF1TX8", NULL, 7,
10321032
MADERA_AIF1_TX_ENABLES, MADERA_AIF1TX8_ENA_SHIFT, 0),
10331033

10341034
SND_SOC_DAPM_AIF_OUT("AIF2TX1", NULL, 0,
10351035
MADERA_AIF2_TX_ENABLES, MADERA_AIF2TX1_ENA_SHIFT, 0),
1036-
SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 0,
1036+
SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 1,
10371037
MADERA_AIF2_TX_ENABLES, MADERA_AIF2TX2_ENA_SHIFT, 0),
1038-
SND_SOC_DAPM_AIF_OUT("AIF2TX3", NULL, 0,
1038+
SND_SOC_DAPM_AIF_OUT("AIF2TX3", NULL, 2,
10391039
MADERA_AIF2_TX_ENABLES, MADERA_AIF2TX3_ENA_SHIFT, 0),
1040-
SND_SOC_DAPM_AIF_OUT("AIF2TX4", NULL, 0,
1040+
SND_SOC_DAPM_AIF_OUT("AIF2TX4", NULL, 3,
10411041
MADERA_AIF2_TX_ENABLES, MADERA_AIF2TX4_ENA_SHIFT, 0),
1042-
SND_SOC_DAPM_AIF_OUT("AIF2TX5", NULL, 0,
1042+
SND_SOC_DAPM_AIF_OUT("AIF2TX5", NULL, 4,
10431043
MADERA_AIF2_TX_ENABLES, MADERA_AIF2TX5_ENA_SHIFT, 0),
1044-
SND_SOC_DAPM_AIF_OUT("AIF2TX6", NULL, 0,
1044+
SND_SOC_DAPM_AIF_OUT("AIF2TX6", NULL, 5,
10451045
MADERA_AIF2_TX_ENABLES, MADERA_AIF2TX6_ENA_SHIFT, 0),
1046-
SND_SOC_DAPM_AIF_OUT("AIF2TX7", NULL, 0,
1046+
SND_SOC_DAPM_AIF_OUT("AIF2TX7", NULL, 6,
10471047
MADERA_AIF2_TX_ENABLES, MADERA_AIF2TX7_ENA_SHIFT, 0),
1048-
SND_SOC_DAPM_AIF_OUT("AIF2TX8", NULL, 0,
1048+
SND_SOC_DAPM_AIF_OUT("AIF2TX8", NULL, 7,
10491049
MADERA_AIF2_TX_ENABLES, MADERA_AIF2TX8_ENA_SHIFT, 0),
10501050

10511051
SND_SOC_DAPM_AIF_OUT("SLIMTX1", NULL, 0,
10521052
MADERA_SLIMBUS_TX_CHANNEL_ENABLE,
10531053
MADERA_SLIMTX1_ENA_SHIFT, 0),
1054-
SND_SOC_DAPM_AIF_OUT("SLIMTX2", NULL, 0,
1054+
SND_SOC_DAPM_AIF_OUT("SLIMTX2", NULL, 1,
10551055
MADERA_SLIMBUS_TX_CHANNEL_ENABLE,
10561056
MADERA_SLIMTX2_ENA_SHIFT, 0),
1057-
SND_SOC_DAPM_AIF_OUT("SLIMTX3", NULL, 0,
1057+
SND_SOC_DAPM_AIF_OUT("SLIMTX3", NULL, 2,
10581058
MADERA_SLIMBUS_TX_CHANNEL_ENABLE,
10591059
MADERA_SLIMTX3_ENA_SHIFT, 0),
1060-
SND_SOC_DAPM_AIF_OUT("SLIMTX4", NULL, 0,
1060+
SND_SOC_DAPM_AIF_OUT("SLIMTX4", NULL, 3,
10611061
MADERA_SLIMBUS_TX_CHANNEL_ENABLE,
10621062
MADERA_SLIMTX4_ENA_SHIFT, 0),
1063-
SND_SOC_DAPM_AIF_OUT("SLIMTX5", NULL, 0,
1063+
SND_SOC_DAPM_AIF_OUT("SLIMTX5", NULL, 4,
10641064
MADERA_SLIMBUS_TX_CHANNEL_ENABLE,
10651065
MADERA_SLIMTX5_ENA_SHIFT, 0),
1066-
SND_SOC_DAPM_AIF_OUT("SLIMTX6", NULL, 0,
1066+
SND_SOC_DAPM_AIF_OUT("SLIMTX6", NULL, 5,
10671067
MADERA_SLIMBUS_TX_CHANNEL_ENABLE,
10681068
MADERA_SLIMTX6_ENA_SHIFT, 0),
1069-
SND_SOC_DAPM_AIF_OUT("SLIMTX7", NULL, 0,
1069+
SND_SOC_DAPM_AIF_OUT("SLIMTX7", NULL, 6,
10701070
MADERA_SLIMBUS_TX_CHANNEL_ENABLE,
10711071
MADERA_SLIMTX7_ENA_SHIFT, 0),
1072-
SND_SOC_DAPM_AIF_OUT("SLIMTX8", NULL, 0,
1072+
SND_SOC_DAPM_AIF_OUT("SLIMTX8", NULL, 7,
10731073
MADERA_SLIMBUS_TX_CHANNEL_ENABLE,
10741074
MADERA_SLIMTX8_ENA_SHIFT, 0),
10751075

10761076
SND_SOC_DAPM_AIF_OUT("AIF3TX1", NULL, 0,
10771077
MADERA_AIF3_TX_ENABLES, MADERA_AIF3TX1_ENA_SHIFT, 0),
1078-
SND_SOC_DAPM_AIF_OUT("AIF3TX2", NULL, 0,
1078+
SND_SOC_DAPM_AIF_OUT("AIF3TX2", NULL, 1,
10791079
MADERA_AIF3_TX_ENABLES, MADERA_AIF3TX2_ENA_SHIFT, 0),
10801080

10811081
SND_SOC_DAPM_AIF_OUT("AIF4TX1", NULL, 0,
10821082
MADERA_AIF4_TX_ENABLES, MADERA_AIF4TX1_ENA_SHIFT, 0),
1083-
SND_SOC_DAPM_AIF_OUT("AIF4TX2", NULL, 0,
1083+
SND_SOC_DAPM_AIF_OUT("AIF4TX2", NULL, 1,
10841084
MADERA_AIF4_TX_ENABLES, MADERA_AIF4TX2_ENA_SHIFT, 0),
10851085

10861086
SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,
@@ -1205,70 +1205,70 @@ SND_SOC_DAPM_PGA_E("IN6R", MADERA_INPUT_ENABLES, MADERA_IN6R_ENA_SHIFT,
12051205

12061206
SND_SOC_DAPM_AIF_IN("AIF1RX1", NULL, 0,
12071207
MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX1_ENA_SHIFT, 0),
1208-
SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 0,
1208+
SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 1,
12091209
MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX2_ENA_SHIFT, 0),
1210-
SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 0,
1210+
SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 2,
12111211
MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX3_ENA_SHIFT, 0),
1212-
SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 0,
1212+
SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 3,
12131213
MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX4_ENA_SHIFT, 0),
1214-
SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 0,
1214+
SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 4,
12151215
MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX5_ENA_SHIFT, 0),
1216-
SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 0,
1216+
SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 5,
12171217
MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX6_ENA_SHIFT, 0),
1218-
SND_SOC_DAPM_AIF_IN("AIF1RX7", NULL, 0,
1218+
SND_SOC_DAPM_AIF_IN("AIF1RX7", NULL, 6,
12191219
MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX7_ENA_SHIFT, 0),
1220-
SND_SOC_DAPM_AIF_IN("AIF1RX8", NULL, 0,
1220+
SND_SOC_DAPM_AIF_IN("AIF1RX8", NULL, 7,
12211221
MADERA_AIF1_RX_ENABLES, MADERA_AIF1RX8_ENA_SHIFT, 0),
12221222

12231223
SND_SOC_DAPM_AIF_IN("AIF2RX1", NULL, 0,
12241224
MADERA_AIF2_RX_ENABLES, MADERA_AIF2RX1_ENA_SHIFT, 0),
1225-
SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 0,
1225+
SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 1,
12261226
MADERA_AIF2_RX_ENABLES, MADERA_AIF2RX2_ENA_SHIFT, 0),
1227-
SND_SOC_DAPM_AIF_IN("AIF2RX3", NULL, 0,
1227+
SND_SOC_DAPM_AIF_IN("AIF2RX3", NULL, 2,
12281228
MADERA_AIF2_RX_ENABLES, MADERA_AIF2RX3_ENA_SHIFT, 0),
1229-
SND_SOC_DAPM_AIF_IN("AIF2RX4", NULL, 0,
1229+
SND_SOC_DAPM_AIF_IN("AIF2RX4", NULL, 3,
12301230
MADERA_AIF2_RX_ENABLES, MADERA_AIF2RX4_ENA_SHIFT, 0),
1231-
SND_SOC_DAPM_AIF_IN("AIF2RX5", NULL, 0,
1231+
SND_SOC_DAPM_AIF_IN("AIF2RX5", NULL, 4,
12321232
MADERA_AIF2_RX_ENABLES, MADERA_AIF2RX5_ENA_SHIFT, 0),
1233-
SND_SOC_DAPM_AIF_IN("AIF2RX6", NULL, 0,
1233+
SND_SOC_DAPM_AIF_IN("AIF2RX6", NULL, 5,
12341234
MADERA_AIF2_RX_ENABLES, MADERA_AIF2RX6_ENA_SHIFT, 0),
1235-
SND_SOC_DAPM_AIF_IN("AIF2RX7", NULL, 0,
1235+
SND_SOC_DAPM_AIF_IN("AIF2RX7", NULL, 6,
12361236
MADERA_AIF2_RX_ENABLES, MADERA_AIF2RX7_ENA_SHIFT, 0),
1237-
SND_SOC_DAPM_AIF_IN("AIF2RX8", NULL, 0,
1237+
SND_SOC_DAPM_AIF_IN("AIF2RX8", NULL, 7,
12381238
MADERA_AIF2_RX_ENABLES, MADERA_AIF2RX8_ENA_SHIFT, 0),
12391239

12401240
SND_SOC_DAPM_AIF_IN("AIF3RX1", NULL, 0,
12411241
MADERA_AIF3_RX_ENABLES, MADERA_AIF3RX1_ENA_SHIFT, 0),
1242-
SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 0,
1242+
SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 1,
12431243
MADERA_AIF3_RX_ENABLES, MADERA_AIF3RX2_ENA_SHIFT, 0),
12441244

12451245
SND_SOC_DAPM_AIF_IN("AIF4RX1", NULL, 0,
12461246
MADERA_AIF4_RX_ENABLES, MADERA_AIF4RX1_ENA_SHIFT, 0),
1247-
SND_SOC_DAPM_AIF_IN("AIF4RX2", NULL, 0,
1247+
SND_SOC_DAPM_AIF_IN("AIF4RX2", NULL, 1,
12481248
MADERA_AIF4_RX_ENABLES, MADERA_AIF4RX2_ENA_SHIFT, 0),
12491249

12501250
SND_SOC_DAPM_AIF_IN("SLIMRX1", NULL, 0,
12511251
MADERA_SLIMBUS_RX_CHANNEL_ENABLE,
12521252
MADERA_SLIMRX1_ENA_SHIFT, 0),
1253-
SND_SOC_DAPM_AIF_IN("SLIMRX2", NULL, 0,
1253+
SND_SOC_DAPM_AIF_IN("SLIMRX2", NULL, 1,
12541254
MADERA_SLIMBUS_RX_CHANNEL_ENABLE,
12551255
MADERA_SLIMRX2_ENA_SHIFT, 0),
1256-
SND_SOC_DAPM_AIF_IN("SLIMRX3", NULL, 0,
1256+
SND_SOC_DAPM_AIF_IN("SLIMRX3", NULL, 2,
12571257
MADERA_SLIMBUS_RX_CHANNEL_ENABLE,
12581258
MADERA_SLIMRX3_ENA_SHIFT, 0),
1259-
SND_SOC_DAPM_AIF_IN("SLIMRX4", NULL, 0,
1259+
SND_SOC_DAPM_AIF_IN("SLIMRX4", NULL, 3,
12601260
MADERA_SLIMBUS_RX_CHANNEL_ENABLE,
12611261
MADERA_SLIMRX4_ENA_SHIFT, 0),
1262-
SND_SOC_DAPM_AIF_IN("SLIMRX5", NULL, 0,
1262+
SND_SOC_DAPM_AIF_IN("SLIMRX5", NULL, 4,
12631263
MADERA_SLIMBUS_RX_CHANNEL_ENABLE,
12641264
MADERA_SLIMRX5_ENA_SHIFT, 0),
1265-
SND_SOC_DAPM_AIF_IN("SLIMRX6", NULL, 0,
1265+
SND_SOC_DAPM_AIF_IN("SLIMRX6", NULL, 5,
12661266
MADERA_SLIMBUS_RX_CHANNEL_ENABLE,
12671267
MADERA_SLIMRX6_ENA_SHIFT, 0),
1268-
SND_SOC_DAPM_AIF_IN("SLIMRX7", NULL, 0,
1268+
SND_SOC_DAPM_AIF_IN("SLIMRX7", NULL, 6,
12691269
MADERA_SLIMBUS_RX_CHANNEL_ENABLE,
12701270
MADERA_SLIMRX7_ENA_SHIFT, 0),
1271-
SND_SOC_DAPM_AIF_IN("SLIMRX8", NULL, 0,
1271+
SND_SOC_DAPM_AIF_IN("SLIMRX8", NULL, 7,
12721272
MADERA_SLIMBUS_RX_CHANNEL_ENABLE,
12731273
MADERA_SLIMRX8_ENA_SHIFT, 0),
12741274

0 commit comments

Comments
 (0)