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 f2a897fffee9f4fbb30c4f7a9e77fffaf43e046b..68ecc1328d5aaa36453c672f86ba17b56355b351 100644 (file)
--- 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 {