diff -r /home/juimonen/temp/conf_master/sof-apl-da7219.conf /home/juimonen/temp/conf_test/sof-apl-da7219.conf
507d506
< 
812d810
< 
1609d1606
< 
1915d1911
< 
2220d2215
< 
diff -r /home/juimonen/temp/conf_master/sof-apl-demux-pcm512x.conf /home/juimonen/temp/conf_test/sof-apl-demux-pcm512x.conf
908d907
< 
1213d1211
< 
1517d1514
< 
diff -r /home/juimonen/temp/conf_master/sof-apl-eq-dmic.conf /home/juimonen/temp/conf_test/sof-apl-eq-dmic.conf
422,426d421
< 
< 
< 
< 
< 
464,465d458
< 
< 
467c460
< SectionVendorTuples."CONTROLMIXER1.1_tuples_w" {
---
> SectionVendorTuples."Capture Switch_tuples_w" {
474,475c467,468
< SectionData."CONTROLMIXER1.1_data_w" {
< 	tuples "CONTROLMIXER1.1_tuples_w"
---
> SectionData."Capture Switch_data_w" {
> 	tuples "Capture Switch_tuples_w"
506c499
< 		"CONTROLMIXER1.1_data_w"
---
> 		"Capture Switch_data_w"
610c603
< SectionVendorTuples."PGA1.0_tuples_w" {
---
> SectionVendorTuples."Dmic0_tuples_w" {
617,618c610,611
< SectionData."PGA1.0_data_w" {
< 	tuples "PGA1.0_tuples_w"
---
> SectionData."Dmic0_data_w" {
> 	tuples "Dmic0_tuples_w"
620c613
< SectionVendorTuples."PGA1.0_tuples_str" {
---
> SectionVendorTuples."Dmic0_tuples_str" {
626,627c619,620
< SectionData."PGA1.0_data_str" {
< 	tuples "PGA1.0_tuples_str"
---
> SectionData."Dmic0_data_str" {
> 	tuples "Dmic0_tuples_str"
634,635c627,628
< 		"PGA1.0_data_w"
< 		"PGA1.0_data_str"
---
> 		"Dmic0_data_w"
> 		"Dmic0_data_str"
765,769d757
< 
< 
< 
< 
< 
diff -r /home/juimonen/temp/conf_master/sof-apl-nocodec.conf /home/juimonen/temp/conf_test/sof-apl-nocodec.conf
1259d1258
< 
1880d1878
< 
2500d2497
< 
diff -r /home/juimonen/temp/conf_master/sof-apl-pcm512x.conf /home/juimonen/temp/conf_test/sof-apl-pcm512x.conf
951d950
< 
1256d1254
< 
1560d1557
< 
diff -r /home/juimonen/temp/conf_master/sof-apl-pcm512x-nohdmi.conf /home/juimonen/temp/conf_test/sof-apl-pcm512x-nohdmi.conf
503d502
< 
diff -r /home/juimonen/temp/conf_master/sof-apl-rt298.conf /home/juimonen/temp/conf_test/sof-apl-rt298.conf
504d503
< 
809d807
< 
1114d1111
< 
1418d1414
< 
diff -r /home/juimonen/temp/conf_master/sof-apl-tdf8532.conf /home/juimonen/temp/conf_test/sof-apl-tdf8532.conf
506d505
< 
811d809
< 
1418d1415
< 
2327d2323
< 
2933d2928
< 
diff -r /home/juimonen/temp/conf_master/sof-apl-wm8804.conf /home/juimonen/temp/conf_test/sof-apl-wm8804.conf
501d500
< 
diff -r /home/juimonen/temp/conf_master/sof-cht-rt5682.conf /home/juimonen/temp/conf_test/sof-cht-rt5682.conf
551d550
< 
diff -r /home/juimonen/temp/conf_master/sof-cml-demux-rt5682.conf /home/juimonen/temp/conf_test/sof-cml-demux-rt5682.conf
1408d1407
< 
1713d1711
< 
2017d2014
< 
diff -r /home/juimonen/temp/conf_master/sof-cml-demux-rt5682-max98357a.conf /home/juimonen/temp/conf_test/sof-cml-demux-rt5682-max98357a.conf
1416d1415
< 
1721d1719
< 
2026d2023
< 
4080d4076
< 
diff -r /home/juimonen/temp/conf_master/sof-cml-rt1011-rt5682.conf /home/juimonen/temp/conf_test/sof-cml-rt1011-rt5682.conf
529d528
< 
1325d1323
< 
1630d1627
< 
1935d1931
< 
4763d4758
< 
diff -r /home/juimonen/temp/conf_master/sof-cml-rt5682.conf /home/juimonen/temp/conf_test/sof-cml-rt5682.conf
519d518
< 
1315d1313
< 
1620d1617
< 
1924d1920
< 
diff -r /home/juimonen/temp/conf_master/sof-cml-rt5682-kwd.conf /home/juimonen/temp/conf_test/sof-cml-rt5682-kwd.conf
523d522
< 
1319d1317
< 
1624d1621
< 
1928d1924
< 
diff -r /home/juimonen/temp/conf_master/sof-cml-rt5682-max98357a.conf /home/juimonen/temp/conf_test/sof-cml-rt5682-max98357a.conf
531d530
< 
1327d1325
< 
1632d1629
< 
1937d1933
< 
4768d4763
< 
diff -r /home/juimonen/temp/conf_master/sof-cml-rt700.conf /home/juimonen/temp/conf_test/sof-cml-rt700.conf
510d509
< 
1495d1493
< 
1800d1797
< 
2104d2100
< 
diff -r /home/juimonen/temp/conf_master/sof-cml-rt711-rt1308-mono-rt715.conf /home/juimonen/temp/conf_test/sof-cml-rt711-rt1308-mono-rt715.conf
510d509
< 
1117d1115
< 
1858d1855
< 
2163d2159
< 
2467d2462
< 
diff -r /home/juimonen/temp/conf_master/sof-cml-rt711-rt1308-rt715.conf /home/juimonen/temp/conf_test/sof-cml-rt711-rt1308-rt715.conf
510d509
< 
1117d1115
< 
1422d1419
< 
2161d2157
< 
2466d2461
< 
2770d2764
< 
diff -r /home/juimonen/temp/conf_master/sof-cml-src-rt5682.conf /home/juimonen/temp/conf_test/sof-cml-src-rt5682.conf
1374d1373
< 
1679d1677
< 
1983d1980
< 
diff -r /home/juimonen/temp/conf_master/sof-cnl-nocodec.conf /home/juimonen/temp/conf_test/sof-cnl-nocodec.conf
506d505
< 
1113d1111
< 
1719d1716
< 
diff -r /home/juimonen/temp/conf_master/sof-cnl-rt274.conf /home/juimonen/temp/conf_test/sof-cnl-rt274.conf
503d502
< 
diff -r /home/juimonen/temp/conf_master/sof-ehl-nocodec.conf /home/juimonen/temp/conf_test/sof-ehl-nocodec.conf
509d508
< 
1116d1114
< 
1722d1719
< 
diff -r /home/juimonen/temp/conf_master/sof-ehl-rt5660.conf /home/juimonen/temp/conf_test/sof-ehl-rt5660.conf
513d512
< 
1725d1723
< 
2030d2027
< 
2335d2331
< 
2639d2634
< 
diff -r /home/juimonen/temp/conf_master/sof-ehl-rt5660-nohdmi.conf /home/juimonen/temp/conf_test/sof-ehl-rt5660-nohdmi.conf
508d507
< 
diff -r /home/juimonen/temp/conf_master/sof-glk-da7219.conf /home/juimonen/temp/conf_test/sof-glk-da7219.conf
507d506
< 
812d810
< 
1723d1720
< 
2029d2025
< 
2334d2329
< 
diff -r /home/juimonen/temp/conf_master/sof-glk-da7219-kwd.conf /home/juimonen/temp/conf_test/sof-glk-da7219-kwd.conf
512d511
< 
817d815
< 
1726d1723
< 
2031d2027
< 
2335d2330
< 
diff -r /home/juimonen/temp/conf_master/sof-glk-rt5682.conf /home/juimonen/temp/conf_test/sof-glk-rt5682.conf
510d509
< 
815d813
< 
1613d1610
< 
1919d1915
< 
2224d2219
< 
diff -r /home/juimonen/temp/conf_master/sof-hda-generic-2ch.conf /home/juimonen/temp/conf_test/sof-hda-generic-2ch.conf
436,440d435
< 
< 
< 
< 
< 
478,479d472
< 
< 
481c474
< SectionVendorTuples."CONTROLMIXER10.10_tuples_w" {
---
> SectionVendorTuples."Capture Switch_tuples_w" {
488,489c481,482
< SectionData."CONTROLMIXER10.10_data_w" {
< 	tuples "CONTROLMIXER10.10_tuples_w"
---
> SectionData."Capture Switch_data_w" {
> 	tuples "Capture Switch_tuples_w"
520c513
< 		"CONTROLMIXER10.10_data_w"
---
> 		"Capture Switch_data_w"
624c617
< SectionVendorTuples."PGA10.0_tuples_w" {
---
> SectionVendorTuples."Dmic0_tuples_w" {
631,632c624,625
< SectionData."PGA10.0_data_w" {
< 	tuples "PGA10.0_tuples_w"
---
> SectionData."Dmic0_data_w" {
> 	tuples "Dmic0_tuples_w"
634c627
< SectionVendorTuples."PGA10.0_tuples_str" {
---
> SectionVendorTuples."Dmic0_tuples_str" {
640,641c633,634
< SectionData."PGA10.0_data_str" {
< 	tuples "PGA10.0_tuples_str"
---
> SectionData."Dmic0_data_str" {
> 	tuples "Dmic0_tuples_str"
648,649c641,642
< 		"PGA10.0_data_w"
< 		"PGA10.0_data_str"
---
> 		"Dmic0_data_w"
> 		"Dmic0_data_str"
780,784d772
< 
< 
< 
< 
< 
918,920d905
< 
< 
< 
1057c1042
< SectionVendorTuples."PGA11.0_tuples_w" {
---
> SectionVendorTuples."Dmic1_tuples_w" {
1064,1065c1049,1050
< SectionData."PGA11.0_data_w" {
< 	tuples "PGA11.0_tuples_w"
---
> SectionData."Dmic1_data_w" {
> 	tuples "Dmic1_tuples_w"
1067c1052
< SectionVendorTuples."PGA11.0_tuples_str" {
---
> SectionVendorTuples."Dmic1_tuples_str" {
1073,1074c1058,1059
< SectionData."PGA11.0_data_str" {
< 	tuples "PGA11.0_tuples_str"
---
> SectionData."Dmic1_data_str" {
> 	tuples "Dmic1_tuples_str"
1081,1082c1066,1067
< 		"PGA11.0_data_w"
< 		"PGA11.0_data_str"
---
> 		"Dmic1_data_w"
> 		"Dmic1_data_str"
1212,1214d1196
< 
< 
< 
2012d1993
< 
2751d2731
< 
3490d3469
< 
3795d3773
< 
4099d4076
< 
diff -r /home/juimonen/temp/conf_master/sof-hda-generic-4ch.conf /home/juimonen/temp/conf_test/sof-hda-generic-4ch.conf
436,440d435
< 
< 
< 
< 
< 
478,479d472
< 
< 
481c474
< SectionVendorTuples."CONTROLMIXER10.10_tuples_w" {
---
> SectionVendorTuples."Capture Switch_tuples_w" {
488,489c481,482
< SectionData."CONTROLMIXER10.10_data_w" {
< 	tuples "CONTROLMIXER10.10_tuples_w"
---
> SectionData."Capture Switch_data_w" {
> 	tuples "Capture Switch_tuples_w"
520c513
< 		"CONTROLMIXER10.10_data_w"
---
> 		"Capture Switch_data_w"
624c617
< SectionVendorTuples."PGA10.0_tuples_w" {
---
> SectionVendorTuples."Dmic0_tuples_w" {
631,632c624,625
< SectionData."PGA10.0_data_w" {
< 	tuples "PGA10.0_tuples_w"
---
> SectionData."Dmic0_data_w" {
> 	tuples "Dmic0_tuples_w"
634c627
< SectionVendorTuples."PGA10.0_tuples_str" {
---
> SectionVendorTuples."Dmic0_tuples_str" {
640,641c633,634
< SectionData."PGA10.0_data_str" {
< 	tuples "PGA10.0_tuples_str"
---
> SectionData."Dmic0_data_str" {
> 	tuples "Dmic0_tuples_str"
648,649c641,642
< 		"PGA10.0_data_w"
< 		"PGA10.0_data_str"
---
> 		"Dmic0_data_w"
> 		"Dmic0_data_str"
780,784d772
< 
< 
< 
< 
< 
918,920d905
< 
< 
< 
1057c1042
< SectionVendorTuples."PGA11.0_tuples_w" {
---
> SectionVendorTuples."Dmic1_tuples_w" {
1064,1065c1049,1050
< SectionData."PGA11.0_data_w" {
< 	tuples "PGA11.0_tuples_w"
---
> SectionData."Dmic1_data_w" {
> 	tuples "Dmic1_tuples_w"
1067c1052
< SectionVendorTuples."PGA11.0_tuples_str" {
---
> SectionVendorTuples."Dmic1_tuples_str" {
1073,1074c1058,1059
< SectionData."PGA11.0_data_str" {
< 	tuples "PGA11.0_tuples_str"
---
> SectionData."Dmic1_data_str" {
> 	tuples "Dmic1_tuples_str"
1081,1082c1066,1067
< 		"PGA11.0_data_w"
< 		"PGA11.0_data_str"
---
> 		"Dmic1_data_w"
> 		"Dmic1_data_str"
1212,1214d1196
< 
< 
< 
2032d2013
< 
2771d2751
< 
3510d3489
< 
3815d3793
< 
4119d4096
< 
diff -r /home/juimonen/temp/conf_master/sof-hda-generic.conf /home/juimonen/temp/conf_test/sof-hda-generic.conf
509d508
< 
1248d1246
< 
1987d1984
< 
2292d2288
< 
2596d2591
< 
diff -r /home/juimonen/temp/conf_master/sof-hda-generic-idisp-2ch.conf /home/juimonen/temp/conf_test/sof-hda-generic-idisp-2ch.conf
437,441d436
< 
< 
< 
< 
< 
479,480d473
< 
< 
482c475
< SectionVendorTuples."CONTROLMIXER5.5_tuples_w" {
---
> SectionVendorTuples."Capture Switch_tuples_w" {
489,490c482,483
< SectionData."CONTROLMIXER5.5_data_w" {
< 	tuples "CONTROLMIXER5.5_tuples_w"
---
> SectionData."Capture Switch_data_w" {
> 	tuples "Capture Switch_tuples_w"
521c514
< 		"CONTROLMIXER5.5_data_w"
---
> 		"Capture Switch_data_w"
625c618
< SectionVendorTuples."PGA5.0_tuples_w" {
---
> SectionVendorTuples."Dmic0_tuples_w" {
632,633c625,626
< SectionData."PGA5.0_data_w" {
< 	tuples "PGA5.0_tuples_w"
---
> SectionData."Dmic0_data_w" {
> 	tuples "Dmic0_tuples_w"
635c628
< SectionVendorTuples."PGA5.0_tuples_str" {
---
> SectionVendorTuples."Dmic0_tuples_str" {
641,642c634,635
< SectionData."PGA5.0_data_str" {
< 	tuples "PGA5.0_tuples_str"
---
> SectionData."Dmic0_data_str" {
> 	tuples "Dmic0_tuples_str"
649,650c642,643
< 		"PGA5.0_data_w"
< 		"PGA5.0_data_str"
---
> 		"Dmic0_data_w"
> 		"Dmic0_data_str"
781,785d773
< 
< 
< 
< 
< 
919,921d906
< 
< 
< 
1058c1043
< SectionVendorTuples."PGA6.0_tuples_w" {
---
> SectionVendorTuples."Dmic1_tuples_w" {
1065,1066c1050,1051
< SectionData."PGA6.0_data_w" {
< 	tuples "PGA6.0_tuples_w"
---
> SectionData."Dmic1_data_w" {
> 	tuples "Dmic1_tuples_w"
1068c1053
< SectionVendorTuples."PGA6.0_tuples_str" {
---
> SectionVendorTuples."Dmic1_tuples_str" {
1074,1075c1059,1060
< SectionData."PGA6.0_data_str" {
< 	tuples "PGA6.0_tuples_str"
---
> SectionData."Dmic1_data_str" {
> 	tuples "Dmic1_tuples_str"
1082,1083c1067,1068
< 		"PGA6.0_data_w"
< 		"PGA6.0_data_str"
---
> 		"Dmic1_data_w"
> 		"Dmic1_data_str"
1213,1215d1197
< 
< 
< 
2010d1991
< 
2315d2295
< 
2619d2598
< 
diff -r /home/juimonen/temp/conf_master/sof-hda-generic-idisp-4ch.conf /home/juimonen/temp/conf_test/sof-hda-generic-idisp-4ch.conf
437,441d436
< 
< 
< 
< 
< 
479,480d473
< 
< 
482c475
< SectionVendorTuples."CONTROLMIXER5.5_tuples_w" {
---
> SectionVendorTuples."Capture Switch_tuples_w" {
489,490c482,483
< SectionData."CONTROLMIXER5.5_data_w" {
< 	tuples "CONTROLMIXER5.5_tuples_w"
---
> SectionData."Capture Switch_data_w" {
> 	tuples "Capture Switch_tuples_w"
521c514
< 		"CONTROLMIXER5.5_data_w"
---
> 		"Capture Switch_data_w"
625c618
< SectionVendorTuples."PGA5.0_tuples_w" {
---
> SectionVendorTuples."Dmic0_tuples_w" {
632,633c625,626
< SectionData."PGA5.0_data_w" {
< 	tuples "PGA5.0_tuples_w"
---
> SectionData."Dmic0_data_w" {
> 	tuples "Dmic0_tuples_w"
635c628
< SectionVendorTuples."PGA5.0_tuples_str" {
---
> SectionVendorTuples."Dmic0_tuples_str" {
641,642c634,635
< SectionData."PGA5.0_data_str" {
< 	tuples "PGA5.0_tuples_str"
---
> SectionData."Dmic0_data_str" {
> 	tuples "Dmic0_tuples_str"
649,650c642,643
< 		"PGA5.0_data_w"
< 		"PGA5.0_data_str"
---
> 		"Dmic0_data_w"
> 		"Dmic0_data_str"
781,785d773
< 
< 
< 
< 
< 
919,921d906
< 
< 
< 
1058c1043
< SectionVendorTuples."PGA6.0_tuples_w" {
---
> SectionVendorTuples."Dmic1_tuples_w" {
1065,1066c1050,1051
< SectionData."PGA6.0_data_w" {
< 	tuples "PGA6.0_tuples_w"
---
> SectionData."Dmic1_data_w" {
> 	tuples "Dmic1_tuples_w"
1068c1053
< SectionVendorTuples."PGA6.0_tuples_str" {
---
> SectionVendorTuples."Dmic1_tuples_str" {
1074,1075c1059,1060
< SectionData."PGA6.0_data_str" {
< 	tuples "PGA6.0_tuples_str"
---
> SectionData."Dmic1_data_str" {
> 	tuples "Dmic1_tuples_str"
1082,1083c1067,1068
< 		"PGA6.0_data_w"
< 		"PGA6.0_data_str"
---
> 		"Dmic1_data_w"
> 		"Dmic1_data_str"
1213,1215d1197
< 
< 
< 
2030d2011
< 
2335d2315
< 
2639d2618
< 
diff -r /home/juimonen/temp/conf_master/sof-hda-generic-idisp.conf /home/juimonen/temp/conf_test/sof-hda-generic-idisp.conf
507d506
< 
812d810
< 
1116d1113
< 
diff -r /home/juimonen/temp/conf_master/sof-icl-nocodec.conf /home/juimonen/temp/conf_test/sof-icl-nocodec.conf
501d500
< 
diff -r /home/juimonen/temp/conf_master/sof-icl-rt5682.conf /home/juimonen/temp/conf_test/sof-icl-rt5682.conf
518d517
< 
1314d1312
< 
1619d1616
< 
1923d1919
< 
diff -r /home/juimonen/temp/conf_master/sof-icl-rt5682-kwd.conf /home/juimonen/temp/conf_test/sof-icl-rt5682-kwd.conf
522d521
< 
1318d1316
< 
1623d1620
< 
1927d1923
< 
diff -r /home/juimonen/temp/conf_master/sof-icl-rt700.conf /home/juimonen/temp/conf_test/sof-icl-rt700.conf
509d508
< 
1494d1492
< 
1799d1796
< 
2103d2099
< 
diff -r /home/juimonen/temp/conf_master/sof-icl-rt711-rt1308-rt715.conf /home/juimonen/temp/conf_test/sof-icl-rt711-rt1308-rt715.conf
505d504
< 
1112d1110
< 
1416d1413
< 
diff -r /home/juimonen/temp/conf_master/sof-icl-rt711-rt1308-rt715-hdmi.conf /home/juimonen/temp/conf_test/sof-icl-rt711-rt1308-rt715-hdmi.conf
509d508
< 
1116d1114
< 
1421d1418
< 
2160d2156
< 
2465d2460
< 
2769d2763
< 
diff -r /home/juimonen/temp/conf_master/sof-imx8qxp-cs42888.conf /home/juimonen/temp/conf_test/sof-imx8qxp-cs42888.conf
469d468
< 
diff -r /home/juimonen/temp/conf_master/sof-imx8qxp-nocodec.conf /home/juimonen/temp/conf_test/sof-imx8qxp-nocodec.conf
469d468
< 
diff -r /home/juimonen/temp/conf_master/sof-imx8qxp-nocodec-sai.conf /home/juimonen/temp/conf_test/sof-imx8qxp-nocodec-sai.conf
469d468
< 
diff -r /home/juimonen/temp/conf_master/sof-imx8qxp-wm8960.conf /home/juimonen/temp/conf_test/sof-imx8qxp-wm8960.conf
469d468
< 
diff -r /home/juimonen/temp/conf_master/sof-jsl-da7219.conf /home/juimonen/temp/conf_test/sof-jsl-da7219.conf
509d508
< 
1304d1302
< 
1609d1606
< 
1914d1910
< 
2218d2213
< 
diff -r /home/juimonen/temp/conf_master/sof-tgl-max98357a-rt5682.conf /home/juimonen/temp/conf_test/sof-tgl-max98357a-rt5682.conf
508d507
< 
813d811
< 
1608d1605
< 
1913d1909
< 
2218d2213
< 
2522d2516
< 
diff -r /home/juimonen/temp/conf_master/sof-tgl-nocodec.conf /home/juimonen/temp/conf_test/sof-tgl-nocodec.conf
509d508
< 
1116d1114
< 
1722d1719
< 
diff -r /home/juimonen/temp/conf_master/sof-tgl-rt711-rt1308.conf /home/juimonen/temp/conf_test/sof-tgl-rt711-rt1308.conf
515d514
< 
1122d1120
< 
2035d2032
< 
2340d2336
< 
2645d2640
< 
2949d2943
< 
diff -r /home/juimonen/temp/conf_master/sof-tgl-rt711-rt1308-nohdmi.conf /home/juimonen/temp/conf_test/sof-tgl-rt711-rt1308-nohdmi.conf
510d509
< 
1116d1114
< 
diff -r /home/juimonen/temp/conf_master/sof-whl-demux-rt5682.conf /home/juimonen/temp/conf_test/sof-whl-demux-rt5682.conf
1408d1407
< 
1713d1711
< 
2017d2014
< 
diff -r /home/juimonen/temp/conf_master/sof-whl-rt5682.conf /home/juimonen/temp/conf_test/sof-whl-rt5682.conf
519d518
< 
1315d1313
< 
1620d1617
< 
1924d1920
< 
diff -r /home/juimonen/temp/conf_master/sof-whl-rt5682-kwd.conf /home/juimonen/temp/conf_test/sof-whl-rt5682-kwd.conf
523d522
< 
1319d1317
< 
1624d1621
< 
1928d1924
<