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 <[email protected]>
alsa-project · Jan 8, 2025 · ea7a065 · ea7a065
1 parent 247fbc0
commit ea7a065
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 26 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -33,7 +33,7 @@ SectionDevice."Line" {
 	}
 }
 
-SectionDevice."Headphone" {
+SectionDevice."Headphones" {
 	Comment "Headphone Out"
 	Value {
 		PlaybackPriority 100
@@ -49,4 +49,3 @@ SectionDevice."Headphone" {
 		ChannelPos1 FR
 	}
 }
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ SectionDevice."Headphones" { @@
     	}
     }
-    SectionDevice."Microphone" {
+    SectionDevice."Mic" {
     	Comment "Microphone"
     	Value {
@@ Expand Down @@