From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 28 Mar 2025 11:00:57 +0000 (+0100)
Subject: HDA: mics - don't create conflict link for Headphone Mic
X-Git-Tag: v1.2.14~12
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=c625ee2783c16e349346c5d3fc4435dc8cac1139;p=alsa-ucm-conf.git

HDA: mics - don't create conflict link for Headphone Mic

Both devices are able to be used together (Headphones out + Headphones mic).

Fixes: 19fc5b9 ("ucm2: HDA: HiFi-analog/mic: Refactor the analog mic discovery")
Link: https://github.com/alsa-project/alsa-ucm-conf/pull/526
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/ucm2/HDA/HiFi-mic.conf b/ucm2/HDA/HiFi-mic.conf
index f2a897f..68ecc13 100644
--- a/ucm2/HDA/HiFi-mic.conf
+++ b/ucm2/HDA/HiFi-mic.conf
@@ -386,19 +386,6 @@ DefineMacro.HDACaptureDevice.SectionDevice."${var:__DevName}" {
 			"${var:-__ConflictDev3}"
 		]
 	}
-
-	# Special case: The stereo mic in Heapdhone jack is in conflict with the
-	# Headphones
-	If.hpconflict {
-		Condition {
-			Type String
-			String1 "${var:__MicName}"
-			String2 "Headphone Mic"
-		}
-		True.ConflictingDevice [
-			"Headphones"
-		]
-	}
 }
 
 If.mic1 {