HDA-Intel: only add the acp dmic to the sound card with analog codec

Without this change, the acp dmic will be added to both Intel sound
card (with analog codec) and Nvidia Hdmi audio sound card.

Signed-off-by: Hui Wang <hui.wang@canonical.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/HDA-Intel/HiFi.conf b/ucm2/HDA-Intel/HiFi.conf
index 2d18c9e..f09ce1c 100644 (file)
--- a/ucm2/HDA-Intel/HiFi.conf
+++ b/ucm2/HDA-Intel/HiFi.conf
@@ -9,24 +9,25 @@ If.analog {
                Type ControlExists
                Control "name='Master Playback Switch'"
        }
-       True.Include.analog.File "/HDA-Intel/HiFi-analog.conf"
+       True {
+               Include.analog.File "/HDA-Intel/HiFi-analog.conf"
+               If.acp {
+                       Condition {
+                               Type String
+                               Empty "${var:AcpCardId}"
+                       }
+                       True {
+                               RenameDevice."Mic1" "Mic"
+                       }
+                       False.Include.acp {
+                               Before.SectionDevice "Mic1"
+                               File "/HDA-Intel/HiFi-acp.conf"
+                       }
+               }
+       }
 }
 
 If.hdmi {
        Condition { Type String Empty "" }
        True.Include.hdmi.File "/HDA-Intel/Hdmi.conf"
 }
-
-If.acp {
-       Condition {
-               Type String
-               Empty "${var:AcpCardId}"
-       }
-       True {
-               RenameDevice."Mic1" "Mic"
-       }
-       False.Include.acp {
-               Before.SectionDevice "Mic1"
-               File "/HDA-Intel/HiFi-acp.conf"
-       }
-}