Takashi Iwai
8389479bc5
- Backport upstream fixes: more Baytrail/Cherrytrail profiles, TRX40 / ALC1220-VLC profiles: 0013-bytcr-rt5640-Add-support-for-devices-without-speaker.patch 0014-rt5640-Move-standard-DAC-setup-to-EnableSeq.conf.patch 0015-bytcr-rt5640-fix-the-execution-order.patch 0016-ucm2-add-initial-configuration-for-TRX40-Gigabyte-Ao.patch 0017-USB-Audio-ALC1220-Bump-analog-Speaker-priority-over-.patch 0018-USB-Audio-ALC1220-fix-indentation-for-Speaker-device.patch 0019-USB-Audio-fix-indentation-in-Gigabyte-Aorus-Master-M.patch 0020-chtnau8824-Add-a-SST-define-variable.patch 0021-kblrt5660-Fix-file-permissions.patch - Run fdupes to reduce the duplicated files OBS-URL: https://build.opensuse.org/request/show/865342 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-ucm-conf?expand=0&rev=29
69 lines
1.9 KiB
Diff
69 lines
1.9 KiB
Diff
From 95587ae8b75134c4bbc2cec0181e5d529826c9c4 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Thu, 14 Jan 2021 18:31:24 +0100
|
|
Subject: [PATCH 15/20] bytcr-rt5640: fix the execution order
|
|
|
|
The includes must be run _after_ defines. The Include directives
|
|
have precedence. Put everything to If compound.
|
|
|
|
Fixes: bdd05ac339 ("bytcr-rt5640: Add support for devices without speakers and/or an internal mic")
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
ucm2/bytcr-rt5640/HiFi-Components.conf | 10 ++++++++--
|
|
ucm2/bytcr-rt5640/HiFi-LongName.conf | 10 ++++++++--
|
|
2 files changed, 16 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/ucm2/bytcr-rt5640/HiFi-Components.conf b/ucm2/bytcr-rt5640/HiFi-Components.conf
|
|
index a76b42d0b414..19997178a934 100644
|
|
--- a/ucm2/bytcr-rt5640/HiFi-Components.conf
|
|
+++ b/ucm2/bytcr-rt5640/HiFi-Components.conf
|
|
@@ -25,7 +25,10 @@ If.mono {
|
|
}
|
|
}
|
|
|
|
-Include.hs.File "/codecs/rt5640/HeadPhones.conf"
|
|
+If.hp {
|
|
+ Condition { Type String Empty "" }
|
|
+ True.Include.hs.File "/codecs/rt5640/HeadPhones.conf"
|
|
+}
|
|
|
|
If.dmic1 {
|
|
Condition {
|
|
@@ -63,4 +66,7 @@ If.in3 {
|
|
}
|
|
}
|
|
|
|
-Include.hsmic.File "/codecs/rt5640/HeadsetMic.conf"
|
|
+If.hsmic {
|
|
+ Condition { Type String Empty "" }
|
|
+ True.Include.hsmic.File "/codecs/rt5640/HeadsetMic.conf"
|
|
+}
|
|
diff --git a/ucm2/bytcr-rt5640/HiFi-LongName.conf b/ucm2/bytcr-rt5640/HiFi-LongName.conf
|
|
index 6cb55565baec..34acef8142f0 100644
|
|
--- a/ucm2/bytcr-rt5640/HiFi-LongName.conf
|
|
+++ b/ucm2/bytcr-rt5640/HiFi-LongName.conf
|
|
@@ -25,7 +25,10 @@ If.mono {
|
|
}
|
|
}
|
|
|
|
-Include.hs.File "/codecs/rt5640/HeadPhones.conf"
|
|
+If.hp {
|
|
+ Condition { Type String Empty "" }
|
|
+ True.Include.hs.File "/codecs/rt5640/HeadPhones.conf"
|
|
+}
|
|
|
|
If.dmic1 {
|
|
Condition {
|
|
@@ -63,4 +66,7 @@ If.in3 {
|
|
}
|
|
}
|
|
|
|
-Include.hsmic.File "/codecs/rt5640/HeadsetMic.conf"
|
|
+If.hsmic {
|
|
+ Condition { Type String Empty "" }
|
|
+ True.Include.hsmic.File "/codecs/rt5640/HeadsetMic.conf"
|
|
+}
|
|
--
|
|
2.26.2
|
|
|