From ea7a065a7b506e36f99fdeb1e123a9a83377d0d3 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 8 Jan 2025 21:54:41 +0100 Subject: [PATCH] ucm: fix SectionDevice identifiers According [1], the device naming scheme should be consistent. Try to rename affected device names according the documentation. [1] https://github.com/alsa-project/alsa-lib/blob/master/include/use-case.h Signed-off-by: Jaroslav Kysela --- ucm2/Intel/avs/avs_da7219/avs_da7219-HiFi.conf | 2 +- ucm2/Intel/avs/avs_nau8825/avs_nau8825-HiFi.conf | 2 +- ucm2/Intel/sof-ehl-rt5660/HiFi.conf | 4 ++-- ucm2/Qualcomm/sc8280xp/HiFi.conf | 4 ++-- ucm2/Qualcomm/sm8650/QRD/HiFi.conf | 4 ++-- ucm2/Tegra/max98090/HiFi.conf | 2 +- ucm2/Tegra/wm8903/Acer-A500-HiFi.conf | 6 +++--- ucm2/USB-Audio/BOSS/Katana-HiFi.conf | 8 ++++---- ucm2/USB-Audio/Behringer/Flow8-Recording-Hifi.conf | 6 +++--- ucm2/USB-Audio/Dell/Desktop-Front-Speaker-Headset.conf | 2 +- ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3-HiFi.conf | 8 ++++---- .../NativeInstruments/Traktor-Kontrol-Z1-Mixer.conf | 3 +-- 12 files changed, 25 insertions(+), 26 deletions(-) diff --git a/ucm2/Intel/avs/avs_da7219/avs_da7219-HiFi.conf b/ucm2/Intel/avs/avs_da7219/avs_da7219-HiFi.conf index 95e572e..9c498cd 100644 --- a/ucm2/Intel/avs/avs_da7219/avs_da7219-HiFi.conf +++ b/ucm2/Intel/avs/avs_da7219/avs_da7219-HiFi.conf @@ -1,4 +1,4 @@ -SectionDevice."Headphone" { +SectionDevice."Headphones" { Comment "Headphones" Value { diff --git a/ucm2/Intel/avs/avs_nau8825/avs_nau8825-HiFi.conf b/ucm2/Intel/avs/avs_nau8825/avs_nau8825-HiFi.conf index 71f7ed0..e1d882e 100644 --- a/ucm2/Intel/avs/avs_nau8825/avs_nau8825-HiFi.conf +++ b/ucm2/Intel/avs/avs_nau8825/avs_nau8825-HiFi.conf @@ -1,4 +1,4 @@ -SectionDevice."Headphone" { +SectionDevice."Headphones" { Comment "Headphones" Value { diff --git a/ucm2/Intel/sof-ehl-rt5660/HiFi.conf b/ucm2/Intel/sof-ehl-rt5660/HiFi.conf index 0f15938..d7f2c44 100644 --- a/ucm2/Intel/sof-ehl-rt5660/HiFi.conf +++ b/ucm2/Intel/sof-ehl-rt5660/HiFi.conf @@ -9,7 +9,7 @@ SectionDevice."Speaker" { Comment "Speaker" ConflictingDevice [ - "Lineout" + "Line" ] EnableSequence [ @@ -25,7 +25,7 @@ SectionDevice."Speaker" { } } -SectionDevice."Lineout" { +SectionDevice."Line" { Comment "Lineout" ConflictingDevice [ diff --git a/ucm2/Qualcomm/sc8280xp/HiFi.conf b/ucm2/Qualcomm/sc8280xp/HiFi.conf index d0f6fbf..e20aa9c 100644 --- a/ucm2/Qualcomm/sc8280xp/HiFi.conf +++ b/ucm2/Qualcomm/sc8280xp/HiFi.conf @@ -67,8 +67,8 @@ SectionDevice."Mic" { } } -SectionDevice."DMic01" { - Comment "DMic01" +SectionDevice."Mic" { + Comment "Microphone" Include.vadm0e.File "/codecs/qcom-lpass/va-macro/DMIC0EnableSeq.conf" Include.vadm0d.File "/codecs/qcom-lpass/va-macro/DMIC0DisableSeq.conf" diff --git a/ucm2/Qualcomm/sm8650/QRD/HiFi.conf b/ucm2/Qualcomm/sm8650/QRD/HiFi.conf index 50c1601..4336525 100644 --- a/ucm2/Qualcomm/sm8650/QRD/HiFi.conf +++ b/ucm2/Qualcomm/sm8650/QRD/HiFi.conf @@ -47,7 +47,7 @@ SectionDevice."Headphones" { } } -SectionDevice."Bottom" { +SectionDevice."Mic1" { Comment "Bottom Microphone" Include.wcdmice.File "/codecs/wcd939x/AnalogMic1EnableSeq.conf" @@ -82,7 +82,7 @@ SectionDevice."Headset" { } } -SectionDevice."Back" { +SectionDevice."Mic2" { Comment "Back Microphone" Include.wcdmice.File "/codecs/wcd939x/AnalogMic4EnableSeq.conf" diff --git a/ucm2/Tegra/max98090/HiFi.conf b/ucm2/Tegra/max98090/HiFi.conf index 5a8f8d8..d6e4e9d 100644 --- a/ucm2/Tegra/max98090/HiFi.conf +++ b/ucm2/Tegra/max98090/HiFi.conf @@ -7,7 +7,7 @@ SectionVerb { ] } -SectionDevice."Speakers" { +SectionDevice."Speaker" { Comment = "Speakers" ConflictingDevice [ diff --git a/ucm2/Tegra/wm8903/Acer-A500-HiFi.conf b/ucm2/Tegra/wm8903/Acer-A500-HiFi.conf index 4615fa4..9bf44de 100644 --- a/ucm2/Tegra/wm8903/Acer-A500-HiFi.conf +++ b/ucm2/Tegra/wm8903/Acer-A500-HiFi.conf @@ -33,7 +33,7 @@ SectionVerb { ] } -SectionDevice."Speakers" { +SectionDevice."Speaker" { Comment "Speakers" ConflictingDevice [ @@ -70,7 +70,7 @@ SectionDevice."Headphones" { } } -SectionDevice."InternalMic" { +SectionDevice."Mic" { Comment "Internal Microphone" ConflictingDevice [ @@ -91,7 +91,7 @@ SectionDevice."InternalMic" { } } -SectionDevice."HeadsetMic" { +SectionDevice."Headset" { Comment "Headset Microphone" ConflictingDevice [ diff --git a/ucm2/USB-Audio/BOSS/Katana-HiFi.conf b/ucm2/USB-Audio/BOSS/Katana-HiFi.conf index a0da73c..8f1f04e 100644 --- a/ucm2/USB-Audio/BOSS/Katana-HiFi.conf +++ b/ucm2/USB-Audio/BOSS/Katana-HiFi.conf @@ -27,7 +27,7 @@ Macro [ } ] -SectionDevice."PrimaryOut" { +SectionDevice."Line1" { Comment "Music Playback" Value { @@ -45,7 +45,7 @@ SectionDevice."PrimaryOut" { } } -SectionDevice."SecondaryOut" { +SectionDevice."Line2" { Comment "DI Playback" Value { @@ -63,7 +63,7 @@ SectionDevice."SecondaryOut" { } } -SectionDevice."PrimaryIn" { +SectionDevice."Line3" { Comment "Processed Signal" Value { @@ -81,7 +81,7 @@ SectionDevice."PrimaryIn" { } } -SectionDevice."SecondaryIn" { +SectionDevice."Line4" { Comment "DI Capture" Value { diff --git a/ucm2/USB-Audio/Behringer/Flow8-Recording-Hifi.conf b/ucm2/USB-Audio/Behringer/Flow8-Recording-Hifi.conf index 7215b9b..5dce19c 100644 --- a/ucm2/USB-Audio/Behringer/Flow8-Recording-Hifi.conf +++ b/ucm2/USB-Audio/Behringer/Flow8-Recording-Hifi.conf @@ -234,7 +234,7 @@ SectionDevice."Line8" { } -SectionDevice."Line56" { +SectionDevice."Line9" { Comment "Line-56 L/R" Value { @@ -252,7 +252,7 @@ SectionDevice."Line56" { } } -SectionDevice."Line78" { +SectionDevice."Line10" { Comment "Line-78 L/R" Value { @@ -270,7 +270,7 @@ SectionDevice."Line78" { } } -SectionDevice."LineMaster" { +SectionDevice."Line11" { Comment "Master/Monitor L/R" Value { diff --git a/ucm2/USB-Audio/Dell/Desktop-Front-Speaker-Headset.conf b/ucm2/USB-Audio/Dell/Desktop-Front-Speaker-Headset.conf index f9cfa61..11b57a2 100644 --- a/ucm2/USB-Audio/Dell/Desktop-Front-Speaker-Headset.conf +++ b/ucm2/USB-Audio/Dell/Desktop-Front-Speaker-Headset.conf @@ -20,7 +20,7 @@ SectionDevice."Headphones" { } } -SectionDevice."Microphone" { +SectionDevice."Mic" { Comment "Microphone" Value { diff --git a/ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3-HiFi.conf b/ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3-HiFi.conf index 7219bea..8d0eadd 100644 --- a/ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3-HiFi.conf +++ b/ucm2/USB-Audio/Digidesign/Digidesign-Mbox-3-HiFi.conf @@ -58,7 +58,7 @@ SectionDevice."Line1" { } -SectionDevice."line2SPDIF" { +SectionDevice."Line2" { Comment "SPDIF Out" Value { PlaybackPriority 100 @@ -75,7 +75,7 @@ SectionDevice."line2SPDIF" { } } -SectionDevice."mic1" { +SectionDevice."Mic1" { Comment "Mic/Line 1" Value { @@ -91,7 +91,7 @@ SectionDevice."mic1" { } } -SectionDevice."mic2" { +SectionDevice."Mic2" { Comment "Mic/Line 2" Value { @@ -107,7 +107,7 @@ SectionDevice."mic2" { } } -SectionDevice."mic3SPDIF" { +SectionDevice."Mic3" { Comment "SPDIF In" Value { diff --git a/ucm2/USB-Audio/NativeInstruments/Traktor-Kontrol-Z1-Mixer.conf b/ucm2/USB-Audio/NativeInstruments/Traktor-Kontrol-Z1-Mixer.conf index 2199b5d..aeef63d 100644 --- a/ucm2/USB-Audio/NativeInstruments/Traktor-Kontrol-Z1-Mixer.conf +++ b/ucm2/USB-Audio/NativeInstruments/Traktor-Kontrol-Z1-Mixer.conf @@ -33,7 +33,7 @@ SectionDevice."Line" { } } -SectionDevice."Headphone" { +SectionDevice."Headphones" { Comment "Headphone Out" Value { PlaybackPriority 100 @@ -49,4 +49,3 @@ SectionDevice."Headphone" { ChannelPos1 FR } } - -- 2.47.1