From b34b66ca8b1a6b8cd1227f2f81ab283dfd03c8c0 Mon Sep 17 00:00:00 2001
From: Shuming Fan <shumingf@realtek.com>
Date: Wed, 17 Nov 2021 11:01:15 +0800
Subject: [PATCH] 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>
---
 ...dset.conf => Desktop-Front-Speaker-Headset.conf} | 13 ++++++++++++-
 ucm2/USB-Audio/Dell/Desktop-Front-Speaker.conf      | 10 ----------
 ucm2/USB-Audio/Dell/Desktop-Front.conf              | 11 +++--------
 3 files changed, 15 insertions(+), 19 deletions(-)
 rename ucm2/USB-Audio/Dell/{Desktop-Front-Headset.conf => Desktop-Front-Speaker-Headset.conf} (66%)
 delete mode 100644 ucm2/USB-Audio/Dell/Desktop-Front-Speaker.conf

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 ae77396..f9cfa61 100644
--- 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
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 758e768..6e2cd34 100644
--- 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"
 }
-- 
2.47.1