Compare commits
No commits in common. 'c9' and 'i10cs' have entirely different histories.
@ -1,3 +1,3 @@
|
|||||||
d6ccb4b512d86786d8383c3394489ecc5d2bca66 SOURCES/alsa-lib-1.2.9.tar.bz2
|
ed7c9f4323392cc9715103d190b40b26aa12f9ba SOURCES/alsa-lib-1.2.13.tar.bz2
|
||||||
8c1d225b9fe108797349e8d0cb6161271aab0f50 SOURCES/alsa-topology-conf-1.2.5.tar.bz2
|
8c1d225b9fe108797349e8d0cb6161271aab0f50 SOURCES/alsa-topology-conf-1.2.5.tar.bz2
|
||||||
9ab0f8e33817122962ac3d6cf5e6e26b8f5cc9cb SOURCES/alsa-ucm-conf-1.2.9.tar.bz2
|
58e776ef96df0fd5cfec8039e2a71c4ef4b8f7a5 SOURCES/alsa-ucm-conf-1.2.13.tar.bz2
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
SOURCES/alsa-lib-1.2.9.tar.bz2
|
SOURCES/alsa-lib-1.2.13.tar.bz2
|
||||||
SOURCES/alsa-topology-conf-1.2.5.tar.bz2
|
SOURCES/alsa-topology-conf-1.2.5.tar.bz2
|
||||||
SOURCES/alsa-ucm-conf-1.2.9.tar.bz2
|
SOURCES/alsa-ucm-conf-1.2.13.tar.bz2
|
||||||
|
@ -0,0 +1,256 @@
|
|||||||
|
From 76edab4e595bd5f3f4c636cccc8d7976d3c519d6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Nicholas Vinson <nvinson234@gmail.com>
|
||||||
|
Date: Thu, 14 Nov 2024 07:49:53 -0500
|
||||||
|
Subject: [PATCH 1/5] src/Versions.in.in: Update *_tempo_base name
|
||||||
|
|
||||||
|
Change @SYMBOL_PREFIX@snd_has_tempo_base to
|
||||||
|
@SYMBOL_PREFIX@snd_has_queue_tempo_base.
|
||||||
|
|
||||||
|
Starting with version 1.2.13, alsa-lib fails to link with ld.lld-19 due
|
||||||
|
to "version script assignment of 'ALSA_1.2.13' to symbol
|
||||||
|
'snd_seq_has_tempo_base' failed: symbol not defined".
|
||||||
|
|
||||||
|
Per commit 769d1db1b0a213a39c7e59c0d1d724e7f45b1ac3 the correct name for
|
||||||
|
the symbol is @SYMBOL_PREFIX@snd_has_queue_tempo_base; therefore, update
|
||||||
|
src/Vesions.in.in to match.
|
||||||
|
|
||||||
|
Fixes bug #420
|
||||||
|
Fixes Gentoo bug 943399 (https://bugs.gentoo.org/943399)
|
||||||
|
|
||||||
|
Closes: https://github.com/alsa-project/alsa-lib/pull/421
|
||||||
|
Signed-off-by: Nicholas Vinson <nvinson234@gmail.com>
|
||||||
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
---
|
||||||
|
src/Versions.in.in | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/Versions.in.in b/src/Versions.in.in
|
||||||
|
index 350ec3d8..7ad6a633 100644
|
||||||
|
--- a/src/Versions.in.in
|
||||||
|
+++ b/src/Versions.in.in
|
||||||
|
@@ -212,7 +212,7 @@ ALSA_1.2.13 {
|
||||||
|
@SYMBOL_PREFIX@snd_seq_create_ump_block;
|
||||||
|
@SYMBOL_PREFIX@snd_seq_queue_tempo_get_tempo_base;
|
||||||
|
@SYMBOL_PREFIX@snd_seq_queue_tempo_set_tempo_base;
|
||||||
|
- @SYMBOL_PREFIX@snd_seq_has_tempo_base;
|
||||||
|
+ @SYMBOL_PREFIX@snd_seq_has_queue_tempo_base;
|
||||||
|
@SYMBOL_PREFIX@snd_seq_port_info_get_ump_is_midi1;
|
||||||
|
@SYMBOL_PREFIX@snd_seq_port_info_set_ump_is_midi1;
|
||||||
|
#endif
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
||||||
|
|
||||||
|
From 6880219ad4ba55ae8a94a34b7a987b3369f7c96f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Takashi Iwai <tiwai@suse.de>
|
||||||
|
Date: Sun, 24 Nov 2024 09:32:29 +0100
|
||||||
|
Subject: [PATCH 2/5] configure: Make sequencer dependent on rawmidi
|
||||||
|
|
||||||
|
The sequencer feature requires rawmidi implicitly, and it became more
|
||||||
|
obvious with UMP support. Add the dependency check to configure
|
||||||
|
script.
|
||||||
|
|
||||||
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||||
|
---
|
||||||
|
configure.ac | 6 ++++++
|
||||||
|
1 file changed, 6 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 1cd22a59..69aeb978 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -483,6 +483,12 @@ fi
|
||||||
|
AC_SUBST(PYTHON_LIBS)
|
||||||
|
AC_SUBST(PYTHON_INCLUDES)
|
||||||
|
|
||||||
|
+if test "$build_rawmidi" != "yes"; then
|
||||||
|
+ if test "$build_seq" = "yes"; then
|
||||||
|
+ AC_ERROR([Cannot enable sequencer without rawmidi])
|
||||||
|
+ fi
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
AM_CONDITIONAL([BUILD_MIXER], [test x$build_mixer = xyes])
|
||||||
|
AM_CONDITIONAL([BUILD_PCM], [test x$build_pcm = xyes])
|
||||||
|
AM_CONDITIONAL([BUILD_RAWMIDI], [test x$build_rawmidi = xyes])
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
||||||
|
|
||||||
|
From 07cee0ba05179a56764c35975d5822420d4f31f9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Takashi Iwai <tiwai@suse.de>
|
||||||
|
Date: Sun, 24 Nov 2024 09:33:16 +0100
|
||||||
|
Subject: [PATCH 3/5] seq: include UMP headers
|
||||||
|
|
||||||
|
Some applications seem including alsa/seqmid.h individually, and this
|
||||||
|
got broken with the update of alsa-lib because now we have
|
||||||
|
dependencies to UMP stuff. Include the necessary UMP headers
|
||||||
|
internally. Also, add the inclusion of rawmidi.h in ump.h for similar
|
||||||
|
reasons.
|
||||||
|
|
||||||
|
Link: https://bugzilla.suse.com/show_bug.cgi?id=1233682
|
||||||
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||||
|
---
|
||||||
|
include/seq.h | 2 ++
|
||||||
|
include/seq_event.h | 2 ++
|
||||||
|
include/ump.h | 2 ++
|
||||||
|
3 files changed, 6 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/include/seq.h b/include/seq.h
|
||||||
|
index 2eee95a6..5082ad0a 100644
|
||||||
|
--- a/include/seq.h
|
||||||
|
+++ b/include/seq.h
|
||||||
|
@@ -29,6 +29,8 @@
|
||||||
|
#ifndef __ALSA_SEQ_H
|
||||||
|
#define __ALSA_SEQ_H
|
||||||
|
|
||||||
|
+#include "ump.h"
|
||||||
|
+
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
diff --git a/include/seq_event.h b/include/seq_event.h
|
||||||
|
index 9ca384ee..0b59202f 100644
|
||||||
|
--- a/include/seq_event.h
|
||||||
|
+++ b/include/seq_event.h
|
||||||
|
@@ -28,6 +28,8 @@
|
||||||
|
#ifndef __ALSA_SEQ_EVENT_H
|
||||||
|
#define __ALSA_SEQ_EVENT_H
|
||||||
|
|
||||||
|
+#include "ump_msg.h"
|
||||||
|
+
|
||||||
|
/**
|
||||||
|
* \defgroup SeqEvents Sequencer Event Definitions
|
||||||
|
* Sequencer Event Definitions
|
||||||
|
diff --git a/include/ump.h b/include/ump.h
|
||||||
|
index 1043d237..06c86a5e 100644
|
||||||
|
--- a/include/ump.h
|
||||||
|
+++ b/include/ump.h
|
||||||
|
@@ -9,6 +9,8 @@
|
||||||
|
#ifndef __ALSA_UMP_H
|
||||||
|
#define __ALSA_UMP_H
|
||||||
|
|
||||||
|
+#include "rawmidi.h"
|
||||||
|
+
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
||||||
|
|
||||||
|
From 76d2d285c10b1e368b4bf9494cf9270ae46197cb Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
Date: Mon, 25 Nov 2024 15:11:27 +0100
|
||||||
|
Subject: [PATCH 4/5] rawmidi: ump - fix snd_ump_block_info_get_block_id double
|
||||||
|
version
|
||||||
|
|
||||||
|
The changes for 1.2.13 in Versions.in.in file matches also old
|
||||||
|
1.2.10 function snd_ump_block_info_get_block_id:
|
||||||
|
|
||||||
|
1 Removed function:
|
||||||
|
|
||||||
|
[D] 'function void snd_ump_block_info_set_block_id(snd_ump_block_info_t*, unsigned int)' {snd_ump_block_info_set_block_id@@ALSA_1.2.10}
|
||||||
|
|
||||||
|
Add 1.2.10 symbol back, but keep 1.2.13 symbol as default.
|
||||||
|
|
||||||
|
Closes: https://github.com/alsa-project/alsa-lib/issues/422
|
||||||
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
---
|
||||||
|
src/rawmidi/ump.c | 9 +++++++++
|
||||||
|
1 file changed, 9 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/rawmidi/ump.c b/src/rawmidi/ump.c
|
||||||
|
index d3676afb..b1246c33 100644
|
||||||
|
--- a/src/rawmidi/ump.c
|
||||||
|
+++ b/src/rawmidi/ump.c
|
||||||
|
@@ -750,11 +750,20 @@ int snd_ump_block_info_get_device(const snd_ump_block_info_t *info)
|
||||||
|
* \param info pointer to a snd_ump_block_info_t structure
|
||||||
|
* \return ID number of the given UMP block
|
||||||
|
*/
|
||||||
|
+#ifndef DOXYGEN
|
||||||
|
+EXPORT_SYMBOL unsigned int INTERNAL(snd_ump_block_info_get_block_id)(const snd_ump_block_info_t *info)
|
||||||
|
+#else
|
||||||
|
unsigned int snd_ump_block_info_get_block_id(const snd_ump_block_info_t *info)
|
||||||
|
+#endif
|
||||||
|
{
|
||||||
|
return info->block_id;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifndef DOC_HIDDEN
|
||||||
|
+use_symbol_version(__snd_ump_block_info_get_block_id, snd_ump_block_info_get_block_id, ALSA_1.2.10);
|
||||||
|
+use_default_symbol_version(__snd_ump_block_info_get_block_id, snd_ump_block_info_get_block_id, ALSA_1.2.13);
|
||||||
|
+#endif /* DOC_HIDDEN */
|
||||||
|
+
|
||||||
|
/**
|
||||||
|
* \brief get UMP block activeness
|
||||||
|
* \param info pointer to a snd_ump_block_info_t structure
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
||||||
|
|
||||||
|
From 352cbc5eb94a271a9c3c0ff5bf1742232a69e0d0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
Date: Mon, 25 Nov 2024 16:17:30 +0100
|
||||||
|
Subject: [PATCH 5/5] rawmidi: ump - fix snd_ump_block_info_set_block_id double
|
||||||
|
version
|
||||||
|
|
||||||
|
Fix mistake snd_ump_block_info_get_block_id / snd_ump_block_info_set_block_id .
|
||||||
|
|
||||||
|
Fixes: 76d2d285 ("rawmidi: ump - fix snd_ump_block_info_get_block_id double version")
|
||||||
|
Link: https://github.com/alsa-project/alsa-lib/issues/422
|
||||||
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
---
|
||||||
|
src/rawmidi/ump.c | 19 ++++++++++---------
|
||||||
|
1 file changed, 10 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/rawmidi/ump.c b/src/rawmidi/ump.c
|
||||||
|
index b1246c33..6807e877 100644
|
||||||
|
--- a/src/rawmidi/ump.c
|
||||||
|
+++ b/src/rawmidi/ump.c
|
||||||
|
@@ -750,20 +750,11 @@ int snd_ump_block_info_get_device(const snd_ump_block_info_t *info)
|
||||||
|
* \param info pointer to a snd_ump_block_info_t structure
|
||||||
|
* \return ID number of the given UMP block
|
||||||
|
*/
|
||||||
|
-#ifndef DOXYGEN
|
||||||
|
-EXPORT_SYMBOL unsigned int INTERNAL(snd_ump_block_info_get_block_id)(const snd_ump_block_info_t *info)
|
||||||
|
-#else
|
||||||
|
unsigned int snd_ump_block_info_get_block_id(const snd_ump_block_info_t *info)
|
||||||
|
-#endif
|
||||||
|
{
|
||||||
|
return info->block_id;
|
||||||
|
}
|
||||||
|
|
||||||
|
-#ifndef DOC_HIDDEN
|
||||||
|
-use_symbol_version(__snd_ump_block_info_get_block_id, snd_ump_block_info_get_block_id, ALSA_1.2.10);
|
||||||
|
-use_default_symbol_version(__snd_ump_block_info_get_block_id, snd_ump_block_info_get_block_id, ALSA_1.2.13);
|
||||||
|
-#endif /* DOC_HIDDEN */
|
||||||
|
-
|
||||||
|
/**
|
||||||
|
* \brief get UMP block activeness
|
||||||
|
* \param info pointer to a snd_ump_block_info_t structure
|
||||||
|
@@ -881,12 +872,22 @@ void snd_ump_block_info_set_device(snd_ump_block_info_t *info, unsigned int devi
|
||||||
|
*
|
||||||
|
* This function is mostly used for setting the block ID to query.
|
||||||
|
*/
|
||||||
|
+#ifndef DOXYGEN
|
||||||
|
+EXPORT_SYMBOL void INTERNAL(snd_ump_block_info_set_block_id)(snd_ump_block_info_t *info,
|
||||||
|
+ unsigned int id)
|
||||||
|
+#else
|
||||||
|
void snd_ump_block_info_set_block_id(snd_ump_block_info_t *info,
|
||||||
|
unsigned int id)
|
||||||
|
+#endif
|
||||||
|
{
|
||||||
|
info->block_id = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifndef DOC_HIDDEN
|
||||||
|
+use_symbol_version(__snd_ump_block_info_set_block_id, snd_ump_block_info_set_block_id, ALSA_1.2.10);
|
||||||
|
+use_default_symbol_version(__snd_ump_block_info_set_block_id, snd_ump_block_info_set_block_id, ALSA_1.2.13);
|
||||||
|
+#endif /* DOC_HIDDEN */
|
||||||
|
+
|
||||||
|
/**
|
||||||
|
* \brief set activeness to snd_ump_block_info_t structure
|
||||||
|
* \param info pointer to a snd_ump_block_info_t structure
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
@ -1,11 +0,0 @@
|
|||||||
--- alsa-lib-1.0.14/aserver/aserver.c 2007-05-31 10:05:13.000000000 +0200
|
|
||||||
+++ alsa-lib-1.0.14.lennart/aserver/aserver.c 2007-08-15 15:53:32.000000000 +0200
|
|
||||||
@@ -35,6 +35,8 @@
|
|
||||||
|
|
||||||
#include "aserver.h"
|
|
||||||
|
|
||||||
+#undef open
|
|
||||||
+
|
|
||||||
char *command;
|
|
||||||
|
|
||||||
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
|
|
@ -0,0 +1,10 @@
|
|||||||
|
--- alsa-lib-1.2.10/aserver/aserver.c~ 2023-09-01 17:35:48.000000000 +0200
|
||||||
|
+++ alsa-lib-1.2.10/aserver/aserver.c 2023-09-01 18:13:11.339601685 +0200
|
||||||
|
@@ -35,6 +35,7 @@
|
||||||
|
#include <limits.h>
|
||||||
|
#include <signal.h>
|
||||||
|
|
||||||
|
+#undef open
|
||||||
|
|
||||||
|
char *command;
|
||||||
|
|
@ -0,0 +1,717 @@
|
|||||||
|
From 11b028a9a01e47fc9b48e4a566803752011902e2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
|
||||||
|
Date: Wed, 13 Nov 2024 14:48:38 +0200
|
||||||
|
Subject: [PATCH 01/12] UCM2: Intel: sof-hda-dsp: Fix handling of empty
|
||||||
|
sys_vendor
|
||||||
|
|
||||||
|
The mistake in UCM syntax caused in alsaucm start error:
|
||||||
|
|
||||||
|
ALSA lib ucm_cond.c:367:(if_eval) unknown If.Condition.Type
|
||||||
|
|
||||||
|
Fixes: 13022a97711d ("sof-hda-dsp: Fix the case where sysfs dmi
|
||||||
|
sys_vendor attribute is not set")
|
||||||
|
|
||||||
|
Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/463
|
||||||
|
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
|
||||||
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
---
|
||||||
|
ucm2/Intel/sof-hda-dsp/HiFi-sof.conf | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf b/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf
|
||||||
|
index fea8159..c755ba2 100644
|
||||||
|
--- a/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf
|
||||||
|
+++ b/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf
|
||||||
|
@@ -6,8 +6,8 @@ Define.SOFVendor "$${sys:devices/virtual/dmi/id/sys_vendor}"
|
||||||
|
|
||||||
|
If.SOFVendor {
|
||||||
|
Condition {
|
||||||
|
- Type Empty
|
||||||
|
- String "${var:SOFVendor}"
|
||||||
|
+ Type String
|
||||||
|
+ Empty "${var:SOFVendor}"
|
||||||
|
}
|
||||||
|
True.Define.SOFVendor "${sys:devices/virtual/dmi/id/board_vendor}"
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
||||||
|
|
||||||
|
From 6397c663d7086b87ca5cbba323ea3dcd0ecd3200 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
Date: Wed, 13 Nov 2024 16:19:15 +0100
|
||||||
|
Subject: [PATCH 02/12] sof-hda-dsp: Fix the case where sysfs dmi product_name
|
||||||
|
attribute is not set
|
||||||
|
|
||||||
|
!!DMI Information
|
||||||
|
!!---------------
|
||||||
|
|
||||||
|
Manufacturer:
|
||||||
|
Product Name:
|
||||||
|
Product Version:
|
||||||
|
Firmware Version: R6G07
|
||||||
|
System SKU: Default string
|
||||||
|
Board Vendor: Default string
|
||||||
|
Board Name: Default string
|
||||||
|
|
||||||
|
BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=2292583
|
||||||
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
---
|
||||||
|
ucm2/Intel/sof-hda-dsp/HiFi-sof.conf | 11 ++++++++++-
|
||||||
|
1 file changed, 10 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf b/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf
|
||||||
|
index c755ba2..5fd1843 100644
|
||||||
|
--- a/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf
|
||||||
|
+++ b/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf
|
||||||
|
@@ -3,6 +3,7 @@
|
||||||
|
# File paths for controlling SOF processing
|
||||||
|
|
||||||
|
Define.SOFVendor "$${sys:devices/virtual/dmi/id/sys_vendor}"
|
||||||
|
+Define.SOFProduct "$${sys:devices/virtual/dmi/id/product_name}"
|
||||||
|
|
||||||
|
If.SOFVendor {
|
||||||
|
Condition {
|
||||||
|
@@ -12,6 +13,14 @@ If.SOFVendor {
|
||||||
|
True.Define.SOFVendor "${sys:devices/virtual/dmi/id/board_vendor}"
|
||||||
|
}
|
||||||
|
|
||||||
|
+If.SOFProduct {
|
||||||
|
+ Condition {
|
||||||
|
+ Type String
|
||||||
|
+ Empty "${var:SOFProduct}"
|
||||||
|
+ }
|
||||||
|
+ True.Define.SOFProduct "${sys:devices/virtual/dmi/id/board_name}"
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
If.SOFIPCVer {
|
||||||
|
Condition {
|
||||||
|
Type ControlExists
|
||||||
|
@@ -43,7 +52,7 @@ If.SOFPath {
|
||||||
|
HeadphoneIirBlob "${var:BlobPath}/eq_iir/pass.blob"
|
||||||
|
HeadphoneFirBlob "${var:BlobPath}/eq_fir/pass.blob"
|
||||||
|
HeadphoneDrcBlob "${var:BlobPath}/drc/passthrough.blob"
|
||||||
|
- ConfPathFromDMI "${var:SOFVendor}/${sys:devices/virtual/dmi/id/product_name}.conf"
|
||||||
|
+ ConfPathFromDMI "${var:SOFVendor}/${var:SOFProduct}"
|
||||||
|
SOFProductConfig "/blobs/sof/product_configs/${var:ConfPathFromDMI}"
|
||||||
|
SOFConfFullPath "${ConfTopDir}${var:SOFProductConfig}"
|
||||||
|
SOFUserConfig "/blobs/sof/user_configs/${var:ConfPathFromDMI}"
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
||||||
|
|
||||||
|
From 70f5bff86035d454312c9d01e304a95791668ea5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
|
||||||
|
Date: Tue, 19 Nov 2024 11:51:15 +0200
|
||||||
|
Subject: [PATCH 03/12] sof-soundwire: cs42l43-spk: Correct PlaybackPCM and
|
||||||
|
routing
|
||||||
|
|
||||||
|
For speaker the correct PCM device to use is "hw:${CardId},2", the
|
||||||
|
"hw:${CardId},0" is for headset playback.
|
||||||
|
|
||||||
|
Adjust the routing as well since with :0,2 the DP6RX1/2 needs to be
|
||||||
|
selected for the speaker.
|
||||||
|
|
||||||
|
Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/465
|
||||||
|
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
|
||||||
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
---
|
||||||
|
ucm2/sof-soundwire/cs42l43-spk.conf | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/ucm2/sof-soundwire/cs42l43-spk.conf b/ucm2/sof-soundwire/cs42l43-spk.conf
|
||||||
|
index 73f1299..693c450 100644
|
||||||
|
--- a/ucm2/sof-soundwire/cs42l43-spk.conf
|
||||||
|
+++ b/ucm2/sof-soundwire/cs42l43-spk.conf
|
||||||
|
@@ -8,8 +8,8 @@ SectionDevice."Speaker" {
|
||||||
|
]
|
||||||
|
|
||||||
|
EnableSequence [
|
||||||
|
- cset "name='cs42l43 Speaker L Input 1' 'DP5RX1'"
|
||||||
|
- cset "name='cs42l43 Speaker R Input 1' 'DP5RX2'"
|
||||||
|
+ cset "name='cs42l43 Speaker L Input 1' 'DP6RX1'"
|
||||||
|
+ cset "name='cs42l43 Speaker R Input 1' 'DP6RX2'"
|
||||||
|
]
|
||||||
|
|
||||||
|
DisableSequence [
|
||||||
|
@@ -19,7 +19,7 @@ SectionDevice."Speaker" {
|
||||||
|
|
||||||
|
Value {
|
||||||
|
PlaybackPriority 100
|
||||||
|
- PlaybackPCM "hw:${CardId},0"
|
||||||
|
+ PlaybackPCM "hw:${CardId},2"
|
||||||
|
PlaybackMixerElem "cs42l43 Speaker Digital"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
||||||
|
|
||||||
|
From 02f4fb77d10ab08a2253d77b90942b5ce9a7ed87 Mon Sep 17 00:00:00 2001
|
||||||
|
From: lbilli <lbilli@users.noreply.github.com>
|
||||||
|
Date: Thu, 14 Nov 2024 20:06:48 -0500
|
||||||
|
Subject: [PATCH 04/12] avs_nau8825: Fix JackControl name
|
||||||
|
|
||||||
|
This is the name reported by amixer events.
|
||||||
|
|
||||||
|
Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/464
|
||||||
|
Signed-off-by: lbilli <lbilli@users.noreply.github.com>
|
||||||
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
---
|
||||||
|
ucm2/Intel/avs/avs_nau8825/avs_nau8825-HiFi.conf | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/ucm2/Intel/avs/avs_nau8825/avs_nau8825-HiFi.conf b/ucm2/Intel/avs/avs_nau8825/avs_nau8825-HiFi.conf
|
||||||
|
index 3f3e6c9..71f7ed0 100644
|
||||||
|
--- a/ucm2/Intel/avs/avs_nau8825/avs_nau8825-HiFi.conf
|
||||||
|
+++ b/ucm2/Intel/avs/avs_nau8825/avs_nau8825-HiFi.conf
|
||||||
|
@@ -21,7 +21,7 @@ SectionDevice."Mic" {
|
||||||
|
Value {
|
||||||
|
CapturePCM "hw:${CardId},1"
|
||||||
|
CaptureCTL "Mic"
|
||||||
|
- JackControl "Headset Mic"
|
||||||
|
+ JackControl "Headset Mic Jack"
|
||||||
|
}
|
||||||
|
|
||||||
|
EnableSequence [
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
||||||
|
|
||||||
|
From 30989bd0c2aa3f9f4b6f5e393397b39678717f45 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Charles Keepax <ckeepax@opensource.cirrus.com>
|
||||||
|
Date: Wed, 20 Nov 2024 10:06:06 +0000
|
||||||
|
Subject: [PATCH 05/12] sof-soundwire: cs42l43: Correct CapturePCM and routing
|
||||||
|
|
||||||
|
For headset microphone capture the correct PCM device to use is
|
||||||
|
"hw:${CardId},1", "hw:${CardId},4" is for built in microphone capture.
|
||||||
|
|
||||||
|
Adjust the routing as well since :0,1 is connected to data port 2 on the
|
||||||
|
codec.
|
||||||
|
|
||||||
|
Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/466
|
||||||
|
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
|
||||||
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
---
|
||||||
|
ucm2/sof-soundwire/cs42l43.conf | 10 +++++-----
|
||||||
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/ucm2/sof-soundwire/cs42l43.conf b/ucm2/sof-soundwire/cs42l43.conf
|
||||||
|
index dc11840..4b4e118 100644
|
||||||
|
--- a/ucm2/sof-soundwire/cs42l43.conf
|
||||||
|
+++ b/ucm2/sof-soundwire/cs42l43.conf
|
||||||
|
@@ -28,19 +28,19 @@ SectionDevice."Headset" {
|
||||||
|
cset "name='cs42l43 ADC1 Input' 'IN1'"
|
||||||
|
cset "name='cs42l43 Decimator 1 Mode' 'ADC'"
|
||||||
|
|
||||||
|
- cset "name='cs42l43 DP1TX1 Input' 'Decimator 1'"
|
||||||
|
- cset "name='cs42l43 DP1TX2 Input' 'Decimator 1'"
|
||||||
|
+ cset "name='cs42l43 DP2TX1 Input' 'Decimator 1'"
|
||||||
|
+ cset "name='cs42l43 DP2TX2 Input' 'Decimator 1'"
|
||||||
|
]
|
||||||
|
|
||||||
|
DisableSequence [
|
||||||
|
cset "name='cs42l43 Decimator 1 Switch' 0"
|
||||||
|
- cset "name='cs42l43 DP1TX1 Input' 'None'"
|
||||||
|
- cset "name='cs42l43 DP1TX2 Input' 'None'"
|
||||||
|
+ cset "name='cs42l43 DP2TX1 Input' 'None'"
|
||||||
|
+ cset "name='cs42l43 DP2TX2 Input' 'None'"
|
||||||
|
]
|
||||||
|
|
||||||
|
Value {
|
||||||
|
CapturePriority 200
|
||||||
|
- CapturePCM "hw:${CardId},4"
|
||||||
|
+ CapturePCM "hw:${CardId},1"
|
||||||
|
CaptureMixer "default:${CardId}"
|
||||||
|
CaptureMixerElem "cs42l43 Headset Microphone"
|
||||||
|
JackControl "Headset Mic Jack"
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
||||||
|
|
||||||
|
From 62acef2efffdcb75a35f90d266bcad145b4eab35 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
Date: Fri, 29 Nov 2024 14:04:00 +0100
|
||||||
|
Subject: [PATCH 06/12] sof-soundwire: whitespace cleanup
|
||||||
|
|
||||||
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
---
|
||||||
|
ucm2/common/pcm/hdmi.conf | 2 +-
|
||||||
|
ucm2/sof-soundwire/sof-soundwire.conf | 2 +-
|
||||||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/ucm2/common/pcm/hdmi.conf b/ucm2/common/pcm/hdmi.conf
|
||||||
|
index e2820dc..37338ec 100644
|
||||||
|
--- a/ucm2/common/pcm/hdmi.conf
|
||||||
|
+++ b/ucm2/common/pcm/hdmi.conf
|
||||||
|
@@ -69,7 +69,7 @@ DefineMacro.HdmiPCMSave {
|
||||||
|
}
|
||||||
|
|
||||||
|
FixedBootSequence [
|
||||||
|
- cfg-save "${var:LibDir}/${var:__Name}.conf:hdmi-pcm"
|
||||||
|
+ cfg-save "${var:LibDir}/${var:__Name}.conf:hdmi-pcm"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf
|
||||||
|
index 34f9661..bb14ef2 100644
|
||||||
|
--- a/ucm2/sof-soundwire/sof-soundwire.conf
|
||||||
|
+++ b/ucm2/sof-soundwire/sof-soundwire.conf
|
||||||
|
@@ -157,7 +157,7 @@ If.mics-array {
|
||||||
|
Empty "${var:Mics1}"
|
||||||
|
}
|
||||||
|
False.FixedBootSequence {
|
||||||
|
- # dmic array info
|
||||||
|
+ # dmic array info
|
||||||
|
exec "-nhlt-dmic-info -o ${var:LibDir}/dmics-nhlt.json"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
||||||
|
|
||||||
|
From 4a01327cc43a18124c0a4a5bcfb840e6ed1efe0a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
Date: Wed, 4 Dec 2024 10:20:51 +0100
|
||||||
|
Subject: [PATCH 07/12] sof-hda-dsp: Add back missing .conf suffix for
|
||||||
|
product/user specific configs
|
||||||
|
|
||||||
|
Fixes: 6397c66 ("sof-hda-dsp: Fix the case where sysfs dmi product_name attribute is not set")
|
||||||
|
Closes: https://github.com/alsa-project/alsa-ucm-conf/issues/482
|
||||||
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
---
|
||||||
|
ucm2/Intel/sof-hda-dsp/HiFi-sof.conf | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf b/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf
|
||||||
|
index 5fd1843..3a4c445 100644
|
||||||
|
--- a/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf
|
||||||
|
+++ b/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf
|
||||||
|
@@ -52,7 +52,7 @@ If.SOFPath {
|
||||||
|
HeadphoneIirBlob "${var:BlobPath}/eq_iir/pass.blob"
|
||||||
|
HeadphoneFirBlob "${var:BlobPath}/eq_fir/pass.blob"
|
||||||
|
HeadphoneDrcBlob "${var:BlobPath}/drc/passthrough.blob"
|
||||||
|
- ConfPathFromDMI "${var:SOFVendor}/${var:SOFProduct}"
|
||||||
|
+ ConfPathFromDMI "${var:SOFVendor}/${var:SOFProduct}.conf"
|
||||||
|
SOFProductConfig "/blobs/sof/product_configs/${var:ConfPathFromDMI}"
|
||||||
|
SOFConfFullPath "${ConfTopDir}${var:SOFProductConfig}"
|
||||||
|
SOFUserConfig "/blobs/sof/user_configs/${var:ConfPathFromDMI}"
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
||||||
|
|
||||||
|
From 0782bf435b8332833e7b3fc91501d78473dd6edf Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
Date: Fri, 29 Nov 2024 14:17:57 +0100
|
||||||
|
Subject: [PATCH 08/12] amd-soundwire: add support for AMD generic legacy
|
||||||
|
machine driver
|
||||||
|
|
||||||
|
Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/478
|
||||||
|
Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/470
|
||||||
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
---
|
||||||
|
ucm2/conf.d/amd-soundwire/amd-soundwire.conf | 1 +
|
||||||
|
ucm2/sof-soundwire/rt722.conf | 15 +++++++++++++++
|
||||||
|
2 files changed, 16 insertions(+)
|
||||||
|
create mode 120000 ucm2/conf.d/amd-soundwire/amd-soundwire.conf
|
||||||
|
|
||||||
|
diff --git a/ucm2/conf.d/amd-soundwire/amd-soundwire.conf b/ucm2/conf.d/amd-soundwire/amd-soundwire.conf
|
||||||
|
new file mode 120000
|
||||||
|
index 0000000..0d00b73
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/ucm2/conf.d/amd-soundwire/amd-soundwire.conf
|
||||||
|
@@ -0,0 +1 @@
|
||||||
|
+../../sof-soundwire/sof-soundwire.conf
|
||||||
|
\ No newline at end of file
|
||||||
|
diff --git a/ucm2/sof-soundwire/rt722.conf b/ucm2/sof-soundwire/rt722.conf
|
||||||
|
index a54664e..a4a431b 100644
|
||||||
|
--- a/ucm2/sof-soundwire/rt722.conf
|
||||||
|
+++ b/ucm2/sof-soundwire/rt722.conf
|
||||||
|
@@ -86,6 +86,21 @@ SectionDevice."Headset" {
|
||||||
|
cset "name='rt722 FU0F Capture Switch' 0"
|
||||||
|
]
|
||||||
|
|
||||||
|
+ If.hsmicsw {
|
||||||
|
+ Condition {
|
||||||
|
+ Type ControlExists
|
||||||
|
+ Control "name='Headset Mic Switch'"
|
||||||
|
+ }
|
||||||
|
+ True {
|
||||||
|
+ EnableSequence [
|
||||||
|
+ cset "name='Headset Mic Switch' on"
|
||||||
|
+ ]
|
||||||
|
+ DisableSequence [
|
||||||
|
+ cset "name='Headset Mic Switch' off"
|
||||||
|
+ ]
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
Value {
|
||||||
|
CapturePriority 200
|
||||||
|
CapturePCM "hw:${CardId},1"
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
||||||
|
|
||||||
|
From 003201356388692525a60bbd0da359f97aac99f3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
|
||||||
|
Date: Tue, 10 Dec 2024 11:04:31 +0200
|
||||||
|
Subject: [PATCH 09/12] ucm2: sof-soundwire: Correct FixedBootSequence for dmic
|
||||||
|
info
|
||||||
|
|
||||||
|
Replace the curly brackets with square brackets.
|
||||||
|
The curly ones break the FixedBootSequence parsing by resetting the
|
||||||
|
sequence.
|
||||||
|
If the /var/lib/alsa/card0.conf.d is not present then UCM will fail because
|
||||||
|
all sequences before the dmic is lost, including the card-init:
|
||||||
|
|
||||||
|
# alsactl init
|
||||||
|
alsa-lib main.c:619:(execute_cfgsave) unable to open file '/var/lib/alsa/card0.conf.d/42-sof-hdmi.conf': No such file or directory
|
||||||
|
alsa-lib main.c:2456:(set_fixedboot_user) Unable to execute force boot sequence
|
||||||
|
|
||||||
|
The full sequence supposed to be:
|
||||||
|
card-init
|
||||||
|
ctl-remap
|
||||||
|
cs42l43
|
||||||
|
dmic
|
||||||
|
hdmi
|
||||||
|
|
||||||
|
Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/485
|
||||||
|
Fixes: 9fa70add7638 ("sof-hda-dsp,sof-soundwire: add CaptureMicInfoFile fields for dmics")
|
||||||
|
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
|
||||||
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
---
|
||||||
|
ucm2/sof-soundwire/sof-soundwire.conf | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf
|
||||||
|
index bb14ef2..a2f9589 100644
|
||||||
|
--- a/ucm2/sof-soundwire/sof-soundwire.conf
|
||||||
|
+++ b/ucm2/sof-soundwire/sof-soundwire.conf
|
||||||
|
@@ -156,10 +156,10 @@ If.mics-array {
|
||||||
|
Type String
|
||||||
|
Empty "${var:Mics1}"
|
||||||
|
}
|
||||||
|
- False.FixedBootSequence {
|
||||||
|
+ False.FixedBootSequence [
|
||||||
|
# dmic array info
|
||||||
|
exec "-nhlt-dmic-info -o ${var:LibDir}/dmics-nhlt.json"
|
||||||
|
- }
|
||||||
|
+ ]
|
||||||
|
}
|
||||||
|
|
||||||
|
Include.hdmi-pcm.File "/common/pcm/hdmi.conf"
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
||||||
|
|
||||||
|
From 52c5cd74512c8130bdb6504cdb4859a89154b35d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Konna1337 <r34p3r666@web.de>
|
||||||
|
Date: Sun, 24 Nov 2024 04:51:49 +0100
|
||||||
|
Subject: [PATCH 10/12] Configuration files for Roland Bridge Cast X V2
|
||||||
|
|
||||||
|
Added configuration for Roland BridgeCast X. X Version of Bridgecast is wired diferently than the non X Version wich is supported
|
||||||
|
|
||||||
|
Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/469
|
||||||
|
Signed-off-by: Konna1337 <r34p3r666@web.de>
|
||||||
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
---
|
||||||
|
ucm2/USB-Audio/Roland/BridgeCastXV2-Hifi.conf | 174 ++++++++++++++++++
|
||||||
|
ucm2/USB-Audio/Roland/BridgeCastXV2.conf | 6 +
|
||||||
|
ucm2/USB-Audio/USB-Audio.conf | 9 +
|
||||||
|
3 files changed, 189 insertions(+)
|
||||||
|
create mode 100644 ucm2/USB-Audio/Roland/BridgeCastXV2-Hifi.conf
|
||||||
|
create mode 100644 ucm2/USB-Audio/Roland/BridgeCastXV2.conf
|
||||||
|
|
||||||
|
diff --git a/ucm2/USB-Audio/Roland/BridgeCastXV2-Hifi.conf b/ucm2/USB-Audio/Roland/BridgeCastXV2-Hifi.conf
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..426a15a
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/ucm2/USB-Audio/Roland/BridgeCastXV2-Hifi.conf
|
||||||
|
@@ -0,0 +1,174 @@
|
||||||
|
+Include.pcm_split.File "/common/pcm/split.conf"
|
||||||
|
+
|
||||||
|
+Macro [
|
||||||
|
+ {
|
||||||
|
+ SplitPCM {
|
||||||
|
+ Name "bc_stereo_out"
|
||||||
|
+ Direction Playback
|
||||||
|
+ Channels 2
|
||||||
|
+ HWChannels 16
|
||||||
|
+ HWChannelPos0 FL
|
||||||
|
+ HWChannelPos1 FR
|
||||||
|
+ HWChannelPos2 FL
|
||||||
|
+ HWChannelPos3 FR
|
||||||
|
+ HWChannelPos4 FL
|
||||||
|
+ HWChannelPos5 FR
|
||||||
|
+ HWChannelPos6 FL
|
||||||
|
+ HWChannelPos7 FR
|
||||||
|
+ HWChannelPos6 FL
|
||||||
|
+ HWChannelPos7 FR
|
||||||
|
+ HWChannelPos8 FL
|
||||||
|
+ HWChannelPos9 FR
|
||||||
|
+ HWChannelPos10 FL
|
||||||
|
+ HWChannelPos11 FR
|
||||||
|
+ HWChannelPos12 FL
|
||||||
|
+ HWChannelPos13 FR
|
||||||
|
+ HWChannelPos14 FL
|
||||||
|
+ HWChannelPos15 FR
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ {
|
||||||
|
+ SplitPCM {
|
||||||
|
+ Name "bc_stereo_in"
|
||||||
|
+ Direction Capture
|
||||||
|
+ Channels 2
|
||||||
|
+ HWChannels 6
|
||||||
|
+ HWChannelPos0 FL
|
||||||
|
+ HWChannelPos1 FR
|
||||||
|
+ HWChannelPos2 FL
|
||||||
|
+ HWChannelPos3 FR
|
||||||
|
+ HWChannelPos4 FL
|
||||||
|
+ HWChannelPos5 FR
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+SectionDevice."Line1" {
|
||||||
|
+ Comment "Chat L/R"
|
||||||
|
+
|
||||||
|
+ Value {
|
||||||
|
+ PlaybackPriority 100
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ Macro.pcm_split.SplitPCMDevice {
|
||||||
|
+ Name "bc_stereo_out"
|
||||||
|
+ Direction Playback
|
||||||
|
+ HWChannels 16
|
||||||
|
+ Channels 2
|
||||||
|
+ Channel0 0
|
||||||
|
+ Channel1 1
|
||||||
|
+ ChannelPos0 FL
|
||||||
|
+ ChannelPos1 FR
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+SectionDevice."Line2" {
|
||||||
|
+ Comment "Game L/R"
|
||||||
|
+
|
||||||
|
+ Value {
|
||||||
|
+ PlaybackPriority 200
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ Macro.pcm_split.SplitPCMDevice {
|
||||||
|
+ Name "bc_stereo_out"
|
||||||
|
+ Direction Playback
|
||||||
|
+ HWChannels 16
|
||||||
|
+ Channels 2
|
||||||
|
+ Channel0 2
|
||||||
|
+ Channel1 3
|
||||||
|
+ ChannelPos0 FL
|
||||||
|
+ ChannelPos1 FR
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+SectionDevice."Line3" {
|
||||||
|
+ Comment "Music L/R"
|
||||||
|
+
|
||||||
|
+ Value {
|
||||||
|
+ PlaybackPriority 300
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ Macro.pcm_split.SplitPCMDevice {
|
||||||
|
+ Name "bc_stereo_out"
|
||||||
|
+ Direction Playback
|
||||||
|
+ HWChannels 16
|
||||||
|
+ Channels 2
|
||||||
|
+ Channel0 12
|
||||||
|
+ Channel1 13
|
||||||
|
+ ChannelPos0 FL
|
||||||
|
+ ChannelPos1 FR
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+SectionDevice."Line4" {
|
||||||
|
+ Comment "System L/R"
|
||||||
|
+
|
||||||
|
+ Value {
|
||||||
|
+ PlaybackPriority 400
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ Macro.pcm_split.SplitPCMDevice {
|
||||||
|
+ Name "bc_stereo_out"
|
||||||
|
+ Direction Playback
|
||||||
|
+ HWChannels 16
|
||||||
|
+ Channels 2
|
||||||
|
+ Channel0 10
|
||||||
|
+ Channel1 11
|
||||||
|
+ ChannelPos0 FL
|
||||||
|
+ ChannelPos1 FR
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+SectionDevice."Line5" {
|
||||||
|
+ Comment "StreamMix"
|
||||||
|
+
|
||||||
|
+ Value {
|
||||||
|
+ CapturePriority 300
|
||||||
|
+ }
|
||||||
|
+ Macro.pcm_split.SplitPCMDevice {
|
||||||
|
+ Name "bc_stereo_in"
|
||||||
|
+ Direction Capture
|
||||||
|
+ HWChannels 6
|
||||||
|
+ Channels 2
|
||||||
|
+ Channel0 0
|
||||||
|
+ Channel1 1
|
||||||
|
+ ChannelPos0 FL
|
||||||
|
+ ChannelPos1 FR
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+SectionDevice."Line6" {
|
||||||
|
+ Comment "Mic"
|
||||||
|
+
|
||||||
|
+ Value {
|
||||||
|
+ CapturePriority 200
|
||||||
|
+ }
|
||||||
|
+ Macro.pcm_split.SplitPCMDevice {
|
||||||
|
+ Name "bc_stereo_in"
|
||||||
|
+ Direction Capture
|
||||||
|
+ HWChannels 6
|
||||||
|
+ Channels 2
|
||||||
|
+ Channel0 2
|
||||||
|
+ Channel1 3
|
||||||
|
+ ChannelPos0 FL
|
||||||
|
+ ChannelPos1 FR
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+SectionDevice."Line7" {
|
||||||
|
+ Comment "SFX"
|
||||||
|
+
|
||||||
|
+ Value {
|
||||||
|
+ CapturePriority 100
|
||||||
|
+ }
|
||||||
|
+ Macro.pcm_split.SplitPCMDevice {
|
||||||
|
+ Name "bc_stereo_in"
|
||||||
|
+ Direction Capture
|
||||||
|
+ HWChannels 6
|
||||||
|
+ Channels 2
|
||||||
|
+ Channel0 4
|
||||||
|
+ Channel1 5
|
||||||
|
+ ChannelPos0 FL
|
||||||
|
+ ChannelPos1 FR
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
diff --git a/ucm2/USB-Audio/Roland/BridgeCastXV2.conf b/ucm2/USB-Audio/Roland/BridgeCastXV2.conf
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..daf77a1
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/ucm2/USB-Audio/Roland/BridgeCastXV2.conf
|
||||||
|
@@ -0,0 +1,6 @@
|
||||||
|
+Comment "Roland BridgeCast XV2 Hifi-Mode"
|
||||||
|
+
|
||||||
|
+SectionUseCase."HiFi" {
|
||||||
|
+ Comment "BridgeCast MultiChannel"
|
||||||
|
+ File "/USB-Audio/Roland/BridgeCastXV2-Hifi.conf"
|
||||||
|
+}
|
||||||
|
diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
|
||||||
|
index 9019fbc..a01241d 100644
|
||||||
|
--- a/ucm2/USB-Audio/USB-Audio.conf
|
||||||
|
+++ b/ucm2/USB-Audio/USB-Audio.conf
|
||||||
|
@@ -182,6 +182,15 @@ If.roland-bridgecastv2 {
|
||||||
|
True.Define.ProfileName "Roland/BridgeCastV2"
|
||||||
|
}
|
||||||
|
|
||||||
|
+If.roland-bridgecastx {
|
||||||
|
+ Condition {
|
||||||
|
+ Type String
|
||||||
|
+ Haystack "${CardComponents}"
|
||||||
|
+ Needle "USB0582:0321"
|
||||||
|
+ }
|
||||||
|
+ True.Define.ProfileName "Roland/BridgeCastXV2"
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
If.motu-m246 {
|
||||||
|
Condition {
|
||||||
|
Type RegexMatch
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
||||||
|
|
||||||
|
From 77ff0f7edbf48179d5da3fe3e4f1fc6bd96af2f6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Andrija=20Vu=C4=8Dini=C4=87?= <andrija.vucinic@gmail.com>
|
||||||
|
Date: Tue, 10 Dec 2024 14:47:28 +0100
|
||||||
|
Subject: [PATCH 11/12] USB-Audio: ALC4080 - add ASUS ROG STRIX X870E-E GAMING
|
||||||
|
WIFI (USB 0b05:1b9b)
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/486
|
||||||
|
Signed-off-by: Andrija Vučinić <andrija.vucinic@gmail.com>
|
||||||
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
---
|
||||||
|
ucm2/USB-Audio/USB-Audio.conf | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
|
||||||
|
index a01241d..bd1983e 100644
|
||||||
|
--- a/ucm2/USB-Audio/USB-Audio.conf
|
||||||
|
+++ b/ucm2/USB-Audio/USB-Audio.conf
|
||||||
|
@@ -60,6 +60,7 @@ If.realtek-alc4080 {
|
||||||
|
# 0b05:1a5c ASUS ROG Strix B650E-I Gaming WiFi
|
||||||
|
# 0b05:1a97 ASUS ROG Maximus Z790 Apex Encore
|
||||||
|
# 0b05:1af1 ASUS ROG Strix Z790-A Gaming Wifi II
|
||||||
|
+ # 0b05:1b9b ASUS ROG STRIX X870E-E GAMING WIFI
|
||||||
|
# 0db0:005a MSI MPG Z690 CARBON WIFI
|
||||||
|
# 0db0:0b58 MSI MPG X870E CARBON WIFI
|
||||||
|
# 0db0:124b MSI MEG Z690 ACE
|
||||||
|
@@ -91,7 +92,7 @@ If.realtek-alc4080 {
|
||||||
|
# 26ce:0a06 ASRock X670E/Z790 Taichi
|
||||||
|
# 26ce:0a08 ASRock Z790 PG-ITX/TB4, X870 Steel Legend
|
||||||
|
# 26ce:0a0b ASRock X870E Taichi
|
||||||
|
- Regex "USB((0414:a0(0e|1[0124]))|(0b05:(19(84|9[69])|1a(16|2[07]|5[23c]|97|f1)))|(0db0:(005a|0b58|124b|151f|1feb|3130|36e7|4(19c|22d|240|88c)|543d|62a4|6c[0c]9|70d3|7696|82c7|8af7|961e|a(073|228|47c|74b)|b202|cd0e|d1d7|d6e7))|(26ce:0a0[68b]))"
|
||||||
|
+ Regex "USB((0414:a0(0e|1[0124]))|(0b05:(19(84|9[69])|1a(16|2[07]|5[23c]|97|f1)|1b9b))|(0db0:(005a|0b58|124b|151f|1feb|3130|36e7|4(19c|22d|240|88c)|543d|62a4|6c[0c]9|70d3|7696|82c7|8af7|961e|a(073|228|47c|74b)|b202|cd0e|d1d7|d6e7))|(26ce:0a0[68b]))"
|
||||||
|
}
|
||||||
|
True.Define.ProfileName "Realtek/ALC4080"
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
||||||
|
|
||||||
|
From cde064fd3a1a7cd57b56d32d42ae57f7e8b454e7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sergey <myserg@gmail.com>
|
||||||
|
Date: Mon, 16 Dec 2024 04:29:47 +0300
|
||||||
|
Subject: [PATCH 12/12] USB-Audio: ALC4080: add support for MSI MEG X670E
|
||||||
|
GODLIKE (USB 0db0:e1f8)
|
||||||
|
|
||||||
|
www.msi.com/Motherboard/MEG-X670E-GODLIKE
|
||||||
|
|
||||||
|
Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/488
|
||||||
|
Signed-off-by: Sergey <myserg@gmail.com>
|
||||||
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
---
|
||||||
|
ucm2/USB-Audio/USB-Audio.conf | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
|
||||||
|
index bd1983e..d942f0e 100644
|
||||||
|
--- a/ucm2/USB-Audio/USB-Audio.conf
|
||||||
|
+++ b/ucm2/USB-Audio/USB-Audio.conf
|
||||||
|
@@ -89,10 +89,11 @@ If.realtek-alc4080 {
|
||||||
|
# 0db0:cd0e MSI X870 Tomahawk
|
||||||
|
# 0db0:d1d7 MSI PRO Z790-A WIFI
|
||||||
|
# 0db0:d6e7 MSI MPG X670E Carbon Wifi
|
||||||
|
+ # 0db0:e1f8 MSI MEG X670E Godlike
|
||||||
|
# 26ce:0a06 ASRock X670E/Z790 Taichi
|
||||||
|
# 26ce:0a08 ASRock Z790 PG-ITX/TB4, X870 Steel Legend
|
||||||
|
# 26ce:0a0b ASRock X870E Taichi
|
||||||
|
- Regex "USB((0414:a0(0e|1[0124]))|(0b05:(19(84|9[69])|1a(16|2[07]|5[23c]|97|f1)|1b9b))|(0db0:(005a|0b58|124b|151f|1feb|3130|36e7|4(19c|22d|240|88c)|543d|62a4|6c[0c]9|70d3|7696|82c7|8af7|961e|a(073|228|47c|74b)|b202|cd0e|d1d7|d6e7))|(26ce:0a0[68b]))"
|
||||||
|
+ Regex "USB((0414:a0(0e|1[0124]))|(0b05:(19(84|9[69])|1a(16|2[07]|5[23c]|97|f1)|1b9b))|(0db0:(005a|0b58|124b|151f|1feb|3130|36e7|4(19c|22d|240|88c)|543d|62a4|6c[0c]9|70d3|7696|82c7|8af7|961e|a(073|228|47c|74b)|b202|cd0e|d1d7|d6e7|e1f8))|(26ce:0a0[68b]))"
|
||||||
|
}
|
||||||
|
True.Define.ProfileName "Realtek/ALC4080"
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
Loading…
Reference in new issue