From 3aab033f1d0be7ee7d71da87f23d8e5d43340c2f Mon Sep 17 00:00:00 2001 From: WeirdTreeThing Date: Tue, 22 Aug 2023 09:34:07 -0400 Subject: [PATCH] Remove remap macro It was never used and caused UCM warnings --- adl/sof-nau8825/HiFi.kano.conf | 19 -------- adl/sof-nau8825/HiFi.osiris.conf | 19 -------- adl/sof-rt5682/HiFi.gimble.conf | 19 -------- adl/sof-rt5682/HiFi.taeko.conf | 19 -------- adl/sof-ssp_amp/HiFi.vell.conf | 19 -------- cml/sof-cml_max9839/HiFi.conf | 19 -------- cml/sof-cmlda7219ma/HiFi.conf | 19 -------- cml/sof-rt5682/HiFi.conf | 19 -------- dmic-common/remap.conf | 50 ---------------------- glk/sof-cs42l42/HiFi.conf | 19 -------- glk/sof-glkda7219ma/HiFi.conf | 19 -------- glk/sof-glkrt5682ma/HiFi.conf | 19 -------- mendocino/sof-rt5682s-hs-/HiFi.conf | 19 -------- tgl/sof-rt5682/HiFi.chronicler.conf | 21 --------- tgl/sof-rt5682/HiFi.eldrid.conf | 19 -------- tgl/sof-rt5682/HiFi.lillipup.conf | 21 --------- tgl/sof-rt5682/HiFi.max98373.conf | 21 --------- tgl/sof-rt5682/HiFi.max98373.rt5682vs.conf | 21 --------- 18 files changed, 381 deletions(-) delete mode 100644 dmic-common/remap.conf diff --git a/adl/sof-nau8825/HiFi.kano.conf b/adl/sof-nau8825/HiFi.kano.conf index 8cdff6f..2b0701f 100644 --- a/adl/sof-nau8825/HiFi.kano.conf +++ b/adl/sof-nau8825/HiFi.kano.conf @@ -35,25 +35,6 @@ Macro [ } ] -Include.ctl_remap.File "/conf.d/dmic-common/remap.conf" - -Macro [ - { - CtlRemapStereoVolSw { - Dst "Mic 1 Capture" - Index0 0 - Index1 1 - } - } - { - CtlRemapStereoVolSw { - Dst "Mic 2 Capture" - Index0 2 - Index1 3 - } - } -] - SectionDevice."Speaker" { Comment "Internal Speakers" diff --git a/adl/sof-nau8825/HiFi.osiris.conf b/adl/sof-nau8825/HiFi.osiris.conf index cc12192..5f3bc0c 100644 --- a/adl/sof-nau8825/HiFi.osiris.conf +++ b/adl/sof-nau8825/HiFi.osiris.conf @@ -29,25 +29,6 @@ Macro [ } ] -Include.ctl_remap.File "/conf.d/dmic-common/remap.conf" - -Macro [ - { - CtlRemapStereoVolSw { - Dst "Mic 1 Capture" - Index0 0 - Index1 1 - } - } - { - CtlRemapStereoVolSw { - Dst "Mic 2 Capture" - Index0 2 - Index1 3 - } - } -] - SectionDevice."Speaker" { Comment "Speaker" diff --git a/adl/sof-rt5682/HiFi.gimble.conf b/adl/sof-rt5682/HiFi.gimble.conf index 76d7968..edd0d86 100644 --- a/adl/sof-rt5682/HiFi.gimble.conf +++ b/adl/sof-rt5682/HiFi.gimble.conf @@ -46,25 +46,6 @@ Macro [ } ] -Include.ctl_remap.File "/conf.d/dmic-common/remap.conf" - -Macro [ - { - CtlRemapStereoVolSw { - Dst "Mic 1 Capture" - Index0 0 - Index1 1 - } - } - { - CtlRemapStereoVolSw { - Dst "Mic 2 Capture" - Index0 2 - Index1 3 - } - } -] - SectionDevice."Speaker" { Comment "Speaker" diff --git a/adl/sof-rt5682/HiFi.taeko.conf b/adl/sof-rt5682/HiFi.taeko.conf index a7dbc59..29737e6 100644 --- a/adl/sof-rt5682/HiFi.taeko.conf +++ b/adl/sof-rt5682/HiFi.taeko.conf @@ -41,25 +41,6 @@ Macro [ } ] -Include.ctl_remap.File "/conf.d/dmic-common/remap.conf" - -Macro [ - { - CtlRemapStereoVolSw { - Dst "Mic 1 Capture" - Index0 0 - Index1 1 - } - } - { - CtlRemapStereoVolSw { - Dst "Mic 2 Capture" - Index0 2 - Index1 3 - } - } -] - SectionDevice."Speaker" { Comment "Speaker" diff --git a/adl/sof-ssp_amp/HiFi.vell.conf b/adl/sof-ssp_amp/HiFi.vell.conf index d03d597..c73245f 100644 --- a/adl/sof-ssp_amp/HiFi.vell.conf +++ b/adl/sof-ssp_amp/HiFi.vell.conf @@ -52,25 +52,6 @@ Macro [ } ] -Include.ctl_remap.File "/conf.d/dmic-common/remap.conf" - -Macro [ - { - CtlRemapStereoVolSw { - Dst "Mic 1 Capture" - Index0 0 - Index1 1 - } - } - { - CtlRemapStereoVolSw { - Dst "Mic 2 Capture" - Index0 2 - Index1 3 - } - } -] - SectionDevice."Speaker" { Comment "Speaker" diff --git a/cml/sof-cml_max9839/HiFi.conf b/cml/sof-cml_max9839/HiFi.conf index 2200c22..d6be7cb 100644 --- a/cml/sof-cml_max9839/HiFi.conf +++ b/cml/sof-cml_max9839/HiFi.conf @@ -53,25 +53,6 @@ Macro [ } ] -Include.ctl_remap.File "/conf.d/dmic-common/remap.conf" - -Macro [ - { - CtlRemapStereoVolSw { - Dst "Mic 1 Capture" - Index0 0 - Index1 1 - } - } - { - CtlRemapStereoVolSw { - Dst "Mic 2 Capture" - Index0 2 - Index1 3 - } - } -] - SectionDevice."Speaker" { Comment "Speaker" diff --git a/cml/sof-cmlda7219ma/HiFi.conf b/cml/sof-cmlda7219ma/HiFi.conf index 9ccb298..67e8fea 100644 --- a/cml/sof-cmlda7219ma/HiFi.conf +++ b/cml/sof-cmlda7219ma/HiFi.conf @@ -47,25 +47,6 @@ Macro [ } ] -Include.ctl_remap.File "/conf.d/dmic-common/remap.conf" - -Macro [ - { - CtlRemapStereoVolSw { - Dst "Mic 1 Capture" - Index0 0 - Index1 1 - } - } - { - CtlRemapStereoVolSw { - Dst "Mic 2 Capture" - Index0 2 - Index1 3 - } - } -] - SectionDevice."Speaker" { Comment "Speaker" diff --git a/cml/sof-rt5682/HiFi.conf b/cml/sof-rt5682/HiFi.conf index b1bba64..f4ce1b6 100644 --- a/cml/sof-rt5682/HiFi.conf +++ b/cml/sof-rt5682/HiFi.conf @@ -36,25 +36,6 @@ Macro [ } ] -Include.ctl_remap.File "/conf.d/dmic-common/remap.conf" - -Macro [ - { - CtlRemapStereoVolSw { - Dst "Mic 1 Capture" - Index0 0 - Index1 1 - } - } - { - CtlRemapStereoVolSw { - Dst "Mic 2 Capture" - Index0 2 - Index1 3 - } - } -] - SectionDevice."Speaker" { Comment "Speaker" diff --git a/dmic-common/remap.conf b/dmic-common/remap.conf deleted file mode 100644 index e19568e..0000000 --- a/dmic-common/remap.conf +++ /dev/null @@ -1,50 +0,0 @@ -# -# Remap controls -# - -# -# Macro CtlRemapMonoVolSw -# -# Arguments: -# Dst - Destination control name -# Src - Source control name -# Index - hardware index for value 0 (mono) -# - -DefineMacro.CtlRemapMonoVolSw { - LibraryConfig.pcm.SubstiConfig { - ctl.default.map { - "name='${var:__Dst} Volume'"."name='${var:__Src} Volume'" { - vindex.0 "${evali:$__Index}" - } - "name='${var:__Dst} Switch'"."name='${var:__Src} Switch'" { - vindex.0 "${evali:$__Index}" - } - } - } -} - -# -# Macro CtlRemapStereoVolSw -# -# Arguments: -# Dst - Destination control name -# Src - Source control name -# Index0 - hardware index for the application index 0 -# Index1 - hardware index for the application index 1 -# - -DefineMacro.CtlRemapStereoVolSw { - LibraryConfig.pcm.SubstiConfig { - ctl.default.map { - "name='${var:__Dst} Volume'"."name='${var:__Src} Volume'" { - vindex.0 "${evali:$__Index0}" - vindex.1 "${evali:$__Index1}" - } - "name='${var:__Dst} Switch'"."name='${var:__Src} Switch'" { - vindex.0 "${evali:$__Index0}" - vindex.1 "${evali:$__Index1}" - } - } - } -} diff --git a/glk/sof-cs42l42/HiFi.conf b/glk/sof-cs42l42/HiFi.conf index 0e10fdf..8bb1049 100644 --- a/glk/sof-cs42l42/HiFi.conf +++ b/glk/sof-cs42l42/HiFi.conf @@ -32,25 +32,6 @@ Macro [ } ] -Include.ctl_remap.File "/conf.d/dmic-common/remap.conf" - -Macro [ - { - CtlRemapStereoVolSw { - Dst "Mic 1 Capture" - Index0 0 - Index1 1 - } - } - { - CtlRemapStereoVolSw { - Dst "Mic 2 Capture" - Index0 2 - Index1 3 - } - } -] - SectionDevice."Speaker" { Comment "Speaker" diff --git a/glk/sof-glkda7219ma/HiFi.conf b/glk/sof-glkda7219ma/HiFi.conf index 47c41ab..3a48fd6 100644 --- a/glk/sof-glkda7219ma/HiFi.conf +++ b/glk/sof-glkda7219ma/HiFi.conf @@ -47,25 +47,6 @@ Macro [ } ] -Include.ctl_remap.File "/conf.d/dmic-common/remap.conf" - -Macro [ - { - CtlRemapStereoVolSw { - Dst "Mic 1 Capture" - Index0 0 - Index1 1 - } - } - { - CtlRemapStereoVolSw { - Dst "Mic 2 Capture" - Index0 2 - Index1 3 - } - } -] - SectionDevice."Speaker" { Comment "Speaker" diff --git a/glk/sof-glkrt5682ma/HiFi.conf b/glk/sof-glkrt5682ma/HiFi.conf index 2523f9c..15e9522 100644 --- a/glk/sof-glkrt5682ma/HiFi.conf +++ b/glk/sof-glkrt5682ma/HiFi.conf @@ -43,25 +43,6 @@ Macro [ } ] -Include.ctl_remap.File "/conf.d/dmic-common/remap.conf" - -Macro [ - { - CtlRemapStereoVolSw { - Dst "Mic 1 Capture" - Index0 0 - Index1 1 - } - } - { - CtlRemapStereoVolSw { - Dst "Mic 2 Capture" - Index0 2 - Index1 3 - } - } -] - SectionDevice."Speaker" { Comment "Speaker" diff --git a/mendocino/sof-rt5682s-hs-/HiFi.conf b/mendocino/sof-rt5682s-hs-/HiFi.conf index 5d50d72..bc8698d 100644 --- a/mendocino/sof-rt5682s-hs-/HiFi.conf +++ b/mendocino/sof-rt5682s-hs-/HiFi.conf @@ -65,25 +65,6 @@ Macro [ } ] -Include.ctl_remap.File "/conf.d/dmic-common/remap.conf" - -Macro [ - { - CtlRemapStereoVolSw { - Dst "Mic 1 Capture" - Index0 0 - Index1 1 - } - } - { - CtlRemapStereoVolSw { - Dst "Mic 2 Capture" - Index0 2 - Index1 3 - } - } -] - SectionDevice."Speaker" { Comment "Speaker" diff --git a/tgl/sof-rt5682/HiFi.chronicler.conf b/tgl/sof-rt5682/HiFi.chronicler.conf index 33b91f3..148efa4 100644 --- a/tgl/sof-rt5682/HiFi.chronicler.conf +++ b/tgl/sof-rt5682/HiFi.chronicler.conf @@ -41,27 +41,6 @@ Macro [ } ] -Include.ctl_remap.File "/conf.d/dmic-common/remap.conf" - -Macro [ - { - CtlRemapStereoVolSw { - Dst "Mic 1 Capture" - Src "STO1 ADC Capture" - Index0 0 - Index1 1 - } - } - { - CtlRemapStereoVolSw { - Dst "Mic 2 Capture" - Src "STO1 ADC Capture" - Index0 2 - Index1 3 - } - } -] - SectionDevice."Speaker" { Comment "Speaker" diff --git a/tgl/sof-rt5682/HiFi.eldrid.conf b/tgl/sof-rt5682/HiFi.eldrid.conf index 34826e8..024b969 100644 --- a/tgl/sof-rt5682/HiFi.eldrid.conf +++ b/tgl/sof-rt5682/HiFi.eldrid.conf @@ -41,25 +41,6 @@ Macro [ } ] -Include.ctl_remap.File "/conf.d/dmic-common/remap.conf" - -Macro [ - { - CtlRemapStereoVolSw { - Dst "Mic 1 Capture" - Index0 0 - Index1 1 - } - } - { - CtlRemapStereoVolSw { - Dst "Mic 2 Capture" - Index0 2 - Index1 3 - } - } -] - SectionDevice."Speaker" { Comment "Speaker" diff --git a/tgl/sof-rt5682/HiFi.lillipup.conf b/tgl/sof-rt5682/HiFi.lillipup.conf index 3832992..e2a70c3 100644 --- a/tgl/sof-rt5682/HiFi.lillipup.conf +++ b/tgl/sof-rt5682/HiFi.lillipup.conf @@ -55,27 +55,6 @@ Macro [ } ] -Include.ctl_remap.File "/conf.d/dmic-common/remap.conf" - -Macro [ - { - CtlRemapStereoVolSw { - Dst "Mic 1 Capture" - Src "STO1 ADC Capture" - Index0 0 - Index1 1 - } - } - { - CtlRemapStereoVolSw { - Dst "Mic 2 Capture" - Src "STO1 ADC Capture" - Index0 2 - Index1 3 - } - } -] - SectionDevice."Speaker" { Comment "Speaker" diff --git a/tgl/sof-rt5682/HiFi.max98373.conf b/tgl/sof-rt5682/HiFi.max98373.conf index 74296cb..b3d0f5c 100644 --- a/tgl/sof-rt5682/HiFi.max98373.conf +++ b/tgl/sof-rt5682/HiFi.max98373.conf @@ -50,27 +50,6 @@ Macro [ } ] -Include.ctl_remap.File "/conf.d/dmic-common/remap.conf" - -Macro [ - { - CtlRemapStereoVolSw { - Dst "Mic 1 Capture" - Src "STO1 ADC Capture" - Index0 0 - Index1 1 - } - } - { - CtlRemapStereoVolSw { - Dst "Mic 2 Capture" - Src "STO1 ADC Capture" - Index0 2 - Index1 3 - } - } -] - SectionDevice."Speaker" { Comment "Speaker" diff --git a/tgl/sof-rt5682/HiFi.max98373.rt5682vs.conf b/tgl/sof-rt5682/HiFi.max98373.rt5682vs.conf index a804b35..bafad0c 100644 --- a/tgl/sof-rt5682/HiFi.max98373.rt5682vs.conf +++ b/tgl/sof-rt5682/HiFi.max98373.rt5682vs.conf @@ -41,27 +41,6 @@ Macro [ } ] -Include.ctl_remap.File "/conf.d/dmic-common/remap.conf" - -Macro [ - { - CtlRemapStereoVolSw { - Dst "Mic 1 Capture" - Src "STO1 ADC Capture" - Index0 0 - Index1 1 - } - } - { - CtlRemapStereoVolSw { - Dst "Mic 2 Capture" - Src "STO1 ADC Capture" - Index0 2 - Index1 3 - } - } -] - SectionDevice."Speaker" { Comment "Speaker"