From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 23 Nov 2021 11:56:27 +0000 (+0100)
Subject: HDA: shuffle order for HiFi-analog.conf include
X-Git-Tag: v1.2.6~5
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=73365dcb9d140e6811f73d2a6fe8f6f4ff11af9a;p=alsa-ucm-conf.git

HDA: shuffle order for HiFi-analog.conf include

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/ucm2/HDA/HiFi.conf b/ucm2/HDA/HiFi.conf
index 83fac01..700788e 100644
--- a/ucm2/HDA/HiFi.conf
+++ b/ucm2/HDA/HiFi.conf
@@ -10,15 +10,15 @@ If.analog {
 		Control "name='Master Playback Switch'"
 	}
 	True {
-		Include.analog.File "/HDA/HiFi-analog.conf"
 		If.acp {
 			Condition {
 				Type String
 				Empty "${var:AcpCardId}"
 			}
-			False.Include.acp {
-				Before.SectionDevice "${var:DeviceMic}"
-				File "/HDA/HiFi-acp.conf"
+			True.Include.analog.File "/HDA/HiFi-analog.conf"
+			False.Include {
+				acp.File "/HDA/HiFi-acp.conf"
+				analog.File "/HDA/HiFi-analog.conf"
 			}
 		}
 	}