ucm2: join two front configs of Dell Desktop into one

This patch makes the speaker and headset configs join to one config.

Signed-off-by: Shuming Fan <shumingf@realtek.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/USB-Audio/Dell/Desktop-Front-Headset.conf b/ucm2/USB-Audio/Dell/Desktop-Front-Speaker-Headset.conf
similarity index 66%
rename from ucm2/USB-Audio/Dell/Desktop-Front-Headset.conf
rename to ucm2/USB-Audio/Dell/Desktop-Front-Speaker-Headset.conf
index ae77396428d8c2a266d1a31a7187250d2a0af480..f9cfa6145cb698a465469e21f19fdb646ae8e5ce 100644 (file)
--- a/ucm2/USB-Audio/Dell/Desktop-Front-Headset.conf
+++ b/ucm2/USB-Audio/Dell/Desktop-Front-Speaker-Headset.conf
@@ -1,3 +1,14 @@
+SectionDevice."Speaker" {
+       Comment "Built-in Speaker"
+
+       Value {
+               PlaybackPriority 100
+               PlaybackPCM "hw:${CardId}"
+               JackControl "Speaker - Output Jack"
+               PlaybackMixerElem "Speaker"
+       }
+}
+
 SectionDevice."Headphones" {
        Comment "Headset/Headphones"
 
@@ -18,4 +29,4 @@ SectionDevice."Microphone" {
                JackControl "Mic - Input Jack"
                CaptureMixerElem "Mic"
        }
-}
+}
\ No newline at end of file

diff --git a/ucm2/USB-Audio/Dell/Desktop-Front-Speaker.conf b/ucm2/USB-Audio/Dell/Desktop-Front-Speaker.conf
deleted file mode 100644 (file)
index 89faf39..0000000
--- a/ucm2/USB-Audio/Dell/Desktop-Front-Speaker.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-SectionDevice."Speaker" {
-       Comment "Built-in Speaker"
-
-       Value {
-               PlaybackPriority 100
-               PlaybackPCM "hw:${CardId}"
-               JackControl "Speaker - Output Jack"
-               PlaybackMixerElem "Speaker"
-       }
-}

diff --git a/ucm2/USB-Audio/Dell/Desktop-Front.conf b/ucm2/USB-Audio/Dell/Desktop-Front.conf
index 758e768c76572d8bd8ca835ffaaebbf809c43bcd..6e2cd344390ab8f9c98810b6176ea8afb4fe1241 100644 (file)
--- a/ucm2/USB-Audio/Dell/Desktop-Front.conf
+++ b/ucm2/USB-Audio/Dell/Desktop-Front.conf
@@ -1,11 +1,6 @@
 Syntax 2
 Comment "USB-audio on the front of Dell Desktop"
-SectionUseCase."Speaker" {
-       Comment "Internal Speaker"
-       File "Dell/Desktop-Front-Speaker.conf"
-}
-
-SectionUseCase."Headset" {
-       Comment "Front Headset"
-       File "Dell/Desktop-Front-Headset.conf"
+SectionUseCase."HiFi" {
+       Comment "Internal Speaker/Front Headset"
+       File "Dell/Desktop-Front-Speaker-Headset.conf"
 }