From: Jaroslav Kysela Date: Tue, 23 Nov 2021 11:50:13 +0000 (+0100) Subject: HDA-Intel: rename config directory to HDA X-Git-Tag: v1.2.6~6 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=ad0b025799d8b0aab3b5abec7f2dee4a87a59146;p=alsa-ucm-conf.git HDA-Intel: rename config directory to HDA It's not related only to Intel. We have AMD, NVidia HDA hardware, too. Signed-off-by: Jaroslav Kysela --- diff --git a/ucm2/HDA-Intel/DualCodecs/DualCodecs.conf b/ucm2/HDA/DualCodecs/DualCodecs.conf similarity index 92% rename from ucm2/HDA-Intel/DualCodecs/DualCodecs.conf rename to ucm2/HDA/DualCodecs/DualCodecs.conf index 393885f..8a8fc64 100644 --- a/ucm2/HDA-Intel/DualCodecs/DualCodecs.conf +++ b/ucm2/HDA/DualCodecs/DualCodecs.conf @@ -1,6 +1,6 @@ Comment "HDAudio with dual HD-audio codecs" SectionUseCase."HiFi" { - File "/HDA-Intel/DualCodecs/HiFi.conf" + File "/HDA/DualCodecs/HiFi.conf" Comment "Default" } diff --git a/ucm2/HDA-Intel/DualCodecs/HiFi.conf b/ucm2/HDA/DualCodecs/HiFi.conf similarity index 100% rename from ucm2/HDA-Intel/DualCodecs/HiFi.conf rename to ucm2/HDA/DualCodecs/HiFi.conf diff --git a/ucm2/HDA-Intel/HDA-Capture-value.conf b/ucm2/HDA/HDA-Capture-value.conf similarity index 100% rename from ucm2/HDA-Intel/HDA-Capture-value.conf rename to ucm2/HDA/HDA-Capture-value.conf diff --git a/ucm2/HDA-Intel/HDA-Intel.conf b/ucm2/HDA/HDA.conf similarity index 88% rename from ucm2/HDA-Intel/HDA-Intel.conf rename to ucm2/HDA/HDA.conf index 47c53c4..a75d311 100644 --- a/ucm2/HDA-Intel/HDA-Intel.conf +++ b/ucm2/HDA/HDA.conf @@ -15,7 +15,7 @@ If.dualcodec { True { Define.Done y Define.AcpCardId "" - Include.dual.File "/HDA-Intel/DualCodecs/DualCodecs.conf" + Include.dual.File "/HDA/DualCodecs/DualCodecs.conf" } } @@ -39,11 +39,11 @@ If.use { Define.Done y SectionUseCase."HiFi" { - File "/HDA-Intel/HiFi.conf" + File "/HDA/HiFi.conf" Comment "Play HiFi quality Music" } - Include.init.File "/HDA-Intel/init.conf" + Include.init.File "/HDA/init.conf" FixedBootSequence [ cset-new "name='Mic ACP LED Capture Switch' type=bool,count=1 off" diff --git a/ucm2/HDA-Intel/Hdmi.conf b/ucm2/HDA/Hdmi.conf similarity index 100% rename from ucm2/HDA-Intel/Hdmi.conf rename to ucm2/HDA/Hdmi.conf diff --git a/ucm2/HDA-Intel/HiFi-acp.conf b/ucm2/HDA/HiFi-acp.conf similarity index 100% rename from ucm2/HDA-Intel/HiFi-acp.conf rename to ucm2/HDA/HiFi-acp.conf diff --git a/ucm2/HDA-Intel/HiFi-analog.conf b/ucm2/HDA/HiFi-analog.conf similarity index 94% rename from ucm2/HDA-Intel/HiFi-analog.conf rename to ucm2/HDA/HiFi-analog.conf index 809fcde..9c8510b 100644 --- a/ucm2/HDA-Intel/HiFi-analog.conf +++ b/ucm2/HDA/HiFi-analog.conf @@ -143,7 +143,7 @@ If.monomic { Value { CapturePriority 200 - Include.value.File "/HDA-Intel/HDA-Capture-value.conf" + Include.value.File "/HDA/HDA-Capture-value.conf" CaptureMasterElem "Headphone Mic Boost" JackControl "Headphone Mic Jack" } @@ -158,7 +158,7 @@ If.monomic { Value { CapturePriority 300 - Include.value.File "/HDA-Intel/HDA-Capture-value.conf" + Include.value.File "/HDA/HDA-Capture-value.conf" CaptureMasterElem "Headset Mic Boost" JackControl "Headphone Mic Jack" } @@ -170,7 +170,7 @@ If.monomic { Value { CapturePriority 200 - Include.value.File "/HDA-Intel/HDA-Capture-value.conf" + Include.value.File "/HDA/HDA-Capture-value.conf" CaptureMasterElem "Mic Boost" JackControl "Mic Jack" } @@ -192,7 +192,7 @@ If.frontmic { Value { CapturePriority 400 - Include.value.File "/HDA-Intel/HDA-Capture-value.conf" + Include.value.File "/HDA/HDA-Capture-value.conf" CaptureMasterElem "Front Mic Boost" JackControl "Front Mic Jack" } diff --git a/ucm2/HDA-Intel/HiFi.conf b/ucm2/HDA/HiFi.conf similarity index 73% rename from ucm2/HDA-Intel/HiFi.conf rename to ucm2/HDA/HiFi.conf index 9f31e07..83fac01 100644 --- a/ucm2/HDA-Intel/HiFi.conf +++ b/ucm2/HDA/HiFi.conf @@ -10,7 +10,7 @@ If.analog { Control "name='Master Playback Switch'" } True { - Include.analog.File "/HDA-Intel/HiFi-analog.conf" + Include.analog.File "/HDA/HiFi-analog.conf" If.acp { Condition { Type String @@ -18,7 +18,7 @@ If.analog { } False.Include.acp { Before.SectionDevice "${var:DeviceMic}" - File "/HDA-Intel/HiFi-acp.conf" + File "/HDA/HiFi-acp.conf" } } } @@ -26,5 +26,5 @@ If.analog { If.hdmi { Condition { Type String Empty "" } - True.Include.hdmi.File "/HDA-Intel/Hdmi.conf" + True.Include.hdmi.File "/HDA/Hdmi.conf" } diff --git a/ucm2/HDA-Intel/init.conf b/ucm2/HDA/init.conf similarity index 100% rename from ucm2/HDA-Intel/init.conf rename to ucm2/HDA/init.conf diff --git a/ucm2/Intel/sof-hda-dsp/HiFi.conf b/ucm2/Intel/sof-hda-dsp/HiFi.conf index 867769c..fb9b1ca 100644 --- a/ucm2/Intel/sof-hda-dsp/HiFi.conf +++ b/ucm2/Intel/sof-hda-dsp/HiFi.conf @@ -4,7 +4,7 @@ SectionVerb { Value.TQ "HiFi" } -Include.hda-analog.File "/HDA-Intel/HiFi-analog.conf" +Include.hda-analog.File "/HDA/HiFi-analog.conf" If.dmic { Condition { diff --git a/ucm2/conf.d/HDA-Intel/HDA-Intel.conf b/ucm2/conf.d/HDA-Intel/HDA-Intel.conf index 8ad4dae..81a584b 120000 --- a/ucm2/conf.d/HDA-Intel/HDA-Intel.conf +++ b/ucm2/conf.d/HDA-Intel/HDA-Intel.conf @@ -1 +1 @@ -../../HDA-Intel/HDA-Intel.conf \ No newline at end of file +../../HDA/HDA.conf \ No newline at end of file