157 lines
4.5 KiB
Diff
157 lines
4.5 KiB
Diff
From 0b2aa9d22f8897cbe68f1aa2ffe437ad3194ec4b Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Mon, 27 Dec 2021 22:05:16 +0100
|
|
Subject: [PATCH 1/4] HDA-DualCodecs: fix typo in Speaker condition
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
ucm2/HDA/DualCodecs/HiFi.conf | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/ucm2/HDA/DualCodecs/HiFi.conf b/ucm2/HDA/DualCodecs/HiFi.conf
|
|
index 7dcd6b0..1f7e58d 100644
|
|
--- a/ucm2/HDA/DualCodecs/HiFi.conf
|
|
+++ b/ucm2/HDA/DualCodecs/HiFi.conf
|
|
@@ -19,7 +19,7 @@ SectionVerb {
|
|
If.speaker {
|
|
Condition {
|
|
Type ControlExists
|
|
- Control "name='Speaker Volume Switch'"
|
|
+ Control "name='Speaker Playback Switch'"
|
|
}
|
|
True {
|
|
SectionVerb {
|
|
@@ -100,7 +100,7 @@ SectionDevice."Headphones" {
|
|
If.speaker {
|
|
Condition {
|
|
Type ControlExists
|
|
- Control "name='Speaker Volume Switch'"
|
|
+ Control "name='Speaker Playback Switch'"
|
|
}
|
|
True.Value.JackHWMute "Speaker"
|
|
}
|
|
--
|
|
2.34.1
|
|
|
|
|
|
From 369f8b497e15a993d411df81a39ee5c8c1433363 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Fri, 7 Jan 2022 10:57:48 +0100
|
|
Subject: [PATCH 2/4] HDA-acp: avoid to create 'Mic ACP LED' control for the
|
|
HDMI card
|
|
|
|
BugLink: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1849#note_1210933
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
ucm2/HDA/HDA.conf | 20 ++++++++++++++------
|
|
1 file changed, 14 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/ucm2/HDA/HDA.conf b/ucm2/HDA/HDA.conf
|
|
index 003d941..ab80fa5 100644
|
|
--- a/ucm2/HDA/HDA.conf
|
|
+++ b/ucm2/HDA/HDA.conf
|
|
@@ -43,13 +43,21 @@ If.use {
|
|
Comment "Play HiFi quality Music"
|
|
}
|
|
|
|
- Include.init.File "/HDA/init.conf"
|
|
+ If.analog {
|
|
+ Condition {
|
|
+ Type ControlExists
|
|
+ Control "name='Master Playback Switch'"
|
|
+ }
|
|
+ True {
|
|
+ Include.init.File "/HDA/init.conf"
|
|
|
|
- FixedBootSequence [
|
|
- cset-new "name='Mic ACP LED Capture Switch' type=bool,count=1 off"
|
|
- exec "-/sbin/modprobe snd_ctl_led"
|
|
- sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:Mic ACP LED Capture Switch"
|
|
- ]
|
|
+ FixedBootSequence [
|
|
+ cset-new "name='Mic ACP LED Capture Switch' type=bool,count=1 off"
|
|
+ exec "-/sbin/modprobe snd_ctl_led"
|
|
+ sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:Mic ACP LED Capture Switch"
|
|
+ ]
|
|
+ }
|
|
+ }
|
|
}
|
|
}
|
|
|
|
--
|
|
2.34.1
|
|
|
|
|
|
From 642db9b51ff7f8ad022fee0362871ceaa46599bf Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Thu, 27 Jan 2022 21:50:32 +0100
|
|
Subject: [PATCH 3/4] acp6x: add initial support for AMD Yellow Carp - ACP6x
|
|
|
|
Link: https://github.com/alsa-project/alsa-ucm-conf/issues/136
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
ucm2/HDA/HDA.conf | 2 +-
|
|
ucm2/conf.d/acp6x/acp6x.conf | 1 +
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
create mode 120000 ucm2/conf.d/acp6x/acp6x.conf
|
|
|
|
diff --git a/ucm2/HDA/HDA.conf b/ucm2/HDA/HDA.conf
|
|
index ab80fa5..411f2e7 100644
|
|
--- a/ucm2/HDA/HDA.conf
|
|
+++ b/ucm2/HDA/HDA.conf
|
|
@@ -3,7 +3,7 @@ Syntax 4
|
|
Define.Use "" # a non-empty string to use UCM configuration for HDA devices
|
|
Define.Done "" # a non-empty string to skip the end error
|
|
|
|
-Define.AcpCardId "$${find-card:field=name,return=id,regex='^acp$'}"
|
|
+Define.AcpCardId "$${find-card:field=name,return=id,regex='^(acp|acp6x)$'}"
|
|
Define.DeviceMic "Mic"
|
|
|
|
If.dualcodec {
|
|
diff --git a/ucm2/conf.d/acp6x/acp6x.conf b/ucm2/conf.d/acp6x/acp6x.conf
|
|
new file mode 120000
|
|
index 0000000..7298c24
|
|
--- /dev/null
|
|
+++ b/ucm2/conf.d/acp6x/acp6x.conf
|
|
@@ -0,0 +1 @@
|
|
+../../common/linked-card.conf
|
|
\ No newline at end of file
|
|
--
|
|
2.34.1
|
|
|
|
|
|
From 8170fffa7bad33c67b7c59ef5d98d92c0c742e91 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Wed, 9 Feb 2022 16:19:31 +0100
|
|
Subject: [PATCH 4/4] sof-hda-dsp: fix multiple If.dmic blocks
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Fix multiple If.dmic blocks - rename the first to devdmic
|
|
initialization.
|
|
|
|
Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/132
|
|
Reported-by: Kacper Michajłow <kasper93@gmail.com>
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf
|
|
index b47777b..eb243d1 100644
|
|
--- a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf
|
|
+++ b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf
|
|
@@ -3,7 +3,7 @@ Syntax 4
|
|
Define.DeviceMic "Mic"
|
|
Define.DeviceDmic ""
|
|
|
|
-If.dmic {
|
|
+If.devdmic {
|
|
Condition {
|
|
Type String
|
|
Haystack "${CardComponents}"
|
|
--
|
|
2.34.1
|
|
|