summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.cirrus.com>2019-01-31 08:30:19 -0500
committerMark Brown <broonie@kernel.org>2019-02-02 10:42:34 -0500
commit909d74e39fe18e145a15ba3638f764e7ac3382c1 (patch)
tree64b63e186fa05e61f4131e605ee10008f5110f4f
parent2264cf2e5db99cdff995592bf80ab6dea567ea91 (diff)
ASoC: arizona: 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 <ckeepax@opensource.cirrus.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat
-rw-r--r--sound/soc/codecs/cs47l24.c52
-rw-r--r--sound/soc/codecs/wm5102.c64
-rw-r--r--sound/soc/codecs/wm5110.c80
-rw-r--r--sound/soc/codecs/wm8997.c60
-rw-r--r--sound/soc/codecs/wm8998.c60
5 files changed, 158 insertions, 158 deletions
diff --git a/sound/soc/codecs/cs47l24.c b/sound/soc/codecs/cs47l24.c
index 45e50fe3bf25..b16832a6a9af 100644
--- a/sound/soc/codecs/cs47l24.c
+++ b/sound/soc/codecs/cs47l24.c
@@ -500,72 +500,72 @@ SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,
500 500
501SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0, 501SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0,
502 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX1_ENA_SHIFT, 0), 502 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX1_ENA_SHIFT, 0),
503SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 0, 503SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 1,
504 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX2_ENA_SHIFT, 0), 504 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX2_ENA_SHIFT, 0),
505SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 0, 505SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 2,
506 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX3_ENA_SHIFT, 0), 506 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX3_ENA_SHIFT, 0),
507SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 0, 507SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 3,
508 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX4_ENA_SHIFT, 0), 508 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX4_ENA_SHIFT, 0),
509SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 0, 509SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 4,
510 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX5_ENA_SHIFT, 0), 510 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX5_ENA_SHIFT, 0),
511SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 0, 511SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 5,
512 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX6_ENA_SHIFT, 0), 512 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX6_ENA_SHIFT, 0),
513SND_SOC_DAPM_AIF_OUT("AIF1TX7", NULL, 0, 513SND_SOC_DAPM_AIF_OUT("AIF1TX7", NULL, 6,
514 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX7_ENA_SHIFT, 0), 514 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX7_ENA_SHIFT, 0),
515SND_SOC_DAPM_AIF_OUT("AIF1TX8", NULL, 0, 515SND_SOC_DAPM_AIF_OUT("AIF1TX8", NULL, 7,
516 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX8_ENA_SHIFT, 0), 516 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX8_ENA_SHIFT, 0),
517 517
518SND_SOC_DAPM_AIF_IN("AIF1RX1", NULL, 0, 518SND_SOC_DAPM_AIF_IN("AIF1RX1", NULL, 0,
519 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX1_ENA_SHIFT, 0), 519 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX1_ENA_SHIFT, 0),
520SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 0, 520SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 1,
521 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX2_ENA_SHIFT, 0), 521 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX2_ENA_SHIFT, 0),
522SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 0, 522SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 2,
523 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX3_ENA_SHIFT, 0), 523 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX3_ENA_SHIFT, 0),
524SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 0, 524SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 3,
525 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX4_ENA_SHIFT, 0), 525 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX4_ENA_SHIFT, 0),
526SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 0, 526SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 4,
527 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX5_ENA_SHIFT, 0), 527 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX5_ENA_SHIFT, 0),
528SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 0, 528SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 5,
529 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX6_ENA_SHIFT, 0), 529 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX6_ENA_SHIFT, 0),
530SND_SOC_DAPM_AIF_IN("AIF1RX7", NULL, 0, 530SND_SOC_DAPM_AIF_IN("AIF1RX7", NULL, 6,
531 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX7_ENA_SHIFT, 0), 531 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX7_ENA_SHIFT, 0),
532SND_SOC_DAPM_AIF_IN("AIF1RX8", NULL, 0, 532SND_SOC_DAPM_AIF_IN("AIF1RX8", NULL, 7,
533 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX8_ENA_SHIFT, 0), 533 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX8_ENA_SHIFT, 0),
534 534
535SND_SOC_DAPM_AIF_OUT("AIF2TX1", NULL, 0, 535SND_SOC_DAPM_AIF_OUT("AIF2TX1", NULL, 0,
536 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX1_ENA_SHIFT, 0), 536 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX1_ENA_SHIFT, 0),
537SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 0, 537SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 1,
538 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX2_ENA_SHIFT, 0), 538 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX2_ENA_SHIFT, 0),
539SND_SOC_DAPM_AIF_OUT("AIF2TX3", NULL, 0, 539SND_SOC_DAPM_AIF_OUT("AIF2TX3", NULL, 2,
540 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX3_ENA_SHIFT, 0), 540 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX3_ENA_SHIFT, 0),
541SND_SOC_DAPM_AIF_OUT("AIF2TX4", NULL, 0, 541SND_SOC_DAPM_AIF_OUT("AIF2TX4", NULL, 3,
542 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX4_ENA_SHIFT, 0), 542 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX4_ENA_SHIFT, 0),
543SND_SOC_DAPM_AIF_OUT("AIF2TX5", NULL, 0, 543SND_SOC_DAPM_AIF_OUT("AIF2TX5", NULL, 4,
544 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX5_ENA_SHIFT, 0), 544 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX5_ENA_SHIFT, 0),
545SND_SOC_DAPM_AIF_OUT("AIF2TX6", NULL, 0, 545SND_SOC_DAPM_AIF_OUT("AIF2TX6", NULL, 5,
546 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX6_ENA_SHIFT, 0), 546 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX6_ENA_SHIFT, 0),
547 547
548SND_SOC_DAPM_AIF_IN("AIF2RX1", NULL, 0, 548SND_SOC_DAPM_AIF_IN("AIF2RX1", NULL, 0,
549 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX1_ENA_SHIFT, 0), 549 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX1_ENA_SHIFT, 0),
550SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 0, 550SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 1,
551 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX2_ENA_SHIFT, 0), 551 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX2_ENA_SHIFT, 0),
552SND_SOC_DAPM_AIF_IN("AIF2RX3", NULL, 0, 552SND_SOC_DAPM_AIF_IN("AIF2RX3", NULL, 2,
553 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX3_ENA_SHIFT, 0), 553 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX3_ENA_SHIFT, 0),
554SND_SOC_DAPM_AIF_IN("AIF2RX4", NULL, 0, 554SND_SOC_DAPM_AIF_IN("AIF2RX4", NULL, 3,
555 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX4_ENA_SHIFT, 0), 555 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX4_ENA_SHIFT, 0),
556SND_SOC_DAPM_AIF_IN("AIF2RX5", NULL, 0, 556SND_SOC_DAPM_AIF_IN("AIF2RX5", NULL, 4,
557 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX5_ENA_SHIFT, 0), 557 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX5_ENA_SHIFT, 0),
558SND_SOC_DAPM_AIF_IN("AIF2RX6", NULL, 0, 558SND_SOC_DAPM_AIF_IN("AIF2RX6", NULL, 5,
559 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX6_ENA_SHIFT, 0), 559 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX6_ENA_SHIFT, 0),
560 560
561SND_SOC_DAPM_AIF_OUT("AIF3TX1", NULL, 0, 561SND_SOC_DAPM_AIF_OUT("AIF3TX1", NULL, 0,
562 ARIZONA_AIF3_TX_ENABLES, ARIZONA_AIF3TX1_ENA_SHIFT, 0), 562 ARIZONA_AIF3_TX_ENABLES, ARIZONA_AIF3TX1_ENA_SHIFT, 0),
563SND_SOC_DAPM_AIF_OUT("AIF3TX2", NULL, 0, 563SND_SOC_DAPM_AIF_OUT("AIF3TX2", NULL, 1,
564 ARIZONA_AIF3_TX_ENABLES, ARIZONA_AIF3TX2_ENA_SHIFT, 0), 564 ARIZONA_AIF3_TX_ENABLES, ARIZONA_AIF3TX2_ENA_SHIFT, 0),
565 565
566SND_SOC_DAPM_AIF_IN("AIF3RX1", NULL, 0, 566SND_SOC_DAPM_AIF_IN("AIF3RX1", NULL, 0,
567 ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX1_ENA_SHIFT, 0), 567 ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX1_ENA_SHIFT, 0),
568SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 0, 568SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 1,
569 ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX2_ENA_SHIFT, 0), 569 ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX2_ENA_SHIFT, 0),
570 570
571SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM, 571SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index 7e817e1877c2..4466e195b66d 100644
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -1214,105 +1214,105 @@ SND_SOC_DAPM_PGA("ISRC2DEC2", ARIZONA_ISRC_2_CTRL_3,
1214 1214
1215SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0, 1215SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0,
1216 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX1_ENA_SHIFT, 0), 1216 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX1_ENA_SHIFT, 0),
1217SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 0, 1217SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 1,
1218 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX2_ENA_SHIFT, 0), 1218 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX2_ENA_SHIFT, 0),
1219SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 0, 1219SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 2,
1220 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX3_ENA_SHIFT, 0), 1220 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX3_ENA_SHIFT, 0),
1221SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 0, 1221SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 3,
1222 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX4_ENA_SHIFT, 0), 1222 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX4_ENA_SHIFT, 0),
1223SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 0, 1223SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 4,
1224 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX5_ENA_SHIFT, 0), 1224 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX5_ENA_SHIFT, 0),
1225SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 0, 1225SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 5,
1226 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX6_ENA_SHIFT, 0), 1226 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX6_ENA_SHIFT, 0),
1227SND_SOC_DAPM_AIF_OUT("AIF1TX7", NULL, 0, 1227SND_SOC_DAPM_AIF_OUT("AIF1TX7", NULL, 6,
1228 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX7_ENA_SHIFT, 0), 1228 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX7_ENA_SHIFT, 0),
1229SND_SOC_DAPM_AIF_OUT("AIF1TX8", NULL, 0, 1229SND_SOC_DAPM_AIF_OUT("AIF1TX8", NULL, 7,
1230 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX8_ENA_SHIFT, 0), 1230 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX8_ENA_SHIFT, 0),
1231 1231
1232SND_SOC_DAPM_AIF_IN("AIF1RX1", NULL, 0, 1232SND_SOC_DAPM_AIF_IN("AIF1RX1", NULL, 0,
1233 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX1_ENA_SHIFT, 0), 1233 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX1_ENA_SHIFT, 0),
1234SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 0, 1234SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 1,
1235 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX2_ENA_SHIFT, 0), 1235 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX2_ENA_SHIFT, 0),
1236SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 0, 1236SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 2,
1237 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX3_ENA_SHIFT, 0), 1237 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX3_ENA_SHIFT, 0),
1238SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 0, 1238SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 3,
1239 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX4_ENA_SHIFT, 0), 1239 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX4_ENA_SHIFT, 0),
1240SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 0, 1240SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 4,
1241 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX5_ENA_SHIFT, 0), 1241 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX5_ENA_SHIFT, 0),
1242SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 0, 1242SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 5,
1243 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX6_ENA_SHIFT, 0), 1243 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX6_ENA_SHIFT, 0),
1244SND_SOC_DAPM_AIF_IN("AIF1RX7", NULL, 0, 1244SND_SOC_DAPM_AIF_IN("AIF1RX7", NULL, 6,
1245 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX7_ENA_SHIFT, 0), 1245 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX7_ENA_SHIFT, 0),
1246SND_SOC_DAPM_AIF_IN("AIF1RX8", NULL, 0, 1246SND_SOC_DAPM_AIF_IN("AIF1RX8", NULL, 7,
1247 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX8_ENA_SHIFT, 0), 1247 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX8_ENA_SHIFT, 0),
1248 1248
1249SND_SOC_DAPM_AIF_OUT("AIF2TX1", NULL, 0, 1249SND_SOC_DAPM_AIF_OUT("AIF2TX1", NULL, 0,
1250 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX1_ENA_SHIFT, 0), 1250 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX1_ENA_SHIFT, 0),
1251SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 0, 1251SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 1,
1252 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX2_ENA_SHIFT, 0), 1252 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX2_ENA_SHIFT, 0),
1253 1253
1254SND_SOC_DAPM_AIF_IN("AIF2RX1", NULL, 0, 1254SND_SOC_DAPM_AIF_IN("AIF2RX1", NULL, 0,
1255 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX1_ENA_SHIFT, 0), 1255 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX1_ENA_SHIFT, 0),
1256SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 0, 1256SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 1,
1257 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX2_ENA_SHIFT, 0), 1257 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX2_ENA_SHIFT, 0),
1258 1258
1259SND_SOC_DAPM_AIF_OUT("AIF3TX1", NULL, 0, 1259SND_SOC_DAPM_AIF_OUT("AIF3TX1", NULL, 0,
1260 ARIZONA_AIF3_TX_ENABLES, ARIZONA_AIF3TX1_ENA_SHIFT, 0), 1260 ARIZONA_AIF3_TX_ENABLES, ARIZONA_AIF3TX1_ENA_SHIFT, 0),
1261SND_SOC_DAPM_AIF_OUT("AIF3TX2", NULL, 0, 1261SND_SOC_DAPM_AIF_OUT("AIF3TX2", NULL, 1,
1262 ARIZONA_AIF3_TX_ENABLES, ARIZONA_AIF3TX2_ENA_SHIFT, 0), 1262 ARIZONA_AIF3_TX_ENABLES, ARIZONA_AIF3TX2_ENA_SHIFT, 0),
1263 1263
1264SND_SOC_DAPM_AIF_IN("AIF3RX1", NULL, 0, 1264SND_SOC_DAPM_AIF_IN("AIF3RX1", NULL, 0,
1265 ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX1_ENA_SHIFT, 0), 1265 ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX1_ENA_SHIFT, 0),
1266SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 0, 1266SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 1,
1267 ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX2_ENA_SHIFT, 0), 1267 ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX2_ENA_SHIFT, 0),
1268 1268
1269SND_SOC_DAPM_AIF_OUT("SLIMTX1", NULL, 0, 1269SND_SOC_DAPM_AIF_OUT("SLIMTX1", NULL, 0,
1270 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 1270 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
1271 ARIZONA_SLIMTX1_ENA_SHIFT, 0), 1271 ARIZONA_SLIMTX1_ENA_SHIFT, 0),
1272SND_SOC_DAPM_AIF_OUT("SLIMTX2", NULL, 0, 1272SND_SOC_DAPM_AIF_OUT("SLIMTX2", NULL, 1,
1273 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 1273 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
1274 ARIZONA_SLIMTX2_ENA_SHIFT, 0), 1274 ARIZONA_SLIMTX2_ENA_SHIFT, 0),
1275SND_SOC_DAPM_AIF_OUT("SLIMTX3", NULL, 0, 1275SND_SOC_DAPM_AIF_OUT("SLIMTX3", NULL, 2,
1276 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 1276 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
1277 ARIZONA_SLIMTX3_ENA_SHIFT, 0), 1277 ARIZONA_SLIMTX3_ENA_SHIFT, 0),
1278SND_SOC_DAPM_AIF_OUT("SLIMTX4", NULL, 0, 1278SND_SOC_DAPM_AIF_OUT("SLIMTX4", NULL, 3,
1279 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 1279 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
1280 ARIZONA_SLIMTX4_ENA_SHIFT, 0), 1280 ARIZONA_SLIMTX4_ENA_SHIFT, 0),
1281SND_SOC_DAPM_AIF_OUT("SLIMTX5", NULL, 0, 1281SND_SOC_DAPM_AIF_OUT("SLIMTX5", NULL, 4,
1282 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 1282 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
1283 ARIZONA_SLIMTX5_ENA_SHIFT, 0), 1283 ARIZONA_SLIMTX5_ENA_SHIFT, 0),
1284SND_SOC_DAPM_AIF_OUT("SLIMTX6", NULL, 0, 1284SND_SOC_DAPM_AIF_OUT("SLIMTX6", NULL, 5,
1285 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 1285 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
1286 ARIZONA_SLIMTX6_ENA_SHIFT, 0), 1286 ARIZONA_SLIMTX6_ENA_SHIFT, 0),
1287SND_SOC_DAPM_AIF_OUT("SLIMTX7", NULL, 0, 1287SND_SOC_DAPM_AIF_OUT("SLIMTX7", NULL, 6,
1288 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 1288 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
1289 ARIZONA_SLIMTX7_ENA_SHIFT, 0), 1289 ARIZONA_SLIMTX7_ENA_SHIFT, 0),
1290SND_SOC_DAPM_AIF_OUT("SLIMTX8", NULL, 0, 1290SND_SOC_DAPM_AIF_OUT("SLIMTX8", NULL, 7,
1291 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 1291 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
1292 ARIZONA_SLIMTX8_ENA_SHIFT, 0), 1292 ARIZONA_SLIMTX8_ENA_SHIFT, 0),
1293 1293
1294SND_SOC_DAPM_AIF_IN("SLIMRX1", NULL, 0, 1294SND_SOC_DAPM_AIF_IN("SLIMRX1", NULL, 0,
1295 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 1295 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
1296 ARIZONA_SLIMRX1_ENA_SHIFT, 0), 1296 ARIZONA_SLIMRX1_ENA_SHIFT, 0),
1297SND_SOC_DAPM_AIF_IN("SLIMRX2", NULL, 0, 1297SND_SOC_DAPM_AIF_IN("SLIMRX2", NULL, 1,
1298 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 1298 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
1299 ARIZONA_SLIMRX2_ENA_SHIFT, 0), 1299 ARIZONA_SLIMRX2_ENA_SHIFT, 0),
1300SND_SOC_DAPM_AIF_IN("SLIMRX3", NULL, 0, 1300SND_SOC_DAPM_AIF_IN("SLIMRX3", NULL, 2,
1301 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 1301 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
1302 ARIZONA_SLIMRX3_ENA_SHIFT, 0), 1302 ARIZONA_SLIMRX3_ENA_SHIFT, 0),
1303SND_SOC_DAPM_AIF_IN("SLIMRX4", NULL, 0, 1303SND_SOC_DAPM_AIF_IN("SLIMRX4", NULL, 3,
1304 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 1304 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
1305 ARIZONA_SLIMRX4_ENA_SHIFT, 0), 1305 ARIZONA_SLIMRX4_ENA_SHIFT, 0),
1306SND_SOC_DAPM_AIF_IN("SLIMRX5", NULL, 0, 1306SND_SOC_DAPM_AIF_IN("SLIMRX5", NULL, 4,
1307 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 1307 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
1308 ARIZONA_SLIMRX5_ENA_SHIFT, 0), 1308 ARIZONA_SLIMRX5_ENA_SHIFT, 0),
1309SND_SOC_DAPM_AIF_IN("SLIMRX6", NULL, 0, 1309SND_SOC_DAPM_AIF_IN("SLIMRX6", NULL, 5,
1310 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 1310 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
1311 ARIZONA_SLIMRX6_ENA_SHIFT, 0), 1311 ARIZONA_SLIMRX6_ENA_SHIFT, 0),
1312SND_SOC_DAPM_AIF_IN("SLIMRX7", NULL, 0, 1312SND_SOC_DAPM_AIF_IN("SLIMRX7", NULL, 6,
1313 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 1313 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
1314 ARIZONA_SLIMRX7_ENA_SHIFT, 0), 1314 ARIZONA_SLIMRX7_ENA_SHIFT, 0),
1315SND_SOC_DAPM_AIF_IN("SLIMRX8", NULL, 0, 1315SND_SOC_DAPM_AIF_IN("SLIMRX8", NULL, 7,
1316 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 1316 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
1317 ARIZONA_SLIMRX8_ENA_SHIFT, 0), 1317 ARIZONA_SLIMRX8_ENA_SHIFT, 0),
1318 1318
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index b0789a03d699..b25877fa529d 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -1348,122 +1348,122 @@ SND_SOC_DAPM_MUX("SPKDAT2R ANC Source", SND_SOC_NOPM, 0, 0,
1348 1348
1349SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0, 1349SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0,
1350 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX1_ENA_SHIFT, 0), 1350 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX1_ENA_SHIFT, 0),
1351SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 0, 1351SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 1,
1352 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX2_ENA_SHIFT, 0), 1352 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX2_ENA_SHIFT, 0),
1353SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 0, 1353SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 2,
1354 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX3_ENA_SHIFT, 0), 1354 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX3_ENA_SHIFT, 0),
1355SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 0, 1355SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 3,
1356 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX4_ENA_SHIFT, 0), 1356 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX4_ENA_SHIFT, 0),
1357SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 0, 1357SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 4,
1358 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX5_ENA_SHIFT, 0), 1358 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX5_ENA_SHIFT, 0),
1359SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 0, 1359SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 5,
1360 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX6_ENA_SHIFT, 0), 1360 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX6_ENA_SHIFT, 0),
1361SND_SOC_DAPM_AIF_OUT("AIF1TX7", NULL, 0, 1361SND_SOC_DAPM_AIF_OUT("AIF1TX7", NULL, 6,
1362 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX7_ENA_SHIFT, 0), 1362 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX7_ENA_SHIFT, 0),
1363SND_SOC_DAPM_AIF_OUT("AIF1TX8", NULL, 0, 1363SND_SOC_DAPM_AIF_OUT("AIF1TX8", NULL, 7,
1364 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX8_ENA_SHIFT, 0), 1364 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX8_ENA_SHIFT, 0),
1365 1365
1366SND_SOC_DAPM_AIF_IN("AIF1RX1", NULL, 0, 1366SND_SOC_DAPM_AIF_IN("AIF1RX1", NULL, 0,
1367 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX1_ENA_SHIFT, 0), 1367 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX1_ENA_SHIFT, 0),
1368SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 0, 1368SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 1,
1369 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX2_ENA_SHIFT, 0), 1369 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX2_ENA_SHIFT, 0),
1370SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 0, 1370SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 2,
1371 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX3_ENA_SHIFT, 0), 1371 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX3_ENA_SHIFT, 0),
1372SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 0, 1372SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 3,
1373 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX4_ENA_SHIFT, 0), 1373 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX4_ENA_SHIFT, 0),
1374SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 0, 1374SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 4,
1375 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX5_ENA_SHIFT, 0), 1375 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX5_ENA_SHIFT, 0),
1376SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 0, 1376SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 5,
1377 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX6_ENA_SHIFT, 0), 1377 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX6_ENA_SHIFT, 0),
1378SND_SOC_DAPM_AIF_IN("AIF1RX7", NULL, 0, 1378SND_SOC_DAPM_AIF_IN("AIF1RX7", NULL, 6,
1379 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX7_ENA_SHIFT, 0), 1379 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX7_ENA_SHIFT, 0),
1380SND_SOC_DAPM_AIF_IN("AIF1RX8", NULL, 0, 1380SND_SOC_DAPM_AIF_IN("AIF1RX8", NULL, 7,
1381 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX8_ENA_SHIFT, 0), 1381 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX8_ENA_SHIFT, 0),
1382 1382
1383SND_SOC_DAPM_AIF_OUT("AIF2TX1", NULL, 0, 1383SND_SOC_DAPM_AIF_OUT("AIF2TX1", NULL, 0,
1384 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX1_ENA_SHIFT, 0), 1384 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX1_ENA_SHIFT, 0),
1385SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 0, 1385SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 1,
1386 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX2_ENA_SHIFT, 0), 1386 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX2_ENA_SHIFT, 0),
1387SND_SOC_DAPM_AIF_OUT("AIF2TX3", NULL, 0, 1387SND_SOC_DAPM_AIF_OUT("AIF2TX3", NULL, 2,
1388 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX3_ENA_SHIFT, 0), 1388 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX3_ENA_SHIFT, 0),
1389SND_SOC_DAPM_AIF_OUT("AIF2TX4", NULL, 0, 1389SND_SOC_DAPM_AIF_OUT("AIF2TX4", NULL, 3,
1390 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX4_ENA_SHIFT, 0), 1390 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX4_ENA_SHIFT, 0),
1391SND_SOC_DAPM_AIF_OUT("AIF2TX5", NULL, 0, 1391SND_SOC_DAPM_AIF_OUT("AIF2TX5", NULL, 4,
1392 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX5_ENA_SHIFT, 0), 1392 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX5_ENA_SHIFT, 0),
1393SND_SOC_DAPM_AIF_OUT("AIF2TX6", NULL, 0, 1393SND_SOC_DAPM_AIF_OUT("AIF2TX6", NULL, 5,
1394 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX6_ENA_SHIFT, 0), 1394 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX6_ENA_SHIFT, 0),
1395 1395
1396SND_SOC_DAPM_AIF_IN("AIF2RX1", NULL, 0, 1396SND_SOC_DAPM_AIF_IN("AIF2RX1", NULL, 0,
1397 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX1_ENA_SHIFT, 0), 1397 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX1_ENA_SHIFT, 0),
1398SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 0, 1398SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 1,
1399 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX2_ENA_SHIFT, 0), 1399 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX2_ENA_SHIFT, 0),
1400SND_SOC_DAPM_AIF_IN("AIF2RX3", NULL, 0, 1400SND_SOC_DAPM_AIF_IN("AIF2RX3", NULL, 2,
1401 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX3_ENA_SHIFT, 0), 1401 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX3_ENA_SHIFT, 0),
1402SND_SOC_DAPM_AIF_IN("AIF2RX4", NULL, 0, 1402SND_SOC_DAPM_AIF_IN("AIF2RX4", NULL, 3,
1403 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX4_ENA_SHIFT, 0), 1403 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX4_ENA_SHIFT, 0),
1404SND_SOC_DAPM_AIF_IN("AIF2RX5", NULL, 0, 1404SND_SOC_DAPM_AIF_IN("AIF2RX5", NULL, 4,
1405 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX5_ENA_SHIFT, 0), 1405 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX5_ENA_SHIFT, 0),
1406SND_SOC_DAPM_AIF_IN("AIF2RX6", NULL, 0, 1406SND_SOC_DAPM_AIF_IN("AIF2RX6", NULL, 5,
1407 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX6_ENA_SHIFT, 0), 1407 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX6_ENA_SHIFT, 0),
1408 1408
1409SND_SOC_DAPM_AIF_IN("SLIMRX1", NULL, 0, 1409SND_SOC_DAPM_AIF_IN("SLIMRX1", NULL, 0,
1410 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 1410 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
1411 ARIZONA_SLIMRX1_ENA_SHIFT, 0), 1411 ARIZONA_SLIMRX1_ENA_SHIFT, 0),
1412SND_SOC_DAPM_AIF_IN("SLIMRX2", NULL, 0, 1412SND_SOC_DAPM_AIF_IN("SLIMRX2", NULL, 1,
1413 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 1413 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
1414 ARIZONA_SLIMRX2_ENA_SHIFT, 0), 1414 ARIZONA_SLIMRX2_ENA_SHIFT, 0),
1415SND_SOC_DAPM_AIF_IN("SLIMRX3", NULL, 0, 1415SND_SOC_DAPM_AIF_IN("SLIMRX3", NULL, 2,
1416 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 1416 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
1417 ARIZONA_SLIMRX3_ENA_SHIFT, 0), 1417 ARIZONA_SLIMRX3_ENA_SHIFT, 0),
1418SND_SOC_DAPM_AIF_IN("SLIMRX4", NULL, 0, 1418SND_SOC_DAPM_AIF_IN("SLIMRX4", NULL, 3,
1419 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 1419 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
1420 ARIZONA_SLIMRX4_ENA_SHIFT, 0), 1420 ARIZONA_SLIMRX4_ENA_SHIFT, 0),
1421SND_SOC_DAPM_AIF_IN("SLIMRX5", NULL, 0, 1421SND_SOC_DAPM_AIF_IN("SLIMRX5", NULL, 4,
1422 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 1422 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
1423 ARIZONA_SLIMRX5_ENA_SHIFT, 0), 1423 ARIZONA_SLIMRX5_ENA_SHIFT, 0),
1424SND_SOC_DAPM_AIF_IN("SLIMRX6", NULL, 0, 1424SND_SOC_DAPM_AIF_IN("SLIMRX6", NULL, 5,
1425 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 1425 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
1426 ARIZONA_SLIMRX6_ENA_SHIFT, 0), 1426 ARIZONA_SLIMRX6_ENA_SHIFT, 0),
1427SND_SOC_DAPM_AIF_IN("SLIMRX7", NULL, 0, 1427SND_SOC_DAPM_AIF_IN("SLIMRX7", NULL, 6,
1428 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 1428 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
1429 ARIZONA_SLIMRX7_ENA_SHIFT, 0), 1429 ARIZONA_SLIMRX7_ENA_SHIFT, 0),
1430SND_SOC_DAPM_AIF_IN("SLIMRX8", NULL, 0, 1430SND_SOC_DAPM_AIF_IN("SLIMRX8", NULL, 7,
1431 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 1431 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
1432 ARIZONA_SLIMRX8_ENA_SHIFT, 0), 1432 ARIZONA_SLIMRX8_ENA_SHIFT, 0),
1433 1433
1434SND_SOC_DAPM_AIF_OUT("SLIMTX1", NULL, 0, 1434SND_SOC_DAPM_AIF_OUT("SLIMTX1", NULL, 0,
1435 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 1435 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
1436 ARIZONA_SLIMTX1_ENA_SHIFT, 0), 1436 ARIZONA_SLIMTX1_ENA_SHIFT, 0),
1437SND_SOC_DAPM_AIF_OUT("SLIMTX2", NULL, 0, 1437SND_SOC_DAPM_AIF_OUT("SLIMTX2", NULL, 1,
1438 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 1438 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
1439 ARIZONA_SLIMTX2_ENA_SHIFT, 0), 1439 ARIZONA_SLIMTX2_ENA_SHIFT, 0),
1440SND_SOC_DAPM_AIF_OUT("SLIMTX3", NULL, 0, 1440SND_SOC_DAPM_AIF_OUT("SLIMTX3", NULL, 2,
1441 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 1441 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
1442 ARIZONA_SLIMTX3_ENA_SHIFT, 0), 1442 ARIZONA_SLIMTX3_ENA_SHIFT, 0),
1443SND_SOC_DAPM_AIF_OUT("SLIMTX4", NULL, 0, 1443SND_SOC_DAPM_AIF_OUT("SLIMTX4", NULL, 3,
1444 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 1444 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
1445 ARIZONA_SLIMTX4_ENA_SHIFT, 0), 1445 ARIZONA_SLIMTX4_ENA_SHIFT, 0),
1446SND_SOC_DAPM_AIF_OUT("SLIMTX5", NULL, 0, 1446SND_SOC_DAPM_AIF_OUT("SLIMTX5", NULL, 4,
1447 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 1447 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
1448 ARIZONA_SLIMTX5_ENA_SHIFT, 0), 1448 ARIZONA_SLIMTX5_ENA_SHIFT, 0),
1449SND_SOC_DAPM_AIF_OUT("SLIMTX6", NULL, 0, 1449SND_SOC_DAPM_AIF_OUT("SLIMTX6", NULL, 5,
1450 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 1450 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
1451 ARIZONA_SLIMTX6_ENA_SHIFT, 0), 1451 ARIZONA_SLIMTX6_ENA_SHIFT, 0),
1452SND_SOC_DAPM_AIF_OUT("SLIMTX7", NULL, 0, 1452SND_SOC_DAPM_AIF_OUT("SLIMTX7", NULL, 6,
1453 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 1453 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
1454 ARIZONA_SLIMTX7_ENA_SHIFT, 0), 1454 ARIZONA_SLIMTX7_ENA_SHIFT, 0),
1455SND_SOC_DAPM_AIF_OUT("SLIMTX8", NULL, 0, 1455SND_SOC_DAPM_AIF_OUT("SLIMTX8", NULL, 7,
1456 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 1456 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
1457 ARIZONA_SLIMTX8_ENA_SHIFT, 0), 1457 ARIZONA_SLIMTX8_ENA_SHIFT, 0),
1458 1458
1459SND_SOC_DAPM_AIF_OUT("AIF3TX1", NULL, 0, 1459SND_SOC_DAPM_AIF_OUT("AIF3TX1", NULL, 0,
1460 ARIZONA_AIF3_TX_ENABLES, ARIZONA_AIF3TX1_ENA_SHIFT, 0), 1460 ARIZONA_AIF3_TX_ENABLES, ARIZONA_AIF3TX1_ENA_SHIFT, 0),
1461SND_SOC_DAPM_AIF_OUT("AIF3TX2", NULL, 0, 1461SND_SOC_DAPM_AIF_OUT("AIF3TX2", NULL, 1,
1462 ARIZONA_AIF3_TX_ENABLES, ARIZONA_AIF3TX2_ENA_SHIFT, 0), 1462 ARIZONA_AIF3_TX_ENABLES, ARIZONA_AIF3TX2_ENA_SHIFT, 0),
1463 1463
1464SND_SOC_DAPM_AIF_IN("AIF3RX1", NULL, 0, 1464SND_SOC_DAPM_AIF_IN("AIF3RX1", NULL, 0,
1465 ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX1_ENA_SHIFT, 0), 1465 ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX1_ENA_SHIFT, 0),
1466SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 0, 1466SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 1,
1467 ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX2_ENA_SHIFT, 0), 1467 ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX2_ENA_SHIFT, 0),
1468 1468
1469SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM, 1469SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,
diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c
index df5b36b8fc5a..33e3dc1a1367 100644
--- a/sound/soc/codecs/wm8997.c
+++ b/sound/soc/codecs/wm8997.c
@@ -516,95 +516,95 @@ SND_SOC_DAPM_PGA("ISRC2DEC2", ARIZONA_ISRC_2_CTRL_3,
516 516
517SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0, 517SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0,
518 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX1_ENA_SHIFT, 0), 518 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX1_ENA_SHIFT, 0),
519SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 0, 519SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 1,
520 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX2_ENA_SHIFT, 0), 520 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX2_ENA_SHIFT, 0),
521SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 0, 521SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 2,
522 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX3_ENA_SHIFT, 0), 522 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX3_ENA_SHIFT, 0),
523SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 0, 523SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 3,
524 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX4_ENA_SHIFT, 0), 524 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX4_ENA_SHIFT, 0),
525SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 0, 525SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 4,
526 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX5_ENA_SHIFT, 0), 526 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX5_ENA_SHIFT, 0),
527SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 0, 527SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 5,
528 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX6_ENA_SHIFT, 0), 528 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX6_ENA_SHIFT, 0),
529SND_SOC_DAPM_AIF_OUT("AIF1TX7", NULL, 0, 529SND_SOC_DAPM_AIF_OUT("AIF1TX7", NULL, 6,
530 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX7_ENA_SHIFT, 0), 530 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX7_ENA_SHIFT, 0),
531SND_SOC_DAPM_AIF_OUT("AIF1TX8", NULL, 0, 531SND_SOC_DAPM_AIF_OUT("AIF1TX8", NULL, 7,
532 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX8_ENA_SHIFT, 0), 532 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX8_ENA_SHIFT, 0),
533 533
534SND_SOC_DAPM_AIF_IN("AIF1RX1", NULL, 0, 534SND_SOC_DAPM_AIF_IN("AIF1RX1", NULL, 0,
535 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX1_ENA_SHIFT, 0), 535 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX1_ENA_SHIFT, 0),
536SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 0, 536SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 1,
537 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX2_ENA_SHIFT, 0), 537 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX2_ENA_SHIFT, 0),
538SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 0, 538SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 2,
539 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX3_ENA_SHIFT, 0), 539 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX3_ENA_SHIFT, 0),
540SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 0, 540SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 3,
541 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX4_ENA_SHIFT, 0), 541 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX4_ENA_SHIFT, 0),
542SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 0, 542SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 4,
543 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX5_ENA_SHIFT, 0), 543 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX5_ENA_SHIFT, 0),
544SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 0, 544SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 5,
545 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX6_ENA_SHIFT, 0), 545 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX6_ENA_SHIFT, 0),
546SND_SOC_DAPM_AIF_IN("AIF1RX7", NULL, 0, 546SND_SOC_DAPM_AIF_IN("AIF1RX7", NULL, 6,
547 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX7_ENA_SHIFT, 0), 547 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX7_ENA_SHIFT, 0),
548SND_SOC_DAPM_AIF_IN("AIF1RX8", NULL, 0, 548SND_SOC_DAPM_AIF_IN("AIF1RX8", NULL, 7,
549 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX8_ENA_SHIFT, 0), 549 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX8_ENA_SHIFT, 0),
550 550
551SND_SOC_DAPM_AIF_OUT("AIF2TX1", NULL, 0, 551SND_SOC_DAPM_AIF_OUT("AIF2TX1", NULL, 0,
552 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX1_ENA_SHIFT, 0), 552 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX1_ENA_SHIFT, 0),
553SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 0, 553SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 1,
554 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX2_ENA_SHIFT, 0), 554 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX2_ENA_SHIFT, 0),
555 555
556SND_SOC_DAPM_AIF_IN("AIF2RX1", NULL, 0, 556SND_SOC_DAPM_AIF_IN("AIF2RX1", NULL, 0,
557 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX1_ENA_SHIFT, 0), 557 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX1_ENA_SHIFT, 0),
558SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 0, 558SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 1,
559 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX2_ENA_SHIFT, 0), 559 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX2_ENA_SHIFT, 0),
560 560
561SND_SOC_DAPM_AIF_OUT("SLIMTX1", NULL, 0, 561SND_SOC_DAPM_AIF_OUT("SLIMTX1", NULL, 0,
562 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 562 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
563 ARIZONA_SLIMTX1_ENA_SHIFT, 0), 563 ARIZONA_SLIMTX1_ENA_SHIFT, 0),
564SND_SOC_DAPM_AIF_OUT("SLIMTX2", NULL, 0, 564SND_SOC_DAPM_AIF_OUT("SLIMTX2", NULL, 1,
565 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 565 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
566 ARIZONA_SLIMTX2_ENA_SHIFT, 0), 566 ARIZONA_SLIMTX2_ENA_SHIFT, 0),
567SND_SOC_DAPM_AIF_OUT("SLIMTX3", NULL, 0, 567SND_SOC_DAPM_AIF_OUT("SLIMTX3", NULL, 2,
568 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 568 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
569 ARIZONA_SLIMTX3_ENA_SHIFT, 0), 569 ARIZONA_SLIMTX3_ENA_SHIFT, 0),
570SND_SOC_DAPM_AIF_OUT("SLIMTX4", NULL, 0, 570SND_SOC_DAPM_AIF_OUT("SLIMTX4", NULL, 3,
571 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 571 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
572 ARIZONA_SLIMTX4_ENA_SHIFT, 0), 572 ARIZONA_SLIMTX4_ENA_SHIFT, 0),
573SND_SOC_DAPM_AIF_OUT("SLIMTX5", NULL, 0, 573SND_SOC_DAPM_AIF_OUT("SLIMTX5", NULL, 4,
574 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 574 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
575 ARIZONA_SLIMTX5_ENA_SHIFT, 0), 575 ARIZONA_SLIMTX5_ENA_SHIFT, 0),
576SND_SOC_DAPM_AIF_OUT("SLIMTX6", NULL, 0, 576SND_SOC_DAPM_AIF_OUT("SLIMTX6", NULL, 5,
577 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 577 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
578 ARIZONA_SLIMTX6_ENA_SHIFT, 0), 578 ARIZONA_SLIMTX6_ENA_SHIFT, 0),
579SND_SOC_DAPM_AIF_OUT("SLIMTX7", NULL, 0, 579SND_SOC_DAPM_AIF_OUT("SLIMTX7", NULL, 6,
580 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 580 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
581 ARIZONA_SLIMTX7_ENA_SHIFT, 0), 581 ARIZONA_SLIMTX7_ENA_SHIFT, 0),
582SND_SOC_DAPM_AIF_OUT("SLIMTX8", NULL, 0, 582SND_SOC_DAPM_AIF_OUT("SLIMTX8", NULL, 7,
583 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 583 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
584 ARIZONA_SLIMTX8_ENA_SHIFT, 0), 584 ARIZONA_SLIMTX8_ENA_SHIFT, 0),
585 585
586SND_SOC_DAPM_AIF_IN("SLIMRX1", NULL, 0, 586SND_SOC_DAPM_AIF_IN("SLIMRX1", NULL, 0,
587 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 587 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
588 ARIZONA_SLIMRX1_ENA_SHIFT, 0), 588 ARIZONA_SLIMRX1_ENA_SHIFT, 0),
589SND_SOC_DAPM_AIF_IN("SLIMRX2", NULL, 0, 589SND_SOC_DAPM_AIF_IN("SLIMRX2", NULL, 1,
590 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 590 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
591 ARIZONA_SLIMRX2_ENA_SHIFT, 0), 591 ARIZONA_SLIMRX2_ENA_SHIFT, 0),
592SND_SOC_DAPM_AIF_IN("SLIMRX3", NULL, 0, 592SND_SOC_DAPM_AIF_IN("SLIMRX3", NULL, 2,
593 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 593 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
594 ARIZONA_SLIMRX3_ENA_SHIFT, 0), 594 ARIZONA_SLIMRX3_ENA_SHIFT, 0),
595SND_SOC_DAPM_AIF_IN("SLIMRX4", NULL, 0, 595SND_SOC_DAPM_AIF_IN("SLIMRX4", NULL, 3,
596 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 596 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
597 ARIZONA_SLIMRX4_ENA_SHIFT, 0), 597 ARIZONA_SLIMRX4_ENA_SHIFT, 0),
598SND_SOC_DAPM_AIF_IN("SLIMRX5", NULL, 0, 598SND_SOC_DAPM_AIF_IN("SLIMRX5", NULL, 4,
599 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 599 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
600 ARIZONA_SLIMRX5_ENA_SHIFT, 0), 600 ARIZONA_SLIMRX5_ENA_SHIFT, 0),
601SND_SOC_DAPM_AIF_IN("SLIMRX6", NULL, 0, 601SND_SOC_DAPM_AIF_IN("SLIMRX6", NULL, 5,
602 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 602 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
603 ARIZONA_SLIMRX6_ENA_SHIFT, 0), 603 ARIZONA_SLIMRX6_ENA_SHIFT, 0),
604SND_SOC_DAPM_AIF_IN("SLIMRX7", NULL, 0, 604SND_SOC_DAPM_AIF_IN("SLIMRX7", NULL, 6,
605 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 605 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
606 ARIZONA_SLIMRX7_ENA_SHIFT, 0), 606 ARIZONA_SLIMRX7_ENA_SHIFT, 0),
607SND_SOC_DAPM_AIF_IN("SLIMRX8", NULL, 0, 607SND_SOC_DAPM_AIF_IN("SLIMRX8", NULL, 7,
608 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 608 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
609 ARIZONA_SLIMRX8_ENA_SHIFT, 0), 609 ARIZONA_SLIMRX8_ENA_SHIFT, 0),
610 610
diff --git a/sound/soc/codecs/wm8998.c b/sound/soc/codecs/wm8998.c
index 409bed30a4e4..125fc32ad92a 100644
--- a/sound/soc/codecs/wm8998.c
+++ b/sound/soc/codecs/wm8998.c
@@ -626,96 +626,96 @@ SND_SOC_DAPM_MUX("AEC2 Loopback", ARIZONA_DAC_AEC_CONTROL_2,
626 626
627SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0, 627SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0,
628 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX1_ENA_SHIFT, 0), 628 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX1_ENA_SHIFT, 0),
629SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 0, 629SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 1,
630 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX2_ENA_SHIFT, 0), 630 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX2_ENA_SHIFT, 0),
631SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 0, 631SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 2,
632 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX3_ENA_SHIFT, 0), 632 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX3_ENA_SHIFT, 0),
633SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 0, 633SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 3,
634 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX4_ENA_SHIFT, 0), 634 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX4_ENA_SHIFT, 0),
635SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 0, 635SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 4,
636 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX5_ENA_SHIFT, 0), 636 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX5_ENA_SHIFT, 0),
637SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 0, 637SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 5,
638 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX6_ENA_SHIFT, 0), 638 ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX6_ENA_SHIFT, 0),
639 639
640SND_SOC_DAPM_AIF_IN("AIF1RX1", NULL, 0, 640SND_SOC_DAPM_AIF_IN("AIF1RX1", NULL, 0,
641 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX1_ENA_SHIFT, 0), 641 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX1_ENA_SHIFT, 0),
642SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 0, 642SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 1,
643 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX2_ENA_SHIFT, 0), 643 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX2_ENA_SHIFT, 0),
644SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 0, 644SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 2,
645 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX3_ENA_SHIFT, 0), 645 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX3_ENA_SHIFT, 0),
646SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 0, 646SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 3,
647 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX4_ENA_SHIFT, 0), 647 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX4_ENA_SHIFT, 0),
648SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 0, 648SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 4,
649 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX5_ENA_SHIFT, 0), 649 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX5_ENA_SHIFT, 0),
650SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 0, 650SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 5,
651 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX6_ENA_SHIFT, 0), 651 ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX6_ENA_SHIFT, 0),
652 652
653SND_SOC_DAPM_AIF_OUT("AIF2TX1", NULL, 0, 653SND_SOC_DAPM_AIF_OUT("AIF2TX1", NULL, 0,
654 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX1_ENA_SHIFT, 0), 654 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX1_ENA_SHIFT, 0),
655SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 0, 655SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 1,
656 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX2_ENA_SHIFT, 0), 656 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX2_ENA_SHIFT, 0),
657SND_SOC_DAPM_AIF_OUT("AIF2TX3", NULL, 0, 657SND_SOC_DAPM_AIF_OUT("AIF2TX3", NULL, 2,
658 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX3_ENA_SHIFT, 0), 658 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX3_ENA_SHIFT, 0),
659SND_SOC_DAPM_AIF_OUT("AIF2TX4", NULL, 0, 659SND_SOC_DAPM_AIF_OUT("AIF2TX4", NULL, 3,
660 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX4_ENA_SHIFT, 0), 660 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX4_ENA_SHIFT, 0),
661SND_SOC_DAPM_AIF_OUT("AIF2TX5", NULL, 0, 661SND_SOC_DAPM_AIF_OUT("AIF2TX5", NULL, 4,
662 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX5_ENA_SHIFT, 0), 662 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX5_ENA_SHIFT, 0),
663SND_SOC_DAPM_AIF_OUT("AIF2TX6", NULL, 0, 663SND_SOC_DAPM_AIF_OUT("AIF2TX6", NULL, 5,
664 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX6_ENA_SHIFT, 0), 664 ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX6_ENA_SHIFT, 0),
665 665
666SND_SOC_DAPM_AIF_IN("AIF2RX1", NULL, 0, 666SND_SOC_DAPM_AIF_IN("AIF2RX1", NULL, 0,
667 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX1_ENA_SHIFT, 0), 667 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX1_ENA_SHIFT, 0),
668SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 0, 668SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 1,
669 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX2_ENA_SHIFT, 0), 669 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX2_ENA_SHIFT, 0),
670SND_SOC_DAPM_AIF_IN("AIF2RX3", NULL, 0, 670SND_SOC_DAPM_AIF_IN("AIF2RX3", NULL, 2,
671 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX3_ENA_SHIFT, 0), 671 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX3_ENA_SHIFT, 0),
672SND_SOC_DAPM_AIF_IN("AIF2RX4", NULL, 0, 672SND_SOC_DAPM_AIF_IN("AIF2RX4", NULL, 3,
673 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX4_ENA_SHIFT, 0), 673 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX4_ENA_SHIFT, 0),
674SND_SOC_DAPM_AIF_IN("AIF2RX5", NULL, 0, 674SND_SOC_DAPM_AIF_IN("AIF2RX5", NULL, 4,
675 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX5_ENA_SHIFT, 0), 675 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX5_ENA_SHIFT, 0),
676SND_SOC_DAPM_AIF_IN("AIF2RX6", NULL, 0, 676SND_SOC_DAPM_AIF_IN("AIF2RX6", NULL, 5,
677 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX6_ENA_SHIFT, 0), 677 ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX6_ENA_SHIFT, 0),
678 678
679SND_SOC_DAPM_AIF_IN("SLIMRX1", NULL, 0, 679SND_SOC_DAPM_AIF_IN("SLIMRX1", NULL, 0,
680 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 680 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
681 ARIZONA_SLIMRX1_ENA_SHIFT, 0), 681 ARIZONA_SLIMRX1_ENA_SHIFT, 0),
682SND_SOC_DAPM_AIF_IN("SLIMRX2", NULL, 0, 682SND_SOC_DAPM_AIF_IN("SLIMRX2", NULL, 1,
683 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 683 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
684 ARIZONA_SLIMRX2_ENA_SHIFT, 0), 684 ARIZONA_SLIMRX2_ENA_SHIFT, 0),
685SND_SOC_DAPM_AIF_IN("SLIMRX3", NULL, 0, 685SND_SOC_DAPM_AIF_IN("SLIMRX3", NULL, 2,
686 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 686 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
687 ARIZONA_SLIMRX3_ENA_SHIFT, 0), 687 ARIZONA_SLIMRX3_ENA_SHIFT, 0),
688SND_SOC_DAPM_AIF_IN("SLIMRX4", NULL, 0, 688SND_SOC_DAPM_AIF_IN("SLIMRX4", NULL, 3,
689 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE, 689 ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
690 ARIZONA_SLIMRX4_ENA_SHIFT, 0), 690 ARIZONA_SLIMRX4_ENA_SHIFT, 0),
691 691
692SND_SOC_DAPM_AIF_OUT("SLIMTX1", NULL, 0, 692SND_SOC_DAPM_AIF_OUT("SLIMTX1", NULL, 0,
693 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 693 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
694 ARIZONA_SLIMTX1_ENA_SHIFT, 0), 694 ARIZONA_SLIMTX1_ENA_SHIFT, 0),
695SND_SOC_DAPM_AIF_OUT("SLIMTX2", NULL, 0, 695SND_SOC_DAPM_AIF_OUT("SLIMTX2", NULL, 1,
696 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 696 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
697 ARIZONA_SLIMTX2_ENA_SHIFT, 0), 697 ARIZONA_SLIMTX2_ENA_SHIFT, 0),
698SND_SOC_DAPM_AIF_OUT("SLIMTX3", NULL, 0, 698SND_SOC_DAPM_AIF_OUT("SLIMTX3", NULL, 2,
699 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 699 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
700 ARIZONA_SLIMTX3_ENA_SHIFT, 0), 700 ARIZONA_SLIMTX3_ENA_SHIFT, 0),
701SND_SOC_DAPM_AIF_OUT("SLIMTX4", NULL, 0, 701SND_SOC_DAPM_AIF_OUT("SLIMTX4", NULL, 3,
702 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 702 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
703 ARIZONA_SLIMTX4_ENA_SHIFT, 0), 703 ARIZONA_SLIMTX4_ENA_SHIFT, 0),
704SND_SOC_DAPM_AIF_OUT("SLIMTX5", NULL, 0, 704SND_SOC_DAPM_AIF_OUT("SLIMTX5", NULL, 4,
705 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 705 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
706 ARIZONA_SLIMTX5_ENA_SHIFT, 0), 706 ARIZONA_SLIMTX5_ENA_SHIFT, 0),
707SND_SOC_DAPM_AIF_OUT("SLIMTX6", NULL, 0, 707SND_SOC_DAPM_AIF_OUT("SLIMTX6", NULL, 5,
708 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE, 708 ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,
709 ARIZONA_SLIMTX6_ENA_SHIFT, 0), 709 ARIZONA_SLIMTX6_ENA_SHIFT, 0),
710 710
711SND_SOC_DAPM_AIF_OUT("AIF3TX1", NULL, 0, 711SND_SOC_DAPM_AIF_OUT("AIF3TX1", NULL, 0,
712 ARIZONA_AIF3_TX_ENABLES, ARIZONA_AIF3TX1_ENA_SHIFT, 0), 712 ARIZONA_AIF3_TX_ENABLES, ARIZONA_AIF3TX1_ENA_SHIFT, 0),
713SND_SOC_DAPM_AIF_OUT("AIF3TX2", NULL, 0, 713SND_SOC_DAPM_AIF_OUT("AIF3TX2", NULL, 1,
714 ARIZONA_AIF3_TX_ENABLES, ARIZONA_AIF3TX2_ENA_SHIFT, 0), 714 ARIZONA_AIF3_TX_ENABLES, ARIZONA_AIF3TX2_ENA_SHIFT, 0),
715 715
716SND_SOC_DAPM_AIF_IN("AIF3RX1", NULL, 0, 716SND_SOC_DAPM_AIF_IN("AIF3RX1", NULL, 0,
717 ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX1_ENA_SHIFT, 0), 717 ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX1_ENA_SHIFT, 0),
718SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 0, 718SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 1,
719 ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX2_ENA_SHIFT, 0), 719 ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX2_ENA_SHIFT, 0),
720 720
721SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM, 721SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-25 10:07:05 -0400