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 <perex@perex.cz>

diff --git a/ucm2/Intel/avs/avs_da7219/avs_da7219-HiFi.conf b/ucm2/Intel/avs/avs_da7219/avs_da7219-HiFi.conf
index 95e572e7d8a9c81bab01823dc662efcbeaa10b9f..9c498cd510e196a51153f82799b847f2bb21caa9 100644 (file)
--- 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 71f7ed0f536a0e39df7da34448483f6f6c007bad..e1d882e006f798cef0dfa17bbd56b7b8463a54f6 100644 (file)
--- 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 0f159382d6a7b7c4c0bc1ac8356fbeff604b94b1..d7f2c4433cbf11fd838e83b4d2144c3dae33349b 100644 (file)
--- 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 d0f6fbf4036098396bb95394b76785ff74ecfbb4..e20aa9c051f91b2c55418c6ad345ca2aafd422d5 100644 (file)
--- 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 50c160187feef0c573aaf82911dcb792d60fa8ad..4336525fdeed7f86cbe40f90a3b9f0de113fc55c 100644 (file)
--- 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 5a8f8d89f1b8573820a92246517b1426f26f8da4..d6e4e9d41c5104a138f88cce168f6e4a6dcbde31 100644 (file)
--- 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 4615fa460acf57a3ea057641edb1835b6fddb179..9bf44deeb916c66e3da1b24a1f123cc8bf7aab23 100644 (file)
--- 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 a0da73cea96fb8202bbd0cfbcb5c7f787c9477ae..8f1f04e0b77b30804c3d1d31d0e76f580ca84410 100644 (file)
--- 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 7215b9b0873a28e0e132f95fa3e0fd48393c7f72..5dce19c096f7e46a00abb2e59e691db9f5ca5983 100644 (file)
--- 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 f9cfa6145cb698a465469e21f19fdb646ae8e5ce..11b57a225d01ec64eb76ea799f87ce771effa3bc 100644 (file)
--- 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 7219bea3a182819ad03440b7f8409c39e3f9be72..8d0eaddf48c39a4a6e14522b2417f585c1918816 100644 (file)
--- 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 2199b5dfe58d5ff3b823ffebab27dcde2a71055c..aeef63de8ba7b4f0ee62b0e644748459712852e4 100644 (file)
--- 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
        }
 }
-