diff -Nru alsa-ucm-conf-1.2.2/README.md alsa-ucm-conf-1.2.6.3/README.md --- alsa-ucm-conf-1.2.2/README.md 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/README.md 2021-12-17 16:53:11.000000000 +0000 @@ -1,4 +1,25 @@ # alsa-ucm-conf ## ALSA Use Case Manager configuration +### Installation + +Copy the ucm and ucm2 trees to the alsa-lib configuration directory +(usually located in /usr/share/alsa) including symlinks. The files +in the package root directory (README.md, LICENSE and VERSION) +files are extra (only informational). + +Example: + +``` +tar xzjf alsa-ucm-conf-1.2.6.2.tar.bz2 -C /usr/share/alsa --strip-components=1 "*/ucm" "*/ucm2" +``` + +### Validation + ![Validate UCM configuration](https://github.com/alsa-project/alsa-ucm-conf/workflows/Validate%20UCM%20configuration/badge.svg?branch=master) + +The UCM configurations are automatically validated using the UCM validator +available at https://github.com/alsa-project/alsa-tests/tree/master/python/ucm-validator . + +If you create a pull request for new hardware, please, add also the +alsa-info.sh output to emulate this hardware in the UCM validator. diff -Nru alsa-ucm-conf-1.2.2/debian/changelog alsa-ucm-conf-1.2.6.3/debian/changelog --- alsa-ucm-conf-1.2.2/debian/changelog 2022-05-24 00:19:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/changelog 2024-04-17 19:59:11.000000000 +0000 @@ -1,148 +1,160 @@ -alsa-ucm-conf (1.2.2-1ubuntu0.13~18.04.sav0) bionic; urgency=medium +alsa-ucm-conf (1.2.6.3-1ubuntu1.11~18.04.sav0) bionic; urgency=medium * Backport to Bionic + * debian/rules: Change execute_* -> override_* with dh_* invocation(s) * debian/control: Set debhelper-compat (= 11) BD - -- Rob Savoury Mon, 23 May 2022 17:19:00 -0700 + -- Rob Savoury Wed, 17 Apr 2024 12:59:11 -0700 -alsa-ucm-conf (1.2.2-1ubuntu0.13) focal; urgency=medium +alsa-ucm-conf (1.2.6.3-1ubuntu1.11) jammy; urgency=medium - * d/p/0035-Revert-PATCH-ucm2-USB-Audio-Add-more-support-to-Leno.patch - d/p/0036-Revert-PATCH-Add-support-for-Lenovo-ThinkStation-P62.patch - d/p/0037-Add-support-for-Lenovo-ThinkStation-P620-Main-Audio.patch - d/p/0038-ucm2-USB-Audio-Add-support-for-Lenovo-ThinkStation-P.patch - d/p/0039-ucm2-USB-Audio-Add-CaptureMixerElem-for-Lenovo-Think.patch - Replace Lenovo P620 UCM files with upstream version to make port selection - in PulseAudio work properly. (LP: #1902464) + * Dropped changes: + - d/p/0001-Add-initial-support-for-MediaTek-mt8390-evk-and-mt83.patch + - replace it with patches accepted by upstream + * Added changes: + - d/p/0001-ucm2-MediaTek-mt8365-evk-Add-alsa-ucm-support.patch + - cherry-pick the patch for mt8365 from the dropped changes + - d/p/0001-ucm2-MediaTek-mt8390-evk-Add-alsa-ucm-support.patch + - d/p/0002-ucm2-MediaTek-mt8395-evk-Add-alsa-ucm-support.patch + - d/p/0003-ucm2-MediaTek-mt8370-evk-Add-alsa-ucm-support.patch + - d/p/0001-ucm2-conf.d-mt8370-evk-Fix-the-type-of-mt8370-evk.co.patch + - d/p/0001-ucm-MediaTek-mt8395-evk-Add-HDMIRX-config.patch + - add supports for MediaTek mt8390-evk, mt8395-evk, and mt8370-evk. + - fix a file type issue on the mt8370-evk config + - add mt8395 HDMI RX support + (LP: #2051199) - -- Kai-Heng Feng Tue, 22 Mar 2022 20:43:51 +0800 + -- Ethan Hsieh Thu, 01 Feb 2024 16:10:15 +0800 -alsa-ucm-conf (1.2.2-1ubuntu0.12) focal; urgency=medium +alsa-ucm-conf (1.2.6.3-1ubuntu1.10) jammy; urgency=medium - * d/p/0034-ucm2-Add-UCM-support-for-Dell-Desktop.patch - Add Realtek 4050 USB Codec front and rear profiles - for a Dell machine. (LP: #1956855) + * d/p/0001-Add-initial-support-for-MediaTek-Genio-boards.patch + - fix typo to make the patch work on mt8390-evk (lp: #2049327) - -- Hui Wang Sun, 09 Jan 2022 16:10:43 +0800 + -- Zhaoxuan Zhai Fri, 12 Jan 2024 16:24:24 +0800 -alsa-ucm-conf (1.2.2-1ubuntu0.11) focal; urgency=medium +alsa-ucm-conf (1.2.6.3-1ubuntu1.9) jammy; urgency=medium - * d/p/0033-HDA-Intel-add-Boost-volume-control-for-Headset-Mic.patch - Add Mic Boost in the HDA Intel ucm, after this change, when users - adjust input volume, the Mic Boost could be adjusted as well as - Capture Volume. (LP: #1930188) + * d/p/0001-ucm2-soundwire-add-rt713-SDCA-device.patch: + - Backport patch to add rt713 SDCA device (LP: #2042902) - -- Hui Wang Tue, 14 Sep 2021 15:11:12 +0800 + -- Artur Pak Thu, 09 Nov 2023 17:48:20 +0800 -alsa-ucm-conf (1.2.2-1ubuntu0.10) focal; urgency=medium +alsa-ucm-conf (1.2.6.3-1ubuntu1.8) jammy; urgency=medium - * d/p/0031-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch - The mixer name is changed in the codec driver rt1316-sdw.c, so need - to handle the new mixer name. - https://github.com/alsa-project/alsa-ucm-conf/pull/109 - (LP: #1937980) - * d/p/0032-sof-hda-dsp-Set-Capture-Switch-on-in-the-BootSequenc.patch - The input volume of the external microphone is 0 by default for all - machines with sof audio driver, that is because the capture switch - is set to off by default, need to set it to on in the ucm. - https://github.com/alsa-project/alsa-ucm-conf/pull/107 - (LP: #1940788) + * d/p/0001-Add-initial-support-for-MediaTek-Genio-boards.patch + - Backport patch to add initial support for MediaTek Genio boards + boards: mt8395-evk, mt8390-evk, and mt8365-evk (LP: #2000228) - -- Hui Wang Mon, 23 Aug 2021 11:00:48 +0800 + -- Ethan Hsieh Mon, 18 Sep 2023 16:59:53 +0800 -alsa-ucm-conf (1.2.2-1ubuntu0.9) focal; urgency=medium +alsa-ucm-conf (1.2.6.3-1ubuntu1.7) jammy; urgency=medium - * d/p/0028-rt715-don-t-initialize-obsolete-ADC-controls.patch - * d/p/0029-sof-soundwire-rt715-use-the-hw-volume-control.patch - * d/p/0030-rt715-add-the-missing-sof-prefix-to-the-hw-control-n.patch - Conditionally initialize the codec rt715 according to mixer names - (LP: #1936009) + * d/p/0001-acp63-add-initial-support-for-AMD-Pink-Sardine-ACP63.patch + d/p/0002-acp63.conf-use-symbolic-link.patch + d/p/0003-acp62-add-initial-support-for-AMD-ACP-v6.2-RPL.patch + - Backport patches to add support AMD ACP RPL and Pink Sardine. + (LP: #2025353) - -- Hui Wang Wed, 14 Jul 2021 08:59:30 +0800 + -- Aaron Ma Fri, 30 Jun 2023 10:20:31 +0200 -alsa-ucm-conf (1.2.2-1ubuntu0.8) focal; urgency=medium +alsa-ucm-conf (1.2.6.3-1ubuntu1.6) jammy; urgency=medium - * d/p/0001-HDA-Intel-add-RearMic-JackControl.patch - Add "Rear Mic Jack" to make P520 rear mic works correctly. (LP: #1929371) + * d/p/0006-sof-hda-dsp-Add-speaker-led-support.patch + - Backport patch to fix speaker mute led (LP: #2015972) - -- Jeremy Szu Tue, 25 May 2021 11:42:01 +0000 + -- Koba Ko Wed, 19 Apr 2023 09:14:07 +0800 -alsa-ucm-conf (1.2.2-1ubuntu0.7) focal; urgency=medium +alsa-ucm-conf (1.2.6.3-1ubuntu1.5) jammy; urgency=medium - * d/p/0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch - * d/p/0002-Add-support-for-rt711-sdca-rt1316-and-rt715-sdca.patch - Add support for rt711-sdca, rt1316 and rt715-sdca. (LP: #1924970) + * d/p/0001-ucm2-HDA-Update-Mic-LED-settings-for-ACP-DMIC.patch + - Backport patch to update AMD micmute LED. (LP: #2012590) - -- Andy Chi Fri, 16 Apr 2021 17:32:34 +0800 + -- Aaron Ma Fri, 24 Mar 2023 11:07:56 +0100 -alsa-ucm-conf (1.2.2-1ubuntu0.6) focal; urgency=medium +alsa-ucm-conf (1.2.6.3-1ubuntu1.4) jammy; urgency=medium - * d/p/0001-rt715-init-setup-ADC07-to-a-proper-volume.patch - Correct rt715 init volume setting. (LP: #1908677) + * d/p/ucm2-sof-soundwire-Update-Mic-LED-settings.patch + - Backport patch to fix micmute LED (soundwire). (LP: #2006102) - -- Kai-Chuan Hsieh Fri, 18 Dec 2020 15:26:20 +0800 + -- Andy Chi Mon, 06 Feb 2023 16:14:46 +0800 -alsa-ucm-conf (1.2.2-1ubuntu0.5) focal; urgency=medium +alsa-ucm-conf (1.2.6.3-1ubuntu1.3) jammy; urgency=medium - * d/p/0001-sof-hda-dsp-add-initial-kcontrol-values.patch - * d/p/0002-sof-hda-dsp-make-the-boot-init-optional-for-all-cont.patch - * d/p/0003-sof-hda-dsp-Set-Master-Playback-Switch-on-in-the-Boo.patch - * d/p/0004-sof-hda-dsp-Increase-the-speaker-output-volume-in-th.patch - Unmute the master playback switch and increase the init output volume, - otherwise, the playback will be muted after freshly install the OS if - the machine uses ucm to configure the audio mixers, and the init playback - output volume is too low after freshly install the OS. - (LP: #1901922) + * d/p/ucm2-sof-hda-dsp-Update-Mic-LED-settings.patch + d/p/ucm2-sof-hda-dsp-If.devdmic-cleanup.patch + - Backport patch to fix micmute LED. (LP: #2002373) - -- Hui Wang Mon, 09 Nov 2020 12:06:50 +0800 + * d/p/sof-hda-dsp-Set-Dmic0-Capture-Switch-on.patch + - Backport patch to fix capture switch default value. (LP: #2001896) -alsa-ucm-conf (1.2.2-1ubuntu0.4) focal; urgency=medium + -- Andy Chi Tue, 17 Jan 2023 17:36:21 +0800 - * d/p/0001-ucm2-USB-Audio-Add-more-support-to-Lenovo-ThinkStati.patch - Add MixerElem and proper PCM assignment to Lenovo P620 Main and Rear - audio, respectively (LP: #1895669) +alsa-ucm-conf (1.2.6.3-1ubuntu1.2) jammy; urgency=medium - -- Kai-Heng Feng Tue, 15 Sep 2020 21:58:46 +0800 + * Backport patch for speaker AMP-ALC1318 support. (LP: #1997946) -alsa-ucm-conf (1.2.2-1ubuntu0.3) focal; urgency=medium + [ Andy Chi ] + * d/p/sof-soundwire-set-PGA-capture-switch-for-rt715-mic-in-Boo.patch: + - fix microphone recording on rt715 (LP: #2000465) - * /d/p/0018-USB-Audio-Dell-WD15-Dock-make-input-and-output-volum.patch - Make the volume adjustable for USB audio on the Dell WD15/WD19 dock, - otherwise even we set the input volume to max, we can't record the sound - with some specific headset-mic (LP: #1893004) + -- Kai-Chuan Hsieh Mon, 26 Dec 2022 14:53:41 +0800 - -- Hui Wang Wed, 02 Sep 2020 09:21:23 +0800 +alsa-ucm-conf (1.2.6.3-1ubuntu1.1) jammy; urgency=medium -alsa-ucm-conf (1.2.2-1ubuntu0.2) focal; urgency=medium + * Backport patch to fix sof-hda-dsp Dmic0 initial. (LP: #1992435) - * d/p/0003-ucm-fix-wrong-If-in-sequence-in-HiFi-dual.conf.patch - * d/p/0004-ucm2-add-initial-ucm.conf-for-the-latest-alsa-lib.patch - * d/p/0005-sof-hda-dsp-don-t-fail-if-Auto-Mute-control-is-not-p.patch - * d/p/0006-ucm.conf-add-support-for-the-kernel-module-name-tree.patch - * d/p/0007-sof-hda-dsp-make-Headphone-Playback-Switch-condition.patch - * d/p/0008-sof-soundwire-initial-UCM2-version.patch - * d/p/0009-sof-soundwire-cleanups-recommended-by-the-ucm-valida.patch - * d/p/0010-sof-soundwire-rewrite-for-syntax-3.patch - * d/p/0011-HDA-Intel-add-support-for-AMD-acp-microphone-devices.patch - * d/p/0012-hda-hdmi-add-HDMI4-HDMI5-HDMI6-devices.patch - * d/p/0013-amd-renoir-acp-use-the-machine-driver-s-name-for-top.patch - * d/p/0014-amd-renoir-acp-add-syntax-in-the-Linked.patch - * d/p/0015-HDA-Intel-only-bind-the-acp-dmic-to-the-soundcard-wi.patch - * d/p/0016-Fix-invalid-Regex-Type-in-various-Condition-blocks.patch - enable sound on AMD Renoir machines (LP: #1889217) + -- Dirk Su Tue, 11 Oct 2022 16:09:17 +0800 - [ Kai-Heng Feng ] - * d/p/0017-Add-support-for-Lenovo-ThinkStation-P620-Main-Audio.patch - Add proper stream and jack assignment to Lenovo ThinkStation P620 - (LP: #1891461) +alsa-ucm-conf (1.2.6.3-1ubuntu1) jammy; urgency=medium - -- Hui Wang Mon, 10 Aug 2020 15:05:02 +0800 + * Backport patch to fix ACP LED for HDMI devices + * Backport patch to enable ACP6x. (LP: #1966957) -alsa-ucm-conf (1.2.2-1ubuntu0.1) focal; urgency=medium + -- Mario Limonciello Tue, 29 Mar 2022 08:35:14 -0500 - * Fix the audio crash on the machine without Intel HDMI audio (lp: #1874698) +alsa-ucm-conf (1.2.6.3-1) unstable; urgency=medium - -- Hui Wang Mon, 25 May 2020 14:36:48 +0800 + * New upstream release. + * Import upstream signing key and configure watch file to check for + sigs (closes: #984652). + * Update copyright years. + * Update Standards-Version to 4.6.0. + * Add profiles for PinePhone, PineTab and librem5 hardware from Arnaud + Ferraris to help upstreaming them (closes: #984654). + * Move chmodding to execute_after_dh_fixperm target (thanks, Nicolas + Boulenguez). + + -- Jordi Mallach Wed, 12 Jan 2022 01:00:23 +0100 + +alsa-ucm-conf (1.2.5.1-1) unstable; urgency=medium + + * New upstream release. + * Add bugtracker and repository upstream metadata. + * Avoid installing upstream .gitignore. + + -- Jordi Mallach Wed, 18 Aug 2021 01:08:30 +0200 + +alsa-ucm-conf (1.2.4-2) unstable; urgency=medium + + * Have alsa-ucm-conf depend on latest libasound2, as this is needed for + V2/3 syntax files to work properly (thanks, Sebastien Bacher). + + -- Jordi Mallach Fri, 05 Feb 2021 00:19:18 +0100 + +alsa-ucm-conf (1.2.4-1) unstable; urgency=medium + + * New upstream release. + * Update Standards-Version to 4.5.1, with no changes needed. + + -- Jordi Mallach Mon, 07 Dec 2020 22:13:23 +0100 + +alsa-ucm-conf (1.2.3-1) unstable; urgency=medium + + * New upstream release. + * Update to debhelper compat v13. + + -- Jordi Mallach Thu, 20 Aug 2020 20:27:17 +0200 alsa-ucm-conf (1.2.2-1) unstable; urgency=medium diff -Nru alsa-ucm-conf-1.2.2/debian/control alsa-ucm-conf-1.2.6.3/debian/control --- alsa-ucm-conf-1.2.2/debian/control 2022-05-24 00:19:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/control 2024-04-17 19:59:11.000000000 +0000 @@ -1,12 +1,13 @@ Source: alsa-ucm-conf Section: libs Priority: optional -Maintainer: Debian ALSA Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian ALSA Maintainers Uploaders: Jordi Mallach , Elimar Riesebieter , Luke Yelavich Build-Depends: debhelper-compat (= 11) -Standards-Version: 4.5.0 +Standards-Version: 4.6.0 Homepage: https://www.alsa-project.org/ Vcs-Git: https://salsa.debian.org/alsa-team/alsa-ucm-conf.git Vcs-Browser: https://salsa.debian.org/alsa-team/alsa-ucm-conf @@ -15,8 +16,7 @@ Package: alsa-ucm-conf Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends} -Enhances: libasound2 +Depends: ${misc:Depends}, libasound2 (>= 1.2.4) Description: ALSA Use Case Manager configuration files This package contains ALSA Use Case Manager configuration of audio input/output names and routing for specific audio hardware. They can be diff -Nru alsa-ucm-conf-1.2.2/debian/copyright alsa-ucm-conf-1.2.6.3/debian/copyright --- alsa-ucm-conf-1.2.2/debian/copyright 2020-01-16 11:27:41.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/copyright 2024-02-01 08:01:58.000000000 +0000 @@ -7,11 +7,11 @@ the alsa-team project at salsa.debian.org. Files: * -Copyright: 2019-2020 Advanced Linux Sound Architecture (ALSA) project +Copyright: 2019-2022 Advanced Linux Sound Architecture (ALSA) project License: BSD-3-clause Files: debian/* -Copyright: 2020 Debian ALSA Maintainers +Copyright: 2020-2022 Debian ALSA Maintainers License: BSD-3-clause License: BSD-3-clause diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0001-acp63-add-initial-support-for-AMD-Pink-Sardine-ACP63.patch alsa-ucm-conf-1.2.6.3/debian/patches/0001-acp63-add-initial-support-for-AMD-Pink-Sardine-ACP63.patch --- alsa-ucm-conf-1.2.2/debian/patches/0001-acp63-add-initial-support-for-AMD-Pink-Sardine-ACP63.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0001-acp63-add-initial-support-for-AMD-Pink-Sardine-ACP63.patch 2024-02-01 07:51:58.000000000 +0000 @@ -0,0 +1,40 @@ +From f9650636f41f2523d5a9e0cecb39190bc3a7bfad Mon Sep 17 00:00:00 2001 +From: Aaron Ma +Date: Wed, 21 Jun 2023 15:54:00 +0800 +Subject: [PATCH 1/3] acp63: add initial support for AMD Pink Sardine - ACP63 + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/327 +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/326 +Signed-off-by: Aaron Ma +Signed-off-by: Jaroslav Kysela +--- + ucm2/HDA/HDA.conf | 2 +- + ucm2/conf.d/acp63/acp63.conf | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + create mode 100644 ucm2/conf.d/acp63/acp63.conf + +diff --git a/ucm2/HDA/HDA.conf b/ucm2/HDA/HDA.conf +index 47dfc05..9317280 100644 +--- a/ucm2/HDA/HDA.conf ++++ b/ucm2/HDA/HDA.conf +@@ -3,7 +3,7 @@ Syntax 6 + 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|acp6x)$'}" ++Define.AcpCardId "$${find-card:field=name,return=id,regex='^(acp|acp6x|acp63)$'}" + Define.DeviceMic "Mic" + + If.dualcodec { +diff --git a/ucm2/conf.d/acp63/acp63.conf b/ucm2/conf.d/acp63/acp63.conf +new file mode 100644 +index 0000000..a90f20e +--- /dev/null ++++ b/ucm2/conf.d/acp63/acp63.conf +@@ -0,0 +1,3 @@ ++Syntax 3 ++ ++Include.linked.File "/common/linked.conf" +-- +2.34.1 + diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0001-rt715-init-setup-ADC07-to-a-proper-volume.patch alsa-ucm-conf-1.2.6.3/debian/patches/0001-rt715-init-setup-ADC07-to-a-proper-volume.patch --- alsa-ucm-conf-1.2.2/debian/patches/0001-rt715-init-setup-ADC07-to-a-proper-volume.patch 2020-12-18 07:26:20.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0001-rt715-init-setup-ADC07-to-a-proper-volume.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -From 263bd26b1216c933db3d216197a78678d0f8610e Mon Sep 17 00:00:00 2001 -From: Libin Yang -Date: Thu, 19 Nov 2020 20:01:30 +0800 -Subject: [PATCH] rt715: init: setup ADC07 to a proper volume - -This patch initiates 'rt715 ADC 07 Capture Volume' to a proper volume. - -Signed-off-by: Libin Yang -Signed-off-by: Jaroslav Kysela ---- - ucm2/codecs/rt715/init.conf | 1 + - 1 file changed, 1 insertion(+) - ---- a/ucm2/codecs/rt715/init.conf -+++ b/ucm2/codecs/rt715/init.conf -@@ -7,4 +7,5 @@ - cset "name='rt715 ADC 25 Mux' 4" - cset "name='rt715 ADC 27 Capture Switch' 1" - cset "name='rt715 ADC 07 Capture Switch' 1" -+ cset "name='rt715 ADC 07 Capture Volume' 58" - ] diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0001-sof-hda-dsp-Support-systems-without-integrated-graph.patch alsa-ucm-conf-1.2.6.3/debian/patches/0001-sof-hda-dsp-Support-systems-without-integrated-graph.patch --- alsa-ucm-conf-1.2.2/debian/patches/0001-sof-hda-dsp-Support-systems-without-integrated-graph.patch 2020-08-10 07:05:02.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0001-sof-hda-dsp-Support-systems-without-integrated-graph.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,140 +0,0 @@ -From 4722f5b3859903521ba0f92a64d86af31083ca50 Mon Sep 17 00:00:00 2001 -From: Kai Vehmanen -Date: Thu, 5 Mar 2020 14:59:56 +0200 -Subject: [PATCH] sof-hda-dsp: Support systems without integrated graphics - audio - -On systems where integrated graphics audio is not present -or is disabled, the HDMI PCM nodes are disabled. Add rules to -detect these systems by checking presence of HDMI jack controls -with UCM2 rules. - -Signed-off-by: Kai Vehmanen -Signed-off-by: Jaroslav Kysela ---- - ucm2/sof-hda-dsp/Hdmi.conf | 96 ++++++++++++++++++++++++-------------- - 1 file changed, 60 insertions(+), 36 deletions(-) - -diff --git a/ucm2/sof-hda-dsp/Hdmi.conf b/ucm2/sof-hda-dsp/Hdmi.conf -index be6cb39..6f2c4aa 100644 ---- a/ucm2/sof-hda-dsp/Hdmi.conf -+++ b/ucm2/sof-hda-dsp/Hdmi.conf -@@ -1,55 +1,79 @@ - # Use case Configuration for sof-hda-dsp - --SectionDevice."HDMI1" { -- Comment "HDMI1/DP1 Output" -+If.hdmi1 { -+ Condition { -+ Type ControlExists -+ Control "iface=CARD,name='HDMI/DP,pcm=3 Jack'" -+ } -+ True { -+ SectionDevice."HDMI1" { -+ Comment "HDMI1/DP1 Output" - -- EnableSequence [ -- cset "name='IEC958 Playback Switch' on" -- ] -+ EnableSequence [ -+ cset "name='IEC958 Playback Switch' on" -+ ] - -- DisableSequence [ -- cset "name='IEC958 Playback Switch' off" -- ] -+ DisableSequence [ -+ cset "name='IEC958 Playback Switch' off" -+ ] - -- Value { -- PlaybackPriority 500 -- PlaybackPCM "hw:${CardId},3" -- JackControl "HDMI/DP,pcm=3 Jack" -+ Value { -+ PlaybackPriority 500 -+ PlaybackPCM "hw:${CardId},3" -+ JackControl "HDMI/DP,pcm=3 Jack" -+ } -+ } - } - } - --SectionDevice."HDMI2" { -- Comment "HDMI2/DP2 Output" -+If.hdmi2 { -+ Condition { -+ Type ControlExists -+ Control "iface=CARD,name='HDMI/DP,pcm=4 Jack'" -+ } -+ True { -+ SectionDevice."HDMI2" { -+ Comment "HDMI2/DP2 Output" - -- EnableSequence [ -- cset "name='IEC958 Playback Switch',index=1 on" -- ] -+ EnableSequence [ -+ cset "name='IEC958 Playback Switch',index=1 on" -+ ] - -- DisableSequence [ -- cset "name='IEC958 Playback Switch',index=1 off" -- ] -+ DisableSequence [ -+ cset "name='IEC958 Playback Switch',index=1 off" -+ ] - -- Value { -- PlaybackPriority 600 -- PlaybackPCM "hw:${CardId},4" -- JackControl "HDMI/DP,pcm=4 Jack" -+ Value { -+ PlaybackPriority 600 -+ PlaybackPCM "hw:${CardId},4" -+ JackControl "HDMI/DP,pcm=4 Jack" -+ } -+ } - } - } - --SectionDevice."HDMI3" { -- Comment "HDMI3/DP3 Output" -+If.hdmi3 { -+ Condition { -+ Type ControlExists -+ Control "iface=CARD,name='HDMI/DP,pcm=5 Jack'" -+ } -+ True { -+ SectionDevice."HDMI3" { -+ Comment "HDMI3/DP3 Output" - -- EnableSequence [ -- cset "name='IEC958 Playback Switch',index=2 on" -- ] -+ EnableSequence [ -+ cset "name='IEC958 Playback Switch',index=2 on" -+ ] - -- DisableSequence [ -- cset "name='IEC958 Playback Switch',index=2 off" -- ] -+ DisableSequence [ -+ cset "name='IEC958 Playback Switch',index=2 off" -+ ] - -- Value { -- PlaybackPriority 700 -- PlaybackPCM "hw:${CardId},5" -- JackControl "HDMI/DP,pcm=5 Jack" -+ Value { -+ PlaybackPriority 700 -+ PlaybackPCM "hw:${CardId},5" -+ JackControl "HDMI/DP,pcm=5 Jack" -+ } -+ } - } - } --- -2.25.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0001-sof-hda-dsp-add-initial-kcontrol-values.patch alsa-ucm-conf-1.2.6.3/debian/patches/0001-sof-hda-dsp-add-initial-kcontrol-values.patch --- alsa-ucm-conf-1.2.2/debian/patches/0001-sof-hda-dsp-add-initial-kcontrol-values.patch 2020-11-09 04:06:50.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0001-sof-hda-dsp-add-initial-kcontrol-values.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -From 40967300232adc19779f641e2963cca686de0e87 Mon Sep 17 00:00:00 2001 -From: Libin Yang -Date: Thu, 21 May 2020 03:45:16 -0400 -Subject: [PATCH 1/2] sof-hda-dsp: add initial kcontrol values - -This patch adds the initial values of sof-hda-dsp card. - -Signed-off-by: Libin Yang -Signed-off-by: Jaroslav Kysela -(cherry picked from commit 450bebd628975ffab153978b80f1493100910e53) -Signed-off-by: Hui Wang ---- - ucm2/sof-hda-dsp/sof-hda-dsp.conf | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/ucm2/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/sof-hda-dsp/sof-hda-dsp.conf -index d7a0518..f3a79e9 100644 ---- a/ucm2/sof-hda-dsp/sof-hda-dsp.conf -+++ b/ucm2/sof-hda-dsp/sof-hda-dsp.conf -@@ -4,3 +4,24 @@ SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Play HiFi quality Music" - } -+ -+# the kcontrols initial values, which will be set by `alsactl init` -+ -+BootSequence [ -+ cset "name='Master Playback Volume' 80" -+ cset "name='Headphone Playback Volume' 80" -+ cset "name='Speaker Playback Volume' 80" -+ cset "name='Auto-Mute Mode' off" -+] -+ -+If.Dmic0 { -+ Condition { -+ Type ControlExists -+ Control "name='Dmic0 Capture Volume'" -+ } -+ True { -+ BootSequence [ -+ cset "name='Dmic0 Capture Volume' 70" -+ ] -+ } -+} --- -2.25.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0001-ucm-MediaTek-mt8395-evk-Add-HDMIRX-config.patch alsa-ucm-conf-1.2.6.3/debian/patches/0001-ucm-MediaTek-mt8395-evk-Add-HDMIRX-config.patch --- alsa-ucm-conf-1.2.2/debian/patches/0001-ucm-MediaTek-mt8395-evk-Add-HDMIRX-config.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0001-ucm-MediaTek-mt8395-evk-Add-HDMIRX-config.patch 2024-02-01 07:50:36.000000000 +0000 @@ -0,0 +1,78 @@ +From 1ab2d020d71a570f691fafbd341782fabb6569d1 Mon Sep 17 00:00:00 2001 +From: Zoran Zhan +Date: Mon, 22 Jan 2024 17:52:05 +0800 +Subject: [PATCH] ucm: MediaTek: mt8395-evk: Add HDMIRX config + +Add HDMI RX config and modify the priority value +of the capture devices. + +Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/389 +Signed-off-by: Zoran Zhan +Signed-off-by: Jaroslav Kysela +--- + ucm2/MediaTek/mt8395-evk/HiFi.conf | 15 ++++++++++++--- + ucm2/MediaTek/mt8395-evk/mt8395-evk.conf | 1 + + 2 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/ucm2/MediaTek/mt8395-evk/HiFi.conf b/ucm2/MediaTek/mt8395-evk/HiFi.conf +index 81e4423..5c25cfb 100644 +--- a/ucm2/MediaTek/mt8395-evk/HiFi.conf ++++ b/ucm2/MediaTek/mt8395-evk/HiFi.conf +@@ -34,6 +34,15 @@ SectionDevice."HDMI2" { + ] + } + ++SectionDevice."HDMI3" { ++ Comment "HDMI RX" ++ ++ Value { ++ CapturePriority 200 ++ CapturePCM "hw:${CardId},7" ++ } ++} ++ + SectionDevice."Speaker" { + Comment "Lineout speaker" + +@@ -90,7 +99,7 @@ SectionDevice."Headset" { + ] + + Value { +- CapturePriority 400 ++ CapturePriority 500 + CaptureChannels 3 + CapturePCM "hw:${CardId},15" + } +@@ -117,7 +126,7 @@ SectionDevice."Mic1" { + ] + + Value { +- CapturePriority 300 ++ CapturePriority 400 + CaptureChannels 3 + CapturePCM "hw:${CardId},15" + } +@@ -127,7 +136,7 @@ SectionDevice."Mic2" { + Comment "Digital microphone" + + Value { +- CapturePriority 200 ++ CapturePriority 300 + CaptureChannels 2 + CapturePCM "hw:${CardId},14" + } +diff --git a/ucm2/MediaTek/mt8395-evk/mt8395-evk.conf b/ucm2/MediaTek/mt8395-evk/mt8395-evk.conf +index 1957b69..b739ec0 100644 +--- a/ucm2/MediaTek/mt8395-evk/mt8395-evk.conf ++++ b/ucm2/MediaTek/mt8395-evk/mt8395-evk.conf +@@ -18,6 +18,7 @@ BootSequence [ + cset "name='PGA_3_Mux' AIN3" + cset "name='HDMI_OUT_MUX' Connect" + cset "name='DPTX_OUT_MUX' Disconnect" ++ cset "name='MULTI_IN1_MUX' HDMI_RX_I2S" + cset "name='Lineout Volume' 10" + cset "name='Headset Volume' 2" + cset "name='PGA1 Volume' 4" +-- +2.34.1 + diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0001-ucm2-HDA-Update-Mic-LED-settings-for-ACP-DMIC.patch alsa-ucm-conf-1.2.6.3/debian/patches/0001-ucm2-HDA-Update-Mic-LED-settings-for-ACP-DMIC.patch --- alsa-ucm-conf-1.2.2/debian/patches/0001-ucm2-HDA-Update-Mic-LED-settings-for-ACP-DMIC.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0001-ucm2-HDA-Update-Mic-LED-settings-for-ACP-DMIC.patch 2024-02-01 08:01:58.000000000 +0000 @@ -0,0 +1,32 @@ +From 9ce9ddb4a84fb467602b716575ea1d8f2bab0c39 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 7 Dec 2022 15:00:35 +0100 +Subject: [PATCH] ucm2: HDA: Update Mic LED settings for ACP DMIC + +Users expect to turn the LED on when only internal mic is off, but +it makes sense to turn this LED when all internal inputs are off. + +This configuration may be changed when the affected applications +are updated. + +BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=2134824 +Signed-off-by: Jaroslav Kysela +--- + ucm2/HDA/HDA.conf | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ucm2/HDA/HDA.conf b/ucm2/HDA/HDA.conf +index 64ffe83..47dfc05 100644 +--- a/ucm2/HDA/HDA.conf ++++ b/ucm2/HDA/HDA.conf +@@ -55,6 +55,7 @@ If.use { + 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" ++ sysw "-/class/sound/ctl-led/mic/card${CardNumber}/detach:Capture Switch" + ] + } + } +-- +2.34.1 + diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0001-ucm2-MediaTek-mt8365-evk-Add-alsa-ucm-support.patch alsa-ucm-conf-1.2.6.3/debian/patches/0001-ucm2-MediaTek-mt8365-evk-Add-alsa-ucm-support.patch --- alsa-ucm-conf-1.2.2/debian/patches/0001-ucm2-MediaTek-mt8365-evk-Add-alsa-ucm-support.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0001-ucm2-MediaTek-mt8365-evk-Add-alsa-ucm-support.patch 2024-02-01 08:02:42.000000000 +0000 @@ -0,0 +1,222 @@ +From 2f8027349c37044e15c694c6df4d62d622e20886 Mon Sep 17 00:00:00 2001 +From: Fadwa Chiby +Date: Mon, 19 Dec 2022 14:20:03 +0000 +Subject: [PATCH] ucm2: MediaTek: mt8365-evk: Add alsa-ucm support + +Add alsa-ucm support for the Mediatek mt8365-evk platform. + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/260 +Signed-off-by: Fadwa Chiby +Signed-off-by: Jaroslav Kysela +--- + ucm2/MediaTek/mt8365-evk/HiFi.conf | 141 +++++++++++++++++++++++ + ucm2/MediaTek/mt8365-evk/mt8365-evk.conf | 39 +++++++ + ucm2/conf.d/mt8365-evk/mt8365-evk.conf | 1 + + 3 files changed, 181 insertions(+) + create mode 100644 ucm2/MediaTek/mt8365-evk/HiFi.conf + create mode 100644 ucm2/MediaTek/mt8365-evk/mt8365-evk.conf + create mode 120000 ucm2/conf.d/mt8365-evk/mt8365-evk.conf + +diff --git a/ucm2/MediaTek/mt8365-evk/HiFi.conf b/ucm2/MediaTek/mt8365-evk/HiFi.conf +new file mode 100644 +index 0000000..81f563f +--- /dev/null ++++ b/ucm2/MediaTek/mt8365-evk/HiFi.conf +@@ -0,0 +1,141 @@ ++SectionDevice."HDMI" { ++ Comment "Hdmi output" ++ ++ Value { ++ PlaybackPriority 250 ++ PlaybackChannels 2 ++ PlaybackPCM "hw:${CardId},1" ++ } ++ ++ EnableSequence [ ++ cset "name='O00 I07 Switch' on" ++ cset "name='O01 I08 Switch' on" ++ ] ++ ++ DisableSequence [ ++ cset "name='O00 I07 Switch' off" ++ cset "name='O01 I08 Switch' off" ++ ] ++} ++ ++SectionDevice."Speaker" { ++ Comment "Line-out Jack " ++ ++ ConflictingDevice [ ++ "Headphones" ++ ] ++ ++ Value { ++ PlaybackPriority 300 ++ PlaybackChannels 2 ++ PlaybackPCM "hw:${CardId},0" ++ PlaybackVolume "name='Lineout_PGAL_GAIN'" ++ } ++ ++ EnableSequence [ ++ cset "name='Audio_Amp_L_Switch' Off" ++ cset "name='Audio_Amp_R_Switch' Off" ++ cset "name='Lineout_PGAL_GAIN' 0" ++ cset "name='Speaker_Amp_Switch' On" ++ ] ++ ++ DisableSequence [ ++ cset "name='Audio_Amp_L_Switch' On" ++ cset "name='Audio_Amp_R_Switch' On" ++ cset "name='Speaker_Amp_Switch' Off" ++ ] ++} ++ ++SectionDevice."Headphones" { ++ Comment "Headset speakers" ++ ++ ConflictingDevice [ ++ "Speaker" ++ ] ++ ++ Value { ++ PlaybackPriority 300 ++ PlaybackChannels 2 ++ PlaybackPCM "hw:${CardId},0" ++ PlaybackVolume "name='Headset_PGAL_GAIN'" ++ } ++ ++ EnableSequence [ ++ cset "name='Audio_Amp_L_Switch' On" ++ cset "name='Audio_Amp_R_Switch' On" ++ cset "name='Headset_PGAL_GAIN' 1" ++ cset "name='Speaker_Amp_Switch' Off" ++ ] ++ ++ DisableSequence [ ++ cset "name='Audio_Amp_L_Switch' Off" ++ cset "name='Audio_Amp_R_Switch' Off" ++ cset "name='Speaker_Amp_Switch' On" ++ ] ++} ++ ++SectionDevice."Mic1" { ++ Comment "Amic" ++ ++ ConflictingDevice [ ++ "Mic2" ++ ] ++ ++ Value { ++ CapturePriority 300 ++ CaptureChannels 1 ++ CapturePCM "hw:${CardId},2" ++ } ++ ++ EnableSequence [ ++ cset "name='Audio_MicSource1_Setting' ADC1" ++ cset "name='Audio_MICBIAS0_Switch' Off" ++ ] ++ ++ DisableSequence [ ++ cset "name='Audio_MicSource1_Setting' ADC2" ++ cset "name='Audio_MICBIAS0_Switch' On" ++ ] ++} ++ ++SectionDevice."Mic2" { ++ Comment "Headset microphone" ++ ++ ConflictingDevice [ ++ "Mic1" ++ ] ++ ++ Value { ++ CapturePriority 350 ++ CaptureChannels 1 ++ CapturePCM "hw:${CardId},2" ++ } ++ ++ EnableSequence [ ++ cset "name='Audio_MicSource1_Setting' ADC2" ++ cset "name='Audio_MICBIAS0_Switch' On" ++ ] ++ ++ DisableSequence [ ++ cset "name='Audio_MicSource1_Setting' ADC1" ++ cset "name='Audio_MICBIAS0_Switch' Off" ++ ] ++} ++ ++SectionDevice."Mic3" { ++ Comment "PDM microphones" ++ ++ Value { ++ CapturePriority 100 ++ CaptureChannels 2 ++ CapturePCM "hw:${CardId},3" ++ } ++ ++ EnableSequence [ ++ cset "name='Audio_MICBIAS0_Switch' On" ++ ] ++ ++ DisableSequence [ ++ cset "name='Audio_MICBIAS0_Switch' Off" ++ ] ++} +diff --git a/ucm2/MediaTek/mt8365-evk/mt8365-evk.conf b/ucm2/MediaTek/mt8365-evk/mt8365-evk.conf +new file mode 100644 +index 0000000..e396f8c +--- /dev/null ++++ b/ucm2/MediaTek/mt8365-evk/mt8365-evk.conf +@@ -0,0 +1,39 @@ ++Syntax 4 ++ ++SectionUseCase."HiFi" { ++ File "/MediaTek/mt8365-evk/HiFi.conf" ++ Comment "Play high quality music" ++} ++ ++BootSequence [ ++ #Audio volume ++ cset "name='Headset_PGAL_GAIN' 0" ++ cset "name='Lineout_PGAL_GAIN' 0" ++ ++ #Audio amp ++ cset "name='Audio_Amp_R_Switch' On" ++ cset "name='Audio_Amp_L_Switch' On" ++ ++ #Headset out ++ cset "name='Speaker_Amp_Switch' Off" ++ ++ #Dmic ++ cset "name='Audio_MICBIAS0_Switch' On" ++ ++ #HDMI audio (I2S3 Out) ++ cset "name='O00 I07 Switch' on" ++ cset "name='O01 I08 Switch' on" ++ ++ #jack_mic Headset In ++ cset "name='Audio_MicSource1_Setting' ADC2" ++ ++ cset "name='O03 I05 Switch' on" ++ cset "name='O04 I06 Switch' on" ++ cset "name='O05 I03 Switch' on" ++ cset "name='O06 I04 Switch' on" ++ cset "name='O09 I14 Switch' on" ++ cset "name='O10 I15 Switch' on" ++ cset "name='AUD_CLK_BUF_Switch' On" ++ cset "name='Audio_ADC_1_Switch' On" ++ cset "name='INT ADDA O03_O04 Switch' on" ++] +diff --git a/ucm2/conf.d/mt8365-evk/mt8365-evk.conf b/ucm2/conf.d/mt8365-evk/mt8365-evk.conf +new file mode 120000 +index 0000000..a46fe74 +--- /dev/null ++++ b/ucm2/conf.d/mt8365-evk/mt8365-evk.conf +@@ -0,0 +1 @@ ++../../MediaTek/mt8365-evk/mt8365-evk.conf +\ No newline at end of file +-- +2.34.1 + diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0001-ucm2-MediaTek-mt8390-evk-Add-alsa-ucm-support.patch alsa-ucm-conf-1.2.6.3/debian/patches/0001-ucm2-MediaTek-mt8390-evk-Add-alsa-ucm-support.patch --- alsa-ucm-conf-1.2.2/debian/patches/0001-ucm2-MediaTek-mt8390-evk-Add-alsa-ucm-support.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0001-ucm2-MediaTek-mt8390-evk-Add-alsa-ucm-support.patch 2024-02-01 07:50:36.000000000 +0000 @@ -0,0 +1,254 @@ +From c5366bdff656092241225d2ad663c3e41b146f8b Mon Sep 17 00:00:00 2001 +From: Zoran Zhan +Date: Thu, 1 Jun 2023 15:37:14 +0800 +Subject: [PATCH 1/3] ucm2: MediaTek: mt8390-evk: Add alsa-ucm support + +Add alsa-ucm support for the MediaTek mt8390-evk platform. + +Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/321 +Signed-off-by: Zoran Zhan +Signed-off-by: Jaroslav Kysela +--- + ucm2/MediaTek/mt8390-evk/HiFi.conf | 165 +++++++++++++++++++++++ + ucm2/MediaTek/mt8390-evk/mt8390-evk.conf | 45 +++++++ + ucm2/conf.d/mt8390-evk/mt8390-evk.conf | 1 + + 3 files changed, 211 insertions(+) + create mode 100644 ucm2/MediaTek/mt8390-evk/HiFi.conf + create mode 100644 ucm2/MediaTek/mt8390-evk/mt8390-evk.conf + create mode 120000 ucm2/conf.d/mt8390-evk/mt8390-evk.conf + +diff --git a/ucm2/MediaTek/mt8390-evk/HiFi.conf b/ucm2/MediaTek/mt8390-evk/HiFi.conf +new file mode 100644 +index 0000000..42a4582 +--- /dev/null ++++ b/ucm2/MediaTek/mt8390-evk/HiFi.conf +@@ -0,0 +1,165 @@ ++SectionDevice."HDMI1" { ++ Comment "HDMI output" ++ ++ Value { ++ PlaybackPriority 300 ++ PlaybackPCM "hw:${CardId},5" ++ JackControl "HDMI Jack" ++ } ++ ++ EnableSequence [ ++ cset "name='HDMI_OUT_MUX' 1" ++ ] ++ ++ DisableSequence [ ++ cset "name='HDMI_OUT_MUX' 0" ++ ] ++} ++ ++SectionDevice."HDMI2" { ++ Comment "DP output" ++ ++ Value { ++ PlaybackPriority 300 ++ PlaybackPCM "hw:${CardId},5" ++ JackControl "DP Jack" ++ } ++ ++ EnableSequence [ ++ cset "name='DPTX_OUT_MUX' 1" ++ ] ++ ++ DisableSequence [ ++ cset "name='DPTX_OUT_MUX' 0" ++ ] ++} ++ ++SectionDevice."Speaker" { ++ Comment "Lineout speaker" ++ ++ ConflictingDevice [ ++ "Headphones" ++ ] ++ ++ EnableSequence [ ++ cset "name='LOL Mux' Playback_L_DAC" ++ ] ++ ++ DisableSequence [ ++ cset "name='LOL Mux' Open" ++ ] ++ ++ Value { ++ PlaybackPriority 400 ++ PlaybackChannels 2 ++ PlaybackPCM "hw:${CardId},0" ++ } ++} ++ ++SectionDevice."Headphones" { ++ Comment "Earphone speaker" ++ ++ ConflictingDevice [ ++ "Speaker" ++ ] ++ ++ EnableSequence [ ++ cset "name='HP Mux' Audio Playback" ++ ] ++ ++ DisableSequence [ ++ cset "name='HP Mux' Open" ++ ] ++ ++ Value { ++ PlaybackPriority 500 ++ PlaybackChannels 2 ++ PlaybackPCM "hw:${CardId},0" ++ } ++} ++ ++SectionDevice."Headset" { ++ Comment "Earphone microphone" ++ ++ ConflictingDevice [ ++ "Mic1" ++ ] ++ ++ EnableSequence [ ++ cset "name='PGA_L_Mux' AIN1" ++ ] ++ ++ Value { ++ CapturePriority 500 ++ CaptureChannels 1 ++ CapturePCM "hw:${CardId},10" ++ } ++} ++ ++SectionDevice."Mic1" { ++ Comment "Analog microphone" ++ ++ ConflictingDevice [ ++ "Headset" ++ ] ++ ++ EnableSequence [ ++ cset "name='PGA_L_Mux' AIN0" ++ ] ++ ++ Value { ++ CapturePriority 400 ++ CaptureChannels 1 ++ CapturePCM "hw:${CardId},10" ++ } ++} ++ ++SectionDevice."Mic2" { ++ Comment "Digital microphone" ++ ++ Value { ++ CapturePriority 300 ++ CaptureChannels 2 ++ CapturePCM "hw:${CardId},14" ++ } ++} ++ ++SectionDevice."Line1" { ++ Comment "PCM input" ++ ++ Value { ++ CapturePriority 200 ++ CaptureChannels 2 ++ CapturePCM "hw:${CardId},8" ++ } ++} ++ ++SectionDevice."Line2" { ++ Comment "PCM output" ++ ++ Value { ++ PlaybackPriority 200 ++ PlaybackChannels 2 ++ PlaybackPCM "hw:${CardId},2" ++ } ++} ++ ++SectionDevice."Line3" { ++ Comment "I2S input" ++ ++ Value { ++ CapturePriority 100 ++ CaptureChannels 2 ++ CapturePCM "hw:${CardId},11" ++ } ++} ++ ++SectionDevice."Line4" { ++ Comment "I2S output" ++ ++ Value { ++ PlaybackPriority 100 ++ PlaybackChannels 8 ++ PlaybackPCM "hw:${CardId},6" ++ } ++} +\ No newline at end of file +diff --git a/ucm2/MediaTek/mt8390-evk/mt8390-evk.conf b/ucm2/MediaTek/mt8390-evk/mt8390-evk.conf +new file mode 100644 +index 0000000..e2d56e2 +--- /dev/null ++++ b/ucm2/MediaTek/mt8390-evk/mt8390-evk.conf +@@ -0,0 +1,45 @@ ++Syntax 4 ++ ++SectionUseCase."HiFi" { ++ File "/MediaTek/mt8390-evk/HiFi.conf" ++ Comment "Play high quality music" ++} ++ ++BootSequence [ ++ cset "name='HP Mux' Audio Playback" ++ cset "name='LOL Mux' Open" ++ cset "name='MISO0_MUX' UL1_CH1" ++ cset "name='MISO1_MUX' UL1_CH1" ++ cset "name='ADC_L_Mux' Left Preamplifier" ++ cset "name='PGA_L_Mux' AIN1" ++ cset "name='HDMI_OUT_MUX' Connect" ++ cset "name='DPTX_OUT_MUX' Disconnect" ++ cset "name='ETDM_OUT1_Clock_Source' a1sys_a2sys" ++ cset "name='ETDM_OUT2_Clock_Source' a1sys_a2sys" ++ cset "name='ETDM_OUT3_Clock_Source' a1sys_a2sys" ++ cset "name='ETDM_IN1_Clock_Source' a1sys_a2sys" ++ cset "name='ETDM_IN2_Clock_Source' a1sys_a2sys" ++ cset "name='Lineout Volume' 10" ++ cset "name='Headset Volume' 2" ++ cset "name='PGA1 Volume' 4" ++ cset "name='O000 I000 Switch' on" ++ cset "name='O001 I001 Switch' on" ++ cset "name='O002 I004 Switch' on" ++ cset "name='O003 I006 Switch' on" ++ cset "name='O034 I168 Switch' on" ++ cset "name='O035 I169 Switch' on" ++ cset "name='O036 I012 Switch' on" ++ cset "name='O037 I013 Switch' on" ++ cset "name='O040 I002 Switch' on" ++ cset "name='O041 I003 Switch' on" ++ cset "name='O048 I022 Switch' on" ++ cset "name='O049 I023 Switch' on" ++ cset "name='O050 I024 Switch' on" ++ cset "name='O051 I025 Switch' on" ++ cset "name='O052 I026 Switch' on" ++ cset "name='O053 I027 Switch' on" ++ cset "name='O054 I028 Switch' on" ++ cset "name='O055 I029 Switch' on" ++ cset "name='O176 I070 Switch' on" ++ cset "name='O177 I071 Switch' on" ++] +\ No newline at end of file +diff --git a/ucm2/conf.d/mt8390-evk/mt8390-evk.conf b/ucm2/conf.d/mt8390-evk/mt8390-evk.conf +new file mode 120000 +index 0000000..5b5c2b9 +--- /dev/null ++++ b/ucm2/conf.d/mt8390-evk/mt8390-evk.conf +@@ -0,0 +1 @@ ++../../MediaTek/mt8390-evk/mt8390-evk.conf +\ No newline at end of file +-- +2.34.1 + diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0001-ucm2-USB-Audio-Add-more-support-to-Lenovo-ThinkStati.patch alsa-ucm-conf-1.2.6.3/debian/patches/0001-ucm2-USB-Audio-Add-more-support-to-Lenovo-ThinkStati.patch --- alsa-ucm-conf-1.2.2/debian/patches/0001-ucm2-USB-Audio-Add-more-support-to-Lenovo-ThinkStati.patch 2020-09-15 13:58:46.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0001-ucm2-USB-Audio-Add-more-support-to-Lenovo-ThinkStati.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,103 +0,0 @@ -From 44b58af40757318a5645a70108ac79c181591f09 Mon Sep 17 00:00:00 2001 -From: Kai-Heng Feng -Date: Tue, 15 Sep 2020 20:22:22 +0800 -Subject: [PATCH] ucm2: USB-Audio: Add more support to Lenovo ThinkStation P620 - -Add MixerElem and proper PCM assignment to Lenovo P620 Main and Rear -audio, respectively. - -Signed-off-by: Kai-Heng Feng ---- - .../Lenovo-ThinkStation-P620-Main-Headset.conf | 1 + - .../Lenovo-ThinkStation-P620-Rear-Line.conf | 10 ++++++++++ - .../Lenovo-ThinkStation-P620-Rear-Mic.conf | 10 ++++++++++ - .../Lenovo-ThinkStation-P620-Rear-Speaker.conf | 8 ++++++++ - .../USB-Audio/Lenovo-ThinkStation-P620-Rear.conf | 16 ++++++++++++++++ - 5 files changed, 45 insertions(+) - create mode 100644 ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Line.conf - create mode 100644 ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Mic.conf - create mode 100644 ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Speaker.conf - create mode 100644 ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear.conf - -diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-Headset.conf b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-Headset.conf -index 5362c5e..f0f01ad 100644 ---- a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-Headset.conf -+++ b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-Headset.conf -@@ -15,5 +15,6 @@ SectionDevice."Microphone" { - CapturePriority 200 - CapturePCM "hw:${CardId}" - JackControl "Mic - Input Jack" -+ CaptureMixerElem "Mic" - } - } -diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Line.conf b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Line.conf -new file mode 100644 -index 0000000..f372989 ---- /dev/null -+++ b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Line.conf -@@ -0,0 +1,10 @@ -+SectionDevice."Line" { -+ Comment "Line In" -+ -+ Value { -+ CapturePriority 100 -+ CapturePCM "hw:${CardId}" -+ JackControl "Line - Input Jack" -+ CaptureMixerElem "Line" -+ } -+} -diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Mic.conf b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Mic.conf -new file mode 100644 -index 0000000..44a79d0 ---- /dev/null -+++ b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Mic.conf -@@ -0,0 +1,10 @@ -+SectionDevice."Mic" { -+ Comment "Microphone" -+ -+ Value { -+ CapturePriority 200 -+ CapturePCM "hw:${CardId},1" -+ JackControl "Mic - Input Jack" -+ CaptureMixerElem "Mic" -+ } -+} -diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Speaker.conf b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Speaker.conf -new file mode 100644 -index 0000000..edebbd3 ---- /dev/null -+++ b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Speaker.conf -@@ -0,0 +1,8 @@ -+SectionDevice."Speaker" { -+ Comment "Speaker" -+ -+ Value { -+ PlaybackPCM "hw:${CardId}" -+ JackControl "Speaker - Output Jack" -+ } -+} -diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear.conf b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear.conf -new file mode 100644 -index 0000000..42e436b ---- /dev/null -+++ b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear.conf -@@ -0,0 +1,16 @@ -+Syntax 2 -+Comment "USB-audio on Lenovo ThinkStation P620 Rear Audio" -+SectionUseCase."Line" { -+ Comment "Line In" -+ File "Lenovo-ThinkStation-P620-Rear-Line.conf" -+} -+ -+SectionUseCase."Speaker" { -+ Comment "Speaker" -+ File "Lenovo-ThinkStation-P620-Rear-Speaker.conf" -+} -+ -+SectionUseCase."Mic" { -+ Comment "Microphone" -+ File "Lenovo-ThinkStation-P620-Rear-Mic.conf" -+} --- -2.17.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0001-ucm2-add-PinePhone-configuration.patch alsa-ucm-conf-1.2.6.3/debian/patches/0001-ucm2-add-PinePhone-configuration.patch --- alsa-ucm-conf-1.2.2/debian/patches/0001-ucm2-add-PinePhone-configuration.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0001-ucm2-add-PinePhone-configuration.patch 2024-01-25 01:26:39.000000000 +0000 @@ -0,0 +1,324 @@ +From 997a22545f3df75c3c1b6cae49f0a4cccbb5d266 Mon Sep 17 00:00:00 2001 +From: Arnaud Ferraris +Date: Tue, 12 May 2020 09:43:51 +0200 +Subject: [PATCH 1/2] ucm2: add PinePhone configuration + +--- + ucm2/PinePhone/HiFi.conf | 139 +++++++++++++++++++++++++++++++++ + ucm2/PinePhone/PinePhone.conf | 11 +++ + ucm2/PinePhone/VoiceCall.conf | 142 ++++++++++++++++++++++++++++++++++ + 3 files changed, 292 insertions(+) + create mode 100644 ucm2/PinePhone/HiFi.conf + create mode 100644 ucm2/PinePhone/PinePhone.conf + create mode 100644 ucm2/PinePhone/VoiceCall.conf + +diff --git a/ucm2/PinePhone/HiFi.conf b/ucm2/PinePhone/HiFi.conf +new file mode 100644 +index 0000000..a6a1cf8 +--- /dev/null ++++ b/ucm2/PinePhone/HiFi.conf +@@ -0,0 +1,137 @@ ++SectionVerb { ++ EnableSequence [ ++ cset "name='Headphone Playback Switch' off" ++ cset "name='Headphone Source Playback Route' DAC" ++ cset "name='Line In Playback Switch' off" ++ cset "name='Line Out Playback Switch' off" ++ cset "name='Line Out Source Playback Route' Mono Differential" ++ cset "name='Mic1 Playback Switch' off" ++ cset "name='Mic2 Playback Switch' off" ++ cset "name='AIF1 DA0 Playback Volume' 160" ++ cset "name='AIF3 ADC Source Capture Route' None" ++ cset "name='AIF2 DAC Source Playback Route' AIF2" ++ cset "name='DAC Playback Switch' on" ++ cset "name='DAC Playback Volume' 160" ++ cset "name='ADC Digital DAC Playback Switch' off" ++ cset "name='AIF1 Slot 0 Digital DAC Playback Switch' on" ++ cset "name='AIF2 Digital DAC Playback Switch' off" ++ cset "name='DAC Reversed Playback Switch' off" ++ cset "name='Earpiece Playback Switch' off" ++ cset "name='Earpiece Source Playback Route' DACL" ++ ++ cset "name='Line In Capture Switch' off" ++ cset "name='Mic1 Capture Switch' off" ++ cset "name='Mic2 Capture Switch' off" ++ cset "name='Mixer Capture Switch' off" ++ cset "name='Mixer Reversed Capture Switch' off" ++ cset "name='ADC Capture Volume' 160" ++ cset "name='AIF1 AD0 Capture Volume' 160" ++ cset "name='AIF1 Data Digital ADC Capture Switch' on" ++ cset "name='AIF2 ADC Mixer ADC Capture Switch' off" ++ cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off" ++ cset "name='AIF2 ADC Mixer AIF2 DAC Rev Capture Switch' off" ++ cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off" ++ cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off" ++ ] ++ DisableSequence [ ++ ] ++ Value { ++ } ++} ++ ++SectionDevice."Speaker" { ++ Comment "Internal speaker" ++ EnableSequence [ ++ cset "name='AIF1 DA0 Stereo Playback Route' Mix Mono" ++ cset "name='Line Out Playback Switch' on" ++ cset "name='Line Out Playback Volume' 100%" ++ ] ++ ++ DisableSequence [ ++ cset "name='Line Out Playback Switch' off" ++ ] ++ ++ Value { ++ PlaybackVolume "Line Out Playback Volume" ++ PlaybackSwitch "Line Out Playback Switch" ++ PlaybackChannels "2" ++ PlaybackPriority 300 ++ PlaybackPCM "hw:${CardId},0" ++ } ++} ++SectionDevice."Earpiece" { ++ Comment "Internal Earpiece" ++ EnableSequence [ ++ cset "name='AIF1 DA0 Stereo Playback Route' Mix Mono" ++ cset "name='Earpiece Playback Switch' on" ++ cset "name='Earpiece Playback Volume' 100%" ++ ] ++ ++ DisableSequence [ ++ cset "name='Earpiece Playback Switch' off" ++ ] ++ ++ Value { ++ PlaybackVolume "Earpiece Playback Volume" ++ PlaybackSwitch "Earpiece Playback Switch" ++ PlaybackChannels "2" ++ PlaybackPriority 100 ++ PlaybackPCM "hw:${CardId},0" ++ } ++} ++SectionDevice."DigitalMic" { ++ Comment "Internal Microphone" ++ ConflictingDevice [ ++ "HeadsetMic" ++ ] ++ EnableSequence [ ++ cset "name='Mic1 Capture Switch' on" ++ ] ++ DisableSequence [ ++ cset "name='Mic1 Capture Switch' off" ++ ] ++ Value { ++ CapturePriority 100 ++ CapturePCM "hw:${CardId},0" ++ CaptureChannels "2" ++ } ++} ++SectionDevice."HeadsetMic" { ++ Comment "Headset Microphone" ++ ConflictingDevice [ ++ "DigitalMic" ++ ] ++ EnableSequence [ ++ cset "name='Mic2 Capture Switch' on" ++ ] ++ DisableSequence [ ++ cset "name='Mic2 Capture Switch' off" ++ ] ++ Value { ++ CapturePriority 200 ++ CapturePCM "hw:${CardId},0" ++ CaptureChannels "2" ++ JackControl "Headset Microphone Jack" ++ } ++} ++SectionDevice."Headphone" { ++ Comment "Headphones" ++ EnableSequence [ ++ cset "name='AIF1 DA0 Stereo Playback Route' Stereo" ++ cset "name='Headphone Playback Switch' on" ++ cset "name='Headphone Playback Volume' 100%" ++ ] ++ ++ DisableSequence [ ++ cset "name='Headphone Playback Switch' off" ++ ] ++ ++ Value { ++ PlaybackVolume "Headphone Playback Volume" ++ PlaybackSwitch "Headphone Playback Switch" ++ PlaybackChannels "2" ++ PlaybackPriority 500 ++ PlaybackPCM "hw:${CardId},0" ++ JackControl "Headphone Jack" ++ } ++} +diff --git a/ucm2/PinePhone/PinePhone.conf b/ucm2/PinePhone/PinePhone.conf +new file mode 100644 +index 0000000..3741216 +--- /dev/null ++++ b/ucm2/PinePhone/PinePhone.conf +@@ -0,0 +1,11 @@ ++Syntax 2 ++ ++SectionUseCase."HiFi" { ++ File "HiFi.conf" ++ Comment "Default" ++} ++ ++SectionUseCase."Voice Call" { ++ File "VoiceCall.conf" ++ Comment "Phone call" ++} +diff --git a/ucm2/PinePhone/VoiceCall.conf b/ucm2/PinePhone/VoiceCall.conf +new file mode 100644 +index 0000000..bc37975 +--- /dev/null ++++ b/ucm2/PinePhone/VoiceCall.conf +@@ -0,0 +1,141 @@ ++SectionVerb { ++ EnableSequence [ ++ cset "name='Headphone Playback Switch' off" ++ cset "name='Headphone Source Playback Route' DAC" ++ cset "name='Line In Playback Switch' off" ++ cset "name='Line Out Playback Switch' off" ++ cset "name='Line Out Source Playback Route' Mono Differential" ++ cset "name='Mic1 Playback Switch' off" ++ cset "name='Mic2 Playback Switch' off" ++ cset "name='AIF1 DA0 Playback Volume' 160" ++ cset "name='AIF2 DAC Playback Volume' 160" ++ cset "name='AIF2 DAC Stereo Playback Route' Mix Mono" ++ cset "name='AIF3 ADC Source Capture Route' None" ++ cset "name='AIF2 DAC Source Playback Route' AIF2" ++ cset "name='DAC Playback Switch' on" ++ cset "name='DAC Playback Volume' 160" ++ cset "name='ADC Digital DAC Playback Switch' off" ++ cset "name='AIF1 Slot 0 Digital DAC Playback Switch' on" ++ cset "name='AIF2 Digital DAC Playback Switch' on" ++ cset "name='DAC Reversed Playback Switch' off" ++ cset "name='Earpiece Playback Switch' off" ++ cset "name='Earpiece Source Playback Route' DACL" ++ ++ cset "name='Line In Capture Switch' off" ++ cset "name='Mic1 Capture Switch' off" ++ cset "name='Mic2 Capture Switch' off" ++ cset "name='Mixer Capture Switch' off" ++ cset "name='Mixer Reversed Capture Switch' off" ++ cset "name='ADC Capture Volume' 160" ++ cset "name='AIF1 AD0 Capture Volume' 160" ++ cset "name='AIF1 Data Digital ADC Capture Switch' on" ++ cset "name='AIF2 ADC Capture Volume' 160" ++ cset "name='AIF2 ADC Mixer ADC Capture Switch' on" ++ cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off" ++ cset "name='AIF2 ADC Mixer AIF2 DAC Rev Capture Switch' off" ++ cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off" ++ cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off" ++ ] ++ DisableSequence [ ++ ] ++ Value { ++ PlaybackRate 8000 ++ } ++} ++ ++SectionDevice."Speaker" { ++ Comment "Internal speaker" ++ EnableSequence [ ++ cset "name='AIF1 DA0 Stereo Playback Route' Mix Mono" ++ cset "name='Line Out Playback Switch' on" ++ cset "name='Line Out Playback Volume' 100%" ++ ] ++ ++ DisableSequence [ ++ cset "name='Line Out Playback Switch' off" ++ ] ++ ++ Value { ++ PlaybackVolume "Line Out Playback Volume" ++ PlaybackSwitch "Line Out Playback Switch" ++ PlaybackChannels "2" ++ PlaybackPriority 100 ++ PlaybackPCM "hw:${CardId},0" ++ } ++} ++SectionDevice."Earpiece" { ++ Comment "Internal Earpiece" ++ EnableSequence [ ++ cset "name='AIF1 DA0 Stereo Playback Route' Mix Mono" ++ cset "name='Earpiece Playback Switch' on" ++ cset "name='Earpiece Playback Volume' 100%" ++ ] ++ ++ DisableSequence [ ++ cset "name='Earpiece Playback Switch' off" ++ ] ++ ++ Value { ++ PlaybackVolume "Earpiece Playback Volume" ++ PlaybackSwitch "Earpiece Playback Switch" ++ PlaybackChannels "2" ++ PlaybackPriority 300 ++ PlaybackPCM "hw:${CardId},0" ++ } ++} ++SectionDevice."DigitalMic" { ++ Comment "Internal Microphone" ++ ConflictingDevice [ ++ "HeadsetMic" ++ ] ++ EnableSequence [ ++ cset "name='Mic1 Capture Switch' on" ++ ] ++ DisableSequence [ ++ cset "name='Mic1 Capture Switch' off" ++ ] ++ Value { ++ CapturePriority 100 ++ CapturePCM "hw:${CardId},0" ++ CaptureChannels "2" ++ } ++} ++SectionDevice."HeadsetMic" { ++ Comment "Headset Microphone" ++ ConflictingDevice [ ++ "DigitalMic" ++ ] ++ EnableSequence [ ++ cset "name='Mic2 Capture Switch' on" ++ ] ++ DisableSequence [ ++ cset "name='Mic2 Capture Switch' off" ++ ] ++ Value { ++ CapturePriority 200 ++ CapturePCM "hw:${CardId},0" ++ CaptureChannels "2" ++ JackControl "Headset Microphone Jack" ++ } ++} ++SectionDevice."Headphone" { ++ Comment "Headset" ++ EnableSequence [ ++ cset "name='AIF1 DA0 Stereo Playback Route' Stereo" ++ cset "name='Headphone Playback Switch' on" ++ cset "name='Headphone Playback Volume' 100%" ++ ] ++ ++ DisableSequence [ ++ cset "name='Headphone Playback Switch' off" ++ ] ++ ++ Value { ++ PlaybackVolume "Headphone Playback Volume" ++ PlaybackSwitch "Headphone Playback Switch" ++ PlaybackChannels "2" ++ PlaybackPriority 500 ++ PlaybackPCM "hw:${CardId},0" ++ JackControl "Headphone Jack" ++ } ++} +-- +2.28.0 + diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0001-ucm2-conf.d-mt8370-evk-Fix-the-type-of-mt8370-evk.co.patch alsa-ucm-conf-1.2.6.3/debian/patches/0001-ucm2-conf.d-mt8370-evk-Fix-the-type-of-mt8370-evk.co.patch --- alsa-ucm-conf-1.2.2/debian/patches/0001-ucm2-conf.d-mt8370-evk-Fix-the-type-of-mt8370-evk.co.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0001-ucm2-conf.d-mt8370-evk-Fix-the-type-of-mt8370-evk.co.patch 2024-02-01 07:50:36.000000000 +0000 @@ -0,0 +1,34 @@ +From d864e945ce4171fcaf6249bebec4f683fef0f5cf Mon Sep 17 00:00:00 2001 +From: Zoran Zhan +Date: Mon, 22 Jan 2024 11:49:08 +0800 +Subject: [PATCH] ucm2: conf.d: mt8370-evk: Fix the type of mt8370-evk.conf + +Fix the type of mt8370-evk.conf at /ucm2/conf.d, to let the +symbolic link can correctly point to the conf. + +Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/386 +Signed-off-by: Zoran Zhan +Signed-off-by: Jaroslav Kysela +--- + ucm2/conf.d/mt8370-evk/mt8370-evk.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + mode change 100644 => 120000 ucm2/conf.d/mt8370-evk/mt8370-evk.conf + +diff --git a/ucm2/conf.d/mt8370-evk/mt8370-evk.conf b/ucm2/conf.d/mt8370-evk/mt8370-evk.conf +deleted file mode 100644 +index 6edb08f..0000000 +--- a/ucm2/conf.d/mt8370-evk/mt8370-evk.conf ++++ /dev/null +@@ -1 +0,0 @@ +-../../MediaTek/mt8370-evk/mt8370-evk.conf +diff --git a/ucm2/conf.d/mt8370-evk/mt8370-evk.conf b/ucm2/conf.d/mt8370-evk/mt8370-evk.conf +new file mode 120000 +index 0000000..fed8ef1 +--- /dev/null ++++ b/ucm2/conf.d/mt8370-evk/mt8370-evk.conf +@@ -0,0 +1 @@ ++../../MediaTek/mt8370-evk/mt8370-evk.conf +\ No newline at end of file +-- +2.34.1 + diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0001-ucm2-sof-soundwire-add-basic-settings-for-RT1318-SDC.patch alsa-ucm-conf-1.2.6.3/debian/patches/0001-ucm2-sof-soundwire-add-basic-settings-for-RT1318-SDC.patch --- alsa-ucm-conf-1.2.2/debian/patches/0001-ucm2-sof-soundwire-add-basic-settings-for-RT1318-SDC.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0001-ucm2-sof-soundwire-add-basic-settings-for-RT1318-SDC.patch 2024-02-01 08:01:58.000000000 +0000 @@ -0,0 +1,69 @@ +From c82c400fb653292bbf0570e278d60e1ba14cc341 Mon Sep 17 00:00:00 2001 +From: Shuming Fan +Date: Wed, 16 Nov 2022 17:36:51 +0800 +Subject: [PATCH] ucm2: sof-soundwire: add basic settings for RT1318 SDCA + device + +Add support for rt1318 amplifier + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/242 +Signed-off-by: Shuming Fan +Signed-off-by: Jaroslav Kysela +--- + ucm2/sof-soundwire/rt1318-1.conf | 20 ++++++++++++++++++++ + ucm2/sof-soundwire/rt1318-2.conf | 25 +++++++++++++++++++++++++ + 2 files changed, 45 insertions(+) + create mode 100644 ucm2/sof-soundwire/rt1318-1.conf + create mode 100644 ucm2/sof-soundwire/rt1318-2.conf + +--- /dev/null ++++ b/ucm2/sof-soundwire/rt1318-1.conf +@@ -0,0 +1,20 @@ ++# Use case Configuration for sof-soundwire card ++ ++SectionDevice."Speaker" { ++ Comment "Speaker" ++ ++ EnableSequence [ ++ cset "name='rt1318-1 DAC Switch' 1" ++ cset "name='Speaker Switch' on" ++ ] ++ ++ DisableSequence [ ++ cset "name='rt1318-1 DAC Switch' 0" ++ cset "name='Speaker Switch' off" ++ ] ++ ++ Value { ++ PlaybackPriority 100 ++ PlaybackPCM "hw:${CardId},2" ++ } ++} +--- /dev/null ++++ b/ucm2/sof-soundwire/rt1318-2.conf +@@ -0,0 +1,25 @@ ++# Use case Configuration for sof-soundwire card ++ ++SectionDevice."Speaker" { ++ Comment "Speaker" ++ ++ EnableSequence [ ++ cset "name='rt1318-1 RX Channel Select' L,L" ++ cset "name='rt1318-2 RX Channel Select' R,R" ++ ++ cset "name='rt1318-1 DAC Switch' 1" ++ cset "name='rt1318-2 DAC Switch' 1" ++ cset "name='Speaker Switch' on" ++ ] ++ ++ DisableSequence [ ++ cset "name='rt1318-1 DAC Switch' 0" ++ cset "name='rt1318-2 DAC Switch' 0" ++ cset "name='Speaker Switch' off" ++ ] ++ ++ Value { ++ PlaybackPriority 100 ++ PlaybackPCM "hw:${CardId},2" ++ } ++} diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0001-ucm2-soundwire-add-rt713-SDCA-device.patch alsa-ucm-conf-1.2.6.3/debian/patches/0001-ucm2-soundwire-add-rt713-SDCA-device.patch --- alsa-ucm-conf-1.2.2/debian/patches/0001-ucm2-soundwire-add-rt713-SDCA-device.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0001-ucm2-soundwire-add-rt713-SDCA-device.patch 2024-02-01 07:51:58.000000000 +0000 @@ -0,0 +1,130 @@ +From b422a8e08cb3845053ece1fc832294adca21a684 Mon Sep 17 00:00:00 2001 +From: Shuming Fan +Date: Thu, 12 Oct 2023 10:07:36 +0800 +Subject: [PATCH] ucm2: soundwire: add rt713 SDCA device + +Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/363 +Signed-off-by: Shuming Fan +Signed-off-by: Jaroslav Kysela + +Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commit/b422a8e08cb3845053ece1fc832294adca21a684 +Bug: https://bugs.launchpad.net/ubuntu/+source/alsa-ucm-conf/+bug/2042902 +Applied-Upstream: v1.2.11 +Last-Update: 2023-11-28 +--- +--- /dev/null ++++ b/ucm2/codecs/rt713-dmic/init.conf +@@ -0,0 +1,6 @@ ++# RT713-dmic specific volume control settings ++ ++BootSequence [ ++ cset "name='rt713-dmic ADC 25 Mux' 'DMIC1'" ++ cset "name='rt713-dmic FU1E Capture Switch' 1" ++] +--- /dev/null ++++ b/ucm2/codecs/rt713-sdca/init.conf +@@ -0,0 +1,8 @@ ++# RT713-sdca specific volume control settings ++ ++BootSequence [ ++ cset "name='rt713 FU05 Playback Volume' 87" ++ cset "name='rt713 ADC 23 Mux' 'MIC2'" ++ cset "name='rt713 FU0F Capture Volume' 57" ++ cset "name='rt713 FU0F Capture Switch' 1" ++] +--- /dev/null ++++ b/ucm2/sof-soundwire/rt713-dmic.conf +@@ -0,0 +1,21 @@ ++# Use case Configuration for sof-soundwire card ++ ++SectionDevice."Mic" { ++ Comment "SoundWire microphones" ++ ++ EnableSequence [ ++ cset "name='rt713-dmic FU1E Capture Switch' 1" ++ ] ++ ++ DisableSequence [ ++ cset "name='rt713-dmic FU1E Capture Switch' 0" ++ ] ++ ++ Value { ++ CapturePriority 100 ++ CapturePCM "hw:${CardId},4" ++ CaptureSwitch "rt713-dmic FU1E Capture Switch" ++ CaptureVolume "rt713-dmic FU1E Capture Volume" ++ CaptureMixerElem "rt713-dmic FU1E" ++ } ++} +--- /dev/null ++++ b/ucm2/sof-soundwire/rt713-sdca.conf +@@ -0,0 +1,40 @@ ++# Use case Configuration for sof-soundwire card ++ ++SectionDevice."Headphones" { ++ Comment "Headphones" ++ ++ EnableSequence [ ++ cset "name='Headphone Switch' on" ++ ] ++ ++ DisableSequence [ ++ cset "name='Headphone Switch' off" ++ ] ++ ++ Value { ++ PlaybackPriority 200 ++ PlaybackPCM "hw:${CardId}" ++ JackControl "Headphone Jack" ++ } ++} ++ ++SectionDevice."Headset" { ++ Comment "Headset Microphone" ++ ++ EnableSequence [ ++ cset "name='rt713 FU0F Capture Switch' 1" ++ ] ++ ++ DisableSequence [ ++ cset "name='rt713 FU0F Capture Switch' 0" ++ ] ++ ++ Value { ++ CapturePriority 200 ++ CapturePCM "hw:${CardId},1" ++ JackControl "Headset Mic Jack" ++ CaptureSwitch "rt713 FU0F Capture Switch" ++ CaptureVolume "rt713 FU0F Capture Volume" ++ CaptureMixerElem "rt713 FU0F" ++ } ++} +--- a/ucm2/sof-soundwire/sof-soundwire.conf ++++ b/ucm2/sof-soundwire/sof-soundwire.conf +@@ -35,7 +35,7 @@ DefineRegex { + String "${CardComponents}" + } + MicCodec { +- Regex " mic:([a-z0-9]+(-sdca)?)" ++ Regex " mic:([a-z0-9]+(-dmic)?+(-sdca)?)" + String "${CardComponents}" + } + Mics { +@@ -47,7 +47,7 @@ DefineRegex { + If.hs_init { + Condition { + Type RegexMatch +- Regex "(rt5682|rt700|rt711(-sdca)?)" ++ Regex "(rt5682|rt700|rt711|rt713(-sdca)?)" + String "${var:HeadsetCodec1}" + } + True.Include.hs_init.File "/codecs/${var:HeadsetCodec1}/init.conf" +@@ -56,7 +56,7 @@ If.hs_init { + If.mic_init { + Condition { + Type RegexMatch +- Regex "(rt715(-sdca)?)" ++ Regex "(rt713-dmic|rt715(-sdca)?)" + String "${var:MicCodec1}" + } + True.Include.mic_init.File "/codecs/${var:MicCodec1}/init.conf" diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch alsa-ucm-conf-1.2.6.3/debian/patches/0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch --- alsa-ucm-conf-1.2.2/debian/patches/0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch 2021-04-16 09:32:34.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -From e4fc252975ca7129d366e64b409883c808401aed Mon Sep 17 00:00:00 2001 -From: Pierre-Louis Bossart -Date: Wed, 30 Sep 2020 17:20:34 -0500 -Subject: [PATCH] ucm2: soundwire: use cfg-amp instead of cfg-spk component - string - -For now we don't have a specific handing of the number of speakers, we -should be handling the number of amplifiers instead. The number of -speakers was added in machine drivers as a placeholder, if and when we -you it it would be in addition to the number of amplifiers, not as a -substitute. - -Signed-off-by: Pierre-Louis Bossart -Signed-off-by: Libin Yang -Signed-off-by: Jaroslav Kysela ---- - ucm2/sof-soundwire/HiFi.conf | 2 +- - ucm2/sof-soundwire/{rt1308-4.conf => rt1308-1.conf} | 7 ------- - ucm2/sof-soundwire/rt1308-2.conf | 7 +++++++ - 3 files changed, 8 insertions(+), 8 deletions(-) - rename ucm2/sof-soundwire/{rt1308-4.conf => rt1308-1.conf} (63%) - -diff --git a/ucm2/sof-soundwire/HiFi.conf b/ucm2/sof-soundwire/HiFi.conf -index f2240e8..e780ea4 100644 ---- a/ucm2/sof-soundwire/HiFi.conf -+++ b/ucm2/sof-soundwire/HiFi.conf -@@ -9,7 +9,7 @@ If.spkdev { - Type String - Empty "${var:SpeakerCodec1}" - } -- False.Include.spkdev.File "/sof-soundwire/${var:SpeakerCodec1}-${var:SpeakerChannels1}.conf" -+ False.Include.spkdev.File "/sof-soundwire/${var:SpeakerCodec1}-${var:SpeakerAmps1}.conf" - } - - If.micdev { -diff --git a/ucm2/sof-soundwire/rt1308-4.conf b/ucm2/sof-soundwire/rt1308-1.conf -similarity index 63% -rename from ucm2/sof-soundwire/rt1308-4.conf -rename to ucm2/sof-soundwire/rt1308-1.conf -index f88cb81..6da5b7e 100644 ---- a/ucm2/sof-soundwire/rt1308-4.conf -+++ b/ucm2/sof-soundwire/rt1308-1.conf -@@ -4,21 +4,14 @@ SectionDevice."Speaker" { - Comment "Speaker" - - EnableSequence [ -- cset "name='rt1308-1 RX Channel Select' LL" -- cset "name='rt1308-2 RX Channel Select' RR" -- - cset "name='rt1308-1 DAC L Switch' 1" - cset "name='rt1308-1 DAC R Switch' 1" -- cset "name='rt1308-2 DAC L Switch' 1" -- cset "name='rt1308-2 DAC R Switch' 1" - cset "name='Speaker Switch' on" - ] - - DisableSequence [ - cset "name='rt1308-1 DAC L Switch' 0" - cset "name='rt1308-1 DAC R Switch' 0" -- cset "name='rt1308-2 DAC L Switch' 0" -- cset "name='rt1308-2 DAC R Switch' 0" - cset "name='Speaker Switch' off" - ] - -diff --git a/ucm2/sof-soundwire/rt1308-2.conf b/ucm2/sof-soundwire/rt1308-2.conf -index 6da5b7e..f88cb81 100644 ---- a/ucm2/sof-soundwire/rt1308-2.conf -+++ b/ucm2/sof-soundwire/rt1308-2.conf -@@ -4,14 +4,21 @@ SectionDevice."Speaker" { - Comment "Speaker" - - EnableSequence [ -+ cset "name='rt1308-1 RX Channel Select' LL" -+ cset "name='rt1308-2 RX Channel Select' RR" -+ - cset "name='rt1308-1 DAC L Switch' 1" - cset "name='rt1308-1 DAC R Switch' 1" -+ cset "name='rt1308-2 DAC L Switch' 1" -+ cset "name='rt1308-2 DAC R Switch' 1" - cset "name='Speaker Switch' on" - ] - - DisableSequence [ - cset "name='rt1308-1 DAC L Switch' 0" - cset "name='rt1308-1 DAC R Switch' 0" -+ cset "name='rt1308-2 DAC L Switch' 0" -+ cset "name='rt1308-2 DAC R Switch' 0" - cset "name='Speaker Switch' off" - ] diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0002-Add-support-for-rt711-sdca-rt1316-and-rt715-sdca.patch alsa-ucm-conf-1.2.6.3/debian/patches/0002-Add-support-for-rt711-sdca-rt1316-and-rt715-sdca.patch --- alsa-ucm-conf-1.2.2/debian/patches/0002-Add-support-for-rt711-sdca-rt1316-and-rt715-sdca.patch 2021-04-16 09:32:34.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0002-Add-support-for-rt711-sdca-rt1316-and-rt715-sdca.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,230 +0,0 @@ -From 197025656ec456331d1a34357b113913ec3b187f Mon Sep 17 00:00:00 2001 -From: Libin Yang -Date: Sun, 7 Feb 2021 12:30:58 +0800 -Subject: [PATCH] ucm2: soundwire: add basic settings for SDCA devices - -Add support for rt711-sdca, rt1316 and rt715-sdca (aka rt714). - -Signed-off-by: Pierre-Louis Bossart -Signed-off-by: Libin Yang -Signed-off-by: Jaroslav Kysela ---- - ucm2/codecs/rt711-sdca/init.conf | 8 ++++++ - ucm2/codecs/rt715-sdca/init.conf | 9 ++++++ - ucm2/sof-soundwire/rt1316-1.conf | 22 +++++++++++++++ - ucm2/sof-soundwire/rt1316-2.conf | 29 +++++++++++++++++++ - ucm2/sof-soundwire/rt711-sdca.conf | 40 +++++++++++++++++++++++++++ - ucm2/sof-soundwire/rt715-sdca.conf | 21 ++++++++++++++ - ucm2/sof-soundwire/sof-soundwire.conf | 10 +++---- - 7 files changed, 134 insertions(+), 5 deletions(-) - create mode 100644 ucm2/codecs/rt711-sdca/init.conf - create mode 100644 ucm2/codecs/rt715-sdca/init.conf - create mode 100644 ucm2/sof-soundwire/rt1316-1.conf - create mode 100644 ucm2/sof-soundwire/rt1316-2.conf - create mode 100644 ucm2/sof-soundwire/rt711-sdca.conf - create mode 100644 ucm2/sof-soundwire/rt715-sdca.conf - -Index: alsa-ucm-conf/ucm2/codecs/rt711-sdca/init.conf -=================================================================== ---- /dev/null -+++ alsa-ucm-conf/ucm2/codecs/rt711-sdca/init.conf -@@ -0,0 +1,8 @@ -+# RT711-sdca specific volume control settings -+ -+BootSequence [ -+ cset "name='rt711 FU05 Playback Volume' 87" -+ cset "name='rt711 ADC 22 Mux' 'MIC2'" -+ cset "name='rt711 FU0F Capture Volume' 57" -+ cset "name='rt711 FU0F Capture Switch' 1" -+] -Index: alsa-ucm-conf/ucm2/codecs/rt715-sdca/init.conf -=================================================================== ---- /dev/null -+++ alsa-ucm-conf/ucm2/codecs/rt715-sdca/init.conf -@@ -0,0 +1,9 @@ -++# RT715-sdca (aka RT714) specific volume control settings -+ -+BootSequence [ -+ cset "name='rt714 FU0A Capture Switch' 0" -+ cset "name='rt714 ADC 22 Mux' 'DMIC3'" -+ cset "name='rt714 ADC 23 Mux' 'DMIC4'" -+ cset "name='rt714 FU02 Capture Switch' 1" -+ cset "name='rt714 FU02 Capture Volume' 124" -+] -Index: alsa-ucm-conf/ucm2/sof-soundwire/rt1316-1.conf -=================================================================== ---- /dev/null -+++ alsa-ucm-conf/ucm2/sof-soundwire/rt1316-1.conf -@@ -0,0 +1,22 @@ -+# Use case Configuration for sof-soundwire card -+ -+SectionDevice."Speaker" { -+ Comment "Speaker" -+ -+ EnableSequence [ -+ cset "name='rt1316-1 DAC L Switch' 1" -+ cset "name='rt1316-1 DAC R Switch' 1" -+ cset "name='Speaker Switch' on" -+ ] -+ -+ DisableSequence [ -+ cset "name='rt1316-1 DAC L Switch' 0" -+ cset "name='rt1316-1 DAC R Switch' 0" -+ cset "name='Speaker Switch' off" -+ ] -+ -+ Value { -+ PlaybackPriority 100 -+ PlaybackPCM "hw:${CardId},2" -+ } -+} -Index: alsa-ucm-conf/ucm2/sof-soundwire/rt1316-2.conf -=================================================================== ---- /dev/null -+++ alsa-ucm-conf/ucm2/sof-soundwire/rt1316-2.conf -@@ -0,0 +1,29 @@ -+# Use case Configuration for sof-soundwire card -+ -+SectionDevice."Speaker" { -+ Comment "Speaker" -+ -+ EnableSequence [ -+ cset "name='rt1316-1 RX Channel Select' L,L" -+ cset "name='rt1316-2 RX Channel Select' R,R" -+ -+ cset "name='rt1316-1 DAC L Switch' 1" -+ cset "name='rt1316-1 DAC R Switch' 1" -+ cset "name='rt1316-2 DAC L Switch' 1" -+ cset "name='rt1316-2 DAC R Switch' 1" -+ cset "name='Speaker Switch' on" -+ ] -+ -+ DisableSequence [ -+ cset "name='rt1316-1 DAC L Switch' 0" -+ cset "name='rt1316-1 DAC R Switch' 0" -+ cset "name='rt1316-2 DAC L Switch' 0" -+ cset "name='rt1316-2 DAC R Switch' 0" -+ cset "name='Speaker Switch' off" -+ ] -+ -+ Value { -+ PlaybackPriority 100 -+ PlaybackPCM "hw:${CardId},2" -+ } -+} -Index: alsa-ucm-conf/ucm2/sof-soundwire/rt711-sdca.conf -=================================================================== ---- /dev/null -+++ alsa-ucm-conf/ucm2/sof-soundwire/rt711-sdca.conf -@@ -0,0 +1,40 @@ -+# Use case Configuration for sof-soundwire card -+ -+SectionDevice."Headphones" { -+ Comment "Headphones" -+ -+ EnableSequence [ -+ cset "name='Headphone Switch' on" -+ ] -+ -+ DisableSequence [ -+ cset "name='Headphone Switch' off" -+ ] -+ -+ Value { -+ PlaybackPriority 200 -+ PlaybackPCM "hw:${CardId}" -+ JackControl "Headphone Jack" -+ } -+} -+ -+SectionDevice."Headset" { -+ Comment "Headset Microphone" -+ -+ EnableSequence [ -+ cset "name='PGA2.0 2 Master Capture Switch' 1" -+ ] -+ -+ DisableSequence [ -+ cset "name='PGA2.0 2 Master Capture Switch' 0" -+ ] -+ -+ Value { -+ CapturePriority 200 -+ CapturePCM "hw:${CardId},1" -+ JackControl "Headset Mic Jack" -+ CaptureSwitch "PGA2.0 2 Master Capture Switch" -+ CaptureVolume "PGA2.0 2 Master Capture Volume" -+ CaptureMixerElem "PGA2.0 2 Master" -+ } -+} -Index: alsa-ucm-conf/ucm2/sof-soundwire/rt715-sdca.conf -=================================================================== ---- /dev/null -+++ alsa-ucm-conf/ucm2/sof-soundwire/rt715-sdca.conf -@@ -0,0 +1,21 @@ -+# Use case Configuration for sof-soundwire card -+ -+SectionDevice."Mic" { -+ Comment "SoundWire microphones" -+ -+ EnableSequence [ -+ cset "name='rt714 FU02 Capture Switch' 1" -+ ] -+ -+ DisableSequence [ -+ cset "name='rt714 FU02 Capture Switch' 0" -+ ] -+ -+ Value { -+ CapturePriority 100 -+ CapturePCM "hw:${CardId},4" -+ CaptureSwitch "rt714 FU02 Capture Switch" -+ CaptureVolume "rt714 FU02 Capture Volume" -+ CaptureMixerElem "rt714 FU02" -+ } -+} -Index: alsa-ucm-conf/ucm2/sof-soundwire/sof-soundwire.conf -=================================================================== ---- alsa-ucm-conf.orig/ucm2/sof-soundwire/sof-soundwire.conf -+++ alsa-ucm-conf/ucm2/sof-soundwire/sof-soundwire.conf -@@ -15,7 +15,7 @@ Define { - - DefineRegex { - SpeakerCodec { -- Regex " spk:([a-z0-9]+)" -+ Regex " spk:([a-z0-9]+(-sdca)?)" - String "${CardComponents}" - } - SpeakerChannels { -@@ -27,11 +27,11 @@ DefineRegex { - String "${CardComponents}" - } - HeadsetCodec { -- Regex " hs:([a-z0-9]+)" -+ Regex " hs:([a-z0-9]+(-sdca)?)" - String "${CardComponents}" - } - MicCodec { -- Regex " mic:([a-z0-9]+)" -+ Regex " mic:([a-z0-9]+(-sdca)?)" - String "${CardComponents}" - } - } -@@ -39,7 +39,7 @@ DefineRegex { - If.hs_init { - Condition { - Type RegexMatch -- Regex "(rt5682|rt700|rt711)" -+ Regex "(rt5682|rt700|rt711(-sdca)?)" - String "${var:HeadsetCodec1}" - } - True.Include.hs_init.File "/codecs/${var:HeadsetCodec1}/init.conf" -@@ -48,7 +48,7 @@ If.hs_init { - If.mic_init { - Condition { - Type RegexMatch -- Regex "(rt715)" -+ Regex "(rt715(-sdca)?)" - String "${var:MicCodec1}" - } - True.Include.mic_init.File "/codecs/${var:MicCodec1}/init.conf" diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0002-acp63.conf-use-symbolic-link.patch alsa-ucm-conf-1.2.6.3/debian/patches/0002-acp63.conf-use-symbolic-link.patch --- alsa-ucm-conf-1.2.2/debian/patches/0002-acp63.conf-use-symbolic-link.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0002-acp63.conf-use-symbolic-link.patch 2024-02-01 07:51:58.000000000 +0000 @@ -0,0 +1,32 @@ +From 65ba35a33dfcf6988d4a0f5b39ff428ab52b71ff Mon Sep 17 00:00:00 2001 +From: pseudoc +Date: Wed, 28 Jun 2023 17:23:55 +0800 +Subject: [PATCH 2/3] acp63.conf: use symbolic link + +Signed-off-by: Atlas Yu +Signed-off-by: Jaroslav Kysela +--- + ucm2/conf.d/acp63/acp63.conf | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + mode change 100644 => 120000 ucm2/conf.d/acp63/acp63.conf + +diff --git a/ucm2/conf.d/acp63/acp63.conf b/ucm2/conf.d/acp63/acp63.conf +deleted file mode 100644 +index a90f20e..0000000 +--- a/ucm2/conf.d/acp63/acp63.conf ++++ /dev/null +@@ -1,3 +0,0 @@ +-Syntax 3 +- +-Include.linked.File "/common/linked.conf" +diff --git a/ucm2/conf.d/acp63/acp63.conf b/ucm2/conf.d/acp63/acp63.conf +new file mode 120000 +index 0000000..7298c24 +--- /dev/null ++++ b/ucm2/conf.d/acp63/acp63.conf +@@ -0,0 +1 @@ ++../../common/linked-card.conf +\ No newline at end of file +-- +2.34.1 + diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0002-sof-hda-dsp-change-Headphones2-to-Mic2.patch alsa-ucm-conf-1.2.6.3/debian/patches/0002-sof-hda-dsp-change-Headphones2-to-Mic2.patch --- alsa-ucm-conf-1.2.2/debian/patches/0002-sof-hda-dsp-change-Headphones2-to-Mic2.patch 2020-08-10 07:05:02.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0002-sof-hda-dsp-change-Headphones2-to-Mic2.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -From 907c8309b2ee671e1b36630b0d29db1bc3124990 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 6 Apr 2020 17:37:20 +0200 -Subject: [PATCH] sof-hda-dsp: change Headphones2 to Mic2 - -Fixes: https://github.com/alsa-project/alsa-ucm-conf/issues/19 - -Signed-off-by: Jaroslav Kysela ---- - ucm2/sof-hda-dsp/HiFi.conf | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/ucm2/sof-hda-dsp/HiFi.conf b/ucm2/sof-hda-dsp/HiFi.conf -index 60a8693..9a82930 100644 ---- a/ucm2/sof-hda-dsp/HiFi.conf -+++ b/ucm2/sof-hda-dsp/HiFi.conf -@@ -6,7 +6,7 @@ SectionVerb { - ] - } - --SectionDevice."Headphones1" { -+SectionDevice."Headphones" { - Comment "Headphones" - - EnableSequence [ -@@ -85,9 +85,9 @@ If.monomic { - Control "name='Input Source'" - ControlEnum "Headphone Mic" - } -- After.SectionDevice "Mic" -+ After.SectionDevice "Mic1" - True { -- SectionDevice."Headphones2" { -+ SectionDevice."Mic2" { - Comment "Headphones Stereo Microphone" - - ConflictingDevice [ -@@ -120,7 +120,7 @@ If.monomic { - } - } - False { -- SectionDevice."Headphones2" { -+ SectionDevice."Mic2" { - Comment "Headphones Stereo Microphone" - - Value { -@@ -132,7 +132,7 @@ If.monomic { - } - } - --SectionDevice."Mic" { -+SectionDevice."Mic1" { - Comment "Digital Microphone" - - Value { --- -2.25.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0002-sof-hda-dsp-make-the-boot-init-optional-for-all-cont.patch alsa-ucm-conf-1.2.6.3/debian/patches/0002-sof-hda-dsp-make-the-boot-init-optional-for-all-cont.patch --- alsa-ucm-conf-1.2.2/debian/patches/0002-sof-hda-dsp-make-the-boot-init-optional-for-all-cont.patch 2020-11-09 04:06:50.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0002-sof-hda-dsp-make-the-boot-init-optional-for-all-cont.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ -From ccad1a73cb7544c310a2eee733520d611471a984 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Wed, 24 Jun 2020 10:39:42 +0200 -Subject: [PATCH 2/2] sof-hda-dsp: make the boot init optional for all controls - -Also don't initialize "Auto-Mute Mode" in the HiFi verb. - -Signed-off-by: Jaroslav Kysela -(backported from commit 6ed067e0d448b34eaa8217f9785830aa1a3f716f) -Signed-off-by: Hui Wang ---- - ucm2/sof-hda-dsp/sof-hda-dsp.conf | 53 ++++++++++++++++++++++++------- - 1 file changed, 42 insertions(+), 11 deletions(-) - -diff --git a/ucm2/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/sof-hda-dsp/sof-hda-dsp.conf -index f3a79e9..a26d1d0 100644 ---- a/ucm2/sof-hda-dsp/sof-hda-dsp.conf -+++ b/ucm2/sof-hda-dsp/sof-hda-dsp.conf -@@ -7,21 +7,52 @@ SectionUseCase."HiFi" { - - # the kcontrols initial values, which will be set by `alsactl init` - --BootSequence [ -- cset "name='Master Playback Volume' 80" -- cset "name='Headphone Playback Volume' 80" -- cset "name='Speaker Playback Volume' 80" -- cset "name='Auto-Mute Mode' off" --] -+If.amute { -+ Condition { -+ Type ControlExists -+ Control "name='Auto-Mute Mode'" -+ } -+ True.BootSequence [ -+ cset "name='Auto-Mute Mode' off" -+ ] -+} -+ -+If.master { -+ Condition { -+ Type ControlExists -+ Control "name='Master Playback Volume'" -+ } -+ True.BootSequence [ -+ cset "name='Master Playback Volume' 60%" -+ ] -+} -+ -+If.speaker { -+ Condition { -+ Type ControlExists -+ Control "name='Speaker Playback Volume'" -+ } -+ True.BootSequence [ -+ cset "name='Speaker Playback Volume' 60%" -+ ] -+} -+ -+If.headphone { -+ Condition { -+ Type ControlExists -+ Control "name='Headphone Playback Volume'" -+ } -+ True.BootSequence [ -+ cset "name='Headphone Playback Volume' 60%" -+ ] -+} - - If.Dmic0 { - Condition { - Type ControlExists - Control "name='Dmic0 Capture Volume'" - } -- True { -- BootSequence [ -- cset "name='Dmic0 Capture Volume' 70" -- ] -- } -+ True.BootSequence [ -+ cset "name='Dmic0 Capture Volume' 70%" -+ ] - } --- -2.25.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0002-ucm2-MediaTek-mt8395-evk-Add-alsa-ucm-support.patch alsa-ucm-conf-1.2.6.3/debian/patches/0002-ucm2-MediaTek-mt8395-evk-Add-alsa-ucm-support.patch --- alsa-ucm-conf-1.2.2/debian/patches/0002-ucm2-MediaTek-mt8395-evk-Add-alsa-ucm-support.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0002-ucm2-MediaTek-mt8395-evk-Add-alsa-ucm-support.patch 2024-02-01 07:50:36.000000000 +0000 @@ -0,0 +1,243 @@ +From 5e75929e8a487498e24db27023be0b57bac222b0 Mon Sep 17 00:00:00 2001 +From: Zoran Zhan +Date: Thu, 1 Jun 2023 15:48:33 +0800 +Subject: [PATCH 2/3] ucm2: MediaTek: mt8395-evk: Add alsa-ucm support + +Add alsa-ucm support for the MediaTek mt8395-evk platform. + +Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/322 +Signed-off-by: Zoran Zhan +Signed-off-by: Jaroslav Kysela +--- + ucm2/MediaTek/mt8395-evk/HiFi.conf | 154 +++++++++++++++++++++++ + ucm2/MediaTek/mt8395-evk/mt8395-evk.conf | 46 +++++++ + ucm2/conf.d/mt8395-evk/mt8395-evk.conf | 1 + + 3 files changed, 201 insertions(+) + create mode 100644 ucm2/MediaTek/mt8395-evk/HiFi.conf + create mode 100644 ucm2/MediaTek/mt8395-evk/mt8395-evk.conf + create mode 120000 ucm2/conf.d/mt8395-evk/mt8395-evk.conf + +diff --git a/ucm2/MediaTek/mt8395-evk/HiFi.conf b/ucm2/MediaTek/mt8395-evk/HiFi.conf +new file mode 100644 +index 0000000..81e4423 +--- /dev/null ++++ b/ucm2/MediaTek/mt8395-evk/HiFi.conf +@@ -0,0 +1,154 @@ ++SectionDevice."HDMI1" { ++ Comment "HDMI output" ++ ++ Value { ++ PlaybackPriority 200 ++ PlaybackPCM "hw:${CardId},5" ++ JackControl "HDMI Jack" ++ } ++ ++ EnableSequence [ ++ cset "name='HDMI_OUT_MUX' 1" ++ ] ++ ++ DisableSequence [ ++ cset "name='HDMI_OUT_MUX' 0" ++ ] ++} ++ ++SectionDevice."HDMI2" { ++ Comment "DP output" ++ ++ Value { ++ PlaybackPriority 200 ++ PlaybackPCM "hw:${CardId},5" ++ JackControl "DP Jack" ++ } ++ ++ EnableSequence [ ++ cset "name='DPTX_OUT_MUX' 1" ++ ] ++ ++ DisableSequence [ ++ cset "name='DPTX_OUT_MUX' 0" ++ ] ++} ++ ++SectionDevice."Speaker" { ++ Comment "Lineout speaker" ++ ++ ConflictingDevice [ ++ "Headphones" ++ ] ++ ++ EnableSequence [ ++ cset "name='LOL Mux' Playback_L_DAC" ++ ] ++ ++ DisableSequence [ ++ cset "name='LOL Mux' Open" ++ ] ++ ++ Value { ++ PlaybackPriority 300 ++ PlaybackChannels 2 ++ PlaybackPCM "hw:${CardId},0" ++ } ++} ++ ++SectionDevice."Headphones" { ++ Comment "Earphone speaker" ++ ++ ConflictingDevice [ ++ "Speaker" ++ ] ++ ++ EnableSequence [ ++ cset "name='HP Mux' Audio Playback" ++ ] ++ ++ DisableSequence [ ++ cset "name='HP Mux' Open" ++ ] ++ ++ Value { ++ PlaybackPriority 400 ++ PlaybackChannels 2 ++ PlaybackPCM "hw:${CardId},0" ++ } ++} ++ ++SectionDevice."Headset" { ++ Comment "Earphone microphone" ++ ++ ConflictingDevice [ ++ "Mic1" ++ ] ++ ++ EnableSequence [ ++ cset "name='PGA_L_Mux' AIN1" ++ ] ++ ++ Value { ++ CapturePriority 400 ++ CaptureChannels 3 ++ CapturePCM "hw:${CardId},15" ++ } ++} ++ ++SectionDevice."Mic1" { ++ Comment "Analog microphone" ++ ++ ConflictingDevice [ ++ "Headset" ++ ] ++ ++ EnableSequence [ ++ cset "name='PGA_L_Mux' AIN0" ++ cset "name='O039 I169 Switch' on" ++ cset "name='O182 I170 Switch' on" ++ cset "name='MISO1_MUX' UL1_CH2" ++ ] ++ ++ DisableSequence [ ++ cset "name='O039 I169 Switch' off" ++ cset "name='O182 I170 Switch' off" ++ cset "name='MISO1_MUX' UL1_CH1" ++ ] ++ ++ Value { ++ CapturePriority 300 ++ CaptureChannels 3 ++ CapturePCM "hw:${CardId},15" ++ } ++} ++ ++SectionDevice."Mic2" { ++ Comment "Digital microphone" ++ ++ Value { ++ CapturePriority 200 ++ CaptureChannels 2 ++ CapturePCM "hw:${CardId},14" ++ } ++} ++ ++SectionDevice."Line1" { ++ Comment "PCM input" ++ ++ Value { ++ CapturePriority 100 ++ CaptureChannels 2 ++ CapturePCM "hw:${CardId},8" ++ } ++} ++ ++SectionDevice."Line2" { ++ Comment "PCM output" ++ ++ Value { ++ PlaybackPriority 100 ++ PlaybackChannels 2 ++ PlaybackPCM "hw:${CardId},2" ++ } ++} +\ No newline at end of file +diff --git a/ucm2/MediaTek/mt8395-evk/mt8395-evk.conf b/ucm2/MediaTek/mt8395-evk/mt8395-evk.conf +new file mode 100644 +index 0000000..1957b69 +--- /dev/null ++++ b/ucm2/MediaTek/mt8395-evk/mt8395-evk.conf +@@ -0,0 +1,46 @@ ++Syntax 4 ++ ++SectionUseCase."HiFi" { ++ File "/MediaTek/mt8395-evk/HiFi.conf" ++ Comment "Play high quality music" ++} ++ ++BootSequence [ ++ cset "name='HP Mux' Audio Playback" ++ cset "name='LOL Mux' Open" ++ cset "name='MISO0_MUX' UL1_CH1" ++ cset "name='MISO1_MUX' UL1_CH1" ++ cset "name='ADC_L_Mux' Left Preamplifier" ++ cset "name='ADC_R_Mux' Right Preamplifier" ++ cset "name='ADC_3_Mux' Preamplifier" ++ cset "name='PGA_L_Mux' AIN1" ++ cset "name='PGA_R_Mux' AIN2" ++ cset "name='PGA_3_Mux' AIN3" ++ cset "name='HDMI_OUT_MUX' Connect" ++ cset "name='DPTX_OUT_MUX' Disconnect" ++ cset "name='Lineout Volume' 10" ++ cset "name='Headset Volume' 2" ++ cset "name='PGA1 Volume' 4" ++ cset "name='PGA2 Volume' 4" ++ cset "name='PGA3 Volume' 4" ++ cset "name='O000 I000 Switch' on" ++ cset "name='O001 I001 Switch' on" ++ cset "name='O002 I004 Switch' on" ++ cset "name='O003 I005 Switch' on" ++ cset "name='O004 I006 Switch' on" ++ cset "name='O005 I007 Switch' on" ++ cset "name='O006 I008 Switch' on" ++ cset "name='O007 I009 Switch' on" ++ cset "name='O008 I010 Switch' on" ++ cset "name='O009 I011 Switch' on" ++ cset "name='O034 I168 Switch' on" ++ cset "name='O035 I169 Switch' on" ++ cset "name='O038 I168 Switch' on" ++ cset "name='O039 I169 Switch' on" ++ cset "name='O040 I002 Switch' on" ++ cset "name='O041 I003 Switch' on" ++ cset "name='O176 I070 Switch' on" ++ cset "name='O177 I071 Switch' on" ++ cset "name='O182 I170 Switch' on" ++ cset "name='O183 I171 Switch' on" ++] +diff --git a/ucm2/conf.d/mt8395-evk/mt8395-evk.conf b/ucm2/conf.d/mt8395-evk/mt8395-evk.conf +new file mode 120000 +index 0000000..30557e3 +--- /dev/null ++++ b/ucm2/conf.d/mt8395-evk/mt8395-evk.conf +@@ -0,0 +1 @@ ++../../MediaTek/mt8395-evk/mt8395-evk.conf +\ No newline at end of file +-- +2.34.1 + diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0002-ucm2-add-PineTab-configuration.patch alsa-ucm-conf-1.2.6.3/debian/patches/0002-ucm2-add-PineTab-configuration.patch --- alsa-ucm-conf-1.2.2/debian/patches/0002-ucm2-add-PineTab-configuration.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0002-ucm2-add-PineTab-configuration.patch 2024-01-25 01:26:39.000000000 +0000 @@ -0,0 +1,133 @@ +From 17860f29124d3d37140833f45ba6b6ad5ed251c3 Mon Sep 17 00:00:00 2001 +From: Arnaud Ferraris +Date: Tue, 12 May 2020 09:43:51 +0200 +Subject: [PATCH 2/2] ucm2: add PineTab configuration + +--- + ucm2/PineTab/HiFi.conf | 100 ++++++++++++++++++++++++++++++++++++++ + ucm2/PineTab/PineTab.conf | 6 +++ + 2 files changed, 106 insertions(+) + create mode 100644 ucm2/PineTab/HiFi.conf + create mode 100644 ucm2/PineTab/PineTab.conf + +diff --git a/ucm2/PineTab/HiFi.conf b/ucm2/PineTab/HiFi.conf +new file mode 100644 +index 0000000..f84ae73 +--- /dev/null ++++ b/ucm2/PineTab/HiFi.conf +@@ -0,0 +1,100 @@ ++SectionVerb { ++ EnableSequence [ ++ cset "name='Headphone Playback Switch' off" ++ cset "name='Headphone Source Playback Route' DAC" ++ cset "name='Line In Playback Switch' off" ++ cset "name='Line Out Playback Switch' off" ++ cset "name='Line Out Source Playback Route' Stereo" ++ cset "name='Mic1 Playback Switch' off" ++ cset "name='Mic2 Playback Switch' off" ++ cset "name='AIF1 DA0 Playback Volume' 160" ++ cset "name='AIF3 ADC Source Capture Route' None" ++ cset "name='AIF2 DAC Source Playback Route' AIF2" ++ cset "name='DAC Playback Switch' on" ++ cset "name='DAC Playback Volume' 160" ++ cset "name='ADC Digital DAC Playback Switch' off" ++ cset "name='AIF1 Slot 0 Digital DAC Playback Switch' on" ++ cset "name='AIF2 Digital DAC Playback Switch' off" ++ cset "name='DAC Reversed Playback Switch' off" ++ cset "name='Earpiece Playback Switch' off" ++ cset "name='Earpiece Source Playback Route' DACL" ++ ++ cset "name='Line In Capture Switch' off" ++ cset "name='Mic1 Capture Switch' off" ++ cset "name='Mic2 Capture Switch' off" ++ cset "name='Mixer Capture Switch' off" ++ cset "name='Mixer Reversed Capture Switch' off" ++ cset "name='ADC Capture Volume' 160" ++ cset "name='AIF1 AD0 Capture Volume' 160" ++ cset "name='AIF1 Data Digital ADC Capture Switch' on" ++ cset "name='AIF2 ADC Mixer ADC Capture Switch' off" ++ cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off" ++ cset "name='AIF2 ADC Mixer AIF2 DAC Rev Capture Switch' off" ++ cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off" ++ cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off" ++ ] ++ DisableSequence [ ++ ] ++ Value { ++ PlaybackPCM "hw:${CardId},0" ++ CapturePCM "hw:${CardId},0" ++ } ++} ++ ++SectionDevice."Speaker" { ++ Comment "Internal speaker" ++ EnableSequence [ ++ cset "name='AIF1 DA0 Stereo Playback Route' Stereo" ++ cset "name='Line Out Playback Switch' on" ++ cset "name='Line Out Playback Volume' 100%" ++ ] ++ ++ DisableSequence [ ++ cset "name='Line Out Playback Switch' off" ++ ] ++ ++ Value { ++ PlaybackVolume "Line Out Playback Volume" ++ PlaybackSwitch "Line Out Playback Switch" ++ PlaybackChannels "2" ++ PlaybackPriority 100 ++ PlaybackPCM "hw:${CardId},0" ++ } ++} ++SectionDevice."DigitalMic" { ++ Comment "Internal Microphone" ++ EnableSequence [ ++ cset "name='Mic1 Capture Switch' on" ++ cset "name='Mic2 Capture Switch' on" ++ ] ++ DisableSequence [ ++ cset "name='Mic1 Capture Switch' off" ++ cset "name='Mic2 Capture Switch' off" ++ ] ++ Value { ++ CapturePriority 100 ++ CapturePCM "hw:${CardId},0" ++ CaptureChannels "2" ++ } ++} ++SectionDevice."Headphone" { ++ Comment "Headphones" ++ EnableSequence [ ++ cset "name='AIF1 DA0 Stereo Playback Route' Stereo" ++ cset "name='Headphone Playback Switch' on" ++ cset "name='Headphone Playback Volume' 100%" ++ ] ++ ++ DisableSequence [ ++ cset "name='Headphone Playback Switch' off" ++ ] ++ ++ Value { ++ PlaybackVolume "Headphone Playback Volume" ++ PlaybackSwitch "Headphone Playback Switch" ++ PlaybackChannels "2" ++ PlaybackPriority 200 ++ PlaybackPCM "hw:${CardId},0" ++ JackControl "Headphone Jack" ++ } ++} +diff --git a/ucm2/PineTab/PineTab.conf b/ucm2/PineTab/PineTab.conf +new file mode 100644 +index 0000000..d672df2 +--- /dev/null ++++ b/ucm2/PineTab/PineTab.conf +@@ -0,0 +1,6 @@ ++Syntax 2 ++ ++SectionUseCase."HiFi" { ++ File "HiFi.conf" ++ Comment "Default" ++} +-- +2.28.0 + diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0003-acp62-add-initial-support-for-AMD-ACP-v6.2-RPL.patch alsa-ucm-conf-1.2.6.3/debian/patches/0003-acp62-add-initial-support-for-AMD-ACP-v6.2-RPL.patch --- alsa-ucm-conf-1.2.2/debian/patches/0003-acp62-add-initial-support-for-AMD-ACP-v6.2-RPL.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0003-acp62-add-initial-support-for-AMD-ACP-v6.2-RPL.patch 2024-02-01 07:51:58.000000000 +0000 @@ -0,0 +1,40 @@ +From 40d9c6c25c839255e549c65ecee1dabb3bf189d1 Mon Sep 17 00:00:00 2001 +From: pseudoc +Date: Wed, 28 Jun 2023 17:27:04 +0800 +Subject: [PATCH 3/3] acp62: add initial support for AMD ACP v6.2 RPL + +Also simplify the regex for AcpCardId. + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/332 +Signed-off-by: Atlas Yu +Signed-off-by: Jaroslav Kysela +--- + ucm2/HDA/HDA.conf | 2 +- + ucm2/conf.d/acp62/acp62.conf | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + create mode 120000 ucm2/conf.d/acp62/acp62.conf + +diff --git a/ucm2/HDA/HDA.conf b/ucm2/HDA/HDA.conf +index 9317280..83f3db2 100644 +--- a/ucm2/HDA/HDA.conf ++++ b/ucm2/HDA/HDA.conf +@@ -3,7 +3,7 @@ Syntax 6 + 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|acp6x|acp63)$'}" ++Define.AcpCardId "$${find-card:field=name,return=id,regex='^acp(|6[23x])$'}" + Define.DeviceMic "Mic" + + If.dualcodec { +diff --git a/ucm2/conf.d/acp62/acp62.conf b/ucm2/conf.d/acp62/acp62.conf +new file mode 120000 +index 0000000..7298c24 +--- /dev/null ++++ b/ucm2/conf.d/acp62/acp62.conf +@@ -0,0 +1 @@ ++../../common/linked-card.conf +\ No newline at end of file +-- +2.34.1 + diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0003-sof-hda-dsp-Set-Master-Playback-Switch-on-in-the-Boo.patch alsa-ucm-conf-1.2.6.3/debian/patches/0003-sof-hda-dsp-Set-Master-Playback-Switch-on-in-the-Boo.patch --- alsa-ucm-conf-1.2.2/debian/patches/0003-sof-hda-dsp-Set-Master-Playback-Switch-on-in-the-Boo.patch 2020-11-09 04:06:50.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0003-sof-hda-dsp-Set-Master-Playback-Switch-on-in-the-Boo.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -From e0fda9bced590330e153dbd3e2b1d7aefa07b4db Mon Sep 17 00:00:00 2001 -From: Hui Wang -Date: Thu, 29 Oct 2020 13:34:02 +0800 -Subject: [PATCH 1/2] sof-hda-dsp: Set Master Playback Switch on in the - BootSequence - -Otherwise, the audio output will be muted by default if there is no -/var/lib/alsa/asound.state. I have experienced this issue When newly -install an OS. - -Backported from: https://github.com/alsa-project/alsa-ucm-conf/pull/57 - -Signed-off-by: Hui Wang ---- - ucm2/HDA-Intel/init.conf | 1 + - ucm2/sof-hda-dsp/sof-hda-dsp.conf | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/ucm2/HDA-Intel/init.conf b/ucm2/HDA-Intel/init.conf -index 1a351a9..6310eb3 100644 ---- a/ucm2/HDA-Intel/init.conf -+++ b/ucm2/HDA-Intel/init.conf -@@ -15,6 +15,7 @@ If.master { - } - True.BootSequence [ - cset "name='Master Playback Volume' 60%" -+ cset "name='Master Playback Switch' on" - ] - } - -diff --git a/ucm2/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/sof-hda-dsp/sof-hda-dsp.conf -index c8069a6..79b54a9 100644 ---- a/ucm2/sof-hda-dsp/sof-hda-dsp.conf -+++ b/ucm2/sof-hda-dsp/sof-hda-dsp.conf -@@ -24,6 +24,7 @@ If.master { - } - True.BootSequence [ - cset "name='Master Playback Volume' 60%" -+ cset "name='Master Playback Switch' on" - ] - } - --- -2.25.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0003-ucm-fix-wrong-If-in-sequence-in-HiFi-dual.conf.patch alsa-ucm-conf-1.2.6.3/debian/patches/0003-ucm-fix-wrong-If-in-sequence-in-HiFi-dual.conf.patch --- alsa-ucm-conf-1.2.2/debian/patches/0003-ucm-fix-wrong-If-in-sequence-in-HiFi-dual.conf.patch 2020-08-10 07:05:02.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0003-ucm-fix-wrong-If-in-sequence-in-HiFi-dual.conf.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -From 9199204e37b32a00cdc314615f23a283828a3a61 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 25 May 2020 20:57:43 +0200 -Subject: [PATCH 03/14] ucm: fix wrong If in sequence in HiFi-dual.conf - -Signed-off-by: Jaroslav Kysela -(cherry picked from commit 63ae90d6366b9a787baf9af3ebed4207679b0789) -Signed-off-by: Hui Wang ---- - ucm2/HDA-Intel/HiFi-dual.conf | 19 +++++++++++-------- - 1 file changed, 11 insertions(+), 8 deletions(-) - -diff --git a/ucm2/HDA-Intel/HiFi-dual.conf b/ucm2/HDA-Intel/HiFi-dual.conf -index 174fef4..e0e814f 100644 ---- a/ucm2/HDA-Intel/HiFi-dual.conf -+++ b/ucm2/HDA-Intel/HiFi-dual.conf -@@ -74,16 +74,19 @@ SectionDevice."Line2" { - - EnableSequence [ - cset "name='Input Source' Line" -- If.0 { -- Condition { -- Type ControlExists -- Control "name='Line Boost Volume'" -- } -- True { -+ ] -+ -+ If.0 { -+ Condition { -+ Type ControlExists -+ Control "name='Line Boost Volume'" -+ } -+ True { -+ EnableSequence [ - cset "name='Line Boost Volume' 3" -- } -+ ] - } -- ] -+ } - } - - SectionDevice."Mic2" { --- -2.17.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0003-ucm2-MediaTek-mt8370-evk-Add-alsa-ucm-support.patch alsa-ucm-conf-1.2.6.3/debian/patches/0003-ucm2-MediaTek-mt8370-evk-Add-alsa-ucm-support.patch --- alsa-ucm-conf-1.2.2/debian/patches/0003-ucm2-MediaTek-mt8370-evk-Add-alsa-ucm-support.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0003-ucm2-MediaTek-mt8370-evk-Add-alsa-ucm-support.patch 2024-02-01 07:50:36.000000000 +0000 @@ -0,0 +1,253 @@ +From a0856afae4e8e071e7626958667cde049ec81e97 Mon Sep 17 00:00:00 2001 +From: Zoran Zhan +Date: Wed, 10 Jan 2024 20:16:17 +0800 +Subject: [PATCH 3/3] ucm2: MediaTek: mt8370-evk: Add alsa-ucm support + +Add alsa-ucm support for the MediaTek mt8370-evk platform. + +Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/380 +Signed-off-by: Zoran Zhan +Signed-off-by: Jaroslav Kysela +--- + ucm2/MediaTek/mt8370-evk/HiFi.conf | 165 +++++++++++++++++++++++ + ucm2/MediaTek/mt8370-evk/mt8370-evk.conf | 45 +++++++ + ucm2/conf.d/mt8370-evk/mt8370-evk.conf | 1 + + 3 files changed, 211 insertions(+) + create mode 100644 ucm2/MediaTek/mt8370-evk/HiFi.conf + create mode 100644 ucm2/MediaTek/mt8370-evk/mt8370-evk.conf + create mode 100644 ucm2/conf.d/mt8370-evk/mt8370-evk.conf + +diff --git a/ucm2/MediaTek/mt8370-evk/HiFi.conf b/ucm2/MediaTek/mt8370-evk/HiFi.conf +new file mode 100644 +index 0000000..42a4582 +--- /dev/null ++++ b/ucm2/MediaTek/mt8370-evk/HiFi.conf +@@ -0,0 +1,165 @@ ++SectionDevice."HDMI1" { ++ Comment "HDMI output" ++ ++ Value { ++ PlaybackPriority 300 ++ PlaybackPCM "hw:${CardId},5" ++ JackControl "HDMI Jack" ++ } ++ ++ EnableSequence [ ++ cset "name='HDMI_OUT_MUX' 1" ++ ] ++ ++ DisableSequence [ ++ cset "name='HDMI_OUT_MUX' 0" ++ ] ++} ++ ++SectionDevice."HDMI2" { ++ Comment "DP output" ++ ++ Value { ++ PlaybackPriority 300 ++ PlaybackPCM "hw:${CardId},5" ++ JackControl "DP Jack" ++ } ++ ++ EnableSequence [ ++ cset "name='DPTX_OUT_MUX' 1" ++ ] ++ ++ DisableSequence [ ++ cset "name='DPTX_OUT_MUX' 0" ++ ] ++} ++ ++SectionDevice."Speaker" { ++ Comment "Lineout speaker" ++ ++ ConflictingDevice [ ++ "Headphones" ++ ] ++ ++ EnableSequence [ ++ cset "name='LOL Mux' Playback_L_DAC" ++ ] ++ ++ DisableSequence [ ++ cset "name='LOL Mux' Open" ++ ] ++ ++ Value { ++ PlaybackPriority 400 ++ PlaybackChannels 2 ++ PlaybackPCM "hw:${CardId},0" ++ } ++} ++ ++SectionDevice."Headphones" { ++ Comment "Earphone speaker" ++ ++ ConflictingDevice [ ++ "Speaker" ++ ] ++ ++ EnableSequence [ ++ cset "name='HP Mux' Audio Playback" ++ ] ++ ++ DisableSequence [ ++ cset "name='HP Mux' Open" ++ ] ++ ++ Value { ++ PlaybackPriority 500 ++ PlaybackChannels 2 ++ PlaybackPCM "hw:${CardId},0" ++ } ++} ++ ++SectionDevice."Headset" { ++ Comment "Earphone microphone" ++ ++ ConflictingDevice [ ++ "Mic1" ++ ] ++ ++ EnableSequence [ ++ cset "name='PGA_L_Mux' AIN1" ++ ] ++ ++ Value { ++ CapturePriority 500 ++ CaptureChannels 1 ++ CapturePCM "hw:${CardId},10" ++ } ++} ++ ++SectionDevice."Mic1" { ++ Comment "Analog microphone" ++ ++ ConflictingDevice [ ++ "Headset" ++ ] ++ ++ EnableSequence [ ++ cset "name='PGA_L_Mux' AIN0" ++ ] ++ ++ Value { ++ CapturePriority 400 ++ CaptureChannels 1 ++ CapturePCM "hw:${CardId},10" ++ } ++} ++ ++SectionDevice."Mic2" { ++ Comment "Digital microphone" ++ ++ Value { ++ CapturePriority 300 ++ CaptureChannels 2 ++ CapturePCM "hw:${CardId},14" ++ } ++} ++ ++SectionDevice."Line1" { ++ Comment "PCM input" ++ ++ Value { ++ CapturePriority 200 ++ CaptureChannels 2 ++ CapturePCM "hw:${CardId},8" ++ } ++} ++ ++SectionDevice."Line2" { ++ Comment "PCM output" ++ ++ Value { ++ PlaybackPriority 200 ++ PlaybackChannels 2 ++ PlaybackPCM "hw:${CardId},2" ++ } ++} ++ ++SectionDevice."Line3" { ++ Comment "I2S input" ++ ++ Value { ++ CapturePriority 100 ++ CaptureChannels 2 ++ CapturePCM "hw:${CardId},11" ++ } ++} ++ ++SectionDevice."Line4" { ++ Comment "I2S output" ++ ++ Value { ++ PlaybackPriority 100 ++ PlaybackChannels 8 ++ PlaybackPCM "hw:${CardId},6" ++ } ++} +\ No newline at end of file +diff --git a/ucm2/MediaTek/mt8370-evk/mt8370-evk.conf b/ucm2/MediaTek/mt8370-evk/mt8370-evk.conf +new file mode 100644 +index 0000000..2d07c46 +--- /dev/null ++++ b/ucm2/MediaTek/mt8370-evk/mt8370-evk.conf +@@ -0,0 +1,45 @@ ++Syntax 4 ++ ++SectionUseCase."HiFi" { ++ File "/MediaTek/mt8370-evk/HiFi.conf" ++ Comment "Play high quality music" ++} ++ ++BootSequence [ ++ cset "name='HP Mux' Audio Playback" ++ cset "name='LOL Mux' Open" ++ cset "name='MISO0_MUX' UL1_CH1" ++ cset "name='MISO1_MUX' UL1_CH1" ++ cset "name='ADC_L_Mux' Left Preamplifier" ++ cset "name='PGA_L_Mux' AIN1" ++ cset "name='HDMI_OUT_MUX' Connect" ++ cset "name='DPTX_OUT_MUX' Disconnect" ++ cset "name='ETDM_OUT1_Clock_Source' a1sys_a2sys" ++ cset "name='ETDM_OUT2_Clock_Source' a1sys_a2sys" ++ cset "name='ETDM_OUT3_Clock_Source' a1sys_a2sys" ++ cset "name='ETDM_IN1_Clock_Source' a1sys_a2sys" ++ cset "name='ETDM_IN2_Clock_Source' a1sys_a2sys" ++ cset "name='Lineout Volume' 10" ++ cset "name='Headset Volume' 2" ++ cset "name='PGA1 Volume' 4" ++ cset "name='O000 I000 Switch' on" ++ cset "name='O001 I001 Switch' on" ++ cset "name='O002 I004 Switch' on" ++ cset "name='O003 I006 Switch' on" ++ cset "name='O034 I168 Switch' on" ++ cset "name='O035 I169 Switch' on" ++ cset "name='O036 I012 Switch' on" ++ cset "name='O037 I013 Switch' on" ++ cset "name='O040 I002 Switch' on" ++ cset "name='O041 I003 Switch' on" ++ cset "name='O048 I022 Switch' on" ++ cset "name='O049 I023 Switch' on" ++ cset "name='O050 I024 Switch' on" ++ cset "name='O051 I025 Switch' on" ++ cset "name='O052 I026 Switch' on" ++ cset "name='O053 I027 Switch' on" ++ cset "name='O054 I028 Switch' on" ++ cset "name='O055 I029 Switch' on" ++ cset "name='O176 I070 Switch' on" ++ cset "name='O177 I071 Switch' on" ++] +\ No newline at end of file +diff --git a/ucm2/conf.d/mt8370-evk/mt8370-evk.conf b/ucm2/conf.d/mt8370-evk/mt8370-evk.conf +new file mode 100644 +index 0000000..6edb08f +--- /dev/null ++++ b/ucm2/conf.d/mt8370-evk/mt8370-evk.conf +@@ -0,0 +1 @@ ++../../MediaTek/mt8370-evk/mt8370-evk.conf +-- +2.34.1 + diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0003-ucm2-add-improved-Librem-5-profiles.patch alsa-ucm-conf-1.2.6.3/debian/patches/0003-ucm2-add-improved-Librem-5-profiles.patch --- alsa-ucm-conf-1.2.2/debian/patches/0003-ucm2-add-improved-Librem-5-profiles.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0003-ucm2-add-improved-Librem-5-profiles.patch 2024-01-25 01:26:39.000000000 +0000 @@ -0,0 +1,237 @@ +From b4e59d4d9ed1922cdd77159bd732314e8b10591e Mon Sep 17 00:00:00 2001 +From: Arnaud Ferraris +Date: Thu, 8 Oct 2020 17:45:30 +0200 +Subject: [PATCH] ucm2: add improved Librem 5 profile + +This commit adds a more fine-tuned UCM profile for the Librem 5: +* input and ouput paths are split so we can select both devices + separately +* it uses standard UCM names for the use-cases and devices + +This is not the final profile, as it requires additional components: +* The headset mic isn't functional on the L5 yet and mic detection isn't + implemented, so Headset mic priority is lowered to make sure the + internal microphone is always used +--- + ucm2/Librem_5/HiFi.conf | 174 ++++++++++++++++++++++++++++++++++++ + ucm2/Librem_5/Librem_5.conf | 11 +++ + ucm2/Librem_5/wm8962.conf | 1 + + ucm2/wm8962 | 1 + + 5 files changed, 206 insertions(+) + create mode 100644 ucm2/Librem_5/HiFi.conf + create mode 100644 ucm2/Librem_5/Librem_5.conf + create mode 120000 ucm2/Librem_5/wm8962.conf + create mode 120000 ucm2/wm8962 + +diff --git a/ucm2/Librem_5/HiFi.conf b/ucm2/Librem_5/HiFi.conf +new file mode 100644 +index 0000000..ee22392 +--- /dev/null ++++ b/ucm2/Librem_5/HiFi.conf +@@ -0,0 +1,175 @@ ++SectionVerb { ++ EnableSequence [ ++ cset "name='Digital Playback Volume' 100,100" ++ cset "name='MIXINL IN2L Switch' off" ++ cset "name='MIXINL IN3L Switch' off" ++ cset "name='MIXINR IN2R Switch' off" ++ cset "name='MIXINR IN3R Switch' off" ++ cset "name='INPGAR IN1R Switch' off" ++ cset "name='INPGAR IN2R Switch' off" ++ cset "name='INPGAR IN3R Switch' on" ++ cset "name='INPGAR IN4R Switch' off" ++ cset "name='INPGAL IN1L Switch' off" ++ cset "name='INPGAL IN2L Switch' off" ++ cset "name='INPGAL IN3L Switch' off" ++ cset "name='INPGAL IN4L Switch' off" ++ cset "name='Input Mixer Switch' off,on" ++ cset "name='SPKOUTL PGA' Mixer" ++ cset "name='SPKOUTR PGA' Mixer" ++ ] ++ ++ DisableSequence [ ++ cset "name='Digital Playback Volume' 0,0" ++ ] ++ ++ Value { ++ } ++} ++ ++SectionDevice."Handset" { ++ Comment "Handset" ++ ++ ConflictingDevice [ ++ "Headphones" ++ "Speaker" ++ ] ++ ++ EnableSequence [ ++ cset "name='Speaker Switch' off,on" ++ cset "name='DAC L/R Swap Switch' on" ++ cset "name='DAC Monomix Switch' on" ++ cset "name='SPKOUTR PGA' DAC" ++ cset "name='Speaker Volume' 121,121" ++ cset "name='Speaker Boost Volume' 2" ++ ] ++ ++ DisableSequence [ ++ cset "name='Speaker Switch' off,off" ++ cset "name='DAC L/R Swap Switch' off" ++ cset "name='DAC Monomix Switch' off" ++ cset "name='SPKOUTR PGA' Mixer" ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ PlaybackPriority "100" ++ PlaybackVolume "name='Speaker Volume'" ++ PlaybackSwitch "name='Speaker Switch'" ++ PlaybackPCM "hw:${CardId},0" ++ } ++} ++ ++SectionDevice."Speaker" { ++ Comment "Speaker" ++ ++ ConflictingDevice [ ++ "Handset" ++ "Headphones" ++ ] ++ ++ EnableSequence [ ++ cset "name='Speaker Switch' on,off" ++ cset "name='DAC Monomix Switch' on" ++ cset "name='SPKOUTL PGA' DAC" ++ cset "name='Speaker Volume' 121,121" ++ cset "name='Speaker Boost Volume' 6" ++ ] ++ ++ DisableSequence [ ++ cset "name='Speaker Switch' off,off" ++ cset "name='DAC Monomix Switch' off" ++ cset "name='SPKOUTL PGA' Mixer" ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ PlaybackPriority "500" ++ PlaybackVolume "name='Speaker Volume'" ++ PlaybackSwitch "name='Speaker Switch'" ++ PlaybackPCM "hw:${CardId},0" ++ } ++} ++ ++SectionDevice."Headphones" { ++ Comment "Headphones" ++ ++ ConflictingDevice [ ++ "Handset" ++ "Speaker" ++ ] ++ ++ EnableSequence [ ++ cset "name='Headphone Switch' on,on" ++ cset "name='HPOUTL PGA' 0 unmute" ++ cset "name='HPOUTR PGA' 0 unmute" ++ cset "name='Headphone Aux Volume' 0" ++ cset "name='Headphone Volume' 121,121" ++ ] ++ ++ DisableSequence [ ++ cset "name='Headphone Switch' off off" ++ cset "name='HPOUTL PGA' 0 mute" ++ cset "name='HPOUTR PGA' 0 mute" ++ ] ++ ++ Value { ++ PlaybackPriority "1000" ++ PlaybackChannels "2" ++ PlaybackVolume "name='Headphone Volume'" ++ PlaybackSwitch "name='Headphone Switch'" ++ PlaybackPCM "hw:${CardId},0" ++ JackControl "Headphones Jack" ++ } ++} ++ ++SectionDevice."Mic" { ++ Comment "Internal Microphone" ++ ++ ConflictingDevice [ ++ "Headset" ++ ] ++ ++ EnableSequence [ ++ cset "name='Digital Capture Volume' 116,116" ++ cset "name='ADC L/R Swap Switch' on" ++ ] ++ ++ DisableSequence [ ++ cset "name='Digital Capture Volume' 0,0" ++ cset "name='ADC L/R Swap Switch' off" ++ ] ++ ++ Value { ++ CapturePriority "500" ++ CaptureChannels "2" ++ CaptureVolume "name='Digital Capture Volume'" ++ CapturePCM "hw:${CardId},0" ++ } ++} ++ ++SectionDevice."Headset" { ++ Comment "Headset Microphone" ++ ++ ConflictingDevice [ ++ "Mic" ++ ] ++ ++ EnableSequence [ ++ cset "name='MIXINR IN3R Switch' on" ++ cset "name='MIXINR IN3R Volume' 7" ++ ] ++ ++ DisableSequence [ ++ cset "name='MIXINR IN3R Switch' off" ++ cset "name='MIXINR IN3R Volume' 0" ++ ] ++ ++ Value { ++ CapturePriority "100" ++ CaptureChannels "2" ++ CaptureVolume "name='MIXINR IN3R Volume'" ++ CaptureSwitch "name='MIXINR IN3R Switch'" ++ CapturePCM "hw:${CardId},0" ++ JackControl "Headphones Jack" ++ } ++} +diff --git a/ucm2/Librem_5/Librem_5.conf b/ucm2/Librem_5/Librem_5.conf +new file mode 100644 +index 0000000..3741216 +--- /dev/null ++++ b/ucm2/Librem_5/Librem_5.conf +@@ -0,0 +1,6 @@ ++Syntax 2 ++ ++SectionUseCase."HiFi" { ++ File "HiFi.conf" ++ Comment "Default" ++} +diff --git a/ucm2/Librem_5/wm8962.conf b/ucm2/Librem_5/wm8962.conf +new file mode 120000 +index 0000000..ea620cc +--- /dev/null ++++ b/ucm2/Librem_5/wm8962.conf +@@ -0,0 +1 @@ ++Librem_5.conf +\ No newline at end of file +diff --git a/ucm2/wm8962 b/ucm2/wm8962 +new file mode 120000 +index 0000000..9c04c54 +--- /dev/null ++++ b/ucm2/wm8962 +@@ -0,0 +1 @@ ++Librem_5 +\ No newline at end of file +-- +2.28.0 + diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0004-HDA-acp-avoid-to-create-Mic-ACP-LED-control-for-the-.patch alsa-ucm-conf-1.2.6.3/debian/patches/0004-HDA-acp-avoid-to-create-Mic-ACP-LED-control-for-the-.patch --- alsa-ucm-conf-1.2.2/debian/patches/0004-HDA-acp-avoid-to-create-Mic-ACP-LED-control-for-the-.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0004-HDA-acp-avoid-to-create-Mic-ACP-LED-control-for-the-.patch 2024-02-01 08:01:58.000000000 +0000 @@ -0,0 +1,47 @@ +From 369f8b497e15a993d411df81a39ee5c8c1433363 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Fri, 7 Jan 2022 10:57:48 +0100 +Subject: [PATCH 1/2] 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 +--- + 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 + diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0004-sof-hda-dsp-Increase-the-speaker-output-volume-in-th.patch alsa-ucm-conf-1.2.6.3/debian/patches/0004-sof-hda-dsp-Increase-the-speaker-output-volume-in-th.patch --- alsa-ucm-conf-1.2.2/debian/patches/0004-sof-hda-dsp-Increase-the-speaker-output-volume-in-th.patch 2020-11-09 04:06:50.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0004-sof-hda-dsp-Increase-the-speaker-output-volume-in-th.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -From 618820c2800c4f79507e681b3d5bb3c5b46cfa24 Mon Sep 17 00:00:00 2001 -From: Hui Wang -Date: Thu, 29 Oct 2020 13:39:49 +0800 -Subject: [PATCH 2/2] sof-hda-dsp: Increase the speaker output volume in the - BootSequence - -At least on the Leonvo X13 Yoga, the speaker output is too low with -60% setting, let us increase it a bit. - -Backported from: https://github.com/alsa-project/alsa-ucm-conf/pull/57 - -Signed-off-by: Hui Wang ---- - ucm2/HDA-Intel/init.conf | 4 ++-- - ucm2/sof-hda-dsp/sof-hda-dsp.conf | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/ucm2/HDA-Intel/init.conf b/ucm2/HDA-Intel/init.conf -index 6310eb3..1e11bae 100644 ---- a/ucm2/HDA-Intel/init.conf -+++ b/ucm2/HDA-Intel/init.conf -@@ -14,7 +14,7 @@ If.master { - Control "name='Master Playback Volume'" - } - True.BootSequence [ -- cset "name='Master Playback Volume' 60%" -+ cset "name='Master Playback Volume' 90%" - cset "name='Master Playback Switch' on" - ] - } -@@ -25,7 +25,7 @@ If.speaker { - Control "name='Speaker Playback Volume'" - } - True.BootSequence [ -- cset "name='Speaker Playback Volume' 60%" -+ cset "name='Speaker Playback Volume' 90%" - ] - } - -diff --git a/ucm2/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/sof-hda-dsp/sof-hda-dsp.conf -index 79b54a9..f961756 100644 ---- a/ucm2/sof-hda-dsp/sof-hda-dsp.conf -+++ b/ucm2/sof-hda-dsp/sof-hda-dsp.conf -@@ -23,7 +23,7 @@ If.master { - Control "name='Master Playback Volume'" - } - True.BootSequence [ -- cset "name='Master Playback Volume' 60%" -+ cset "name='Master Playback Volume' 90%" - cset "name='Master Playback Switch' on" - ] - } -@@ -34,7 +34,7 @@ If.speaker { - Control "name='Speaker Playback Volume'" - } - True.BootSequence [ -- cset "name='Speaker Playback Volume' 60%" -+ cset "name='Speaker Playback Volume' 90%" - ] - } - --- -2.25.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0004-ucm2-add-initial-ucm.conf-for-the-latest-alsa-lib.patch alsa-ucm-conf-1.2.6.3/debian/patches/0004-ucm2-add-initial-ucm.conf-for-the-latest-alsa-lib.patch --- alsa-ucm-conf-1.2.2/debian/patches/0004-ucm2-add-initial-ucm.conf-for-the-latest-alsa-lib.patch 2020-08-10 07:05:02.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0004-ucm2-add-initial-ucm.conf-for-the-latest-alsa-lib.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,115 +0,0 @@ -From e4f3a366fcff6703948017b6e3335a6a23744f46 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Wed, 27 May 2020 12:28:32 +0200 -Subject: [PATCH 04/14] ucm2: add initial ucm.conf for the latest alsa-lib - -Signed-off-by: Jaroslav Kysela -(cherry picked from commit 24ac1523e51469bdfa2ebb5f5dbec35743935403) -Signed-off-by: Hui Wang ---- - ucm2/ucm.conf | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 93 insertions(+) - create mode 100644 ucm2/ucm.conf - -diff --git a/ucm2/ucm.conf b/ucm2/ucm.conf -new file mode 100644 -index 0000000..29bef5c ---- /dev/null -+++ b/ucm2/ucm.conf -@@ -0,0 +1,93 @@ -+# -+# This is the toplevel file included from the alsa-lib. -+# -+# It allows to add extra lookups for the old kernels or so. -+# -+# You may specify the directory (relative to the toplevel) and -+# the master configuration file which defines the verbs. -+# -+ -+# -+# Syntax version is reset for the master configuration file. -+# -+ -+Syntax 3 -+ -+If.driver { -+ Condition { -+ Type String -+ Empty "${CardNumber}" -+ } -+ True { -+ -+ # -+ # The last probed path for no-hw-card: -+ # -+ # ucm2/${OpenName}/${OpenName}.conf -+ # ucm/${OpenName}/${OpenName}.conf -+ # -+ -+ UseCasePath { -+ legacy { -+ Directory "${OpenName}" -+ File "${OpenName}.conf" -+ } -+ v1_legacy { -+ Version 1 -+ Directory "${OpenName}" -+ File "${OpenName}.conf" -+ } -+ } -+ -+ } -+ False { -+ -+ # -+ # The last probed path when hw-card is found: -+ # -+ # ucm2/${CardDriver}/${CardLongName}.conf -+ # ucm2/${CardDriver}/${CardDriver}.conf -+ # ucm/${CardLongName}/${CardLongName}.conf -+ # ucm/${CardName}/${CardName}.conf or \ -+ # ucm/${OpenName}/${OpenName}.conf -+ # -+ -+ UseCasePath { -+ longname { -+ Directory "${CardDriver}" -+ File "${CardLongName}.conf" -+ } -+ driver { -+ Directory "${CardDriver}" -+ File "${CardDriver}.conf" -+ } -+ v1_longname { -+ Version 1 -+ Directory "${CardLongName}" -+ File "${CardLongName}.conf" -+ } -+ } -+ -+ If.hw { -+ Condition { -+ Type String -+ Haystack "${OpenName}.conf" -+ Needle "hw:" -+ } -+ True { -+ UseCasePath.v1_cardnamme { -+ Version 1 -+ Directory "${CardName}" -+ File "${CardName}.conf" -+ } -+ } -+ False { -+ UseCasePath.v1_openname { -+ Version 1 -+ Directory "${OpenName}" -+ File "${OpenName}.conf" -+ } -+ } -+ } -+ } -+} --- -2.17.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0005-acp6x-add-initial-support-for-AMD-Yellow-Carp-ACP6x.patch alsa-ucm-conf-1.2.6.3/debian/patches/0005-acp6x-add-initial-support-for-AMD-Yellow-Carp-ACP6x.patch --- alsa-ucm-conf-1.2.2/debian/patches/0005-acp6x-add-initial-support-for-AMD-Yellow-Carp-ACP6x.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0005-acp6x-add-initial-support-for-AMD-Yellow-Carp-ACP6x.patch 2024-02-01 08:01:58.000000000 +0000 @@ -0,0 +1,37 @@ +From 642db9b51ff7f8ad022fee0362871ceaa46599bf Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Thu, 27 Jan 2022 21:50:32 +0100 +Subject: [PATCH 2/2] 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 +--- + 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 + diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0005-sof-hda-dsp-don-t-fail-if-Auto-Mute-control-is-not-p.patch alsa-ucm-conf-1.2.6.3/debian/patches/0005-sof-hda-dsp-don-t-fail-if-Auto-Mute-control-is-not-p.patch --- alsa-ucm-conf-1.2.2/debian/patches/0005-sof-hda-dsp-don-t-fail-if-Auto-Mute-control-is-not-p.patch 2020-08-10 07:05:02.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0005-sof-hda-dsp-don-t-fail-if-Auto-Mute-control-is-not-p.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -From ffe77aedcf378b95f45d51ec65d313156c957343 Mon Sep 17 00:00:00 2001 -From: Kai Vehmanen -Date: Wed, 10 Jun 2020 17:14:16 +0300 -Subject: [PATCH 05/14] sof-hda-dsp: don't fail if Auto-Mute control is not - present - -The "Auto-Mute Mode" control is not present in all HDA codecs. -The generic SOF HDA UCM file should be robust enough to handle -these cases as well. - -Signed-off-by: Kai Vehmanen -Signed-off-by: Jaroslav Kysela -(cherry picked from commit 4c1189fdcb4819df6c36cf490d17f532f82c8bbe) -Signed-off-by: Hui Wang ---- - ucm2/sof-hda-dsp/HiFi.conf | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -diff --git a/ucm2/sof-hda-dsp/HiFi.conf b/ucm2/sof-hda-dsp/HiFi.conf -index 9a82930..eea6ed9 100644 ---- a/ucm2/sof-hda-dsp/HiFi.conf -+++ b/ucm2/sof-hda-dsp/HiFi.conf -@@ -1,9 +1,17 @@ - # Use case Configuration for sof-hda-dsp - - SectionVerb { -- EnableSequence [ -- cset "name='Auto-Mute Mode' 'Disabled'" -- ] -+ If.automute { -+ Condition { -+ Type ControlExists -+ Control "name='Auto-Mute Mode'" -+ } -+ True { -+ EnableSequence [ -+ cset "name='Auto-Mute Mode' 'Disabled'" -+ ] -+ } -+ } - } - - SectionDevice."Headphones" { --- -2.17.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0006-sof-hda-dsp-Add-speaker-led-support.patch alsa-ucm-conf-1.2.6.3/debian/patches/0006-sof-hda-dsp-Add-speaker-led-support.patch --- alsa-ucm-conf-1.2.2/debian/patches/0006-sof-hda-dsp-Add-speaker-led-support.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0006-sof-hda-dsp-Add-speaker-led-support.patch 2024-02-01 08:01:58.000000000 +0000 @@ -0,0 +1,38 @@ +From fa57710ebfec1f3af78e561febc443cd3c195f2f Mon Sep 17 00:00:00 2001 +From: KobaKo +Date: Mon, 6 Mar 2023 20:22:51 +0800 +Subject: [PATCH] sof-hda-dsp: Add speaker led support + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/302 +Signed-off-by: KobaKo +Signed-off-by: Jaroslav Kysela +(cherry picked from commit a2cabe3044075d53e4df0d4bb7c0818071e95e12) +Signed-off-by: Koba Ko +--- + ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +Index: alsa-ucm-conf-1.2.6.3/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf +=================================================================== +--- alsa-ucm-conf-1.2.6.3.orig/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf 2023-04-20 15:38:13.362896688 +0200 ++++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf 2023-04-20 15:38:13.362896688 +0200 +@@ -61,6 +61,19 @@ + ] + } + ++If.DellMuteLed { ++ Condition { ++ Type String ++ Haystack "$${sys:class/leds/platform::mute/device}" ++ Needle "dell-laptop" ++ } ++ True { ++ FixedBootSequence [ ++ sysw "-/class/sound/ctl-led/speaker/card${CardNumber}/attach:Master Playback Switch" ++ ] ++ } ++} ++ + If.headphone { + Condition { + Type ControlExists diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0006-ucm.conf-add-support-for-the-kernel-module-name-tree.patch alsa-ucm-conf-1.2.6.3/debian/patches/0006-ucm.conf-add-support-for-the-kernel-module-name-tree.patch --- alsa-ucm-conf-1.2.2/debian/patches/0006-ucm.conf-add-support-for-the-kernel-module-name-tree.patch 2020-08-10 07:05:02.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0006-ucm.conf-add-support-for-the-kernel-module-name-tree.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,181 +0,0 @@ -From 1fbef6c6c06cfeb41a1dc4f1e9c8c6ae45906d12 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 22 Jun 2020 17:52:54 +0200 -Subject: [PATCH 06/14] ucm.conf: add support for the kernel module name tree - -It seems that some ASoC drivers (mainly created from the DT tree) -does not offer any good identification for the common part. -This change adds the sysfs kernel module name lookup to -module/.conf . - -Also, modularize V1, V2Name, V2Module blocks. The V1 compatibility -is turned off by default now. - -Signed-off-by: Jaroslav Kysela -(cherry picked from commit d001c8de287f9fa3ce1814fb1c0804390576a19e) -Signed-off-by: Hui Wang ---- - ucm2/ucm.conf | 112 ++++++++++++++++++++++++++++++++++---------------- - 1 file changed, 77 insertions(+), 35 deletions(-) - -diff --git a/ucm2/ucm.conf b/ucm2/ucm.conf -index 29bef5c..ec82878 100644 ---- a/ucm2/ucm.conf -+++ b/ucm2/ucm.conf -@@ -13,76 +13,118 @@ - - Syntax 3 - -+Define.V1 "" # non-empty string to enable ucm v1 paths -+Define.V2Module yes # empty string to disable -+Define.V2Name yes # empty string to disable -+ - If.driver { - Condition { - Type String - Empty "${CardNumber}" - } - True { -- - # -- # The last probed path for no-hw-card: -+ # The probed path for no-hw-card: - # - # ucm2/${OpenName}/${OpenName}.conf -- # ucm/${OpenName}/${OpenName}.conf - # -- - UseCasePath { - legacy { - Directory "${OpenName}" - File "${OpenName}.conf" - } -- v1_legacy { -- Version 1 -- Directory "${OpenName}" -- File "${OpenName}.conf" -- } - } -- - } - False { - - # -- # The last probed path when hw-card is found: -+ # The probed path when hw-card is found: - # -+ # ucm2/${KernelModule}/${KernelModule}.conf - # ucm2/${CardDriver}/${CardLongName}.conf - # ucm2/${CardDriver}/${CardDriver}.conf -- # ucm/${CardLongName}/${CardLongName}.conf -- # ucm/${CardName}/${CardName}.conf or \ -- # ucm/${OpenName}/${OpenName}.conf - # - -- UseCasePath { -- longname { -- Directory "${CardDriver}" -- File "${CardLongName}.conf" -- } -- driver { -- Directory "${CardDriver}" -- File "${CardDriver}.conf" -+ If.V2Module { -+ Condition { -+ Type String -+ Empty "${var:V2Module}" - } -- v1_longname { -- Version 1 -- Directory "${CardLongName}" -- File "${CardLongName}.conf" -+ False { -+ Define.KernelModulePath "class/sound/card${CardNumber}/device/driver" -+ Define.KernelModule "${sys:$KernelModulePath}" -+ UseCasePath.module { -+ Directory "module" -+ File "${var:KernelModule}.conf" -+ } - } - } -- -- If.hw { -+ If.V2Name { - Condition { - Type String -- Haystack "${OpenName}.conf" -- Needle "hw:" -+ Empty "${var:V2Name}" -+ } -+ False.UseCasePath { -+ longname { -+ Directory "${CardDriver}" -+ File "${CardLongName}.conf" -+ } -+ driver { -+ Directory "${CardDriver}" -+ File "${CardDriver}.conf" -+ } - } -- True { -- UseCasePath.v1_cardnamme { -+ } -+ } -+} -+ -+If.V1 { -+ Condition { -+ Type String -+ Empty "${var:V1}" -+ } -+ False.If.v1_driver { -+ Condition { -+ Type String -+ Empty "${CardNumber}" -+ } -+ True { -+ # -+ # The probed path for no-hw-card: -+ # -+ # ucm/${OpenName}/${OpenName}.conf -+ # -+ UseCasePath.v1_legacy { -+ Version 1 -+ Directory "${OpenName}" -+ File "${OpenName}.conf" -+ } -+ } -+ False { -+ # -+ # The ucm v1 probed path when hw-card is found: -+ # -+ # ucm/${CardLongName}/${CardLongName}.conf -+ # ucm/${CardName}/${CardName}.conf or \ -+ # ucm/${OpenName}/${OpenName}.conf -+ # -+ UseCasePath.v1_longname { -+ Version 1 -+ Directory "${CardLongName}" -+ File "${CardLongName}.conf" -+ } -+ If.v1_hw { -+ Condition { -+ Type String -+ Haystack "${OpenName}" -+ Needle "hw:" -+ } -+ True.UseCasePath.v1_cardnamme { - Version 1 - Directory "${CardName}" - File "${CardName}.conf" - } -- } -- False { -- UseCasePath.v1_openname { -+ False.UseCasePath.v1_openname { - Version 1 - Directory "${OpenName}" - File "${OpenName}.conf" --- -2.17.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0007-sof-hda-dsp-make-Headphone-Playback-Switch-condition.patch alsa-ucm-conf-1.2.6.3/debian/patches/0007-sof-hda-dsp-make-Headphone-Playback-Switch-condition.patch --- alsa-ucm-conf-1.2.2/debian/patches/0007-sof-hda-dsp-make-Headphone-Playback-Switch-condition.patch 2020-08-10 07:05:02.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0007-sof-hda-dsp-make-Headphone-Playback-Switch-condition.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -From d11b97caa9ed357687a26bb55df1ec5ff854d53b Mon Sep 17 00:00:00 2001 -From: Kai Vehmanen -Date: Thu, 11 Jun 2020 17:46:07 +0300 -Subject: [PATCH 07/14] sof-hda-dsp: make Headphone Playback Switch conditional - -The Headphone Playback Switch control is not present in all -HDA codecs. Allow the Headphones definition to work also on -such systems. - -Signed-off-by: Kai Vehmanen -Signed-off-by: Jaroslav Kysela -(cherry picked from commit 6b0216d7b9ed5094a7bf28e6f643d90dd7e6fa62) -Signed-off-by: Hui Wang ---- - ucm2/sof-hda-dsp/HiFi.conf | 21 ++++++++++++++------- - 1 file changed, 14 insertions(+), 7 deletions(-) - -diff --git a/ucm2/sof-hda-dsp/HiFi.conf b/ucm2/sof-hda-dsp/HiFi.conf -index eea6ed9..f553625 100644 ---- a/ucm2/sof-hda-dsp/HiFi.conf -+++ b/ucm2/sof-hda-dsp/HiFi.conf -@@ -17,13 +17,20 @@ SectionVerb { - SectionDevice."Headphones" { - Comment "Headphones" - -- EnableSequence [ -- cset "name='Headphone Playback Switch' on" -- ] -- -- DisableSequence [ -- cset "name='Headphone Playback Switch' off" -- ] -+ If.headphone_switch { -+ Condition { -+ Type ControlExists -+ Control "name='Headphone Playback Switch'" -+ } -+ True { -+ EnableSequence [ -+ cset "name='Headphone Playback Switch' on" -+ ] -+ DisableSequence [ -+ cset "name='Headphone Playback Switch' off" -+ ] -+ } -+ } - - Value { - PlaybackPriority 200 --- -2.17.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0008-sof-soundwire-initial-UCM2-version.patch alsa-ucm-conf-1.2.6.3/debian/patches/0008-sof-soundwire-initial-UCM2-version.patch --- alsa-ucm-conf-1.2.2/debian/patches/0008-sof-soundwire-initial-UCM2-version.patch 2020-08-10 07:05:02.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0008-sof-soundwire-initial-UCM2-version.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,608 +0,0 @@ -From a9ea67df93618e432d395b492dfcf04e2c66be8f Mon Sep 17 00:00:00 2001 -From: Pierre-Louis Bossart -Date: Mon, 16 Mar 2020 16:42:11 -0500 -Subject: [PATCH 08/14] sof-soundwire: initial UCM2 version - -Add support for sof-soundwire driver, with conditional inclusion of -sections for RT700, RT711, RT5682, RT1308, RT715. - -Signed-off-by: Libin Yang -Signed-off-by: Pierre-Louis Bossart -Signed-off-by: Jaroslav Kysela -(cherry picked from commit 9f2dae6a560c60593c24aa4b85aed07418f9dd8e) -Signed-off-by: Hui Wang ---- - ucm2/codecs/rt5682/init.conf | 24 ++++++++ - ucm2/codecs/rt700/init.conf | 17 ++++++ - ucm2/codecs/rt711/init.conf | 17 ++++++ - ucm2/codecs/rt715/init.conf | 19 +++++++ - ucm2/sof-soundwire/Hdmi.conf | 79 +++++++++++++++++++++++++++ - ucm2/sof-soundwire/HiFi.conf | 8 +++ - ucm2/sof-soundwire/RT1308-1.conf | 23 ++++++++ - ucm2/sof-soundwire/RT1308-2.conf | 30 ++++++++++ - ucm2/sof-soundwire/RT1308.conf | 30 ++++++++++ - ucm2/sof-soundwire/RT5682.conf | 62 +++++++++++++++++++++ - ucm2/sof-soundwire/RT700.conf | 75 +++++++++++++++++++++++++ - ucm2/sof-soundwire/RT711.conf | 51 +++++++++++++++++ - ucm2/sof-soundwire/RT715.conf | 31 +++++++++++ - ucm2/sof-soundwire/sof-soundwire.conf | 11 ++++ - 14 files changed, 477 insertions(+) - create mode 100644 ucm2/codecs/rt5682/init.conf - create mode 100644 ucm2/codecs/rt700/init.conf - create mode 100644 ucm2/codecs/rt711/init.conf - create mode 100644 ucm2/codecs/rt715/init.conf - create mode 100644 ucm2/sof-soundwire/Hdmi.conf - create mode 100644 ucm2/sof-soundwire/HiFi.conf - create mode 100644 ucm2/sof-soundwire/RT1308-1.conf - create mode 100644 ucm2/sof-soundwire/RT1308-2.conf - create mode 100644 ucm2/sof-soundwire/RT1308.conf - create mode 100644 ucm2/sof-soundwire/RT5682.conf - create mode 100644 ucm2/sof-soundwire/RT700.conf - create mode 100644 ucm2/sof-soundwire/RT711.conf - create mode 100644 ucm2/sof-soundwire/RT715.conf - create mode 100644 ucm2/sof-soundwire/sof-soundwire.conf - -diff --git a/ucm2/codecs/rt5682/init.conf b/ucm2/codecs/rt5682/init.conf -new file mode 100644 -index 0000000..d819feb ---- /dev/null -+++ b/ucm2/codecs/rt5682/init.conf -@@ -0,0 +1,24 @@ -+# RT5682 specific volume control settings -+If.RT5682init { -+ Condition { -+ Type String -+ Haystack "${CardComponents}" -+ Needle "hs:rt5682" -+ } -+ True { -+ BootSequence [ -+ cset "name='rt5682 Stereo1 DAC MIXL DAC L1 Switch' 1" -+ cset "name='rt5682 Stereo1 DAC MIXR DAC R1 Switch' 1" -+ cset "name='rt5682 DAC L Mux' 1" -+ cset "name='rt5682 DAC R Mux' 1" -+ cset "name='rt5682 IF1 01 ADC Swap Mux' 2" -+ cset "name='rt5682 CBJ Boost Volume' 3" -+ cset "name='rt5682 Stereo1 ADC L Mux' 0" -+ cset "name='rt5682 Stereo1 ADC R Mux' 0" -+ cset "name='rt5682 Stereo1 ADC L1 Mux' 1" -+ cset "name='rt5682 Stereo1 ADC R1 Mux' 1" -+ cset "name='rt5682 Stereo1 ADC MIXL ADC2 Switch' 0" -+ cset "name='rt5682 Stereo1 ADC MIXR ADC2 Switch' 0" -+ ] -+ } -+} -diff --git a/ucm2/codecs/rt700/init.conf b/ucm2/codecs/rt700/init.conf -new file mode 100644 -index 0000000..c5be34f ---- /dev/null -+++ b/ucm2/codecs/rt700/init.conf -@@ -0,0 +1,17 @@ -+# RT700 specific volume control settings -+If.rt700init { -+ Condition { -+ Type String -+ Haystack "${CardComponents}" -+ Needle "hs:rt700" -+ } -+ True { -+ BootSequence [ -+ cset "name='DAC Front Playback Volume' 87" -+ cset "name='HPO Mux' 'Front'" -+ cset "name='ADC 09 Capture Volume' 63" -+ cset "name='ADC 22 Mux' 'MIC2'" -+ cset "name='AMIC Volume' 1" -+ ] -+ } -+} -diff --git a/ucm2/codecs/rt711/init.conf b/ucm2/codecs/rt711/init.conf -new file mode 100644 -index 0000000..c2b8629 ---- /dev/null -+++ b/ucm2/codecs/rt711/init.conf -@@ -0,0 +1,17 @@ -+# RT711 specific volume control settings -+If.rt711init { -+ Condition { -+ Type String -+ Haystack "${CardComponents}" -+ Needle "hs:rt711" -+ } -+ True { -+ BootSequence [ -+ cset "name='rt711 DAC Surr Playback Volume' 87" -+ cset "name='rt711 ADC 08 Capture Volume' 63" -+ cset "name='rt711 ADC 23 Mux' 'MIC2'" -+ cset "name='rt711 ADC 08 Capture Switch' 1" -+ cset "name='rt711 AMIC Volume' 1" -+ ] -+ } -+} -diff --git a/ucm2/codecs/rt715/init.conf b/ucm2/codecs/rt715/init.conf -new file mode 100644 -index 0000000..745f471 ---- /dev/null -+++ b/ucm2/codecs/rt715/init.conf -@@ -0,0 +1,19 @@ -+# RT715 specific volume control settings -+If.RT715init { -+ Condition { -+ Type String -+ Haystack "${CardComponents}" -+ Needle "mic:rt715" -+ } -+ True { -+ BootSequence [ -+ cset "name='rt715 DMIC3 Boost' 2" -+ cset "name='rt715 DMIC4 Boost' 2" -+ cset "name='rt715 ADC 24 Mux' 3" -+ cset "name='rt715 ADC 25 Mux' 4" -+ cset "name='rt715 ADC 27 Capture Switch' 1" -+ cset "name='rt715 ADC 07 Capture Switch' 1" -+ -+ ] -+ } -+} -diff --git a/ucm2/sof-soundwire/Hdmi.conf b/ucm2/sof-soundwire/Hdmi.conf -new file mode 100644 -index 0000000..d0ba790 ---- /dev/null -+++ b/ucm2/sof-soundwire/Hdmi.conf -@@ -0,0 +1,79 @@ -+# Use case Configuration for sof-soundwire card -+ -+If.hdmi1 { -+ Condition { -+ Type ControlExists -+ Control "iface=CARD,name='HDMI/DP,pcm=5 Jack'" -+ } -+ True { -+ SectionDevice."HDMI1" { -+ Comment "HDMI1/DP1 Output" -+ -+ EnableSequence [ -+ cset "name='IEC958 Playback Switch' on" -+ ] -+ -+ DisableSequence [ -+ cset "name='IEC958 Playback Switch' off" -+ ] -+ -+ Value { -+ PlaybackPriority 500 -+ PlaybackPCM "hw:${CardId},5" -+ JackControl "HDMI/DP,pcm=5 Jack" -+ } -+ } -+ } -+} -+ -+If.hdmi2 { -+ Condition { -+ Type ControlExists -+ Control "iface=CARD,name='HDMI/DP,pcm=6 Jack'" -+ } -+ True { -+ SectionDevice."HDMI2" { -+ Comment "HDMI2/DP2 Output" -+ -+ EnableSequence [ -+ cset "name='IEC958 Playback Switch',index=1 on" -+ ] -+ -+ DisableSequence [ -+ cset "name='IEC958 Playback Switch',index=1 off" -+ ] -+ -+ Value { -+ PlaybackPriority 600 -+ PlaybackPCM "hw:${CardId},6" -+ JackControl "HDMI/DP,pcm=6 Jack" -+ } -+ } -+ } -+} -+ -+If.hdmi3 { -+ Condition { -+ Type ControlExists -+ Control "iface=CARD,name='HDMI/DP,pcm=7 Jack'" -+ } -+ True { -+ SectionDevice."HDMI3" { -+ Comment "HDMI3/DP3 Output" -+ -+ EnableSequence [ -+ cset "name='IEC958 Playback Switch',index=2 on" -+ ] -+ -+ DisableSequence [ -+ cset "name='IEC958 Playback Switch',index=2 off" -+ ] -+ -+ Value { -+ PlaybackPriority 700 -+ PlaybackPCM "hw:${CardId},7" -+ JackControl "HDMI/DP,pcm=7 Jack" -+ } -+ } -+ } -+} -diff --git a/ucm2/sof-soundwire/HiFi.conf b/ucm2/sof-soundwire/HiFi.conf -new file mode 100644 -index 0000000..457cf67 ---- /dev/null -+++ b/ucm2/sof-soundwire/HiFi.conf -@@ -0,0 +1,8 @@ -+# Use case Configuration for sof-soundwire card -+ -+ -+ -+ -+ -+ -+ -diff --git a/ucm2/sof-soundwire/RT1308-1.conf b/ucm2/sof-soundwire/RT1308-1.conf -new file mode 100644 -index 0000000..da2eeae ---- /dev/null -+++ b/ucm2/sof-soundwire/RT1308-1.conf -@@ -0,0 +1,23 @@ -+# Use case Configuration for sof-soundwire card -+ -+SectionDevice."Speaker" { -+ Comment "Speaker" -+ -+ EnableSequence [ -+ cset "name='rt1308-1 DAC L Switch' 1" -+ cset "name='rt1308-1 DAC R Switch' 1" -+ cset "name='Speaker Switch' on" -+ ] -+ -+ DisableSequence [ -+ cset "name='rt1308-1 DAC L Switch' 0" -+ cset "name='rt1308-1 DAC R Switch' 0" -+ cset "name='Speaker Switch' off" -+ ] -+ -+ Value { -+ PlaybackPriority 100 -+ PlaybackPCM "hw:${CardId},2" -+ PlaybackChannels "2" -+ } -+} -diff --git a/ucm2/sof-soundwire/RT1308-2.conf b/ucm2/sof-soundwire/RT1308-2.conf -new file mode 100644 -index 0000000..3484b70 ---- /dev/null -+++ b/ucm2/sof-soundwire/RT1308-2.conf -@@ -0,0 +1,30 @@ -+# Use case Configuration for sof-soundwire card -+ -+SectionDevice."Speaker" { -+ Comment "Speaker" -+ -+ EnableSequence [ -+ cset "name='rt1308-1 RX Channel Select' LL" -+ cset "name='rt1308-2 RX Channel Select' RR" -+ -+ cset "name='rt1308-1 DAC L Switch' 1" -+ cset "name='rt1308-1 DAC R Switch' 1" -+ cset "name='rt1308-2 DAC L Switch' 1" -+ cset "name='rt1308-2 DAC R Switch' 1" -+ cset "name='Speaker Switch' on" -+ ] -+ -+ DisableSequence [ -+ cset "name='rt1308-1 DAC L Switch' 0" -+ cset "name='rt1308-1 DAC R Switch' 0" -+ cset "name='rt1308-2 DAC L Switch' 0" -+ cset "name='rt1308-2 DAC R Switch' 0" -+ cset "name='Speaker Switch' off" -+ ] -+ -+ Value { -+ PlaybackPriority 100 -+ PlaybackPCM "hw:${CardId},2" -+ PlaybackChannels "2" -+ } -+} -diff --git a/ucm2/sof-soundwire/RT1308.conf b/ucm2/sof-soundwire/RT1308.conf -new file mode 100644 -index 0000000..f8e36a3 ---- /dev/null -+++ b/ucm2/sof-soundwire/RT1308.conf -@@ -0,0 +1,30 @@ -+# Use case Configuration for sof-soundwire card -+# alsaucm -c sof-soundwire set _verb HiFi set _enadev Speaker -+ -+If.RT1308 { -+ Condition { -+ Type String -+ Haystack "${CardComponents}" -+ Needle "spk:rt1308" -+ } -+ True { -+ -+ If.2ch { -+ Condition { -+ Type String -+ Haystack "${CardComponents}" -+ Needle "cfg-spk:2" -+ } -+ True { -+ -+ -+ -+ } -+ False { -+ -+ -+ -+ } -+ } -+ } -+} -diff --git a/ucm2/sof-soundwire/RT5682.conf b/ucm2/sof-soundwire/RT5682.conf -new file mode 100644 -index 0000000..2a63bf2 ---- /dev/null -+++ b/ucm2/sof-soundwire/RT5682.conf -@@ -0,0 +1,62 @@ -+# Use case Configuration for sof-soundwire card -+ -+If.RT5682 { -+ Condition { -+ Type String -+ Haystack "${CardComponents}" -+ Needle "hs:rt5682" -+ } -+ True { -+ -+ SectionDevice."Headphones" { -+ Comment "Headphones" -+ -+ EnableSequence [ -+ cset "name='Headphone Switch' on" -+ cset "name='rt5682 HPOL Playback Switch' 1" -+ cset "name='rt5682 HPOR Playback Switch' 1" -+ ] -+ -+ DisableSequence [ -+ cset "name='rt5682 HPOL Playback Switch' 0" -+ cset "name='rt5682 HPOR Playback Switch' 0" -+ cset "name='Headphone Switch' off" -+ -+ ] -+ -+ Value { -+ PlaybackPriority 200 -+ PlaybackPCM "hw:${CardId},0" -+ PlaybackChannels "2" -+ JackControl "Headphone Jack" -+ } -+ } -+ -+ SectionDevice."Headset" { -+ Comment "Headset Microphone" -+ -+ EnableSequence [ -+ cset "name='Headset Mic Switch' on" -+ cset "name='rt5682 STO1 ADC Capture Switch' 1" -+ cset "name='rt5682 RECMIX1L CBJ Switch' 1" -+ cset "name='rt5682 Stereo1 ADC MIXL ADC1 Switch' 1" -+ cset "name='rt5682 Stereo1 ADC MIXR ADC1 Switch' 1" -+ ] -+ -+ DisableSequence [ -+ cset "name='rt5682 STO1 ADC Capture Switch' 0" -+ cset "name='rt5682 RECMIX1L CBJ Switch' 0" -+ cset "name='rt5682 Stereo1 ADC MIXL ADC1 Switch' 0" -+ cset "name='rt5682 Stereo1 ADC MIXR ADC1 Switch' 0" -+ cset "name='Headset Mic Switch' off" -+ ] -+ -+ Value { -+ CapturePriority 200 -+ CapturePCM "hw:${CardId},1" -+ CaptureChannels "2" -+ JackControl "Headset Mic Jack" -+ } -+ } -+ } -+} -diff --git a/ucm2/sof-soundwire/RT700.conf b/ucm2/sof-soundwire/RT700.conf -new file mode 100644 -index 0000000..9fe532c ---- /dev/null -+++ b/ucm2/sof-soundwire/RT700.conf -@@ -0,0 +1,75 @@ -+# Use case Configuration for sof-soundwire card -+ -+If.RT700 { -+ Condition { -+ Type String -+ Haystack "${CardComponents}" -+ Needle "hs:rt700" -+ } -+ True { -+ -+ SectionDevice."Headphones" { -+ Comment "Headphones" -+ -+ ConflictingDevice [ -+ "Speaker" -+ ] -+ -+ EnableSequence [ -+ cset "name='Headphones Switch' on" -+ ] -+ -+ DisableSequence [ -+ cset "name='Headphones Switch' off" -+ ] -+ -+ Value { -+ PlaybackPriority 200 -+ PlaybackPCM "hw:${CardId},0" -+ PlaybackChannels "2" -+ JackControl "Headphone Jack" -+ } -+ } -+ -+ SectionDevice."Speaker" { -+ Comment "Speaker" -+ -+ ConflictingDevice [ -+ "Headphones" -+ ] -+ -+ EnableSequence [ -+ cset "name='Speaker Switch' on" -+ ] -+ -+ DisableSequence [ -+ cset "name='Speaker Switch' off" -+ ] -+ -+ Value { -+ PlaybackPriority 100 -+ PlaybackPCM "hw:${CardId},0" -+ PlaybackChannels "2" -+ } -+ } -+ -+ SectionDevice."Headset" { -+ Comment "Headset Microphone" -+ -+ EnableSequence [ -+ cset "name='ADC 09 Capture Switch' 1" -+ ] -+ -+ DisableSequence [ -+ cset "name='ADC 09 Capture Switch' 0" -+ ] -+ -+ Value { -+ CapturePriority 200 -+ CapturePCM "hw:${CardId},1" -+ CaptureChannels "2" -+ JackControl "Headset Mic Jack" -+ } -+ } -+ } -+} -diff --git a/ucm2/sof-soundwire/RT711.conf b/ucm2/sof-soundwire/RT711.conf -new file mode 100644 -index 0000000..11a504a ---- /dev/null -+++ b/ucm2/sof-soundwire/RT711.conf -@@ -0,0 +1,51 @@ -+# Use case Configuration for sof-soundwire card -+ -+If.RT711 { -+ Condition { -+ Type String -+ Haystack "${CardComponents}" -+ Needle "hs:rt711" -+ } -+ True { -+ -+ SectionDevice."Headphones" { -+ Comment "Headphones" -+ -+ EnableSequence [ -+ cset "name='Headphone Switch' on" -+ ] -+ -+ DisableSequence [ -+ cset "name='Headphone Switch' off" -+ ] -+ -+ Value { -+ PlaybackPriority 200 -+ PlaybackPCM "hw:${CardId},0" -+ PlaybackChannels "2" -+ JackControl "Headphone Jack" -+ } -+ } -+ -+ SectionDevice."Headset" { -+ Comment "Headset Microphone" -+ -+ EnableSequence [ -+ cset "name='PGA2.0 2 Master Capture Switch' 1" -+ ] -+ -+ DisableSequence [ -+ cset "name='PGA2.0 2 Master Capture Switch' 0" -+ ] -+ -+ Value { -+ CapturePriority 200 -+ CapturePCM "hw:${CardId},1" -+ CaptureChannels "2" -+ JackControl "Headset Mic Jack" -+ CaptureSwitch "PGA2.0 2 Master Capture Switch" -+ CaptureVolume "PGA2.0 2 Master Capture Volume" -+ } -+ } -+ } -+} -diff --git a/ucm2/sof-soundwire/RT715.conf b/ucm2/sof-soundwire/RT715.conf -new file mode 100644 -index 0000000..2b8d89d ---- /dev/null -+++ b/ucm2/sof-soundwire/RT715.conf -@@ -0,0 +1,31 @@ -+# Use case Configuration for sof-soundwire card -+ -+If.RT715 { -+ Condition { -+ Type String -+ Haystack "${CardComponents}" -+ Needle "mic:rt715" -+ } -+ True { -+ -+ SectionDevice."Mic" { -+ Comment "SoundWire microphones" -+ -+ EnableSequence [ -+ cset "name='PGA5.0 5 Master Capture Switch' 1" -+ ] -+ -+ DisableSequence [ -+ cset "name='PGA5.0 5 Master Capture Switch' 0" -+ ] -+ -+ Value { -+ CapturePriority 100 -+ CapturePCM "hw:${CardId},4" -+ CaptureChannels "2" -+ CaptureSwitch "PGA5.0 5 Master Capture Switch" -+ CaptureVolume "PGA5.0 5 Master Capture Volume" -+ } -+ } -+ } -+} -diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf -new file mode 100644 -index 0000000..565f2b5 ---- /dev/null -+++ b/ucm2/sof-soundwire/sof-soundwire.conf -@@ -0,0 +1,11 @@ -+Syntax 2 -+ -+SectionUseCase."HiFi" { -+ File "HiFi.conf" -+ Comment "Play HiFi quality Music" -+} -+ -+ -+ -+ -+ --- -2.17.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0009-sof-soundwire-cleanups-recommended-by-the-ucm-valida.patch alsa-ucm-conf-1.2.6.3/debian/patches/0009-sof-soundwire-cleanups-recommended-by-the-ucm-valida.patch --- alsa-ucm-conf-1.2.2/debian/patches/0009-sof-soundwire-cleanups-recommended-by-the-ucm-valida.patch 2020-08-10 07:05:02.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0009-sof-soundwire-cleanups-recommended-by-the-ucm-valida.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,131 +0,0 @@ -From 0a5c528a4b1f10b2264130267eeb2c05ae1202f3 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Wed, 24 Jun 2020 11:15:42 +0200 -Subject: [PATCH 09/14] sof-soundwire: cleanups recommended by the - ucm-validator - -Signed-off-by: Jaroslav Kysela -(cherry picked from commit 1072c6d68e69ac432b411557237effa2dcc869cc) -Signed-off-by: Hui Wang ---- - ucm2/sof-soundwire/RT1308-1.conf | 1 - - ucm2/sof-soundwire/RT1308-2.conf | 1 - - ucm2/sof-soundwire/RT5682.conf | 4 +--- - ucm2/sof-soundwire/RT700.conf | 7 ++----- - ucm2/sof-soundwire/RT711.conf | 4 +--- - ucm2/sof-soundwire/RT715.conf | 1 - - 6 files changed, 4 insertions(+), 14 deletions(-) - -diff --git a/ucm2/sof-soundwire/RT1308-1.conf b/ucm2/sof-soundwire/RT1308-1.conf -index da2eeae..6da5b7e 100644 ---- a/ucm2/sof-soundwire/RT1308-1.conf -+++ b/ucm2/sof-soundwire/RT1308-1.conf -@@ -18,6 +18,5 @@ SectionDevice."Speaker" { - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId},2" -- PlaybackChannels "2" - } - } -diff --git a/ucm2/sof-soundwire/RT1308-2.conf b/ucm2/sof-soundwire/RT1308-2.conf -index 3484b70..f88cb81 100644 ---- a/ucm2/sof-soundwire/RT1308-2.conf -+++ b/ucm2/sof-soundwire/RT1308-2.conf -@@ -25,6 +25,5 @@ SectionDevice."Speaker" { - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId},2" -- PlaybackChannels "2" - } - } -diff --git a/ucm2/sof-soundwire/RT5682.conf b/ucm2/sof-soundwire/RT5682.conf -index 2a63bf2..95a251d 100644 ---- a/ucm2/sof-soundwire/RT5682.conf -+++ b/ucm2/sof-soundwire/RT5682.conf -@@ -26,8 +26,7 @@ If.RT5682 { - - Value { - PlaybackPriority 200 -- PlaybackPCM "hw:${CardId},0" -- PlaybackChannels "2" -+ PlaybackPCM "hw:${CardId}" - JackControl "Headphone Jack" - } - } -@@ -54,7 +53,6 @@ If.RT5682 { - Value { - CapturePriority 200 - CapturePCM "hw:${CardId},1" -- CaptureChannels "2" - JackControl "Headset Mic Jack" - } - } -diff --git a/ucm2/sof-soundwire/RT700.conf b/ucm2/sof-soundwire/RT700.conf -index 9fe532c..d2df463 100644 ---- a/ucm2/sof-soundwire/RT700.conf -+++ b/ucm2/sof-soundwire/RT700.conf -@@ -25,8 +25,7 @@ If.RT700 { - - Value { - PlaybackPriority 200 -- PlaybackPCM "hw:${CardId},0" -- PlaybackChannels "2" -+ PlaybackPCM "hw:${CardId}" - JackControl "Headphone Jack" - } - } -@@ -48,8 +47,7 @@ If.RT700 { - - Value { - PlaybackPriority 100 -- PlaybackPCM "hw:${CardId},0" -- PlaybackChannels "2" -+ PlaybackPCM "hw:${CardId}" - } - } - -@@ -67,7 +65,6 @@ If.RT700 { - Value { - CapturePriority 200 - CapturePCM "hw:${CardId},1" -- CaptureChannels "2" - JackControl "Headset Mic Jack" - } - } -diff --git a/ucm2/sof-soundwire/RT711.conf b/ucm2/sof-soundwire/RT711.conf -index 11a504a..12b48ed 100644 ---- a/ucm2/sof-soundwire/RT711.conf -+++ b/ucm2/sof-soundwire/RT711.conf -@@ -21,8 +21,7 @@ If.RT711 { - - Value { - PlaybackPriority 200 -- PlaybackPCM "hw:${CardId},0" -- PlaybackChannels "2" -+ PlaybackPCM "hw:${CardId}" - JackControl "Headphone Jack" - } - } -@@ -41,7 +40,6 @@ If.RT711 { - Value { - CapturePriority 200 - CapturePCM "hw:${CardId},1" -- CaptureChannels "2" - JackControl "Headset Mic Jack" - CaptureSwitch "PGA2.0 2 Master Capture Switch" - CaptureVolume "PGA2.0 2 Master Capture Volume" -diff --git a/ucm2/sof-soundwire/RT715.conf b/ucm2/sof-soundwire/RT715.conf -index 2b8d89d..d1734ad 100644 ---- a/ucm2/sof-soundwire/RT715.conf -+++ b/ucm2/sof-soundwire/RT715.conf -@@ -22,7 +22,6 @@ If.RT715 { - Value { - CapturePriority 100 - CapturePCM "hw:${CardId},4" -- CaptureChannels "2" - CaptureSwitch "PGA5.0 5 Master Capture Switch" - CaptureVolume "PGA5.0 5 Master Capture Volume" - } --- -2.17.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0010-sof-soundwire-rewrite-for-syntax-3.patch alsa-ucm-conf-1.2.6.3/debian/patches/0010-sof-soundwire-rewrite-for-syntax-3.patch --- alsa-ucm-conf-1.2.2/debian/patches/0010-sof-soundwire-rewrite-for-syntax-3.patch 2020-08-10 07:05:02.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0010-sof-soundwire-rewrite-for-syntax-3.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,760 +0,0 @@ -From 465691121617531c8b296a01b03e3812bc0ded87 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Wed, 24 Jun 2020 12:24:45 +0200 -Subject: [PATCH 10/14] sof-soundwire: rewrite for 'syntax 3' - -The codec/ sequences must not have the platform specific checks. - -Signed-off-by: Jaroslav Kysela -(cherry picked from commit 4734c44b38cd36588c774a4f52aa899ae5ad7fc4) -Signed-off-by: Hui Wang ---- - ucm2/codecs/rt5682/init.conf | 38 ++++------ - ucm2/codecs/rt700/init.conf | 24 +++---- - ucm2/codecs/rt711/init.conf | 24 +++---- - ucm2/codecs/rt715/init.conf | 25 +++---- - ucm2/sof-soundwire/HiFi.conf | 33 +++++++-- - ucm2/sof-soundwire/RT1308.conf | 30 -------- - ucm2/sof-soundwire/RT5682.conf | 60 ---------------- - ucm2/sof-soundwire/RT700.conf | 72 ------------------- - ucm2/sof-soundwire/RT711.conf | 49 ------------- - ucm2/sof-soundwire/RT715.conf | 30 -------- - .../{RT1308-1.conf => rt1308-2.conf} | 0 - .../{RT1308-2.conf => rt1308-4.conf} | 0 - ucm2/sof-soundwire/rt5682.conf | 50 +++++++++++++ - ucm2/sof-soundwire/rt700.conf | 62 ++++++++++++++++ - ucm2/sof-soundwire/rt711.conf | 39 ++++++++++ - ucm2/sof-soundwire/rt715.conf | 20 ++++++ - ucm2/sof-soundwire/sof-soundwire.conf | 54 ++++++++++++-- - 17 files changed, 287 insertions(+), 323 deletions(-) - delete mode 100644 ucm2/sof-soundwire/RT1308.conf - delete mode 100644 ucm2/sof-soundwire/RT5682.conf - delete mode 100644 ucm2/sof-soundwire/RT700.conf - delete mode 100644 ucm2/sof-soundwire/RT711.conf - delete mode 100644 ucm2/sof-soundwire/RT715.conf - rename ucm2/sof-soundwire/{RT1308-1.conf => rt1308-2.conf} (100%) - rename ucm2/sof-soundwire/{RT1308-2.conf => rt1308-4.conf} (100%) - create mode 100644 ucm2/sof-soundwire/rt5682.conf - create mode 100644 ucm2/sof-soundwire/rt700.conf - create mode 100644 ucm2/sof-soundwire/rt711.conf - create mode 100644 ucm2/sof-soundwire/rt715.conf - -diff --git a/ucm2/codecs/rt5682/init.conf b/ucm2/codecs/rt5682/init.conf -index d819feb..11ce9db 100644 ---- a/ucm2/codecs/rt5682/init.conf -+++ b/ucm2/codecs/rt5682/init.conf -@@ -1,24 +1,16 @@ - # RT5682 specific volume control settings --If.RT5682init { -- Condition { -- Type String -- Haystack "${CardComponents}" -- Needle "hs:rt5682" -- } -- True { -- BootSequence [ -- cset "name='rt5682 Stereo1 DAC MIXL DAC L1 Switch' 1" -- cset "name='rt5682 Stereo1 DAC MIXR DAC R1 Switch' 1" -- cset "name='rt5682 DAC L Mux' 1" -- cset "name='rt5682 DAC R Mux' 1" -- cset "name='rt5682 IF1 01 ADC Swap Mux' 2" -- cset "name='rt5682 CBJ Boost Volume' 3" -- cset "name='rt5682 Stereo1 ADC L Mux' 0" -- cset "name='rt5682 Stereo1 ADC R Mux' 0" -- cset "name='rt5682 Stereo1 ADC L1 Mux' 1" -- cset "name='rt5682 Stereo1 ADC R1 Mux' 1" -- cset "name='rt5682 Stereo1 ADC MIXL ADC2 Switch' 0" -- cset "name='rt5682 Stereo1 ADC MIXR ADC2 Switch' 0" -- ] -- } --} -+ -+BootSequence [ -+ cset "name='rt5682 Stereo1 DAC MIXL DAC L1 Switch' 1" -+ cset "name='rt5682 Stereo1 DAC MIXR DAC R1 Switch' 1" -+ cset "name='rt5682 DAC L Mux' 1" -+ cset "name='rt5682 DAC R Mux' 1" -+ cset "name='rt5682 IF1 01 ADC Swap Mux' 2" -+ cset "name='rt5682 CBJ Boost Volume' 3" -+ cset "name='rt5682 Stereo1 ADC L Mux' 0" -+ cset "name='rt5682 Stereo1 ADC R Mux' 0" -+ cset "name='rt5682 Stereo1 ADC L1 Mux' 1" -+ cset "name='rt5682 Stereo1 ADC R1 Mux' 1" -+ cset "name='rt5682 Stereo1 ADC MIXL ADC2 Switch' 0" -+ cset "name='rt5682 Stereo1 ADC MIXR ADC2 Switch' 0" -+] -diff --git a/ucm2/codecs/rt700/init.conf b/ucm2/codecs/rt700/init.conf -index c5be34f..406e2cb 100644 ---- a/ucm2/codecs/rt700/init.conf -+++ b/ucm2/codecs/rt700/init.conf -@@ -1,17 +1,9 @@ - # RT700 specific volume control settings --If.rt700init { -- Condition { -- Type String -- Haystack "${CardComponents}" -- Needle "hs:rt700" -- } -- True { -- BootSequence [ -- cset "name='DAC Front Playback Volume' 87" -- cset "name='HPO Mux' 'Front'" -- cset "name='ADC 09 Capture Volume' 63" -- cset "name='ADC 22 Mux' 'MIC2'" -- cset "name='AMIC Volume' 1" -- ] -- } --} -+ -+BootSequence [ -+ cset "name='DAC Front Playback Volume' 87" -+ cset "name='HPO Mux' 'Front'" -+ cset "name='ADC 09 Capture Volume' 63" -+ cset "name='ADC 22 Mux' 'MIC2'" -+ cset "name='AMIC Volume' 1" -+] -diff --git a/ucm2/codecs/rt711/init.conf b/ucm2/codecs/rt711/init.conf -index c2b8629..f3cea28 100644 ---- a/ucm2/codecs/rt711/init.conf -+++ b/ucm2/codecs/rt711/init.conf -@@ -1,17 +1,9 @@ - # RT711 specific volume control settings --If.rt711init { -- Condition { -- Type String -- Haystack "${CardComponents}" -- Needle "hs:rt711" -- } -- True { -- BootSequence [ -- cset "name='rt711 DAC Surr Playback Volume' 87" -- cset "name='rt711 ADC 08 Capture Volume' 63" -- cset "name='rt711 ADC 23 Mux' 'MIC2'" -- cset "name='rt711 ADC 08 Capture Switch' 1" -- cset "name='rt711 AMIC Volume' 1" -- ] -- } --} -+ -+BootSequence [ -+ cset "name='rt711 DAC Surr Playback Volume' 87" -+ cset "name='rt711 ADC 08 Capture Volume' 63" -+ cset "name='rt711 ADC 23 Mux' 'MIC2'" -+ cset "name='rt711 ADC 08 Capture Switch' 1" -+ cset "name='rt711 AMIC Volume' 1" -+] -diff --git a/ucm2/codecs/rt715/init.conf b/ucm2/codecs/rt715/init.conf -index 745f471..6e07b2d 100644 ---- a/ucm2/codecs/rt715/init.conf -+++ b/ucm2/codecs/rt715/init.conf -@@ -1,19 +1,10 @@ - # RT715 specific volume control settings --If.RT715init { -- Condition { -- Type String -- Haystack "${CardComponents}" -- Needle "mic:rt715" -- } -- True { -- BootSequence [ -- cset "name='rt715 DMIC3 Boost' 2" -- cset "name='rt715 DMIC4 Boost' 2" -- cset "name='rt715 ADC 24 Mux' 3" -- cset "name='rt715 ADC 25 Mux' 4" -- cset "name='rt715 ADC 27 Capture Switch' 1" -- cset "name='rt715 ADC 07 Capture Switch' 1" - -- ] -- } --} -+BootSequence [ -+ cset "name='rt715 DMIC3 Boost' 2" -+ cset "name='rt715 DMIC4 Boost' 2" -+ cset "name='rt715 ADC 24 Mux' 3" -+ cset "name='rt715 ADC 25 Mux' 4" -+ cset "name='rt715 ADC 27 Capture Switch' 1" -+ cset "name='rt715 ADC 07 Capture Switch' 1" -+] -diff --git a/ucm2/sof-soundwire/HiFi.conf b/ucm2/sof-soundwire/HiFi.conf -index 457cf67..f2240e8 100644 ---- a/ucm2/sof-soundwire/HiFi.conf -+++ b/ucm2/sof-soundwire/HiFi.conf -@@ -1,8 +1,31 @@ - # Use case Configuration for sof-soundwire card - -- -- -- -- -- -+SectionVerb { -+ Value.TQ "HiFi" -+} -+ -+If.spkdev { -+ Condition { -+ Type String -+ Empty "${var:SpeakerCodec1}" -+ } -+ False.Include.spkdev.File "/sof-soundwire/${var:SpeakerCodec1}-${var:SpeakerChannels1}.conf" -+} -+ -+If.micdev { -+ Condition { -+ Type String -+ Empty "${var:MicCodec1}" -+ } -+ False.Include.micdev.File "/sof-soundwire/${var:MicCodec1}.conf" -+} -+ -+If.hsdev { -+ Condition { -+ Type String -+ Empty "${var:HeadsetCodec1}" -+ } -+ False.Include.hsdev.File "/sof-soundwire/${var:HeadsetCodec1}.conf" -+} -+ - -diff --git a/ucm2/sof-soundwire/RT1308.conf b/ucm2/sof-soundwire/RT1308.conf -deleted file mode 100644 -index f8e36a3..0000000 ---- a/ucm2/sof-soundwire/RT1308.conf -+++ /dev/null -@@ -1,30 +0,0 @@ --# Use case Configuration for sof-soundwire card --# alsaucm -c sof-soundwire set _verb HiFi set _enadev Speaker -- --If.RT1308 { -- Condition { -- Type String -- Haystack "${CardComponents}" -- Needle "spk:rt1308" -- } -- True { -- -- If.2ch { -- Condition { -- Type String -- Haystack "${CardComponents}" -- Needle "cfg-spk:2" -- } -- True { -- -- -- -- } -- False { -- -- -- -- } -- } -- } --} -diff --git a/ucm2/sof-soundwire/RT5682.conf b/ucm2/sof-soundwire/RT5682.conf -deleted file mode 100644 -index 95a251d..0000000 ---- a/ucm2/sof-soundwire/RT5682.conf -+++ /dev/null -@@ -1,60 +0,0 @@ --# Use case Configuration for sof-soundwire card -- --If.RT5682 { -- Condition { -- Type String -- Haystack "${CardComponents}" -- Needle "hs:rt5682" -- } -- True { -- -- SectionDevice."Headphones" { -- Comment "Headphones" -- -- EnableSequence [ -- cset "name='Headphone Switch' on" -- cset "name='rt5682 HPOL Playback Switch' 1" -- cset "name='rt5682 HPOR Playback Switch' 1" -- ] -- -- DisableSequence [ -- cset "name='rt5682 HPOL Playback Switch' 0" -- cset "name='rt5682 HPOR Playback Switch' 0" -- cset "name='Headphone Switch' off" -- -- ] -- -- Value { -- PlaybackPriority 200 -- PlaybackPCM "hw:${CardId}" -- JackControl "Headphone Jack" -- } -- } -- -- SectionDevice."Headset" { -- Comment "Headset Microphone" -- -- EnableSequence [ -- cset "name='Headset Mic Switch' on" -- cset "name='rt5682 STO1 ADC Capture Switch' 1" -- cset "name='rt5682 RECMIX1L CBJ Switch' 1" -- cset "name='rt5682 Stereo1 ADC MIXL ADC1 Switch' 1" -- cset "name='rt5682 Stereo1 ADC MIXR ADC1 Switch' 1" -- ] -- -- DisableSequence [ -- cset "name='rt5682 STO1 ADC Capture Switch' 0" -- cset "name='rt5682 RECMIX1L CBJ Switch' 0" -- cset "name='rt5682 Stereo1 ADC MIXL ADC1 Switch' 0" -- cset "name='rt5682 Stereo1 ADC MIXR ADC1 Switch' 0" -- cset "name='Headset Mic Switch' off" -- ] -- -- Value { -- CapturePriority 200 -- CapturePCM "hw:${CardId},1" -- JackControl "Headset Mic Jack" -- } -- } -- } --} -diff --git a/ucm2/sof-soundwire/RT700.conf b/ucm2/sof-soundwire/RT700.conf -deleted file mode 100644 -index d2df463..0000000 ---- a/ucm2/sof-soundwire/RT700.conf -+++ /dev/null -@@ -1,72 +0,0 @@ --# Use case Configuration for sof-soundwire card -- --If.RT700 { -- Condition { -- Type String -- Haystack "${CardComponents}" -- Needle "hs:rt700" -- } -- True { -- -- SectionDevice."Headphones" { -- Comment "Headphones" -- -- ConflictingDevice [ -- "Speaker" -- ] -- -- EnableSequence [ -- cset "name='Headphones Switch' on" -- ] -- -- DisableSequence [ -- cset "name='Headphones Switch' off" -- ] -- -- Value { -- PlaybackPriority 200 -- PlaybackPCM "hw:${CardId}" -- JackControl "Headphone Jack" -- } -- } -- -- SectionDevice."Speaker" { -- Comment "Speaker" -- -- ConflictingDevice [ -- "Headphones" -- ] -- -- EnableSequence [ -- cset "name='Speaker Switch' on" -- ] -- -- DisableSequence [ -- cset "name='Speaker Switch' off" -- ] -- -- Value { -- PlaybackPriority 100 -- PlaybackPCM "hw:${CardId}" -- } -- } -- -- SectionDevice."Headset" { -- Comment "Headset Microphone" -- -- EnableSequence [ -- cset "name='ADC 09 Capture Switch' 1" -- ] -- -- DisableSequence [ -- cset "name='ADC 09 Capture Switch' 0" -- ] -- -- Value { -- CapturePriority 200 -- CapturePCM "hw:${CardId},1" -- JackControl "Headset Mic Jack" -- } -- } -- } --} -diff --git a/ucm2/sof-soundwire/RT711.conf b/ucm2/sof-soundwire/RT711.conf -deleted file mode 100644 -index 12b48ed..0000000 ---- a/ucm2/sof-soundwire/RT711.conf -+++ /dev/null -@@ -1,49 +0,0 @@ --# Use case Configuration for sof-soundwire card -- --If.RT711 { -- Condition { -- Type String -- Haystack "${CardComponents}" -- Needle "hs:rt711" -- } -- True { -- -- SectionDevice."Headphones" { -- Comment "Headphones" -- -- EnableSequence [ -- cset "name='Headphone Switch' on" -- ] -- -- DisableSequence [ -- cset "name='Headphone Switch' off" -- ] -- -- Value { -- PlaybackPriority 200 -- PlaybackPCM "hw:${CardId}" -- JackControl "Headphone Jack" -- } -- } -- -- SectionDevice."Headset" { -- Comment "Headset Microphone" -- -- EnableSequence [ -- cset "name='PGA2.0 2 Master Capture Switch' 1" -- ] -- -- DisableSequence [ -- cset "name='PGA2.0 2 Master Capture Switch' 0" -- ] -- -- Value { -- CapturePriority 200 -- CapturePCM "hw:${CardId},1" -- JackControl "Headset Mic Jack" -- CaptureSwitch "PGA2.0 2 Master Capture Switch" -- CaptureVolume "PGA2.0 2 Master Capture Volume" -- } -- } -- } --} -diff --git a/ucm2/sof-soundwire/RT715.conf b/ucm2/sof-soundwire/RT715.conf -deleted file mode 100644 -index d1734ad..0000000 ---- a/ucm2/sof-soundwire/RT715.conf -+++ /dev/null -@@ -1,30 +0,0 @@ --# Use case Configuration for sof-soundwire card -- --If.RT715 { -- Condition { -- Type String -- Haystack "${CardComponents}" -- Needle "mic:rt715" -- } -- True { -- -- SectionDevice."Mic" { -- Comment "SoundWire microphones" -- -- EnableSequence [ -- cset "name='PGA5.0 5 Master Capture Switch' 1" -- ] -- -- DisableSequence [ -- cset "name='PGA5.0 5 Master Capture Switch' 0" -- ] -- -- Value { -- CapturePriority 100 -- CapturePCM "hw:${CardId},4" -- CaptureSwitch "PGA5.0 5 Master Capture Switch" -- CaptureVolume "PGA5.0 5 Master Capture Volume" -- } -- } -- } --} -diff --git a/ucm2/sof-soundwire/RT1308-1.conf b/ucm2/sof-soundwire/rt1308-2.conf -similarity index 100% -rename from ucm2/sof-soundwire/RT1308-1.conf -rename to ucm2/sof-soundwire/rt1308-2.conf -diff --git a/ucm2/sof-soundwire/RT1308-2.conf b/ucm2/sof-soundwire/rt1308-4.conf -similarity index 100% -rename from ucm2/sof-soundwire/RT1308-2.conf -rename to ucm2/sof-soundwire/rt1308-4.conf -diff --git a/ucm2/sof-soundwire/rt5682.conf b/ucm2/sof-soundwire/rt5682.conf -new file mode 100644 -index 0000000..092ac9c ---- /dev/null -+++ b/ucm2/sof-soundwire/rt5682.conf -@@ -0,0 +1,50 @@ -+# Use case Configuration for sof-soundwire card -+ -+SectionDevice."Headphones" { -+ Comment "Headphones" -+ -+ EnableSequence [ -+ cset "name='Headphone Switch' on" -+ cset "name='rt5682 HPOL Playback Switch' 1" -+ cset "name='rt5682 HPOR Playback Switch' 1" -+ ] -+ -+ DisableSequence [ -+ cset "name='rt5682 HPOL Playback Switch' 0" -+ cset "name='rt5682 HPOR Playback Switch' 0" -+ cset "name='Headphone Switch' off" -+ -+ ] -+ -+ Value { -+ PlaybackPriority 200 -+ PlaybackPCM "hw:${CardId}" -+ JackControl "Headphone Jack" -+ } -+} -+ -+SectionDevice."Headset" { -+ Comment "Headset Microphone" -+ -+ EnableSequence [ -+ cset "name='Headset Mic Switch' on" -+ cset "name='rt5682 STO1 ADC Capture Switch' 1" -+ cset "name='rt5682 RECMIX1L CBJ Switch' 1" -+ cset "name='rt5682 Stereo1 ADC MIXL ADC1 Switch' 1" -+ cset "name='rt5682 Stereo1 ADC MIXR ADC1 Switch' 1" -+ ] -+ -+ DisableSequence [ -+ cset "name='rt5682 STO1 ADC Capture Switch' 0" -+ cset "name='rt5682 RECMIX1L CBJ Switch' 0" -+ cset "name='rt5682 Stereo1 ADC MIXL ADC1 Switch' 0" -+ cset "name='rt5682 Stereo1 ADC MIXR ADC1 Switch' 0" -+ cset "name='Headset Mic Switch' off" -+ ] -+ -+ Value { -+ CapturePriority 200 -+ CapturePCM "hw:${CardId},1" -+ JackControl "Headset Mic Jack" -+ } -+} -diff --git a/ucm2/sof-soundwire/rt700.conf b/ucm2/sof-soundwire/rt700.conf -new file mode 100644 -index 0000000..ab647f7 ---- /dev/null -+++ b/ucm2/sof-soundwire/rt700.conf -@@ -0,0 +1,62 @@ -+# Use case Configuration for sof-soundwire card -+ -+SectionDevice."Headphones" { -+ Comment "Headphones" -+ -+ ConflictingDevice [ -+ "Speaker" -+ ] -+ -+ EnableSequence [ -+ cset "name='Headphones Switch' on" -+ ] -+ -+ DisableSequence [ -+ cset "name='Headphones Switch' off" -+ ] -+ -+ Value { -+ PlaybackPriority 200 -+ PlaybackPCM "hw:${CardId}" -+ JackControl "Headphone Jack" -+ } -+} -+ -+SectionDevice."Speaker" { -+ Comment "Speaker" -+ -+ ConflictingDevice [ -+ "Headphones" -+ ] -+ -+ EnableSequence [ -+ cset "name='Speaker Switch' on" -+ ] -+ -+ DisableSequence [ -+ cset "name='Speaker Switch' off" -+ ] -+ -+ Value { -+ PlaybackPriority 100 -+ PlaybackPCM "hw:${CardId}" -+ } -+} -+ -+SectionDevice."Headset" { -+ Comment "Headset Microphone" -+ -+ EnableSequence [ -+ cset "name='ADC 09 Capture Switch' 1" -+ ] -+ -+ DisableSequence [ -+ cset "name='ADC 09 Capture Switch' 0" -+ ] -+ -+ Value { -+ CapturePriority 200 -+ CapturePCM "hw:${CardId},1" -+ JackControl "Headset Mic Jack" -+ } -+} -diff --git a/ucm2/sof-soundwire/rt711.conf b/ucm2/sof-soundwire/rt711.conf -new file mode 100644 -index 0000000..5300cf9 ---- /dev/null -+++ b/ucm2/sof-soundwire/rt711.conf -@@ -0,0 +1,39 @@ -+# Use case Configuration for sof-soundwire card -+ -+SectionDevice."Headphones" { -+ Comment "Headphones" -+ -+ EnableSequence [ -+ cset "name='Headphone Switch' on" -+ ] -+ -+ DisableSequence [ -+ cset "name='Headphone Switch' off" -+ ] -+ -+ Value { -+ PlaybackPriority 200 -+ PlaybackPCM "hw:${CardId}" -+ JackControl "Headphone Jack" -+ } -+} -+ -+SectionDevice."Headset" { -+ Comment "Headset Microphone" -+ -+ EnableSequence [ -+ cset "name='PGA2.0 2 Master Capture Switch' 1" -+ ] -+ -+ DisableSequence [ -+ cset "name='PGA2.0 2 Master Capture Switch' 0" -+ ] -+ -+ Value { -+ CapturePriority 200 -+ CapturePCM "hw:${CardId},1" -+ JackControl "Headset Mic Jack" -+ CaptureSwitch "PGA2.0 2 Master Capture Switch" -+ CaptureVolume "PGA2.0 2 Master Capture Volume" -+ } -+} -diff --git a/ucm2/sof-soundwire/rt715.conf b/ucm2/sof-soundwire/rt715.conf -new file mode 100644 -index 0000000..7b8ca59 ---- /dev/null -+++ b/ucm2/sof-soundwire/rt715.conf -@@ -0,0 +1,20 @@ -+# Use case Configuration for sof-soundwire card -+ -+SectionDevice."Mic" { -+ Comment "SoundWire microphones" -+ -+ EnableSequence [ -+ cset "name='PGA5.0 5 Master Capture Switch' 1" -+ ] -+ -+ DisableSequence [ -+ cset "name='PGA5.0 5 Master Capture Switch' 0" -+ ] -+ -+ Value { -+ CapturePriority 100 -+ CapturePCM "hw:${CardId},4" -+ CaptureSwitch "PGA5.0 5 Master Capture Switch" -+ CaptureVolume "PGA5.0 5 Master Capture Volume" -+ } -+} -diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf -index 565f2b5..fe43d5f 100644 ---- a/ucm2/sof-soundwire/sof-soundwire.conf -+++ b/ucm2/sof-soundwire/sof-soundwire.conf -@@ -1,11 +1,55 @@ --Syntax 2 -+Syntax 3 - - SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Play HiFi quality Music" - } - -- -- -- -- -+Define { -+ SpeakerCodec1 "" -+ SpeakerChannels1 "2" -+ SpeakerAmps1 "0" -+ HeadsetCodec1 "" -+ MicCodec1 "" -+} -+ -+DefineRegex { -+ SpeakerCodec { -+ Regex " spk:([a-z0-9]+)" -+ String "${CardComponents}" -+ } -+ SpeakerChannels { -+ Regex " cfg-spk:([0-9]+)" -+ String "${CardComponents}" -+ } -+ SpeakerAmps { -+ Regex " cfg-amp:([0-9]+)" -+ String "${CardComponents}" -+ } -+ HeadsetCodec { -+ Regex " hs:([a-z0-9]+)" -+ String "${CardComponents}" -+ } -+ MicCodec { -+ Regex " mic:([a-z0-9]+)" -+ String "${CardComponents}" -+ } -+} -+ -+If.hs_init { -+ Condition { -+ Type Regex -+ Regex "(rt5682|rt700|rt711)" -+ String "${var:HeadsetCodec1}" -+ } -+ True.Include.hs_init.File "/codecs/${var:HeadsetCodec1}/init.conf" -+} -+ -+If.mic_init { -+ Condition { -+ Type Regex -+ Regex "(rt715)" -+ String "${var:MicCodec1}" -+ } -+ True.Include.mic_init.File "/codecs/${var:MicCodec1}/init.conf" -+} --- -2.17.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0011-HDA-Intel-add-support-for-AMD-acp-microphone-devices.patch alsa-ucm-conf-1.2.6.3/debian/patches/0011-HDA-Intel-add-support-for-AMD-acp-microphone-devices.patch --- alsa-ucm-conf-1.2.2/debian/patches/0011-HDA-Intel-add-support-for-AMD-acp-microphone-devices.patch 2020-08-10 07:05:02.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0011-HDA-Intel-add-support-for-AMD-acp-microphone-devices.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,408 +0,0 @@ -From 0574339829f36e302f4bc05d49830fa73ae2c4f5 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Thu, 23 Jul 2020 12:43:48 +0800 -Subject: [PATCH 11/14] HDA-Intel: add support for AMD acp microphone devices - -- move the generic HDA code from sof-hda-dsp to HDA-Intel -- add generic codecs/hda/hdmi.conf - -Signed-off-by: Jaroslav Kysela -(backported from commit dcef48f13d4f5db79b006755074940b94730a883) -Signed-off-by: Hui Wang ---- - ucm2/HDA-Intel/HDA-Capture-value.conf | 4 + - ucm2/HDA-Intel/HDA-Intel.conf | 28 ++++++ - ucm2/HDA-Intel/Hdmi.conf | 37 +++++++ - ucm2/HDA-Intel/HiFi-acp.conf | 8 ++ - ucm2/HDA-Intel/HiFi-analog.conf | 133 ++++++++++++++++++++++++++ - ucm2/HDA-Intel/HiFi.conf | 32 +++++++ - ucm2/HDA-Intel/init.conf | 39 ++++++++ - ucm2/codecs/hda/hdmi.conf | 25 +++++ - ucm2/module/lib/linked.conf | 3 + - ucm2/module/snd_acp3x_rn.conf | 1 + - 10 files changed, 310 insertions(+) - create mode 100644 ucm2/HDA-Intel/HDA-Capture-value.conf - create mode 100644 ucm2/HDA-Intel/HDA-Intel.conf - create mode 100644 ucm2/HDA-Intel/Hdmi.conf - create mode 100644 ucm2/HDA-Intel/HiFi-acp.conf - create mode 100644 ucm2/HDA-Intel/HiFi-analog.conf - create mode 100644 ucm2/HDA-Intel/HiFi.conf - create mode 100644 ucm2/HDA-Intel/init.conf - create mode 100644 ucm2/codecs/hda/hdmi.conf - create mode 100644 ucm2/module/lib/linked.conf - create mode 120000 ucm2/module/snd_acp3x_rn.conf - -diff --git a/ucm2/HDA-Intel/HDA-Capture-value.conf b/ucm2/HDA-Intel/HDA-Capture-value.conf -new file mode 100644 -index 0000000..2f1316a ---- /dev/null -+++ b/ucm2/HDA-Intel/HDA-Capture-value.conf -@@ -0,0 +1,4 @@ -+CapturePCM "hw:${CardId}" -+CaptureMixerElem "Capture" -+CaptureVolume "Capture Volume" -+CaptureSwitch "Capture Switch" -diff --git a/ucm2/HDA-Intel/HDA-Intel.conf b/ucm2/HDA-Intel/HDA-Intel.conf -new file mode 100644 -index 0000000..109eea6 ---- /dev/null -+++ b/ucm2/HDA-Intel/HDA-Intel.conf -@@ -0,0 +1,28 @@ -+Syntax 3 -+ -+Define.Use "" # a non-empty string to use UCM configuration for HDA devices -+ -+Define.AcpCardId "$${CardIdByName:acp}" -+ -+If.acp { -+ Condition { -+ Type String -+ Empty "${var:AcpCardId}" -+ } -+ False.Define.Use y -+} -+ -+If.use { -+ Condition { -+ Type String -+ Empty "${var:Use}" -+ } -+ False { -+ SectionUseCase."HiFi" { -+ File "HiFi.conf" -+ Comment "Play HiFi quality Music" -+ } -+ -+ Include.init.File "/HDA-Intel/init.conf" -+ } -+} -diff --git a/ucm2/HDA-Intel/Hdmi.conf b/ucm2/HDA-Intel/Hdmi.conf -new file mode 100644 -index 0000000..8b1843b ---- /dev/null -+++ b/ucm2/HDA-Intel/Hdmi.conf -@@ -0,0 +1,37 @@ -+# Use case Configuration for sof-hda-dsp -+ -+If.hdmi1 { -+ Condition { Type String Empty "" } -+ True { -+ Define { -+ HdmiNum 1 -+ HdmiPCM 3 -+ HdmiPrio 500 -+ } -+ Include.hdmi1.File "/codecs/hda/hdmi.conf" -+ } -+} -+ -+If.hdmi2 { -+ Condition { Type String Empty "" } -+ True { -+ Define { -+ HdmiNum 2 -+ HdmiPCM 7 -+ HdmiPrio 600 -+ } -+ Include.hdmi2.File "/codecs/hda/hdmi.conf" -+ } -+} -+ -+If.hdmi3 { -+ Condition { Type String Empty "" } -+ True { -+ Define { -+ HdmiNum 3 -+ HdmiPCM 8 -+ HdmiPrio 700 -+ } -+ Include.hdmi3.File "/codecs/hda/hdmi.conf" -+ } -+} -diff --git a/ucm2/HDA-Intel/HiFi-acp.conf b/ucm2/HDA-Intel/HiFi-acp.conf -new file mode 100644 -index 0000000..123ae15 ---- /dev/null -+++ b/ucm2/HDA-Intel/HiFi-acp.conf -@@ -0,0 +1,8 @@ -+SectionDevice."Mic1" { -+ Comment "Digital Microphone" -+ -+ Value { -+ CapturePriority 100 -+ CapturePCM "hw:${var:AcpCardId}" -+ } -+} -diff --git a/ucm2/HDA-Intel/HiFi-analog.conf b/ucm2/HDA-Intel/HiFi-analog.conf -new file mode 100644 -index 0000000..1143a67 ---- /dev/null -+++ b/ucm2/HDA-Intel/HiFi-analog.conf -@@ -0,0 +1,133 @@ -+# Generic HDA devices for analog I/O -+ -+SectionDevice."Headphones" { -+ Comment "Headphones" -+ -+ If.headphone_switch { -+ Condition { -+ Type ControlExists -+ Control "name='Headphone Playback Switch'" -+ } -+ True { -+ EnableSequence [ -+ cset "name='Headphone Playback Switch' on" -+ ] -+ DisableSequence [ -+ cset "name='Headphone Playback Switch' off" -+ ] -+ } -+ } -+ -+ Value { -+ PlaybackPriority 200 -+ PlaybackPCM "hw:${CardId}" -+ PlaybackMixerElem "Headphone" -+ PlaybackMasterElem "Master" -+ PlaybackVolume "Headphone Playback Volume" -+ PlaybackSwitch "Headphone Playback Switch" -+ If.jack { -+ Condition { -+ Type ControlExists -+ Control "iface=CARD,name='Headphone Mic Jack'" -+ } -+ True { -+ JackControl "Headphone Mic Jack" -+ } -+ False { -+ JackControl "Headphone Jack" -+ } -+ } -+ } -+} -+ -+SectionDevice."Speaker" { -+ Comment "Speaker" -+ -+ If.seq { -+ Condition { -+ Type ControlExists -+ Control "name='Bass Speaker Playback Switch'" -+ } -+ True { -+ EnableSequence [ -+ cset "name='Speaker Playback Switch' on" -+ cset "name='Bass Speaker Playback Switch' on" -+ ] -+ -+ DisableSequence [ -+ cset "name='Speaker Playback Switch' off" -+ cset "name='Bass Speaker Playback Switch' off" -+ ] -+ } -+ False { -+ EnableSequence [ -+ cset "name='Speaker Playback Switch' on" -+ ] -+ -+ DisableSequence [ -+ cset "name='Speaker Playback Switch' off" -+ ] -+ } -+ } -+ -+ Value { -+ PlaybackPriority 100 -+ PlaybackPCM "hw:${CardId}" -+ PlaybackMixerElem "Speaker" -+ PlaybackMasterElem "Master" -+ PlaybackVolume "Speaker Playback Volume" -+ PlaybackSwitch "Speaker Playback Switch" -+ } -+} -+ -+If.monomic { -+ Condition { -+ Type ControlExists -+ Control "name='Input Source'" -+ ControlEnum "Headphone Mic" -+ } -+ True { -+ SectionDevice."Mic2" { -+ Comment "Headphones Stereo Microphone" -+ -+ ConflictingDevice [ -+ "Headset" -+ ] -+ -+ EnableSequence [ -+ cset "name='Input Source' 'Headphone Mic'" -+ ] -+ -+ Value { -+ CapturePriority 200 -+ Include.value.File "/HDA-Intel/HDA-Capture-value.conf" -+ JackControl "Headphone Mic Jack" -+ } -+ } -+ -+ SectionDevice."Headset" { -+ Comment "Headset Mono Microphone" -+ -+ EnableSequence [ -+ cset "name='Input Source' 'Headset Mic'" -+ ] -+ -+ Value { -+ CapturePriority 300 -+ Include.value.File "/HDA-Intel/HDA-Capture-value.conf" -+ JackControl "Headphone Mic Jack" -+ } -+ } -+ } -+ False { -+ SectionDevice."Mic2" { -+ Comment "Headphones Stereo Microphone" -+ -+ Value { -+ CapturePriority 200 -+ Include.value.File "/HDA-Intel/HDA-Capture-value.conf" -+ JackControl "Mic Jack" -+ } -+ } -+ } -+} -diff --git a/ucm2/HDA-Intel/HiFi.conf b/ucm2/HDA-Intel/HiFi.conf -new file mode 100644 -index 0000000..2d18c9e ---- /dev/null -+++ b/ucm2/HDA-Intel/HiFi.conf -@@ -0,0 +1,32 @@ -+# Use case Configuration for sof-hda-dsp -+ -+SectionVerb { -+ Value.TQ "HiFi" -+} -+ -+If.analog { -+ Condition { -+ Type ControlExists -+ Control "name='Master Playback Switch'" -+ } -+ True.Include.analog.File "/HDA-Intel/HiFi-analog.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" -+ } -+} -diff --git a/ucm2/HDA-Intel/init.conf b/ucm2/HDA-Intel/init.conf -new file mode 100644 -index 0000000..1a351a9 ---- /dev/null -+++ b/ucm2/HDA-Intel/init.conf -@@ -0,0 +1,39 @@ -+If.amute { -+ Condition { -+ Type ControlExists -+ Control "name='Auto-Mute Mode'" -+ } -+ True.BootSequence [ -+ cset "name='Auto-Mute Mode' off" -+ ] -+} -+ -+If.master { -+ Condition { -+ Type ControlExists -+ Control "name='Master Playback Volume'" -+ } -+ True.BootSequence [ -+ cset "name='Master Playback Volume' 60%" -+ ] -+} -+ -+If.speaker { -+ Condition { -+ Type ControlExists -+ Control "name='Speaker Playback Volume'" -+ } -+ True.BootSequence [ -+ cset "name='Speaker Playback Volume' 60%" -+ ] -+} -+ -+If.headphone { -+ Condition { -+ Type ControlExists -+ Control "name='Headphone Playback Volume'" -+ } -+ True.BootSequence [ -+ cset "name='Headphone Playback Volume' 60%" -+ ] -+} -diff --git a/ucm2/codecs/hda/hdmi.conf b/ucm2/codecs/hda/hdmi.conf -new file mode 100644 -index 0000000..c22f615 ---- /dev/null -+++ b/ucm2/codecs/hda/hdmi.conf -@@ -0,0 +1,25 @@ -+If.hdmi { -+ Condition { -+ Type ControlExists -+ Control "iface=CARD,name='HDMI/DP,pcm=${var:HdmiPCM} Jack'" -+ } -+ True { -+ SectionDevice."HDMI${var:HdmiNum}" { -+ Comment "HDMI${var:HdmiNum}/${var:HdmiNum} Output" -+ -+ EnableSequence [ -+ cset "name='IEC958 Playback Switch' on" -+ ] -+ -+ DisableSequence [ -+ cset "name='IEC958 Playback Switch' off" -+ ] -+ -+ Value { -+ PlaybackPriority "${var:HdmiPrio}" -+ PlaybackPCM "hw:${CardId},${var:HdmiPCM}" -+ JackControl "HDMI/DP,pcm=${var:HdmiPCM} Jack" -+ } -+ } -+ } -+} -diff --git a/ucm2/module/lib/linked.conf b/ucm2/module/lib/linked.conf -new file mode 100644 -index 0000000..d7656a8 ---- /dev/null -+++ b/ucm2/module/lib/linked.conf -@@ -0,0 +1,3 @@ -+ValueDefaults { -+ Linked 1 -+} -diff --git a/ucm2/module/snd_acp3x_rn.conf b/ucm2/module/snd_acp3x_rn.conf -new file mode 120000 -index 0000000..b56794a ---- /dev/null -+++ b/ucm2/module/snd_acp3x_rn.conf -@@ -0,0 +1 @@ -+lib/linked.conf -\ No newline at end of file --- -2.17.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0012-hda-hdmi-add-HDMI4-HDMI5-HDMI6-devices.patch alsa-ucm-conf-1.2.6.3/debian/patches/0012-hda-hdmi-add-HDMI4-HDMI5-HDMI6-devices.patch --- alsa-ucm-conf-1.2.2/debian/patches/0012-hda-hdmi-add-HDMI4-HDMI5-HDMI6-devices.patch 2020-08-10 07:05:02.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0012-hda-hdmi-add-HDMI4-HDMI5-HDMI6-devices.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,100 +0,0 @@ -From 1478d4c3e7e689c9d1daddbb1422f645b2fd619f Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 6 Jul 2020 16:47:57 +0200 -Subject: [PATCH 12/14] hda hdmi: add HDMI4,HDMI5,HDMI6 devices - -- fix the duplicate index value in the comment section -- change priorities - -Signed-off-by: Jaroslav Kysela -(cherry picked from commit 3e8973062fa2b2c7df6d07ac98bfd4aef6bff5e3) -Signed-off-by: Hui Wang ---- - ucm2/HDA-Intel/Hdmi.conf | 42 ++++++++++++++++++++++++++++++++++++--- - ucm2/codecs/hda/hdmi.conf | 2 +- - 2 files changed, 40 insertions(+), 4 deletions(-) - -diff --git a/ucm2/HDA-Intel/Hdmi.conf b/ucm2/HDA-Intel/Hdmi.conf -index 8b1843b..c8b6e77 100644 ---- a/ucm2/HDA-Intel/Hdmi.conf -+++ b/ucm2/HDA-Intel/Hdmi.conf -@@ -6,7 +6,7 @@ If.hdmi1 { - Define { - HdmiNum 1 - HdmiPCM 3 -- HdmiPrio 500 -+ HdmiPrio 1100 - } - Include.hdmi1.File "/codecs/hda/hdmi.conf" - } -@@ -18,7 +18,7 @@ If.hdmi2 { - Define { - HdmiNum 2 - HdmiPCM 7 -- HdmiPrio 600 -+ HdmiPrio 1200 - } - Include.hdmi2.File "/codecs/hda/hdmi.conf" - } -@@ -30,8 +30,44 @@ If.hdmi3 { - Define { - HdmiNum 3 - HdmiPCM 8 -- HdmiPrio 700 -+ HdmiPrio 1300 - } - Include.hdmi3.File "/codecs/hda/hdmi.conf" - } - } -+ -+If.hdmi4 { -+ Condition { Type String Empty "" } -+ True { -+ Define { -+ HdmiNum 4 -+ HdmiPCM 9 -+ HdmiPrio 1400 -+ } -+ Include.hdmi4.File "/codecs/hda/hdmi.conf" -+ } -+} -+ -+If.hdmi5 { -+ Condition { Type String Empty "" } -+ True { -+ Define { -+ HdmiNum 5 -+ HdmiPCM 10 -+ HdmiPrio 1500 -+ } -+ Include.hdmi5.File "/codecs/hda/hdmi.conf" -+ } -+} -+ -+If.hdmi6 { -+ Condition { Type String Empty "" } -+ True { -+ Define { -+ HdmiNum 6 -+ HdmiPCM 11 -+ HdmiPrio 1600 -+ } -+ Include.hdmi5.File "/codecs/hda/hdmi.conf" -+ } -+} -diff --git a/ucm2/codecs/hda/hdmi.conf b/ucm2/codecs/hda/hdmi.conf -index c22f615..ba80fef 100644 ---- a/ucm2/codecs/hda/hdmi.conf -+++ b/ucm2/codecs/hda/hdmi.conf -@@ -5,7 +5,7 @@ If.hdmi { - } - True { - SectionDevice."HDMI${var:HdmiNum}" { -- Comment "HDMI${var:HdmiNum}/${var:HdmiNum} Output" -+ Comment "HDMI${var:HdmiNum} Output" - - EnableSequence [ - cset "name='IEC958 Playback Switch' on" --- -2.17.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0013-amd-renoir-acp-use-the-machine-driver-s-name-for-top.patch alsa-ucm-conf-1.2.6.3/debian/patches/0013-amd-renoir-acp-use-the-machine-driver-s-name-for-top.patch --- alsa-ucm-conf-1.2.2/debian/patches/0013-amd-renoir-acp-use-the-machine-driver-s-name-for-top.patch 2020-08-10 07:05:02.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0013-amd-renoir-acp-use-the-machine-driver-s-name-for-top.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -Index: alsa-ucm-conf-1.2.2/ucm2/module/acp_pdm_mach.conf -=================================================================== ---- /dev/null -+++ alsa-ucm-conf-1.2.2/ucm2/module/acp_pdm_mach.conf -@@ -0,0 +1,3 @@ -+ValueDefaults { -+ Linked 1 -+} diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0014-amd-renoir-acp-add-syntax-in-the-Linked.patch alsa-ucm-conf-1.2.6.3/debian/patches/0014-amd-renoir-acp-add-syntax-in-the-Linked.patch --- alsa-ucm-conf-1.2.2/debian/patches/0014-amd-renoir-acp-add-syntax-in-the-Linked.patch 2020-08-10 07:05:02.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0014-amd-renoir-acp-add-syntax-in-the-Linked.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Index: alsa-ucm-conf-1.2.2/ucm2/module/acp_pdm_mach.conf -=================================================================== ---- alsa-ucm-conf-1.2.2.orig/ucm2/module/acp_pdm_mach.conf -+++ alsa-ucm-conf-1.2.2/ucm2/module/acp_pdm_mach.conf -@@ -1,3 +1,5 @@ -+Syntax 3 -+ - ValueDefaults { - Linked 1 - } -Index: alsa-ucm-conf-1.2.2/ucm2/module/lib/linked.conf -=================================================================== ---- alsa-ucm-conf-1.2.2.orig/ucm2/module/lib/linked.conf -+++ alsa-ucm-conf-1.2.2/ucm2/module/lib/linked.conf -@@ -1,3 +1,5 @@ -+Syntax 3 -+ - ValueDefaults { - Linked 1 - } diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0015-HDA-Intel-only-bind-the-acp-dmic-to-the-soundcard-wi.patch alsa-ucm-conf-1.2.6.3/debian/patches/0015-HDA-Intel-only-bind-the-acp-dmic-to-the-soundcard-wi.patch --- alsa-ucm-conf-1.2.2/debian/patches/0015-HDA-Intel-only-bind-the-acp-dmic-to-the-soundcard-wi.patch 2020-08-10 07:05:02.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0015-HDA-Intel-only-bind-the-acp-dmic-to-the-soundcard-wi.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -From b21b89fb37c6bb64a392d86d4f1ff28277077087 Mon Sep 17 00:00:00 2001 -From: Hui Wang -Date: Thu, 23 Jul 2020 15:21:05 +0800 -Subject: [PATCH 15/15] HDA-Intel: only bind the acp dmic to the soundcard with - analog codec - -On the Lenovo amd renoir laptops, there are 2 soundcards, one is the -intel soundcard with analog codec, the other is the nvidia soundcard -with only hdmi audio codec. We expect the the dmic of acp driver to -bind to the soundcard with analog codec instead of both 2 soundcards. - -Signed-off-by: Hui Wang ---- - ucm2/HDA-Intel/HDA-Intel.conf | 8 ++++++++ - ucm2/HDA-Intel/HiFi.conf | 8 +------- - 2 files changed, 9 insertions(+), 7 deletions(-) - -diff --git a/ucm2/HDA-Intel/HDA-Intel.conf b/ucm2/HDA-Intel/HDA-Intel.conf -index 109eea6..e288ae4 100644 ---- a/ucm2/HDA-Intel/HDA-Intel.conf -+++ b/ucm2/HDA-Intel/HDA-Intel.conf -@@ -12,6 +12,14 @@ If.acp { - False.Define.Use y - } - -+If.analog { -+ Condition { -+ Type ControlExists -+ Control "name='Master Playback Switch'" -+ } -+ False.Define.Use "" -+} -+ - If.use { - Condition { - Type String -diff --git a/ucm2/HDA-Intel/HiFi.conf b/ucm2/HDA-Intel/HiFi.conf -index 2d18c9e..7d4acb9 100644 ---- a/ucm2/HDA-Intel/HiFi.conf -+++ b/ucm2/HDA-Intel/HiFi.conf -@@ -4,13 +4,7 @@ SectionVerb { - Value.TQ "HiFi" - } - --If.analog { -- Condition { -- Type ControlExists -- Control "name='Master Playback Switch'" -- } -- True.Include.analog.File "/HDA-Intel/HiFi-analog.conf" --} -+Include.analog.File "/HDA-Intel/HiFi-analog.conf" - - If.hdmi { - Condition { Type String Empty "" } --- -2.17.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0016-Fix-invalid-Regex-Type-in-various-Condition-blocks.patch alsa-ucm-conf-1.2.6.3/debian/patches/0016-Fix-invalid-Regex-Type-in-various-Condition-blocks.patch --- alsa-ucm-conf-1.2.2/debian/patches/0016-Fix-invalid-Regex-Type-in-various-Condition-blocks.patch 2020-08-10 07:05:02.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0016-Fix-invalid-Regex-Type-in-various-Condition-blocks.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -From 36a4725d4ed7210259bbe7ab47f4175ac8ad10db Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Sun, 28 Jun 2020 19:44:17 +0200 -Subject: [PATCH 12/16] Fix invalid "Regex" Type in various Condition blocks - -Regex is not a valid Condition type, using it leads to errors like these: - -ALSA lib ucm_cond.c:300:(if_eval) unknown If.Condition.Type -ALSA lib main.c:983:(snd_use_case_mgr_open) error: failed to import cht-bsw-rt5672 use case configuration -22 -alsaucm: error failed to open sound card cht-bsw-rt5672: Invalid argument - -Replacing it with "RegexMatch" fixes this. - -Signed-off-by: Hans de Goede -Signed-off-by: Jaroslav Kysela -(backported from commit a396908d25976c030e7a6a56bd5be0738c11d2ee) -Signed-off-by: Hui Wang ---- - 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 fe43d5f..2ba44be 100644 ---- a/ucm2/sof-soundwire/sof-soundwire.conf -+++ b/ucm2/sof-soundwire/sof-soundwire.conf -@@ -38,7 +38,7 @@ DefineRegex { - - If.hs_init { - Condition { -- Type Regex -+ Type RegexMatch - Regex "(rt5682|rt700|rt711)" - String "${var:HeadsetCodec1}" - } -@@ -47,7 +47,7 @@ If.hs_init { - - If.mic_init { - Condition { -- Type Regex -+ Type RegexMatch - Regex "(rt715)" - String "${var:MicCodec1}" - } --- -2.17.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0017-Add-support-for-Lenovo-ThinkStation-P620-Main-Audio.patch alsa-ucm-conf-1.2.6.3/debian/patches/0017-Add-support-for-Lenovo-ThinkStation-P620-Main-Audio.patch --- alsa-ucm-conf-1.2.2/debian/patches/0017-Add-support-for-Lenovo-ThinkStation-P620-Main-Audio.patch 2020-08-10 07:05:02.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0017-Add-support-for-Lenovo-ThinkStation-P620-Main-Audio.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -From fc489d2a140000eb2b04181dc6c97201376accfc Mon Sep 17 00:00:00 2001 -From: Kai-Heng Feng -Date: Thu, 6 Aug 2020 16:54:11 +0800 -Subject: [PATCH] Add support for Lenovo ThinkStation P620 Main Audio - -This add support for internal speaker and front headset. - -We need two separate configs to let PulseAudio understands they are two -different profiles, so the headset's port availability won't affect -speaker's profile availability. ---- - ...Lenovo-ThinkStation-P620-Main-Headset.conf | 19 +++++++++++++++++++ - ...Lenovo-ThinkStation-P620-Main-Speaker.conf | 9 +++++++++ - .../Lenovo-ThinkStation-P620-Main.conf | 11 +++++++++++ - 3 files changed, 39 insertions(+) - create mode 100644 ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-Headset.conf - create mode 100644 ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-Speaker.conf - create mode 100644 ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main.conf - -diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-Headset.conf b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-Headset.conf -new file mode 100644 -index 0000000..5362c5e ---- /dev/null -+++ b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-Headset.conf -@@ -0,0 +1,19 @@ -+SectionDevice."Headphones" { -+ Comment "Headphones" -+ -+ Value { -+ PlaybackPriority 200 -+ PlaybackPCM "hw:${CardId},1" -+ JackControl "Headphone - Output Jack" -+ } -+} -+ -+SectionDevice."Microphone" { -+ Comment "Microphone" -+ -+ Value { -+ CapturePriority 200 -+ CapturePCM "hw:${CardId}" -+ JackControl "Mic - Input Jack" -+ } -+} -diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-Speaker.conf b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-Speaker.conf -new file mode 100644 -index 0000000..a83a947 ---- /dev/null -+++ b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-Speaker.conf -@@ -0,0 +1,9 @@ -+SectionDevice."Speaker" { -+ Comment "Speaker" -+ -+ Value { -+ PlaybackPriority 100 -+ PlaybackPCM "hw:${CardId}" -+ JackControl "Speaker - Output Jack" -+ } -+} -diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main.conf b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main.conf -new file mode 100644 -index 0000000..ad1bd91 ---- /dev/null -+++ b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main.conf -@@ -0,0 +1,11 @@ -+Syntax 2 -+Comment "USB-audio on Lenovo ThinkStation P620 Main Audio" -+SectionUseCase."Speaker" { -+ Comment "Internal Speaker" -+ File "Lenovo-ThinkStation-P620-Main-Speaker.conf" -+} -+ -+SectionUseCase."Headset" { -+ Comment "Front Headset" -+ File "Lenovo-ThinkStation-P620-Main-Headset.conf" -+} --- -2.17.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0018-USB-Audio-Dell-WD15-Dock-make-input-and-output-volum.patch alsa-ucm-conf-1.2.6.3/debian/patches/0018-USB-Audio-Dell-WD15-Dock-make-input-and-output-volum.patch --- alsa-ucm-conf-1.2.2/debian/patches/0018-USB-Audio-Dell-WD15-Dock-make-input-and-output-volum.patch 2020-09-02 01:21:23.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0018-USB-Audio-Dell-WD15-Dock-make-input-and-output-volum.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -From 15a3ab694c703530e0d9317116be5d28129986e0 Mon Sep 17 00:00:00 2001 -From: Hui Wang -Date: Mon, 17 Aug 2020 12:37:44 +0800 -Subject: [PATCH] USB-Audio: Dell-WD15-Dock: make input and output volume - adjustable - -Recently we found the input volume is too low for some specific -headset-mic, even we adjust the input volume to max from PA, we still -can't record the sound from that headset-mic. That is because we -change the input or output volume from PA, but the mixer's volume -is not changed, only PA's soft-volume is changed. - -Checking the amixer controls for the sound card in the WD19, it -supports MixerElem, Volume and Switch, and checking the sound card in -the WD15, it doesn't have Volume and Switch for Headphone and Line, -So adding the volume and switch control in the ucm conditionally. - -Signed-off-by: Hui Wang -BugLink: https://github.com/alsa-project/alsa-ucm-conf/pull/47 -Signed-off-by: Jaroslav Kysela ---- - ucm2/USB-Audio/Dell-WD15-Dock-HiFi.conf | 36 +++++++++++++++++++++++++ - 1 file changed, 36 insertions(+) - -diff --git a/ucm2/USB-Audio/Dell-WD15-Dock-HiFi.conf b/ucm2/USB-Audio/Dell-WD15-Dock-HiFi.conf -index 2f625e4..04355a7 100644 ---- a/ucm2/USB-Audio/Dell-WD15-Dock-HiFi.conf -+++ b/ucm2/USB-Audio/Dell-WD15-Dock-HiFi.conf -@@ -4,6 +4,18 @@ SectionDevice."Headphones" { - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId}" -+ -+ If.Headphone_ctl { -+ Condition { -+ Type ControlExists -+ Control "name='Headphone Playback Switch'" -+ } -+ True { -+ PlaybackMixerElem "Headphone" -+ PlaybackVolume "Headphone Playback Volume" -+ PlaybackSwitch "Headphone Playback Switch" -+ } -+ } - } - } - -@@ -13,6 +25,18 @@ SectionDevice."Line" { - Value { - PlaybackPriority 200 - PlaybackPCM "hw:${CardId},1" -+ -+ If.Line_ctl { -+ Condition { -+ Type ControlExists -+ Control "name='Line Playback Switch'" -+ } -+ True { -+ PlaybackMixerElem "Line" -+ PlaybackVolume "Line Playback Volume" -+ PlaybackSwitch "Line Playback Switch" -+ } -+ } - } - } - -@@ -22,5 +46,17 @@ SectionDevice."Mic" { - Value { - CapturePriority 100 - CapturePCM "hw:${CardId}" -+ -+ If.Mic_ctl { -+ Condition { -+ Type ControlExists -+ Control "name='Mic Capture Switch'" -+ } -+ True { -+ CaptureMixerElem "Mic" -+ CaptureVolume "Mic Capture Volume" -+ CaptureSwitch "Mic Capture Switch" -+ } -+ } - } - } --- -2.25.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0027-HDA-Intel-add-RearMic-JackControl.patch alsa-ucm-conf-1.2.6.3/debian/patches/0027-HDA-Intel-add-RearMic-JackControl.patch --- alsa-ucm-conf-1.2.2/debian/patches/0027-HDA-Intel-add-RearMic-JackControl.patch 2021-05-25 11:42:01.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0027-HDA-Intel-add-RearMic-JackControl.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -From: Jeremy Szu -Date: Tue, 25 May 2021 11:32:47 +0000 -Subject: HDA-Intel-add-RearMic-JackControl - -On the LENOVO P520 (dual codecs machine), the Jack name of Rear Mic is -"Rear Mic Jack". - -Below is picked from alsa-info.txt on the LENOVO p520 machine: - control.18 { - iface CARD - name 'Rear Mic Jack' - value true - comment { - access read - type BOOLEAN - count 1 - } - } ---- - ucm2/HDA-Intel/HiFi-dual.conf | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ucm2/HDA-Intel/HiFi-dual.conf b/ucm2/HDA-Intel/HiFi-dual.conf -index e0e814f..cff948e 100644 ---- a/ucm2/HDA-Intel/HiFi-dual.conf -+++ b/ucm2/HDA-Intel/HiFi-dual.conf -@@ -96,6 +96,7 @@ SectionDevice."Mic2" { - CapturePriority 300 - CapturePCM "hw:${CardId}" - JackHWMute "Line2" -+ JackControl "Rear Mic Jack" - } - - ConflictingDevice [ diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0028-rt715-don-t-initialize-obsolete-ADC-controls.patch alsa-ucm-conf-1.2.6.3/debian/patches/0028-rt715-don-t-initialize-obsolete-ADC-controls.patch --- alsa-ucm-conf-1.2.2/debian/patches/0028-rt715-don-t-initialize-obsolete-ADC-controls.patch 2021-07-14 00:59:30.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0028-rt715-don-t-initialize-obsolete-ADC-controls.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -From f9949919dc5e548e308ab0e9a5c6a09cc370f4c4 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Tue, 18 May 2021 19:14:47 +0200 -Subject: [PATCH] rt715: don't initialize obsolete ADC controls - -Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/67 -Signed-off-by: Jaroslav Kysela ---- - ucm2/codecs/rt715/init.conf | 15 ++++++++++++--- - 1 file changed, 12 insertions(+), 3 deletions(-) - -diff --git a/ucm2/codecs/rt715/init.conf b/ucm2/codecs/rt715/init.conf -index 15a0571..2baa105 100644 ---- a/ucm2/codecs/rt715/init.conf -+++ b/ucm2/codecs/rt715/init.conf -@@ -5,7 +5,16 @@ BootSequence [ - cset "name='rt715 DMIC4 Boost' 2" - cset "name='rt715 ADC 24 Mux' 3" - cset "name='rt715 ADC 25 Mux' 4" -- cset "name='rt715 ADC 27 Capture Switch' 1" -- cset "name='rt715 ADC 07 Capture Switch' 1" -- cset "name='rt715 ADC 07 Capture Volume' 58" - ] -+ -+If.adcxx { -+ Condition { -+ Type ControlExists -+ Control "name='rt715 ADC 07 Capture Switch'" -+ } -+ True.BootSequence [ -+ cset "name='rt715 ADC 27 Capture Switch' 1" -+ cset "name='rt715 ADC 07 Capture Switch' 1" -+ cset "name='rt715 ADC 07 Capture Volume' 58" -+ ] -+} --- -2.25.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0029-sof-soundwire-rt715-use-the-hw-volume-control.patch alsa-ucm-conf-1.2.6.3/debian/patches/0029-sof-soundwire-rt715-use-the-hw-volume-control.patch --- alsa-ucm-conf-1.2.2/debian/patches/0029-sof-soundwire-rt715-use-the-hw-volume-control.patch 2021-07-14 00:59:30.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0029-sof-soundwire-rt715-use-the-hw-volume-control.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -From 8eed6728ff4597c28c945ba65cc7715fd528b126 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Tue, 18 May 2021 19:01:58 +0200 -Subject: [PATCH] sof-soundwire: rt715 - use the hw volume control - -Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/67 -Signed-off-by: Jaroslav Kysela ---- - ucm2/sof-soundwire/rt715.conf | 22 ++++++++++++++++------ - 1 file changed, 16 insertions(+), 6 deletions(-) - -diff --git a/ucm2/sof-soundwire/rt715.conf b/ucm2/sof-soundwire/rt715.conf -index 7b8ca59..3b191bd 100644 ---- a/ucm2/sof-soundwire/rt715.conf -+++ b/ucm2/sof-soundwire/rt715.conf -@@ -1,20 +1,30 @@ - # Use case Configuration for sof-soundwire card - -+If.hwctl { -+ Condition { -+ Type ControlExists -+ Control "name='Capture Volume'" -+ } -+ True.Define.rt715ctl "Capture" -+ False.Define.rt715ctl "PGA5.0 5 Master Capture" -+} -+ - SectionDevice."Mic" { - Comment "SoundWire microphones" - - EnableSequence [ -- cset "name='PGA5.0 5 Master Capture Switch' 1" -+ cset "name='${var:rt715ctl} Switch' 1" - ] - - DisableSequence [ -- cset "name='PGA5.0 5 Master Capture Switch' 0" -+ cset "name='${var:rt715ctl} Switch' 0" - ] - - Value { -- CapturePriority 100 -- CapturePCM "hw:${CardId},4" -- CaptureSwitch "PGA5.0 5 Master Capture Switch" -- CaptureVolume "PGA5.0 5 Master Capture Volume" -+ CapturePriority 100 -+ CapturePCM "hw:${CardId},4" -+ CaptureSwitch "${var:rt715ctl} Switch" -+ CaptureVolume "${var:rt715ctl} Volume" -+ CaptureMixerElem "${var:rt715ctl}" - } - } --- -2.25.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0030-rt715-add-the-missing-sof-prefix-to-the-hw-control-n.patch alsa-ucm-conf-1.2.6.3/debian/patches/0030-rt715-add-the-missing-sof-prefix-to-the-hw-control-n.patch --- alsa-ucm-conf-1.2.2/debian/patches/0030-rt715-add-the-missing-sof-prefix-to-the-hw-control-n.patch 2021-07-14 00:59:30.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0030-rt715-add-the-missing-sof-prefix-to-the-hw-control-n.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -From 2f27f7ba0a4298612738c3c63455ac968bb47e38 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Tue, 18 May 2021 19:31:10 +0200 -Subject: [PATCH] rt715: add the missing sof prefix to the hw control name - -Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/67 -Signed-off-by: Jaroslav Kysela ---- - ucm2/sof-soundwire/rt715.conf | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ucm2/sof-soundwire/rt715.conf b/ucm2/sof-soundwire/rt715.conf -index 3b191bd..a733c08 100644 ---- a/ucm2/sof-soundwire/rt715.conf -+++ b/ucm2/sof-soundwire/rt715.conf -@@ -3,9 +3,9 @@ - If.hwctl { - Condition { - Type ControlExists -- Control "name='Capture Volume'" -+ Control "name='rt715 Capture Volume'" - } -- True.Define.rt715ctl "Capture" -+ True.Define.rt715ctl "rt715 Capture" - False.Define.rt715ctl "PGA5.0 5 Master Capture" - } - --- -2.25.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0031-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch alsa-ucm-conf-1.2.6.3/debian/patches/0031-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch --- alsa-ucm-conf-1.2.2/debian/patches/0031-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch 2021-08-23 03:00:48.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0031-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,139 +0,0 @@ -From 47f19f276255ddfbcb7fbb71c24f435ccf8bc7a5 Mon Sep 17 00:00:00 2001 -From: Hui Wang -Date: Fri, 23 Jul 2021 11:13:02 +0800 -Subject: [PATCH] sof-soundwire: rt1316 - DAC L and R is replaced by DAC - -In the latest codec driver rt1316-sdw.c, the DAC L and DAC R are -replaced by DAC, so we change the ucm to add the condition checking, -if 'DAC L' exists, will set those mixers in the old way, otherwise, -set the mixers with new name. - -The codec rt1316 is used on a Dell TGL soundwire audio machine. - -Signed-off-by: Hui Wang ---- - ucm2/sof-soundwire/rt1316-1.conf | 39 +++++++++++++++++------ - ucm2/sof-soundwire/rt1316-2.conf | 54 ++++++++++++++++++++++---------- - 2 files changed, 67 insertions(+), 26 deletions(-) - -diff --git a/ucm2/sof-soundwire/rt1316-1.conf b/ucm2/sof-soundwire/rt1316-1.conf -index f442a79..aa277dd 100644 ---- a/ucm2/sof-soundwire/rt1316-1.conf -+++ b/ucm2/sof-soundwire/rt1316-1.conf -@@ -3,17 +3,36 @@ - SectionDevice."Speaker" { - Comment "Speaker" - -- EnableSequence [ -- cset "name='rt1316-1 DAC L Switch' 1" -- cset "name='rt1316-1 DAC R Switch' 1" -- cset "name='Speaker Switch' on" -- ] -+ If.lrswitch { -+ Condition { -+ Type ControlExists -+ Control "name='rt1316-1 DAC L Switch'" -+ } -+ True { -+ EnableSequence [ -+ cset "name='rt1316-1 DAC L Switch' 1" -+ cset "name='rt1316-1 DAC R Switch' 1" -+ cset "name='Speaker Switch' on" -+ ] - -- DisableSequence [ -- cset "name='rt1316-1 DAC L Switch' 0" -- cset "name='rt1316-1 DAC R Switch' 0" -- cset "name='Speaker Switch' off" -- ] -+ DisableSequence [ -+ cset "name='rt1316-1 DAC L Switch' 0" -+ cset "name='rt1316-1 DAC R Switch' 0" -+ cset "name='Speaker Switch' off" -+ ] -+ } -+ False { -+ EnableSequence [ -+ cset "name='rt1316-1 DAC Switch' 1" -+ cset "name='Speaker Switch' on" -+ ] -+ -+ DisableSequence [ -+ cset "name='rt1316-1 DAC Switch' 0" -+ cset "name='Speaker Switch' off" -+ ] -+ } -+ } - - Value { - PlaybackPriority 100 -diff --git a/ucm2/sof-soundwire/rt1316-2.conf b/ucm2/sof-soundwire/rt1316-2.conf -index f2fd9ab..94223e1 100644 ---- a/ucm2/sof-soundwire/rt1316-2.conf -+++ b/ucm2/sof-soundwire/rt1316-2.conf -@@ -3,24 +3,46 @@ - SectionDevice."Speaker" { - Comment "Speaker" - -- EnableSequence [ -- cset "name='rt1316-1 RX Channel Select' L,L" -- cset "name='rt1316-2 RX Channel Select' R,R" -+ If.lrswitch { -+ Condition { -+ Type ControlExists -+ Control "name='rt1316-1 DAC L Switch'" -+ } -+ True { -+ EnableSequence [ -+ cset "name='rt1316-1 RX Channel Select' L,L" -+ cset "name='rt1316-2 RX Channel Select' R,R" -+ cset "name='rt1316-1 DAC L Switch' 1" -+ cset "name='rt1316-1 DAC R Switch' 1" -+ cset "name='rt1316-2 DAC L Switch' 1" -+ cset "name='rt1316-2 DAC R Switch' 1" -+ cset "name='Speaker Switch' on" -+ ] - -- cset "name='rt1316-1 DAC L Switch' 1" -- cset "name='rt1316-1 DAC R Switch' 1" -- cset "name='rt1316-2 DAC L Switch' 1" -- cset "name='rt1316-2 DAC R Switch' 1" -- cset "name='Speaker Switch' on" -- ] -+ DisableSequence [ -+ cset "name='rt1316-1 DAC L Switch' 0" -+ cset "name='rt1316-1 DAC R Switch' 0" -+ cset "name='rt1316-2 DAC L Switch' 0" -+ cset "name='rt1316-2 DAC R Switch' 0" -+ cset "name='Speaker Switch' off" -+ ] -+ } -+ False { -+ EnableSequence [ -+ cset "name='rt1316-1 RX Channel Select' L,L" -+ cset "name='rt1316-2 RX Channel Select' R,R" -+ cset "name='rt1316-1 DAC Switch' 1" -+ cset "name='rt1316-2 DAC Switch' 1" -+ cset "name='Speaker Switch' on" -+ ] - -- DisableSequence [ -- cset "name='rt1316-1 DAC L Switch' 0" -- cset "name='rt1316-1 DAC R Switch' 0" -- cset "name='rt1316-2 DAC L Switch' 0" -- cset "name='rt1316-2 DAC R Switch' 0" -- cset "name='Speaker Switch' off" -- ] -+ DisableSequence [ -+ cset "name='rt1316-1 DAC Switch' 0" -+ cset "name='rt1316-2 DAC Switch' 0" -+ cset "name='Speaker Switch' off" -+ ] -+ } -+ } - - Value { - PlaybackPriority 100 --- -2.25.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0032-sof-hda-dsp-Set-Capture-Switch-on-in-the-BootSequenc.patch alsa-ucm-conf-1.2.6.3/debian/patches/0032-sof-hda-dsp-Set-Capture-Switch-on-in-the-BootSequenc.patch --- alsa-ucm-conf-1.2.2/debian/patches/0032-sof-hda-dsp-Set-Capture-Switch-on-in-the-BootSequenc.patch 2021-08-23 03:00:48.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0032-sof-hda-dsp-Set-Capture-Switch-on-in-the-BootSequenc.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -From 55d2ab5c177ec905dc46f45dd27de408c55153bd Mon Sep 17 00:00:00 2001 -From: Hui Wang -Date: Fri, 23 Jul 2021 11:20:50 +0800 -Subject: [PATCH] sof-hda-dsp: Set Capture Switch on in the BootSequence - -We found an issue that the PA source of Mic2/Headset and Mic2 is -muted by default after newly install an OS, the root cause is the -'Capture Switch' is set to off in the kernel. - -Without ucm, the /usr/share/alsa/init/default will set the 'Capture -Switch' to on, similarly we set it to on in the BootSequence of ucm. - -Signed-off-by: Hui Wang ---- - ucm2/sof-hda-dsp/sof-hda-dsp.conf | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/ucm2/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/sof-hda-dsp/sof-hda-dsp.conf -index 79b54a9..ca3473a 100644 ---- a/ucm2/sof-hda-dsp/sof-hda-dsp.conf -+++ b/ucm2/sof-hda-dsp/sof-hda-dsp.conf -@@ -57,3 +57,14 @@ If.Dmic0 { - cset "name='Dmic0 Capture Volume' 70%" - ] - } -+ -+If.Capture { -+ Condition { -+ Type ControlExists -+ Control "name='Capture Switch'" -+ } -+ True.BootSequence [ -+ cset "name='Capture Volume' 60%" -+ cset "name='Capture Switch' on" -+ ] -+} --- -2.25.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0033-HDA-Intel-add-Boost-volume-control-for-Headset-Mic.patch alsa-ucm-conf-1.2.6.3/debian/patches/0033-HDA-Intel-add-Boost-volume-control-for-Headset-Mic.patch --- alsa-ucm-conf-1.2.2/debian/patches/0033-HDA-Intel-add-Boost-volume-control-for-Headset-Mic.patch 2021-09-14 07:11:12.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0033-HDA-Intel-add-Boost-volume-control-for-Headset-Mic.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -From 89c4e449ab80f8b5f083743e109301ff595db92d Mon Sep 17 00:00:00 2001 -From: Hui Wang -Date: Thu, 17 Jun 2021 11:50:53 +0800 -Subject: [PATCH] HDA-Intel: add Boost volume control for Headset Mic - -Ubuntu Linux users complain even they set the input volume to maximum, -they still can't record sound with a pretty satisfied volume, they -need to run commandline commands to adjust "Mic Boost/Headset Mic -Boost/Headphone Mic boost" value to increase the input volume. - -That is because the current ucm only defines "Capture Volume" to -control the input volume. Here we add Boost control, then users could -adjust both "Capture Volume" and "Boost Volume" through Pulseaudio and -Gnome. - -BugLink: https://bugs.launchpad.net/bugs/1930188 -Signed-off-by: Hui Wang -Signed-off-by: Jaroslav Kysela ---- - ucm2/HDA-Intel/HiFi-analog.conf | 3 +++ - 1 file changed, 3 insertions(+) - -Index: alsa-ucm-conf-1.2.2/ucm2/sof-hda-dsp/HiFi.conf -=================================================================== ---- alsa-ucm-conf-1.2.2.orig/ucm2/sof-hda-dsp/HiFi.conf -+++ alsa-ucm-conf-1.2.2/ucm2/sof-hda-dsp/HiFi.conf -@@ -116,6 +116,7 @@ If.monomic { - Value { - CapturePriority 200 - -+ CaptureMasterElem "Headphone Mic Boost" - JackControl "Headphone Mic Jack" - } - } -@@ -130,6 +131,7 @@ If.monomic { - Value { - CapturePriority 300 - -+ CaptureMasterElem "Headset Mic Boost" - JackControl "Headphone Mic Jack" - } - } -@@ -141,6 +143,7 @@ If.monomic { - Value { - CapturePriority 200 - -+ CaptureMasterElem "Mic Boost" - JackControl "Mic Jack" - } - } diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0034-ucm2-Add-UCM-support-for-Dell-Desktop.patch alsa-ucm-conf-1.2.6.3/debian/patches/0034-ucm2-Add-UCM-support-for-Dell-Desktop.patch --- alsa-ucm-conf-1.2.2/debian/patches/0034-ucm2-Add-UCM-support-for-Dell-Desktop.patch 2022-01-09 08:10:43.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0034-ucm2-Add-UCM-support-for-Dell-Desktop.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,154 +0,0 @@ -From 65aae1a79e0cf26987f48daa188508fc75cc7bef Mon Sep 17 00:00:00 2001 -From: Shuming Fan -Date: Mon, 15 Nov 2021 11:43:12 +0800 -Subject: [PATCH] ucm2: Add UCM support for Dell Desktop - -The Dell Desktop uses two USB audio codecs as front and rear panel. -The front UAC has two outputs of speaker/headphone and one input of headset mic. -The rear UAC has one output of line-out. - -BugLink: https://github.com/alsa-project/alsa-ucm-conf/pull/120 -Signed-off-by: Shuming Fan -Signed-off-by: Jaroslav Kysela ---- - .../USB-Audio/Dell-Desktop-Front-Headset.conf | 21 +++++++++++++ - .../USB-Audio/Dell-Desktop-Front-Speaker.conf | 10 +++++++ - ucm2/USB-Audio/Dell-Desktop-Front.conf | 11 +++++++ - ucm2/USB-Audio/Dell-Desktop-Rear-Line.conf | 10 +++++++ - ucm2/USB-Audio/Dell-Desktop-Rear.conf | 6 ++++ - ucm2/USB-Audio/USB-Audio.conf | 30 +++++++++++++++++++ - 6 files changed, 88 insertions(+) - create mode 100644 ucm2/USB-Audio/Dell-Desktop-Front-Headset.conf - create mode 100644 ucm2/USB-Audio/Dell-Desktop-Front-Speaker.conf - create mode 100644 ucm2/USB-Audio/Dell-Desktop-Front.conf - create mode 100644 ucm2/USB-Audio/Dell-Desktop-Rear-Line.conf - create mode 100644 ucm2/USB-Audio/Dell-Desktop-Rear.conf - create mode 100644 ucm2/USB-Audio/USB-Audio.conf - -diff --git a/ucm2/USB-Audio/Dell-Desktop-Front-Headset.conf b/ucm2/USB-Audio/Dell-Desktop-Front-Headset.conf -new file mode 100644 -index 0000000..ae77396 ---- /dev/null -+++ b/ucm2/USB-Audio/Dell-Desktop-Front-Headset.conf -@@ -0,0 +1,21 @@ -+SectionDevice."Headphones" { -+ Comment "Headset/Headphones" -+ -+ Value { -+ PlaybackPriority 200 -+ PlaybackPCM "hw:${CardId},1" -+ JackControl "Headphone - Output Jack" -+ PlaybackMixerElem "Headphone" -+ } -+} -+ -+SectionDevice."Microphone" { -+ Comment "Microphone" -+ -+ Value { -+ CapturePriority 200 -+ CapturePCM "hw:${CardId}" -+ JackControl "Mic - Input Jack" -+ CaptureMixerElem "Mic" -+ } -+} -diff --git a/ucm2/USB-Audio/Dell-Desktop-Front-Speaker.conf b/ucm2/USB-Audio/Dell-Desktop-Front-Speaker.conf -new file mode 100644 -index 0000000..89faf39 ---- /dev/null -+++ b/ucm2/USB-Audio/Dell-Desktop-Front-Speaker.conf -@@ -0,0 +1,10 @@ -+SectionDevice."Speaker" { -+ Comment "Built-in Speaker" -+ -+ Value { -+ PlaybackPriority 100 -+ PlaybackPCM "hw:${CardId}" -+ JackControl "Speaker - Output Jack" -+ PlaybackMixerElem "Speaker" -+ } -+} -diff --git a/ucm2/USB-Audio/Dell-Desktop-Front.conf b/ucm2/USB-Audio/Dell-Desktop-Front.conf -new file mode 100644 -index 0000000..4c6f9f9 ---- /dev/null -+++ b/ucm2/USB-Audio/Dell-Desktop-Front.conf -@@ -0,0 +1,11 @@ -+Syntax 2 -+Comment "USB-audio on the front of Dell Desktop" -+SectionUseCase."Speaker" { -+ Comment "Internal Speaker" -+ File "Dell-Desktop-Front-Speaker.conf" -+} -+ -+SectionUseCase."Headset" { -+ Comment "Front Headset" -+ File "Dell-Desktop-Front-Headset.conf" -+} -diff --git a/ucm2/USB-Audio/Dell-Desktop-Rear-Line.conf b/ucm2/USB-Audio/Dell-Desktop-Rear-Line.conf -new file mode 100644 -index 0000000..f3edfd9 ---- /dev/null -+++ b/ucm2/USB-Audio/Dell-Desktop-Rear-Line.conf -@@ -0,0 +1,10 @@ -+SectionDevice."Line" { -+ Comment "Line Out" -+ -+ Value { -+ PlaybackPriority 100 -+ PlaybackPCM "hw:${CardId}" -+ JackControl "Line - Output Jack" -+ PlaybackMixerElem "PCM" -+ } -+} -diff --git a/ucm2/USB-Audio/Dell-Desktop-Rear.conf b/ucm2/USB-Audio/Dell-Desktop-Rear.conf -new file mode 100644 -index 0000000..3c1f87b ---- /dev/null -+++ b/ucm2/USB-Audio/Dell-Desktop-Rear.conf -@@ -0,0 +1,6 @@ -+Syntax 2 -+Comment "USB-audio on the rear of Dell Desktop" -+SectionUseCase."Line" { -+ Comment "Line Out" -+ File "Dell-Desktop-Rear-Line.conf" -+} -diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf -new file mode 100644 -index 0000000..a3b1cf3 ---- /dev/null -+++ b/ucm2/USB-Audio/USB-Audio.conf -@@ -0,0 +1,30 @@ -+Syntax 3 -+ -+Define.ProfileName "" -+ -+If.dell-desktop-front { -+ Condition { -+ Type String -+ Haystack "${CardComponents}" -+ Needle "USB0bda:4c54" -+ } -+ True.Define.ProfileName "Dell-Desktop-Front" -+} -+ -+If.dell-desktop-rear { -+ Condition { -+ Type String -+ Haystack "${CardComponents}" -+ Needle "USB0bda:4c55" -+ } -+ True.Define.ProfileName "Dell-Desktop-Rear" -+} -+ -+If.inc { -+ Condition { -+ Type String -+ Empty "${var:ProfileName}" -+ } -+ True.Error "UCM is not supported for this USB device (${CardLongName} @ ${CardComponents})" -+ False.Include.prof.File "${var:ProfileName}.conf" -+} --- -2.25.1 - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0035-Revert-PATCH-ucm2-USB-Audio-Add-more-support-to-Leno.patch alsa-ucm-conf-1.2.6.3/debian/patches/0035-Revert-PATCH-ucm2-USB-Audio-Add-more-support-to-Leno.patch --- alsa-ucm-conf-1.2.2/debian/patches/0035-Revert-PATCH-ucm2-USB-Audio-Add-more-support-to-Leno.patch 2022-03-22 12:43:51.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0035-Revert-PATCH-ucm2-USB-Audio-Add-more-support-to-Leno.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,97 +0,0 @@ -From: Kai-Heng Feng -Date: Tue, 22 Mar 2022 01:46:18 -0400 -Subject: Revert "[PATCH] ucm2: USB-Audio: Add more support to Lenovo - ThinkStation P620" - -This reverts commit 2bd8b3011cc929a3f68070786ba689f2757a909a. ---- - .../USB-Audio/Lenovo-ThinkStation-P620-Main-Headset.conf | 1 - - ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Line.conf | 10 ---------- - ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Mic.conf | 10 ---------- - .../USB-Audio/Lenovo-ThinkStation-P620-Rear-Speaker.conf | 8 -------- - ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear.conf | 16 ---------------- - 5 files changed, 45 deletions(-) - delete mode 100644 ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Line.conf - delete mode 100644 ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Mic.conf - delete mode 100644 ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Speaker.conf - delete mode 100644 ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear.conf - -diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-Headset.conf b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-Headset.conf -index f0f01ad..5362c5e 100644 ---- a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-Headset.conf -+++ b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-Headset.conf -@@ -15,6 +15,5 @@ SectionDevice."Microphone" { - CapturePriority 200 - CapturePCM "hw:${CardId}" - JackControl "Mic - Input Jack" -- CaptureMixerElem "Mic" - } - } -diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Line.conf b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Line.conf -deleted file mode 100644 -index f372989..0000000 ---- a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Line.conf -+++ /dev/null -@@ -1,10 +0,0 @@ --SectionDevice."Line" { -- Comment "Line In" -- -- Value { -- CapturePriority 100 -- CapturePCM "hw:${CardId}" -- JackControl "Line - Input Jack" -- CaptureMixerElem "Line" -- } --} -diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Mic.conf b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Mic.conf -deleted file mode 100644 -index 44a79d0..0000000 ---- a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Mic.conf -+++ /dev/null -@@ -1,10 +0,0 @@ --SectionDevice."Mic" { -- Comment "Microphone" -- -- Value { -- CapturePriority 200 -- CapturePCM "hw:${CardId},1" -- JackControl "Mic - Input Jack" -- CaptureMixerElem "Mic" -- } --} -diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Speaker.conf b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Speaker.conf -deleted file mode 100644 -index edebbd3..0000000 ---- a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-Speaker.conf -+++ /dev/null -@@ -1,8 +0,0 @@ --SectionDevice."Speaker" { -- Comment "Speaker" -- -- Value { -- PlaybackPCM "hw:${CardId}" -- JackControl "Speaker - Output Jack" -- } --} -diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear.conf b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear.conf -deleted file mode 100644 -index 42e436b..0000000 ---- a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear.conf -+++ /dev/null -@@ -1,16 +0,0 @@ --Syntax 2 --Comment "USB-audio on Lenovo ThinkStation P620 Rear Audio" --SectionUseCase."Line" { -- Comment "Line In" -- File "Lenovo-ThinkStation-P620-Rear-Line.conf" --} -- --SectionUseCase."Speaker" { -- Comment "Speaker" -- File "Lenovo-ThinkStation-P620-Rear-Speaker.conf" --} -- --SectionUseCase."Mic" { -- Comment "Microphone" -- File "Lenovo-ThinkStation-P620-Rear-Mic.conf" --} diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0036-Revert-PATCH-Add-support-for-Lenovo-ThinkStation-P62.patch alsa-ucm-conf-1.2.6.3/debian/patches/0036-Revert-PATCH-Add-support-for-Lenovo-ThinkStation-P62.patch --- alsa-ucm-conf-1.2.2/debian/patches/0036-Revert-PATCH-Add-support-for-Lenovo-ThinkStation-P62.patch 2022-03-22 12:43:51.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0036-Revert-PATCH-Add-support-for-Lenovo-ThinkStation-P62.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -From: Kai-Heng Feng -Date: Tue, 22 Mar 2022 01:46:44 -0400 -Subject: Revert "[PATCH] Add support for Lenovo ThinkStation P620 Main Audio" - -This reverts commit 5570217cde34c3a107f0ebf6169835796767c3b4. ---- - .../Lenovo-ThinkStation-P620-Main-Headset.conf | 19 ------------------- - .../Lenovo-ThinkStation-P620-Main-Speaker.conf | 9 --------- - ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main.conf | 11 ----------- - 3 files changed, 39 deletions(-) - delete mode 100644 ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-Headset.conf - delete mode 100644 ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-Speaker.conf - delete mode 100644 ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main.conf - -diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-Headset.conf b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-Headset.conf -deleted file mode 100644 -index 5362c5e..0000000 ---- a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-Headset.conf -+++ /dev/null -@@ -1,19 +0,0 @@ --SectionDevice."Headphones" { -- Comment "Headphones" -- -- Value { -- PlaybackPriority 200 -- PlaybackPCM "hw:${CardId},1" -- JackControl "Headphone - Output Jack" -- } --} -- --SectionDevice."Microphone" { -- Comment "Microphone" -- -- Value { -- CapturePriority 200 -- CapturePCM "hw:${CardId}" -- JackControl "Mic - Input Jack" -- } --} -diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-Speaker.conf b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-Speaker.conf -deleted file mode 100644 -index a83a947..0000000 ---- a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-Speaker.conf -+++ /dev/null -@@ -1,9 +0,0 @@ --SectionDevice."Speaker" { -- Comment "Speaker" -- -- Value { -- PlaybackPriority 100 -- PlaybackPCM "hw:${CardId}" -- JackControl "Speaker - Output Jack" -- } --} -diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main.conf b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main.conf -deleted file mode 100644 -index ad1bd91..0000000 ---- a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main.conf -+++ /dev/null -@@ -1,11 +0,0 @@ --Syntax 2 --Comment "USB-audio on Lenovo ThinkStation P620 Main Audio" --SectionUseCase."Speaker" { -- Comment "Internal Speaker" -- File "Lenovo-ThinkStation-P620-Main-Speaker.conf" --} -- --SectionUseCase."Headset" { -- Comment "Front Headset" -- File "Lenovo-ThinkStation-P620-Main-Headset.conf" --} diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0037-Add-support-for-Lenovo-ThinkStation-P620-Main-Audio.patch alsa-ucm-conf-1.2.6.3/debian/patches/0037-Add-support-for-Lenovo-ThinkStation-P620-Main-Audio.patch --- alsa-ucm-conf-1.2.2/debian/patches/0037-Add-support-for-Lenovo-ThinkStation-P620-Main-Audio.patch 2022-03-22 12:43:51.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0037-Add-support-for-Lenovo-ThinkStation-P620-Main-Audio.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,62 +0,0 @@ -From: Kai-Heng Feng -Date: Thu, 20 Aug 2020 22:12:02 +0800 -Subject: Add support for Lenovo ThinkStation P620 Main Audio - -This add support for its internal speaker and front headset. - -Signed-off-by: Kai-Heng Feng -Signed-off-by: Jaroslav Kysela ---- - .../Lenovo-ThinkStation-P620-Main-HiFi.conf | 29 ++++++++++++++++++++++ - ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main.conf | 6 +++++ - 2 files changed, 35 insertions(+) - create mode 100644 ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-HiFi.conf - create mode 100644 ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main.conf - -diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-HiFi.conf b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-HiFi.conf -new file mode 100644 -index 0000000..c515d46 ---- /dev/null -+++ b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-HiFi.conf -@@ -0,0 +1,29 @@ -+SectionDevice."Headphones" { -+ Comment "Headphones" -+ -+ Value { -+ PlaybackPriority 200 -+ PlaybackPCM "hw:${CardId},1" -+ JackControl "Headphone - Output Jack" -+ } -+} -+ -+SectionDevice."Mic" { -+ Comment "Mic" -+ -+ Value { -+ CapturePriority 200 -+ CapturePCM "hw:${CardId}" -+ JackControl "Mic - Input Jack" -+ } -+} -+ -+SectionDevice."Speaker" { -+ Comment "Speaker" -+ -+ Value { -+ PlaybackPriority 100 -+ PlaybackPCM "hw:${CardId}" -+ JackControl "Speaker - Output Jack" -+ } -+} -diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main.conf b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main.conf -new file mode 100644 -index 0000000..53ef729 ---- /dev/null -+++ b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main.conf -@@ -0,0 +1,6 @@ -+Syntax 2 -+Comment "USB-audio on Lenovo ThinkStation P620 Main Audio" -+SectionUseCase."HiFi" { -+ Comment "Default" -+ File "Lenovo-ThinkStation-P620-Main-HiFi.conf" -+} diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0038-ucm2-USB-Audio-Add-support-for-Lenovo-ThinkStation-P.patch alsa-ucm-conf-1.2.6.3/debian/patches/0038-ucm2-USB-Audio-Add-support-for-Lenovo-ThinkStation-P.patch --- alsa-ucm-conf-1.2.2/debian/patches/0038-ucm2-USB-Audio-Add-support-for-Lenovo-ThinkStation-P.patch 2022-03-22 12:43:51.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0038-ucm2-USB-Audio-Add-support-for-Lenovo-ThinkStation-P.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,62 +0,0 @@ -From: Kai-Heng Feng -Date: Wed, 9 Sep 2020 17:10:41 +0800 -Subject: ucm2: USB-Audio: Add support for Lenovo ThinkStation P620 Rear Audio - -Add proper PCM assignment to Lenovo ThinkStation P620 Rear Audio. - -Signed-off-by: Kai-Heng Feng -Signed-off-by: Jaroslav Kysela ---- - .../Lenovo-ThinkStation-P620-Rear-HiFi.conf | 29 ++++++++++++++++++++++ - ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear.conf | 6 +++++ - 2 files changed, 35 insertions(+) - create mode 100644 ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-HiFi.conf - create mode 100644 ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear.conf - -diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-HiFi.conf b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-HiFi.conf -new file mode 100644 -index 0000000..3ea8391 ---- /dev/null -+++ b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-HiFi.conf -@@ -0,0 +1,29 @@ -+SectionDevice."Line" { -+ Comment "Line In" -+ -+ Value { -+ CapturePriority 100 -+ CapturePCM "hw:${CardId}" -+ JackControl "Line - Input Jack" -+ } -+} -+ -+SectionDevice."Mic" { -+ Comment "Mic" -+ -+ Value { -+ CapturePriority 200 -+ CapturePCM "hw:${CardId},1" -+ JackControl "Mic - Input Jack" -+ } -+} -+ -+SectionDevice."Speaker" { -+ Comment "Speaker" -+ -+ Value { -+ PlaybackPriority 100 -+ PlaybackPCM "hw:${CardId}" -+ JackControl "Speaker - Output Jack" -+ } -+} -diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear.conf b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear.conf -new file mode 100644 -index 0000000..f97efcb ---- /dev/null -+++ b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear.conf -@@ -0,0 +1,6 @@ -+Syntax 2 -+Comment "USB-audio on Lenovo ThinkStation P620 Rear Audio" -+SectionUseCase."HiFi" { -+ Comment "Default" -+ File "Lenovo-ThinkStation-P620-Rear-HiFi.conf" -+} diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0039-ucm2-USB-Audio-Add-CaptureMixerElem-for-Lenovo-Think.patch alsa-ucm-conf-1.2.6.3/debian/patches/0039-ucm2-USB-Audio-Add-CaptureMixerElem-for-Lenovo-Think.patch --- alsa-ucm-conf-1.2.2/debian/patches/0039-ucm2-USB-Audio-Add-CaptureMixerElem-for-Lenovo-Think.patch 2022-03-22 12:43:51.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/0039-ucm2-USB-Audio-Add-CaptureMixerElem-for-Lenovo-Think.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -From: Kai-Heng Feng -Date: Mon, 14 Sep 2020 21:00:36 +0800 -Subject: ucm2: USB-Audio: Add CaptureMixerElem for Lenovo ThinkStation P620 - -The Switch and Volume mixer start to work after device firmware update. -Add MixerElem to support them. - -Signed-off-by: Kai-Heng Feng -Signed-off-by: Jaroslav Kysela ---- - ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-HiFi.conf | 1 + - ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-HiFi.conf | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-HiFi.conf b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-HiFi.conf -index c515d46..695dfba 100644 ---- a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-HiFi.conf -+++ b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-HiFi.conf -@@ -15,6 +15,7 @@ SectionDevice."Mic" { - CapturePriority 200 - CapturePCM "hw:${CardId}" - JackControl "Mic - Input Jack" -+ CaptureMixerElem "Mic" - } - } - -diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-HiFi.conf b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-HiFi.conf -index 3ea8391..9777a54 100644 ---- a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-HiFi.conf -+++ b/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-HiFi.conf -@@ -5,6 +5,7 @@ SectionDevice."Line" { - CapturePriority 100 - CapturePCM "hw:${CardId}" - JackControl "Line - Input Jack" -+ CaptureMixerElem "Line" - } - } - -@@ -15,6 +16,7 @@ SectionDevice."Mic" { - CapturePriority 200 - CapturePCM "hw:${CardId},1" - JackControl "Mic - Input Jack" -+ CaptureMixerElem "Mic" - } - } - diff -Nru alsa-ucm-conf-1.2.2/debian/patches/series alsa-ucm-conf-1.2.6.3/debian/patches/series --- alsa-ucm-conf-1.2.2/debian/patches/series 2022-03-22 12:43:51.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/series 2024-02-01 08:01:58.000000000 +0000 @@ -1,42 +1,24 @@ -0001-sof-hda-dsp-Support-systems-without-integrated-graph.patch -0002-sof-hda-dsp-change-Headphones2-to-Mic2.patch -0003-ucm-fix-wrong-If-in-sequence-in-HiFi-dual.conf.patch -0004-ucm2-add-initial-ucm.conf-for-the-latest-alsa-lib.patch -0005-sof-hda-dsp-don-t-fail-if-Auto-Mute-control-is-not-p.patch -0006-ucm.conf-add-support-for-the-kernel-module-name-tree.patch -0007-sof-hda-dsp-make-Headphone-Playback-Switch-condition.patch -0008-sof-soundwire-initial-UCM2-version.patch -0009-sof-soundwire-cleanups-recommended-by-the-ucm-valida.patch -0010-sof-soundwire-rewrite-for-syntax-3.patch -0011-HDA-Intel-add-support-for-AMD-acp-microphone-devices.patch -0012-hda-hdmi-add-HDMI4-HDMI5-HDMI6-devices.patch -0013-amd-renoir-acp-use-the-machine-driver-s-name-for-top.patch -0014-amd-renoir-acp-add-syntax-in-the-Linked.patch -0015-HDA-Intel-only-bind-the-acp-dmic-to-the-soundcard-wi.patch -0016-Fix-invalid-Regex-Type-in-various-Condition-blocks.patch -0017-Add-support-for-Lenovo-ThinkStation-P620-Main-Audio.patch - -0018-USB-Audio-Dell-WD15-Dock-make-input-and-output-volum.patch - -0001-ucm2-USB-Audio-Add-more-support-to-Lenovo-ThinkStati.patch - -0001-sof-hda-dsp-add-initial-kcontrol-values.patch -0002-sof-hda-dsp-make-the-boot-init-optional-for-all-cont.patch -0003-sof-hda-dsp-Set-Master-Playback-Switch-on-in-the-Boo.patch -0004-sof-hda-dsp-Increase-the-speaker-output-volume-in-th.patch -0001-rt715-init-setup-ADC07-to-a-proper-volume.patch -0001-ucm2-soundwire-use-cfg-amp-instead-of-cfg-spk-component-string.patch -0002-Add-support-for-rt711-sdca-rt1316-and-rt715-sdca.patch -0027-HDA-Intel-add-RearMic-JackControl.patch -0028-rt715-don-t-initialize-obsolete-ADC-controls.patch -0029-sof-soundwire-rt715-use-the-hw-volume-control.patch -0030-rt715-add-the-missing-sof-prefix-to-the-hw-control-n.patch -0031-sof-soundwire-rt1316-DAC-L-and-R-is-replaced-by-DAC.patch -0032-sof-hda-dsp-Set-Capture-Switch-on-in-the-BootSequenc.patch -0033-HDA-Intel-add-Boost-volume-control-for-Headset-Mic.patch -0034-ucm2-Add-UCM-support-for-Dell-Desktop.patch -0035-Revert-PATCH-ucm2-USB-Audio-Add-more-support-to-Leno.patch -0036-Revert-PATCH-Add-support-for-Lenovo-ThinkStation-P62.patch -0037-Add-support-for-Lenovo-ThinkStation-P620-Main-Audio.patch -0038-ucm2-USB-Audio-Add-support-for-Lenovo-ThinkStation-P.patch -0039-ucm2-USB-Audio-Add-CaptureMixerElem-for-Lenovo-Think.patch +0001-ucm2-add-PinePhone-configuration.patch +0002-ucm2-add-PineTab-configuration.patch +0003-ucm2-add-improved-Librem-5-profiles.patch +0004-HDA-acp-avoid-to-create-Mic-ACP-LED-control-for-the-.patch +0005-acp6x-add-initial-support-for-AMD-Yellow-Carp-ACP6x.patch +sof-hda-dsp-fix-multiple-If.dmic-blocks.patch +0001-ucm2-sof-soundwire-add-basic-settings-for-RT1318-SDC.patch +sof-soundwire-set-PGA-capture-switch-for-rt715-mic-in-Boo.patch +ucm2-sof-hda-dsp-Update-Mic-LED-settings.patch +ucm2-sof-hda-dsp-If.devdmic-cleanup.patch +sof-hda-dsp-Set-Dmic0-Capture-Switch-on.patch +ucm2-sof-soundwire-Update-Mic-LED-settings.patch +0001-ucm2-HDA-Update-Mic-LED-settings-for-ACP-DMIC.patch +0006-sof-hda-dsp-Add-speaker-led-support.patch +0001-acp63-add-initial-support-for-AMD-Pink-Sardine-ACP63.patch +0002-acp63.conf-use-symbolic-link.patch +0003-acp62-add-initial-support-for-AMD-ACP-v6.2-RPL.patch +0001-ucm2-soundwire-add-rt713-SDCA-device.patch +0001-ucm2-MediaTek-mt8365-evk-Add-alsa-ucm-support.patch +0001-ucm2-MediaTek-mt8390-evk-Add-alsa-ucm-support.patch +0002-ucm2-MediaTek-mt8395-evk-Add-alsa-ucm-support.patch +0003-ucm2-MediaTek-mt8370-evk-Add-alsa-ucm-support.patch +0001-ucm2-conf.d-mt8370-evk-Fix-the-type-of-mt8370-evk.co.patch +0001-ucm-MediaTek-mt8395-evk-Add-HDMIRX-config.patch diff -Nru alsa-ucm-conf-1.2.2/debian/patches/sof-hda-dsp-Set-Dmic0-Capture-Switch-on.patch alsa-ucm-conf-1.2.6.3/debian/patches/sof-hda-dsp-Set-Dmic0-Capture-Switch-on.patch --- alsa-ucm-conf-1.2.2/debian/patches/sof-hda-dsp-Set-Dmic0-Capture-Switch-on.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/sof-hda-dsp-Set-Dmic0-Capture-Switch-on.patch 2024-02-01 08:01:58.000000000 +0000 @@ -0,0 +1,26 @@ +From: Kai-Chuan Hsieh +Date: Mon, 26 Dec 2022 10:24:20 +0800 +Subject: sof-hda-dsp: Set Dmic0 Capture Switch on + +Internal micrphone default is off after fresh installation. +Add operation to set the control on to align with other architecture. + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/259 +Signed-off-by: Kai-Chuan Hsieh +Signed-off-by: Jaroslav Kysela +--- + ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf +index 791b26b..e1b9a56 100644 +--- a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf ++++ b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf +@@ -83,6 +83,7 @@ If.dmic { + } + True.BootSequence [ + cset "name='Dmic0 Capture Volume' 70%" ++ cset "name='Dmic0 Capture Switch' on" + ] + } + } diff -Nru alsa-ucm-conf-1.2.2/debian/patches/sof-hda-dsp-fix-multiple-If.dmic-blocks.patch alsa-ucm-conf-1.2.6.3/debian/patches/sof-hda-dsp-fix-multiple-If.dmic-blocks.patch --- alsa-ucm-conf-1.2.2/debian/patches/sof-hda-dsp-fix-multiple-If.dmic-blocks.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/sof-hda-dsp-fix-multiple-If.dmic-blocks.patch 2024-02-01 08:01:58.000000000 +0000 @@ -0,0 +1,34 @@ +From 8170fffa7bad33c67b7c59ef5d98d92c0c742e91 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 9 Feb 2022 16:19:31 +0100 +Subject: [PATCH] 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 +Signed-off-by: Jaroslav Kysela +--- + 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 + diff -Nru alsa-ucm-conf-1.2.2/debian/patches/sof-soundwire-set-PGA-capture-switch-for-rt715-mic-in-Boo.patch alsa-ucm-conf-1.2.6.3/debian/patches/sof-soundwire-set-PGA-capture-switch-for-rt715-mic-in-Boo.patch --- alsa-ucm-conf-1.2.2/debian/patches/sof-soundwire-set-PGA-capture-switch-for-rt715-mic-in-Boo.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/sof-soundwire-set-PGA-capture-switch-for-rt715-mic-in-Boo.patch 2024-02-01 08:01:58.000000000 +0000 @@ -0,0 +1,29 @@ +From: Jaroslav Kysela +Date: Mon, 26 Dec 2022 09:20:51 +0100 +Subject: sof-soundwire: set PGA capture switch for rt715 mic in BootSequence + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/issues/255 +Signed-off-by: Jaroslav Kysela +--- + ucm2/sof-soundwire/sof-soundwire.conf | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf +index 2442854..f59aa7d 100644 +--- a/ucm2/sof-soundwire/sof-soundwire.conf ++++ b/ucm2/sof-soundwire/sof-soundwire.conf +@@ -61,3 +61,14 @@ If.mic_init { + } + True.Include.mic_init.File "/codecs/${var:MicCodec1}/init.conf" + } ++ ++If.mic_init_rt715 { ++ Condition { ++ Type String ++ Needle "rt715" ++ Haystack "${var:MicCodec1}" ++ } ++ True.BootSequence [ ++ cset "name='PGA5.0 5 Master Capture Switch' 1" ++ ] ++} diff -Nru alsa-ucm-conf-1.2.2/debian/patches/ucm2-sof-hda-dsp-If.devdmic-cleanup.patch alsa-ucm-conf-1.2.6.3/debian/patches/ucm2-sof-hda-dsp-If.devdmic-cleanup.patch --- alsa-ucm-conf-1.2.2/debian/patches/ucm2-sof-hda-dsp-If.devdmic-cleanup.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/ucm2-sof-hda-dsp-If.devdmic-cleanup.patch 2024-02-01 08:01:58.000000000 +0000 @@ -0,0 +1,31 @@ +From: Jaroslav Kysela +Date: Wed, 7 Dec 2022 15:48:05 +0100 +Subject: ucm2: sof-hda-dsp - If.devdmic cleanup + +Simplify the If.devdmic block. + +Signed-off-by: Jaroslav Kysela +--- + 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 403f7a6..791b26b 100644 +--- a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf ++++ b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf +@@ -11,6 +11,7 @@ If.devdmic { + } + True { + Define.DeviceDmic "Mic1" ++ Define.DeviceMic "Mic2" + FixedBootSequence [ + # + # users expect to turn the LED on when only internal +@@ -20,7 +21,6 @@ If.devdmic { + sysw "-/class/sound/ctl-led/mic/card${CardNumber}/detach:Capture Switch" + ] + } +- True.Define.DeviceMic "Mic2" + } + + SectionUseCase."HiFi" { diff -Nru alsa-ucm-conf-1.2.2/debian/patches/ucm2-sof-hda-dsp-Update-Mic-LED-settings.patch alsa-ucm-conf-1.2.6.3/debian/patches/ucm2-sof-hda-dsp-Update-Mic-LED-settings.patch --- alsa-ucm-conf-1.2.2/debian/patches/ucm2-sof-hda-dsp-Update-Mic-LED-settings.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/ucm2-sof-hda-dsp-Update-Mic-LED-settings.patch 2024-02-01 08:01:58.000000000 +0000 @@ -0,0 +1,39 @@ +From: Jaroslav Kysela +Date: Wed, 7 Dec 2022 10:18:04 +0100 +Subject: ucm2: sof-hda-dsp: Update Mic LED settings + +Users expect to turn the LED on when only internal mic is off, but +it makes sense to turn this LED when all internal inputs are off. + +This configuration may be changed when the affected applications +are updated. + +BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=2134824 +Signed-off-by: Jaroslav Kysela +--- + ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf | 12 +++++++++++- + 1 file changed, 11 insertions(+), 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 eb243d1..403f7a6 100644 +--- a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf ++++ b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf +@@ -9,7 +9,17 @@ If.devdmic { + Haystack "${CardComponents}" + Needle "cfg-dmics:" + } +- True.Define.DeviceDmic "Mic1" ++ True { ++ Define.DeviceDmic "Mic1" ++ FixedBootSequence [ ++ # ++ # users expect to turn the LED on when only internal ++ # mic is off, but it makes sense to turn this LED ++ # when all internal inputs are off ++ # ++ sysw "-/class/sound/ctl-led/mic/card${CardNumber}/detach:Capture Switch" ++ ] ++ } + True.Define.DeviceMic "Mic2" + } + diff -Nru alsa-ucm-conf-1.2.2/debian/patches/ucm2-sof-soundwire-Update-Mic-LED-settings.patch alsa-ucm-conf-1.2.6.3/debian/patches/ucm2-sof-soundwire-Update-Mic-LED-settings.patch --- alsa-ucm-conf-1.2.2/debian/patches/ucm2-sof-soundwire-Update-Mic-LED-settings.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/patches/ucm2-sof-soundwire-Update-Mic-LED-settings.patch 2024-02-01 08:01:58.000000000 +0000 @@ -0,0 +1,25 @@ +From: Andy Chi +Date: Wed, 28 Dec 2022 17:36:37 +0800 +Subject: ucm2: sof-soundwire: Update Mic LED settings + +It would be better to make this settings as default in +the driver. See PR. + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/261 +Signed-off-by: Andy Chi +Signed-off-by: Jaroslav Kysela +--- + ucm2/sof-soundwire/sof-soundwire.conf | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf +index f59aa7d..ab27164 100644 +--- a/ucm2/sof-soundwire/sof-soundwire.conf ++++ b/ucm2/sof-soundwire/sof-soundwire.conf +@@ -70,5 +70,6 @@ If.mic_init_rt715 { + } + True.BootSequence [ + cset "name='PGA5.0 5 Master Capture Switch' 1" ++ sysw "-/class/sound/ctl-led/mic/card${CardNumber}/detach:PGA5.0 5 Master Capture Switch" + ] + } diff -Nru alsa-ucm-conf-1.2.2/debian/rules alsa-ucm-conf-1.2.6.3/debian/rules --- alsa-ucm-conf-1.2.2/debian/rules 2020-01-16 12:52:50.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/rules 2024-04-17 19:52:05.000000000 +0000 @@ -5,4 +5,8 @@ override_dh_install: dh_install - chmod -x $(CURDIR)/debian/alsa-ucm-conf/usr/share/alsa/ucm2/kblrt5660/* + rm -f $(CURDIR)/debian/alsa-ucm-conf/usr/share/alsa/ucm2/conf.virt.d/.gitignore + +override_dh_fixperms: + dh_fixperms + chmod -x $(CURDIR)/debian/alsa-ucm-conf/usr/share/alsa/ucm2/Intel/kblrt5660/* diff -Nru alsa-ucm-conf-1.2.2/debian/upstream/metadata alsa-ucm-conf-1.2.6.3/debian/upstream/metadata --- alsa-ucm-conf-1.2.2/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/upstream/metadata 2024-01-25 01:26:39.000000000 +0000 @@ -0,0 +1,5 @@ +--- +Bug-Database: https://github.com/alsa-project/alsa-ucm-conf/issues +Bug-Submit: https://github.com/alsa-project/alsa-ucm-conf/issues/new +Repository: git://git.alsa-project.org/alsa-ucm-conf.git +Repository-Browse: https://git.alsa-project.org/?p=alsa-ucm-conf.git diff -Nru alsa-ucm-conf-1.2.2/debian/upstream/signing-key.asc alsa-ucm-conf-1.2.6.3/debian/upstream/signing-key.asc --- alsa-ucm-conf-1.2.2/debian/upstream/signing-key.asc 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/upstream/signing-key.asc 2024-01-25 01:26:39.000000000 +0000 @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBF+PBUIBEACQ0eLhY6zJkZCztI3Zj7GiEkGyDYXFr10wMn2BmAxXEOhvGs5C +XtZYokNnYnojU2ehb14pdQiIYVm7YwjNjPhFmc6DnSJ74tlDtzI0ZfZYgU8B3/AU +hHCIe7NeH+uqaS4hQ4gQF3HB19GNQ21keQPtm/cZzNvkAwWQ6wxiIas/odQGt6sg +TULub4gXQw42iCW0jNeliNgeOc/4/2qtznN+Ss5G+Hs+EBh0kFCG4+5RcpgtKmYO +LEy+8qI/UmlgOeT+47eTXm4LjxHfRuKcbvSExfICUB5XLD2ZmeZbFyP48jkDvB7w +A4jNfImtlRfTvoviNlOl08Pk3aJoPR8IZIGw+EQCf3ChXTziadqOg37SAy4yGJ14 +BjirKgBNO4zB+lkLOAknsVKJOKRt3w54MevCuj0GGbfSyErZAeHvliXrfBa1ACLu +c2ynRDR/5j0FA3vPzRsHyOGFC4F34W5BhkXCuJBG2o2VDv/zANzjg/hw+0IbmH3G +kYn73EDIaz5giKJolE32WaWkz39DwuuoUaLLyfxyiN+c0p2/XQFCrOSqHNUMfI5z +Ll62nL1XruF6u9ApLKRv/uDJN7tLgds83rteYJP7/5/JSYCPB8PcUkmhB8OoVdpr +tYI8C/6Y6KREm3Jk4AdkySIFnPXZQCkiOR2qOmAuaQPeesjsrSkUtJYZcwARAQAB +tEVBTFNBIFJlbGVhc2UgVGVhbSAoUGFja2FnZSBTaWduaW5nIEtleSB2MSkgPHJl +bGVhc2VAYWxzYS1wcm9qZWN0Lm9yZz6JAk4EEwEIADgWIQTwTfUHN6waiExLPXGD +gFltpuWckQUCX48FQgIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRCDgFlt +puWckRhVD/45DNoD79lHBJEu0Wv93OSlPZDUKR+BnkkdEDgDEhTvk+Bin/EWdb3g +Unc+rEczgAqjqblLH7ndBtFZPNGiQ2nu8eAdN0TrOFQx7bFg4Do7KXNUUqdPUETC +AgkozF3ucsgOcBbv6LwwDfdQDFjkg7CuNGy8CRcLSO5dLK7domq3RxF5mKl1dkOv +4brfw6ssn+pja/jkgM9BKt80ycIDiJtVRuXMBJD19ZB8EzQO9OQBdAPERSG8BwLX +LemTLAZqNd0mixVbn50qCQil64UOkOd5DHVBBokxgtlJEcDujqWaCUYSygSiP2ke +44ArDr7hRwG5KhhbFOigXo3nBYnKyiuWs0jpnrTQD9+uTxcetyBpJ6BW/i/Fy2a9 +NBFNhbDI07rCMXM25cLP8qbI5i6nTSDlkpLP40At9yUVYt8gIO6ZpGpO04/lAhT1 +NxtbZkKMo1nphMHU/MDSusoHyLxUXpppdbXTdMgsuFrXae3gcFDowQbLZqb6ZAJ5 +opX4sDBIdoHDBsI6wCGTV7AAWB8RXWW0RTYMkyIxqixiiB2N2jaau4yHfqv9QWOY +oPcx6ySKqGN0HV50PeRis5eeq7kHIdRrVIOBd0tPIqCKIvyJZk1QXReKvvE84Km2 +dYPusBlhhF7/4WVovlE6HFwyLSOyb32m4qf5dV35op07ew8i4DHpkQ== +=n4lM +-----END PGP PUBLIC KEY BLOCK----- diff -Nru alsa-ucm-conf-1.2.2/debian/watch alsa-ucm-conf-1.2.6.3/debian/watch --- alsa-ucm-conf-1.2.2/debian/watch 2020-01-16 11:24:14.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/debian/watch 2024-01-25 01:26:39.000000000 +0000 @@ -1,2 +1,3 @@ version=4 +opts="pgpsigurlmangle=s/$/.sig/" \ ftp://ftp.alsa-project.org/pub/lib/alsa-ucm-conf-(.+)\.tar\.bz2 diff -Nru alsa-ucm-conf-1.2.2/ucm2/DAISY-I2S/DAISY-I2S.conf alsa-ucm-conf-1.2.6.3/ucm2/DAISY-I2S/DAISY-I2S.conf --- alsa-ucm-conf-1.2.2/ucm2/DAISY-I2S/DAISY-I2S.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/DAISY-I2S/DAISY-I2S.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -Syntax 2 - -Comment "Daisy internal card" - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Default" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/DAISY-I2S/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/DAISY-I2S/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/DAISY-I2S/HiFi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/DAISY-I2S/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -SectionVerb { - EnableSequence [ - cset "name='Left Speaker Mixer Left DAC1 Switch' on" - cset "name='Right Speaker Mixer Right DAC1 Switch' on" - cset "name='Left Headphone Mixer Left DAC1 Switch' on" - cset "name='Right Headphone Mixer Right DAC1 Switch' on" - cset "name='DMIC1 Left Capture Switch' on" - cset "name='DMIC1 Right Capture Switch' on" - cset "name='MIC2 External Mic Switch' on" - cset "name='Left ADC Mixer MIC2 Switch' on" - cset "name='Right ADC Mixer MIC2 Switch' on" - cset "name='EQ1 Mode' Default" - cset "name='DAI1 Filter Mode' Music" - ] -} - -SectionDevice."Headphones" { - EnableSequence [ - cset "name='EQ1 Switch' off" - cset "name='Left Headphone Mixer Left DAC1 Switch' on" - cset "name='Right Headphone Mixer Right DAC1 Switch' on" - ] - - DisableSequence [ - cset "name='EQ1 Mode' Default" - cset "name='EQ1 Switch' on" - cset "name='Left Speaker Mixer Left DAC1 Switch' on" - cset "name='Right Speaker Mixer Right DAC1 Switch' on" - ] - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId}" - } -} - -SectionDevice."Mic" { - EnableSequence [ - cset "name='DMIC1 Left Capture Switch' off" - cset "name='DMIC1 Right Capture Switch' off" - cset "name='Left ADC Mixer MIC2 Switch' on" - cset "name='Right ADC Mixer MIC2 Switch' on" - ] - - DisableSequence [ - cset "name='Left ADC Mixer MIC2 Switch' off" - cset "name='Right ADC Mixer MIC2 Switch' off" - cset "name='DMIC1 Left Capture Switch' on" - cset "name='DMIC1 Right Capture Switch' on" - ] - - Value { - CapturePriority 100 - CapturePCM "hw:${CardId}" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/DB410c/DB410c.conf alsa-ucm-conf-1.2.6.3/ucm2/DB410c/DB410c.conf --- alsa-ucm-conf-1.2.2/ucm2/DB410c/DB410c.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/DB410c/DB410c.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -Syntax 2 - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Play HiFi quality Music" -} -SectionUseCase."HDMI" { - File "HDMI.conf" - Comment "HDMI output" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/DB410c/HDMI.conf alsa-ucm-conf-1.2.6.3/ucm2/DB410c/HDMI.conf --- alsa-ucm-conf-1.2.2/ucm2/DB410c/HDMI.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/DB410c/HDMI.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -# Use case configuration for DB410c board. -# Author: Srinivas Kandagatla - -SectionVerb { - Value { - TQ "HiFi" - } -} - -SectionDevice."HDMI" { - # Name "HDMI-stereo" - Comment "HDMI Digital Stereo Output" - Value { - PlaybackPriority 200 - PlaybackPCM "plughw:${CardId}" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/DB410c/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/DB410c/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/DB410c/HiFi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/DB410c/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,159 +0,0 @@ -# Use case configuration for DB410c board. -# Author: Srinivas Kandagatla - -SectionDevice."Speaker" { - Comment "Speaker playback" - - ConflictingDevice [ - "Headphones" - "Earpiece" - ] - - EnableSequence [ - cset "name='SPK DAC Switch' 1" - cset "name='RX3 MIX1 INP1' RX1" - ## gain to 0dB - cset "name='RX3 Digital Volume' 128" - ] - - DisableSequence [ - cset "name='SPK DAC Switch' 0" - cset "name='RX3 MIX1 INP1' ZERO" - ] - - Value { - PlaybackPriority 200 - PlaybackPCM "plughw:${CardId},1" - } -} - -SectionDevice."Headphones" { - Comment "Headphones playback" - - ConflictingDevice [ - "Speaker" - "Earpiece" - ] - EnableSequence [ - cset "name='RX1 MIX1 INP1' RX1" - cset "name='RX2 MIX1 INP1' RX2" - cset "name='RDAC2 MUX' RX2" - cset "name='HPHL' 1" - cset "name='HPHR' 1" - ## gain to 0dB - cset "name='RX1 Digital Volume' 128" - ## gain to 0dB - cset "name='RX2 Digital Volume' 128" - ] - - DisableSequence [ - cset "name='RX1 Digital Volume' 0" - cset "name='RX2 Digital Volume' 0" - cset "name='HPHL' 0" - cset "name='HPHR' 0" - cset "name='RDAC2 MUX' ZERO" - cset "name='RX1 MIX1 INP1' ZERO" - cset "name='RX2 MIX1 INP1' ZERO" - ] - - Value { - PlaybackPriority 300 - PlaybackPCM "plughw:${CardId},1" - } -} - -SectionDevice."Earpiece" { - Comment "Earpiece playback" - - ConflictingDevice [ - "Speaker" - "Headphones" - ] - - Value { - PlaybackPriority 100 - PlaybackPCM "plughw:${CardId},1" - } -} - -SectionDevice."Handset" { - Comment "Headset Microphone" - - EnableSequence [ - cset "name='DEC1 MUX' ADC2" - cset "name='CIC1 MUX' AMIC" - cset "name='ADC2 Volume' 8" - cset "name='ADC2 MUX' INP2" - ] - - DisableSequence [ - cset "name='ADC2 MUX' ZERO" - cset "name='ADC2 Volume' 0" - cset "name='DEC1 MUX' ZERO" - ] - - Value { - CapturePriority 400 - CapturePCM "plughw:${CardId},2" - } -} - -SectionDevice."Mic1" { - Comment "Primary Microphone" - - EnableSequence [ - cset "name='DEC1 MUX' ADC1" - cset "name='CIC1 MUX' AMIC" - cset "name='ADC1 Volume' 8" - ] - - DisableSequence [ - cset "name='DEC1 MUX' ZERO" - cset "name='ADC1 Volume' 0" - ] - - Value { - CapturePriority 300 - CapturePCM "plughw:${CardId},2" - } -} - -SectionDevice."Mic2" { - Comment "Secondary Microphone" - - EnableSequence [ - cset "name='DEC1 MUX' ADC2" - cset "name='CIC1 MUX' AMIC" - cset "name='ADC2 Volume' 8" - cset "name='ADC2 MUX' INP2" - ] - - DisableSequence [ - cset "name='DEC1 MUX' ZERO" - cset "name='ADC2 Volume' 0" - cset "name='ADC2 MUX' ZERO" - ] - - Value { - CapturePriority 200 - CapturePCM "plughw:${CardId},2" - } -} - -SectionDevice."Mic3" { - Comment "Digital Microphone" - - EnableSequence [ - cset "name='DEC1 MUX' DMIC1" - cset "name='CIC1 MUX' DMIC" - ] - - DisableSequence [ - cset "name='DEC1 MUX' ZERO" - ] - - Value { - CapturePriority 100 - CapturePCM "plughw:${CardId},2" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/DB820c/DB820c.conf alsa-ucm-conf-1.2.6.3/ucm2/DB820c/DB820c.conf --- alsa-ucm-conf-1.2.2/ucm2/DB820c/DB820c.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/DB820c/DB820c.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -Syntax 2 - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "HiFi quality Music" -} - -SectionUseCase."HDMI" { - File "HDMI.conf" - Comment "HDMI output" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/DB820c/HDMI.conf alsa-ucm-conf-1.2.6.3/ucm2/DB820c/HDMI.conf --- alsa-ucm-conf-1.2.2/ucm2/DB820c/HDMI.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/DB820c/HDMI.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -# Use case configuration for DB820c board. -# Author: Srinivas Kandagatla - -SectionVerb { - EnableSequence [ - cset "name='HDMI Mixer MultiMedia1' 1" - ] - - DisableSequence [ - cset "name='HDMI Mixer MultiMedia1' 0" - ] - - Value { - TQ "HiFi" - } -} - -SectionDevice."HDMI" { - Comment "HDMI Digital Stereo Output" - - EnableSequence [ - cset "name='HDMI Mixer MultiMedia1' 1" - ] - - DisableSequence [ - cset "name='HDMI Mixer MultiMedia1' 0" - ] - - Value { - PlaybackPriority 200 - PlaybackPCM "plughw:${CardId}" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/DB820c/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/DB820c/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/DB820c/HiFi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/DB820c/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,100 +0,0 @@ -# Use case configuration for DB820c board. -# Author: Srinivas Kandagatla - -SectionVerb { - - EnableSequence [ - cset "name='SLIM RX0 MUX' ZERO" - cset "name='SLIM RX1 MUX' ZERO" - cset "name='SLIM RX2 MUX' ZERO" - cset "name='SLIM RX3 MUX' ZERO" - cset "name='SLIM RX4 MUX' ZERO" - cset "name='SLIM RX5 MUX' AIF4_PB" - cset "name='SLIM RX6 MUX' AIF4_PB" - cset "name='SLIM RX7 MUX' ZERO" - cset "name='RX INT1_2 MUX' RX5" - cset "name='RX INT2_2 MUX' RX6" - ## gain to 0dB - cset "name='RX5 Digital Volume' 68" - ## gain to 0dB - cset "name='RX6 Digital Volume' 68" - cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 1" - cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1" - cset "name='RX INT1 DEM MUX' CLSH_DSM_OUT" - cset "name='RX INT2 DEM MUX' CLSH_DSM_OUT" - cset "name='AIF1_CAP Mixer SLIM TX0' 1" - cset "name='SLIM TX0 MUX' DEC0" - cset "name='ADC2 Volume' 12" - cset "name='ADC MUX0' AMIC" - cset "name='AMIC MUX0' ADC2" - ] - - DisableSequence [ - cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 0" - cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0" - ] -} - -SectionDevice."Headphones" { - Comment "Headphones playback" - - EnableSequence [ - cset "name='SLIM RX0 MUX' ZERO" - cset "name='SLIM RX1 MUX' ZERO" - cset "name='SLIM RX2 MUX' ZERO" - cset "name='SLIM RX3 MUX' ZERO" - cset "name='SLIM RX4 MUX' ZERO" - cset "name='SLIM RX5 MUX' AIF4_PB" - cset "name='SLIM RX6 MUX' AIF4_PB" - cset "name='SLIM RX7 MUX' ZERO" - cset "name='RX INT1_2 MUX' RX5" - cset "name='RX INT2_2 MUX' RX6" - ## gain to 0dB - cset "name='RX5 Digital Volume' 68" - ## gain to 0dB - cset "name='RX6 Digital Volume' 68" - cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 1" - cset "name='RX INT1 DEM MUX' CLSH_DSM_OUT" - cset "name='RX INT2 DEM MUX' CLSH_DSM_OUT" - ] - - DisableSequence [ - cset "name='RX5 Digital Volume' 0" - cset "name='RX6 Digital Volume' 0" - cset "name='SLIM RX5 MUX' ZERO" - cset "name='SLIM RX6 MUX' ZERO" - cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 0" - ] - - Value { - PlaybackPriority 100 - PlaybackPCM "plughw:${CardId},1" - } -} - -SectionDevice."Headset" { - Comment "Headset Microphone" - - EnableSequence [ - cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1" - cset "name='AIF1_CAP Mixer SLIM TX0' 1" - cset "name='SLIM TX0 MUX' DEC0" - cset "name='ADC2 Volume' 12" - cset "name='ADC MUX0' AMIC" - cset "name='AMIC MUX0' ADC2" - ] - - DisableSequence [ - cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0" - cset "name='AIF1_CAP Mixer SLIM TX0' 0" - cset "name='AMIC MUX0' ZERO" - cset "name='SLIM TX0 MUX' ZERO" - cset "name='ADC2 Volume' 0" - ] - - Value { - CapturePriority 100 - CapturePCM "plughw:${CardId},2" - CaptureChannels 1 - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/GoogleNyan/GoogleNyan.conf alsa-ucm-conf-1.2.6.3/ucm2/GoogleNyan/GoogleNyan.conf --- alsa-ucm-conf-1.2.2/ucm2/GoogleNyan/GoogleNyan.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/GoogleNyan/GoogleNyan.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Syntax 2 -Comment "Nyan internal card" -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Default" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/GoogleNyan/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/GoogleNyan/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/GoogleNyan/HiFi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/GoogleNyan/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ -SectionVerb { - EnableSequence [ - cset "name='Left Speaker Mixer Left DAC Switch' on" - cset "name='Right Speaker Mixer Right DAC Switch' on" - cset "name='Headphone Left Switch' on" - cset "name='Headphone Right Switch' on" - cset "name='Digital EQ 3 Band Switch' off" - cset "name='Digital EQ 5 Band Switch' off" - cset "name='Digital EQ 7 Band Switch' off" - cset "name='Biquad Switch' off" - cset "name='Filter Mode' Music" - cset "name='ADC Oversampling Rate' 0" - cset "name='DMIC Mux' DMIC" - cset "name='MIC2 Mux' IN34" - cset "name='Right ADC Mixer MIC2 Switch' on" - cset "name='Left ADC Mixer MIC2 Switch' on" - cset "name='MIC2 Volume' 10" - cset "name='MIC2 Boost Volume' 0" - cset "name='Mic Jack Switch' off" - cset "name='Int Mic Switch' on" - cset "name='ADCR Boost Volume' 4" - cset "name='ADCL Boost Volume' 4" - cset "name='ADCR Volume' 11" - cset "name='ADCL Volume' 11" - cset "name='Left Speaker Mixer Left DAC Switch' on" - cset "name='Right Speaker Mixer Right DAC Switch' on" - cset "name='Speaker Left Mixer Volume' 2" - cset "name='Speaker Right Mixer Volume' 2" - cset "name='Record Path DC Blocking' on" - cset "name='Playback Path DC Blocking' on" - cset "name='Headphone Left Switch' on" - cset "name='Headphone Right Switch' on" - cset "name='Headphones Switch' off" - cset "name='Speaker Left Switch' on" - cset "name='Speaker Right Switch' on" - cset "name='Speakers Switch' on" - ] -} - -SectionDevice."Headphones" { - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId}" - } - EnableSequence [ - cset "name='Speakers Switch' off" - cset "name='Headphones Switch' on" - ] - DisableSequence [ - cset "name='Headphones Switch' off" - cset "name='Speakers Switch' on" - ] -} - -SectionDevice."Mic" { - Value { - CapturePriority 100 - CapturePCM "hw:${CardId}" - #CaptureControl "MIC2" - } - EnableSequence [ - cset "name='Int Mic Switch' off" - cset "name='DMIC Mux' ADC" - cset "name='Mic Jack Switch' on" - cset "name='Record Path DC Blocking' on" - ] - DisableSequence [ - cset "name='Mic Jack Switch' off" - cset "name='DMIC Mux' DMIC" - cset "name='Int Mic Switch' on" - cset "name='Record Path DC Blocking' off" - ] -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/HDA/DualCodecs/DualCodecs.conf alsa-ucm-conf-1.2.6.3/ucm2/HDA/DualCodecs/DualCodecs.conf --- alsa-ucm-conf-1.2.2/ucm2/HDA/DualCodecs/DualCodecs.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/HDA/DualCodecs/DualCodecs.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,15 @@ +Comment "HDAudio with dual HD-audio codecs" +SectionUseCase."HiFi" { + File "/HDA/DualCodecs/HiFi.conf" + Comment "Default" +} + +Include.init1.File "/HDA/init.conf" + +BootSequence [ + cset "name='Front Playback Volume' 100%" + cset "name='Front Playback Switch' on" + cset "name='Rear-Panel Capture Volume' 100%" + cset "name='Rear-Panel Capture Switch' on" + cset "name='Input Source' 'Rear Mic'" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/HDA/DualCodecs/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/HDA/DualCodecs/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/HDA/DualCodecs/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/HDA/DualCodecs/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,157 @@ +SectionVerb { + Value { + TQ "HiFi" + } + + EnableSequence [ + cset "name='Front Playback Switch' off" + cset "name='Rear-Panel Capture Switch' off" + cset "name='Headphone Playback Switch' off" + ] + + DisableSequence [ + cset "name='Front Playback Switch' off" + cset "name='Front-Panel Capture Switch' off" + cset "name='Rear-Panel Capture Switch' off" + ] +} + +If.speaker { + Condition { + Type ControlExists + Control "name='Speaker Volume Switch'" + } + True { + SectionVerb { + EnableSequence [ + cset "name='Speaker Playback Switch' on" + ] + DisableSequence [ + cset "name='Speaker Playback Switch' off" + ] + } + + SectionDevice."Speaker" { + Comment "Speaker" + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId},4" + PlaybackMixerElem "Speaker" + } + + DisableSequence [ + cset "name='Speaker Playback Switch' off" + ] + + ConflictingDevice [ + "Headphones" + ] + } + } +} + +SectionDevice."Line1" { + Comment "Line Out" + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + } + + If.0 { + Condition { + Type ControlExists + Control "name='Front Playback Switch'" + } + True { + Value { + PlaybackMixerElem "Front" + JackControl "Line Out Front Jack" + } + } + False { + Value { + JackControl "Line Out Jack" + JackHWMute "Speaker" + } + } + } +} + +SectionDevice."Headphones" { + Comment "Headphones" + + EnableSequence [ + cset "name='Headphone Playback Switch' on" + ] + + DisableSequence [ + cset "name='Headphone Playback Switch' off" + ] + + Value { + PlaybackPriority 300 + PlaybackPCM "hw:${CardId},4" + PlaybackMixerElem "Headphone" + JackControl "Front Headphone Jack" + } + + If.speaker { + Condition { + Type ControlExists + Control "name='Speaker Volume Switch'" + } + True.Value.JackHWMute "Speaker" + } + +} + +SectionDevice."Line2" { + Comment "Rear Line In" + + ConflictingDevice [ + "Mic2" + ] + + EnableSequence [ + cset "name='Input Source' Line" + ] + + Value { + CapturePriority 200 + CapturePCM "hw:${CardId}" + CaptureMixerElem "Rear-Panel" + CaptureMasterElem "Line Boost" + JackControl "Line Jack" + } +} + +SectionDevice."Mic2" { + Comment "Rear Microphone" + + Value { + CapturePriority 300 + CapturePCM "hw:${CardId}" + CaptureMixerElem "Rear-Panel" + CaptureMasterElem "Rear Mic Boost" + JackHWMute "Line2" + JackControl "Rear Mic Jack" + } + + EnableSequence [ + cset "name='Input Source' 'Rear Mic'" + ] +} + +SectionDevice."Mic1" { + Comment "Front Microphone" + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId},4" + CaptureMixerElem "Front-Panel" + CaptureMasterElem "Front Mic Boost" + JackControl "Front Mic Jack" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/HDA/HDA-Capture-value.conf alsa-ucm-conf-1.2.6.3/ucm2/HDA/HDA-Capture-value.conf --- alsa-ucm-conf-1.2.2/ucm2/HDA/HDA-Capture-value.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/HDA/HDA-Capture-value.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,4 @@ +CapturePCM "hw:${CardId}" +CaptureMixerElem "Capture" +CaptureVolume "Capture Volume" +CaptureSwitch "Capture Switch" diff -Nru alsa-ucm-conf-1.2.2/ucm2/HDA/HDA.conf alsa-ucm-conf-1.2.6.3/ucm2/HDA/HDA.conf --- alsa-ucm-conf-1.2.2/ucm2/HDA/HDA.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/HDA/HDA.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,62 @@ +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.DeviceMic "Mic" + +If.dualcodec { + Condition { + Type String + Haystack "${CardLongName}" + Needle "DualCodecs" + } + True { + Define.Done y + Define.AcpCardId "" + Include.dual.File "/HDA/DualCodecs/DualCodecs.conf" + } +} + +If.acp { + Condition { + Type String + Empty "${var:AcpCardId}" + } + False { + Define.Use y + Define.DeviceMic "Mic2" + } +} + +If.use { + Condition { + Type String + Empty "${var:Use}" + } + False { + Define.Done y + + SectionUseCase."HiFi" { + File "/HDA/HiFi.conf" + Comment "Play HiFi quality Music" + } + + 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" + ] + } +} + +If.err { + Condition { + Type String + Empty "${var:Done}" + } + True.Error "UCM is not supported for this HDA model (${CardLongName})" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/HDA/Hdmi.conf alsa-ucm-conf-1.2.6.3/ucm2/HDA/Hdmi.conf --- alsa-ucm-conf-1.2.2/ucm2/HDA/Hdmi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/HDA/Hdmi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,79 @@ +# Use case Configuration for sof-hda-dsp + +If.hdmi1 { + Condition { Type String Empty "" } + True { + Define { + HdmiNum 1 + HdmiPCM 3 + HdmiCtlIndex 0 + HdmiPrio 1100 + } + Include.hdmi1.File "/codecs/hda/hdmi.conf" + } +} + +If.hdmi2 { + Condition { Type String Empty "" } + True { + Define { + HdmiNum 2 + HdmiPCM 7 + HdmiCtlIndex 1 + HdmiPrio 1200 + } + Include.hdmi2.File "/codecs/hda/hdmi.conf" + } +} + +If.hdmi3 { + Condition { Type String Empty "" } + True { + Define { + HdmiNum 3 + HdmiPCM 8 + HdmiCtlIndex 2 + HdmiPrio 1300 + } + Include.hdmi3.File "/codecs/hda/hdmi.conf" + } +} + +If.hdmi4 { + Condition { Type String Empty "" } + True { + Define { + HdmiNum 4 + HdmiPCM 9 + HdmiCtlIndex 3 + HdmiPrio 1400 + } + Include.hdmi4.File "/codecs/hda/hdmi.conf" + } +} + +If.hdmi5 { + Condition { Type String Empty "" } + True { + Define { + HdmiNum 5 + HdmiPCM 10 + HdmiCtlIndex 4 + HdmiPrio 1500 + } + Include.hdmi5.File "/codecs/hda/hdmi.conf" + } +} + +If.hdmi6 { + Condition { Type String Empty "" } + True { + Define { + HdmiNum 6 + HdmiPCM 11 + HdmiCtlIndex 5 + HdmiPrio 1600 + } + Include.hdmi6.File "/codecs/hda/hdmi.conf" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/HDA/HiFi-acp.conf alsa-ucm-conf-1.2.6.3/ucm2/HDA/HiFi-acp.conf --- alsa-ucm-conf-1.2.2/ucm2/HDA/HiFi-acp.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/HDA/HiFi-acp.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,10 @@ +SectionDevice."Mic1" { + Comment "Digital Microphone" + + Value { + CapturePriority 100 + CapturePCM "hw:${var:AcpCardId}" + CaptureMixerElem "Mic ACP LED" + CaptureSwitch "Mic ACP LED Capture Switch" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/HDA/HiFi-analog.conf alsa-ucm-conf-1.2.6.3/ucm2/HDA/HiFi-analog.conf --- alsa-ucm-conf-1.2.2/ucm2/HDA/HiFi-analog.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/HDA/HiFi-analog.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,238 @@ +# Generic HDA devices for analog I/O + +Define.DeviceFrontMic "" +Define.hpvol "Headphone" +Define.hpjack "Headphone Jack" +Define.lovol "Line Out" + +If.fmic { + Condition { + Type ControlExists + Control "name='Front Mic Playback Switch'" + } + True { + If.mic2 { + Condition { + Type String + String1 "${var:DeviceMic}" + String2 "Mic2" + } + True.Define { + DeviceFrontMic "Mic3" + } + False.Define { + DeviceMic "Mic1" + DeviceFrontMic "Mic2" + } + } + } +} + +If.hplo { + Condition { + Type ControlExists + Control "name='Headphone+LO Playback Volume'" + } + True.Define { + hpvol "Headphone+LO" + lovol "Headphone+LO" + } +} + +If.hpjack { + Condition { + Type ControlExists + Control "iface=CARD,name='Headphone Mic Jack'" + } + True.Define.hpjack "Headphone Mic Jack" + False.If.front { + Condition { + Type ControlExists + Control "iface=CARD,name='Front Headphone Jack'" + } + True.Define.hpjack "Front Headphone Jack" + } +} + +SectionDevice."Headphones" { + Comment "Headphones" + + If.headphone_switch { + Condition { + Type ControlExists + Control "name='Headphone Playback Switch'" + } + True { + EnableSequence [ + cset "name='Headphone Playback Switch' on" + ] + DisableSequence [ + cset "name='Headphone Playback Switch' off" + ] + } + } + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + PlaybackMixerElem "${var:hpvol}" + PlaybackMasterElem "Master" + PlaybackVolume "${var:hpvol} Playback Volume" + PlaybackSwitch "Headphone Playback Switch" + JackControl "${var:hpjack}" + } +} + +SectionDevice."Speaker" { + Comment "Speaker" + + If.seq { + Condition { + Type ControlExists + Control "name='Bass Speaker Playback Switch'" + } + True { + EnableSequence [ + cset "name='Speaker Playback Switch' on" + cset "name='Bass Speaker Playback Switch' on" + ] + + DisableSequence [ + cset "name='Speaker Playback Switch' off" + cset "name='Bass Speaker Playback Switch' off" + ] + } + False { + EnableSequence [ + cset "name='Speaker Playback Switch' on" + ] + + DisableSequence [ + cset "name='Speaker Playback Switch' off" + ] + } + } + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + PlaybackMixerElem "Speaker" + PlaybackMasterElem "Master" + PlaybackVolume "Speaker Playback Volume" + PlaybackSwitch "Speaker Playback Switch" + } +} + +If.monomic { + Condition { + Type ControlExists + Control "name='Input Source'" + ControlEnum "Headphone Mic" + } + True { + SectionDevice."${var:DeviceMic}" { + Comment "Headphones Stereo Microphone" + + ConflictingDevice [ + "Headset" + ] + + EnableSequence [ + cset "name='Input Source' 'Headphone Mic'" + ] + + Value { + CapturePriority 200 + Include.value.File "/HDA/HDA-Capture-value.conf" + CaptureMasterElem "Headphone Mic Boost" + JackControl "Headphone Mic Jack" + } + } + + SectionDevice."Headset" { + Comment "Headset Mono Microphone" + + EnableSequence [ + cset "name='Input Source' 'Headset Mic'" + ] + + Value { + CapturePriority 300 + Include.value.File "/HDA/HDA-Capture-value.conf" + CaptureMasterElem "Headset Mic Boost" + JackControl "Headphone Mic Jack" + } + } + } + False { + SectionDevice."${var:DeviceMic}" { + Comment "Headphones Stereo Microphone" + + Value { + CapturePriority 200 + Include.value.File "/HDA/HDA-Capture-value.conf" + CaptureMasterElem "Mic Boost" + JackControl "Mic Jack" + } + } + } +} + +If.frontmic { + Condition { + Type String + Empty "${var:DeviceFrontMic}" + } + False.SectionDevice."${var:DeviceFrontMic}" { + Comment "Front Stereo Microphone" + + ConflictingDevice [ + "${var:DeviceMic}" + ] + + Value { + CapturePriority 400 + Include.value.File "/HDA/HDA-Capture-value.conf" + CaptureMasterElem "Front Mic Boost" + JackControl "Front Mic Jack" + } + } +} + +If.lineout { + Condition { + Type ControlExists + Control "name='Line Out Playback Switch'" + } + True.SectionDevice."Line" { + Comment "Line Output" + + If.conflict { + Condition { + Type String + String1 "${var:lovol}" + String2 "Headphone+LO" + } + True.ConflictingDevice [ + "Headphones" + ] + } + + EnableSequence [ + cset "name='Line Out Playback Switch' on" + ] + DisableSequence [ + cset "name='Line Out Playback Switch' off" + ] + + Value { + PlaybackPriority 300 + PlaybackPCM "hw:${CardId}" + PlaybackMixerElem "${var:lovol}" + PlaybackMasterElem "Master" + PlaybackVolume "${var:lovol} Playback Volume" + PlaybackSwitch "Line Out Playback Switch" + JackControl "Line Out Jack" + } + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/HDA/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/HDA/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/HDA/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/HDA/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,30 @@ +# Use case Configuration for sof-hda-dsp + +SectionVerb { + Value.TQ "HiFi" +} + +If.analog { + Condition { + Type ControlExists + Control "name='Master Playback Switch'" + } + True { + If.acp { + Condition { + Type String + Empty "${var:AcpCardId}" + } + True.Include.analog.File "/HDA/HiFi-analog.conf" + False.Include { + acp.File "/HDA/HiFi-acp.conf" + analog.File "/HDA/HiFi-analog.conf" + } + } + } +} + +If.hdmi { + Condition { Type String Empty "" } + True.Include.hdmi.File "/HDA/Hdmi.conf" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/HDA/init.conf alsa-ucm-conf-1.2.6.3/ucm2/HDA/init.conf --- alsa-ucm-conf-1.2.2/ucm2/HDA/init.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/HDA/init.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,52 @@ +If.amute { + Condition { + Type ControlExists + Control "name='Auto-Mute Mode'" + } + True.BootSequence [ + cset "name='Auto-Mute Mode' off" + ] +} + +If.master { + Condition { + Type ControlExists + Control "name='Master Playback Volume'" + } + True.BootSequence [ + cset "name='Master Playback Volume' 60%" + cset "name='Master Playback Switch' on" + ] +} + +If.speaker { + Condition { + Type ControlExists + Control "name='Speaker Playback Volume'" + } + True.BootSequence [ + cset "name='Speaker Playback Volume' 60%" + cset "name='Speaker Playback Switch' off" + ] +} + +If.headphone { + Condition { + Type ControlExists + Control "name='Headphone Playback Volume'" + } + True.BootSequence [ + cset "name='Headphone Playback Volume' 60%" + cset "name='Headphone Playback Switch' off" + ] +} + +If.capture { + Condition { + Type ControlExists + Control "name='Capture Volume'" + } + True.BootSequence [ + cset "name='Capture Volume' 60%" + ] +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/HDA-Intel/HDAudio-DualCodecs.conf alsa-ucm-conf-1.2.6.3/ucm2/HDA-Intel/HDAudio-DualCodecs.conf --- alsa-ucm-conf-1.2.2/ucm2/HDA-Intel/HDAudio-DualCodecs.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/HDA-Intel/HDAudio-DualCodecs.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Syntax 2 -Comment "HDAudio with dual HD-audio codecs" -SectionUseCase."HiFi" { - File "HiFi-dual.conf" - Comment "Default" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/HDA-Intel/HDAudio-Gigabyte-ALC1220DualCodecs.conf alsa-ucm-conf-1.2.6.3/ucm2/HDA-Intel/HDAudio-Gigabyte-ALC1220DualCodecs.conf --- alsa-ucm-conf-1.2.2/ucm2/HDA-Intel/HDAudio-Gigabyte-ALC1220DualCodecs.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/HDA-Intel/HDAudio-Gigabyte-ALC1220DualCodecs.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Syntax 2 -Comment "HDAudio with dual HD-audio codecs" -SectionUseCase."HiFi" { - File "HiFi-dual.conf" - Comment "Default" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/HDA-Intel/HDAudio-Lenovo-DualCodecs.conf alsa-ucm-conf-1.2.6.3/ucm2/HDA-Intel/HDAudio-Lenovo-DualCodecs.conf --- alsa-ucm-conf-1.2.2/ucm2/HDA-Intel/HDAudio-Lenovo-DualCodecs.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/HDA-Intel/HDAudio-Lenovo-DualCodecs.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Syntax 2 -Comment "HDAudio with dual HD-audio codecs" -SectionUseCase."HiFi" { - File "HiFi-dual.conf" - Comment "Default" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/HDA-Intel/HiFi-dual.conf alsa-ucm-conf-1.2.6.3/ucm2/HDA-Intel/HiFi-dual.conf --- alsa-ucm-conf-1.2.2/ucm2/HDA-Intel/HiFi-dual.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/HDA-Intel/HiFi-dual.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,116 +0,0 @@ -SectionVerb { - Value { - TQ "HiFi" - } - - EnableSequence [ - cset "name='Front Playback Volume' 100%" - cset "name='Front Playback Switch' on" - cset "name='Rear-Panel Capture Volume' 100%" - cset "name='Rear-Panel Capture Switch' on" - ] - - DisableSequence [ - cset "name='Front Playback Volume' 0" - cset "name='Front Playback Switch' off" - cset "name='Rear-Panel Capture Volume' 0" - cset "name='Rear-Panel Capture Switch' off" - ] -} - -SectionDevice."Speaker" { - Comment "Speaker" - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId},4" - PlaybackMixerElem "Speaker" - } - - ConflictingDevice [ - "Headphones" - ] -} - -SectionDevice."Line1" { - Comment "Line Out" - - Value { - PlaybackPriority 200 - PlaybackPCM "hw:${CardId}" - JackControl "Line Out Jack" - JackHWMute "Speaker" - } -} - -SectionDevice."Headphones" { - Comment "Headphones" - - Value { - PlaybackPriority 300 - PlaybackPCM "hw:${CardId},4" - PlaybackMixerElem "Headphone" - JackControl "Front Headphone Jack" - JackHWMute "Speaker" - } - - ConflictingDevice [ - "Speaker" - ] -} - -SectionDevice."Line2" { - Comment "Rear Line In" - - Value { - CapturePriority 200 - CapturePCM "hw:${CardId}" - JackControl "Line Jack" - } - - ConflictingDevice [ - "Mic2" - ] - - EnableSequence [ - cset "name='Input Source' Line" - If.0 { - Condition { - Type ControlExists - Control "name='Line Boost Volume'" - } - True { - cset "name='Line Boost Volume' 3" - } - } - ] -} - -SectionDevice."Mic2" { - Comment "Rear Microphone" - - Value { - CapturePriority 300 - CapturePCM "hw:${CardId}" - JackHWMute "Line2" - } - - ConflictingDevice [ - "Line2" - ] - - EnableSequence [ - cset "name='Input Source' Rear Mic" - ] -} - -SectionDevice."Mic1" { - Comment "Front Microphone" - - Value { - CapturePriority 100 - CapturePCM "hw:${CardId},4" - CaptureMixerElem "Front-Panel" - JackControl "Front Mic Jack" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/SOF/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/SOF/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/SOF/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/SOF/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,116 @@ +If.bytcht_rt5640 { + Condition { + Type String + Haystack "${CardName}" + Needle "bytcht rt5640" + } + True { + Include.init.File "/codecs/rt5640/init.conf" + Include.main.File "/Intel/bytcr-rt5640/HiFi.conf" + } +} + +If.bytcht_rt5651 { + Condition { + Type String + Haystack "${CardName}" + Needle "bytcht rt5651" + } + True { + Include.init.File "/codecs/rt5651/init.conf" + Include.main.File "/Intel/bytcr-rt5651/HiFi.conf" + } +} + +If.bytcht_cx2072x { + Condition { + Type String + Haystack "${CardName}" + Needle "bytcht cx2072x" + } + True.Include.main.File "/Intel/bytcht-cx2072x/HiFi.conf" +} + +If.bytcht_es8316 { + Condition { + Type String + Haystack "${CardName}" + Needle "bytcht es8316" + } + True.Include.main.File "/Intel/bytcht-es8316/HiFi.conf" +} + +If.bytcht_rt5672 { + Condition { + Type String + Haystack "${CardName}" + Needle "bytcht rt5672" + } + True.Include.main.File "/Intel/cht-bsw-rt5672/HiFi.conf" +} + +If.bytcht_nau8824 { + Condition { + Type String + Haystack "${CardName}" + Needle "bytcht nau8824" + } + True.Include.main.File "/Intel/chtnau8824/HiFi.conf" +} + +If.bytcht_rt5645 { + Condition { + Type String + Haystack "${CardName}" + Needle "bytcht rt5645" + } + True { + Include.init.File "/codecs/rt5645/init.conf" + Include.main.File "/Intel/chtrt5645/HiFi.conf" + } +} + +If.bytcht_rt5650 { + Condition { + Type String + Haystack "${CardName}" + Needle "bytcht rt5650" + } + True.Include.main.File "/Intel/chtrt5650/HiFi.conf" +} + +If.bytcht_max98090 { + Condition { + Type String + Haystack "${CardName}" + Needle "bytcht max98090" + } + True.Include.main.File "/Intel/chtmax98090/HiFi.conf" +} + +If.bytcht_wm5102 { + Condition { + Type String + Haystack "${CardName}" + Needle "bytcht wm5102" + } + True.Include.main.File "/Intel/bytcr-wm5102/HiFi.conf" +} + +If.bdw_rt286 { + Condition { + Type String + Haystack "${CardName}" + Needle "bdw rt286" + } + True.Include.main.File "/Intel/broadwell-rt286/HiFi.conf" +} + +If.bdw_rt5677 { + Condition { + Type String + Haystack "${CardName}" + Needle "bdw rt5677" + } + True.Include.main.File "/Intel/bdw-rt5677/HiFi.conf" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/SOF/SOF.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/SOF/SOF.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/SOF/SOF.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/SOF/SOF.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,9 @@ +Syntax 4 + +SectionUseCase."HiFi" { + File "/Intel/SOF/HiFi.conf" + Comment "Play HiFi quality Music" +} + +Include.card-init.File "/lib/card-init.conf" +Include.ctl-remap.File "/lib/ctl-remap.conf" diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/bdw-rt5677/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/bdw-rt5677/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/bdw-rt5677/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/bdw-rt5677/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,187 @@ +# Use case Configuration for bdw-rt5677 +# command-line sequence to switch playback/capture +# alsaucm -c bdw-rt5677 set _verb HiFi +# alsaucm -c bdw-rt5677 set _verb HiFi set _enadev Headphones + +LibraryConfig.remap.Config { + + ctl.default.remap { + "name='IN1 Boost'" "name='IN1 Boost Capture Volume'" + "name='IN2 Boost'" "name='IN2 Boost Capture Volume'" + } + +} + +SectionVerb { + + EnableSequence [ + + cset "name='PDM1 L Mux' STO1 DAC MIX" + cset "name='PDM1 R Mux' STO1 DAC MIX" + + # Adjust Master Playback volume if needed + # cset "name='Master Playback Volume' 30" + + cset "name='OUT1 Playback Switch' off" + cset "name='OUT2 Playback Switch' off" + + cset "name='DAC1 Playback Volume' 175" + cset "name='DAC2 Playback Volume' 175" + cset "name='DAC12 SRC Mux' STO1 DAC MIX" + + cset "name='Stereo DAC MIXL ST L Switch' off" + cset "name='Stereo DAC MIXL DAC1 L Switch' off" + cset "name='Stereo DAC MIXL DAC2 L Switch' off" + cset "name='Stereo DAC MIXL DAC1 R Switch' on" + + cset "name='Stereo DAC MIXR ST R Switch' off" + cset "name='Stereo DAC MIXR DAC1 R Switch' off" + cset "name='Stereo DAC MIXR DAC2 R Switch' off" + cset "name='Stereo DAC MIXR DAC1 L Switch' on" + + cset "name='DAC1 MIXL Stereo ADC Switch' off" + cset "name='DAC1 MIXL DAC1 Switch' on" + + cset "name='DAC1 MIXR Stereo ADC Switch' off" + cset "name='DAC1 MIXR DAC1 Switch' on" + + cset "name='DAC1 Mux' IF1 DAC 01" + + cset "name='Stereo1 DMIC Mux' DMIC1" + cset "name='Stereo1 ADC2 Mux' DMIC" + cset "name='Stereo1 ADC1 Mux' ADC1/2" + + cset "name='Sto1 ADC MIXL ADC1 Switch' off" + cset "name='Sto1 ADC MIXL ADC2 Switch' off" + cset "name='Sto1 ADC MIXL ADC2 Switch' on" + + cset "name='Sto1 ADC MIXR ADC1 Switch' off" + cset "name='Sto1 ADC MIXR ADC2 Switch' off" + cset "name='Sto1 ADC MIXR ADC2 Switch' on" + + cset "name='IF1 ADC1 Mux' STO1 ADC MIX" + cset "name='IF1 ADC1 Swap Mux' L/R" + + # Adjust Mic Capture Volume if needed + # cset "name='Mic Capture Volume' 30" + + cset "name='ADC1 Capture Switch' on" + cset "name='ADC1 Capture Volume' 31" + cset "name='STO1 ADC Boost Volume' 2" + + cset "name='Headphone Switch' off" + cset "name='Speaker Switch' on" + + cset "name='Remote DMICs Switch' on" + cset "name='Mono DMIC L Mux' DMIC1" + cset "name='Mono ADC2 L Mux' DMIC" + cset "name='Mono ADC MIXL ADC1 Switch' off" + cset "name='Mono ADC MIXL ADC2 Switch' on" + cset "name='VAD ADC Mux' MONO ADC MIX L" + cset "name='IB01 Mux' VAD ADC/DAC1 FS" + cset "name='IB01 Bypass Mux' Bypass" + cset "name='Mono ADC Boost Volume' 2" + ] +} + +SectionDevice."Speaker" { + Comment "Speakers" + + ConflictingDevice [ + "Headphones" + ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + } +} + + +SectionDevice."Headphones" { + Comment "Headphones" + + ConflictingDevice [ + "Speaker" + ] + + EnableSequence [ + cset "name='Speaker Switch' off" + cset "name='Stereo DAC MIXL DAC1 R Switch' off" + cset "name='Stereo DAC MIXR DAC1 L Switch' off" + cset "name='Stereo DAC MIXL DAC1 L Switch' on" + cset "name='Stereo DAC MIXR DAC1 R Switch' on" + cset "name='OUT1 Playback Switch' on" + cset "name='OUT2 Playback Switch' on" + cset "name='Headphone Switch' on" + ] + + DisableSequence [ + cset "name='Headphone Switch' off" + cset "name='OUT1 Playback Switch' off" + cset "name='OUT2 Playback Switch' off" + cset "name='Stereo DAC MIXL DAC1 L Switch' off" + cset "name='Stereo DAC MIXR DAC1 R Switch' off" + cset "name='Stereo DAC MIXL DAC1 R Switch' on" + cset "name='Stereo DAC MIXR DAC1 L Switch' on" + cset "name='Speaker Switch' on" + ] + + Value { + PlaybackPriority 300 + PlaybackPCM "hw:${CardId}" + JackControl "Headphone Jack" + JackHWMute "Speaker" + } +} + +SectionDevice."Mic" { + Comment "Internal Microphone" + + ConflictingDevice [ + "Headset" + ] + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId}" + } +} + +SectionDevice."Headset" { + Comment "Headset Microphone" + + ConflictingDevice [ + "Mic" + ] + + EnableSequence [ + cset "name='Sto1 ADC MIXL ADC2 Switch' off" + cset "name='Sto1 ADC MIXR ADC2 Switch' off" + cset "name='Local DMICs Switch' off" + + cset "name='IF1 ADC1 Swap Mux' L/L" + + cset "name='Sto1 ADC MIXL ADC1 Switch' on" + cset "name='Sto1 ADC MIXR ADC1 Switch' on" + cset "name='Headset Mic Switch' on" + ] + + DisableSequence [ + cset "name='Sto1 ADC MIXL ADC1 Switch' off" + cset "name='Sto1 ADC MIXR ADC1 Switch' off" + cset "name='Headset Mic Switch' off" + + cset "name='IF1 ADC1 Swap Mux' L/R" + + cset "name='Sto1 ADC MIXL ADC2 Switch' on" + cset "name='Sto1 ADC MIXR ADC2 Switch' on" + cset "name='Local DMICs Switch' on" + ] + + Value { + CapturePriority 300 + CapturePCM "hw:${CardId}" + JackControl "Mic Jack" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/bdw-rt5677/bdw-rt5677.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/bdw-rt5677/bdw-rt5677.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/bdw-rt5677/bdw-rt5677.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/bdw-rt5677/bdw-rt5677.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,9 @@ +Syntax 4 + +SectionUseCase."HiFi" { + File "/Intel/bdw-rt5677/HiFi.conf" + Comment "Default" +} + +Include.card-init.File "/lib/card-init.conf" +Include.ctl-remap.File "/lib/ctl-remap.conf" diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/broadwell-rt286/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/broadwell-rt286/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/broadwell-rt286/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/broadwell-rt286/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,102 @@ +# Use case Configuration for broadwell-rt286 + +SectionDevice."Speaker" { + Comment "Speakers" + + ConflictingDevice [ + "Headphones" + ] + + EnableSequence [ + cset "name='SPO Switch' on" + cset "name='Speaker Playback Switch' on" + cset "name='Speaker Switch' on" + ] + + DisableSequence [ + cset "name='Speaker Switch' off" + cset "name='Speaker Playback Switch' off" + cset "name='SPO Switch' off" + ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + PlaybackMixerElem "DAC0" + PlaybackMasterElem "Master" + } +} + +SectionDevice."Headphones" { + Comment "Headphones" + + ConflictingDevice [ + "Speaker" + ] + + EnableSequence [ + cset "name='HPO L Switch' on" + cset "name='HPO R Switch' on" + cset "name='Headphone Jack Switch' on" + ] + + DisableSequence [ + cset "name='Headphone Jack Switch' off" + cset "name='HPO L Switch' off" + cset "name='HPO R Switch' off" + ] + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + PlaybackMixerElem "DAC0" + PlaybackMasterElem "Master" + JackDev "rt286-jack" + JackControl "Headphone Jack" + } +} + +SectionDevice."Mic" { + Comment "Internal Microphone" + + ConflictingDevice [ + "Headset" + ] + + EnableSequence [ + cset "name='ADC 0 Mux' 2" + ] + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId}" + CaptureMixerElem "ADC0" + CaptureMasterElem "Mic" + } +} + +SectionDevice."Headset" { + Comment "Headset Microphone" + + ConflictingDevice [ + "Mic" + ] + + EnableSequence [ + cset "name='ADC 0 Mux' 0" + cset "name='AMIC Volume' 3" + ] + + DisableSequence [ + cset "name='AMIC Volume' 0" + ] + + Value { + CapturePriority 200 + CapturePCM "hw:${CardId}" + CaptureMixerElem "ADC0" + CaptureMasterElem "Mic" + JackDev "rt286-jack" + JackControl "Mic Jack" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/broadwell-rt286/broadwell-rt286.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/broadwell-rt286/broadwell-rt286.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/broadwell-rt286/broadwell-rt286.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/broadwell-rt286/broadwell-rt286.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,6 @@ +Syntax 2 + +SectionUseCase."HiFi" { + File "/Intel/broadwell-rt286/HiFi.conf" + Comment "Play HiFi quality Music" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/broxton-rt298/Hdmi.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/broxton-rt298/Hdmi.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/broxton-rt298/Hdmi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/broxton-rt298/Hdmi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,43 @@ +# Usecase for device HDMI1/Display Port stereo playback on Intel SKYLAKE/KABYLAKE platforms + +SectionDevice."HDMI1" { + Comment "HDMI/Display Port 1 Stereo" + + Value { + PlaybackPCM "hw:${CardId},4" + PlaybackPriority 500 + If.1 { + Condition { + Type ControlExists + Control "iface=CARD,name='HDMI/DP,pcm=4 Jack'" + } + True { + JackControl "HDMI/DP,pcm=4 Jack" + } + False { + JackControl "HDMI/DP, pcm=4 Jack" + } + } + } +} + +SectionDevice."HDMI2" { + Comment "HDMI/Display Port 2 Stereo" + + Value { + PlaybackPCM "hw:${CardId},5" + PlaybackPriority 600 + If.1 { + Condition { + Type ControlExists + Control "iface=CARD,name='HDMI/DP,pcm=5 Jack'" + } + True { + JackControl "HDMI/DP,pcm=5 Jack" + } + False { + JackControl "HDMI/DP, pcm=5 Jack" + } + } + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/broxton-rt298/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/broxton-rt298/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/broxton-rt298/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/broxton-rt298/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,112 @@ +# Usecase for stereo playback Speaker and Headset, Recording on DMIC and Headset MIC. +# For Audio in I2S mode on Intel Broxton platforms + +SectionVerb { + + EnableSequence [ + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + ] + + Value { + TQ "HiFi" + } +} + +SectionDevice."Speaker" { + Comment "Speaker" + + ConflictingDevice [ + "Headphones" + ] + + EnableSequence [ + cset "name='SPO Switch' 1" + cset "name='Speaker Playback Switch' 1,1" + cset "name='Speaker Switch' 1" + cset "name='HPO L Switch' 0" + cset "name='HPO R Switch' 0" + ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + } +} + +SectionDevice."Headphones" { + Comment "Headphones" + + ConflictingDevice [ + "Speaker" + ] + + EnableSequence [ + cset "name='HPO L Switch' 1" + cset "name='HPO R Switch' 1" + cset "name='Headphone Jack Switch' 1" + cset "name='Speaker Playback Switch' 0,0" + ] + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + JackControl "Headphone Jack" + JackHWMute "Speaker" + } +} + +SectionDevice."Mic" { + Comment "Digital Microphone" + + ConflictingDevice [ + "Headset" + ] + + EnableSequence [ + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + cset "name='media0_out mo codec0_in mi Switch' 0" + cset "name='Mic Jack Switch' 0" + + ] + + DisableSequence [ + cset "name='media0_out mo codec0_in mi Switch' 1" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 0" + cset "name='Mic Jack Switch' 1" + cset "name='ADC 0 Mux' 0" + ] + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId},1" + } +} + +SectionDevice."Headset" { + Comment "Headset Microphone" + + ConflictingDevice [ + "Mic" + ] + + EnableSequence [ + cset "name='media0_out mo codec0_in mi Switch' 1" + cset "name='ADC0 Capture Volume' 105,105" + cset "name='ADC 0 Mux' 0" + cset "name='Mic Jack Switch' 1" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 0" + ] + + DisableSequence [ + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + cset "name='media0_out mo codec0_in mi Switch' 0" + ] + + Value { + CapturePriority 200 + CapturePCM "hw:${CardId},1" + JackControl "Mic Jack" + } +} + +Include.hdmi.File "/Intel/broxton-rt298/Hdmi.conf" diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/broxton-rt298/broxton-rt298.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/broxton-rt298/broxton-rt298.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/broxton-rt298/broxton-rt298.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/broxton-rt298/broxton-rt298.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,41 @@ +# UCM for Intel Broxton platforms +# For Audio in I2S mode + +Syntax 3 + +SectionUseCase."HiFi" { + File "/Intel/broxton-rt298/HiFi.conf" + Comment "Play and record HiFi quality Music" +} + +SectionDefaults [ + cset "name='Headphone Jack Switch' 1" + cset "name='Speaker Switch' 1" + cset "name='Speaker Playback Switch' 0,0" + cset "name='Front DAC Switch' 1" + cset "name='Front RECMIX Switch' 0" + cset "name='Mic Jack Switch' 1" + cset "name='ADC 0 Mux' 2" + cset "name='ADC 1 Mux' 0" + cset "name='DAC0 Playback Volume' 100,100" + cset "name='HPO L Switch' 0" + cset "name='HPO Mux' 0" + cset "name='HPO R Switch' 0" + cset "name='Pin 5 Mux' 1" + cset "name='Pin 6 Mux' 2" + cset "name='Pin 7 Mux' 3" + cset "name='RECMIX Beep Switch' 0" + cset "name='RECMIX Line1 Switch' 0" + cset "name='RECMIX Mic1 Switch' 0" + cset "name='SPK Mux' 0" + cset "name='SPO Switch' 1" + cset "name='codec0_out mo codec0_in mi Switch' 0" + cset "name='codec0_out mo dmic01_hifi_in mi Switch' 0" + cset "name='codec0_out mo media0_in mi Switch' 1" + cset "name='codec1_out mo codec0_in mi Switch' 0" + cset "name='codec1_out mo dmic01_hifi_in mi Switch' 0" + cset "name='codec1_out mo media0_in mi Switch' 0" + cset "name='media0_out mo codec0_in mi Switch' 1" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + cset "name='media0_out mo media0_in mi Switch' 0" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/bytcht-cx2072x/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcht-cx2072x/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/bytcht-cx2072x/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcht-cx2072x/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,23 @@ +SectionVerb { + + Include.e.File "/codecs/cx2072x/EnableSeq.conf" + Include.d.File "/codecs/cx2072x/DisableSeq.conf" + + If.Controls { + Condition { + Type ControlExists + Control "name='media0_in Gain 0 Switch'" + } + Before.EnableSequence "0" + True { + Include.pe.File "/platforms/bytcr/PlatformEnableSeq.conf" + Include.pd.File "/platforms/bytcr/PlatformDisableSeq.conf" + } + } +} + +Include.spk.File "/codecs/cx2072x/Speaker.conf" +Include.hp.File "/codecs/cx2072x/HeadPhones.conf" + +Include.imic.File "/codecs/cx2072x/InternalMic.conf" +Include.hsmic.File "/codecs/cx2072x/HeadsetMic.conf" diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/bytcht-cx2072x/bytcht-cx2072x.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcht-cx2072x/bytcht-cx2072x.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/bytcht-cx2072x/bytcht-cx2072x.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcht-cx2072x/bytcht-cx2072x.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,6 @@ +Syntax 3 + +SectionUseCase."HiFi" { + File "/Intel/bytcht-cx2072x/HiFi.conf" + Comment "Play HiFi quality Music" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/bytcht-es8316/HiFi-Components.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcht-es8316/HiFi-Components.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/bytcht-es8316/HiFi-Components.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcht-es8316/HiFi-Components.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,43 @@ +If.spk { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-spk:2" + } + True.Include.spk.File "/codecs/es8316/Speaker.conf" +} + +If.mono { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-spk:1" + } + True.Include.mspk.File "/codecs/es8316/MonoSpeaker.conf" +} + +Include.hs.File "/codecs/es8316/HeadPhones.conf" + +If.in1 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-mic:in1" + } + True { + Include.mic.File "/codecs/es8316/IN1-InternalMic.conf" + Include.hsmic.File "/codecs/es8316/IN2-HeadsetMic.conf" + } +} + +If.in2 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-mic:in2" + } + True { + Include.hsmic.File "/codecs/es8316/IN1-HeadsetMic.conf" + Include.mic.File "/codecs/es8316/IN2-InternalMic.conf" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/bytcht-es8316/HiFi-LongName.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcht-es8316/HiFi-LongName.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/bytcht-es8316/HiFi-LongName.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcht-es8316/HiFi-LongName.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,43 @@ +If.spk { + Condition { + Type String + Haystack "${CardLongName}" + Needle "-stereo-spk" + } + True.Include.spk.File "/codecs/es8316/Speaker.conf" +} + +If.mono { + Condition { + Type String + Haystack "${CardLongName}" + Needle "-mono-spk" + } + True.Include.mspk.File "/codecs/es8316/MonoSpeaker.conf" +} + +Include.hs.File "/codecs/es8316/HeadPhones.conf" + +If.in1 { + Condition { + Type String + Haystack "${CardLongName}" + Needle "-in1-mic" + } + True { + Include.mic.File "/codecs/es8316/IN1-InternalMic.conf" + Include.hsmic.File "/codecs/es8316/IN2-HeadsetMic.conf" + } +} + +If.in2 { + Condition { + Type String + Haystack "${CardLongName}" + Needle "-in2-mic" + } + True { + Include.hsmic.File "/codecs/es8316/IN1-HeadsetMic.conf" + Include.mic.File "/codecs/es8316/IN2-InternalMic.conf" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/bytcht-es8316/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcht-es8316/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/bytcht-es8316/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcht-es8316/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,25 @@ +SectionVerb { + Include.e.File "/codecs/es8316/EnableSeq.conf" + + If.Controls { + Condition { + Type ControlExists + Control "name='media0_in Gain 0 Switch'" + } + Before.EnableSequence "0" + True { + Include.pe.File "/platforms/bytcr/PlatformEnableSeq.conf" + Include.pd.File "/platforms/bytcr/PlatformDisableSeq.conf" + } + } +} + +If.0 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-spk:" + } + True.Include.comp.File "/Intel/bytcht-es8316/HiFi-Components.conf" + False.Include.long.File "/Intel/bytcht-es8316/HiFi-LongName.conf" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/bytcht-es8316/bytcht-es8316.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcht-es8316/bytcht-es8316.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/bytcht-es8316/bytcht-es8316.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcht-es8316/bytcht-es8316.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,6 @@ +Syntax 3 + +SectionUseCase."HiFi" { + File "/Intel/bytcht-es8316/HiFi.conf" + Comment "Play HiFi quality Music" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/bytcr-rt5640/HiFi-Components.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcr-rt5640/HiFi-Components.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/bytcr-rt5640/HiFi-Components.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcr-rt5640/HiFi-Components.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,77 @@ +If.spk { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-spk:2" + } + True.Define.HaveSpeaker "2" +} + +If.mono { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-spk:1" + } + True.Define.HaveSpeaker "1" +} + +If.hp2 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-hp2:lineout" + } + True.Define.HaveHeadPhones2 "yes" +} + +If.dmic1 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-mic:dmic1" + } + True { + Define.HaveInternalMic "dmic" + Define.StereoADC2Mux "DMIC1" + } +} + +If.dmic2 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-mic:dmic2" + } + True { + Define.HaveInternalMic "dmic" + Define.StereoADC2Mux "DMIC2" + } +} + +If.in1 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-mic:in1" + } + True.Define.HaveInternalMic "in1" +} + +If.in3 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-mic:in3" + } + True.Define.HaveInternalMic "in3" +} + +If.hs2 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-hs2:in1" + } + True.Define.HaveHeadsetMic2 "in1" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/bytcr-rt5640/HiFi-LongName.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcr-rt5640/HiFi-LongName.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/bytcr-rt5640/HiFi-LongName.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcr-rt5640/HiFi-LongName.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,47 @@ +If.spk { + Condition { + Type String + Haystack "${CardLongName}" + Needle "-stereo-spk" + } + True.Define.HaveSpeaker "2" +} + +If.mono { + Condition { + Type String + Haystack "${CardLongName}" + Needle "-mono-spk" + } + True.Define.HaveSpeaker "1" +} + +If.dmic1 { + Condition { + Type String + Haystack "${CardLongName}" + Needle "-dmic1-mic" + } + True { + Define.HaveInternalMic "dmic" + Define.StereoADC2Mux "DMIC1" + } +} + +If.in1 { + Condition { + Type String + Haystack "${CardLongName}" + Needle "-in1-mic" + } + True.Define.HaveInternalMic "in1" +} + +If.in3 { + Condition { + Type String + Haystack "${CardLongName}" + Needle "-in3-mic" + } + True.Define.HaveInternalMic "in3" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/bytcr-rt5640/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcr-rt5640/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/bytcr-rt5640/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcr-rt5640/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,237 @@ +# Use case Configuration for bytcr-rt5640 + +Define.HaveAif "" +Define.HaveSpeaker "" +Define.HaveHeadPhones2 "" +Define.HaveInternalMic "" +Define.HaveHeadsetMic "yes" +Define.HaveHeadsetMic2 "" +Define.StereoADC2Mux "DMIC1" + +If.DefineAif1 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "aif:1" + } + True.Define.HaveAif "1" +} + +If.DefineAif2 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "aif:2" + } + True.Define.HaveAif "2" +} + +If.0 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-spk:" + } + True.Include.comp.File "/Intel/bytcr-rt5640/HiFi-Components.conf" + False.Include.long.File "/Intel/bytcr-rt5640/HiFi-LongName.conf" +} + +SectionVerb { + Include.e.File "/codecs/rt5640/EnableSeq.conf" + + EnableSequence [ + cset "name='Speaker Switch' off" + cset "name='Headphone Switch' off" + cset "name='Headset Mic Switch' off" + cset "name='Internal Mic Switch' off" + ] + + If.Controls { + Condition { + Type ControlExists + Control "name='media0_in Gain 0 Switch'" + } + Before.EnableSequence "0" + True { + Include.pe.File "/platforms/bytcr/PlatformEnableSeq.conf" + Include.pd.File "/platforms/bytcr/PlatformDisableSeq.conf" + } + } +} + +If.spk { + Condition { + Type String + Haystack "${var:HaveSpeaker}" + Needle "2" + } + True { + Include.spk.File "/codecs/rt5640/Speaker.conf" + + SectionDevice."Speaker" { + EnableSequence [ + cset "name='Speaker Switch' on" + ] + + DisableSequence [ + cset "name='Speaker Switch' off" + ] + } + } +} + +If.mono { + Condition { + Type String + Haystack "${var:HaveSpeaker}" + Needle "1" + } + True { + Include.mspk.File "/codecs/rt5640/MonoSpeaker.conf" + + SectionDevice."Speaker" { + EnableSequence [ + cset "name='Speaker Switch' on" + ] + + DisableSequence [ + cset "name='Speaker Switch' off" + ] + } + } +} + +If.hp { + Condition { Type String Empty "" } + True { + Include.hs.File "/codecs/rt5640/HeadPhones.conf" + + SectionDevice."Headphones" { + EnableSequence [ + cset "name='Headphone Switch' on" + ] + + DisableSequence [ + cset "name='Headphone Switch' off" + ] + } + } +} + +If.hp2 { + Condition { Type String Empty "${var:HaveHeadPhones2}" } + False { + Include.hs.File "/codecs/rt5640/HeadPhones2.conf" + + SectionDevice."Headphones2" { + EnableSequence [ + cset "name='Line Out Switch' on" + ] + + DisableSequence [ + cset "name='Line Out Switch' off" + ] + } + } +} + +If.dmic { + Condition { + Type String + Haystack "${var:HaveInternalMic}" + Needle "dmic" + } + True { + Include.dmic.File "/codecs/rt5640/DigitalMics.conf" + + SectionDevice."Mic" { + EnableSequence [ + cset "name='Internal Mic Switch' on" + ] + + DisableSequence [ + cset "name='Internal Mic Switch' off" + ] + } + } +} + +If.in1 { + Condition { + Type String + Haystack "${var:HaveInternalMic}" + Needle "in1" + } + True { + Include.mic1.File "/codecs/rt5640/IN1-InternalMic.conf" + + SectionDevice."Mic" { + EnableSequence [ + cset "name='Internal Mic Switch' on" + ] + + DisableSequence [ + cset "name='Internal Mic Switch' off" + ] + } + } +} + +If.in3 { + Condition { + Type String + Haystack "${var:HaveInternalMic}" + Needle "in3" + } + True { + Include.mic3.File "/codecs/rt5640/IN3-InternalMic.conf" + + SectionDevice."Mic" { + EnableSequence [ + cset "name='Internal Mic Switch' on" + ] + + DisableSequence [ + cset "name='Internal Mic Switch' off" + ] + } + } +} + +If.hsmic { + Condition { Type String Empty "" } + True { + Include.hsmic.File "/codecs/rt5640/HeadsetMic.conf" + + SectionDevice."Headset" { + EnableSequence [ + cset "name='Headset Mic Switch' on" + ] + + DisableSequence [ + cset "name='Headset Mic Switch' off" + ] + } + } +} + +If.hsmic2 { + Condition { + Type String + Haystack "${var:HaveHeadsetMic2}" + Needle "in1" + } + True { + Include.hsmic.File "/codecs/rt5640/HeadsetMic2-IN1.conf" + + SectionDevice."Headset2" { + EnableSequence [ + cset "name='Headset Mic 2 Switch' on" + ] + + DisableSequence [ + cset "name='Headset Mic 2 Switch' off" + ] + } + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/bytcr-rt5640/bytcr-rt5640.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcr-rt5640/bytcr-rt5640.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/bytcr-rt5640/bytcr-rt5640.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcr-rt5640/bytcr-rt5640.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,16 @@ +Syntax 4 + +SectionUseCase."HiFi" { + File "/Intel/bytcr-rt5640/HiFi.conf" + Comment "Play HiFi quality Music" +} + +Include.card-init.File "/lib/card-init.conf" +Include.ctl-remap.File "/lib/ctl-remap.conf" +Include.codec-init.File "/codecs/rt5640/init.conf" + +FixedBootSequence [ + exec "-/sbin/modprobe snd_ctl_led" + sysw "-/class/sound/ctl-led/speaker/card${CardNumber}/attach:Speaker Channel Switch" + sysw "-/class/sound/ctl-led/speaker/card${CardNumber}/attach:HP Channel Switch" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/bytcr-rt5651/HiFi-Components.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcr-rt5651/HiFi-Components.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/bytcr-rt5651/HiFi-Components.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcr-rt5651/HiFi-Components.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,85 @@ +If.spk { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-spk:2" + } + True { + Include.spk.File "/codecs/rt5651/Speaker.conf" + } +} + +If.mono { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-spk:1" + } + True { + Include.mspk.File "/codecs/rt5651/MonoSpeaker.conf" + } +} + +If.headphones { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-hp:lrswap" + } + True { + Include.hp.File "/codecs/rt5651/HeadPhones-swapped.conf" + } + False { + Include.hp.File "/codecs/rt5651/HeadPhones.conf" + } +} + +If.dmic { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-mic:dmic" + } + True { + Include.dmic.File "/codecs/rt5651/DigitalMic.conf" + Include.hsmic.File "/codecs/rt5651/IN2-HeadsetMic.conf" + SectionDevice."Mic".ConflictingDevice.0 "Headset" + } + False { + Include.hsmic.File "/codecs/rt5651/IN3-HeadsetMic.conf" + } +} + +If.in2 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-mic:in2" + } + True { + Include.mic.File "/codecs/rt5651/IN2-InternalMic.conf" + } +} + +If.in12 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-mic:in12" + } + True { + Include.mic.File "/codecs/rt5651/IN12-InternalMic.conf" + } + False { + If.in1 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-mic:in1" + } + True { + Include.mic.File "/codecs/rt5651/IN1-InternalMic.conf" + } + } + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/bytcr-rt5651/HiFi-LongName.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcr-rt5651/HiFi-LongName.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/bytcr-rt5651/HiFi-LongName.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcr-rt5651/HiFi-LongName.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,83 @@ +If.spk { + Condition { + Type String + Haystack "${CardLongName}" + Needle "-stereo-spk" + } + True { + Include.spk.File "/codecs/rt5651/Speaker.conf" + } +} + +If.mono { + Condition { + Type String + Haystack "${CardLongName}" + Needle "-mono-spk" + } + True { + Include.mspk.File "/codecs/rt5651/MonoSpeaker.conf" + } +} + +If.headphones { + Condition { + Type String + Haystack "${CardLongName}" + Needle "-mic-hp-swapped" + } + True { + Include.hp.File "/codecs/rt5651/HeadPhones-swapped.conf" + } + False { + Include.hp.File "/codecs/rt5651/HeadPhones.conf" + } +} + +If.dmic1 { + Condition { + Type String + Haystack "${CardLongName}" + Needle "-dmic1-mic" + } + True { + Include.dmic.File "/codecs/rt5651/DigitalMic.conf" + Include.hsmic.File "/codecs/rt5651/IN2-HeadsetMic.conf" + } + False { + Include.hsmic.File "/codecs/rt5651/IN3-HeadsetMic.conf" + } +} + +If.in1 { + Condition { + Type String + Haystack "${CardLongName}" + Needle "-in1-mic" + } + True { + Include.mic.File "/codecs/rt5651/IN1-InternalMic.conf" + } +} + +If.in2 { + Condition { + Type String + Haystack "${CardLongName}" + Needle "-in2-mic" + } + True { + Include.mic.File "/codecs/rt5651/IN2-InternalMic.conf" + } +} + +If.in12 { + Condition { + Type String + Haystack "${CardLongName}" + Needle "-in12-mic" + } + True { + Include.mic.File "/codecs/rt5651/IN12-InternalMic.conf" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/bytcr-rt5651/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcr-rt5651/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/bytcr-rt5651/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcr-rt5651/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,33 @@ +# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 + + +SectionVerb { + + Include.e.File "/codecs/rt5651/EnableSeq.conf" + + If.Controls { + Condition { + Type ControlExists + Control "name='media0_in Gain 0 Switch'" + } + Before.EnableSequence "0" + True { + Include.pe.File "/platforms/bytcr/PlatformEnableSeq.conf" + Include.pd.File "/platforms/bytcr/PlatformDisableSeq.conf" + } + } +} + +If.0 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-spk:" + } + True { + Include.comp.File "/Intel/bytcr-rt5651/HiFi-Components.conf" + } + False { + Include.long.File "/Intel/bytcr-rt5651/HiFi-LongName.conf" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/bytcr-rt5651/bytcr-rt5651.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcr-rt5651/bytcr-rt5651.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/bytcr-rt5651/bytcr-rt5651.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcr-rt5651/bytcr-rt5651.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,12 @@ +# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 + +Syntax 4 + +SectionUseCase."HiFi" { + File "/Intel/bytcr-rt5651/HiFi.conf" + Comment "Play HiFi quality Music" +} + +Include.card-init.File "/lib/card-init.conf" +Include.ctl-remap.File "/lib/ctl-remap.conf" +Include.codec-init.File "/codecs/rt5651/init.conf" diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/bytcr-wm5102/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcr-wm5102/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/bytcr-wm5102/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcr-wm5102/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,27 @@ +SectionVerb { + + Value { + TQ "HiFi" + } + + Include.e.File "/codecs/wm5102/EnableSeq.conf" + + If.Controls { + Condition { + Type ControlExists + Control "name='media0_in Gain 0 Switch'" + } + True { + Include.pe { + File "/platforms/bytcr/PlatformEnableSeq.conf" + Before.EnableSequence "0" + } + Include.pd.File "/platforms/bytcr/PlatformDisableSeq.conf" + } + } +} + +Include.spk.File "/codecs/wm5102/Speaker.conf" +Include.hp.File "/codecs/wm5102/HeadPhones.conf" +Include.mic.File "/codecs/wm5102/IN3-InternalMic.conf" +Include.headset.File "/codecs/wm5102/IN1-HeadsetMic.conf" diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/bytcr-wm5102/bytcr-wm5102.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcr-wm5102/bytcr-wm5102.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/bytcr-wm5102/bytcr-wm5102.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/bytcr-wm5102/bytcr-wm5102.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,6 @@ +Syntax 3 + +SectionUseCase."HiFi" { + File "/Intel/bytcr-wm5102/HiFi.conf" + Comment "Play HiFi quality Music" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/cht-bsw-rt5672/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/cht-bsw-rt5672/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/cht-bsw-rt5672/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/cht-bsw-rt5672/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,155 @@ +# Adapted from https://github.com/plbossart/UCM/tree/master/cht-bsw-rt5672 + +Define.Speaker "yes" +Define.Headphones "yes" +Define.MonoSpeaker "yes" +Define.DigitalMic1 "yes" +Define.DigitalMic2 "yes" +Define.HeadsetMic "yes" + +# Figure out which components are in use on the device, we check both the +# components string (present on newer kernels) as well as checking for DMI +# strings for compatibility with older kernels. Note DMI matches for new +# models should only be added to the kernel, this UCM profile will then +# automatically pick up the info from the components string. + +If.components-stereo-spk { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-spk:2" + } + True.Define.MonoSpeaker "" +} + +If.components-dmic1 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-mic:dmic1" + } + True.Define.DigitalMic2 "" +} + +If.components-dmic2 { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-mic:dmic2" + } + True.Define.DigitalMic1 "" +} + +If.dmi-dmic1 { + Condition { + Type RegexMatch + String "${CardLongName}" + Regex "(LENOVO.*LenovoMiix210)|(LENOVO.*ThinkPad10)" + } + True { + Define.MonoSpeaker "" + Define.DigitalMic2 "" + } +} + +If.dmi-dmic2 { + Condition { + Type RegexMatch + String "${CardLongName}" + Regex "(LENOVO.*ThinkPad8)" + } + True { + Define.MonoSpeaker "" + Define.DigitalMic1 "" + } +} + +SectionVerb { + Include.e.File "/codecs/rt5672/EnableSeq.conf" + + If.Controls { + Condition { + Type ControlExists + Control "name='media0_in Gain 0 Switch'" + } + Before.EnableSequence "0" + True { + Include.pe.File "/platforms/bytcr/PlatformEnableSeq.conf" + Include.pd.File "/platforms/bytcr/PlatformDisableSeq.conf" + } + } +} + +If.spk { + Condition { + Type String + Empty "${var:Speaker}" + } + False.Include.spk.File "/codecs/rt5672/Speaker.conf" +} + +If.mspk { + Condition { + Type String + Empty "${var:MonoSpeaker}" + } + True { + RenameDevice."Speaker1" "Speaker" + RemoveDevice."Speaker2" "Speaker2" + } + False.Include.mspk.File "/codecs/rt5672/MonoSpeaker.conf" +} + +If.hp { + Condition { + Type String + Empty "${var:Headphones}" + } + #True.RemoveDevice."Headphones" "Headphones" + False.Include.hp.File "/codecs/rt5672/HeadPhones.conf" +} + +If.dmic1 { + Condition { + Type String + Empty "${var:DigitalMic1}" + } + True.RemoveDevice."Mic1" "Mic1" + False { + Include.dmic1.File "/codecs/rt5672/DMIC1.conf" + If.dmic2 { + Condition { + Type "String" + Empty "${var:DigitalMic2}" + } + True.RenameDevice."Mic1" "Mic" + } + } +} + +If.dmic2 { + Condition { + Type String + Empty "${var:DigitalMic2}" + } + True.RemoveDevice."Mic2" "Mic2" + False { + Include.dmic2.File "/codecs/rt5672/DMIC2.conf" + If.dmic1 { + Condition { + Type "String" + Empty "${var:DigitalMic1}" + } + True.RenameDevice."Mic2" "Mic" + } + } +} + +If.hsmic { + Condition { + Type String + Empty "${var:HeadsetMic}" + } + #True.RemoveDevice."Headset" "Headset" + False.Include.hsmic.File "/codecs/rt5672/HeadsetMic.conf" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/cht-bsw-rt5672/cht-bsw-rt5672.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/cht-bsw-rt5672/cht-bsw-rt5672.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/cht-bsw-rt5672/cht-bsw-rt5672.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/cht-bsw-rt5672/cht-bsw-rt5672.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,14 @@ +# Adapted from https://github.com/plbossart/UCM/tree/master/cht-bsw-rt5672 + +Syntax 3 + +SectionUseCase."HiFi" { + File "/Intel/cht-bsw-rt5672/HiFi.conf" + Comment "Play HiFi quality Music" +} + +FixedBootSequence [ + exec "-/sbin/modprobe snd_ctl_led" + sysw "-/class/sound/ctl-led/speaker/card${CardNumber}/attach:DAC1 Playback Switch" + sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:ADC Capture Switch" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/chtmax98090/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/chtmax98090/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/chtmax98090/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/chtmax98090/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,36 @@ +SectionVerb { + Value { + TQ "HiFi" + } + + Include.e.File "/codecs/max98090/EnableSeq.conf" + + If.platform { + Condition { + Type ControlExists + Control "name='media0_in Gain 0 Switch'" + } + Before.EnableSequence "0" + True.Include.pe.File "/platforms/bytcr/PlatformEnableSeq.conf" + } + + If.Quawks { + Condition { + Type String + Haystack "${CardLongName}" + Needle "GOOGLE-Quawks-1.0" + } + True { + EnableSequence [ + # volume values modified + cset "name='Headphone Volume' 25" + cset "name='Speaker Volume' 32" + ] + } + } +} + +Include.hs.File "/codecs/max98090/Headphones.conf" +Include.spk.File "/codecs/max98090/Speaker.conf" +Include.mic.File "/codecs/max98090/InternalMic.conf" +Include.hsmic.File "/codecs/max98090/HeadsetMic.conf" diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/chtmax98090/chtmax98090.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/chtmax98090/chtmax98090.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/chtmax98090/chtmax98090.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/chtmax98090/chtmax98090.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,5 @@ +Syntax 3 +SectionUseCase."HiFi" { + File "/Intel/chtmax98090/HiFi.conf" + Comment "Play HiFi quality Music" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/chtnau8824/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/chtnau8824/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/chtnau8824/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/chtnau8824/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,75 @@ +Define.Speaker "Speaker" +Define.Mic "InternalMic" +Define.SST "yes" +Define.RightOutputChannel 1 + +If.Controls { + Condition { + Type ControlExists + Control "name='media0_in Gain 0 Switch'" + } + False { + Define.SST "" + Define.RightOutputChannel 0 + } +} + +If.cfg-mspk { + Condition { + Type RegexMatch + String "${CardLongName}" + Regex "(cube-i1_TF|PIPO-W2S)" + } + True { + Define.Speaker "MonoSpeaker" + } +} + +If.cfg-mic { + Condition { + Type RegexMatch + String "${CardLongName}" + # Medion E22??T models put DMIC in their product version + # when using DMICs + Regex "(MEDION-E22..T.*-DMIC-)" + } + True { + Define.Mic "DMIC1_2" + } +} + +SectionVerb { + + Value { + TQ "HiFi" + } + + Include.e.File "/codecs/nau8824/EnableSeq.conf" + + If.SST { + Condition { + Type String + Empty "${var:SST}" + } + False { + Include.pe { + File "/platforms/bytcr/PlatformEnableSeq.conf" + Before.EnableSequence "0" + } + Include.pd.File "/platforms/bytcr/PlatformDisableSeq.conf" + } + } +} + +# The includes using $vars in there path must be conditional otherwise the +# $var gets expanded before the other If-s above can change the vars. +If.cfg-includes { + Condition { Type String Empty "" } + True { + Include.spk.File "/codecs/nau8824/${var:Speaker}.conf" + Include.hp.File "/codecs/nau8824/HeadPhones.conf" + + Include.mic.File "/codecs/nau8824/${var:Mic}.conf" + Include.hsmic.File "/codecs/nau8824/HeadsetMic.conf" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/chtnau8824/chtnau8824.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/chtnau8824/chtnau8824.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/chtnau8824/chtnau8824.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/chtnau8824/chtnau8824.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,8 @@ +Syntax 3 + +Comment "chtnau8824 internal card" + +SectionUseCase."HiFi" { + File "/Intel/chtnau8824/HiFi.conf" + Comment "Default" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/chtrt5645/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/chtrt5645/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/chtrt5645/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/chtrt5645/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,208 @@ +Define.MonoSpeaker "" +Define.AnalogMic "yes" +Define.DigitalMic "" + +If.cfg-dmic1 { + Condition { + Type RegexMatch + String "${CardLongName}" + Regex "(ASUSTeK.*T100HAN|ASUSTeK.*T101HA)" + } + True { + Define.AnalogMic "" + Define.DigitalMic "DMIC1" + } +} + +If.cfg-dmic2 { + Condition { + Type RegexMatch + String "${CardLongName}" + Regex "(LENOVO.*LenovoMIIX320|MEDION.*Wingman|Standard-EF20EA-1.0)" + } + True { + Define.AnalogMic "" + Define.DigitalMic "DMIC2" + } +} + +If.cfg-mspk { + Condition { + Type RegexMatch + String "${CardLongName}" + Regex "(gpd-win-pocket-rt5645|TECLAST-X80Pro)" + } + True { + Define.MonoSpeaker "yes" + } +} + +SectionVerb { + # ALSA PCM + Value { + TQ "HiFi" + } + + Include.ce.File "/codecs/rt5645/EnableSeq.conf" + Include.cd.File "/codecs/rt5645/DisableSeq.conf" + + EnableSequence [ + cset "name='Stereo1 ADC1 Mux' 1" + cset "name='I2S2 Func Switch' on" + # 3/12 the headphone mic tends to be quite loud + cset "name='IN1 Boost' 3" + # 8/8 the internal analog mic tends to be quite soft + cset "name='IN2 Boost' 8" + ] + + If.Controls { + Condition { + Type ControlExists + Control "name='media0_in Gain 0 Switch'" + } + Before.EnableSequence "0" + True { + Include.pe.File "/platforms/bytcr/PlatformEnableSeq.conf" + Include.pd.File "/platforms/bytcr/PlatformDisableSeq.conf" + } + } +} + +SectionDevice."Speaker" { + Comment "Speaker" + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + } + + ConflictingDevice [ + "Headphones" + ] + + Include.e.File "/codecs/rt5645/SpeakerEnableSeq.conf" + + If.mspk { + Condition { + Type String + Empty "${var:MonoSpeaker}" + } + False { + EnableSequence [ + # Monospeaker: Mix right to left + cset "name='Stereo DAC MIXL DAC R1 Switch' 1" + cset "name='Stereo DAC MIXR DAC R1 Switch' 0" + ] + DisableSequence [ + # Undo monospeaker mixing + cset "name='Stereo DAC MIXL DAC R1 Switch' 0" + cset "name='Stereo DAC MIXR DAC R1 Switch' 1" + ] + } + } + + DisableSequence [ + cset "name='Ext Spk Switch' off" + cset "name='Speaker Channel Switch' off" + ] +} + +SectionDevice."Headphones" { + Comment "Headphones" + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + JackControl "Headphone Jack" + } + + ConflictingDevice [ + "Speaker" + ] + + Include.e.File "/codecs/rt5645/HeadphonesEnableSeq.conf" + + DisableSequence [ + cset "name='Headphone Switch' off" + cset "name='Headphone Channel Switch' off" + ] +} + +If.amic { + Condition { + Type String + Empty "${var:AnalogMic}" + } + Before.SectionDevice "Headset" + False.Include.amic.File "/codecs/rt5645/AnalogMic.conf" +} + +If.dmic { + Condition { + Type String + Empty "${var:DigitalMic}" + } + Before.SectionDevice "Headset" + False { + SectionDevice."Mic" { + Comment "Internal Microphone" + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId}" + } + + Include.e.File "/codecs/rt5645/DigitalMicEnableSeq.conf" + Include.d.File "/codecs/rt5645/DigitalMicDisableSeq.conf" + + EnableSequence [ + cset "name='Stereo1 ADC2 Mux' DMIC" + cset "name='Mono ADC L2 Mux' DMIC" + cset "name='Mono ADC R2 Mux' DMIC" + ] + + If.dmic2 { + Condition { + Type String + String1 "${var:DigitalMic}" + String2 "DMIC1" + } + True { + EnableSequence [ + cset "name='Stereo1 DMIC Mux' DMIC1" + ] + } + False { + EnableSequence [ + cset "name='Stereo1 DMIC Mux' DMIC2" + cset "name='Mono DMIC L Mux' DMIC2" + cset "name='Mono DMIC R Mux' DMIC2" + ] + } + } + } + } +} + +SectionDevice."Headset" { + Comment "Headset Microphone" + + Value { + CapturePriority 200 + CapturePCM "hw:${CardId}" + JackControl "Headset Mic Jack" + } + + Include.e.File "/codecs/rt5645/HSMicEnableSeq.conf" + Include.d.File "/codecs/rt5645/HSMicDisableSeq.conf" + + EnableSequence [ + cset "name='Sto1 ADC MIXL ADC2 Switch' off" + cset "name='Sto1 ADC MIXR ADC2 Switch' off" + + cset "name='Mono ADC MIXL ADC1 Switch' on" + cset "name='Mono ADC MIXR ADC1 Switch' on" + cset "name='Mono ADC MIXL ADC2 Switch' off" + cset "name='Mono ADC MIXR ADC2 Switch' off" + ] +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/chtrt5645/chtrt5645.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/chtrt5645/chtrt5645.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/chtrt5645/chtrt5645.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/chtrt5645/chtrt5645.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,11 @@ +Syntax 4 +Comment "Intel SoC Audio Device" + +SectionUseCase."HiFi" { + File "/Intel/chtrt5645/HiFi.conf" + Comment "Default" +} + +Include.card-init.File "/lib/card-init.conf" +Include.ctl-remap.File "/lib/ctl-remap.conf" +Include.codec-init.File "/codecs/rt5645/init.conf" diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/chtrt5650/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/chtrt5650/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/chtrt5650/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/chtrt5650/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,116 @@ + +SectionVerb { + # ALSA PCM + Value { + TQ "HiFi" + } + + Include.e.File "/codecs/rt5645/EnableSeq.conf" + Include.d.File "/codecs/rt5645/DisableSeq.conf" + + If.Controls { + Condition { + Type ControlExists + Control "name='media0_in Gain 0 Switch'" + } + Before.EnableSequence "0" + True { + Include.pe.File "/platforms/bytcr/PlatformEnableSeq.conf" + Include.pd.File "/platforms/bytcr/PlatformDisableSeq.conf" + } + } + + EnableSequence [ + cset "name='Speaker HWEQ' 1,164,237,135,1,165,0,0,1,166,237,135,1,167,0,0,1,192,30,196,1,193,0,0,1,194,30,196,1,195,0,0,1,196,31,180,1,197,0,75,1,198,31,180,1,199,31,180,1,200,0,75,1,201,31,180,0,177,51,224" + cset "name='DAC1 Playback Volume' 77,77" + cset "name='Speaker ClassD Playback Volume' 4" + cset "name='I2S2 Func Switch' off" + cset "name='RT5650 IF1 ADC Mux' 0" + ] +} + +SectionDevice."Speaker" { + Comment "Speaker" + + Value { + PlaybackPCM "hw:${CardId}" + PlaybackPriority 100 + } + + ConflictingDevice [ + "Headphones" + ] + + Include.spk.File "/codecs/rt5645/SpeakerEnableSeq.conf" + + DisableSequence [ + cset "name='Ext Spk Switch' off" + cset "name='Speaker Channel Switch' off" + ] +} + +SectionDevice."Headphones" { + Comment "Headphones" + + Value { + PlaybackPCM "hw:${CardId}" + PlaybackPriority 200 + JackControl "Headphone Jack" + JackHWMute "Speaker" + } + + ConflictingDevice [ + "Speaker" + ] + + Include.hse.File "/codecs/rt5645/HeadphonesEnableSeq.conf" + + DisableSequence [ + cset "name='Headphone Switch' off" + cset "name='Headphone Channel Switch' off" + ] +} + +SectionDevice."Mic1" { + Comment "Internal Microphone" + + Value { + CapturePCM "hw:${CardId}" + CapturePriority 100 + } + + EnableSequence [ + cset "name='Int Mic Switch' on" + cset "name='Sto1 ADC MIXL ADC2 Switch' on" + cset "name='Sto1 ADC MIXR ADC2 Switch' on" + ] + + DisableSequence [ + cset "name='Sto1 ADC MIXL ADC2 Switch' off" + cset "name='Sto1 ADC MIXR ADC2 Switch' off" + cset "name='Int Mic Switch' off" + ] +} + +SectionDevice."Mic2" { + Comment "Headset Microphone" + + Value { + CapturePCM "hw:${CardId}" + CapturePriority 200 + JackControl "Headset Mic Jack" + JackHWMute "Mic1" + } + + Include.hsmice.File "/codecs/rt5645/HSMicEnableSeq.conf" + + EnableSequence [ + cset "name='IN1 Boost' 1" + ] + + Include.hsmicd.File "/codecs/rt5645/HSMicDisableSeq.conf" + + DisableSequence [ + cset "name='IN1 Boost' 0" + ] +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/chtrt5650/chtrt5650.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/chtrt5650/chtrt5650.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/chtrt5650/chtrt5650.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/chtrt5650/chtrt5650.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,6 @@ +Comment "Intel SoC Audio Device" +Syntax 3 +SectionUseCase."HiFi" { + File "/Intel/chtrt5650/HiFi.conf" + Comment "Default" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/hda-dsp/Hdmi1.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/hda-dsp/Hdmi1.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/hda-dsp/Hdmi1.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/hda-dsp/Hdmi1.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,24 @@ +# Usecase for device HDMI1/Display Port stereo playback on Intel cAVS platforms +# For Audio in HDA mode + +SectionDevice."HDMI1" { + Comment "HDMI/Display Port 1 Stereo" + + Value { + PlaybackPriority 300 + PlaybackPCM "hw:${CardId},10" + If.1 { + Condition { + Type ControlExists + Control "iface=CARD,name='HDMI/DP,pcm=17 Jack'" + } + True { + JackControl "HDMI/DP,pcm=17 Jack" + } + False { + JackControl "HDMI/DP, pcm=17 Jack" + } + } + } +} + diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/hda-dsp/Hdmi2.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/hda-dsp/Hdmi2.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/hda-dsp/Hdmi2.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/hda-dsp/Hdmi2.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,23 @@ +# Usecase for device HDMI2/Display Port stereo playback on Intel cAVS platforms +# For Audio in HDA mode + +SectionDevice."HDMI2" { + Comment "HDMI/Display Port 2 Stereo" + + Value { + PlaybackPriority 400 + PlaybackPCM "hw:${CardId},11" + If.1 { + Condition { + Type ControlExists + Control "iface=CARD,name='HDMI/DP,pcm=18 Jack'" + } + True { + JackControl "HDMI/DP,pcm=18 Jack" + } + False { + JackControl "HDMI/DP, pcm=18 Jack" + } + } + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/hda-dsp/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/hda-dsp/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/hda-dsp/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/hda-dsp/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,96 @@ +# Usecase for stereo playback Speaker and Headset, Recording on DMIC and Headset MIC. +# For Audio in HDA mode on Intel cAVS platforms + +SectionVerb { + + EnableSequence [ + cset "name='mch_cap_out mo mch_cap_in mi Switch' 1" + ] + + Value { + TQ "HiFi" + } +} + +SectionDevice."Headphones" { + Comment "Headphones" + + ConflictingDevice [ + "Speaker" + ] + + EnableSequence [ + cset "name='Headphone Playback Switch' 1,1" + cset "name='Speaker Playback Switch' 0,0" + ] + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId},7" + PlaybackMixerElem "Headphone" + PlaybackMasterElem "Master" + PlaybackVolume "Headphone Playback Volume" + PlaybackSwitch "Headphone Playback Switch" + JackControl "Front Headphone Jack" + JackHWMute "Speaker" + } +} + +SectionDevice."Speaker" { + Comment "Speaker" + + ConflictingDevice [ + "Headphones" + ] + + EnableSequence [ + cset "name='Headphone Playback Switch' 0,0" + cset "name='Speaker Playback Switch' 1,1" + ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId},7" + PlaybackMixerElem "Speaker" + PlaybackMasterElem "Master" + PlaybackVolume "Speaker Playback Volume" + PlaybackSwitch "Speaker Playback Switch" + } +} + +SectionDevice."Headset" { + Comment "Headset Microphone" + + ConflictingDevice [ + "Mic" + ] + + EnableSequence [ + cset "name='media0_out mo codec0_in mi Switch' 1" + ] + + Value { + CapturePriority 200 + CapturePCM "hw:${CardId},7" + } +} + +SectionDevice."Mic" { + Comment "Digital Microphone" + + ConflictingDevice [ + "Headset" + ] + + EnableSequence [ + cset "name='mch_cap_out mo mch_cap_in mi Switch' 1" + ] + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId},13" + } +} + +Include.hdmi1.File "/Intel/hda-dsp/Hdmi1.conf" +Include.hdmi2.File "/Intel/hda-dsp/Hdmi2.conf" diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/hda-dsp/hda-dsp.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/hda-dsp/hda-dsp.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/hda-dsp/hda-dsp.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/hda-dsp/hda-dsp.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,16 @@ +# UCM for Intel CAVS platforms +# For Audio in HDA and DMIC mode + +Syntax 3 + +SectionUseCase."HiFi" { + File "/Intel/hda-dsp/HiFi.conf" + Comment "Play HiFi quality Music" +} + +SectionDefaults [ + cset "name='Master Playback Switch' 1" + cset "name='codec0_out mo media0_in mi Switch' 1" + cset "name='media0_out mo codec0_in mi Switch' 1" + cset "name='mch_cap_out mo mch_cap_in mi Switch' 1" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/kblrt5660/Hdmi1.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/kblrt5660/Hdmi1.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/kblrt5660/Hdmi1.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/kblrt5660/Hdmi1.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,23 @@ +# Usecase for device HDMI1/Display Port stereo playback on Intel KABYLAKE platforms +# For Audio in I2S mode + +SectionDevice."HDMI1" { + Comment "HDMI/Display Port 1 Stereo" + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId},2" + If.1 { + Condition { + Type ControlExists + Control "iface=CARD,name='HDMI/DP,pcm=4 Jack'" + } + True { + JackControl "HDMI/DP,pcm=4 Jack" + } + False { + JackControl "HDMI/DP, pcm=4 Jack" + } + } + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/kblrt5660/Hdmi2.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/kblrt5660/Hdmi2.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/kblrt5660/Hdmi2.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/kblrt5660/Hdmi2.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,23 @@ +# Usecase for device HDMI1/Display Port stereo playback on Intel KABYLAKE platforms +# For Audio in I2S mode + +SectionDevice."HDMI2" { + Comment "HDMI/Display Port 2 Stereo" + + Value { + PlaybackPriority 300 + PlaybackPCM "hw:${CardId},3" + If.1 { + Condition { + Type ControlExists + Control "iface=CARD,name='HDMI/DP,pcm=5 Jack'" + } + True { + JackControl "HDMI/DP,pcm=5 Jack" + } + False { + JackControl "HDMI/DP, pcm=5 Jack" + } + } + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/kblrt5660/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/kblrt5660/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/kblrt5660/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/kblrt5660/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,77 @@ +# UCM for Intel Kabylake platforms with RT5660 +# For Audio in I2S mode + +LibraryConfig.remap.Config { + + ctl.default.remap { + "name='IN1 Boost Volume'" "name='IN1 Boost Capture Volume'" + "name='IN2 Boost Volume'" "name='IN2 Boost Capture Volume'" + "name='IN3 Boost Volume'" "name='IN3 Boost Capture Volume'" + "name='STO1 ADC Boost Gain Volume'" "name='STO1 ADC Boost Capture Volume'" + } + +} + +SectionDevice."Line1" { + Comment "Line playback" + + EnableSequence [ + cset "name='DAC1 Playback Volume' 30" + cset "name='OUT Playback Volume' 19" + cset "name='OUT Playback Switch' on" + cset "name='codec0_out mo media0_in mi Switch' on" + cset "name='DAC1 MIXL DAC1 Switch' on" + cset "name='DAC1 MIXR DAC1 Switch' on" + cset "name='Stereo DAC MIXL DAC L1 Switch' on" + cset "name='Stereo DAC MIXR DAC L1 Switch' off" + cset "name='Stereo DAC MIXR DAC R1 Switch' on" + cset "name='Stereo DAC MIXL DAC R1 Switch' off" + cset "name='LOUT MIX DAC Switch' on" + cset "name='Line Out Switch' on" + ] + + DisableSequence [ + cset "name='Line Out Switch' off" + cset "name='DAC1 MIXL DAC1' off" + cset "name='DAC1 MIXR DAC1' off" + ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + JackDev "rt5660-jack" + JackControl "Line Out Jack" + } +} + +SectionDevice."Line2" { + Comment "Line capture" + + EnableSequence [ + cset "name='ADC Capture Volume' 30" + cset "name='IN1 Boost Volume' 30" + cset "name='IN2 Boost Volume' 30" + cset "name='STO1 ADC Boost Gain Volume' 1" + cset "name='RECMIXL BST1 Switch' off" + cset "name='RECMIXR BST1 Switch' on" + cset "name='RECMIXL BST2 Switch' on" + cset "name='RECMIXR BST2 Switch' off" + cset "name='Line In Switch' on" + cset "name='Sto1 ADC MIXR ADC1 Switch' on" + cset "name='Sto1 ADC MIXL ADC1 Switch' on" + cset "name='media0_out mo codec0_in mi Switch' on" + ] + + DisableSequence [ + cset "name='Line In Switch' off" + cset "name='Sto1 ADC MIXR ADC1 Switch' off" + cset "name='Sto1 ADC MIXL ADC1 Switch' off" + ] + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId},1" + JackDev "rt5660-jack" + JackControl "Line In Jack" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/kblrt5660/kblrt5660.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/kblrt5660/kblrt5660.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/kblrt5660/kblrt5660.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/kblrt5660/kblrt5660.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,19 @@ +Syntax 4 + +SectionUseCase."HiFi" { + File "/Intel/kblrt5660/HiFi.conf" + Comment "Play HiFi quality Music" +} + +SectionUseCase."Hdmi1" { + File "/Intel/kblrt5660/Hdmi1.conf" + Comment "Play on Hdmi/DP 1" +} + +SectionUseCase."Hdmi2" { + File "/Intel/kblrt5660/Hdmi2.conf" + Comment "Play on Hdmi/DP 2" +} + +Include.card-init.File "/lib/card-init.conf" +Include.ctl-remap.File "/lib/ctl-remap.conf" diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/skylake-rt286/Hdmi1.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/skylake-rt286/Hdmi1.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/skylake-rt286/Hdmi1.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/skylake-rt286/Hdmi1.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,23 @@ +# Usecase for device HDMI1/Display Port stereo playback on Intel SKYLAKE/KABYLAKE platforms +# For Audio in I2S mode + +SectionDevice."HDMI1" { + Comment "HDMI/Display Port 1 Stereo" + + Value { + PlaybackPriority 300 + PlaybackPCM "hw:${CardId},4" + If.1 { + Condition { + Type ControlExists + Control "iface=CARD,name='HDMI/DP,pcm=4 Jack'" + } + True { + JackControl "HDMI/DP,pcm=4 Jack" + } + False { + JackControl "HDMI/DP, pcm=4 Jack" + } + } + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/skylake-rt286/Hdmi2.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/skylake-rt286/Hdmi2.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/skylake-rt286/Hdmi2.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/skylake-rt286/Hdmi2.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,23 @@ +# Usecase for device HDMI2/Display Port stereo playback on Intel SKYLAKE/KABYLAKE platforms +# For Audio in I2S mode + +SectionDevice."HDMI2" { + Comment "HDMI/Display Port 2 Stereo" + + Value { + PlaybackPriority 400 + PlaybackPCM "hw:${CardId},5" + If.1 { + Condition { + Type ControlExists + Control "iface=CARD,name='HDMI/DP,pcm=5 Jack'" + } + True { + JackControl "HDMI/DP,pcm=5 Jack" + } + False { + JackControl "HDMI/DP, pcm=5 Jack" + } + } + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/skylake-rt286/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/skylake-rt286/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/skylake-rt286/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/skylake-rt286/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,112 @@ +# Usecase for stereo playback Speaker and Headset, Recording on DMIC and Headset MIC. +# For Audio in I2S mode on Intel SKYLAKE/KABYLAKE platforms + +SectionVerb { + EnableSequence [ + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + ] + + Value { + TQ "HiFi" + } +} + +SectionDevice."Headphones" { + Comment "Headphones" + + ConflictingDevice [ + "Speaker" + ] + + EnableSequence [ + cset "name='HPO L Switch' 1" + cset "name='HPO R Switch' 1" + cset "name='Headphone Jack Switch' 1" + cset "name='Speaker Playback Switch' 0,0" + ] + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + JackControl "Headphone Jack" + JackHWMute "Speaker" + } +} + +SectionDevice."Speaker" { + Comment "Speaker" + + ConflictingDevice [ + "Headphones" + ] + + EnableSequence [ + cset "name='SPO Switch' 1" + cset "name='Speaker Playback Switch' 1,1" + cset "name='Speaker Switch' 1" + cset "name='HPO L Switch' 0" + cset "name='HPO R Switch' 0" + ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + } +} + +SectionDevice."Headset" { + Comment "Headset Microphone" + + ConflictingDevice [ + "Mic" + ] + EnableSequence [ + cset "name='media0_out mo codec0_in mi Switch' 1" + cset "name='ADC0 Capture Switch' 1,1" + cset "name='ADC 0 Mux' 0" + cset "name='Mic Jack Switch' 1" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 0" + ] + + DisableSequence [ + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + cset "name='media0_out mo codec0_in mi Switch' 0" + ] + Value { + CapturePriority 200 + CapturePCM "hw:${CardId},1" + JackControl "Mic Jack" + } +} + +SectionDevice."Mic" { + Comment "Digital Stereo Microphone" + + ConflictingDevice [ + "Headset" + ] + + EnableSequence [ + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + cset "name='media0_out mo codec0_in mi Switch' 0" + cset "name='ADC0 Capture Switch' 0,0" + cset "name='Mic Jack Switch' 0" + cset "name='ADC 0 Mux' 0" + + ] + + DisableSequence [ + cset "name='media0_out mo codec0_in mi Switch' 1" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 0" + cset "name='ADC0 Capture Switch' 1,1" + cset "name='Mic Jack Switch' 1" + cset "name='ADC 0 Mux' 2" + ] + Value { + CapturePriority 100 + CapturePCM "hw:${CardId},1" + } +} + +Include.hdmi1.File "/Intel/skylake-rt286/Hdmi1.conf" +Include.hdmi2.File "/Intel/skylake-rt286/Hdmi2.conf" diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/skylake-rt286/skylake-rt286.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/skylake-rt286/skylake-rt286.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/skylake-rt286/skylake-rt286.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/skylake-rt286/skylake-rt286.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,44 @@ +# UCM for Intel SKYLAKE/KABYLAKE platforms +# For Audio in I2S mode + +Syntax 3 + +SectionUseCase."HiFi" { + File "/Intel/skylake-rt286/HiFi.conf" + Comment "Play and record HiFi quality Music" +} + +SectionDefaults [ + cset "name='Headphone Jack Switch' 1" + cset "name='Speaker Switch' 1" + cset "name='Speaker Playback Switch' 0,0" + cset "name='Front DAC Switch' 1" + cset "name='Front RECMIX Switch' 0" + cset "name='Mic Jack Switch' 1" + cset "name='ADC 0 Mux' 2" + cset "name='ADC 1 Mux' 0" + cset "name='ADC0 Capture Volume' 105,105" + cset "name='ADC0 Capture Switch' 1,1" + cset "name='AMIC Volume' 3" + cset "name='DAC0 Playback Volume' 100,100" + cset "name='HPO L Switch' 0" + cset "name='HPO Mux' 0" + cset "name='HPO R Switch' 0" + cset "name='Pin 5 Mux' 1" + cset "name='Pin 6 Mux' 2" + cset "name='Pin 7 Mux' 3" + cset "name='RECMIX Beep Switch' 0" + cset "name='RECMIX Line1 Switch' 0" + cset "name='RECMIX Mic1 Switch' 0" + cset "name='SPK Mux' 0" + cset "name='SPO Switch' 1" + cset "name='codec0_out mo codec0_in mi Switch' 0" + cset "name='codec0_out mo dmic01_hifi_in mi Switch' 0" + cset "name='codec0_out mo media0_in mi Switch' 1" + cset "name='codec1_out mo codec0_in mi Switch' 0" + cset "name='codec1_out mo dmic01_hifi_in mi Switch' 0" + cset "name='codec1_out mo media0_in mi Switch' 0" + cset "name='media0_out mo codec0_in mi Switch' 1" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + cset "name='media0_out mo media0_in mi Switch' 0" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/sof-ehl-rt5660/Hdmi.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/sof-ehl-rt5660/Hdmi.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/sof-ehl-rt5660/Hdmi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/sof-ehl-rt5660/Hdmi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,85 @@ +# Usecase for device HDMI/Display Port stereo playback on Intel ELKHARTLAKE platforms + +SectionDevice."HDMI1" { + Comment "HDMI/Display Port 1 Stereo" + + Value { + PlaybackPCM "hw:${CardId},3" + PlaybackPriority 500 + If.1 { + Condition { + Type ControlExists + Control "iface=CARD,name='HDMI/DP,pcm=3 Jack'" + } + True { + JackControl "HDMI/DP,pcm=3 Jack" + } + False { + JackControl "HDMI/DP, pcm=3 Jack" + } + } + } +} + +SectionDevice."HDMI2" { + Comment "HDMI/Display Port 2 Stereo" + + Value { + PlaybackPCM "hw:${CardId},4" + PlaybackPriority 600 + If.1 { + Condition { + Type ControlExists + Control "iface=CARD,name='HDMI/DP,pcm=4 Jack'" + } + True { + JackControl "HDMI/DP,pcm=4 Jack" + } + False { + JackControl "HDMI/DP, pcm=4 Jack" + } + } + } +} + +SectionDevice."HDMI3" { + Comment "HDMI/Display Port 3 Stereo" + + Value { + PlaybackPCM "hw:${CardId},5" + PlaybackPriority 600 + If.1 { + Condition { + Type ControlExists + Control "iface=CARD,name='HDMI/DP,pcm=5 Jack'" + } + True { + JackControl "HDMI/DP,pcm=5 Jack" + } + False { + JackControl "HDMI/DP, pcm=5 Jack" + } + } + } +} + +SectionDevice."HDMI4" { + Comment "HDMI/Display Port 4 Stereo" + + Value { + PlaybackPCM "hw:${CardId},6" + PlaybackPriority 600 + If.1 { + Condition { + Type ControlExists + Control "iface=CARD,name='HDMI/DP,pcm=6 Jack'" + } + True { + JackControl "HDMI/DP,pcm=6 Jack" + } + False { + JackControl "HDMI/DP, pcm=6 Jack" + } + } + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/sof-ehl-rt5660/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/sof-ehl-rt5660/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/sof-ehl-rt5660/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/sof-ehl-rt5660/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,75 @@ +# Usecase for stereo playback Speaker and Headset, Recording on DMIC and Headset MIC. +# For Audio in I2S mode on Intel ElkhartLake platforms + +SectionVerb { + +} + +SectionDevice."Speaker" { + Comment "Speaker" + + ConflictingDevice [ + "Lineout" + ] + + EnableSequence [ + cset "name='Speaker Switch' on" + ] + + DisableSequence [ + cset "name='Speaker Switch' off" + ] + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + } +} + +SectionDevice."Lineout" { + Comment "Lineout" + + ConflictingDevice [ + "Speaker" + ] + + EnableSequence [ + cset "name='Line Out Switch' on" + ] + + DisableSequence [ + cset "name='Line Out Switch' off" + ] + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + } +} + +SectionDevice."Mic" { + Comment "Digital Microphone" + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId},1" + } +} + +SectionDevice."Headset" { + Comment "Headset Microphone" + + EnableSequence [ + cset "name='Headset Mic2 Switch' on" + ] + + DisableSequence [ + cset "name='Headset Mic2 Switch' off" + ] + + Value { + CapturePriority 200 + CapturePCM "hw:${CardId}" + } +} + +Include.hdmi.File "/Intel/sof-ehl-rt5660/Hdmi.conf" diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/sof-ehl-rt5660/sof-ehl-rt5660.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/sof-ehl-rt5660/sof-ehl-rt5660.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/sof-ehl-rt5660/sof-ehl-rt5660.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/sof-ehl-rt5660/sof-ehl-rt5660.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,19 @@ +# UCM for Intel ElkhartLake platforms +# For Audio in I2S mode + +Syntax 3 + +SectionUseCase."HiFi" { + File "/Intel/sof-ehl-rt5660/HiFi.conf" + Comment "Play and record HiFi quality Music" +} + +SectionDefaults [ + cset "name='DAC1 MIXL DAC1 Switch' on" + cset "name='DAC1 MIXR DAC1 Switch' on" + cset "name='Stereo DAC MIXL DAC L1 Switch' on" + cset "name='Stereo DAC MIXR DAC R1 Switch' on" + cset "name='LOUT MIX DAC Switch' on" + cset "name='RECMIXL BST2 Switch' on" + cset "name='RECMIXR BST2 Switch' on" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/sof-hda-dsp/Hdmi.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/sof-hda-dsp/Hdmi.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/sof-hda-dsp/Hdmi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/sof-hda-dsp/Hdmi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,40 @@ +# Use case Configuration for sof-hda-dsp + +If.hdmi1 { + Condition { Type String Empty "" } + True { + Define { + HdmiNum 1 + HdmiPCM 3 + HdmiCtlIndex 0 + HdmiPrio 500 + } + Include.hdmi1.File "/codecs/hda/hdmi.conf" + } +} + +If.hdmi2 { + Condition { Type String Empty "" } + True { + Define { + HdmiNum 2 + HdmiPCM 4 + HdmiCtlIndex 1 + HdmiPrio 600 + } + Include.hdmi2.File "/codecs/hda/hdmi.conf" + } +} + +If.hdmi3 { + Condition { Type String Empty "" } + True { + Define { + HdmiNum 3 + HdmiPCM 5 + HdmiCtlIndex 2 + HdmiPrio 700 + } + Include.hdmi3.File "/codecs/hda/hdmi.conf" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/sof-hda-dsp/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/sof-hda-dsp/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/sof-hda-dsp/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/sof-hda-dsp/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,51 @@ +# Use case Configuration for sof-hda-dsp + +SectionVerb { + Value.TQ "HiFi" +} + +Include.hda-analog.File "/HDA/HiFi-analog.conf" + +If.dmic { + Condition { + Type String + Empty "${var:DeviceDmic}" + } + Before.SectionDevice "${var:DeviceMic}" + False.SectionDevice."${var:DeviceDmic}" { + Comment "Digital Microphone" + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId},6" + If.chn { + Condition { + Type RegexMatch + Regex "cfg-dmics:[34]" + String "${CardComponents}" + } + True { + CaptureChannels 4 + } + } + If.vol { + Condition { + Type ControlExists + Control "name='Dmic0 Capture Switch'" + } + True { + CaptureMixerElem "Dmic0" + CaptureVolume "Dmic0 Capture Volume" + CaptureSwitch "Dmic0 Capture Switch" + } + False { + # v1.3 SOF firmware + CaptureMixerElem "PGA10.0 10 Master" + CaptureVolume "PGA10.0 10 Master Capture Volume" + } + } + } + } +} + +Include.hdmi.File "/Intel/sof-hda-dsp/Hdmi.conf" diff -Nru alsa-ucm-conf-1.2.2/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf alsa-ucm-conf-1.2.6.3/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf --- alsa-ucm-conf-1.2.2/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,89 @@ +Syntax 4 + +Define.DeviceMic "Mic" +Define.DeviceDmic "" + +If.dmic { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-dmics:" + } + True.Define.DeviceDmic "Mic1" + True.Define.DeviceMic "Mic2" +} + +SectionUseCase."HiFi" { + File "/Intel/sof-hda-dsp/HiFi.conf" + Comment "Play HiFi quality Music" +} + +# the kcontrols initial values, which will be set by `alsactl init` + +If.amute { + Condition { + Type ControlExists + Control "name='Auto-Mute Mode'" + } + True.BootSequence [ + cset "name='Auto-Mute Mode' off" + ] +} + +If.master { + Condition { + Type ControlExists + Control "name='Master Playback Volume'" + } + True.BootSequence [ + cset "name='Master Playback Volume' 60%" + cset "name='Master Playback Switch' on" + ] +} + +If.speaker { + Condition { + Type ControlExists + Control "name='Speaker Playback Volume'" + } + True.BootSequence [ + cset "name='Speaker Playback Volume' 60%" + ] +} + +If.headphone { + Condition { + Type ControlExists + Control "name='Headphone Playback Volume'" + } + True.BootSequence [ + cset "name='Headphone Playback Volume' 60%" + ] +} + +If.dmic { + Condition { + Type String + Empty "${var:DeviceDmic}" + } + False.If.Dmic0 { + Condition { + Type ControlExists + Control "name='Dmic0 Capture Volume'" + } + True.BootSequence [ + cset "name='Dmic0 Capture Volume' 70%" + ] + } +} + +If.Capture { + Condition { + Type ControlExists + Control "name='Capture Switch'" + } + True.BootSequence [ + cset "name='Capture Volume' 60%" + cset "name='Capture Switch' on" + ] +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/MediaTek/mtk-rt5650/HDMI.conf alsa-ucm-conf-1.2.6.3/ucm2/MediaTek/mtk-rt5650/HDMI.conf --- alsa-ucm-conf-1.2.2/ucm2/MediaTek/mtk-rt5650/HDMI.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/MediaTek/mtk-rt5650/HDMI.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,9 @@ +SectionDevice."HDMI" { + Comment "HDMI Audio" + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId},2" + JackControl "mtk-rt5650 HDMI Jack" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/MediaTek/mtk-rt5650/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/MediaTek/mtk-rt5650/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/MediaTek/mtk-rt5650/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/MediaTek/mtk-rt5650/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,85 @@ +# Use case configuration for mtk-rt5650 + +SectionVerb { + Include.e.File "/codecs/rt5645/EnableSeq.conf" + + # ALSA PCM + Value { + TQ "HiFi" + } +} + +SectionDevice."Speaker" { + Comment "Speaker" + + ConflictingDevice [ + "Headphones" + ] + + Include.spk.File "/codecs/rt5645/SpeakerEnableSeq.conf" + + Value { + PlaybackPCM "hw:${CardId},0" + PlaybackPriority 100 + PlaybackMixerElem "Speaker" + PlaybackVolume "Speaker Playback Volume" + } +} + +SectionDevice."Headphones" { + Comment "Headphones" + + ConflictingDevice [ + "Speaker" + ] + + Include.hse.File "/codecs/rt5645/HeadphonesEnableSeq.conf" + + DisableSequence [ + cset "name='Headphone Switch' off" + cset "name='Headphone Channel Switch' off" + ] + + Value { + PlaybackPCM "hw:${CardId},0" + PlaybackPriority 200 + PlaybackMixerElem "Headphone" + PlaybackVolume "Headphone Playback Volume" + JackControl "Headset Jack" + JackHWMute "Speaker" + } +} + +Include.hdmi.File "/MediaTek/mtk-rt5650/HDMI.conf" + +SectionDevice."Mic" { + Comment "Internal Microphone" + + Include.dmice.File "/codecs/rt5645/DigitalMicEnableSeq.conf" + Include.dmicd.File "/codecs/rt5645/DigitalMicDisableSeq.conf" + + Value { + CapturePCM "hw:${CardId},1" + CapturePriority 100 + CaptureMasterElem "ADC" + CaptureMixerElem "IN" + CaptureVolume "IN Capture Volume" + } +} + +SectionDevice."Headset" { + Comment "Headset Microphone" + + Include.hsmice.File "/codecs/rt5645/HSMicEnableSeq.conf" + Include.hsmicd.File "/codecs/rt5645/HSMicDisableSeq.conf" + + Value { + CapturePCM "hw:${CardId},1" + CapturePriority 200 + CaptureMasterElem "ADC" + CaptureMixerElem "IN" + CaptureVolume "IN Capture Volume" + JackControl "Headset Jack" + JackHWMute "Mic" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/MediaTek/mtk-rt5650/init.conf alsa-ucm-conf-1.2.6.3/ucm2/MediaTek/mtk-rt5650/init.conf --- alsa-ucm-conf-1.2.2/ucm2/MediaTek/mtk-rt5650/init.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/MediaTek/mtk-rt5650/init.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,17 @@ +# mtk-rt5650 specific boot sequence + +BootSequence [ + cset "name='O03 I05 Switch' 1" + cset "name='O04 I06 Switch' 1" + cset "name='O09 I17 Switch' 1" + cset "name='O10 I18 Switch' 1" + + # Internal speaker amplification params + cset "name='DAC1 Playback Volume' 69" + cset "name='Speaker ClassD Playback Volume' 6" + + # Muxing + cset "name='IF2 ADC Mux' IF_ADC1" + cset "name='RT5650 IF1 ADC1 Swap Mux' L/R" + cset "name='Stereo1 ADC1 Mux' ADC" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/MediaTek/mtk-rt5650/mtk-rt5650.conf alsa-ucm-conf-1.2.6.3/ucm2/MediaTek/mtk-rt5650/mtk-rt5650.conf --- alsa-ucm-conf-1.2.2/ucm2/MediaTek/mtk-rt5650/mtk-rt5650.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/MediaTek/mtk-rt5650/mtk-rt5650.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,12 @@ +Comment "ALC5650 sound card on MediaTek SoC" +Syntax 4 + +SectionUseCase."HiFi" { + File "/MediaTek/mtk-rt5650/HiFi.conf" + Comment "Default" +} + +Include.card-init.File "/lib/card-init.conf" +Include.ctl-remap.File "/lib/ctl-remap.conf" +Include.codec-init.File "/codecs/rt5645/init.conf" +Include.init.File "/MediaTek/mtk-rt5650/init.conf" diff -Nru alsa-ucm-conf-1.2.2/ucm2/NXP/iMX8/Librem_5_Devkit/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/NXP/iMX8/Librem_5_Devkit/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/NXP/iMX8/Librem_5_Devkit/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/NXP/iMX8/Librem_5_Devkit/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,74 @@ +SectionVerb { + EnableSequence [ + cset "name='Digital Input Mux' I2S" + cset "name='PCM Playback Volume' 144" + + cset "name='AVC Switch' off" + cset "name='Headphone Playback ZC Switch' off" + + cset "name='Capture Attenuate Switch (-6dB)' off" + cset "name='Capture Mux' MIX_IN" + cset "name='Capture ZC Switch' off" + cset "name='Capture Switch' On" + cset "name='Capture Volume' 15,15" + ] + DisableSequence [ + cset "name='PCM Playback Volume' 0" + ] +} + +SectionDevice."Handset" { + Comment "Handset" + + ConflictingDevice [ + "Headset" + ] + + EnableSequence [ + cset "name='Mic Mux MUX' Input 2" + cset "name='Lineout Playback Switch' on" + cset "name='Lineout Playback Volume' 18" + cset "name='Mic Volume' 2" + ] + DisableSequence [ + cset "name='Lineout Playback Switch' off" + cset "name='Mic Volume' 0" + ] + Value { + PlaybackPriority "1000" + PlaybackPCM "hw:${CardId}" + PlaybackVolume "name='Lineout Playback Volume'" + PlaybackSwitch "name='Lineout Playback Switch'" + PlaybackMixerElem "Lineout" + CapturePriority "1000" + CapturePCM "hw:${CardId}" + } +} + +SectionDevice."Headset" { + Comment "Headset" + + ConflictingDevice [ + "Handset" + ] + + EnableSequence [ + cset "name='Mic Mux MUX' Input 1" + cset "name='Headphone Mux' DAC" + cset "name='Headphone Playback Volume' 63" + cset "name='Headphone Playback Switch' on" + ] + DisableSequence [ + cset "name='Headphone Playback Switch' off" + ] + Value { + PlaybackPriority "700" + PlaybackPCM "hw:${CardId}" + PlaybackVolume "name='Headphone Playback Volume'" + PlaybackSwitch "name='Headphone Playback Switch'" + PlaybackMixerElem "Headphone" + CapturePriority "700" + CapturePCM "hw:${CardId}" + JackControl "Headphones Jack" + } +} diff -Nru "/tmp/tmpgj5lswvs/UstkJCzJCi/alsa-ucm-conf-1.2.2/ucm2/NXP/iMX8/Librem_5_Devkit/Librem 5 Devkit.conf" "/tmp/tmpgj5lswvs/vgYrAb4sHi/alsa-ucm-conf-1.2.6.3/ucm2/NXP/iMX8/Librem_5_Devkit/Librem 5 Devkit.conf" --- "/tmp/tmpgj5lswvs/UstkJCzJCi/alsa-ucm-conf-1.2.2/ucm2/NXP/iMX8/Librem_5_Devkit/Librem 5 Devkit.conf" 1970-01-01 00:00:00.000000000 +0000 +++ "/tmp/tmpgj5lswvs/vgYrAb4sHi/alsa-ucm-conf-1.2.6.3/ucm2/NXP/iMX8/Librem_5_Devkit/Librem 5 Devkit.conf" 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,5 @@ +Syntax 2 + +SectionUseCase."HiFi" { + File "HiFi.conf" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/Pandaboard/FMAnalog.conf alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/Pandaboard/FMAnalog.conf --- alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/Pandaboard/FMAnalog.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/Pandaboard/FMAnalog.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,45 @@ +# Use case Configurationfor TI PandaBoard(ES) HiFi Music +# By Liam Girdwood + +SectionVerb { + EnableSequence [ + cset "name='AMIC_UL PDM Switch' 1" + cset "name='MUX_UL00' 9" + cset "name='MUX_UL01' 10" + cset "name='Capture Volume' 4" + ] + + + DisableSequence [ + cset "name='AMIC_UL PDM Switch' 0" + cset "name='MUX_UL00' 0" + cset "name='MUX_UL01' 0" + cset "name='Capture Volume' 0" + ] + + # Optional TQ + Value { + TQ "Music" + } +} + +SectionDevice."Headset" { + Comment "3.5mm Headset" + + EnableSequence [ + cset "name='Analog Left Capture Route' 2" + cset "name='Analog Right Capture Route' 2" + cset "name='Capture Preamplifier Volume' 2" + ] + + DisableSequence [ + cset "name='Analog Left Capture Route' 3" + cset "name='Analog Right Capture Route' 3" + cset "name='Capture Preamplifier Volume' 0" + ] + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId}" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/Pandaboard/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/Pandaboard/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/Pandaboard/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/Pandaboard/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,56 @@ +# Use case Configuration for TI PandaBoard(ES) HiFi Music +# By Liam Girdwood + +SectionVerb { + EnableSequence [ + cset "name='DL1 Mixer Multimedia' 1" + cset "name='Sidetone Mixer Playback' 1" + cset "name='DL1 PDM Switch' 1" + cset "name='DL1 Media Playback Volume' 90,90" + cset "name='SDT DL Volume' 120" + + cset "name='Headset Left Playback' 1" + cset "name='Headset Right Playback' 1" + cset "name='Headset Playback Volume' 13" + ] + + DisableSequence [ + cset "name='DL1 Mixer Multimedia' 0" + cset "name='Sidetone Mixer Playback' 0" + cset "name='DL1 PDM Switch' 0" + cset "name='DL1 Media Playback Volume' 0,0" + cset "name='SDT DL Volume' 0" + + cset "name='Headset Right Playback' 0" + cset "name='Headset Left Playback' 0" + cset "name='Headset Playback Volume' 0" + ] + + # Optional TQ + Value { + TQ "Music" + } +} + +SectionDevice."Headset" { + Comment "3.5mm Headset" + + EnableSequence [ + cset "name='Headset Left Playback' 1" + cset "name='Headset Right Playback' 1" + cset "name='Headset Playback Volume' 13" + ] + + DisableSequence [ + cset "name='Headset Right Playback' 0" + cset "name='Headset Left Playback' 0" + cset "name='Headset Playback Volume' 0" + ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + # PlaybackVolume "name='DL1 Media Playback Volume' 90,90" + # PlaybackSwitch "name='DL1 PDM Switch' 1" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/Pandaboard/HiFiLP.conf alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/Pandaboard/HiFiLP.conf --- alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/Pandaboard/HiFiLP.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/Pandaboard/HiFiLP.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,46 @@ +# Use case Configuration for TI PandaBoard(ES) HiFi Music +# By Liam Girdwood + +SectionVerb { + EnableSequence [ + cset "name='DL1 Mixer Multimedia' 1" + cset "name='Sidetone Mixer Playback' 1" + cset "name='DL1 PDM Switch' 1" + cset "name='DL1 Media Playback Volume' 90,90" + cset "name='SDT DL Volume' 120" + ] + + DisableSequence [ + cset "name='DL1 Mixer Multimedia' 0" + cset "name='Sidetone Mixer Playback' 0" + cset "name='DL1 PDM Switch' 0" + cset "name='DL1 Media Playback Volume' 0,0" + cset "name='SDT DL Volume' 0" + ] + + # Optional TQ + Value { + TQ "Music" + } +} + +SectionDevice."Headset" { + Comment "3.5mm Headset" + + EnableSequence [ + cset "name='Headset Left Playback' 1" + cset "name='Headset Right Playback' 1" + cset "name='Headset Playback Volume' 13" + ] + + DisableSequence [ + cset "name='Headset Right Playback' 0" + cset "name='Headset Left Playback' 0" + cset "name='Headset Playback Volume' 0" + ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId},6" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/Pandaboard/Pandaboard.conf alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/Pandaboard/Pandaboard.conf --- alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/Pandaboard/Pandaboard.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/Pandaboard/Pandaboard.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,41 @@ +# UCM configuration for PandaBoard(ES) + +SectionUseCase."Record" { + File "/OMAP/abe-twl6040/Pandaboard/Record.conf" + Comment "Record" +} + +SectionUseCase."HiFi" { + File "/OMAP/abe-twl6040/Pandaboard/HiFi.conf" + Comment "Play HiFi quality Music" +} + +SectionUseCase."HiFi_Low_Power" { + File "/OMAP/abe-twl6040/Pandaboard/HiFiLP.conf" + Comment "Play HiFi quality Music in Low Power Mode" +} + +SectionUseCase."Voice" { + File "/OMAP/abe-twl6040/Pandaboard/Voice.conf" + Comment "Playback Voice quality" +} + +SectionUseCase."Voice_Low_Power" { + File "/OMAP/abe-twl6040/Pandaboard/Voice.conf" + Comment "Playback Voice quality in Low Power Mode" +} + +SectionUseCase."Voice_Call" { + File "/OMAP/abe-twl6040/Pandaboard/VoiceCall.conf" + Comment "Capture and Playback in Voice quality" +} + +SectionUseCase."Voice_Call_IP" { + File "/OMAP/abe-twl6040/Pandaboard/VoiceCall.conf" + Comment "Capture and Playback in Voice quality" +} + +SectionUseCase."FM_Analog_Radio" { + File "/OMAP/abe-twl6040/Pandaboard/FMAnalog.conf" + Comment "Capture FM Analog Radio" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/Pandaboard/Record.conf alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/Pandaboard/Record.conf --- alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/Pandaboard/Record.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/Pandaboard/Record.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,47 @@ +# Use case Configuration for TI PandaBoard(ES) HiFi Music +# By Liam Girdwood + +SectionVerb { + EnableSequence [ + # No more AMIC PDM Switch in current kernels + #cset "name='AMIC_UL PDM Switch' 1" + cset "name='MUX_UL00' 9" + cset "name='MUX_UL01' 10" + cset "name='Capture Volume' 4" + ] + + DisableSequence [ + # No more AMIC PDM Switch in current kernels + #cset "name='AMIC_UL PDM Switch' 0" + cset "name='MUX_UL00' 0" + cset "name='MUX_UL01' 0" + cset "name='Capture Volume' 0" + ] + + # Optional TQ + Value { + TQ "Music" + } + +} + +SectionDevice."Headset" { + Comment "3.5mm Headset" + + EnableSequence [ + cset "name='Analog Left Capture Route' 0" + cset "name='Analog Right Capture Route' 0" + cset "name='Capture Preamplifier Volume' 2" + ] + + DisableSequence [ + cset "name='Analog Left Capture Route' 3" + cset "name='Analog Right Capture Route' 3" + cset "name='Capture Preamplifier Volume' 0" + ] + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId}" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/Pandaboard/Voice.conf alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/Pandaboard/Voice.conf --- alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/Pandaboard/Voice.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/Pandaboard/Voice.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,46 @@ +# Use case Configuration for TI PandaBoard(ES) HiFi Music +# By Liam Girdwood + +SectionVerb { + EnableSequence [ + cset "name='DL1 Mixer Voice' 1" + cset "name='Sidetone Mixer Playback' 1" + cset "name='DL1 PDM Switch' 1" + cset "name='DL1 Voice Playback Volume' 90,90" + cset "name='SDT DL Volume' 120" + ] + + DisableSequence [ + cset "name='DL1 Mixer Voice' 0" + cset "name='Sidetone Mixer Playback' 0" + cset "name='DL1 PDM Switch' 0" + cset "name='DL1 Voice Playback Volume' 0,0" + cset "name='SDT DL Volume' 0" + ] + + # Optional TQ + Value { + TQ "Voice" + } +} + +SectionDevice."Headset" { + Comment "3.5mm Headset" + + EnableSequence [ + cset "name='Headset Left Playback' 1" + cset "name='Headset Right Playback' 1" + cset "name='Headset Playback Volume' 13" + ] + + DisableSequence [ + cset "name='Headset Right Playback' 0" + cset "name='Headset Left Playback' 0" + cset "name='Headset Playback Volume' 0" + ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId},2" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/Pandaboard/VoiceCall.conf alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/Pandaboard/VoiceCall.conf --- alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/Pandaboard/VoiceCall.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/Pandaboard/VoiceCall.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,67 @@ +# Use case Configuration for TI PandaBoard(ES) HiFi Music +# By Liam Girdwood + +SectionVerb { + EnableSequence [ + cset "name='AMIC_UL PDM Switch' 1" + cset "name='Sidetone Mixer Capture' 1" + cset "name='MUX_VX0' 9" + cset "name='MUX_VX1' 10" + cset "name='DL1 Mixer Voice' 1" + cset "name='Sidetone Mixer Playback' 1" + cset "name='DL1 PDM Switch' 1" + cset "name='DL1 Voice Playback Volume' 90,90" + cset "name='Capture Volume' 4" + cset "name='Capture Mixer Voice Capture' 90,90" + cset "name='SDT DL Volume' 120" + ] + + + DisableSequence [ + cset "name='AMIC_UL PDM Switch' 0" + cset "name='Sidetone Mixer Capture' 0" + cset "name='MUX_VX0' 0" + cset "name='MUX_VX1' 0" + cset "name='DL1 Mixer Voice' 0" + cset "name='Sidetone Mixer Playback' 0" + cset "name='DL1 PDM Switch' 0" + cset "name='DL1 Voice Playback Volume' 0,0" + cset "name='Capture Volume' 0" + cset "name='DL1 Voice Playback Volume' 0,0" + cset "name='SDT DL Volume' 0" + ] + + # Optional TQ + Value { + TQ "Voice" + } +} + +SectionDevice."Headset" { + Comment "3.5mm Headset" + + EnableSequence [ + cset "name='Analog Left Capture Route' 0" + cset "name='Analog Right Capture Route' 0" + cset "name='Capture Preamplifier Volume' 2" + cset "name='Headset Left Playback' 1" + cset "name='Headset Right Playback' 1" + cset "name='Headset Playback Volume' 13" + ] + + DisableSequence [ + cset "name='Analog Left Capture Route' 3" + cset "name='Analog Right Capture Route' 3" + cset "name='Capture Preamplifier Volume' 0" + cset "name='Headset Right Playback' 0" + cset "name='Headset Left Playback' 0" + cset "name='Headset Playback Volume' 0" + ] + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId},2" + PlaybackPriority 100 + PlaybackPCM "hw:${CardId},2" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/SDP4430/FMAnalog.conf alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/SDP4430/FMAnalog.conf --- alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/SDP4430/FMAnalog.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/SDP4430/FMAnalog.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,40 @@ +# Use case Configuratio +# By Liam Girdwood + +SectionVerb { + EnableSequence [ + cset "name='AMIC_UL PDM Switch' 1" + cset "name='MUX_UL00' 9" + cset "name='MUX_UL01' 10" + cset "name='Capture Volume' 4" + ] + + DisableSequence [ + cset "name='AMIC_UL PDM Switch' 0" + cset "name='MUX_UL00' 0" + cset "name='MUX_UL01' 0" + cset "name='Capture Volume' 0" + ] +} + +SectionDevice."Headset" { + Comment "SDP4430 3.5mm Headset" + + EnableSequence [ + cset "name='Analog Left Capture Route' 2" + cset "name='Analog Right Capture Route' 2" + cset "name='Capture Preamplifier Volume' 2" + ] + + DisableSequence [ + cset "name='Analog Left Capture Route' 3" + cset "name='Analog Right Capture Route' 3" + cset "name='Capture Preamplifier Volume' 0" + ] + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId}" + } +} + diff -Nru alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/SDP4430/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/SDP4430/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/SDP4430/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/SDP4430/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,57 @@ +# Use case Configuration for TI SDP4430 HiFi Music +# By Liam Girdwood + +SectionVerb { + EnableSequence [ + cset "name='DL1 Mixer Multimedia' 1" + cset "name='Sidetone Mixer Playback' 1" + cset "name='DL1 PDM Switch' 1" + cset "name='DL1 Media Playback Volume' 90,90" + cset "name='SDT DL Volume' 120" + + cset "name='HS Left Playback' 1" + cset "name='HS Right Playback' 1" + cset "name='Headset Playback Volume' 13" + ] + + DisableSequence [ + cset "name='DL1 Mixer Multimedia' 0" + cset "name='Sidetone Mixer Playback' 0" + cset "name='DL1 PDM Switch' 0" + cset "name='DL1 Media Playback Volume' 0,0" + cset "name='SDT DL Volume' 0" + + cset "name='HS Right Playback' 0" + cset "name='HS Left Playback' 0" + cset "name='Headset Playback Volume' 0" + ] + + # Optional TQ and ALSA PCMs +# Value { +# TQ "Music" +# PlaybackPCM "hw:${CardId},0" +# PlaybackVolume "name='DL1 Media Playback Volume' 90,90" +# PlaybackSwitch "name='DL1 PDM Switch' 1" +# } +} + +SectionDevice."Headset" { + Comment "SDP4430 3.5mm Headset" + + EnableSequence [ + cset "name='HS Left Playback' 1" + cset "name='HS Right Playback' 1" + cset "name='Headset Playback Volume' 13" + ] + + DisableSequence [ + cset "name='HS Right Playback' 0" + cset "name='HS Left Playback' 0" + cset "name='Headset Playback Volume' 0" + ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/SDP4430/HiFiLP.conf alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/SDP4430/HiFiLP.conf --- alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/SDP4430/HiFiLP.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/SDP4430/HiFiLP.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,45 @@ +# Use case Configuration for TI SDP4430 HiFi Music +# By Liam Girdwood + +SectionVerb { + EnableSequence [ + cset "name='DL1 Mixer Multimedia' 1" + cset "name='Sidetone Mixer Playback' 1" + cset "name='DL1 PDM Switch' 1" + cset "name='DL1 Media Playback Volume' 90,90" + cset "name='SDT DL Volume' 120" + ] + + DisableSequence [ + cset "name='DL1 Mixer Multimedia' 0" + cset "name='Sidetone Mixer Playback' 0" + cset "name='DL1 PDM Switch' 0" + cset "name='DL1 Media Playback Volume' 0,0" + cset "name='SDT DL Volume' 0" + ] + + Value { + TQ "Music" + } +} + +SectionDevice."Headset" { + Comment "SDP4430 3.5mm Headset" + + EnableSequence [ + cset "name='HS Left Playback' 1" + cset "name='HS Right Playback' 1" + cset "name='Headset Playback Volume' 13" + ] + + DisableSequence [ + cset "name='HS Right Playback' 0" + cset "name='HS Left Playback' 0" + cset "name='Headset Playback Volume' 0" + ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId},6" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/SDP4430/Record.conf alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/SDP4430/Record.conf --- alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/SDP4430/Record.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/SDP4430/Record.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,45 @@ +# Use case Configuration for TI SDP4430 HiFi Music +# By Liam Girdwood + +SectionVerb { + EnableSequence [ + cset "name='AMIC_UL PDM Switch' 1" + cset "name='MUX_UL00' 9" + cset "name='MUX_UL01' 10" + cset "name='Capture Volume' 4" + ] + + DisableSequence [ + cset "name='AMIC_UL PDM Switch' 0" + cset "name='MUX_UL00' 0" + cset "name='MUX_UL01' 0" + cset "name='Capture Volume' 0" + ] + + # Optional TQ and ALSA PCMs + Value { + TQ "Music" + } + +} + +SectionDevice."Headset" { + Comment "SDP4430 3.5mm Headset" + + EnableSequence [ + cset "name='Analog Left Capture Route' 0" + cset "name='Analog Right Capture Route' 0" + cset "name='Capture Preamplifier Volume' 2" + ] + + DisableSequence [ + cset "name='Analog Left Capture Route' 3" + cset "name='Analog Right Capture Route' 3" + cset "name='Capture Preamplifier Volume' 0" + ] + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId}" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/SDP4430/SDP4430.conf alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/SDP4430/SDP4430.conf --- alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/SDP4430/SDP4430.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/SDP4430/SDP4430.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,41 @@ +# UCM configuration for SDP4430 + +SectionUseCase."Record" { + File "/OMAP/abe-twl6040/SDP4430/Record.conf" + Comment "Record" +} + +SectionUseCase."HiFi" { + File "/OMAP/abe-twl6040/SDP4430/HiFi.conf" + Comment "Play HiFi quality Music" +} + +SectionUseCase."HiFi_Low_Power" { + File "/OMAP/abe-twl6040/SDP4430/HiFiLP.conf" + Comment "Play HiFi quality Music in Low Power Mode" +} + +SectionUseCase."Voice" { + File "/OMAP/abe-twl6040/SDP4430/Voice.conf" + Comment "Playback Voice quality" +} + +SectionUseCase."Voice_Low_Power" { + File "/OMAP/abe-twl6040/SDP4430/Voice.conf" + Comment "Playback Voice quality in Low Power Mode." +} + +SectionUseCase."Voice_Call" { + File "/OMAP/abe-twl6040/SDP4430/VoiceCall.conf" + Comment "Capture and Playback in Voice quality" +} + +SectionUseCase."Voice_Call_IP" { + File "/OMAP/abe-twl6040/SDP4430/VoiceCall.conf" + Comment "Capture and Playback in Voice quality" +} + +SectionUseCase."FM_Analog_Radio" { + File "/OMAP/abe-twl6040/SDP4430/FMAnalog.conf" + Comment "Capture FM Analog Radio" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/SDP4430/Voice.conf alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/SDP4430/Voice.conf --- alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/SDP4430/Voice.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/SDP4430/Voice.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,45 @@ +# Use case Configuration for TI SDP4430 HiFi Music +# By Liam Girdwood + +SectionVerb { + EnableSequence [ + cset "name='DL1 Mixer Voice' 1" + cset "name='Sidetone Mixer Playback' 1" + cset "name='DL1 PDM Switch' 1" + cset "name='DL1 Voice Playback Volume' 90,90" + cset "name='SDT DL Volume' 120" + ] + + DisableSequence [ + cset "name='DL1 Mixer Voice' 0" + cset "name='Sidetone Mixer Playback' 0" + cset "name='DL1 PDM Switch' 0" + cset "name='DL1 Voice Playback Volume' 0,0" + cset "name='SDT DL Volume' 0" + ] + + Value { + TQ "Voice" + } +} + +SectionDevice."Headset" { + Comment "SDP4430 3.5mm Headset" + + EnableSequence [ + cset "name='HS Left Playback' 1" + cset "name='HS Right Playback' 1" + cset "name='Headset Playback Volume' 13" + ] + + DisableSequence [ + cset "name='HS Right Playback' 0" + cset "name='HS Left Playback' 0" + cset "name='Headset Playback Volume' 0" + ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId},2" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/SDP4430/VoiceCall.conf alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/SDP4430/VoiceCall.conf --- alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/SDP4430/VoiceCall.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/SDP4430/VoiceCall.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,66 @@ +# Use case Configuration for TI SDP4430 HiFi Music +# By Liam Girdwood + +SectionVerb { + EnableSequence [ + cset "name='AMIC_UL PDM Switch' 1" + cset "name='Sidetone Mixer Capture' 1" + cset "name='MUX_VX0' 9" + cset "name='MUX_VX1' 10" + cset "name='DL1 Mixer Voice' 1" + cset "name='Sidetone Mixer Playback' 1" + cset "name='DL1 PDM Switch' 1" + cset "name='DL1 Voice Playback Volume' 90,90" + cset "name='Capture Volume' 4" + cset "name='Capture Mixer Voice Capture' 90,90" + cset "name='SDT DL Volume' 120" + ] + + + DisableSequence [ + cset "name='AMIC_UL PDM Switch' 0" + cset "name='Sidetone Mixer Capture' 0" + cset "name='MUX_VX0' 0" + cset "name='MUX_VX1' 0" + cset "name='DL1 Mixer Voice' 0" + cset "name='Sidetone Mixer Playback' 0" + cset "name='DL1 PDM Switch' 0" + cset "name='DL1 Voice Playback Volume' 0,0" + cset "name='Capture Volume' 0" + cset "name='DL1 Voice Playback Volume' 0,0" + cset "name='SDT DL Volume' 0" + ] + + Value { + TQ "Voice" + } +} + +SectionDevice."Headset" { + Comment "SDP4430 3.5mm Headset" + + EnableSequence [ + cset "name='Analog Left Capture Route' 0" + cset "name='Analog Right Capture Route' 0" + cset "name='Capture Preamplifier Volume' 2" + cset "name='HS Left Playback' 1" + cset "name='HS Right Playback' 1" + cset "name='Headset Playback Volume' 13" + ] + + DisableSequence [ + cset "name='Analog Left Capture Route' 3" + cset "name='Analog Right Capture Route' 3" + cset "name='Capture Preamplifier Volume' 0" + cset "name='HS Right Playback' 0" + cset "name='HS Left Playback' 0" + cset "name='Headset Playback Volume' 0" + ] + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId},2" + PlaybackPriority 100 + PlaybackPCM "hw:${CardId},2" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/abe-twl6040.conf alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/abe-twl6040.conf --- alsa-ucm-conf-1.2.2/ucm2/OMAP/abe-twl6040/abe-twl6040.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/OMAP/abe-twl6040/abe-twl6040.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,13 @@ +# UCM configuration for PandaBoard(ES) + +Syntax 3 + +If.sdp4430 { + Condition { + Type String + String1 "${CardName}" + String2 "SDP4430" + } + True.Include.sdp4430.File "/OMAP/abe-twl6040/SDP4430/SDP4430.conf" + False.Include.pandaboard.File "/OMAP/abe-twl6040/Pandaboard/Pandaboard.conf" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/PAZ00/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/PAZ00/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/PAZ00/HiFi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/PAZ00/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -SectionVerb { - EnableSequence [ - cset "name='Speaker Playback Switch' on" - cset "name='Int Spk Switch' on" - cset "name='Speaker Mix DAC2SPK Playback Switch' on" - ] - DisableSequence [ - cset "name='Speaker Playback Switch' off" - cset "name='Int Spk Switch' off" - cset "name='Speaker Mix DAC2SPK Playback Switch' off" - ] -} - -SectionDevice."Headset" { - Comment "3.5mm Headset" - - EnableSequence [ - # Internal speaker - cset "name='Int Spk Switch' off" - - # Headphones - cset "name='Headphone Playback Switch' on" - cset "name='HPL Mix DACL2HP Playback Switch' on" - cset "name='HPR Mix DACR2HP Playback Switch' on" - ] - DisableSequence [ - # Headphones - cset "name='Headphone Playback Switch' off" - cset "name='HPL Mix DACL2HP Playback Switch' off" - cset "name='HPR Mix DACR2HP Playback Switch' off" - - # Internal speaker - cset "name='Int Spk Switch' on" - ] - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId}" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/PAZ00/PAZ00.conf alsa-ucm-conf-1.2.6.3/ucm2/PAZ00/PAZ00.conf --- alsa-ucm-conf-1.2.2/ucm2/PAZ00/PAZ00.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/PAZ00/PAZ00.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -Syntax 2 - -Comment "PAZ00 alc5632" - -SectionDefaults [ - cset "name='Master Playback Switch' on" - cset "name='Master Playback Volume' 44,44" - cset "name='Headphone Playback Volume' 21,21" - cset "name='Speaker Playback Volume' 21,21" - cset "name='SpeakerOut Mux' 2" - cset "name='SpeakerOut N Mux' LN/-R" - cset "name='AB-D Amp Mux' 0" - cset "name='Left Headphone Mux' 1" - cset "name='Right Headphone Mux' 1" - cset "name='DMIC Boost Capture Volume' 4" - cset "name='Rec Capture Volume' 24" - - # Fix external mic record volumes - cset "name='Mic 1 Boost Volume' 0" - cset "name='Mic 2 Boost Volume' 0" - cset "name='Mic1 Playback Volume' 0" - cset "name='Mic2 Playback Volume' 0" - cset "name='Rec Capture Volume' 0" -] - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Music playback" -} - -SectionUseCase."Record" { - File "Record.conf" - Comment "Playback and capture" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/PAZ00/Record.conf alsa-ucm-conf-1.2.6.3/ucm2/PAZ00/Record.conf --- alsa-ucm-conf-1.2.2/ucm2/PAZ00/Record.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/PAZ00/Record.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +0,0 @@ -SectionVerb { - EnableSequence [ - cset "name='Speaker Playback Switch' on" - cset "name='Int Spk Switch' on" - cset "name='Speaker Mix DAC2SPK Playback Switch' on" - - cset "name='DMICL Mix DMICL2ADC Capture Switch' on" - cset "name='DMIC En Capture Switch' on" - cset "name='DMIC PreFilter Capture Switch' on" - ] - DisableSequence [ - cset "name='Speaker Playback Switch' off" - cset "name='Int Spk Switch' off" - cset "name='Speaker Mix DAC2SPK Playback Switch' off" - - cset "name='DMICL Mix DMICL2ADC Capture Switch' off" - cset "name='DMIC En Capture Switch' off" - cset "name='DMIC PreFilter Capture Switch' off" - ] -} - -SectionDevice."Headset" { - Comment "3.5mm Headset" - - EnableSequence [ - # Internal speaker - cset "name='Int Spk Switch' off" - - # Internal mic - cset "name='DMIC En Capture Switch' off" - - # Headphones - cset "name='Headphone Playback Switch' on" - cset "name='HPL Mix DACL2HP Playback Switch' on" - cset "name='HPR Mix DACR2HP Playback Switch' on" - - # External min - cset "name='Left Capture Mix MIC12REC_L Capture Switch' on" - ] - DisableSequence [ - # Headphones - cset "name='Headphone Playback Switch' off" - cset "name='HPL Mix DACL2HP Playback Switch' off" - cset "name='HPR Mix DACR2HP Playback Switch' off" - - # External mic - cset "name='Left Capture Mix MIC12REC_L Capture Switch' on" - - # Internal speaker - cset "name='Int Spk Switch' on" - - # Internal mic - cset "name='DMIC En Capture Switch' on" - ] - Value { - CapturePriority 100 - CapturePCM "hw:${CardId}" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/PandaBoard/FMAnalog.conf alsa-ucm-conf-1.2.6.3/ucm2/PandaBoard/FMAnalog.conf --- alsa-ucm-conf-1.2.2/ucm2/PandaBoard/FMAnalog.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/PandaBoard/FMAnalog.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -# Use case Configurationfor TI PandaBoard HiFi Music -# By Liam Girdwood - -SectionVerb { - EnableSequence [ - cset "name='AMIC_UL PDM Switch' 1" - cset "name='MUX_UL00' 9" - cset "name='MUX_UL01' 10" - cset "name='Capture Volume' 4" - ] - - - DisableSequence [ - cset "name='AMIC_UL PDM Switch' 0" - cset "name='MUX_UL00' 0" - cset "name='MUX_UL01' 0" - cset "name='Capture Volume' 0" - ] - - # Optional TQ - Value { - TQ "Music" - } -} - -SectionDevice."Headset" { - Comment "PandaBoard 3.5mm Headset" - - EnableSequence [ - cset "name='Analog Left Capture Route' 2" - cset "name='Analog Right Capture Route' 2" - cset "name='Capture Preamplifier Volume' 2" - ] - - DisableSequence [ - cset "name='Analog Left Capture Route' 3" - cset "name='Analog Right Capture Route' 3" - cset "name='Capture Preamplifier Volume' 0" - ] - - Value { - CapturePriority 100 - CapturePCM "hw:${CardId}" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/PandaBoard/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/PandaBoard/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/PandaBoard/HiFi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/PandaBoard/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -# Use case Configuration for TI PandaBoard HiFi Music -# By Liam Girdwood - -SectionVerb { - EnableSequence [ - cset "name='DL1 Mixer Multimedia' 1" - cset "name='Sidetone Mixer Playback' 1" - cset "name='DL1 PDM Switch' 1" - cset "name='DL1 Media Playback Volume' 90,90" - cset "name='SDT DL Volume' 120" - - cset "name='Headset Left Playback' 1" - cset "name='Headset Right Playback' 1" - cset "name='Headset Playback Volume' 13" - ] - - DisableSequence [ - cset "name='DL1 Mixer Multimedia' 0" - cset "name='Sidetone Mixer Playback' 0" - cset "name='DL1 PDM Switch' 0" - cset "name='DL1 Media Playback Volume' 0,0" - cset "name='SDT DL Volume' 0" - - cset "name='Headset Right Playback' 0" - cset "name='Headset Left Playback' 0" - cset "name='Headset Playback Volume' 0" - ] - - # Optional TQ - Value { - TQ "Music" - } -} - -SectionDevice."Headset" { - Comment "PandaBoard 3.5mm Headset" - - EnableSequence [ - cset "name='Headset Left Playback' 1" - cset "name='Headset Right Playback' 1" - cset "name='Headset Playback Volume' 13" - ] - - DisableSequence [ - cset "name='Headset Right Playback' 0" - cset "name='Headset Left Playback' 0" - cset "name='Headset Playback Volume' 0" - ] - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId}" - # PlaybackVolume "name='DL1 Media Playback Volume' 90,90" - # PlaybackSwitch "name='DL1 PDM Switch' 1" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/PandaBoard/HiFiLP.conf alsa-ucm-conf-1.2.6.3/ucm2/PandaBoard/HiFiLP.conf --- alsa-ucm-conf-1.2.2/ucm2/PandaBoard/HiFiLP.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/PandaBoard/HiFiLP.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -# Use case Configuration for TI PandaBoard HiFi Music -# By Liam Girdwood - -SectionVerb { - EnableSequence [ - cset "name='DL1 Mixer Multimedia' 1" - cset "name='Sidetone Mixer Playback' 1" - cset "name='DL1 PDM Switch' 1" - cset "name='DL1 Media Playback Volume' 90,90" - cset "name='SDT DL Volume' 120" - ] - - DisableSequence [ - cset "name='DL1 Mixer Multimedia' 0" - cset "name='Sidetone Mixer Playback' 0" - cset "name='DL1 PDM Switch' 0" - cset "name='DL1 Media Playback Volume' 0,0" - cset "name='SDT DL Volume' 0" - ] - - # Optional TQ - Value { - TQ "Music" - } -} - -SectionDevice."Headset" { - Comment "PandaBoard 3.5mm Headset" - - EnableSequence [ - cset "name='Headset Left Playback' 1" - cset "name='Headset Right Playback' 1" - cset "name='Headset Playback Volume' 13" - ] - - DisableSequence [ - cset "name='Headset Right Playback' 0" - cset "name='Headset Left Playback' 0" - cset "name='Headset Playback Volume' 0" - ] - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId},6" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/PandaBoard/PandaBoard.conf alsa-ucm-conf-1.2.6.3/ucm2/PandaBoard/PandaBoard.conf --- alsa-ucm-conf-1.2.2/ucm2/PandaBoard/PandaBoard.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/PandaBoard/PandaBoard.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -# UCM configuration for PandaBoard - -Syntax 2 - -SectionUseCase."Record" { - File "Record.conf" - Comment "Record" -} - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Play HiFi quality Music" -} - -SectionUseCase."HiFi_Low_Power" { - File "HiFiLP.conf" - Comment "Play HiFi quality Music in Low Power Mode" -} - -SectionUseCase."Voice" { - File "Voice.conf" - Comment "Playback Voice quality" -} - -SectionUseCase."Voice_Low_Power" { - File "Voice.conf" - Comment "Playback Voice quality in Low Power Mode" -} - -SectionUseCase."Voice_Call" { - File "VoiceCall.conf" - Comment "Capture and Playback in Voice quality" -} - -SectionUseCase."Voice_Call_IP" { - File "VoiceCall.conf" - Comment "Capture and Playback in Voice quality" -} - -SectionUseCase."FM_Analog_Radio" { - File "FMAnalog.conf" - Comment "Capture FM Analog Radio" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/PandaBoard/Record.conf alsa-ucm-conf-1.2.6.3/ucm2/PandaBoard/Record.conf --- alsa-ucm-conf-1.2.2/ucm2/PandaBoard/Record.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/PandaBoard/Record.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -# Use case Configuration for TI PandaBoard HiFi Music -# By Liam Girdwood - -SectionVerb { - EnableSequence [ - # No more AMIC PDM Switch in current kernels - #cset "name='AMIC_UL PDM Switch' 1" - cset "name='MUX_UL00' 9" - cset "name='MUX_UL01' 10" - cset "name='Capture Volume' 4" - ] - - DisableSequence [ - # No more AMIC PDM Switch in current kernels - #cset "name='AMIC_UL PDM Switch' 0" - cset "name='MUX_UL00' 0" - cset "name='MUX_UL01' 0" - cset "name='Capture Volume' 0" - ] - - # Optional TQ - Value { - TQ "Music" - } - -} - -SectionDevice."Headset" { - Comment "PandaBoard 3.5mm Headset" - - EnableSequence [ - cset "name='Analog Left Capture Route' 0" - cset "name='Analog Right Capture Route' 0" - cset "name='Capture Preamplifier Volume' 2" - ] - - DisableSequence [ - cset "name='Analog Left Capture Route' 3" - cset "name='Analog Right Capture Route' 3" - cset "name='Capture Preamplifier Volume' 0" - ] - - Value { - CapturePriority 100 - CapturePCM "hw:${CardId}" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/PandaBoard/Voice.conf alsa-ucm-conf-1.2.6.3/ucm2/PandaBoard/Voice.conf --- alsa-ucm-conf-1.2.2/ucm2/PandaBoard/Voice.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/PandaBoard/Voice.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -# Use case Configuration for TI PandaBoard HiFi Music -# By Liam Girdwood - -SectionVerb { - EnableSequence [ - cset "name='DL1 Mixer Voice' 1" - cset "name='Sidetone Mixer Playback' 1" - cset "name='DL1 PDM Switch' 1" - cset "name='DL1 Voice Playback Volume' 90,90" - cset "name='SDT DL Volume' 120" - ] - - DisableSequence [ - cset "name='DL1 Mixer Voice' 0" - cset "name='Sidetone Mixer Playback' 0" - cset "name='DL1 PDM Switch' 0" - cset "name='DL1 Voice Playback Volume' 0,0" - cset "name='SDT DL Volume' 0" - ] - - # Optional TQ - Value { - TQ "Voice" - } -} - -SectionDevice."Headset" { - Comment "PandaBoard 3.5mm Headset" - - EnableSequence [ - cset "name='Headset Left Playback' 1" - cset "name='Headset Right Playback' 1" - cset "name='Headset Playback Volume' 13" - ] - - DisableSequence [ - cset "name='Headset Right Playback' 0" - cset "name='Headset Left Playback' 0" - cset "name='Headset Playback Volume' 0" - ] - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId},2" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/PandaBoard/VoiceCall.conf alsa-ucm-conf-1.2.6.3/ucm2/PandaBoard/VoiceCall.conf --- alsa-ucm-conf-1.2.2/ucm2/PandaBoard/VoiceCall.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/PandaBoard/VoiceCall.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -# Use case Configuration for TI PandaBoard HiFi Music -# By Liam Girdwood - -SectionVerb { - EnableSequence [ - cset "name='AMIC_UL PDM Switch' 1" - cset "name='Sidetone Mixer Capture' 1" - cset "name='MUX_VX0' 9" - cset "name='MUX_VX1' 10" - cset "name='DL1 Mixer Voice' 1" - cset "name='Sidetone Mixer Playback' 1" - cset "name='DL1 PDM Switch' 1" - cset "name='DL1 Voice Playback Volume' 90,90" - cset "name='Capture Volume' 4" - cset "name='Capture Mixer Voice Capture' 90,90" - cset "name='SDT DL Volume' 120" - ] - - - DisableSequence [ - cset "name='AMIC_UL PDM Switch' 0" - cset "name='Sidetone Mixer Capture' 0" - cset "name='MUX_VX0' 0" - cset "name='MUX_VX1' 0" - cset "name='DL1 Mixer Voice' 0" - cset "name='Sidetone Mixer Playback' 0" - cset "name='DL1 PDM Switch' 0" - cset "name='DL1 Voice Playback Volume' 0,0" - cset "name='Capture Volume' 0" - cset "name='DL1 Voice Playback Volume' 0,0" - cset "name='SDT DL Volume' 0" - ] - - # Optional TQ - Value { - TQ "Voice" - } -} - -SectionDevice."Headset" { - Comment "PandaBoard 3.5mm Headset" - - EnableSequence [ - cset "name='Analog Left Capture Route' 0" - cset "name='Analog Right Capture Route' 0" - cset "name='Capture Preamplifier Volume' 2" - cset "name='Headset Left Playback' 1" - cset "name='Headset Right Playback' 1" - cset "name='Headset Playback Volume' 13" - ] - - DisableSequence [ - cset "name='Analog Left Capture Route' 3" - cset "name='Analog Right Capture Route' 3" - cset "name='Capture Preamplifier Volume' 0" - cset "name='Headset Right Playback' 0" - cset "name='Headset Left Playback' 0" - cset "name='Headset Playback Volume' 0" - ] - - Value { - CapturePriority 100 - CapturePCM "hw:${CardId},2" - PlaybackPriority 100 - PlaybackPCM "hw:${CardId},2" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/PandaBoardES/FMAnalog.conf alsa-ucm-conf-1.2.6.3/ucm2/PandaBoardES/FMAnalog.conf --- alsa-ucm-conf-1.2.2/ucm2/PandaBoardES/FMAnalog.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/PandaBoardES/FMAnalog.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -# Use case Configurationfor TI PandaBoardES HiFi Music -# By Liam Girdwood - -SectionVerb { - EnableSequence [ - cset "name='AMIC_UL PDM Switch' 1" - cset "name='MUX_UL00' 9" - cset "name='MUX_UL01' 10" - cset "name='Capture Volume' 4" - ] - - - DisableSequence [ - cset "name='AMIC_UL PDM Switch' 0" - cset "name='MUX_UL00' 0" - cset "name='MUX_UL01' 0" - cset "name='Capture Volume' 0" - ] - - # Optional TQ - Value { - TQ "Music" - } -} - -SectionDevice."Headset" { - Comment "PandaBoardES 3.5mm Headset" - - EnableSequence [ - cset "name='Analog Left Capture Route' 2" - cset "name='Analog Right Capture Route' 2" - cset "name='Capture Preamplifier Volume' 2" - ] - - DisableSequence [ - cset "name='Analog Left Capture Route' 3" - cset "name='Analog Right Capture Route' 3" - cset "name='Capture Preamplifier Volume' 0" - ] - - Value { - CapturePriority 100 - CapturePCM "hw:${CardId}" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/PandaBoardES/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/PandaBoardES/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/PandaBoardES/HiFi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/PandaBoardES/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -# Use case Configuration for TI PandaBoardES HiFi Music -# By Liam Girdwood - -SectionVerb { - EnableSequence [ - cset "name='DL1 Mixer Multimedia' 1" - cset "name='Sidetone Mixer Playback' 1" - cset "name='DL1 PDM Switch' 1" - cset "name='DL1 Media Playback Volume' 90,90" - cset "name='SDT DL Volume' 120" - - cset "name='Headset Left Playback' 1" - cset "name='Headset Right Playback' 1" - cset "name='Headset Playback Volume' 13" - ] - - DisableSequence [ - cset "name='DL1 Mixer Multimedia' 0" - cset "name='Sidetone Mixer Playback' 0" - cset "name='DL1 PDM Switch' 0" - cset "name='DL1 Media Playback Volume' 0,0" - cset "name='SDT DL Volume' 0" - - cset "name='Headset Right Playback' 0" - cset "name='Headset Left Playback' 0" - cset "name='Headset Playback Volume' 0" - ] - - # Optional TQ - Value { - TQ "Music" - } -} - -SectionDevice."Headset" { - Comment "PandaBoardES 3.5mm Headset" - - EnableSequence [ - cset "name='Headset Left Playback' 1" - cset "name='Headset Right Playback' 1" - cset "name='Headset Playback Volume' 13" - ] - - DisableSequence [ - cset "name='Headset Right Playback' 0" - cset "name='Headset Left Playback' 0" - cset "name='Headset Playback Volume' 0" - ] - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId}" - # PlaybackVolume "name='DL1 Media Playback Volume' 90,90" - # PlaybackSwitch "name='DL1 PDM Switch' 1" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/PandaBoardES/HiFiLP.conf alsa-ucm-conf-1.2.6.3/ucm2/PandaBoardES/HiFiLP.conf --- alsa-ucm-conf-1.2.2/ucm2/PandaBoardES/HiFiLP.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/PandaBoardES/HiFiLP.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -# Use case Configuration for TI PandaBoardES HiFi Music -# By Liam Girdwood - -SectionVerb { - EnableSequence [ - cset "name='DL1 Mixer Multimedia' 1" - cset "name='Sidetone Mixer Playback' 1" - cset "name='DL1 PDM Switch' 1" - cset "name='DL1 Media Playback Volume' 90,90" - cset "name='SDT DL Volume' 120" - ] - - DisableSequence [ - cset "name='DL1 Mixer Multimedia' 0" - cset "name='Sidetone Mixer Playback' 0" - cset "name='DL1 PDM Switch' 0" - cset "name='DL1 Media Playback Volume' 0,0" - cset "name='SDT DL Volume' 0" - ] - - # Optional TQ - Value { - TQ "Music" - } -} - -SectionDevice."Headset" { - Comment "PandaBoardES 3.5mm Headset" - - EnableSequence [ - cset "name='Headset Left Playback' 1" - cset "name='Headset Right Playback' 1" - cset "name='Headset Playback Volume' 13" - ] - - DisableSequence [ - cset "name='Headset Right Playback' 0" - cset "name='Headset Left Playback' 0" - cset "name='Headset Playback Volume' 0" - ] - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId},6" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/PandaBoardES/PandaBoardES.conf alsa-ucm-conf-1.2.6.3/ucm2/PandaBoardES/PandaBoardES.conf --- alsa-ucm-conf-1.2.2/ucm2/PandaBoardES/PandaBoardES.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/PandaBoardES/PandaBoardES.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -# UCM configuration for PandaBoardES - -Syntax 2 - -SectionUseCase."Record" { - File "Record.conf" - Comment "Record" -} - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Play HiFi quality Music" -} - -SectionUseCase."HiFi_Low_Power" { - File "HiFiLP.conf" - Comment "Play HiFi quality Music in Low Power Mode" -} - -SectionUseCase."Voice" { - File "Voice.conf" - Comment "Playback Voice quality." -} - -SectionUseCase."Voice_Low_Power" { - File "Voice.conf" - Comment "Playback Voice quality in Low Power Mode" -} - -SectionUseCase."Voice_Call" { - File "VoiceCall.conf" - Comment "Capture and Playback in Voice quality" -} - -SectionUseCase."Voice_Call_IP" { - File "VoiceCall.conf" - Comment "Capture and Playback in Voice quality" -} - -SectionUseCase."FM_Analog_Radio" { - File "FMAnalog.conf" - Comment "Capture FM Analog Radio" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/PandaBoardES/Record.conf alsa-ucm-conf-1.2.6.3/ucm2/PandaBoardES/Record.conf --- alsa-ucm-conf-1.2.2/ucm2/PandaBoardES/Record.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/PandaBoardES/Record.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -# By Liam Girdwood - -SectionVerb { - EnableSequence [ - # No more AMIC PDM Switch in current kernels - #cset "name='AMIC_UL PDM Switch' 1" - cset "name='MUX_UL00' 9" - cset "name='MUX_UL01' 10" - cset "name='Capture Volume' 4" - ] - - DisableSequence [ - # No more AMIC PDM Switch in current kernels - #cset "name='AMIC_UL PDM Switch' 0" - cset "name='MUX_UL00' 0" - cset "name='MUX_UL01' 0" - cset "name='Capture Volume' 0" - ] - - # Optional TQ - Value { - TQ "Music" - } - -} - -SectionDevice."Headset" { - Comment "PandaBoardES 3.5mm Headset" - - EnableSequence [ - cset "name='Analog Left Capture Route' 0" - cset "name='Analog Right Capture Route' 0" - cset "name='Capture Preamplifier Volume' 2" - ] - - DisableSequence [ - cset "name='Analog Left Capture Route' 3" - cset "name='Analog Right Capture Route' 3" - cset "name='Capture Preamplifier Volume' 0" - ] - - Value { - CapturePriority 100 - CapturePCM "hw:${CardId}" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/PandaBoardES/Voice.conf alsa-ucm-conf-1.2.6.3/ucm2/PandaBoardES/Voice.conf --- alsa-ucm-conf-1.2.2/ucm2/PandaBoardES/Voice.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/PandaBoardES/Voice.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -# Use case Configuration for TI PandaBoardES HiFi Music -# By Liam Girdwood - -SectionVerb { - EnableSequence [ - cset "name='DL1 Mixer Voice' 1" - cset "name='Sidetone Mixer Playback' 1" - cset "name='DL1 PDM Switch' 1" - cset "name='DL1 Voice Playback Volume' 90,90" - cset "name='SDT DL Volume' 120" - ] - - DisableSequence [ - cset "name='DL1 Mixer Voice' 0" - cset "name='Sidetone Mixer Playback' 0" - cset "name='DL1 PDM Switch' 0" - cset "name='DL1 Voice Playback Volume' 0,0" - cset "name='SDT DL Volume' 0" - ] - - # Optional TQ - Value { - TQ "Voice" - } -} - -SectionDevice."Headset" { - Comment "PandaBoardES 3.5mm Headset" - - EnableSequence [ - cset "name='Headset Left Playback' 1" - cset "name='Headset Right Playback' 1" - cset "name='Headset Playback Volume' 13" - ] - - DisableSequence [ - cset "name='Headset Right Playback' 0" - cset "name='Headset Left Playback' 0" - cset "name='Headset Playback Volume' 0" - ] - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId},2" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/PandaBoardES/VoiceCall.conf alsa-ucm-conf-1.2.6.3/ucm2/PandaBoardES/VoiceCall.conf --- alsa-ucm-conf-1.2.2/ucm2/PandaBoardES/VoiceCall.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/PandaBoardES/VoiceCall.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -# Use case Configuration for TI PandaBoardES HiFi Music -# By Liam Girdwood - -SectionVerb { - EnableSequence [ - cset "name='AMIC_UL PDM Switch' 1" - cset "name='Sidetone Mixer Capture' 1" - cset "name='MUX_VX0' 9" - cset "name='MUX_VX1' 10" - cset "name='DL1 Mixer Voice' 1" - cset "name='Sidetone Mixer Playback' 1" - cset "name='DL1 PDM Switch' 1" - cset "name='DL1 Voice Playback Volume' 90,90" - cset "name='Capture Volume' 4" - cset "name='Capture Mixer Voice Capture' 90,90" - cset "name='SDT DL Volume' 120" - ] - - - DisableSequence [ - cset "name='AMIC_UL PDM Switch' 0" - cset "name='Sidetone Mixer Capture' 0" - cset "name='MUX_VX0' 0" - cset "name='MUX_VX1' 0" - cset "name='DL1 Mixer Voice' 0" - cset "name='Sidetone Mixer Playback' 0" - cset "name='DL1 PDM Switch' 0" - cset "name='DL1 Voice Playback Volume' 0,0" - cset "name='Capture Volume' 0" - cset "name='DL1 Voice Playback Volume' 0,0" - cset "name='SDT DL Volume' 0" - ] - - # Optional TQ and ALSA PCMs - Value { - TQ "Voice" - } -} - -SectionDevice."Headset" { - Comment "PandaBoardES 3.5mm Headset" - - EnableSequence [ - cset "name='Analog Left Capture Route' 0" - cset "name='Analog Right Capture Route' 0" - cset "name='Capture Preamplifier Volume' 2" - cset "name='Headset Left Playback' 1" - cset "name='Headset Right Playback' 1" - cset "name='Headset Playback Volume' 13" - ] - - DisableSequence [ - cset "name='Analog Left Capture Route' 3" - cset "name='Analog Right Capture Route' 3" - cset "name='Capture Preamplifier Volume' 0" - cset "name='Headset Right Playback' 0" - cset "name='Headset Left Playback' 0" - cset "name='Headset Playback Volume' 0" - ] - - Value { - CapturePriority 100 - CapturePCM "hw:${CardId},2" - PlaybackPriority 100 - PlaybackPCM "hw:${CardId},2" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Qualcomm/apq8016-sbc/HDMI.conf alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/apq8016-sbc/HDMI.conf --- alsa-ucm-conf-1.2.2/ucm2/Qualcomm/apq8016-sbc/HDMI.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/apq8016-sbc/HDMI.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,17 @@ +# Use case configuration for DB410c board. +# Author: Srinivas Kandagatla + +SectionVerb { + Value { + TQ "HiFi" + } +} + +SectionDevice."HDMI" { + # Name "HDMI-stereo" + Comment "HDMI Digital Stereo Output" + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Qualcomm/apq8016-sbc/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/apq8016-sbc/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Qualcomm/apq8016-sbc/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/apq8016-sbc/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,159 @@ +# Use case configuration for DB410c board. +# Author: Srinivas Kandagatla + +SectionDevice."Speaker" { + Comment "Speaker playback" + + ConflictingDevice [ + "Headphones" + "Earpiece" + ] + + EnableSequence [ + cset "name='SPK DAC Switch' 1" + cset "name='RX3 MIX1 INP1' RX1" + ## gain to 0dB + cset "name='RX3 Digital Volume' 128" + ] + + DisableSequence [ + cset "name='SPK DAC Switch' 0" + cset "name='RX3 MIX1 INP1' ZERO" + ] + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId},1" + } +} + +SectionDevice."Headphones" { + Comment "Headphones playback" + + ConflictingDevice [ + "Speaker" + "Earpiece" + ] + EnableSequence [ + cset "name='RX1 MIX1 INP1' RX1" + cset "name='RX2 MIX1 INP1' RX2" + cset "name='RDAC2 MUX' RX2" + cset "name='HPHL' 1" + cset "name='HPHR' 1" + ## gain to 0dB + cset "name='RX1 Digital Volume' 128" + ## gain to 0dB + cset "name='RX2 Digital Volume' 128" + ] + + DisableSequence [ + cset "name='RX1 Digital Volume' 0" + cset "name='RX2 Digital Volume' 0" + cset "name='HPHL' 0" + cset "name='HPHR' 0" + cset "name='RDAC2 MUX' ZERO" + cset "name='RX1 MIX1 INP1' ZERO" + cset "name='RX2 MIX1 INP1' ZERO" + ] + + Value { + PlaybackPriority 300 + PlaybackPCM "hw:${CardId},1" + } +} + +SectionDevice."Earpiece" { + Comment "Earpiece playback" + + ConflictingDevice [ + "Speaker" + "Headphones" + ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId},1" + } +} + +SectionDevice."Handset" { + Comment "Headset Microphone" + + EnableSequence [ + cset "name='DEC1 MUX' ADC2" + cset "name='CIC1 MUX' AMIC" + cset "name='ADC2 Volume' 8" + cset "name='ADC2 MUX' INP2" + ] + + DisableSequence [ + cset "name='ADC2 MUX' ZERO" + cset "name='ADC2 Volume' 0" + cset "name='DEC1 MUX' ZERO" + ] + + Value { + CapturePriority 400 + CapturePCM "hw:${CardId},2" + } +} + +SectionDevice."Mic1" { + Comment "Primary Microphone" + + EnableSequence [ + cset "name='DEC1 MUX' ADC1" + cset "name='CIC1 MUX' AMIC" + cset "name='ADC1 Volume' 8" + ] + + DisableSequence [ + cset "name='DEC1 MUX' ZERO" + cset "name='ADC1 Volume' 0" + ] + + Value { + CapturePriority 300 + CapturePCM "hw:${CardId},2" + } +} + +SectionDevice."Mic2" { + Comment "Secondary Microphone" + + EnableSequence [ + cset "name='DEC1 MUX' ADC2" + cset "name='CIC1 MUX' AMIC" + cset "name='ADC2 Volume' 8" + cset "name='ADC2 MUX' INP2" + ] + + DisableSequence [ + cset "name='DEC1 MUX' ZERO" + cset "name='ADC2 Volume' 0" + cset "name='ADC2 MUX' ZERO" + ] + + Value { + CapturePriority 200 + CapturePCM "hw:${CardId},2" + } +} + +SectionDevice."Mic3" { + Comment "Digital Microphone" + + EnableSequence [ + cset "name='DEC1 MUX' DMIC1" + cset "name='CIC1 MUX' DMIC" + ] + + DisableSequence [ + cset "name='DEC1 MUX' ZERO" + ] + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId},2" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Qualcomm/apq8016-sbc/apq8016-sbc.conf alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/apq8016-sbc/apq8016-sbc.conf --- alsa-ucm-conf-1.2.2/ucm2/Qualcomm/apq8016-sbc/apq8016-sbc.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/apq8016-sbc/apq8016-sbc.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,10 @@ +Syntax 3 + +SectionUseCase."HiFi" { + File "/Qualcomm/apq8016-sbc/HiFi.conf" + Comment "Play HiFi quality Music" +} +SectionUseCase."HDMI" { + File "/Qualcomm/apq8016-sbc/HDMI.conf" + Comment "HDMI output" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Qualcomm/apq8096/HDMI.conf alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/apq8096/HDMI.conf --- alsa-ucm-conf-1.2.2/ucm2/Qualcomm/apq8096/HDMI.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/apq8096/HDMI.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,33 @@ +# Use case configuration for DB820c board. +# Author: Srinivas Kandagatla + +SectionVerb { + EnableSequence [ + cset "name='HDMI Mixer MultiMedia1' 1" + ] + + DisableSequence [ + cset "name='HDMI Mixer MultiMedia1' 0" + ] + + Value { + TQ "HiFi" + } +} + +SectionDevice."HDMI" { + Comment "HDMI Digital Stereo Output" + + EnableSequence [ + cset "name='HDMI Mixer MultiMedia1' 1" + ] + + DisableSequence [ + cset "name='HDMI Mixer MultiMedia1' 0" + ] + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Qualcomm/apq8096/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/apq8096/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Qualcomm/apq8096/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/apq8096/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,100 @@ +# Use case configuration for DB820c board. +# Author: Srinivas Kandagatla + +SectionVerb { + + EnableSequence [ + cset "name='SLIM RX0 MUX' ZERO" + cset "name='SLIM RX1 MUX' ZERO" + cset "name='SLIM RX2 MUX' ZERO" + cset "name='SLIM RX3 MUX' ZERO" + cset "name='SLIM RX4 MUX' ZERO" + cset "name='SLIM RX5 MUX' AIF4_PB" + cset "name='SLIM RX6 MUX' AIF4_PB" + cset "name='SLIM RX7 MUX' ZERO" + cset "name='RX INT1_2 MUX' RX5" + cset "name='RX INT2_2 MUX' RX6" + ## gain to 0dB + cset "name='RX5 Digital Volume' 68" + ## gain to 0dB + cset "name='RX6 Digital Volume' 68" + cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 1" + cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1" + cset "name='RX INT1 DEM MUX' CLSH_DSM_OUT" + cset "name='RX INT2 DEM MUX' CLSH_DSM_OUT" + cset "name='AIF1_CAP Mixer SLIM TX0' 1" + cset "name='SLIM TX0 MUX' DEC0" + cset "name='ADC2 Volume' 12" + cset "name='ADC MUX0' AMIC" + cset "name='AMIC MUX0' ADC2" + ] + + DisableSequence [ + cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 0" + cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0" + ] +} + +SectionDevice."Headphones" { + Comment "Headphones playback" + + EnableSequence [ + cset "name='SLIM RX0 MUX' ZERO" + cset "name='SLIM RX1 MUX' ZERO" + cset "name='SLIM RX2 MUX' ZERO" + cset "name='SLIM RX3 MUX' ZERO" + cset "name='SLIM RX4 MUX' ZERO" + cset "name='SLIM RX5 MUX' AIF4_PB" + cset "name='SLIM RX6 MUX' AIF4_PB" + cset "name='SLIM RX7 MUX' ZERO" + cset "name='RX INT1_2 MUX' RX5" + cset "name='RX INT2_2 MUX' RX6" + ## gain to 0dB + cset "name='RX5 Digital Volume' 68" + ## gain to 0dB + cset "name='RX6 Digital Volume' 68" + cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 1" + cset "name='RX INT1 DEM MUX' CLSH_DSM_OUT" + cset "name='RX INT2 DEM MUX' CLSH_DSM_OUT" + ] + + DisableSequence [ + cset "name='RX5 Digital Volume' 0" + cset "name='RX6 Digital Volume' 0" + cset "name='SLIM RX5 MUX' ZERO" + cset "name='SLIM RX6 MUX' ZERO" + cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 0" + ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId},1" + } +} + +SectionDevice."Headset" { + Comment "Headset Microphone" + + EnableSequence [ + cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1" + cset "name='AIF1_CAP Mixer SLIM TX0' 1" + cset "name='SLIM TX0 MUX' DEC0" + cset "name='ADC2 Volume' 12" + cset "name='ADC MUX0' AMIC" + cset "name='AMIC MUX0' ADC2" + ] + + DisableSequence [ + cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0" + cset "name='AIF1_CAP Mixer SLIM TX0' 0" + cset "name='AMIC MUX0' ZERO" + cset "name='SLIM TX0 MUX' ZERO" + cset "name='ADC2 Volume' 0" + ] + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId},2" + CaptureChannels 1 + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Qualcomm/apq8096/apq8096.conf alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/apq8096/apq8096.conf --- alsa-ucm-conf-1.2.2/ucm2/Qualcomm/apq8096/apq8096.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/apq8096/apq8096.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,11 @@ +Syntax 2 + +SectionUseCase."HiFi" { + File "/Qualcomm/apq8096/HiFi.conf" + Comment "HiFi quality Music" +} + +SectionUseCase."HDMI" { + File "/Qualcomm/apq8096/HDMI.conf" + Comment "HDMI output" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Qualcomm/sc7180/rt5682-max98357a/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/sc7180/rt5682-max98357a/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Qualcomm/sc7180/rt5682-max98357a/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/sc7180/rt5682-max98357a/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,101 @@ +# Use case configuration for ALC5682+MAX98357A on SC7180 + +SectionVerb { + Value { + TQ "HiFi" + } +} + +SectionDevice."Speaker" { + Comment "Speaker" + + Value { + PlaybackChannels 2 + PlaybackPCM "hw:${CardId},1" + PlaybackPriority 100 + PlaybackMixerElem "Speaker" + PlaybackVolume "Speaker Playback Volume" + } +} + +SectionDevice."Headphones" { + Comment "Headphones" + + EnableSequence [ + cset "name='HPOL Playback Switch' 1" + cset "name='HPOR Playback Switch' 1" + cset "name='Stereo1 DAC MIXL DAC L1 Switch' 1" + cset "name='Stereo1 DAC MIXR DAC R1 Switch' 1" + ] + + DisableSequence [ + cset "name='HPOL Playback Switch' 0" + cset "name='HPOR Playback Switch' 0" + cset "name='Stereo1 DAC MIXL DAC L1 Switch' 0" + cset "name='Stereo1 DAC MIXR DAC R1 Switch' 0" + ] + + Value { + PlaybackPCM "hw:${CardId},0" + PlaybackPriority 200 + PlaybackMasterElem "DAC1" + PlaybackMixerElem "Headphone" + PlaybackVolume "Headphone Playback Volume" + } +} + +SectionDevice."Mic" { + Comment "Internal Microphone" + + ConflictingDevice [ + "Headset" + ] + + EnableSequence [ + cset "name='IF1 01 ADC Swap Mux' 1" + cset "name='Stereo1 ADC L2 Mux' 1" + cset "name='Stereo1 ADC R2 Mux' 1" + cset "name='Stereo1 ADC MIXL ADC2 Switch' 1" + cset "name='Stereo1 ADC MIXR ADC2 Switch' 1" + ] + + DisableSequence [ + cset "name='Stereo1 ADC L2 Mux' 0" + cset "name='Stereo1 ADC R2 Mux' 0" + cset "name='Stereo1 ADC MIXL ADC2 Switch' 0" + cset "name='Stereo1 ADC MIXR ADC2 Switch' 0" + ] + + Value { + CapturePCM "hw:${CardId},0" + CapturePriority 100 + CaptureMixerElem "STO1 ADC" + CaptureVolume "STO1 ADC Capture Volume" + } +} + +SectionDevice."Headset" { + Comment "Headset Microphone" + + EnableSequence [ + cset "name='IF1 01 ADC Swap Mux' 2" + cset "name='Stereo1 ADC L1 Mux' 1" + cset "name='Stereo1 ADC R1 Mux' 1" + cset "name='Stereo1 ADC MIXL ADC1 Switch' 1" + cset "name='Stereo1 ADC MIXR ADC1 Switch' 1" + ] + + DisableSequence [ + cset "name='Stereo1 ADC L1 Mux' 0" + cset "name='Stereo1 ADC R1 Mux' 0" + cset "name='Stereo1 ADC MIXL ADC1 Switch' 0" + cset "name='Stereo1 ADC MIXR ADC1 Switch' 0" + ] + + Value { + CapturePCM "hw:${CardId},0" + CapturePriority 200 + CaptureMixerElem "STO1 ADC" + CaptureVolume "STO1 ADC Capture Volume" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Qualcomm/sc7180/rt5682-max98357a/init.conf alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/sc7180/rt5682-max98357a/init.conf --- alsa-ucm-conf-1.2.2/ucm2/Qualcomm/sc7180/rt5682-max98357a/init.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/sc7180/rt5682-max98357a/init.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,24 @@ +BootSequence [ + # Headphone + cset "name='HPOL Playback Switch' 0" + cset "name='HPOR Playback Switch' 0" + cset "name='Stereo1 DAC MIXL DAC L1 Switch' 0" + cset "name='Stereo1 DAC MIXR DAC R1 Switch' 0" + + # Headset mic + cset "name='Stereo1 ADC L Mux' 0" + cset "name='STO1 ADC Capture Switch' on" + cset "name='RECMIX1L CBJ Switch' 1" + cset "name='CBJ Boost Volume' 3" + cset "name='Stereo1 ADC L1 Mux' 0" + cset "name='Stereo1 ADC R1 Mux' 0" + cset "name='Stereo1 ADC MIXL ADC1 Switch' 0" + cset "name='Stereo1 ADC MIXR ADC1 Switch' 0" + + # Internal mic on ALC5682 + cset "name='IF1 01 ADC Swap Mux' 1" + cset "name='Stereo1 ADC L2 Mux' 0" + cset "name='Stereo1 ADC R2 Mux' 0" + cset "name='Stereo1 ADC MIXL ADC2 Switch' 0" + cset "name='Stereo1 ADC MIXR ADC2 Switch' 0" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/Qualcomm/sc7180/rt5682-max98357a/sc7180-rt5682-max98357a-1mic.conf alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/sc7180/rt5682-max98357a/sc7180-rt5682-max98357a-1mic.conf --- alsa-ucm-conf-1.2.2/ucm2/Qualcomm/sc7180/rt5682-max98357a/sc7180-rt5682-max98357a-1mic.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/sc7180/rt5682-max98357a/sc7180-rt5682-max98357a-1mic.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,11 @@ +Comment "SC7180 RT5682 MAX98357A single microphone sound card" +Syntax 4 + +SectionUseCase."HiFi" { + File "/Qualcomm/sc7180/rt5682-max98357a/HiFi.conf" + Comment "Default" +} + +Include.card-init.File "/lib/card-init.conf" +Include.ctl-remap.File "/lib/ctl-remap.conf" +Include.init.File "/Qualcomm/sc7180/rt5682-max98357a/init.conf" diff -Nru alsa-ucm-conf-1.2.2/ucm2/Qualcomm/sdm845/HDMI.conf alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/sdm845/HDMI.conf --- alsa-ucm-conf-1.2.2/ucm2/Qualcomm/sdm845/HDMI.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/sdm845/HDMI.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,26 @@ +# Use case configuration for DB845c board. +# Author: Srinivas Kandagatla + +SectionVerb { + EnableSequence [ + cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 1" + ] + + DisableSequence [ + cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 0" + ] + + Value { + TQ "HiFi" + } +} + +SectionDevice."HDMI" { + #Name "HDMI" + Comment "HDMI Digital Stereo Output" + + Value { + PlaybackPCM "hw:${CardId}" + PlaybackPriority 200 + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Qualcomm/sdm845/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/sdm845/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Qualcomm/sdm845/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/sdm845/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,40 @@ +# Use case configuration for DB845c. +# Author: Srinivas Kandagatla + +SectionVerb { + + EnableSequence [ + cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 1" + ] + + Include.wcde.File "/codecs/wcd934x/DefaultEnableSeq.conf" + Include.wsae.File "/codecs/wsa881x/DefaultEnableSeq.conf" + + Include.wcdd { + File "/codecs/wcd934x/DefaultDisableSeq.conf" + Before.DisableSequence "0" + } + + DisableSequence [ + cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 0" + ] + + Value { + TQ "HiFi" + } +} + +SectionDevice."Speaker" { + Comment "Speaker playback" + + Include.wcde.File "/codecs/wcd934x/SpeakerEnableSeq.conf" + Include.wsae.File "/codecs/wsa881x/SpeakerEnableSeq.conf" + Include.wsad.File "/codecs/wsa881x/SpeakerDisableSeq.conf" + Include.wcdd.File "/codecs/wcd934x/SpeakerDisableSeq.conf" + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId},1" + PlaybackVolume "RX2 Digital Volume" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Qualcomm/sdm845/sdm845.conf alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/sdm845/sdm845.conf --- alsa-ucm-conf-1.2.2/ucm2/Qualcomm/sdm845/sdm845.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/sdm845/sdm845.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,11 @@ +Syntax 3 + +SectionUseCase."HiFi" { + File "/Qualcomm/sdm845/HiFi.conf" + Comment "HiFi quality Music." +} + +SectionUseCase."HDMI" { + File "/Qualcomm/sdm845/HDMI.conf" + Comment "HDMI output." +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Qualcomm/sm8250/HDMI.conf alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/sm8250/HDMI.conf --- alsa-ucm-conf-1.2.2/ucm2/Qualcomm/sm8250/HDMI.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/sm8250/HDMI.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,26 @@ +# Use case configuration for RB5 board. +# Author: Srinivas Kandagatla + +SectionVerb { + EnableSequence [ + cset "name='TERT_MI2S_RX Audio Mixer MultiMedia1' 1" + ] + + DisableSequence [ + cset "name='TERT_MI2S_RX Audio Mixer MultiMedia1' 0" + ] + + Value { + TQ "HiFi" + } +} + +SectionDevice."HDMI" { + #Name "HDMI" + Comment "HDMI Digital Stereo Output" + + Value { + PlaybackPCM "hw:${CardId}" + PlaybackPriority 200 + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Qualcomm/sm8250/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/sm8250/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Qualcomm/sm8250/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/sm8250/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,46 @@ +# Use case configuration for Qualcomm RB5. +# Author: Srinivas Kandagatla + +SectionVerb { + + EnableSequence [ + cset "name='WSA_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' 1" + cset "name='MultiMedia3 Mixer VA_CODEC_DMA_TX_0' 1" + ] + + Include.wsae.File "/codecs/wsa881x/DefaultEnableSeq.conf" + + DisableSequence [ + cset "name='WSA_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' 0" + cset "name='MultiMedia3 Mixer VA_CODEC_DMA_TX_0' 0" + ] + + Value { + TQ "HiFi" + } +} + +SectionDevice."Speaker" { + Comment "Speaker playback" + + Include.lpasswsae.File "/codecs/qcom-lpass/wsa-macro/SpeakerEnableSeq.conf" + Include.wsae.File "/codecs/wsa881x/SpeakerEnableSeq.conf" + Include.wsad.File "/codecs/wsa881x/SpeakerDisableSeq.conf" + Include.lpasswsad.File "/codecs/qcom-lpass/wsa-macro/SpeakerDisableSeq.conf" + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId},1" + } +} + +SectionDevice."Mic" { + Comment "Mic" + Include.lpassvae.File "/codecs/qcom-lpass/va-macro/DMIC0EnableSeq.conf" + Include.lpassvad.File "/codecs/qcom-lpass/va-macro/DMIC0DisableSeq.conf" + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId},2" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Qualcomm/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf --- alsa-ucm-conf-1.2.2/ucm2/Qualcomm/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Qualcomm/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,11 @@ +Syntax 3 + +SectionUseCase."HiFi" { + File "/Qualcomm/sm8250/HiFi.conf" + Comment "HiFi quality Music." +} + +SectionUseCase."HDMI" { + File "/Qualcomm/sm8250/HDMI.conf" + Comment "HDMI output." +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/README.md alsa-ucm-conf-1.2.6.3/ucm2/README.md --- alsa-ucm-conf-1.2.2/ucm2/README.md 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/README.md 2021-12-17 16:53:11.000000000 +0000 @@ -7,9 +7,54 @@ codecs/ dsps/ -Those directories are not inspected for the list of -available UCM configurations. They contain files -included from other UCMs. +Those directories are not inspected for the list of available UCM +configurations. They contain files included from other UCMs. + +UCM master configuration path lookup is defined in the top level +ucm.conf file. This file allows custom directory layout. The new +ucm2 layout is based on the ALSA driver name with the kernel driver +name as fallback. The virtual cards (no direct hw bound) lookups are +placed to the separate conf.virt.d directory. + +The lookup configuration: + + https://git.alsa-project.org/?p=alsa-ucm-conf.git;a=blob;f=ucm2/ucm.conf + +Example paths - new conf.d scheme: + +- conf.d/USB-Audio/Dell-WD15-Dock.conf +-- special configuration for the Dell docking station with USB soundcard +- conf.virt.d/TwoCardsMix.conf +-- virtual UCM from two soundcards + +Example paths - no conf.d scheme (may be invalidated): + +- USB-Audio/Dell-WD15-Dock.conf +-- special configuration for the Dell docking station with USB soundcard +- TwoCardsMix/TwoCardsMix.conf +-- virtual UCM from two soundcards + +Note: For the driver configurations, use always the ALSA driver name or +the real kernel driver name - not the ucm card name configuration paths! + +The kernel driver name is obtained using sysfs like (last +part of the path is used from the symlink): + +```` + /sys/class/sound/card0/device/driver +```` + +The ALSA driver name can be obtained using procfs like: + +```` + cat /proc/asound/cards + 1 [NVidia ]: HDA-Intel - HDA NVidia + HDA NVidia at 0xb5080000 irq 17 + + driver name: HDA-Intel + card short name: HDA NVidia + card long name: HDA NVidia at 0xb5080000 irq 17 +```` Syntax, value names ------------------- diff -Nru alsa-ucm-conf-1.2.2/ucm2/Rockchip/es8316/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Rockchip/es8316/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Rockchip/es8316/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Rockchip/es8316/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,66 @@ +# Reference: +# https://gitlab.manjaro.org/manjaro-arm/packages/community/pinebookpro-post-install/-/blob/4b4206c57b21044bf9c00848bd1f8b6f710d19eb/asound.state +# https://gitlab.manjaro.org/manjaro-arm/packages/community/pinebookpro-audio/-/blob/1f567db09495acc3beb5405c9ef85c3c07b86785/audio_jack_plugged_in.sh + +SectionDevice."Speaker" { + Comment "Speaker" + + ConflictingDevice [ + "Headphones" + ] + + EnableSequence [ + cset "name='Playback Polarity' 'R Invert'" + cset "name='Speaker Switch' on" + ] + + DisableSequence [ + cset "name='Speaker Switch' off" + ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + PlaybackMixerElem "Headphone Mixer" + PlaybackMasterElem "DAC" + } +} + +SectionDevice."Mic" { + Comment "Internal Microphone" + + EnableSequence [ + cset "name='Differential Mux' lin1-rin1" + ] + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId}" + CaptureMixerElem "ADC PGA Gain" + CaptureMasterElem "ADC" + } +} + +SectionDevice."Headphones" { + Comment "Headphones" + + ConflictingDevice [ + "Speaker" + ] + + EnableSequence [ + cset "name='Playback Polarity' 'Normal'" + ] + DisableSequence [ + cset "name='Playback Polarity' 'R Invert'" + ] + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + PlaybackMixerElem "Headphone Mixer" + PlaybackMasterElem "DAC" + JackControl "Headphones Jack" + JackHWMute "Speaker" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Rockchip/es8316/es8316.conf alsa-ucm-conf-1.2.6.3/ucm2/Rockchip/es8316/es8316.conf --- alsa-ucm-conf-1.2.2/ucm2/Rockchip/es8316/es8316.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Rockchip/es8316/es8316.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,29 @@ +Syntax 3 + +SectionUseCase."HiFi" { + File "/Rockchip/es8316/HiFi.conf" + Comment "Play HiFi quality Music" +} + +BootSequence [ + # Disable all outputs + cset "name='Speaker Switch' off" + + # Set HP vol to 0 dB (3/3) + cset "name='Headphone Playback Volume' 3" + # Set HP mixer vol to 0 dB + cset "name='Headphone Mixer Volume' 11" + # Set DAC vol to 0 dB (192/192) + cset "name='DAC Playback Volume' 192" + + # Disable Auto Level Control + cset "name='ALC Capture Switch' off" + # Set ADC vol to 0 dB (192/192) + cset "name='ADC Capture Volume' 192" + # Set Mic amplifier to +16 dB + cset "name='ADC PGA Gain Volume' 7" + + # Setup muxes / switches + cset "name='Left Headphone Mixer Left DAC Switch' on" + cset "name='Right Headphone Mixer Right DAC Switch' on" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/Rockchip/max98090/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Rockchip/max98090/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Rockchip/max98090/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Rockchip/max98090/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,119 @@ +SectionVerb { + Value { + MinBufferLevel "512" + } + + EnableSequence [ + cset "name='Left Speaker Mixer Left DAC Switch' on" + cset "name='Right Speaker Mixer Right DAC Switch' on" + cset "name='Headphone Left Switch' off" + cset "name='Headphone Right Switch' off" + cset "name='Digital EQ 3 Band Switch' off" + cset "name='Digital EQ 5 Band Switch' off" + cset "name='Digital EQ 7 Band Switch' off" + cset "name='Biquad Switch' off" + cset "name='Filter Mode' Music" + cset "name='ADC Oversampling Rate' 0" + + cset "name='DMIC Mux' DMIC" + cset "name='MIC2 Mux' IN34" + cset "name='Right ADC Mixer MIC2 Switch' on" + cset "name='Left ADC Mixer MIC2 Switch' on" + cset "name='MIC2 Volume' 20" + cset "name='Headset Mic Switch' off" + cset "name='Int Mic Switch' on" + + cset "name='ADCR Boost Volume' 4" + cset "name='ADCL Boost Volume' 4" + cset "name='ADCR Volume' 11" + cset "name='ADCL Volume' 11" + + cset "name='Left Speaker Mixer Left DAC Switch' on" + cset "name='Right Speaker Mixer Right DAC Switch' on" + cset "name='Speaker Left Mixer Volume' 2" + cset "name='Speaker Right Mixer Volume' 2" + cset "name='Record Path DC Blocking' on" + cset "name='Playback Path DC Blocking' on" + + cset "name='Speaker Left Switch' on" + cset "name='Speaker Right Switch' on" + cset "name='Speaker Switch' on" + ] +} + +SectionDevice."Speaker" { + Comment "Speaker" + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + } + + EnableSequence [ + cset "name='Speaker Switch' on" + ] + + DisableSequence [ + cset "name='Speaker Switch' off" + ] +} + +SectionDevice."Mic" { + Comment "Internal Microphone" + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId}" + } + + EnableSequence [ + cset "name='Int Mic Switch' on" + ] + + DisableSequence [ + cset "name='Int Mic Switch' off" + ] +} + +SectionDevice."Headphones" { + Comment "Headphones" + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + } + + EnableSequence [ + cset "name='Speaker Switch' off" + cset "name='Headphone Left Switch' on" + cset "name='Headphone Right Switch' on" + ] + DisableSequence [ + cset "name='Headphone Left Switch' off" + cset "name='Headphone Right Switch' off" + cset "name='Speaker Switch' on" + ] +} + +SectionDevice."Headset" { + Comment "Headset Microphone" + + Value { + CapturePriority 200 + CapturePCM "hw:${CardId}" + } + + EnableSequence [ + cset "name='Int Mic Switch' off" + cset "name='DMIC Mux' ADC" + cset "name='Headset Mic Switch' on" + cset "name='Record Path DC Blocking' on" + ] + + DisableSequence [ + cset "name='Headset Mic Switch' off" + cset "name='DMIC Mux' DMIC" + cset "name='Int Mic Switch' on" + cset "name='Record Path DC Blocking' off" + ] +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Rockchip/max98090/max98090.conf alsa-ucm-conf-1.2.6.3/ucm2/Rockchip/max98090/max98090.conf --- alsa-ucm-conf-1.2.2/ucm2/Rockchip/max98090/max98090.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Rockchip/max98090/max98090.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,8 @@ +Syntax 2 + +Comment "Rockchip Veyron card" + +SectionUseCase."HiFi" { + File "/Rockchip/max98090/HiFi.conf" + Comment "Default" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Rockchip/rk3399-gru-sound/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Rockchip/rk3399-gru-sound/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Rockchip/rk3399-gru-sound/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Rockchip/rk3399-gru-sound/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,125 @@ +SectionVerb { + Value { + MinBufferLevel "512" + } + + EnableSequence [ + cset "name='Stereo1 DMIC Mux' DMIC1" + cset "name='Sto1 ADC MIXL DMIC Switch' on" + cset "name='Sto1 ADC MIXR DMIC Switch' on" + + cset "name='Mixer Out FilterL DACL Switch' on" + cset "name='Mixer Out FilterR DACR Switch' on" + cset "name='Playback Digital Switch' on" + cset "name='Headphone Switch' on" + + cset "name='Mixin Volume' 11" + cset "name='Mixin Switch' on" + cset "name='Mixer In Mic Switch' on" + cset "name='Out DAIL Mux' ADC" + cset "name='Out DAIR Mux' ADC" + cset "name='ADC1 Capture Volume' 51" + cset "name='Mic Volume' 6" + cset "name='Capture Digital Switch' on" + cset "name='Mic Switch' on" + + cset "name='Speakers Switch' off" + cset "name='Int Mic Switch' off" + cset "name='Headphones Switch' off" + cset "name='Headset Mic Switch' off" + ] +} + +SectionDevice."Speaker" { + Comment "Speaker" + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + PlaybackMixerElem "Speakers" + } + + EnableSequence [ + cset "name='Speakers Switch' on" + ] + + DisableSequence [ + cset "name='Speakers Switch' off" + ] + + ConflictingDevice [ + "Headphones" + ] +} + +SectionDevice."Mic" { + Comment "Internal Microphone" + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId},1" + CaptureMixerElem "ADC1" + } + + EnableSequence [ + cset "name='Int Mic Switch' on" + ] + + DisableSequence [ + cset "name='Int Mic Switch' off" + ] + + ConflictingDevice [ + "Headset" + ] +} + +SectionDevice."Headphones" { + Comment "Headphones" + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId},2" + PlaybackMixerElem "Headphone" + JackControl "Headphones Jack" + } + + EnableSequence [ + cset "name='Headphones Switch' on" + cset "name='DAC Soft Mute Switch' off" + cset "name='Headphone Switch' on" + ] + + DisableSequence [ + cset "name='Headphone Switch' off" + cset "name='DAC Soft Mute Switch' on" + cset "name='Headphones Switch' off" + ] + + ConflictingDevice [ + "Speaker" + ] +} + +SectionDevice."Headset" { + Comment "Headset Microphone" + + Value { + CapturePriority 200 + CapturePCM "hw:${CardId},2" + CaptureMixerElem "Mic" + JackControl "Headset Mic Jack" + } + + EnableSequence [ + cset "name='Headset Mic Switch' on" + ] + + DisableSequence [ + cset "name='Headset Mic Switch' off" + ] + + ConflictingDevice [ + "Mic" + ] +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Rockchip/rk3399-gru-sound/rk3399-gru-sound.conf alsa-ucm-conf-1.2.6.3/ucm2/Rockchip/rk3399-gru-sound/rk3399-gru-sound.conf --- alsa-ucm-conf-1.2.2/ucm2/Rockchip/rk3399-gru-sound/rk3399-gru-sound.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Rockchip/rk3399-gru-sound/rk3399-gru-sound.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,8 @@ +Syntax 2 + +Comment "Rockchip Gru card" + +SectionUseCase."HiFi" { + File "/Rockchip/rk3399-gru-sound/HiFi.conf" + Comment "Default" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/SDP4430/FMAnalog.conf alsa-ucm-conf-1.2.6.3/ucm2/SDP4430/FMAnalog.conf --- alsa-ucm-conf-1.2.2/ucm2/SDP4430/FMAnalog.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/SDP4430/FMAnalog.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -# Use case Configuratio -# By Liam Girdwood - -SectionVerb { - EnableSequence [ - cset "name='AMIC_UL PDM Switch' 1" - cset "name='MUX_UL00' 9" - cset "name='MUX_UL01' 10" - cset "name='Capture Volume' 4" - ] - - DisableSequence [ - cset "name='AMIC_UL PDM Switch' 0" - cset "name='MUX_UL00' 0" - cset "name='MUX_UL01' 0" - cset "name='Capture Volume' 0" - ] -} - -SectionDevice."Headset" { - Comment "SDP4430 3.5mm Headset" - - EnableSequence [ - cset "name='Analog Left Capture Route' 2" - cset "name='Analog Right Capture Route' 2" - cset "name='Capture Preamplifier Volume' 2" - ] - - DisableSequence [ - cset "name='Analog Left Capture Route' 3" - cset "name='Analog Right Capture Route' 3" - cset "name='Capture Preamplifier Volume' 0" - ] - - Value { - CapturePriority 100 - CapturePCM "hw:${CardId}" - } -} - diff -Nru alsa-ucm-conf-1.2.2/ucm2/SDP4430/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/SDP4430/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/SDP4430/HiFi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/SDP4430/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -# Use case Configuration for TI SDP4430 HiFi Music -# By Liam Girdwood - -SectionVerb { - EnableSequence [ - cset "name='DL1 Mixer Multimedia' 1" - cset "name='Sidetone Mixer Playback' 1" - cset "name='DL1 PDM Switch' 1" - cset "name='DL1 Media Playback Volume' 90,90" - cset "name='SDT DL Volume' 120" - - cset "name='HS Left Playback' 1" - cset "name='HS Right Playback' 1" - cset "name='Headset Playback Volume' 13" - ] - - DisableSequence [ - cset "name='DL1 Mixer Multimedia' 0" - cset "name='Sidetone Mixer Playback' 0" - cset "name='DL1 PDM Switch' 0" - cset "name='DL1 Media Playback Volume' 0,0" - cset "name='SDT DL Volume' 0" - - cset "name='HS Right Playback' 0" - cset "name='HS Left Playback' 0" - cset "name='Headset Playback Volume' 0" - ] - - # Optional TQ and ALSA PCMs -# Value { -# TQ "Music" -# PlaybackPCM "hw:${CardId},0" -# PlaybackVolume "name='DL1 Media Playback Volume' 90,90" -# PlaybackSwitch "name='DL1 PDM Switch' 1" -# } -} - -SectionDevice."Headset" { - Comment "SDP4430 3.5mm Headset" - - EnableSequence [ - cset "name='HS Left Playback' 1" - cset "name='HS Right Playback' 1" - cset "name='Headset Playback Volume' 13" - ] - - DisableSequence [ - cset "name='HS Right Playback' 0" - cset "name='HS Left Playback' 0" - cset "name='Headset Playback Volume' 0" - ] - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId}" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/SDP4430/HiFiLP.conf alsa-ucm-conf-1.2.6.3/ucm2/SDP4430/HiFiLP.conf --- alsa-ucm-conf-1.2.2/ucm2/SDP4430/HiFiLP.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/SDP4430/HiFiLP.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -# Use case Configuration for TI SDP4430 HiFi Music -# By Liam Girdwood - -SectionVerb { - EnableSequence [ - cset "name='DL1 Mixer Multimedia' 1" - cset "name='Sidetone Mixer Playback' 1" - cset "name='DL1 PDM Switch' 1" - cset "name='DL1 Media Playback Volume' 90,90" - cset "name='SDT DL Volume' 120" - ] - - DisableSequence [ - cset "name='DL1 Mixer Multimedia' 0" - cset "name='Sidetone Mixer Playback' 0" - cset "name='DL1 PDM Switch' 0" - cset "name='DL1 Media Playback Volume' 0,0" - cset "name='SDT DL Volume' 0" - ] - - Value { - TQ "Music" - } -} - -SectionDevice."Headset" { - Comment "SDP4430 3.5mm Headset" - - EnableSequence [ - cset "name='HS Left Playback' 1" - cset "name='HS Right Playback' 1" - cset "name='Headset Playback Volume' 13" - ] - - DisableSequence [ - cset "name='HS Right Playback' 0" - cset "name='HS Left Playback' 0" - cset "name='Headset Playback Volume' 0" - ] - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId},6" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/SDP4430/Record.conf alsa-ucm-conf-1.2.6.3/ucm2/SDP4430/Record.conf --- alsa-ucm-conf-1.2.2/ucm2/SDP4430/Record.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/SDP4430/Record.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -# Use case Configuration for TI SDP4430 HiFi Music -# By Liam Girdwood - -SectionVerb { - EnableSequence [ - cset "name='AMIC_UL PDM Switch' 1" - cset "name='MUX_UL00' 9" - cset "name='MUX_UL01' 10" - cset "name='Capture Volume' 4" - ] - - DisableSequence [ - cset "name='AMIC_UL PDM Switch' 0" - cset "name='MUX_UL00' 0" - cset "name='MUX_UL01' 0" - cset "name='Capture Volume' 0" - ] - - # Optional TQ and ALSA PCMs - Value { - TQ "Music" - } - -} - -SectionDevice."Headset" { - Comment "SDP4430 3.5mm Headset" - - EnableSequence [ - cset "name='Analog Left Capture Route' 0" - cset "name='Analog Right Capture Route' 0" - cset "name='Capture Preamplifier Volume' 2" - ] - - DisableSequence [ - cset "name='Analog Left Capture Route' 3" - cset "name='Analog Right Capture Route' 3" - cset "name='Capture Preamplifier Volume' 0" - ] - - Value { - CapturePriority 100 - CapturePCM "hw:${CardId}" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/SDP4430/SDP4430.conf alsa-ucm-conf-1.2.6.3/ucm2/SDP4430/SDP4430.conf --- alsa-ucm-conf-1.2.2/ucm2/SDP4430/SDP4430.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/SDP4430/SDP4430.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -# UCM configuration for SDP4430 - -Syntax 2 - -SectionUseCase."Record" { - File "Record.conf" - Comment "Record" -} - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Play HiFi quality Music" -} - -SectionUseCase."HiFi_Low_Power" { - File "HiFiLP.conf" - Comment "Play HiFi quality Music in Low Power Mode" -} - -SectionUseCase."Voice" { - File "Voice.conf" - Comment "Playback Voice quality" -} - -SectionUseCase."Voice_Low_Power" { - File "Voice.conf" - Comment "Playback Voice quality in Low Power Mode." -} - -SectionUseCase."Voice_Call" { - File "VoiceCall.conf" - Comment "Capture and Playback in Voice quality" -} - -SectionUseCase."Voice_Call_IP" { - File "VoiceCall.conf" - Comment "Capture and Playback in Voice quality" -} - -SectionUseCase."FM_Analog_Radio" { - File "FMAnalog.conf" - Comment "Capture FM Analog Radio" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/SDP4430/Voice.conf alsa-ucm-conf-1.2.6.3/ucm2/SDP4430/Voice.conf --- alsa-ucm-conf-1.2.2/ucm2/SDP4430/Voice.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/SDP4430/Voice.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -# Use case Configuration for TI SDP4430 HiFi Music -# By Liam Girdwood - -SectionVerb { - EnableSequence [ - cset "name='DL1 Mixer Voice' 1" - cset "name='Sidetone Mixer Playback' 1" - cset "name='DL1 PDM Switch' 1" - cset "name='DL1 Voice Playback Volume' 90,90" - cset "name='SDT DL Volume' 120" - ] - - DisableSequence [ - cset "name='DL1 Mixer Voice' 0" - cset "name='Sidetone Mixer Playback' 0" - cset "name='DL1 PDM Switch' 0" - cset "name='DL1 Voice Playback Volume' 0,0" - cset "name='SDT DL Volume' 0" - ] - - Value { - TQ "Voice" - } -} - -SectionDevice."Headset" { - Comment "SDP4430 3.5mm Headset" - - EnableSequence [ - cset "name='HS Left Playback' 1" - cset "name='HS Right Playback' 1" - cset "name='Headset Playback Volume' 13" - ] - - DisableSequence [ - cset "name='HS Right Playback' 0" - cset "name='HS Left Playback' 0" - cset "name='Headset Playback Volume' 0" - ] - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId},2" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/SDP4430/VoiceCall.conf alsa-ucm-conf-1.2.6.3/ucm2/SDP4430/VoiceCall.conf --- alsa-ucm-conf-1.2.2/ucm2/SDP4430/VoiceCall.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/SDP4430/VoiceCall.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -# Use case Configuration for TI SDP4430 HiFi Music -# By Liam Girdwood - -SectionVerb { - EnableSequence [ - cset "name='AMIC_UL PDM Switch' 1" - cset "name='Sidetone Mixer Capture' 1" - cset "name='MUX_VX0' 9" - cset "name='MUX_VX1' 10" - cset "name='DL1 Mixer Voice' 1" - cset "name='Sidetone Mixer Playback' 1" - cset "name='DL1 PDM Switch' 1" - cset "name='DL1 Voice Playback Volume' 90,90" - cset "name='Capture Volume' 4" - cset "name='Capture Mixer Voice Capture' 90,90" - cset "name='SDT DL Volume' 120" - ] - - - DisableSequence [ - cset "name='AMIC_UL PDM Switch' 0" - cset "name='Sidetone Mixer Capture' 0" - cset "name='MUX_VX0' 0" - cset "name='MUX_VX1' 0" - cset "name='DL1 Mixer Voice' 0" - cset "name='Sidetone Mixer Playback' 0" - cset "name='DL1 PDM Switch' 0" - cset "name='DL1 Voice Playback Volume' 0,0" - cset "name='Capture Volume' 0" - cset "name='DL1 Voice Playback Volume' 0,0" - cset "name='SDT DL Volume' 0" - ] - - Value { - TQ "Voice" - } -} - -SectionDevice."Headset" { - Comment "SDP4430 3.5mm Headset" - - EnableSequence [ - cset "name='Analog Left Capture Route' 0" - cset "name='Analog Right Capture Route' 0" - cset "name='Capture Preamplifier Volume' 2" - cset "name='HS Left Playback' 1" - cset "name='HS Right Playback' 1" - cset "name='Headset Playback Volume' 13" - ] - - DisableSequence [ - cset "name='Analog Left Capture Route' 3" - cset "name='Analog Right Capture Route' 3" - cset "name='Capture Preamplifier Volume' 0" - cset "name='HS Right Playback' 0" - cset "name='HS Left Playback' 0" - cset "name='Headset Playback Volume' 0" - ] - - Value { - CapturePriority 100 - CapturePCM "hw:${CardId},2" - PlaybackPriority 100 - PlaybackPCM "hw:${CardId},2" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Samsung/snow/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Samsung/snow/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Samsung/snow/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Samsung/snow/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,58 @@ +# It's configuration for DAISY-I2S, update for another hw! + +SectionVerb { + EnableSequence [ + cset "name='Left Speaker Mixer Left DAC1 Switch' on" + cset "name='Right Speaker Mixer Right DAC1 Switch' on" + cset "name='Left Headphone Mixer Left DAC1 Switch' on" + cset "name='Right Headphone Mixer Right DAC1 Switch' on" + cset "name='DMIC1 Left Capture Switch' on" + cset "name='DMIC1 Right Capture Switch' on" + cset "name='MIC2 External Mic Switch' on" + cset "name='Left ADC Mixer MIC2 Switch' on" + cset "name='Right ADC Mixer MIC2 Switch' on" + cset "name='EQ1 Mode' Default" + cset "name='DAI1 Filter Mode' Music" + ] +} + +SectionDevice."Headphones" { + EnableSequence [ + cset "name='EQ1 Switch' off" + cset "name='Left Headphone Mixer Left DAC1 Switch' on" + cset "name='Right Headphone Mixer Right DAC1 Switch' on" + ] + + DisableSequence [ + cset "name='EQ1 Mode' Default" + cset "name='EQ1 Switch' on" + cset "name='Left Speaker Mixer Left DAC1 Switch' on" + cset "name='Right Speaker Mixer Right DAC1 Switch' on" + ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + } +} + +SectionDevice."Mic" { + EnableSequence [ + cset "name='DMIC1 Left Capture Switch' off" + cset "name='DMIC1 Right Capture Switch' off" + cset "name='Left ADC Mixer MIC2 Switch' on" + cset "name='Right ADC Mixer MIC2 Switch' on" + ] + + DisableSequence [ + cset "name='Left ADC Mixer MIC2 Switch' off" + cset "name='Right ADC Mixer MIC2 Switch' off" + cset "name='DMIC1 Left Capture Switch' on" + cset "name='DMIC1 Right Capture Switch' on" + ] + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId}" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Samsung/snow/snow.conf alsa-ucm-conf-1.2.6.3/ucm2/Samsung/snow/snow.conf --- alsa-ucm-conf-1.2.2/ucm2/Samsung/snow/snow.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Samsung/snow/snow.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,8 @@ +Syntax 3 + +Comment "Internal card" + +SectionUseCase."HiFi" { + File "/Samsung/snow/HiFi.conf" + Comment "Default" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Tegra/alc5632/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Tegra/alc5632/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Tegra/alc5632/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Tegra/alc5632/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,39 @@ +SectionVerb { + EnableSequence [ + cset "name='Speaker Playback Switch' on" + cset "name='Int Spk Switch' on" + cset "name='Speaker Mix DAC2SPK Playback Switch' on" + ] + DisableSequence [ + cset "name='Speaker Playback Switch' off" + cset "name='Int Spk Switch' off" + cset "name='Speaker Mix DAC2SPK Playback Switch' off" + ] +} + +SectionDevice."Headset" { + Comment "3.5mm Headset" + + EnableSequence [ + # Internal speaker + cset "name='Int Spk Switch' off" + + # Headphones + cset "name='Headphone Playback Switch' on" + cset "name='HPL Mix DACL2HP Playback Switch' on" + cset "name='HPR Mix DACR2HP Playback Switch' on" + ] + DisableSequence [ + # Headphones + cset "name='Headphone Playback Switch' off" + cset "name='HPL Mix DACL2HP Playback Switch' off" + cset "name='HPR Mix DACR2HP Playback Switch' off" + + # Internal speaker + cset "name='Int Spk Switch' on" + ] + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Tegra/alc5632/Record.conf alsa-ucm-conf-1.2.6.3/ucm2/Tegra/alc5632/Record.conf --- alsa-ucm-conf-1.2.2/ucm2/Tegra/alc5632/Record.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Tegra/alc5632/Record.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,59 @@ +SectionVerb { + EnableSequence [ + cset "name='Speaker Playback Switch' on" + cset "name='Int Spk Switch' on" + cset "name='Speaker Mix DAC2SPK Playback Switch' on" + + cset "name='DMICL Mix DMICL2ADC Capture Switch' on" + cset "name='DMIC En Capture Switch' on" + cset "name='DMIC PreFilter Capture Switch' on" + ] + DisableSequence [ + cset "name='Speaker Playback Switch' off" + cset "name='Int Spk Switch' off" + cset "name='Speaker Mix DAC2SPK Playback Switch' off" + + cset "name='DMICL Mix DMICL2ADC Capture Switch' off" + cset "name='DMIC En Capture Switch' off" + cset "name='DMIC PreFilter Capture Switch' off" + ] +} + +SectionDevice."Headset" { + Comment "3.5mm Headset" + + EnableSequence [ + # Internal speaker + cset "name='Int Spk Switch' off" + + # Internal mic + cset "name='DMIC En Capture Switch' off" + + # Headphones + cset "name='Headphone Playback Switch' on" + cset "name='HPL Mix DACL2HP Playback Switch' on" + cset "name='HPR Mix DACR2HP Playback Switch' on" + + # External min + cset "name='Left Capture Mix MIC12REC_L Capture Switch' on" + ] + DisableSequence [ + # Headphones + cset "name='Headphone Playback Switch' off" + cset "name='HPL Mix DACL2HP Playback Switch' off" + cset "name='HPR Mix DACR2HP Playback Switch' off" + + # External mic + cset "name='Left Capture Mix MIC12REC_L Capture Switch' on" + + # Internal speaker + cset "name='Int Spk Switch' on" + + # Internal mic + cset "name='DMIC En Capture Switch' on" + ] + Value { + CapturePriority 100 + CapturePCM "hw:${CardId}" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Tegra/alc5632/alc5632.conf alsa-ucm-conf-1.2.6.3/ucm2/Tegra/alc5632/alc5632.conf --- alsa-ucm-conf-1.2.2/ucm2/Tegra/alc5632/alc5632.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Tegra/alc5632/alc5632.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,44 @@ +Syntax 2 + +Comment "PAZ00 alc5632" + +BootSequence [ + cset "name='Master Playback Switch' on" + cset "name='Master Playback Volume' 44,44" + cset "name='Headphone Playback Volume' 21,21" + cset "name='Speaker Playback Volume' 21,21" + cset "name='SpeakerOut Mux' 2" + cset "name='SpeakerOut N Mux' LN/-R" + cset "name='AB-D Amp Mux' 0" + cset "name='Left Headphone Mux' 1" + cset "name='Right Headphone Mux' 1" + cset "name='DMIC Boost Capture Volume' 4" + cset "name='Rec Capture Volume' 24" + + # Fix external mic record volumes + cset "name='Mic 1 Boost Volume' 0" + cset "name='Mic 2 Boost Volume' 0" + cset "name='Mic1 Playback Volume' 0" + cset "name='Mic2 Playback Volume' 0" + cset "name='Rec Capture Volume' 0" + + # Enable internal speaker + cset "name='Speaker Playback Switch' on" + cset "name='Int Spk Switch' on" + cset "name='Speaker Mix DAC2SPK Playback Switch' on" + + # Enable DMIC + cset "name='DMICL Mix DMICL2ADC Capture Switch' on" + cset "name='DMIC En Capture Switch' on" + cset "name='DMIC PreFilter Capture Switch' on" +] + +SectionUseCase."HiFi" { + File "/Tegra/alc5632/HiFi.conf" + Comment "Music playback" +} + +SectionUseCase."Record" { + File "/Tegra/alc5632/Record.conf" + Comment "Playback and capture" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Tegra/max98090/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Tegra/max98090/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Tegra/max98090/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Tegra/max98090/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,73 @@ +SectionVerb { + EnableSequence [ + cset "name='Left Speaker Mixer Left DAC Switch' on" + cset "name='Right Speaker Mixer Right DAC Switch' on" + cset "name='Headphone Left Switch' on" + cset "name='Headphone Right Switch' on" + cset "name='Digital EQ 3 Band Switch' off" + cset "name='Digital EQ 5 Band Switch' off" + cset "name='Digital EQ 7 Band Switch' off" + cset "name='Biquad Switch' off" + cset "name='Filter Mode' Music" + cset "name='ADC Oversampling Rate' 0" + cset "name='DMIC Mux' DMIC" + cset "name='MIC2 Mux' IN34" + cset "name='Right ADC Mixer MIC2 Switch' on" + cset "name='Left ADC Mixer MIC2 Switch' on" + cset "name='MIC2 Volume' 10" + cset "name='MIC2 Boost Volume' 0" + cset "name='Mic Jack Switch' off" + cset "name='Int Mic Switch' on" + cset "name='ADCR Boost Volume' 4" + cset "name='ADCL Boost Volume' 4" + cset "name='ADCR Volume' 11" + cset "name='ADCL Volume' 11" + cset "name='Left Speaker Mixer Left DAC Switch' on" + cset "name='Right Speaker Mixer Right DAC Switch' on" + cset "name='Speaker Left Mixer Volume' 2" + cset "name='Speaker Right Mixer Volume' 2" + cset "name='Record Path DC Blocking' on" + cset "name='Playback Path DC Blocking' on" + cset "name='Headphone Left Switch' on" + cset "name='Headphone Right Switch' on" + cset "name='Headphones Switch' off" + cset "name='Speaker Left Switch' on" + cset "name='Speaker Right Switch' on" + cset "name='Speakers Switch' on" + ] +} + +SectionDevice."Headphones" { + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + } + EnableSequence [ + cset "name='Speakers Switch' off" + cset "name='Headphones Switch' on" + ] + DisableSequence [ + cset "name='Headphones Switch' off" + cset "name='Speakers Switch' on" + ] +} + +SectionDevice."Mic" { + Value { + CapturePriority 100 + CapturePCM "hw:${CardId}" + #CaptureControl "MIC2" + } + EnableSequence [ + cset "name='Int Mic Switch' off" + cset "name='DMIC Mux' ADC" + cset "name='Mic Jack Switch' on" + cset "name='Record Path DC Blocking' on" + ] + DisableSequence [ + cset "name='Mic Jack Switch' off" + cset "name='DMIC Mux' DMIC" + cset "name='Int Mic Switch' on" + cset "name='Record Path DC Blocking' off" + ] +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Tegra/max98090/max98090.conf alsa-ucm-conf-1.2.6.3/ucm2/Tegra/max98090/max98090.conf --- alsa-ucm-conf-1.2.2/ucm2/Tegra/max98090/max98090.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Tegra/max98090/max98090.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,6 @@ +Syntax 2 +Comment "Nyan internal card" +SectionUseCase."HiFi" { + File "/Tegra/max98090/HiFi.conf" + Comment "Default" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Tegra/rt5640/Google-Nexus-7-HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Tegra/rt5640/Google-Nexus-7-HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Tegra/rt5640/Google-Nexus-7-HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Tegra/rt5640/Google-Nexus-7-HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,15 @@ +# Use case Configuration for ASUS Google Nexus 7 (2012) + +Define.HaveAif "1" +Define.HaveSpeaker "2" +Define.HaveHeadsetMic "" +Define.HaveInternalMic "dmic" +Define.StereoADC2Mux "DMIC1" + +Include.hp.File "/codecs/rt5640/HeadPhones.conf" +Include.mspk.File "/codecs/rt5640/Speaker.conf" +Include.dmic.File "/codecs/rt5640/DigitalMics.conf" + +SectionVerb { + Include.e.File "/codecs/rt5640/EnableSeq.conf" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Tegra/rt5640/Google-Nexus-7.conf alsa-ucm-conf-1.2.6.3/ucm2/Tegra/rt5640/Google-Nexus-7.conf --- alsa-ucm-conf-1.2.2/ucm2/Tegra/rt5640/Google-Nexus-7.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Tegra/rt5640/Google-Nexus-7.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,8 @@ +# Use case Configuration for ASUS Google Nexus 7 (2012) + +Syntax 4 + +SectionUseCase."HiFi" { + File "/Tegra/rt5640/Google-Nexus-7-HiFi.conf" + Comment "Play HiFi quality Music" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Tegra/tegra-hda/tegra-hda-HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Tegra/tegra-hda/tegra-hda-HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Tegra/tegra-hda/tegra-hda-HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Tegra/tegra-hda/tegra-hda-HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,12 @@ +If.hdmi { + Condition { Type String Empty "" } + True { + Define { + HdmiNum 1 + HdmiPCM 3 + HdmiCtlIndex 0 + HdmiPrio 1100 + } + Include.hdmi.File "/codecs/hda/hdmi.conf" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Tegra/tegra-hda/tegra-hda.conf alsa-ucm-conf-1.2.6.3/ucm2/Tegra/tegra-hda/tegra-hda.conf --- alsa-ucm-conf-1.2.2/ucm2/Tegra/tegra-hda/tegra-hda.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Tegra/tegra-hda/tegra-hda.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,8 @@ +# UCM for Nvidia Tegra30 HDMI Audio + +Syntax 4 + +SectionUseCase."HiFi" { + File "/Tegra/tegra-hda/tegra-hda-HiFi.conf" + Comment "Play HiFi quality Music" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Tegra/wm8903/Acer-A500-HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/Tegra/wm8903/Acer-A500-HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/Tegra/wm8903/Acer-A500-HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Tegra/wm8903/Acer-A500-HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,114 @@ +# Use case Configuration for Acer Iconia Tab A500 + +SectionVerb { + EnableSequence [ + # WM8903 Output Configuration + cset "name='Digital Playback Volume' 80" + cset "name='Headphone Volume' 42" + cset "name='Line Out Volume' 42" + cset "name='DAC Boost Volume' 0" + + # WM8903 Output Routing + cset "name='Left Output Mixer DACL Switch' on" + cset "name='Left Output Mixer DACR Switch' off" + cset "name='Right Output Mixer DACL Switch' off" + cset "name='Right Output Mixer DACR Switch' on" + + # WM8903 Input Configuration + cset "name='Digital Capture Volume' 120" + cset "name='DRC Compressor Threshold Volume' 124" + cset "name='DRC Compressor Slope R0' 1" + cset "name='DRC Compressor Slope R1' 1" + cset "name='DRC Maximum Gain Volume' 1" + cset "name='DRC Minimum Gain Volume' 0" + cset "name='DRC Volume' 13" + + # WM8903 Input Routing + cset "name='Left Input PGA Switch' on" + cset "name='Right Input PGA Switch' on" + + # Tegra-specific switches + cset "name='Int Spk Switch' on" + cset "name='Int Mic Switch' on" + ] +} + +SectionDevice."Speakers" { + Comment "Speakers" + + ConflictingDevice [ + "Headphones" + ] + + EnableSequence [ + cset "name='Headphone Switch' off" + cset "name='Line Out Switch' on" + ] + + Value { + PlaybackPCM "hw:${CardId}" + PlaybackMixerElem "Line Out" + } +} + +SectionDevice."Headphones" { + Comment "Headphones" + + ConflictingDevice [ + "Speakers" + ] + + EnableSequence [ + cset "name='Line Out Switch' off" + cset "name='Headphone Switch' on" + ] + + Value { + PlaybackPCM "hw:${CardId}" + PlaybackMixerElem "Headphone" + JackControl "Headphone Jack" + } +} + +SectionDevice."InternalMic" { + Comment "Internal Microphone" + + ConflictingDevice [ + "HeadsetMic" + ] + + EnableSequence [ + cset "name='Left Input PGA Volume' 31" + cset "name='Right Input PGA Volume' 31" + cset "name='Left Input Inverting Mux' IN1L" + cset "name='Right Input Inverting Mux' IN1R" + cset "name='DRC Switch' on" + ] + + Value { + CapturePCM "hw:${CardId}" + CaptureMixerElem "Digital" + } +} + +SectionDevice."HeadsetMic" { + Comment "Headset Microphone" + + ConflictingDevice [ + "InternalMic" + ] + + EnableSequence [ + cset "name='Left Input PGA Volume' 25" + cset "name='Right Input PGA Volume' 25" + cset "name='Left Input Inverting Mux' IN2L" + cset "name='Right Input Inverting Mux' IN2R" + cset "name='DRC Switch' off" + ] + + Value { + CapturePCM "hw:${CardId}" + CaptureMixerElem "Digital" + JackControl "Mic Jack" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/Tegra/wm8903/Acer-A500.conf alsa-ucm-conf-1.2.6.3/ucm2/Tegra/wm8903/Acer-A500.conf --- alsa-ucm-conf-1.2.2/ucm2/Tegra/wm8903/Acer-A500.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/Tegra/wm8903/Acer-A500.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,8 @@ +# Use case Configuration for Acer Iconia Tab A500 + +Syntax 4 + +SectionUseCase."HiFi" { + File "/Tegra/wm8903/Acer-A500-HiFi.conf" + Comment "Play HiFi quality Music" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Dell/Desktop-Front-Speaker-Headset.conf alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Dell/Desktop-Front-Speaker-Headset.conf --- alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Dell/Desktop-Front-Speaker-Headset.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Dell/Desktop-Front-Speaker-Headset.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,32 @@ +SectionDevice."Speaker" { + Comment "Built-in Speaker" + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + JackControl "Speaker - Output Jack" + PlaybackMixerElem "Speaker" + } +} + +SectionDevice."Headphones" { + Comment "Headset/Headphones" + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId},1" + JackControl "Headphone - Output Jack" + PlaybackMixerElem "Headphone" + } +} + +SectionDevice."Microphone" { + Comment "Microphone" + + Value { + CapturePriority 200 + CapturePCM "hw:${CardId}" + JackControl "Mic - Input Jack" + CaptureMixerElem "Mic" + } +} \ No newline at end of file diff -Nru alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Dell/Desktop-Front.conf alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Dell/Desktop-Front.conf --- alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Dell/Desktop-Front.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Dell/Desktop-Front.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,6 @@ +Syntax 2 +Comment "USB-audio on the front of Dell Desktop" +SectionUseCase."HiFi" { + Comment "Internal Speaker/Front Headset" + File "/USB-Audio/Dell/Desktop-Front-Speaker-Headset.conf" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Dell/Desktop-Rear-Line.conf alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Dell/Desktop-Rear-Line.conf --- alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Dell/Desktop-Rear-Line.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Dell/Desktop-Rear-Line.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,10 @@ +SectionDevice."Line" { + Comment "Line Out" + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + JackControl "Line - Output Jack" + PlaybackMixerElem "PCM" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Dell/Desktop-Rear.conf alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Dell/Desktop-Rear.conf --- alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Dell/Desktop-Rear.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Dell/Desktop-Rear.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,6 @@ +Syntax 2 +Comment "USB-audio on the rear of Dell Desktop" +SectionUseCase."Line" { + Comment "Line Out" + File "/USB-Audio/Dell/Desktop-Rear-Line.conf" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Dell/WD15-Dock-HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Dell/WD15-Dock-HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Dell/WD15-Dock-HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Dell/WD15-Dock-HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,62 @@ +SectionDevice."Headphones" { + Comment "Headphones" + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + + If.Headphone_ctl { + Condition { + Type ControlExists + Control "name='Headphone Playback Switch'" + } + True { + PlaybackMixerElem "Headphone" + PlaybackVolume "Headphone Playback Volume" + PlaybackSwitch "Headphone Playback Switch" + } + } + } +} + +SectionDevice."Line" { + Comment "Line Out" + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId},1" + + If.Line_ctl { + Condition { + Type ControlExists + Control "name='Line Playback Switch'" + } + True { + PlaybackMixerElem "Line" + PlaybackVolume "Line Playback Volume" + PlaybackSwitch "Line Playback Switch" + } + } + } +} + +SectionDevice."Mic" { + Comment "Microphone" + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId}" + + If.Mic_ctl { + Condition { + Type ControlExists + Control "name='Mic Capture Switch'" + } + True { + CaptureMixerElem "Mic" + CaptureVolume "Mic Capture Volume" + CaptureSwitch "Mic Capture Switch" + } + } + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Dell/WD15-Dock.conf alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Dell/WD15-Dock.conf --- alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Dell/WD15-Dock.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Dell/WD15-Dock.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,6 @@ +Syntax 2 +Comment "USB-audio on Dell WD15 docking station" +SectionUseCase."HiFi" { + File "/USB-Audio/Dell/WD15-Dock-HiFi.conf" + Comment "Default" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Dell-WD15-Dock-HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Dell-WD15-Dock-HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Dell-WD15-Dock-HiFi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Dell-WD15-Dock-HiFi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -SectionDevice."Headphones" { - Comment "Headphones" - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId}" - } -} - -SectionDevice."Line" { - Comment "Line Out" - - Value { - PlaybackPriority 200 - PlaybackPCM "hw:${CardId},1" - } -} - -SectionDevice."Mic" { - Comment "Microphone" - - Value { - CapturePriority 100 - CapturePCM "hw:${CardId}" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Dell-WD15-Dock.conf alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Dell-WD15-Dock.conf --- alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Dell-WD15-Dock.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Dell-WD15-Dock.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Syntax 2 -Comment "USB-audio on Dell WD15 docking station" -SectionUseCase."HiFi" { - File "Dell-WD15-Dock-HiFi.conf" - Comment "Default" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Gigabyte/Aorus-Master-Main-Audio-HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Gigabyte/Aorus-Master-Main-Audio-HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Gigabyte/Aorus-Master-Main-Audio-HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Gigabyte/Aorus-Master-Main-Audio-HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,61 @@ +Define.SecondaryCardId "$${find-card:field=name,return=id,regex='Aorus Master Front Headphone'" + +SectionDevice."Speaker" { + Comment "Speakers" + Value { + PlaybackChannels 8 + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + JackControl "Line Out Jack" + PlaybackMixerElem "Line Out" + } +} + +SectionDevice."Headphones" { + Comment "Front Headphones" + Value { + PlaybackPriority 300 + PlaybackPCM "hw:${var:SecondaryCardId}" + JackCTL "hw:${var:SecondaryCardId}" + JackControl "Headphone - Output Jack" + } +} + +SectionDevice."SPDIF" { + Comment "S/PDIF Out" + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId},1" + # PlaybackMixerElem "IEC958" + } +} + +SectionDevice."Line" { + Comment "Line In" + Value { + CapturePriority 100 + CapturePCM "hw:${CardId}" + JackControl "Line Jack" + CaptureMixerElem "Line" + } +} + +SectionDevice."Mic1" { + Comment "Microphone" + Value { + CapturePriority 200 + CapturePCM "hw:${CardId},1" + JackControl "Mic Jack" + CaptureMixerElem "Mic" + } +} + +SectionDevice."Mic2" { + Comment "Front Microphone" + Value { + CapturePriority 300 + CapturePCM "hw:${CardId},2" + JackControl "Front Mic Jack" + CaptureMixerElem "Front Mic" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Gigabyte/Aorus-Master-Main-Audio.conf alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Gigabyte/Aorus-Master-Main-Audio.conf --- alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Gigabyte/Aorus-Master-Main-Audio.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Gigabyte/Aorus-Master-Main-Audio.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,5 @@ +Comment "Gigabyte Aorus Integrated Audio" +SectionUseCase."HiFi" { + File "/USB-Audio/Gigabyte/Aorus-Master-Main-Audio-HiFi.conf" + Comment "Default Alsa Profile" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/USB-Audio/GoXLR/GoXLR-HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/GoXLR/GoXLR-HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/USB-Audio/GoXLR/GoXLR-HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/GoXLR/GoXLR-HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,199 @@ +LibraryConfig.pcm.Config { + + pcm.goxlr_stereo_out { + @args [ CARD CHN0 CHN1 ] + @args { + CARD.type string + CHN0.type integer + CHN1.type integer + } + type dshare + ipc_key 5678493 + ipc_perm 0600 + slave { + pcm { + type hw + card $CARD + device 0 + } + channels 10 + } + bindings.0 $CHN0 + bindings.1 $CHN1 + } + + pcm.goxlr_stereo_in { + @args [ CARD CHN0 CHN1 ] + @args { + CARD.type string + CHN0.type integer + CHN1.type integer + } + type dsnoop + ipc_key 5678593 + ipc_perm 0600 + slave { + pcm { + type hw + card $CARD + device 0 + } + channels 23 + } + bindings.0 $CHN0 + bindings.1 $CHN1 + } + + pcm.goxlr_system { + @args [ CARD ] + @args.CARD.type string + type empty + slave.pcm { + @func concat + strings [ "goxlr_stereo_out:" $CARD ",0,1" ] + } + } + + pcm.goxlr_game { + @args [ CARD ] + @args.CARD.type string + type empty + slave.pcm { + @func concat + strings [ "goxlr_stereo_out:" $CARD ",2,3" ] + } + } + + pcm.goxlr_chat { + @args [ CARD ] + @args.CARD.type string + type empty + slave.pcm { + @func concat + strings [ "goxlr_stereo_out:" $CARD ",4,5" ] + } + } + + pcm.goxlr_music { + @args [ CARD ] + @args.CARD.type string + type empty + slave.pcm { + @func concat + strings [ "goxlr_stereo_out:" $CARD ",6,7" ] + } + } + + pcm.goxlr_sample { + @args [ CARD ] + @args.CARD.type string + type empty + slave.pcm { + @func concat + strings [ "goxlr_stereo_out:" $CARD ",8,9" ] + } + } + + pcm.goxlr_mix { + @args [ CARD ] + @args.CARD.type string + type empty + slave.pcm { + @func concat + strings [ "goxlr_stereo_in:" $CARD ",0,1" ] + } + } + + pcm.goxlr_chatmic { + @args [ CARD ] + @args.CARD.type string + type empty + slave.pcm { + @func concat + strings [ "goxlr_stereo_in:" $CARD ",2,3" ] + } + } + + pcm.goxlr_sample_input { + @args [ CARD ] + @args.CARD.type string + type empty + slave.pcm { + @func concat + strings [ "goxlr_stereo_in:" $CARD ",16,17" ] + } + } + +} + +SectionDevice."Speaker" { + Comment "System" + + Value { + PlaybackPriority 100 + PlaybackPCM "goxlr_system:${CardId}" + } +} + +SectionDevice."Line1" { + Comment "Game" + + Value { + PlaybackPriority 300 + PlaybackPCM "goxlr_game:${CardId}" + } +} + +SectionDevice."Line2" { + Comment "Music" + + Value { + PlaybackPriority 400 + PlaybackPCM "goxlr_music:${CardId}" + } +} + +SectionDevice."Headphones" { + Comment "Chat" + + Value { + PlaybackPriority 200 + PlaybackPCM "goxlr_chat:${CardId}" + } +} + +SectionDevice."Line3" { + Comment "Sample" + + Value { + PlaybackPriority 500 + PlaybackPCM "goxlr_sample:${CardId}" + } +} + +SectionDevice."Line4" { + Comment "Broadcast Stream Mix" + + Value { + CapturePriority 200 + CapturePCM "goxlr_mix:${CardId}" + } +} + +SectionDevice."Headset" { + Comment "Chat Mic" + + Value { + CapturePriority 100 + CapturePCM "goxlr_chatmic:${CardId}" + } +} + +SectionDevice."Line5" { + Comment "Sample" + + Value { + CapturePriority 300 + CapturePCM "goxlr_sample_input:${CardId}" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/USB-Audio/GoXLR/GoXLR.conf alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/GoXLR/GoXLR.conf --- alsa-ucm-conf-1.2.2/ucm2/USB-Audio/GoXLR/GoXLR.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/GoXLR/GoXLR.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,5 @@ +Comment "GoXLR USB-Audio" +SectionUseCase."HiFi" { + Comment "Default Alsa Profile" + File "/USB-Audio/GoXLR/GoXLR-HiFi.conf" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Main-HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Main-HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Main-HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Main-HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,30 @@ +SectionDevice."Headphones" { + Comment "Headphones" + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId},1" + JackControl "Headphone - Output Jack" + } +} + +SectionDevice."Mic" { + Comment "Mic" + + Value { + CapturePriority 200 + CapturePCM "hw:${CardId}" + JackControl "Mic - Input Jack" + CaptureMixerElem "Mic" + } +} + +SectionDevice."Speaker" { + Comment "Speaker" + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + JackControl "Speaker - Output Jack" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Main.conf alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Main.conf --- alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Main.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Main.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,5 @@ +Comment "USB-audio on Lenovo ThinkStation P620 Main Audio" +SectionUseCase."HiFi" { + Comment "Default" + File "/USB-Audio/Lenovo/ThinkStation-P620-Main-HiFi.conf" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Rear-HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Rear-HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Rear-HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Rear-HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,31 @@ +SectionDevice."Line" { + Comment "Line In" + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId}" + JackControl "Line - Input Jack" + CaptureMixerElem "Line" + } +} + +SectionDevice."Mic" { + Comment "Mic" + + Value { + CapturePriority 200 + CapturePCM "hw:${CardId},1" + JackControl "Mic - Input Jack" + CaptureMixerElem "Mic" + } +} + +SectionDevice."Speaker" { + Comment "Speaker" + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + JackControl "Speaker - Output Jack" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Rear.conf alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Rear.conf --- alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Rear.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Rear.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,5 @@ +Comment "USB-audio on Lenovo ThinkStation P620 Rear Audio" +SectionUseCase."HiFi" { + Comment "Default" + File "/USB-Audio/Lenovo/ThinkStation-P620-Rear-HiFi.conf" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Realtek/ALC1220-VB-Desktop-HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Realtek/ALC1220-VB-Desktop-HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Realtek/ALC1220-VB-Desktop-HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Realtek/ALC1220-VB-Desktop-HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,60 @@ +SectionDevice."Speaker" { + Comment "Speakers" + Value { + PlaybackChannels 8 + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + JackControl "Speaker Jack" + PlaybackMixerElem "Speaker" + } +} + +SectionDevice."Headphones" { + Comment "Front Headphones" + Value { + PlaybackPriority 300 + PlaybackPCM "hw:${CardId},1" + JackControl "Front Headphone Jack" + PlaybackMixerElem "Front Headphone" + } +} + +SectionDevice."SPDIF" { + Comment "S/PDIF Out" + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId},2" + PlaybackMixerElem "IEC958" + } +} + +SectionDevice."Line" { + Comment "Line In" + Value { + CapturePriority 100 + CapturePCM "hw:${CardId}" + JackControl "Line Jack" + CaptureMixerElem "Line" + } +} + +SectionDevice."Mic1" { + Comment "Microphone" + Value { + CapturePriority 200 + CapturePCM "hw:${CardId},1" + JackControl "Mic Jack" + CaptureMixerElem "Mic" + } +} + +SectionDevice."Mic2" { + Comment "Front Microphone" + Value { + CapturePriority 300 + CapturePCM "hw:${CardId},2" + JackControl "Front Mic Jack" + CaptureMixerElem "Front Mic" + } +} + diff -Nru alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Realtek/ALC1220-VB-Desktop.conf alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Realtek/ALC1220-VB-Desktop.conf --- alsa-ucm-conf-1.2.2/ucm2/USB-Audio/Realtek/ALC1220-VB-Desktop.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/Realtek/ALC1220-VB-Desktop.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,5 @@ +Comment "USB-audio on Realtek ALC1220-VB desktop" +SectionUseCase."HiFi" { + File "/USB-Audio/Realtek/ALC1220-VB-Desktop-HiFi.conf" + Comment "Default Alsa Profile" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/USB-Audio/USB-Audio.conf alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/USB-Audio.conf --- alsa-ucm-conf-1.2.2/ucm2/USB-Audio/USB-Audio.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/USB-Audio/USB-Audio.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,101 @@ +Syntax 4 + +Define.ProfileName "" + +If.linked { + Condition { + Type RegexMatch + String "${CardComponents}" + # Aorus Master Front Headphone 0414:a000 + Regex "USB0414:a000" + } + True.Define.ProfileName "../common/linked" +} + +If.realtek-alc1220-vb { + + Condition { + Type RegexMatch + String "${CardComponents}" + # 0414:a002 Gigabyte TRX40 Aorus Pro WiFi + # 0b05:1917 ASUS ROG Strix + # 0b05:1918 ASUS PRIME TRX40 PRO-S + # 0db0:0d64 MSI TRX40 Creator + # 0db0:543d MSI TRX40 + # 26ce:0a01 Asrock TRX40 Creator + Regex "USB((0414:a002)|(0b05:191[78])|(0db0:(0d64|543d))|(26ce:0a01))" + } + True.Define.ProfileName "Realtek/ALC1220-VB-Desktop" +} + +If.gigabyte-aorus-main { + Condition { + Type String + Haystack "${CardComponents}" + Needle "USB0414:a001" + } + True.Define.ProfileName "Gigabyte/Aorus-Master-Main-Audio" +} + +If.dell-wd15 { + Condition { + Type RegexMatch + String "${CardComponents}" + Regex "USB0bda:40(14|2e)" + } + True.Define.ProfileName "Dell/WD15-Dock" +} + +If.dell-desktop-front { + Condition { + Type String + Haystack "${CardComponents}" + Needle "USB0bda:4c54" + } + True.Define.ProfileName "Dell/Desktop-Front" +} + +If.dell-desktop-rear { + Condition { + Type String + Haystack "${CardComponents}" + Needle "USB0bda:4c55" + } + True.Define.ProfileName "Dell/Desktop-Rear" +} + +If.goxlr { + Condition { + Type RegexMatch + String "${CardComponents}" + Regex "USB1220:8fe[04]" + } + True.Define.ProfileName "GoXLR/GoXLR" +} + +If.lenovo-p620-rear { + Condition { + Type String + Haystack "${CardComponents}" + Needle "USB17aa:1046" + } + True.Define.ProfileName "Lenovo/ThinkStation-P620-Rear" +} + +If.lenovo-p620-main { + Condition { + Type String + Haystack "${CardComponents}" + Needle "USB17aa:104d" + } + True.Define.ProfileName "Lenovo/ThinkStation-P620-Main" +} + +If.inc { + Condition { + Type String + Empty "${var:ProfileName}" + } + True.Error "UCM is not supported for this USB device (${CardLongName} @ ${CardComponents})" + False.Include.prof.File "/USB-Audio/${var:ProfileName}.conf" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/VEYRON-I2S/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/VEYRON-I2S/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/VEYRON-I2S/HiFi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/VEYRON-I2S/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,119 +0,0 @@ -SectionVerb { - Value { - MinBufferLevel "512" - } - - EnableSequence [ - cset "name='Left Speaker Mixer Left DAC Switch' on" - cset "name='Right Speaker Mixer Right DAC Switch' on" - cset "name='Headphone Left Switch' off" - cset "name='Headphone Right Switch' off" - cset "name='Digital EQ 3 Band Switch' off" - cset "name='Digital EQ 5 Band Switch' off" - cset "name='Digital EQ 7 Band Switch' off" - cset "name='Biquad Switch' off" - cset "name='Filter Mode' Music" - cset "name='ADC Oversampling Rate' 0" - - cset "name='DMIC Mux' DMIC" - cset "name='MIC2 Mux' IN34" - cset "name='Right ADC Mixer MIC2 Switch' on" - cset "name='Left ADC Mixer MIC2 Switch' on" - cset "name='MIC2 Volume' 20" - cset "name='Headset Mic Switch' off" - cset "name='Int Mic Switch' on" - - cset "name='ADCR Boost Volume' 4" - cset "name='ADCL Boost Volume' 4" - cset "name='ADCR Volume' 11" - cset "name='ADCL Volume' 11" - - cset "name='Left Speaker Mixer Left DAC Switch' on" - cset "name='Right Speaker Mixer Right DAC Switch' on" - cset "name='Speaker Left Mixer Volume' 2" - cset "name='Speaker Right Mixer Volume' 2" - cset "name='Record Path DC Blocking' on" - cset "name='Playback Path DC Blocking' on" - - cset "name='Speaker Left Switch' on" - cset "name='Speaker Right Switch' on" - cset "name='Speaker Switch' on" - ] -} - -SectionDevice."Speaker" { - Comment "Speaker" - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId}" - } - - EnableSequence [ - cset "name='Speaker Switch' on" - ] - - DisableSequence [ - cset "name='Speaker Switch' off" - ] -} - -SectionDevice."Mic" { - Comment "Internal Microphone" - - Value { - CapturePriority 100 - CapturePCM "hw:${CardId}" - } - - EnableSequence [ - cset "name='Int Mic Switch' on" - ] - - DisableSequence [ - cset "name='Int Mic Switch' off" - ] -} - -SectionDevice."Headphones" { - Comment "Headphones" - - Value { - PlaybackPriority 200 - PlaybackPCM "hw:${CardId}" - } - - EnableSequence [ - cset "name='Speaker Switch' off" - cset "name='Headphone Left Switch' on" - cset "name='Headphone Right Switch' on" - ] - DisableSequence [ - cset "name='Headphone Left Switch' off" - cset "name='Headphone Right Switch' off" - cset "name='Speaker Switch' on" - ] -} - -SectionDevice."Headset" { - Comment "Headset Microphone" - - Value { - CapturePriority 200 - CapturePCM "hw:${CardId}" - } - - EnableSequence [ - cset "name='Int Mic Switch' off" - cset "name='DMIC Mux' ADC" - cset "name='Headset Mic Switch' on" - cset "name='Record Path DC Blocking' on" - ] - - DisableSequence [ - cset "name='Headset Mic Switch' off" - cset "name='DMIC Mux' DMIC" - cset "name='Int Mic Switch' on" - cset "name='Record Path DC Blocking' off" - ] -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/VEYRON-I2S/VEYRON-I2S.conf alsa-ucm-conf-1.2.6.3/ucm2/VEYRON-I2S/VEYRON-I2S.conf --- alsa-ucm-conf-1.2.2/ucm2/VEYRON-I2S/VEYRON-I2S.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/VEYRON-I2S/VEYRON-I2S.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -Syntax 2 - -Comment "Rockchip Veyron card" - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Default" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/broadwell-rt286/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/broadwell-rt286/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/broadwell-rt286/HiFi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/broadwell-rt286/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,103 +0,0 @@ -# Use case Configuration for Nexus 7 -# Adapted to Ubuntu Touch by David Henningsson - -SectionDevice."Speaker" { - Comment "Speakers" - - ConflictingDevice [ - "Headphones" - ] - - EnableSequence [ - cset "name='SPO Switch' on" - cset "name='Speaker Playback Switch' on" - cset "name='Speaker Switch' on" - ] - - DisableSequence [ - cset "name='Speaker Switch' off" - cset "name='Speaker Playback Switch' off" - cset "name='SPO Switch' off" - ] - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId}" - PlaybackMixerElem "DAC0" - PlaybackMasterElem "Master" - } -} - -SectionDevice."Headphones" { - Comment "Headphones" - - ConflictingDevice [ - "Speaker" - ] - - EnableSequence [ - cset "name='HPO L Switch' on" - cset "name='HPO R Switch' on" - cset "name='Headphone Jack Switch' on" - ] - - DisableSequence [ - cset "name='Headphone Jack Switch' off" - cset "name='HPO L Switch' off" - cset "name='HPO R Switch' off" - ] - - Value { - PlaybackPriority 200 - PlaybackPCM "hw:${CardId}" - PlaybackMixerElem "DAC0" - PlaybackMasterElem "Master" - JackDev "rt286-jack" - JackControl "Headphone Jack" - } -} - -SectionDevice."Mic" { - Comment "Internal Microphone" - - ConflictingDevice [ - "Headset" - ] - - EnableSequence [ - cset "name='ADC 0 Mux' 2" - ] - - Value { - CapturePriority 100 - CapturePCM "hw:${CardId}" - CaptureMixerElem "ADC0" - CaptureMasterElem "Mic" - } -} - -SectionDevice."Headset" { - Comment "Headset Microphone" - - ConflictingDevice [ - "Mic" - ] - - EnableSequence [ - cset "name='ADC 0 Mux' 0" - cset "name='AMIC Volume' 3" - ] - - DisableSequence [ - cset "name='AMIC Volume' 0" - ] - - Value { - CapturePriority 200 - CapturePCM "hw:${CardId}" - CaptureMixerElem "ADC0" - CaptureMasterElem "Mic" - JackDev "rt286-jack" - JackControl "Mic Jack" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/broadwell-rt286/broadwell-rt286.conf alsa-ucm-conf-1.2.6.3/ucm2/broadwell-rt286/broadwell-rt286.conf --- alsa-ucm-conf-1.2.2/ucm2/broadwell-rt286/broadwell-rt286.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/broadwell-rt286/broadwell-rt286.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Syntax 2 - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Play HiFi quality Music" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/broxton-rt298/Hdmi.conf alsa-ucm-conf-1.2.6.3/ucm2/broxton-rt298/Hdmi.conf --- alsa-ucm-conf-1.2.2/ucm2/broxton-rt298/Hdmi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/broxton-rt298/Hdmi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -# Usecase for device HDMI1/Display Port stereo playback on Intel SKYLAKE/KABYLAKE platforms - -SectionDevice."HDMI1" { - Comment "HDMI/Display Port 1 Stereo" - - Value { - PlaybackPCM "hw:${CardId},4" - PlaybackPriority 500 - If.1 { - Condition { - Type ControlExists - Control "iface=CARD,name='HDMI/DP,pcm=4 Jack'" - } - True { - JackControl "HDMI/DP,pcm=4 Jack" - } - False { - JackControl "HDMI/DP, pcm=4 Jack" - } - } - } -} - -SectionDevice."HDMI2" { - Comment "HDMI/Display Port 2 Stereo" - - Value { - PlaybackPCM "hw:${CardId},5" - PlaybackPriority 600 - If.1 { - Condition { - Type ControlExists - Control "iface=CARD,name='HDMI/DP,pcm=5 Jack'" - } - True { - JackControl "HDMI/DP,pcm=5 Jack" - } - False { - JackControl "HDMI/DP, pcm=5 Jack" - } - } - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/broxton-rt298/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/broxton-rt298/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/broxton-rt298/HiFi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/broxton-rt298/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,113 +0,0 @@ -# Usecase for stereo playback Speaker and Headset, Recording on DMIC and Headset MIC. -# For Audio in I2S mode on Intel Broxton platforms - -SectionVerb { - - EnableSequence [ - cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" - ] - - Value { - TQ "HiFi" - } -} - -SectionDevice."Speaker" { - Comment "Speaker" - - ConflictingDevice [ - "Headphones" - ] - - EnableSequence [ - cset "name='SPO Switch' 1" - cset "name='Speaker Playback Switch' 1,1" - cset "name='Speaker Switch' 1" - cset "name='HPO L Switch' 0" - cset "name='HPO R Switch' 0" - ] - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId}" - JackHWMute "Headphones" - } -} - -SectionDevice."Headphones" { - Comment "Headphones" - - ConflictingDevice [ - "Speaker" - ] - - EnableSequence [ - cset "name='HPO L Switch' 1" - cset "name='HPO R Switch' 1" - cset "name='Headphone Jack Switch' 1" - cset "name='Speaker Playback Switch' 0,0" - ] - - Value { - PlaybackPriority 200 - PlaybackPCM "hw:${CardId}" - JackControl "Headphone Jack" - JackHWMute "Speaker" - } -} - -SectionDevice."Mic" { - Comment "Digital Microphone" - - ConflictingDevice [ - "Headset" - ] - - EnableSequence [ - cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" - cset "name='media0_out mo codec0_in mi Switch' 0" - cset "name='Mic Jack Switch' 0" - - ] - - DisableSequence [ - cset "name='media0_out mo codec0_in mi Switch' 1" - cset "name='media0_out mo dmic01_hifi_in mi Switch' 0" - cset "name='Mic Jack Switch' 1" - cset "name='ADC 0 Mux' 0" - ] - - Value { - CapturePriority 100 - CapturePCM "hw:${CardId},1" - } -} - -SectionDevice."Headset" { - Comment "Headset Microphone" - - ConflictingDevice [ - "Mic" - ] - - EnableSequence [ - cset "name='media0_out mo codec0_in mi Switch' 1" - cset "name='ADC0 Capture Volume' 105,105" - cset "name='ADC 0 Mux' 0" - cset "name='Mic Jack Switch' 1" - cset "name='media0_out mo dmic01_hifi_in mi Switch' 0" - ] - - DisableSequence [ - cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" - cset "name='media0_out mo codec0_in mi Switch' 0" - ] - - Value { - CapturePriority 200 - CapturePCM "hw:${CardId},1" - JackControl "Mic Jack" - } -} - - diff -Nru alsa-ucm-conf-1.2.2/ucm2/broxton-rt298/broxton-rt298.conf alsa-ucm-conf-1.2.6.3/ucm2/broxton-rt298/broxton-rt298.conf --- alsa-ucm-conf-1.2.2/ucm2/broxton-rt298/broxton-rt298.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/broxton-rt298/broxton-rt298.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -# UCM for Intel Broxton platforms -# For Audio in I2S mode - -Syntax 2 - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Play and record HiFi quality Music" -} - -SectionDefaults [ - cset "name='Headphone Jack Switch' 1" - cset "name='Speaker Switch' 1" - cset "name='Speaker Playback Switch' 0,0" - cset "name='Front DAC Switch' 1" - cset "name='Front RECMIX Switch' 0" - cset "name='Mic Jack Switch' 1" - cset "name='ADC 0 Mux' 2" - cset "name='ADC 1 Mux' 0" - cset "name='DAC0 Playback Volume' 100,100" - cset "name='HPO L Switch' 0" - cset "name='HPO Mux' 0" - cset "name='HPO R Switch' 0" - cset "name='Pin 5 Mux' 1" - cset "name='Pin 6 Mux' 2" - cset "name='Pin 7 Mux' 3" - cset "name='RECMIX Beep Switch' 0" - cset "name='RECMIX Line1 Switch' 0" - cset "name='RECMIX Mic1 Switch' 0" - cset "name='SPK Mux' 0" - cset "name='SPO Switch' 1" - cset "name='codec0_out mo codec0_in mi Switch' 0" - cset "name='codec0_out mo dmic01_hifi_in mi Switch' 0" - cset "name='codec0_out mo media0_in mi Switch' 1" - cset "name='codec1_out mo codec0_in mi Switch' 0" - cset "name='codec1_out mo dmic01_hifi_in mi Switch' 0" - cset "name='codec1_out mo media0_in mi Switch' 0" - cset "name='media0_out mo codec0_in mi Switch' 1" - cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" - cset "name='media0_out mo media0_in mi Switch' 0" -] diff -Nru alsa-ucm-conf-1.2.2/ucm2/bytcht-cx2072x/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/bytcht-cx2072x/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/bytcht-cx2072x/HiFi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/bytcht-cx2072x/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -SectionVerb { - EnableSequence [ - - - ] - - DisableSequence [ - - - ] -} - - - - - - diff -Nru alsa-ucm-conf-1.2.2/ucm2/bytcht-cx2072x/bytcht-cx2072x.conf alsa-ucm-conf-1.2.6.3/ucm2/bytcht-cx2072x/bytcht-cx2072x.conf --- alsa-ucm-conf-1.2.2/ucm2/bytcht-cx2072x/bytcht-cx2072x.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/bytcht-cx2072x/bytcht-cx2072x.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Syntax 2 - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Play HiFi quality Music" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/bytcht-es8316/HiFi-Components.conf alsa-ucm-conf-1.2.6.3/ucm2/bytcht-es8316/HiFi-Components.conf --- alsa-ucm-conf-1.2.2/ucm2/bytcht-es8316/HiFi-Components.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/bytcht-es8316/HiFi-Components.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -If.spk { - Condition { - Type String - Haystack "${CardComponents}" - Needle "cfg-spk:2" - } - True { - - } -} - -If.mono { - Condition { - Type String - Haystack "${CardComponents}" - Needle "cfg-spk:1" - } - True { - - } -} - - - -If.in1 { - Condition { - Type String - Haystack "${CardComponents}" - Needle "cfg-mic:in1" - } - True { - - - } -} - -If.in2 { - Condition { - Type String - Haystack "${CardComponents}" - Needle "cfg-mic:in2" - } - True { - - - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/bytcht-es8316/HiFi-LongName.conf alsa-ucm-conf-1.2.6.3/ucm2/bytcht-es8316/HiFi-LongName.conf --- alsa-ucm-conf-1.2.2/ucm2/bytcht-es8316/HiFi-LongName.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/bytcht-es8316/HiFi-LongName.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -If.spk { - Condition { - Type String - Haystack "${CardLongName}" - Needle "-stereo-spk" - } - True { - - } -} - -If.mono { - Condition { - Type String - Haystack "${CardLongName}" - Needle "-mono-spk" - } - True { - - } -} - - - -If.in1 { - Condition { - Type String - Haystack "${CardLongName}" - Needle "-in1-mic" - } - True { - - - } -} - -If.in2 { - Condition { - Type String - Haystack "${CardLongName}" - Needle "-in2-mic" - } - True { - - - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/bytcht-es8316/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/bytcht-es8316/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/bytcht-es8316/HiFi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/bytcht-es8316/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -SectionVerb { - EnableSequence [ - - - ] - - DisableSequence [ - - ] -} - -If.0 { - Condition { - Type String - Haystack "${CardComponents}" - Needle "cfg-spk:" - } - True { - - } - False { - - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/bytcht-es8316/bytcht-es8316.conf alsa-ucm-conf-1.2.6.3/ucm2/bytcht-es8316/bytcht-es8316.conf --- alsa-ucm-conf-1.2.2/ucm2/bytcht-es8316/bytcht-es8316.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/bytcht-es8316/bytcht-es8316.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Syntax 2 - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Play HiFi quality Music" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/bytcr-rt5640/HiFi-Components.conf alsa-ucm-conf-1.2.6.3/ucm2/bytcr-rt5640/HiFi-Components.conf --- alsa-ucm-conf-1.2.2/ucm2/bytcr-rt5640/HiFi-Components.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/bytcr-rt5640/HiFi-Components.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -If.spk { - Condition { - Type String - Haystack "${CardComponents}" - Needle "cfg-spk:2" - } - True { - - } -} - -If.mono { - Condition { - Type String - Haystack "${CardComponents}" - Needle "cfg-spk:1" - } - True { - - } -} - - - -If.dmic1 { - Condition { - Type String - Haystack "${CardComponents}" - Needle "cfg-mic:dmic1" - } - True { - - } -} - -If.in1 { - Condition { - Type String - Haystack "${CardComponents}" - Needle "cfg-mic:in1" - } - True { - - } -} - -If.in3 { - Condition { - Type String - Haystack "${CardComponents}" - Needle "cfg-mic:in3" - } - True { - - } -} - - diff -Nru alsa-ucm-conf-1.2.2/ucm2/bytcr-rt5640/HiFi-LongName.conf alsa-ucm-conf-1.2.6.3/ucm2/bytcr-rt5640/HiFi-LongName.conf --- alsa-ucm-conf-1.2.2/ucm2/bytcr-rt5640/HiFi-LongName.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/bytcr-rt5640/HiFi-LongName.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -If.spk { - Condition { - Type String - Haystack "${CardLongName}" - Needle "-stereo-spk" - } - True { - - } -} - -If.mono { - Condition { - Type String - Haystack "${CardLongName}" - Needle "-mono-spk" - } - True { - - } -} - - - -If.dmic1 { - Condition { - Type String - Haystack "${CardLongName}" - Needle "-dmic1-mic" - } - True { - - } -} - -If.in1 { - Condition { - Type String - Haystack "${CardLongName}" - Needle "-in1-mic" - } - True { - - } -} - -If.in3 { - Condition { - Type String - Haystack "${CardLongName}" - Needle "-in3-mic" - } - True { - - } -} - - diff -Nru alsa-ucm-conf-1.2.2/ucm2/bytcr-rt5640/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/bytcr-rt5640/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/bytcr-rt5640/HiFi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/bytcr-rt5640/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -# Use case Configuration for bytcr-rt5640 - - -SectionVerb { - EnableSequence [ - - - ] - - DisableSequence [ - - ] -} - -If.0 { - Condition { - Type String - Haystack "${CardComponents}" - Needle "cfg-spk:" - } - True { - - } - False { - - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/bytcr-rt5640/bytcr-rt5640.conf alsa-ucm-conf-1.2.6.3/ucm2/bytcr-rt5640/bytcr-rt5640.conf --- alsa-ucm-conf-1.2.2/ucm2/bytcr-rt5640/bytcr-rt5640.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/bytcr-rt5640/bytcr-rt5640.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Syntax 2 - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Play HiFi quality Music" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/bytcr-rt5651/HiFi-Components.conf alsa-ucm-conf-1.2.6.3/ucm2/bytcr-rt5651/HiFi-Components.conf --- alsa-ucm-conf-1.2.2/ucm2/bytcr-rt5651/HiFi-Components.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/bytcr-rt5651/HiFi-Components.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -If.spk { - Condition { - Type String - Haystack "${CardComponents}" - Needle "cfg-spk:2" - } - True { - - } -} - -If.mono { - Condition { - Type String - Haystack "${CardComponents}" - Needle "cfg-spk:1" - } - True { - - } -} - -If.headphones { - Condition { - Type String - Haystack "${CardComponents}" - Needle "cfg-hp:lrswap" - } - True { - - } - False { - - } -} - -If.dmic1 { - Condition { - Type String - Haystack "${CardComponents}" - Needle "cfg-mic:dmic1" - } - True { - - - SectionDevice."Mic".ConflictingDevice.0 "Headset" - } - False { - - } -} - -If.in1 { - Condition { - Type String - Haystack "${CardComponents}" - Needle "cfg-mic:in1" - } - True { - - } -} - -If.in2 { - Condition { - Type String - Haystack "${CardComponents}" - Needle "cfg-mic:in2" - } - True { - - } -} - -If.in12 { - Condition { - Type String - Haystack "${CardComponents}" - Needle "cfg-mic:in12" - } - True { - - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/bytcr-rt5651/HiFi-LongName.conf alsa-ucm-conf-1.2.6.3/ucm2/bytcr-rt5651/HiFi-LongName.conf --- alsa-ucm-conf-1.2.2/ucm2/bytcr-rt5651/HiFi-LongName.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/bytcr-rt5651/HiFi-LongName.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ -If.spk { - Condition { - Type String - Haystack "${CardLongName}" - Needle "-stereo-spk" - } - True { - - } -} - -If.mono { - Condition { - Type String - Haystack "${CardLongName}" - Needle "-mono-spk" - } - True { - - } -} - -If.headphones { - Condition { - Type String - Haystack "${CardLongName}" - Needle "-mic-hp-swapped" - } - True { - - } - False { - - } -} - -If.dmic1 { - Condition { - Type String - Haystack "${CardLongName}" - Needle "-dmic1-mic" - } - True { - - - } - False { - - } -} - -If.in1 { - Condition { - Type String - Haystack "${CardLongName}" - Needle "-in1-mic" - } - True { - - } -} - -If.in2 { - Condition { - Type String - Haystack "${CardLongName}" - Needle "-in2-mic" - } - True { - - } -} - -If.in12 { - Condition { - Type String - Haystack "${CardLongName}" - Needle "-in12-mic" - } - True { - - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/bytcr-rt5651/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/bytcr-rt5651/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/bytcr-rt5651/HiFi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/bytcr-rt5651/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 - - -SectionVerb { - EnableSequence [ - - - ] - - DisableSequence [ - - ] -} - -If.0 { - Condition { - Type String - Haystack "${CardComponents}" - Needle "cfg-spk:" - } - True { - - } - False { - - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/bytcr-rt5651/bytcr-rt5651.conf alsa-ucm-conf-1.2.6.3/ucm2/bytcr-rt5651/bytcr-rt5651.conf --- alsa-ucm-conf-1.2.2/ucm2/bytcr-rt5651/bytcr-rt5651.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/bytcr-rt5651/bytcr-rt5651.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 - -Syntax 2 - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Play HiFi quality Music" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/cht-bsw-rt5672/HiFi-stereo-dmic2.conf alsa-ucm-conf-1.2.6.3/ucm2/cht-bsw-rt5672/HiFi-stereo-dmic2.conf --- alsa-ucm-conf-1.2.2/ucm2/cht-bsw-rt5672/HiFi-stereo-dmic2.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/cht-bsw-rt5672/HiFi-stereo-dmic2.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -# Adapted from https://github.com/plbossart/UCM/tree/master/cht-bsw-rt5672 - -SectionVerb { - EnableSequence [ - - - ] - - DisableSequence [ - - ] -} - - -RenameDevice."Speaker1" "Speaker" -RemoveDevice."Speaker2" "Speaker2" - - - -RenameDevice."Mic2" "Mic" -RemoveDevice."Mic1" "Mic1" - diff -Nru alsa-ucm-conf-1.2.2/ucm2/cht-bsw-rt5672/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/cht-bsw-rt5672/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/cht-bsw-rt5672/HiFi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/cht-bsw-rt5672/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -# Adapted from https://github.com/plbossart/UCM/tree/master/cht-bsw-rt5672 - -SectionVerb { - EnableSequence [ - - - ] - - DisableSequence [ - - ] -} - - - - - - - - diff -Nru alsa-ucm-conf-1.2.2/ucm2/cht-bsw-rt5672/LENOVO-20BN002QGE-ThinkPad8-20BN002QGE.conf alsa-ucm-conf-1.2.6.3/ucm2/cht-bsw-rt5672/LENOVO-20BN002QGE-ThinkPad8-20BN002QGE.conf --- alsa-ucm-conf-1.2.2/ucm2/cht-bsw-rt5672/LENOVO-20BN002QGE-ThinkPad8-20BN002QGE.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/cht-bsw-rt5672/LENOVO-20BN002QGE-ThinkPad8-20BN002QGE.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Syntax 2 - -SectionUseCase."HiFi" { - File "HiFi-stereo-dmic2.conf" - Comment "Play HiFi quality Music" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/cht-bsw-rt5672/LENOVO-20BN002QGE-ThinkPad8.conf alsa-ucm-conf-1.2.6.3/ucm2/cht-bsw-rt5672/LENOVO-20BN002QGE-ThinkPad8.conf --- alsa-ucm-conf-1.2.2/ucm2/cht-bsw-rt5672/LENOVO-20BN002QGE-ThinkPad8.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/cht-bsw-rt5672/LENOVO-20BN002QGE-ThinkPad8.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Syntax 2 - -SectionUseCase."HiFi" { - File "HiFi-stereo-dmic2.conf" - Comment "Play HiFi quality Music" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/cht-bsw-rt5672/cht-bsw-rt5672-stereo-dmic2.conf alsa-ucm-conf-1.2.6.3/ucm2/cht-bsw-rt5672/cht-bsw-rt5672-stereo-dmic2.conf --- alsa-ucm-conf-1.2.2/ucm2/cht-bsw-rt5672/cht-bsw-rt5672-stereo-dmic2.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/cht-bsw-rt5672/cht-bsw-rt5672-stereo-dmic2.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Syntax 2 - -SectionUseCase."HiFi" { - File "HiFi-stereo-dmic2.conf" - Comment "Play HiFi quality Music" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/cht-bsw-rt5672/cht-bsw-rt5672.conf alsa-ucm-conf-1.2.6.3/ucm2/cht-bsw-rt5672/cht-bsw-rt5672.conf --- alsa-ucm-conf-1.2.2/ucm2/cht-bsw-rt5672/cht-bsw-rt5672.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/cht-bsw-rt5672/cht-bsw-rt5672.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -# Adapted from https://github.com/plbossart/UCM/tree/master/cht-bsw-rt5672 - -Syntax 2 - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Play HiFi quality Music" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/chtnau8824/HiFi-mono.conf alsa-ucm-conf-1.2.6.3/ucm2/chtnau8824/HiFi-mono.conf --- alsa-ucm-conf-1.2.2/ucm2/chtnau8824/HiFi-mono.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/chtnau8824/HiFi-mono.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ - -SectionVerb { - - Value { - TQ "HiFi" - } - - EnableSequence [ - - - ] - - DisableSequence [ - - ] -} - - - - - - diff -Nru alsa-ucm-conf-1.2.2/ucm2/chtnau8824/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/chtnau8824/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/chtnau8824/HiFi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/chtnau8824/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ - -SectionVerb { - EnableSequence [ - - - ] - - DisableSequence [ - - ] -} - - - - - - diff -Nru alsa-ucm-conf-1.2.2/ucm2/chtnau8824/PIPO-W2S-Defaultstring-CherryTrailCR.conf alsa-ucm-conf-1.2.6.3/ucm2/chtnau8824/PIPO-W2S-Defaultstring-CherryTrailCR.conf --- alsa-ucm-conf-1.2.2/ucm2/chtnau8824/PIPO-W2S-Defaultstring-CherryTrailCR.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/chtnau8824/PIPO-W2S-Defaultstring-CherryTrailCR.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -Syntax 2 - -Comment "chtnau8824 internal card" - -SectionUseCase."HiFi" { - File "HiFi-mono.conf" - Comment "Default" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/chtnau8824/chtnau8824-mono.conf alsa-ucm-conf-1.2.6.3/ucm2/chtnau8824/chtnau8824-mono.conf --- alsa-ucm-conf-1.2.2/ucm2/chtnau8824/chtnau8824-mono.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/chtnau8824/chtnau8824-mono.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -Syntax 2 - -Comment "chtnau8824 internal card" - -SectionUseCase."HiFi" { - File "HiFi-mono.conf" - Comment "Default" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/chtnau8824/chtnau8824.conf alsa-ucm-conf-1.2.6.3/ucm2/chtnau8824/chtnau8824.conf --- alsa-ucm-conf-1.2.2/ucm2/chtnau8824/chtnau8824.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/chtnau8824/chtnau8824.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -Syntax 2 - -Comment "chtnau8824 internal card" - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Default" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/chtnau8824/cube-i1_TF-Defaultstring-CherryTrailCR.conf alsa-ucm-conf-1.2.6.3/ucm2/chtnau8824/cube-i1_TF-Defaultstring-CherryTrailCR.conf --- alsa-ucm-conf-1.2.2/ucm2/chtnau8824/cube-i1_TF-Defaultstring-CherryTrailCR.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/chtnau8824/cube-i1_TF-Defaultstring-CherryTrailCR.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -Syntax 2 - -Comment "chtnau8824 internal card" - -SectionUseCase."HiFi" { - File "HiFi-mono.conf" - Comment "Default" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/chtrt5645/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN.conf alsa-ucm-conf-1.2.6.3/ucm2/chtrt5645/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN.conf --- alsa-ucm-conf-1.2.2/ucm2/chtrt5645/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/chtrt5645/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Syntax 2 -Comment "Intel SoC Audio Device" -SectionUseCase."HiFi" { - File "HiFi-dmic1.conf" - Comment "Default" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/chtrt5645/HiFi-dmic1.conf alsa-ucm-conf-1.2.6.3/ucm2/chtrt5645/HiFi-dmic1.conf --- alsa-ucm-conf-1.2.2/ucm2/chtrt5645/HiFi-dmic1.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/chtrt5645/HiFi-dmic1.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,117 +0,0 @@ -SectionVerb { - # ALSA PCM - Value { - TQ "HiFi" - } - - EnableSequence [ - - - - cset "name='Stereo1 ADC1 Mux' 1" - cset "name='I2S2 Func Switch' on" - # 3/12 the headphone mic tends to be quite loud - cset "name='IN1 Boost' 3" - # 8/8 the internal analog mic tends to be quite soft - cset "name='IN2 Boost' 8" - ] - - DisableSequence [ - - ] -} - -SectionDevice."Speaker" { - Comment "Speaker" - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId}" - } - - ConflictingDevice [ - "Headphones" - ] - - EnableSequence [ - - ] - - DisableSequence [ - cset "name='Ext Spk Switch' off" - cset "name='Speaker Channel Switch' off" - ] -} - -SectionDevice."Headphones" { - Comment "Headphones" - - Value { - PlaybackPriority 200 - PlaybackPCM "hw:${CardId}" - JackControl "Headphone Jack" - JackHWMute "Speaker" - } - - ConflictingDevice [ - "Speaker" - ] - - EnableSequence [ - - ] - - DisableSequence [ - cset "name='Headphone Switch' off" - cset "name='Headphone Channel Switch' off" - ] -} - -SectionDevice."Mic" { - Comment "Internal Microphone" - - Value { - CapturePriority 100 - CapturePCM "hw:${CardId}" - } - - EnableSequence [ - - - cset "name='Stereo1 DMIC Mux' DMIC1" - cset "name='Stereo1 ADC2 Mux' DMIC" - cset "name='Mono ADC L2 Mux' DMIC" - cset "name='Mono ADC R2 Mux' DMIC" - ] - - DisableSequence [ - - ] -} - -SectionDevice."Headset" { - Comment "Headset Microphone" - - Value { - CapturePriority 200 - CapturePCM "hw:${CardId}" - JackControl "Headset Mic Jack" - JackHWMute "Mic" - } - - EnableSequence [ - - - cset "name='Sto1 ADC MIXL ADC2 Switch' off" - cset "name='Sto1 ADC MIXR ADC2 Switch' off" - - cset "name='Mono ADC MIXL ADC1 Switch' on" - cset "name='Mono ADC MIXR ADC1 Switch' on" - cset "name='Mono ADC MIXL ADC2 Switch' off" - cset "name='Mono ADC MIXR ADC2 Switch' off" - ] - - DisableSequence [ - - ] -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/chtrt5645/HiFi-dmic2.conf alsa-ucm-conf-1.2.6.3/ucm2/chtrt5645/HiFi-dmic2.conf --- alsa-ucm-conf-1.2.2/ucm2/chtrt5645/HiFi-dmic2.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/chtrt5645/HiFi-dmic2.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,119 +0,0 @@ -SectionVerb { - # ALSA PCM - Value { - TQ "HiFi" - } - - EnableSequence [ - - - - cset "name='Stereo1 ADC1 Mux' 1" - cset "name='I2S2 Func Switch' on" - # 3/12 the headphone mic tends to be quite loud - cset "name='IN1 Boost' 3" - # 8/8 the internal analog mic tends to be quite soft - cset "name='IN2 Boost' 8" - ] - - DisableSequence [ - - ] -} - -SectionDevice."Speaker" { - Comment "Speaker" - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId}" - } - - ConflictingDevice [ - "Headphones" - ] - - EnableSequence [ - - ] - - DisableSequence [ - cset "name='Ext Spk Switch' off" - cset "name='Speaker Channel Switch' off" - ] -} - -SectionDevice."Headphones" { - Comment "Headphones" - - Value { - PlaybackPriority 200 - PlaybackPCM "hw:${CardId}" - JackControl "Headphone Jack" - JackHWMute "Speaker" - } - - ConflictingDevice [ - "Speaker" - ] - - EnableSequence [ - - ] - - DisableSequence [ - cset "name='Headphone Switch' off" - cset "name='Headphone Channel Switch' off" - ] -} - -SectionDevice."Mic" { - Comment "Internal Microphone" - - Value { - CapturePriority 100 - CapturePCM "hw:${CardId}" - } - - EnableSequence [ - - - cset "name='Stereo1 DMIC Mux' DMIC2" - cset "name='Stereo1 ADC2 Mux' DMIC" - cset "name='Mono DMIC L Mux' DMIC2" - cset "name='Mono DMIC R Mux' DMIC2" - cset "name='Mono ADC L2 Mux' DMIC" - cset "name='Mono ADC R2 Mux' DMIC" - ] - - DisableSequence [ - - ] -} - -SectionDevice."Headset" { - Comment "Headset Microphone" - - Value { - CapturePriority 200 - CapturePCM "hw:${CardId}" - JackControl "Headset Mic Jack" - JackHWMute "DMic" - } - - EnableSequence [ - - - cset "name='Sto1 ADC MIXL ADC2 Switch' off" - cset "name='Sto1 ADC MIXR ADC2 Switch' off" - - cset "name='Mono ADC MIXL ADC1 Switch' on" - cset "name='Mono ADC MIXR ADC1 Switch' on" - cset "name='Mono ADC MIXL ADC2 Switch' off" - cset "name='Mono ADC MIXR ADC2 Switch' off" - ] - - DisableSequence [ - - ] -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf alsa-ucm-conf-1.2.6.3/ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf --- alsa-ucm-conf-1.2.2/ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,105 +0,0 @@ -SectionVerb { - # ALSA PCM - Value { - TQ "HiFi" - } - - EnableSequence [ - - - - cset "name='Stereo1 ADC1 Mux' 1" - cset "name='I2S2 Func Switch' on" - # 3/12 the headphone mic tends to be quite loud - cset "name='IN1 Boost' 3" - # 8/8 the internal analog mic tends to be quite soft - cset "name='IN2 Boost' 8" - ] - - DisableSequence [ - - ] -} - -SectionDevice."Speaker" { - Comment "Speaker" - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId}" - } - - ConflictingDevice [ - "Headphones" - ] - - EnableSequence [ - # Monospeaker: Mix right to left - cset "name='Stereo DAC MIXL DAC R1 Switch' 1" - cset "name='Stereo DAC MIXR DAC R1 Switch' 0" - - - ] - - DisableSequence [ - cset "name='Ext Spk Switch' off" - cset "name='Speaker Channel Switch' off" - ] -} - -SectionDevice."Headphones" { - Comment "Headphones" - - Value { - PlaybackPriority 200 - PlaybackPCM "hw:${CardId}" - JackControl "Headphone Jack" - JackHWMute "Speaker" - } - - ConflictingDevice [ - "Speaker" - ] - - EnableSequence [ - # Undo monospeaker mixing - cset "name='Stereo DAC MIXL DAC R1 Switch' 0" - cset "name='Stereo DAC MIXR DAC R1 Switch' 1" - - - ] - - DisableSequence [ - cset "name='Headphone Switch' off" - cset "name='Headphone Channel Switch' off" - ] -} - - - -SectionDevice."Headset" { - Comment "Headset Microphone" - - Value { - CapturePriority 200 - CapturePCM "hw:${CardId}" - JackControl "Headset Mic Jack" - JackHWMute "Mic" - } - - EnableSequence [ - - - cset "name='Sto1 ADC MIXL ADC2 Switch' off" - cset "name='Sto1 ADC MIXR ADC2 Switch' off" - - cset "name='Mono ADC MIXL ADC1 Switch' on" - cset "name='Mono ADC MIXR ADC1 Switch' on" - cset "name='Mono ADC MIXL ADC2 Switch' off" - cset "name='Mono ADC MIXR ADC2 Switch' off" - ] - - DisableSequence [ - - ] -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/chtrt5645/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/chtrt5645/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/chtrt5645/HiFi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/chtrt5645/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,97 +0,0 @@ -SectionVerb { - # ALSA PCM - Value { - TQ "HiFi" - } - - EnableSequence [ - - - - cset "name='Stereo1 ADC1 Mux' 1" - cset "name='I2S2 Func Switch' on" - # 3/12 the headphone mic tends to be quite loud - cset "name='IN1 Boost' 3" - # 8/8 the internal analog mic tends to be quite soft - cset "name='IN2 Boost' 8" - ] - - DisableSequence [ - - ] -} - -SectionDevice."Speaker" { - Comment "Speaker" - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId}" - } - - ConflictingDevice [ - "Headphones" - ] - - EnableSequence [ - - ] - - DisableSequence [ - cset "name='Ext Spk Switch' off" - cset "name='Speaker Channel Switch' off" - ] -} - -SectionDevice."Headphones" { - Comment "Headphones" - - Value { - PlaybackPriority 200 - PlaybackPCM "hw:${CardId}" - JackControl "Headphone Jack" - JackHWMute "Speaker" - } - - ConflictingDevice [ - "Speaker" - ] - - EnableSequence [ - - ] - - DisableSequence [ - cset "name='Headphone Switch' off" - cset "name='Headphone Channel Switch' off" - ] -} - - - -SectionDevice."Headset" { - Comment "Headset Microphone" - - Value { - CapturePriority 200 - CapturePCM "hw:${CardId}" - JackControl "Headset Mic Jack" - JackHWMute "Mic" - } - - EnableSequence [ - - - cset "name='Sto1 ADC MIXL ADC2 Switch' off" - cset "name='Sto1 ADC MIXR ADC2 Switch' off" - - cset "name='Mono ADC MIXL ADC1 Switch' on" - cset "name='Mono ADC MIXR ADC1 Switch' on" - cset "name='Mono ADC MIXL ADC2 Switch' off" - cset "name='Mono ADC MIXR ADC2 Switch' off" - ] - - DisableSequence [ - - ] -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/chtrt5645/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216.conf alsa-ucm-conf-1.2.6.3/ucm2/chtrt5645/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216.conf --- alsa-ucm-conf-1.2.2/ucm2/chtrt5645/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/chtrt5645/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Syntax 2 -Comment "Intel SoC Audio Device" -SectionUseCase."HiFi" { - File "HiFi-dmic2.conf" - Comment "Default" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/chtrt5645/TECLAST-X80Pro-Defaultstring-CherryTrailCR.conf alsa-ucm-conf-1.2.6.3/ucm2/chtrt5645/TECLAST-X80Pro-Defaultstring-CherryTrailCR.conf --- alsa-ucm-conf-1.2.2/ucm2/chtrt5645/TECLAST-X80Pro-Defaultstring-CherryTrailCR.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/chtrt5645/TECLAST-X80Pro-Defaultstring-CherryTrailCR.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Syntax 2 -Comment "Intel SoC Audio Device" -SectionUseCase."HiFi" { - File "HiFi-mono-speaker-analog-mic.conf" - Comment "Default" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/chtrt5645/chtrt5645-dmic1.conf alsa-ucm-conf-1.2.6.3/ucm2/chtrt5645/chtrt5645-dmic1.conf --- alsa-ucm-conf-1.2.2/ucm2/chtrt5645/chtrt5645-dmic1.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/chtrt5645/chtrt5645-dmic1.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Syntax 2 -Comment "Intel SoC Audio Device" -SectionUseCase."HiFi" { - File "HiFi-dmic1.conf" - Comment "Default" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/chtrt5645/chtrt5645-dmic2.conf alsa-ucm-conf-1.2.6.3/ucm2/chtrt5645/chtrt5645-dmic2.conf --- alsa-ucm-conf-1.2.2/ucm2/chtrt5645/chtrt5645-dmic2.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/chtrt5645/chtrt5645-dmic2.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Syntax 2 -Comment "Intel SoC Audio Device" -SectionUseCase."HiFi" { - File "HiFi-dmic2.conf" - Comment "Default" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/chtrt5645/chtrt5645-mono-speaker-analog-mic.conf alsa-ucm-conf-1.2.6.3/ucm2/chtrt5645/chtrt5645-mono-speaker-analog-mic.conf --- alsa-ucm-conf-1.2.2/ucm2/chtrt5645/chtrt5645-mono-speaker-analog-mic.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/chtrt5645/chtrt5645-mono-speaker-analog-mic.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Syntax 2 -Comment "Intel SoC Audio Device" -SectionUseCase."HiFi" { - File "HiFi-mono-speaker-analog-mic.conf" - Comment "Default" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/chtrt5645/chtrt5645.conf alsa-ucm-conf-1.2.6.3/ucm2/chtrt5645/chtrt5645.conf --- alsa-ucm-conf-1.2.2/ucm2/chtrt5645/chtrt5645.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/chtrt5645/chtrt5645.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Syntax 2 -Comment "Intel SoC Audio Device" -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Default" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/chtrt5645/gpd-win-pocket-rt5645.conf alsa-ucm-conf-1.2.6.3/ucm2/chtrt5645/gpd-win-pocket-rt5645.conf --- alsa-ucm-conf-1.2.2/ucm2/chtrt5645/gpd-win-pocket-rt5645.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/chtrt5645/gpd-win-pocket-rt5645.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Syntax 2 -Comment "Intel SoC Audio Device" -SectionUseCase."HiFi" { - File "HiFi-mono-speaker-analog-mic.conf" - Comment "Default" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/chtrt5650/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/chtrt5650/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/chtrt5650/HiFi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/chtrt5650/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,113 +0,0 @@ - -SectionVerb { - # ALSA PCM - Value { - TQ "HiFi" - - # ALSA PCM device for HiFi - PlaybackPCM "hw:${CardId}" - CapturePCM "hw:${CardId}" - } - - EnableSequence [ - - - - cset "name='Speaker HWEQ' 1,164,237,135,1,165,0,0,1,166,237,135,1,167,0,0,1,192,30,196,1,193,0,0,1,194,30,196,1,195,0,0,1,196,31,180,1,197,0,75,1,198,31,180,1,199,31,180,1,200,0,75,1,201,31,180,0,177,51,224" - cset "name='DAC1 Playback Volume' 77,77" - cset "name='Speaker ClassD Playback Volume' 4" - cset "name='I2S2 Func Switch' off" - cset "name='RT5650 IF1 ADC Mux' 0" - ] - - DisableSequence [ - - ] -} - -SectionDevice."Speaker" { - Comment "Speaker" - - Value { - PlaybackChannels "2" - } - - ConflictingDevice [ - "Headphones" - ] - - EnableSequence [ - - ] - - DisableSequence [ - cset "name='Ext Spk Switch' off" - cset "name='Speaker Channel Switch' off" - ] -} - -SectionDevice."Headphones" { - Comment "Headphones" - - Value { - PlaybackChannels "2" - JackControl "Headphone Jack" - JackHWMute "Speaker" - } - - ConflictingDevice [ - "Speaker" - ] - - EnableSequence [ - - ] - - DisableSequence [ - cset "name='Headphone Switch' off" - cset "name='Headphone Channel Switch' off" - ] -} - -SectionDevice."Mic" { - Comment "Internal Microphone" - - Value { - CaptureChannels "2" - CapturePriority "150" - } - - EnableSequence [ - cset "name='Int Mic Switch' on" - cset "name='Sto1 ADC MIXL ADC2 Switch' on" - cset "name='Sto1 ADC MIXR ADC2 Switch' on" - ] - - DisableSequence [ - cset "name='Sto1 ADC MIXL ADC2 Switch' off" - cset "name='Sto1 ADC MIXR ADC2 Switch' off" - cset "name='Int Mic Switch' off" - ] -} - -SectionDevice."HSMic" { - Comment "Headset Microphone" - - Value { - CaptureChannels "2" - JackControl "Headset Mic Jack" - JackHWMute "Mic" - } - - EnableSequence [ - - - cset "name='IN1 Boost' 1" - ] - - DisableSequence [ - - - cset "name='IN1 Boost' 0" - ] -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/chtrt5650/chtrt5650.conf alsa-ucm-conf-1.2.6.3/ucm2/chtrt5650/chtrt5650.conf --- alsa-ucm-conf-1.2.2/ucm2/chtrt5650/chtrt5650.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/chtrt5650/chtrt5650.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -Comment "Intel SoC Audio Device" -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Default" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/cx2072x/DisableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/cx2072x/DisableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/cx2072x/DisableSeq.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/cx2072x/DisableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -1,7 +1,9 @@ -# Output Configuration -cset "name='I2S DAC1L Switch' off" -cset "name='I2S DAC1R Switch' off" +DisableSequence [ + # Output Configuration + cset "name='I2S DAC1L Switch' off" + cset "name='I2S DAC1R Switch' off" -# Input Configuration -cset "name='I2S ADC1L Switch' off" -cset "name='I2S ADC1R Switch' off" + # Input Configuration + cset "name='I2S ADC1L Switch' off" + cset "name='I2S ADC1R Switch' off" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/cx2072x/EnableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/cx2072x/EnableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/cx2072x/EnableSeq.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/cx2072x/EnableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -1,13 +1,15 @@ -# Disable all inputs / outputs -cset "name='Ext Spk Switch' off" -cset "name='Headphone Switch' off" -cset "name='Headset Mic Switch' off" -cset "name='Int Mic Switch' off" +EnableSequence [ + # Disable all inputs / outputs + cset "name='Ext Spk Switch' off" + cset "name='Headphone Switch' off" + cset "name='Headset Mic Switch' off" + cset "name='Int Mic Switch' off" -# Output Configuration -cset "name='I2S DAC1L Switch' on" -cset "name='I2S DAC1R Switch' on" + # Output Configuration + cset "name='I2S DAC1L Switch' on" + cset "name='I2S DAC1R Switch' on" -# Input Configuration -cset "name='I2S ADC1L Switch' on" -cset "name='I2S ADC1R Switch' on" + # Input Configuration + cset "name='I2S ADC1L Switch' on" + cset "name='I2S ADC1R Switch' on" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/es8316/EnableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/es8316/EnableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/es8316/EnableSeq.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/es8316/EnableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -1,19 +1,25 @@ -# Disable all inputs / outputs -cset "name='Speaker Switch' off" -cset "name='Headphone Switch' off" -cset "name='Headset Mic Switch' off" -cset "name='Internal Mic Switch' off" +EnableSequence [ + # Disable all inputs / outputs + cset "name='Speaker Switch' off" + cset "name='Headphone Switch' off" + cset "name='Headset Mic Switch' off" + cset "name='Internal Mic Switch' off" -# Set HP vol to 0 dB (3/3) -cset "name='Headphone Playback Volume' 3" -# Set HP mixer vol to -6 dB (4/7) louder does not work -cset "name='Headphone Mixer Volume' 4" -# Set DAC vol to 0 dB (192/192) -cset "name='DAC Playback Volume' 192" -# Set ADC vold to 0 dB (10/10) -cset "name='ADC PGA Gain Volume' 10" + # Set HP vol to 0 dB (3/3) + cset "name='Headphone Playback Volume' 3" + # Set HP mixer vol to 0 dB + cset "name='Headphone Mixer Volume' 11" + # Set DAC vol to 0 dB (192/192) + cset "name='DAC Playback Volume' 192" -# Setup muxes / switches -cset "name='Left Headphone Mixer Left DAC Switch' on" -cset "name='Right Headphone Mixer Right DAC Switch' on" -cset "name='ALC Capture Switch' on" + # Disable Auto Level Control + cset "name='ALC Capture Switch' off" + # Set ADC vol to 0 dB (192/192) + cset "name='ADC Capture Volume' 192" + # Set Mic amplifier to +16 dB + cset "name='ADC PGA Gain Volume' 7" + + # Setup muxes / switches + cset "name='Left Headphone Mixer Left DAC Switch' on" + cset "name='Right Headphone Mixer Right DAC Switch' on" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/es8316/HeadPhones.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/es8316/HeadPhones.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/es8316/HeadPhones.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/es8316/HeadPhones.conf 2021-12-17 16:53:11.000000000 +0000 @@ -16,6 +16,8 @@ Value { PlaybackPriority 200 PlaybackPCM "hw:${CardId}" + PlaybackMixerElem "Headphone Mixer" + PlaybackMasterElem "DAC" JackControl "Headphone Jack" JackHWMute "Speaker" } diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/es8316/IN1-HeadsetMic.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/es8316/IN1-HeadsetMic.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/es8316/IN1-HeadsetMic.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/es8316/IN1-HeadsetMic.conf 2021-12-17 16:53:11.000000000 +0000 @@ -17,6 +17,8 @@ Value { CapturePriority 200 CapturePCM "hw:${CardId}" + CaptureMixerElem "ADC PGA Gain" + CaptureMasterElem "ADC" JackControl "Headset Mic Jack" } } diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/es8316/IN1-InternalMic.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/es8316/IN1-InternalMic.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/es8316/IN1-InternalMic.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/es8316/IN1-InternalMic.conf 2021-12-17 16:53:11.000000000 +0000 @@ -17,5 +17,7 @@ Value { CapturePriority 100 CapturePCM "hw:${CardId}" + CaptureMixerElem "ADC PGA Gain" + CaptureMasterElem "ADC" } } diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/es8316/IN2-HeadsetMic.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/es8316/IN2-HeadsetMic.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/es8316/IN2-HeadsetMic.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/es8316/IN2-HeadsetMic.conf 2021-12-17 16:53:11.000000000 +0000 @@ -17,6 +17,8 @@ Value { CapturePriority 200 CapturePCM "hw:${CardId}" + CaptureMixerElem "ADC PGA Gain" + CaptureMasterElem "ADC" JackControl "Headset Mic Jack" } } diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/es8316/IN2-InternalMic.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/es8316/IN2-InternalMic.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/es8316/IN2-InternalMic.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/es8316/IN2-InternalMic.conf 2021-12-17 16:53:11.000000000 +0000 @@ -17,5 +17,7 @@ Value { CapturePriority 100 CapturePCM "hw:${CardId}" + CaptureMixerElem "ADC PGA Gain" + CaptureMasterElem "ADC" } } diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/es8316/MonoSpeaker.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/es8316/MonoSpeaker.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/es8316/MonoSpeaker.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/es8316/MonoSpeaker.conf 2021-12-17 16:53:11.000000000 +0000 @@ -33,5 +33,9 @@ Value { PlaybackPriority 100 PlaybackPCM "hw:${CardId}" + # The es8316 only has a HP-amp which is muxed to the speaker + # or to the headpones output + PlaybackMixerElem "Headphone Mixer" + PlaybackMasterElem "DAC" } } diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/es8316/Speaker.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/es8316/Speaker.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/es8316/Speaker.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/es8316/Speaker.conf 2021-12-17 16:53:11.000000000 +0000 @@ -16,5 +16,9 @@ Value { PlaybackPriority 100 PlaybackPCM "hw:${CardId}" + # The es8316 only has a HP-amp which is muxed to the speaker + # or to the headpones output + PlaybackMixerElem "Headphone Mixer" + PlaybackMasterElem "DAC" } } diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/hda/hdmi.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/hda/hdmi.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/hda/hdmi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/hda/hdmi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,25 @@ +If.hdmi { + Condition { + Type ControlExists + Control "iface=CARD,name='HDMI/DP,pcm=${var:HdmiPCM} Jack'" + } + True { + SectionDevice."HDMI${var:HdmiNum}" { + Comment "HDMI / DisplayPort ${var:HdmiNum} Output" + + EnableSequence [ + cset "name='IEC958 Playback Switch',index=${var:HdmiCtlIndex} on" + ] + + DisableSequence [ + cset "name='IEC958 Playback Switch',index=${var:HdmiCtlIndex} off" + ] + + Value { + PlaybackPriority "${var:HdmiPrio}" + PlaybackPCM "hw:${CardId},${var:HdmiPCM}" + JackControl "HDMI/DP,pcm=${var:HdmiPCM} Jack" + } + } + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/max98090/EnableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/max98090/EnableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/max98090/EnableSeq.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/max98090/EnableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,27 @@ +EnableSequence [ + cset "name='Left Speaker Mixer Left DAC Switch' on" + cset "name='Right Speaker Mixer Right DAC Switch' on" + cset "name='Digital EQ 3 Band Switch' off" + cset "name='Digital EQ 5 Band Switch' off" + cset "name='Digital EQ 7 Band Switch' off" + cset "name='Biquad Switch' off" + cset "name='Filter Mode' Music" + cset "name='ADC Oversampling Rate' 0" + + cset "name='DMIC Mux' DMIC" + cset "name='MIC2 Mux' IN34" + cset "name='MIC2 Volume' 10" + cset "name='MIC2 Boost Volume' 0" + + cset "name='ADCR Boost Volume' 4" + cset "name='ADCL Boost Volume' 4" + cset "name='ADCR Volume' 11" + cset "name='ADCL Volume' 11" + + cset "name='Headphone Volume' 10" + cset "name='Speaker Volume' 10" + + cset "name='Speaker Left Mixer Volume' 3" + cset "name='Speaker Right Mixer Volume' 3" + cset "name='Playback Path DC Blocking' on" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/max98090/Headphones.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/max98090/Headphones.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/max98090/Headphones.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/max98090/Headphones.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,25 @@ +SectionDevice."Headphones" { + Comment "Headphones" + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + JackControl "Headphone Jack" + } + + ConflictingDevice [ + "Speaker" + ] + + EnableSequence [ + cset "name='Headphone Left Switch' on" + cset "name='Headphone Right Switch' on" + cset "name='Headphone Switch' on" + ] + + DisableSequence [ + cset "name='Headphone Left Switch' off" + cset "name='Headphone Right Switch' off" + cset "name='Headphone Switch' off" + ] +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/max98090/HeadsetMic.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/max98090/HeadsetMic.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/max98090/HeadsetMic.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/max98090/HeadsetMic.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,32 @@ +# Headset Microphone via MIC2 +SectionDevice."Headset" { + Comment "Headset Microphone" + + Value { + CapturePriority 200 + CapturePCM "hw:${CardId}" + JackControl "Headset Mic Jack" + } + + ConflictingDevice [ + "Mic" + ] + + EnableSequence [ + cset "name='Headset Mic Switch' on" + cset "name='DMIC Mux' ADC" + cset "name='Record Path DC Blocking' on" + + cset "name='Left ADC Mixer MIC2 Switch' on" + cset "name='Right ADC Mixer MIC2 Switch' on" + ] + + DisableSequence [ + cset "name='Headset Mic Switch' off" + cset "name='DMIC Mux' DMIC" + cset "name='Record Path DC Blocking' off" + + cset "name='Left ADC Mixer MIC2 Switch' off" + cset "name='Right ADC Mixer MIC2 Switch' off" + ] +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/max98090/InternalMic.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/max98090/InternalMic.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/max98090/InternalMic.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/max98090/InternalMic.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,25 @@ +# internal microphone via DMIC +SectionDevice."Mic" { + Comment "Internal Microphone" + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId}" + } + + ConflictingDevice [ + "Headset" + ] + + EnableSequence [ + cset "name='Int Mic Switch' on" + cset "name='DMIC Mux' DMIC" + cset "name='Record Path DC Blocking' off" + ] + + DisableSequence [ + cset "name='Int Mic Switch' off" + cset "name='DMIC Mux' ADC" + cset "name='Record Path DC Blocking' on" + ] +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/max98090/Speaker.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/max98090/Speaker.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/max98090/Speaker.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/max98090/Speaker.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,24 @@ +SectionDevice."Speaker" { + Comment "Speaker" + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + } + + ConflictingDevice [ + "Headphones" + ] + + EnableSequence [ + cset "name='Speaker Left Switch' on" + cset "name='Speaker Right Switch' on" + cset "name='Ext Spk Switch' on" + ] + + DisableSequence [ + cset "name='Speaker Left Switch' off" + cset "name='Speaker Right Switch' off" + cset "name='Ext Spk Switch' off" + ] +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/nau8824/DMIC1_2.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/nau8824/DMIC1_2.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/nau8824/DMIC1_2.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/nau8824/DMIC1_2.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,30 @@ +# Stereo DMICs on the DMIC1 and DMIC2 inputs + +SectionDevice."Mic" { + Comment "Internal Digital Microphones" + + Value { + CapturePriority 200 + CapturePCM "hw:${CardId}" + } + + ConflictingDevice [ + "Headset" + ] + + EnableSequence [ + # Note needs to be swapped / swap is deliberate! + cset "name='ADC CH0 Select' 1" + cset "name='ADC CH1 Select' 0" + + cset "name='Int Mic Switch' on" + cset "name='DMIC1 Enable Switch' on" + cset "name='DMIC2 Enable Switch' on" + ] + + DisableSequence [ + cset "name='Int Mic Switch' off" + cset "name='DMIC1 Enable Switch' off" + cset "name='DMIC2 Enable Switch' off" + ] +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/nau8824/EnableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/nau8824/EnableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/nau8824/EnableSeq.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/nau8824/EnableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -1,15 +1,17 @@ -# Playback TDM configuration -cset "name='DACL Channel Source' 0" -cset "name='DACR Channel Source' 1" -# Input Configuration -cset "name='DMIC1 Enable Switch' off" -cset "name='DMIC2 Enable Switch' off" -cset "name='DMIC3 Enable Switch' off" -cset "name='DMIC4 Enable Switch' off" -cset "name='MIC1 Volume' 10" -cset "name='MIC2 Volume' 10" -# Button Configuration -cset "name='THD for key media' 10" -cset "name='THD for key voice command' 16" -cset "name='THD for key volume up' 38" -cset "name='THD for key volume down' 115" +EnableSequence [ + # Playback TDM configuration + cset "name='DACL Channel Source' 0" + cset "name='DACR Channel Source' ${var:RightOutputChannel}" + # Input Configuration + cset "name='DMIC1 Enable Switch' off" + cset "name='DMIC2 Enable Switch' off" + cset "name='DMIC3 Enable Switch' off" + cset "name='DMIC4 Enable Switch' off" + cset "name='MIC1 Volume' 14" + cset "name='MIC2 Volume' 14" + # Button Configuration + cset "name='THD for key media' 10" + cset "name='THD for key voice command' 16" + cset "name='THD for key volume up' 38" + cset "name='THD for key volume down' 115" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/qcom-lpass/va-macro/DMIC0DisableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/qcom-lpass/va-macro/DMIC0DisableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/qcom-lpass/va-macro/DMIC0DisableSeq.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/qcom-lpass/va-macro/DMIC0DisableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,5 @@ +DisableSequence [ + cset "name='VA DMIC MUX0' ZERO" + cset "name='VA_DEC0 Volume' 0" + cset "name='VA_AIF1_CAP Mixer DEC0' 0" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/qcom-lpass/va-macro/DMIC0EnableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/qcom-lpass/va-macro/DMIC0EnableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/qcom-lpass/va-macro/DMIC0EnableSeq.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/qcom-lpass/va-macro/DMIC0EnableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,5 @@ +EnableSequence [ + cset "name='VA DMIC MUX0' DMIC0" + cset "name='VA_AIF1_CAP Mixer DEC0' 1" + cset "name='VA_DEC0 Volume' 100" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/qcom-lpass/wsa-macro/SpeakerDisableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/qcom-lpass/wsa-macro/SpeakerDisableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/qcom-lpass/wsa-macro/SpeakerDisableSeq.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/qcom-lpass/wsa-macro/SpeakerDisableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,10 @@ +DisableSequence [ + cset "name='WSA_RX0 Digital Volume' 0" + cset "name='WSA_RX1 Digital Volume' 0" + cset "name='WSA_COMP1 Switch' 0" + cset "name='WSA_COMP2 Switch' 0" + cset "name='WSA_RX0 INP0' ZERO" + cset "name='WSA_RX1 INP0' ZERO" + cset "name='WSA RX0 MUX' ZERO" + cset "name='WSA RX1 MUX' ZERO" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/qcom-lpass/wsa-macro/SpeakerEnableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/qcom-lpass/wsa-macro/SpeakerEnableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/qcom-lpass/wsa-macro/SpeakerEnableSeq.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/qcom-lpass/wsa-macro/SpeakerEnableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,10 @@ +EnableSequence [ + cset "name='WSA RX0 MUX' AIF1_PB" + cset "name='WSA RX1 MUX' AIF1_PB" + cset "name='WSA_RX0 INP0' RX0" + cset "name='WSA_RX1 INP0' RX1" + cset "name='WSA_COMP1 Switch' 1" + cset "name='WSA_COMP2 Switch' 1" + cset "name='WSA_RX0 Digital Volume' 68" + cset "name='WSA_RX1 Digital Volume' 68" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5640/DigitalMics.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5640/DigitalMics.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5640/DigitalMics.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5640/DigitalMics.conf 2021-12-17 16:53:11.000000000 +0000 @@ -1,26 +1,61 @@ SectionDevice."Mic" { Comment "Internal Digital Microphones" - ConflictingDevice [ - "Headset" - ] + If.have-headset { + Condition { + Type String + Empty "${var:HaveHeadsetMic}" + } + False { + ConflictingDevice [ + "Headset" + ] + } + } EnableSequence [ + cset "name='Stereo ADC2 Mux' ${var:StereoADC2Mux}" + cset "name='Mono ADC MIXL ADC2 Switch' on" + cset "name='Mono ADC MIXR ADC2 Switch' on" cset "name='Stereo ADC MIXL ADC2 Switch' on" cset "name='Stereo ADC MIXR ADC2 Switch' on" - cset "name='Internal Mic Switch' on" ] DisableSequence [ + cset "name='Mono ADC MIXL ADC2 Switch' off" + cset "name='Mono ADC MIXR ADC2 Switch' off" cset "name='Stereo ADC MIXL ADC2 Switch' off" cset "name='Stereo ADC MIXR ADC2 Switch' off" - cset "name='Internal Mic Switch' off" ] Value { CapturePriority 100 CapturePCM "hw:${CardId}" + If.DmicAif1 { + Condition { + Type String + String1 "${var:HaveAif}" + String2 "1" + } + True { + CaptureMixerElem "ADC" + CaptureVolume "ADC Capture Volume" + CaptureSwitch "ADC Capture Switch" + } + } + If.DmicAif2 { + Condition { + Type String + String1 "${var:HaveAif}" + String2 "2" + } + True { + CaptureMixerElem "Mono ADC" + CaptureVolume "Mono ADC Capture Volume" + CaptureSwitch "Mono ADC Capture Switch" + } + } } } diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5640/EnableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5640/EnableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5640/EnableSeq.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5640/EnableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -1,41 +1,84 @@ -# RT5640 default output routing -cset "name='OUT MIXL DAC L1 Switch' on" -cset "name='OUT MIXR DAC R1 Switch' on" - -# uncomment for loopback mic->speakers -# cset "name='SPOL MIX BST1 Switch' on" -# cset "name='SPOR MIX BST1 Switch' on" - -# uncomment for loopback playback -> capture -# cset "name='RECMIXL OUT MIXL Switch' on" -# cset "name='RECMIXR OUT MIXR Switch' on" - -# uncomment to enable swap between AIF1 and AIF2 -# warning: can only work with SSP0 firmware enabled -cset "name='SDI select' 0" -cset "name='DAI select' 0" -#cset "name='SDI select' 1" -#cset "name='DAI select' 1" - -cset "name='DAC2 Playback Switch' on" -cset "name='DIG MIXL DAC L2 Switch' on" - -# Input Configuration -cset "name='Stereo ADC1 Mux' ADC" -cset "name='Stereo ADC2 Mux' DMIC1" -cset "name='Mono ADC L1 Mux' 1" -cset "name='Mono ADC R1 Mux' 1" - -# 47=0dB, 0.375 dB/step, set it to 6 dB to help with soft mics -cset "name='ADC Capture Volume' 63" -# Set ADC Boost Gain to 3dB higher vals result in too much noise -cset "name='ADC Boost Gain' 1" -# Set IN1/IN3 internal mic boost to 8 (max) -# Set IN2 headset-mic boost to 1, headset mics are quite loud -cset "name='IN1 Boost' 8" -cset "name='IN2 Boost' 1" -cset "name='IN3 Boost' 8" - -cset "name='Internal Mic Switch' off" -cset "name='Headset Mic Switch' off" -cset "name='ADC Capture Switch' on" +EnableSequence [ + # RT5640 default output routing + cset "name='DAC MIXL INF1 Switch' on" + cset "name='DAC MIXR INF1 Switch' on" + cset "name='Stereo DAC MIXL DAC L1 Switch' on" + cset "name='Stereo DAC MIXR DAC R1 Switch' on" + cset "name='Stereo DAC MIXL DAC L2 Switch' on" + cset "name='Stereo DAC MIXR DAC R2 Switch' on" + cset "name='OUT MIXL DAC L1 Switch' on" + cset "name='OUT MIXR DAC R1 Switch' on" + cset "name='SPK MIXL DAC L1 Switch' on" + cset "name='SPK MIXR DAC R1 Switch' on" + + # uncomment for loopback mic->speakers + # cset "name='SPOL MIX BST1 Switch' on" + # cset "name='SPOR MIX BST1 Switch' on" + + # uncomment for loopback playback -> capture + # cset "name='RECMIXL OUT MIXL Switch' on" + # cset "name='RECMIXR OUT MIXR Switch' on" + + # uncomment to enable swap between AIF1 and AIF2 + # warning: can only work with SSP0 firmware enabled + cset "name='SDI select' 0" + cset "name='DAI select' 0" + #cset "name='SDI select' 1" + #cset "name='DAI select' 1" + + cset "name='DAC2 Playback Switch' on" + + # Input Configuration + cset "name='Stereo ADC1 Mux' ADC" + cset "name='ADC Capture Switch' on" + + cset "name='Mono ADC L1 Mux' ADCL" + cset "name='Mono ADC R1 Mux' ADCR" + cset "name='Mono ADC L2 Mux' DMIC L1" + cset "name='Mono ADC R2 Mux' DMIC R1" + cset "name='Mono ADC Capture Switch' on" + + # 47=0dB, 0.375 dB/step, set it to 9 dB to help with soft mics + cset "name='ADC Capture Volume' 71" + cset "name='Mono ADC Capture Volume' 71" + + # The second 'Mono ADC' path does not have a 'Boost Gain', + # set this to 0dB so that the volume of the AIF1 and AIF2 paths is equal. + cset "name='ADC Boost Gain' 0" + + # Set IN1/IN3 internal mic boost to 8 (max) + # Set IN2 headset-mic boost to 1, headset mics are quite loud + cset "name='IN1 Boost' 8" + cset "name='IN2 Boost' 1" + cset "name='IN3 Boost' 8" + + # Start with all controls which are used by the individual + # input/output Enable/DisableSequences off + + cset "name='RECMIXL BST1 Switch' off" + cset "name='RECMIXR BST1 Switch' off" + cset "name='RECMIXL BST2 Switch' off" + cset "name='RECMIXR BST2 Switch' off" + cset "name='RECMIXL BST3 Switch' off" + cset "name='RECMIXR BST3 Switch' off" + + cset "name='Stereo ADC MIXL ADC1 Switch' off" + cset "name='Stereo ADC MIXR ADC1 Switch' off" + cset "name='Stereo ADC MIXL ADC2 Switch' off" + cset "name='Stereo ADC MIXR ADC2 Switch' off" + cset "name='Mono ADC MIXL ADC1 Switch' off" + cset "name='Mono ADC MIXR ADC1 Switch' off" + cset "name='Mono ADC MIXL ADC2 Switch' off" + cset "name='Mono ADC MIXR ADC2 Switch' off" + + # Turn off playback switches by default, otherwise both Speaker + # and headphones are playing audio initially until headphones are + # re-inserted. + cset "name='HP L Playback Switch' off" + cset "name='HP R Playback Switch' off" + cset "name='Speaker L Playback Switch' off" + cset "name='Speaker R Playback Switch' off" + + cset "name='HP Playback Volume' 29" + cset "name='Speaker Playback Volume' 35" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5640/HeadPhones.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5640/HeadPhones.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5640/HeadPhones.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5640/HeadPhones.conf 2021-12-17 16:53:11.000000000 +0000 @@ -1,38 +1,53 @@ SectionDevice."Headphones" { Comment "Headphones" - ConflictingDevice [ - "Speaker" - ] + If.have-spk { + Condition { + Type String + Empty "${var:HaveSpeaker}" + } + False { + ConflictingDevice [ + "Speaker" + ] + } + } EnableSequence [ - cset "name='DAC MIXL INF1 Switch' on" - cset "name='DAC MIXR INF1 Switch' on" - cset "name='Stereo DAC MIXL DAC L1 Switch' on" - cset "name='Stereo DAC MIXR DAC R1 Switch' on" - cset "name='Stereo DAC MIXL DAC L2 Switch' on" - cset "name='Stereo DAC MIXR DAC R2 Switch' on" cset "name='HPO MIX HPVOL Switch' on" - cset "name='Headphone Switch' on" cset "name='HP Channel Switch' on" - cset "name='Speaker Switch' off" cset "name='HP L Playback Switch' on" cset "name='HP R Playback Switch' on" - cset "name='HP Playback Volume' 29" ] DisableSequence [ - cset "name='Headphone Switch' off" cset "name='HP Channel Switch' off" cset "name='HP L Playback Switch' off" cset "name='HP R Playback Switch' off" - cset "name='HP Playback Volume' 0" ] Value { PlaybackPriority 300 PlaybackPCM "hw:${CardId}" JackControl "Headphone Jack" + PlaybackMixerElem "HP" + PlaybackVolume "HP Playback Volume" + If.HpAif1 { + Condition { + Type String + String1 "${var:HaveAif}" + String2 "1" + } + True.PlaybackMasterElem "DAC1" + } + If.HpAif2 { + Condition { + Type String + String1 "${var:HaveAif}" + String2 "2" + } + True.PlaybackMasterElem "DAC2" + } } } diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5640/HeadPhones2.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5640/HeadPhones2.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5640/HeadPhones2.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5640/HeadPhones2.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,46 @@ +# The 2nd headset jack uses lineout with an external HP-amp + +SectionDevice."Headphones2" { + Comment "Headphones 2" + + ConflictingDevice [ + "Speaker" + "Headphones" + ] + + EnableSequence [ + cset "name='LOUT MIX OUTVOL L Switch' on" + cset "name='LOUT MIX OUTVOL R Switch' on" + cset "name='OUT Channel Switch' on" + ] + + DisableSequence [ + cset "name='LOUT MIX OUTVOL L Switch' off" + cset "name='LOUT MIX OUTVOL R Switch' off" + cset "name='OUT Channel Switch' off" + ] + + Value { + PlaybackPriority 400 + PlaybackPCM "hw:${CardId}" + JackControl "Line Out Jack" + PlaybackMixerElem "OUT" + PlaybackVolume "OUT Playback Volume" + If.HpAif1 { + Condition { + Type String + String1 "${var:HaveAif}" + String2 "1" + } + True.PlaybackMasterElem "DAC1" + } + If.HpAif2 { + Condition { + Type String + String1 "${var:HaveAif}" + String2 "2" + } + True.PlaybackMasterElem "DAC2" + } + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5640/HeadsetMic.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5640/HeadsetMic.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5640/HeadsetMic.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5640/HeadsetMic.conf 2021-12-17 16:53:11.000000000 +0000 @@ -1,43 +1,59 @@ SectionDevice."Headset" { Comment "Headset Microphone" - ConflictingDevice [ - "Mic" - ] + If.have-mic { + Condition { + Type String + Empty "${var:HaveInternalMic}" + } + False { + ConflictingDevice [ + "Mic" + ] + } + } EnableSequence [ - cset "name='Headset Mic Switch' on" - cset "name='RECMIXL BST2 Switch' on" cset "name='RECMIXR BST2 Switch' on" cset "name='Stereo ADC MIXL ADC1 Switch' on" cset "name='Stereo ADC MIXR ADC1 Switch' on" - cset "name='Mono ADC MIXL ADC1 Switch' on" cset "name='Mono ADC MIXR ADC1 Switch' on" - - cset "name='Mono ADC Capture Switch' on" ] DisableSequence [ cset "name='Stereo ADC MIXL ADC1 Switch' off" cset "name='Stereo ADC MIXR ADC1 Switch' off" - - cset "name='RECMIXL BST2 Switch' off" - cset "name='RECMIXR BST2 Switch' off" - - cset "name='Headset Mic Switch' off" - cset "name='Mono ADC MIXL ADC1 Switch' off" cset "name='Mono ADC MIXR ADC1 Switch' off" - cset "name='Mono ADC Capture Switch' off" + cset "name='RECMIXL BST2 Switch' off" + cset "name='RECMIXR BST2 Switch' off" ] Value { CapturePriority 200 CapturePCM "hw:${CardId}" JackControl "Headset Mic Jack" + CaptureMixerElem "IN2 Boost" + CaptureVolume "IN2 Boost" + If.HSmicAif1 { + Condition { + Type String + String1 "${var:HaveAif}" + String2 "1" + } + True.CaptureMasterElem "ADC" + } + If.HSmicAif2 { + Condition { + Type String + String1 "${var:HaveAif}" + String2 "2" + } + True.CaptureMasterElem "Mono ADC" + } } } diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5640/HeadsetMic2-IN1.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5640/HeadsetMic2-IN1.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5640/HeadsetMic2-IN1.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5640/HeadsetMic2-IN1.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,52 @@ +SectionDevice."Headset2" { + Comment "Headset Microphone 2" + + ConflictingDevice [ + "Mic" + "Headset" + ] + + EnableSequence [ + cset "name='RECMIXL BST1 Switch' on" + cset "name='RECMIXR BST1 Switch' on" + + cset "name='Stereo ADC MIXL ADC1 Switch' on" + cset "name='Stereo ADC MIXR ADC1 Switch' on" + cset "name='Mono ADC MIXL ADC1 Switch' on" + cset "name='Mono ADC MIXR ADC1 Switch' on" + ] + + DisableSequence [ + cset "name='Stereo ADC MIXL ADC1 Switch' off" + cset "name='Stereo ADC MIXR ADC1 Switch' off" + cset "name='Mono ADC MIXL ADC1 Switch' off" + cset "name='Mono ADC MIXR ADC1 Switch' off" + + cset "name='RECMIXL BST1 Switch' off" + cset "name='RECMIXR BST1 Switch' off" + ] + + Value { + CapturePriority 300 + CapturePCM "hw:${CardId}" + JackControl "Headset Mic 2 Jack" + CaptureMixerElem "IN1 Boost" + CaptureVolume "IN1 Boost" + If.In1Aif1 { + Condition { + Type String + String1 "${var:HaveAif}" + String2 "1" + } + True.CaptureMasterElem "ADC" + } + If.In1Aif2 { + Condition { + Type String + String1 "${var:HaveAif}" + String2 "2" + } + True.CaptureMasterElem "Mono ADC" + } + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5640/IN1-InternalMic.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5640/IN1-InternalMic.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5640/IN1-InternalMic.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5640/IN1-InternalMic.conf 2021-12-17 16:53:11.000000000 +0000 @@ -1,45 +1,58 @@ SectionDevice."Mic" { Comment "Internal Microphone on IN1" - ConflictingDevice [ - "Headset" - ] + If.have-headset { + Condition { + Type String + Empty "${var:HaveHeadsetMic}" + } + False { + ConflictingDevice [ + "Headset" + ] + } + } EnableSequence [ - cset "name='Internal Mic Switch' on" - cset "name='RECMIXL BST1 Switch' on" cset "name='RECMIXR BST1 Switch' on" - cset "name='RECMIXL BST3 Switch' off" - cset "name='RECMIXR BST3 Switch' off" cset "name='Stereo ADC MIXL ADC1 Switch' on" cset "name='Stereo ADC MIXR ADC1 Switch' on" - cset "name='Mono ADC MIXL ADC1 Switch' on" cset "name='Mono ADC MIXR ADC1 Switch' on" - - cset "name='Mono ADC Capture Switch' on" ] DisableSequence [ cset "name='Stereo ADC MIXL ADC1 Switch' off" cset "name='Stereo ADC MIXR ADC1 Switch' off" - - cset "name='RECMIXL BST1 Switch' off" - cset "name='RECMIXR BST1 Switch' off" - - cset "name='Internal Mic Switch' off" - cset "name='Mono ADC MIXL ADC1 Switch' off" cset "name='Mono ADC MIXR ADC1 Switch' off" - cset "name='Mono ADC Capture Switch' off" - + cset "name='RECMIXL BST1 Switch' off" + cset "name='RECMIXR BST1 Switch' off" ] Value { CapturePriority 100 CapturePCM "hw:${CardId}" + CaptureMixerElem "IN1 Boost" + CaptureVolume "IN1 Boost" + If.In1Aif1 { + Condition { + Type String + String1 "${var:HaveAif}" + String2 "1" + } + True.CaptureMasterElem "ADC" + } + If.In1Aif2 { + Condition { + Type String + String1 "${var:HaveAif}" + String2 "2" + } + True.CaptureMasterElem "Mono ADC" + } } } diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5640/IN3-InternalMic.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5640/IN3-InternalMic.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5640/IN3-InternalMic.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5640/IN3-InternalMic.conf 2021-12-17 16:53:11.000000000 +0000 @@ -1,45 +1,58 @@ SectionDevice."Mic" { Comment "Internal Microphone on IN3" - ConflictingDevice [ - "Headset" - ] + If.have-headset { + Condition { + Type String + Empty "${var:HaveHeadsetMic}" + } + False { + ConflictingDevice [ + "Headset" + ] + } + } EnableSequence [ - cset "name='Internal Mic Switch' on" - - cset "name='RECMIXL BST1 Switch' off" - cset "name='RECMIXR BST1 Switch' off" cset "name='RECMIXL BST3 Switch' on" cset "name='RECMIXR BST3 Switch' on" cset "name='Stereo ADC MIXL ADC1 Switch' on" cset "name='Stereo ADC MIXR ADC1 Switch' on" - cset "name='Mono ADC MIXL ADC1 Switch' on" cset "name='Mono ADC MIXR ADC1 Switch' on" - - cset "name='Mono ADC Capture Switch' on" - ] DisableSequence [ cset "name='Stereo ADC MIXL ADC1 Switch' off" cset "name='Stereo ADC MIXR ADC1 Switch' off" - - cset "name='RECMIXL BST3 Switch' off" - cset "name='RECMIXR BST3 Switch' off" - - cset "name='Internal Mic Switch' off" - cset "name='Mono ADC MIXL ADC1 Switch' off" cset "name='Mono ADC MIXR ADC1 Switch' off" - cset "name='Mono ADC Capture Switch' off" + cset "name='RECMIXL BST3 Switch' off" + cset "name='RECMIXR BST3 Switch' off" ] Value { CapturePriority 100 CapturePCM "hw:${CardId}" + CaptureMixerElem "IN3 Boost" + CaptureVolume "IN3 Boost" + If.In3Aif1 { + Condition { + Type String + String1 "${var:HaveAif}" + String2 "1" + } + True.CaptureMasterElem "ADC" + } + If.In3Aif2 { + Condition { + Type String + String1 "${var:HaveAif}" + String2 "2" + } + True.CaptureMasterElem "Mono ADC" + } } } diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5640/MonoSpeaker.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5640/MonoSpeaker.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5640/MonoSpeaker.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5640/MonoSpeaker.conf 2021-12-17 16:53:11.000000000 +0000 @@ -6,37 +6,42 @@ ] EnableSequence [ - cset "name='DAC MIXL INF1 Switch' on" - cset "name='DAC MIXR INF1 Switch' on" - cset "name='Stereo DAC MIXL DAC L1 Switch' on" - cset "name='Stereo DAC MIXR DAC R1 Switch' on" - cset "name='Stereo DAC MIXL DAC L2 Switch' on" - cset "name='Stereo DAC MIXR DAC R2 Switch' on" - cset "name='SPK MIXL DAC L1 Switch' on" - cset "name='SPK MIXR DAC R1 Switch' on" cset "name='SPOL MIX SPKVOL L Switch' on" # for mono speaker we apply left on right # cset "name='SPOR MIX SPKVOL R Switch' on" cset "name='SPOL MIX SPKVOL R Switch' on" - cset "name='Speaker Switch' on" cset "name='Speaker Channel Switch' on" - cset "name='Headphone Switch' off" cset "name='Speaker L Playback Switch' on" cset "name='Speaker R Playback Switch' on" - cset "name='Speaker Playback Volume' 35" ] DisableSequence [ - cset "name='Speaker Switch' off" cset "name='Speaker Channel Switch' off" cset "name='Speaker L Playback Switch' off" cset "name='Speaker R Playback Switch' off" - cset "name='Speaker Playback Volume' 0" ] Value { PlaybackPriority 100 PlaybackPCM "hw:${CardId}" + PlaybackMixerElem "Speaker" + PlaybackVolume "Speaker Playback Volume" + If.MonoSpkAif1 { + Condition { + Type String + String1 "${var:HaveAif}" + String2 "1" + } + True.PlaybackMasterElem "DAC1" + } + If.MonoSpkAif2 { + Condition { + Type String + String1 "${var:HaveAif}" + String2 "2" + } + True.PlaybackMasterElem "DAC2" + } } } diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5640/Speaker.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5640/Speaker.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5640/Speaker.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5640/Speaker.conf 2021-12-17 16:53:11.000000000 +0000 @@ -6,37 +6,42 @@ ] EnableSequence [ - cset "name='DAC MIXL INF1 Switch' on" - cset "name='DAC MIXR INF1 Switch' on" - cset "name='Stereo DAC MIXL DAC L1 Switch' on" - cset "name='Stereo DAC MIXR DAC R1 Switch' on" - cset "name='Stereo DAC MIXL DAC L2 Switch' on" - cset "name='Stereo DAC MIXR DAC R2 Switch' on" - cset "name='SPK MIXL DAC L1 Switch' on" - cset "name='SPK MIXR DAC R1 Switch' on" cset "name='SPOL MIX SPKVOL L Switch' on" cset "name='SPOR MIX SPKVOL R Switch' on" # undo MonoSpeaker mixing of right channel to left speaker cset "name='SPOL MIX SPKVOL R Switch' off" - cset "name='Speaker Switch' on" cset "name='Speaker Channel Switch' on" - cset "name='Headphone Switch' off" cset "name='Speaker L Playback Switch' on" cset "name='Speaker R Playback Switch' on" - cset "name='Speaker Playback Volume' 35" ] DisableSequence [ - cset "name='Speaker Switch' off" cset "name='Speaker Channel Switch' off" cset "name='Speaker L Playback Switch' off" cset "name='Speaker R Playback Switch' off" - cset "name='Speaker Playback Volume' 0" ] Value { PlaybackPriority 100 PlaybackPCM "hw:${CardId}" + PlaybackMixerElem "Speaker" + PlaybackVolume "Speaker Playback Volume" + If.SpkAif1 { + Condition { + Type String + String1 "${var:HaveAif}" + String2 "1" + } + True.PlaybackMasterElem "DAC1" + } + If.SpkAif2 { + Condition { + Type String + String1 "${var:HaveAif}" + String2 "2" + } + True.PlaybackMasterElem "DAC2" + } } } diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5640/init.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5640/init.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5640/init.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5640/init.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,18 @@ +LibraryConfig.remap.Config { + + ctl.default.remap { + "name='ADC Boost Gain'" "name='ADC Boost Capture Volume'" + "name='IN1 Boost'" "name='IN1 Boost Capture Volume'" + "name='IN2 Boost'" "name='IN2 Boost Capture Volume'" + "name='IN3 Boost'" "name='IN3 Boost Capture Volume'" + # Rename the 'Headphone Switch' DAPM PIN switch to avoid it getting + # grouped with 'Headphone Playback Volume' + "name='Headphone Switch'" "name='Headphone Output Switch'" + "name='HP Playback Volume'" "name='Headphone Playback Volume'" + "name='HP Channel Switch'" "name='Headphone Playback Switch'" + # Idem for the 'Speaker Switch' + "name='Speaker Switch'" "name='Speaker Output Switch'" + "name='Speaker Channel Switch'" "name='Speaker Playback Switch'" + } + +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5645/DigitalMicDisableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5645/DigitalMicDisableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5645/DigitalMicDisableSeq.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5645/DigitalMicDisableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -1,5 +1,7 @@ -cset "name='Sto1 ADC MIXL ADC2 Switch' off" -cset "name='Sto1 ADC MIXR ADC2 Switch' off" -cset "name='Mono ADC MIXL ADC2 Switch' off" -cset "name='Mono ADC MIXR ADC2 Switch' off" -cset "name='Int Mic Switch' off" +DisableSequence [ + cset "name='Sto1 ADC MIXL ADC2 Switch' off" + cset "name='Sto1 ADC MIXR ADC2 Switch' off" + cset "name='Mono ADC MIXL ADC2 Switch' off" + cset "name='Mono ADC MIXR ADC2 Switch' off" + cset "name='Int Mic Switch' off" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5645/DigitalMicEnableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5645/DigitalMicEnableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5645/DigitalMicEnableSeq.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5645/DigitalMicEnableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -1,10 +1,12 @@ -cset "name='Int Mic Switch' on" +EnableSequence [ + cset "name='Int Mic Switch' on" -cset "name='Sto1 ADC MIXL ADC1 Switch' off" -cset "name='Sto1 ADC MIXR ADC1 Switch' off" -cset "name='Sto1 ADC MIXL ADC2 Switch' on" -cset "name='Sto1 ADC MIXR ADC2 Switch' on" -cset "name='Mono ADC MIXL ADC1 Switch' off" -cset "name='Mono ADC MIXR ADC1 Switch' off" -cset "name='Mono ADC MIXL ADC2 Switch' on" -cset "name='Mono ADC MIXR ADC2 Switch' on" + cset "name='Sto1 ADC MIXL ADC1 Switch' off" + cset "name='Sto1 ADC MIXR ADC1 Switch' off" + cset "name='Sto1 ADC MIXL ADC2 Switch' on" + cset "name='Sto1 ADC MIXR ADC2 Switch' on" + cset "name='Mono ADC MIXL ADC1 Switch' off" + cset "name='Mono ADC MIXR ADC1 Switch' off" + cset "name='Mono ADC MIXL ADC2 Switch' on" + cset "name='Mono ADC MIXR ADC2 Switch' on" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5645/DisableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5645/DisableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5645/DisableSeq.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5645/DisableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -1,15 +1,17 @@ -# Disable audio output path -cset "name='codec_out1 mix 0 pcm0_in Switch' off" -cset "name='media0_out mix 0 media1_in Switch' off" +DisableSequence [ + # Disable audio output path + cset "name='codec_out1 mix 0 pcm0_in Switch' off" + cset "name='media0_out mix 0 media1_in Switch' off" -cset "name='media1_in Gain 0 Switch' off" -cset "name='pcm0_in Gain 0 Switch' off" -cset "name='codec_out1 Gain 0 Switch' off" + cset "name='media1_in Gain 0 Switch' off" + cset "name='pcm0_in Gain 0 Switch' off" + cset "name='codec_out1 Gain 0 Switch' off" -# Disable audio input path -cset "name='pcm1_out mix 0 media_loop2_in Switch' off" -cset "name='media_loop2_out mix 0 codec_in0 Switch' off" + # Disable audio input path + cset "name='pcm1_out mix 0 media_loop2_in Switch' off" + cset "name='media_loop2_out mix 0 codec_in0 Switch' off" -cset "name='media_loop2_out Gain 0 Switch' off" -cset "name='pcm1_out Gain 0 Switch' off" -cset "name='codec_in0 Gain 0 Switch' off" + cset "name='media_loop2_out Gain 0 Switch' off" + cset "name='pcm1_out Gain 0 Switch' off" + cset "name='codec_in0 Gain 0 Switch' off" +] \ No newline at end of file diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5645/EnableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5645/EnableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5645/EnableSeq.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5645/EnableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -1,46 +1,48 @@ -# Output Configuration -cset "name='DAC1 L Mux' IF1 DAC" -cset "name='DAC1 R Mux' IF1 DAC" -cset "name='DAC1 MIXL DAC1 Switch' 1" -cset "name='DAC1 MIXR DAC1 Switch' 1" -cset "name='Stereo DAC MIXL DAC L1 Switch' 1" -cset "name='Stereo DAC MIXR DAC R1 Switch' 1" +EnableSequence [ + # Output Configuration + cset "name='DAC1 L Mux' IF1 DAC" + cset "name='DAC1 R Mux' IF1 DAC" + cset "name='DAC1 MIXL DAC1 Switch' 1" + cset "name='DAC1 MIXR DAC1 Switch' 1" + cset "name='Stereo DAC MIXL DAC L1 Switch' 1" + cset "name='Stereo DAC MIXR DAC R1 Switch' 1" -cset "name='DAC L2 Mux' IF2 DAC" -cset "name='DAC R2 Mux' IF2 DAC" -cset "name='Mono DAC MIXL DAC L2 Switch' on" -cset "name='Mono DAC MIXR DAC R2 Switch' on" -cset "name='DAC2 Playback Switch' on" + cset "name='DAC L2 Mux' IF2 DAC" + cset "name='DAC R2 Mux' IF2 DAC" + cset "name='Mono DAC MIXL DAC L2 Switch' on" + cset "name='Mono DAC MIXR DAC R2 Switch' on" + cset "name='DAC2 Playback Switch' on" -cset "name='HPOVOL MIXL DAC1 Switch' on" -cset "name='HPOVOL MIXR DAC1 Switch' on" -cset "name='HPOVOL MIXL DAC2 Switch' on" -cset "name='HPOVOL MIXR DAC2 Switch' on" -cset "name='HPO MIX HPVOL Switch' on" -cset "name='HPOVOL L Switch' on" -cset "name='HPOVOL R Switch' on" + cset "name='HPOVOL MIXL DAC1 Switch' on" + cset "name='HPOVOL MIXR DAC1 Switch' on" + cset "name='HPOVOL MIXL DAC2 Switch' on" + cset "name='HPOVOL MIXR DAC2 Switch' on" + cset "name='HPO MIX HPVOL Switch' on" + cset "name='HPOVOL L Switch' on" + cset "name='HPOVOL R Switch' on" -cset "name='SPK MIXL DAC L1 Switch' on" -cset "name='SPK MIXR DAC R1 Switch' on" -cset "name='SPK MIXL DAC L2 Switch' on" -cset "name='SPK MIXR DAC R2 Switch' on" -cset "name='SPOL MIX SPKVOL L Switch' on" -cset "name='SPOR MIX SPKVOL R Switch' on" -cset "name='SPKVOL L Switch' on" -cset "name='SPKVOL R Switch' on" + cset "name='SPK MIXL DAC L1 Switch' on" + cset "name='SPK MIXR DAC R1 Switch' on" + cset "name='SPK MIXL DAC L2 Switch' on" + cset "name='SPK MIXR DAC R2 Switch' on" + cset "name='SPOL MIX SPKVOL L Switch' on" + cset "name='SPOR MIX SPKVOL R Switch' on" + cset "name='SPKVOL L Switch' on" + cset "name='SPKVOL R Switch' on" -# Input Configuration -cset "name='Stereo1 DMIC Mux' 0" -cset "name='Stereo1 ADC2 Mux' 1" -cset "name='ADC Capture Switch' on" + # Input Configuration + cset "name='Stereo1 DMIC Mux' 0" + cset "name='Stereo1 ADC2 Mux' 1" + cset "name='ADC Capture Switch' on" -# 55/63 -cset "name='ADC Capture Volume' 55" -# set ADC Boost to 0/3, higher vals cause a lot of white noise -cset "name='ADC Boost Capture Volume' 0" -# 55/63 -cset "name='Mono ADC Capture Volume' 55" -# 0/3 -cset "name='Mono ADC Boost Capture Volume' 0" -# 27/31 -cset "name='IN Capture Volume' 27" + # 55/63 + cset "name='ADC Capture Volume' 55" + # set ADC Boost to 0/3, higher vals cause a lot of white noise + cset "name='ADC Boost Capture Volume' 0" + # 55/63 + cset "name='Mono ADC Capture Volume' 55" + # 0/3 + cset "name='Mono ADC Boost Capture Volume' 0" + # 27/31 + cset "name='IN Capture Volume' 27" +] \ No newline at end of file diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5645/HSMicDisableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5645/HSMicDisableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5645/HSMicDisableSeq.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5645/HSMicDisableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -1,6 +1,8 @@ -cset "name='Headset Mic Switch' off" +DisableSequence [ + cset "name='Headset Mic Switch' off" -cset "name='RECMIXL BST1 Switch' off" -cset "name='RECMIXR BST1 Switch' off" -cset "name='Sto1 ADC MIXL ADC1 Switch' off" -cset "name='Sto1 ADC MIXR ADC1 Switch' off" + cset "name='RECMIXL BST1 Switch' off" + cset "name='RECMIXR BST1 Switch' off" + cset "name='Sto1 ADC MIXL ADC1 Switch' off" + cset "name='Sto1 ADC MIXR ADC1 Switch' off" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5645/HSMicEnableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5645/HSMicEnableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5645/HSMicEnableSeq.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5645/HSMicEnableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -1,7 +1,9 @@ -cset "name='Headset Mic Switch' on" +EnableSequence [ + cset "name='Headset Mic Switch' on" -cset "name='Sto1 ADC MIXL ADC1 Switch' on" -cset "name='Sto1 ADC MIXR ADC1 Switch' on" + cset "name='Sto1 ADC MIXL ADC1 Switch' on" + cset "name='Sto1 ADC MIXR ADC1 Switch' on" -cset "name='RECMIXL BST1 Switch' on" -cset "name='RECMIXR BST1 Switch' on" + cset "name='RECMIXL BST1 Switch' on" + cset "name='RECMIXR BST1 Switch' on" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5645/HeadphonesEnableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5645/HeadphonesEnableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5645/HeadphonesEnableSeq.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5645/HeadphonesEnableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -1,7 +1,9 @@ -cset "name='Ext Spk Switch' off" -cset "name='Speaker Channel Switch' off" +EnableSequence [ + cset "name='Ext Spk Switch' off" + cset "name='Speaker Channel Switch' off" -cset "name='Headphone Switch' on" -cset "name='Headphone Channel Switch' on" -# 25/39 higher values cause crackling on some boards -cset "name='Headphone Playback Volume' 25" + cset "name='Headphone Switch' on" + cset "name='Headphone Channel Switch' on" + # 25/39 higher values cause crackling on some boards + cset "name='Headphone Playback Volume' 25" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5645/SpeakerEnableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5645/SpeakerEnableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5645/SpeakerEnableSeq.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5645/SpeakerEnableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -1,6 +1,8 @@ -cset "name='Headphone Switch' off" -cset "name='Headphone Channel Switch' off" +EnableSequence [ + cset "name='Headphone Switch' off" + cset "name='Headphone Channel Switch' off" -cset "name='Ext Spk Switch' on" -cset "name='Speaker Channel Switch' on" -cset "name='Speaker Playback Volume' 31" + cset "name='Ext Spk Switch' on" + cset "name='Speaker Channel Switch' on" + cset "name='Speaker Playback Volume' 31" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5645/init.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5645/init.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5645/init.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5645/init.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,10 @@ +LibraryConfig.remap.Config { + + ctl.default.remap { + "name='IN1 Boost'" "name='IN1 Boost Capture Volume'" + "name='IN2 Boost'" "name='IN2 Boost Capture Volume'" + "name='Headphone Channel Switch'" "name='Headphone Playback Switch'" + "name='Speaker Channel Switch'" "name='Speaker Playback Switch'" + } + +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5651/DigitalMic.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5651/DigitalMic.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5651/DigitalMic.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5651/DigitalMic.conf 2021-12-17 16:53:11.000000000 +0000 @@ -4,12 +4,14 @@ EnableSequence [ cset "name='Stereo1 ADC MIXL ADC2 Switch' on" cset "name='Stereo1 ADC MIXR ADC2 Switch' on" + cset "name='DMIC ASRC Switch' on" cset "name='Internal Mic Switch' on" ] DisableSequence [ cset "name='Stereo1 ADC MIXL ADC2 Switch' off" cset "name='Stereo1 ADC MIXR ADC2 Switch' off" + cset "name='DMIC ASRC Switch' off" cset "name='Internal Mic Switch' off" ] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5651/EnableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5651/EnableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5651/EnableSeq.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5651/EnableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -1,56 +1,59 @@ -# default state -cset "name='HPO MIX DAC1 Switch' on" -cset "name='HPO MIX HPVOL Switch' off" -cset "name='HPO L Playback Switch' off" -cset "name='HPO R Playback Switch' off" -cset "name='HPOVOL L Switch' on" -cset "name='HPOVOL R Switch' on" -cset "name='LOUT MIX DAC L1 Switch' on" -cset "name='LOUT MIX DAC R1 Switch' on" -cset "name='IF1 ASRC Switch' on" -cset "name='LOUT L Playback Switch' off" -cset "name='LOUT R Playback Switch' off" -cset "name='Stereo DAC MIXL DAC L1 Switch' on" -cset "name='Stereo DAC MIXL DAC R1 Switch' off" -cset "name='Stereo DAC MIXR DAC L1 Switch' off" -cset "name='Stereo DAC MIXR DAC R1 Switch' on" -cset "name='Stereo1 ADC MIXL ADC1 Switch' off" -cset "name='Stereo1 ADC MIXR ADC1 Switch' off" -cset "name='Stereo1 ADC MIXL ADC2 Switch' off" -cset "name='Stereo1 ADC MIXR ADC2 Switch' off" -cset "name='Stereo2 ADC MIXL ADC1 Switch' off" -cset "name='Stereo2 ADC MIXR ADC1 Switch' off" -cset "name='Stereo2 ADC MIXL ADC2 Switch' off" -cset "name='Stereo2 ADC MIXR ADC2 Switch' off" -cset "name='Headphone Switch' off" -cset "name='Speaker Switch' off" +EnableSequence [ -# volumes -cset "name='OUT Playback Volume' 31" -cset "name='HP Playback Volume' 31" -cset "name='DAC1 Playback Volume' 175" -cset "name='IN Capture Volume' 23" -# 47=0dB, 0.375 dB/step, set it to 6 dB to help with soft mics -cset "name='ADC Capture Volume' 63" -cset "name='ADC Capture Switch' on" -# Set ADC Boost Gain to 3dB higher vals result in too much noise -cset "name='ADC Boost Gain' 1" -# Set IN1, IN2 and IN3 internal mic boost to 1 -cset "name='IN1 Boost' 1" -cset "name='IN2 Boost' 1" -cset "name='IN3 Boost' 1" + # default state + cset "name='HPO MIX DAC1 Switch' on" + cset "name='HPO MIX HPVOL Switch' off" + cset "name='HPO L Playback Switch' off" + cset "name='HPO R Playback Switch' off" + cset "name='HPOVOL L Switch' on" + cset "name='HPOVOL R Switch' on" + cset "name='LOUT MIX DAC L1 Switch' on" + cset "name='LOUT MIX DAC R1 Switch' on" + cset "name='IF1 ASRC Switch' on" + cset "name='LOUT L Playback Switch' off" + cset "name='LOUT R Playback Switch' off" + cset "name='Stereo DAC MIXL DAC L1 Switch' on" + cset "name='Stereo DAC MIXL DAC R1 Switch' off" + cset "name='Stereo DAC MIXR DAC L1 Switch' off" + cset "name='Stereo DAC MIXR DAC R1 Switch' on" + cset "name='Stereo1 ADC MIXL ADC1 Switch' off" + cset "name='Stereo1 ADC MIXR ADC1 Switch' off" + cset "name='Stereo1 ADC MIXL ADC2 Switch' off" + cset "name='Stereo1 ADC MIXR ADC2 Switch' off" + cset "name='Stereo2 ADC MIXL ADC1 Switch' off" + cset "name='Stereo2 ADC MIXR ADC1 Switch' off" + cset "name='Stereo2 ADC MIXL ADC2 Switch' off" + cset "name='Stereo2 ADC MIXR ADC2 Switch' off" + cset "name='Headphone Switch' off" + cset "name='Speaker Switch' off" -# input -cset "name='Stereo1 ADC L1 Mux' ADC" -cset "name='Stereo1 ADC R1 Mux' ADC" -cset "name='Stereo1 ADC L2 Mux' DMIC" -cset "name='Stereo1 ADC R2 Mux' DMIC" -cset "name='RECMIXL BST1 Switch' off" -cset "name='RECMIXR BST1 Switch' off" -cset "name='RECMIXL BST3 Switch' off" -cset "name='RECMIXR BST3 Switch' off" -cset "name='RECMIXL BST2 Switch' off" -cset "name='RECMIXR BST2 Switch' off" -cset "name='Headset Mic Switch' off" -cset "name='Internal Mic Switch' off" -cset "name='Line In Switch' off" + # volumes + cset "name='OUT Playback Volume' 31" + cset "name='HP Playback Volume' 31" + cset "name='DAC1 Playback Volume' 175" + cset "name='IN Capture Volume' 23" + # 47=0dB, 0.375 dB/step, set it to 6 dB to help with soft mics + cset "name='ADC Capture Volume' 63" + cset "name='ADC Capture Switch' on" + # Set ADC Boost Gain to 3dB higher vals result in too much noise + cset "name='ADC Boost Gain' 1" + # Set IN1, IN2 and IN3 internal mic boost to 1 + cset "name='IN1 Boost' 1" + cset "name='IN2 Boost' 1" + cset "name='IN3 Boost' 1" + + # input + cset "name='Stereo1 ADC L1 Mux' ADC" + cset "name='Stereo1 ADC R1 Mux' ADC" + cset "name='Stereo1 ADC L2 Mux' DMIC" + cset "name='Stereo1 ADC R2 Mux' DMIC" + cset "name='RECMIXL BST1 Switch' off" + cset "name='RECMIXR BST1 Switch' off" + cset "name='RECMIXL BST3 Switch' off" + cset "name='RECMIXR BST3 Switch' off" + cset "name='RECMIXL BST2 Switch' off" + cset "name='RECMIXR BST2 Switch' off" + cset "name='Headset Mic Switch' off" + cset "name='Internal Mic Switch' off" + cset "name='Line In Switch' off" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5651/HeadPhones.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5651/HeadPhones.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5651/HeadPhones.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5651/HeadPhones.conf 2021-12-17 16:53:11.000000000 +0000 @@ -15,12 +15,12 @@ cset "name='LOUT R Playback Switch' off" ] - DisableSequence [ + # DisableSequence [ # This is done by the Speaker EnableSequence, so that the # Platform Clock and BIAS do not temporarily get turned off # as that breaks audio-streams which are playing when # switching between Speaker/Headphone - ] + # ] Value { PlaybackPriority 200 diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5651/Speaker.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5651/Speaker.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5651/Speaker.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5651/Speaker.conf 2021-12-17 16:53:11.000000000 +0000 @@ -15,12 +15,12 @@ cset "name='HPO R Playback Switch' off" ] - DisableSequence [ + # DisableSequence [ # This is done by the Headphones EnableSequence, so that the # Platform Clock and BIAS do not temporarily get turned off # as that breaks audio-streams which are playing when # switching between Speaker/Headphone - ] + # ] Value { PlaybackPriority 100 diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5651/init.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5651/init.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5651/init.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5651/init.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,11 @@ +LibraryConfig.remap.Config { + + ctl.default.remap { + "name='ADC Boost Gain'" "name='ADC Boost Capture Volume'" + "name='IN1 Boost'" "name='IN1 Boost Capture Volume'" + "name='IN2 Boost'" "name='IN2 Boost Capture Volume'" + "name='IN3 Boost'" "name='IN3 Boost Capture Volume'" + "name='HP Playback Volume'" "name='Headphone Playback Volume'" + } + +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5672/DMIC1.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5672/DMIC1.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5672/DMIC1.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5672/DMIC1.conf 2021-12-17 16:53:11.000000000 +0000 @@ -23,5 +23,10 @@ Value { CapturePriority 100 CapturePCM "hw:${CardId}" + # The DMIC ofcourse has no analog volume controls + # Use the digital ADC master control as MixerElem + CaptureMixerElem "ADC" + CaptureVolume "ADC Capture Volume" + CaptureSwitch "ADC Capture Switch" } } diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5672/DMIC2.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5672/DMIC2.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5672/DMIC2.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5672/DMIC2.conf 2021-12-17 16:53:11.000000000 +0000 @@ -23,5 +23,10 @@ Value { CapturePriority 200 CapturePCM "hw:${CardId}" + # The DMIC ofcourse has no analog volume controls + # Use the digital ADC master control as MixerElem + CaptureMixerElem "ADC" + CaptureVolume "ADC Capture Volume" + CaptureSwitch "ADC Capture Switch" } } diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5672/EnableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5672/EnableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5672/EnableSeq.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5672/EnableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -1,48 +1,54 @@ -# Playback (I2S1) +EnableSequence [ + # Playback (I2S1) -# common -cset "name='DAC1 L Mux' IF1 DAC" -cset "name='DAC1 R Mux' IF1 DAC" -cset "name='DAC1 MIXL DAC1 Switch' on" -cset "name='DAC1 MIXR DAC1 Switch' on" -cset "name='Stereo DAC MIXL DAC L1 Switch' on" -cset "name='Stereo DAC MIXL DAC R1 Switch' off" -cset "name='Stereo DAC MIXR DAC R1 Switch' on" -cset "name='Stereo DAC MIXR DAC L1 Switch' off" - -# speaker -cset "name='PDM1 L Mux' Stereo DAC" -cset "name='PDM1 R Mux' Stereo DAC" - -# headphone -cset "name='HPOVOL MIXL DAC1 Switch' on" -cset "name='HPOVOL MIXR DAC1 Switch' on" -cset "name='HPO MIX HPVOL Switch' on" - -# line out -# cset "name='OUT MIXL DAC L1 Switch' on" -# cset "name='OUT MIXR DAC R1 Switch' on" -# cset "name='LOUT MIX OUTMIX L Switch' on" -# cset "name='LOUT MIX OUTMIX R Switch' on" - -# 47=0dB, 0.375 dB/step -cset "name='ADC Capture Volume' 47" -cset "name='ADC Capture Switch' on" - -# Headset mic is quite soft, boost it a bit, 1 = 20dB which is the first -# available boost step -cset "name='IN1 Boost Volume' 1" - -# Start with all outputs / inputs disabled -cset "name='Ext Spk Switch' off" -cset "name='Headphone Switch' off" -cset "name='Int Mic Switch' off" -cset "name='Headset Mic Switch' off" -cset "name='Sto1 ADC MIXL ADC1 Switch' off" -cset "name='Sto1 ADC MIXR ADC1 Switch' off" -cset "name='Sto1 ADC MIXL ADC2 Switch' off" -cset "name='Sto1 ADC MIXR ADC2 Switch' off" -cset "name='RECMIXL BST1 Switch' off" -cset "name='RECMIXR BST1 Switch' off" -cset "name='RECMIXL BST2 Switch' off" -cset "name='RECMIXR BST2 Switch' off" + # common + cset "name='DAC1 L Mux' IF1 DAC" + cset "name='DAC1 R Mux' IF1 DAC" + cset "name='DAC1 MIXL DAC1 Switch' on" + cset "name='DAC1 MIXR DAC1 Switch' on" + cset "name='Stereo DAC MIXL DAC L1 Switch' on" + cset "name='Stereo DAC MIXL DAC R1 Switch' off" + cset "name='Stereo DAC MIXR DAC R1 Switch' on" + cset "name='Stereo DAC MIXR DAC L1 Switch' off" + + # speaker + cset "name='PDM1 L Mux' Stereo DAC" + cset "name='PDM1 R Mux' Stereo DAC" + + # headphone + cset "name='HPOVOL MIXL DAC1 Switch' on" + cset "name='HPOVOL MIXR DAC1 Switch' on" + cset "name='HPO MIX HPVOL Switch' on" + + # line out + # cset "name='OUT MIXL DAC L1 Switch' on" + # cset "name='OUT MIXR DAC R1 Switch' on" + # cset "name='LOUT MIX OUTMIX L Switch' on" + # cset "name='LOUT MIX OUTMIX R Switch' on" + + # Both the DMICs and the headset mic (even with the 20dB boost below) + # are quite soft, set the default capture volume to +12dB + # 47=0dB, 0.375dB/step, 79=+12dB + cset "name='ADC Capture Volume' 79" + cset "name='ADC Capture Switch' on" + # 0=0dB + cset "name='STO1 ADC Boost Gain Volume' 0" + + # Headset mic is quite soft, boost it a bit, 1 = 20dB which is the first + # available boost step + cset "name='IN1 Boost Volume' 1" + + # Start with all outputs / inputs disabled + cset "name='Ext Spk Switch' off" + cset "name='Headphone Switch' off" + cset "name='Int Mic Switch' off" + cset "name='Headset Mic Switch' off" + cset "name='Sto1 ADC MIXL ADC1 Switch' off" + cset "name='Sto1 ADC MIXR ADC1 Switch' off" + cset "name='Sto1 ADC MIXL ADC2 Switch' off" + cset "name='Sto1 ADC MIXR ADC2 Switch' off" + cset "name='RECMIXL BST1 Switch' off" + cset "name='RECMIXR BST1 Switch' off" + cset "name='RECMIXL BST2 Switch' off" + cset "name='RECMIXR BST2 Switch' off" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5672/HeadPhones.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5672/HeadPhones.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5672/HeadPhones.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5672/HeadPhones.conf 2021-12-17 16:53:11.000000000 +0000 @@ -18,5 +18,8 @@ PlaybackPriority 300 PlaybackPCM "hw:${CardId}" JackControl "Headphone Jack" + PlaybackMixerElem "HP" + PlaybackMasterElem "DAC1" + PlaybackVolume "HP Playback Volume" } } diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5672/HeadsetMic.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5672/HeadsetMic.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5672/HeadsetMic.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5672/HeadsetMic.conf 2021-12-17 16:53:11.000000000 +0000 @@ -12,11 +12,6 @@ cset "name='RECMIXR BST1 Switch' on" cset "name='Sto1 ADC MIXL ADC1 Switch' on" cset "name='Sto1 ADC MIXR ADC1 Switch' on" - # For unknown reasons the headset mic sound is only recorded - # on the left channel, we tweak the data-stream reception to - # use the left samples for both slots, so that we get a stereo - # stream with the mic sound on both channels - cset "name='codec_in rx deinterleaver codec_in0_1' 1" ] DisableSequence [ @@ -25,13 +20,14 @@ cset "name='RECMIXR BST1 Switch' off" cset "name='Sto1 ADC MIXL ADC1 Switch' off" cset "name='Sto1 ADC MIXR ADC1 Switch' off" - # Undo data-stream reception mono-mix workaround - cset "name='codec_in rx deinterleaver codec_in0_1' 2" ] Value { CapturePriority 300 CapturePCM "hw:${CardId}" JackControl "Headset Mic Jack" + CaptureMixerElem "IN1 Boost" + CaptureMasterElem "ADC" + CaptureVolume "IN1 Boost Volume" } } diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5672/MonoSpeaker.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5672/MonoSpeaker.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5672/MonoSpeaker.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5672/MonoSpeaker.conf 2021-12-17 16:53:11.000000000 +0000 @@ -21,5 +21,10 @@ Value { PlaybackPriority 100 PlaybackPCM "hw:${CardId}" + # The speaker ampl. path on the 5672 has no speaker vol control + # Use the digital DAC1 master control as MixerElem + PlaybackMixerElem "DAC1" + PlaybackVolume "DAC1 Playback Volume" + PlaybackSwitch "DAC1 Playback Switch" } } diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5672/Speaker.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5672/Speaker.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5672/Speaker.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5672/Speaker.conf 2021-12-17 16:53:11.000000000 +0000 @@ -17,5 +17,10 @@ Value { PlaybackPriority 200 PlaybackPCM "hw:${CardId}" + # The speaker ampl. path on the 5672 has no speaker vol control + # Use the digital DAC1 master control as MixerElem + PlaybackMixerElem "DAC1" + PlaybackVolume "DAC1 Playback Volume" + PlaybackSwitch "DAC1 Playback Switch" } } diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt5682/init.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5682/init.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt5682/init.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt5682/init.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,24 @@ +# RT5682 specific volume control settings + +LibraryConfig.remap.Config { + + ctl.default.remap { + "name='STO1 ADC Boost Gain Volume'" "name='STO1 ADC Boost Capture Volume'" + } + +} + +BootSequence [ + cset "name='rt5682 Stereo1 DAC MIXL DAC L1 Switch' 1" + cset "name='rt5682 Stereo1 DAC MIXR DAC R1 Switch' 1" + cset "name='rt5682 DAC L Mux' 1" + cset "name='rt5682 DAC R Mux' 1" + cset "name='rt5682 IF1 01 ADC Swap Mux' 2" + cset "name='rt5682 CBJ Boost Volume' 3" + cset "name='rt5682 Stereo1 ADC L Mux' 0" + cset "name='rt5682 Stereo1 ADC R Mux' 0" + cset "name='rt5682 Stereo1 ADC L1 Mux' 1" + cset "name='rt5682 Stereo1 ADC R1 Mux' 1" + cset "name='rt5682 Stereo1 ADC MIXL ADC2 Switch' 0" + cset "name='rt5682 Stereo1 ADC MIXR ADC2 Switch' 0" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt700/init.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt700/init.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt700/init.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt700/init.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,9 @@ +# RT700 specific volume control settings + +BootSequence [ + cset "name='DAC Front Playback Volume' 87" + cset "name='HPO Mux' 'Front'" + cset "name='ADC 09 Capture Volume' 63" + cset "name='ADC 22 Mux' 'MIC2'" + cset "name='AMIC Volume' 1" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt711/init.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt711/init.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt711/init.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt711/init.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,9 @@ +# RT711 specific volume control settings + +BootSequence [ + cset "name='rt711 DAC Surr Playback Volume' 87" + cset "name='rt711 ADC 08 Capture Volume' 63" + cset "name='rt711 ADC 23 Mux' 'MIC2'" + cset "name='rt711 ADC 08 Capture Switch' 1" + cset "name='rt711 AMIC Volume' 1" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt711-sdca/init.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt711-sdca/init.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt711-sdca/init.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt711-sdca/init.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,8 @@ +# RT711-sdca specific volume control settings + +BootSequence [ + cset "name='rt711 FU05 Playback Volume' 87" + cset "name='rt711 ADC 22 Mux' 'MIC2'" + cset "name='rt711 FU0F Capture Volume' 57" + cset "name='rt711 FU0F Capture Switch' 1" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt715/init.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt715/init.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt715/init.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt715/init.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,31 @@ +# RT715 specific volume control settings + +BootSequence [ + cset "name='rt715 DMIC3 Boost' 2" + cset "name='rt715 DMIC4 Boost' 2" + cset "name='rt715 ADC 24 Mux' 3" + cset "name='rt715 ADC 25 Mux' 4" +] + +If.adcxx { + Condition { + Type ControlExists + Control "name='rt715 ADC 07 Capture Switch'" + } + True.BootSequence [ + cset "name='rt715 ADC 27 Capture Switch' 1" + cset "name='rt715 ADC 07 Capture Switch' 1" + cset "name='rt715 ADC 07 Capture Volume' 58" + ] +} + +If.capturesw { + Condition { + Type ControlExists + Control "name='rt715 Capture Switch'" + } + True.FixedBootSequence [ + exec "-/sbin/modprobe snd_ctl_led" + sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:rt715 Capture Switch" + ] +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/rt715-sdca/init.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt715-sdca/init.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/rt715-sdca/init.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/rt715-sdca/init.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,14 @@ +# RT715-sdca (aka RT714) specific volume control settings + +BootSequence [ + cset "name='rt714 FU0A Capture Switch' 0" + cset "name='rt714 ADC 22 Mux' 'DMIC3'" + cset "name='rt714 ADC 23 Mux' 'DMIC4'" + cset "name='rt714 FU02 Capture Switch' 1" + cset "name='rt714 FU02 Capture Volume' 124" +] + +FixedBootSequence [ + exec "-/sbin/modprobe snd_ctl_led" + sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:rt714 FU02 Capture Switch" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/wcd934x/DefaultDisableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/wcd934x/DefaultDisableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/wcd934x/DefaultDisableSeq.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/wcd934x/DefaultDisableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,7 @@ +DisableSequence [ + cset "name='RX INT7_1 MIX1 INP0' ZERO" + cset "name='RX INT8_1 MIX1 INP0' ZERO" + cset "name='RX INT1_2 MUX' ZERO" + cset "name='RX INT2_2 MUX' ZERO" + cset "name='CDC_IF TX0 MUX' ZERO" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/wcd934x/DefaultEnableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/wcd934x/DefaultEnableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/wcd934x/DefaultEnableSeq.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/wcd934x/DefaultEnableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,16 @@ +EnableSequence [ + cset "name='SLIM RX1 MUX' AIF1_PB" + cset "name='SLIM RX2 MUX' AIF1_PB" + cset "name='SLIM RX6 MUX' ZERO" + cset "name='SLIM RX7 MUX' ZERO" + cset "name='SLIM RX3 MUX' ZERO" + cset "name='SLIM RX4 MUX' ZERO" + cset "name='SLIM RX5 MUX' ZERO" + cset "name='AIF1_CAP Mixer SLIM TX0' 1" + + cset "name='RX INT7_1 MIX1 INP0' RX1" + cset "name='RX INT8_1 MIX1 INP0' RX2" + cset "name='RX INT1_2 MUX' RX1" + cset "name='RX INT2_2 MUX' RX2" + cset "name='CDC_IF TX0 MUX' DEC0" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/wcd934x/HeadphoneDisableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/wcd934x/HeadphoneDisableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/wcd934x/HeadphoneDisableSeq.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/wcd934x/HeadphoneDisableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,6 @@ +cset "name='COMP1 Switch' 0" +cset "name='COMP2 Switch' 0" +cset "name='RX1 Digital Volume' 0" +cset "name='RX2 Digital Volume' 0" +cset "name='RX INT1 DEM MUX' ZERO" +cset "name='RX INT2 DEM MUX' ZERO" diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/wcd934x/HeadphoneEnableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/wcd934x/HeadphoneEnableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/wcd934x/HeadphoneEnableSeq.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/wcd934x/HeadphoneEnableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,6 @@ +cset "name='COMP1 Switch' 1" +cset "name='COMP2 Switch' 1" +cset "name='RX INT1 DEM MUX' CLSH_DSM_OUT" +cset "name='RX INT2 DEM MUX' CLSH_DSM_OUT" +cset "name='RX1 Digital Volume' 68" +cset "name='RX2 Digital Volume' 68" diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/wcd934x/HeadphoneMicDisableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/wcd934x/HeadphoneMicDisableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/wcd934x/HeadphoneMicDisableSeq.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/wcd934x/HeadphoneMicDisableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,2 @@ +cset "name='AMIC MUX0' ZERO" +cset "name='ADC2 Volume' 0" diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/wcd934x/HeadphoneMicEnableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/wcd934x/HeadphoneMicEnableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/wcd934x/HeadphoneMicEnableSeq.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/wcd934x/HeadphoneMicEnableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,3 @@ +cset "name='AMIC MUX0' ADC2" +cset "name='ADC2 Volume' 12" +cset "name='ADC MUX0' AMIC" diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/wcd934x/SpeakerDisableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/wcd934x/SpeakerDisableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/wcd934x/SpeakerDisableSeq.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/wcd934x/SpeakerDisableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,6 @@ +DisableSequence [ + cset "name='RX7 Digital Volume' 0" + cset "name='RX8 Digital Volume' 0" + cset "name='COMP7 Switch' 0" + cset "name='COMP8 Switch' 0" +] \ No newline at end of file diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/wcd934x/SpeakerEnableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/wcd934x/SpeakerEnableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/wcd934x/SpeakerEnableSeq.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/wcd934x/SpeakerEnableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,6 @@ +EnableSequence [ + cset "name='COMP7 Switch' 1" + cset "name='COMP8 Switch' 1" + cset "name='RX7 Digital Volume' 80" + cset "name='RX8 Digital Volume' 80" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/wm5102/EnableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/wm5102/EnableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/wm5102/EnableSeq.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/wm5102/EnableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,16 @@ +EnableSequence [ + # Route AIF1 to the speakers and headphones + cset "name='SPKOUTL Input 1' AIF1RX1" + cset "name='SPKOUTR Input 1' AIF1RX2" + cset "name='HPOUT1L Input 1' AIF1RX1" + cset "name='HPOUT1R Input 1' AIF1RX2" + + # Both mics are quite soft by default, boost then + cset "name='IN1L Volume' 28" + cset "name='IN3L Volume' 28" + + cset "name='Headphone Switch' off" + cset "name='Headset Mic Switch' off" + cset "name='Internal Mic Switch' off" + cset "name='Speaker Switch' off" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/wm5102/HeadPhones.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/wm5102/HeadPhones.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/wm5102/HeadPhones.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/wm5102/HeadPhones.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,23 @@ +SectionDevice."Headphones" { + Comment "Headphones" + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + JackControl "Headphone Jack" + } + + ConflictingDevice [ + "Speaker" + ] + + EnableSequence [ + cset "name='HPOUT1 Digital Switch' on" + cset "name='Headphone Switch' on" + ] + + DisableSequence [ + cset "name='HPOUT1 Digital Switch' off" + cset "name='Headphone Switch' off" + ] +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/wm5102/IN1-HeadsetMic.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/wm5102/IN1-HeadsetMic.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/wm5102/IN1-HeadsetMic.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/wm5102/IN1-HeadsetMic.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,24 @@ +SectionDevice."Headset" { + Comment "Headset Microphone" + + ConflictingDevice [ + "Mic" + ] + + EnableSequence [ + cset "name='AIF1TX1 Input 1' IN1L" + cset "name='AIF1TX2 Input 1' IN1L" + + cset "name='Headset Mic Switch' on" + ] + + DisableSequence [ + cset "name='Headset Mic Switch' off" + ] + + Value { + CapturePriority 200 + CapturePCM "hw:${CardId}" + JackControl "Headset Mic Jack" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/wm5102/IN3-InternalMic.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/wm5102/IN3-InternalMic.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/wm5102/IN3-InternalMic.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/wm5102/IN3-InternalMic.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,23 @@ +SectionDevice."Mic" { + Comment "Internal Microphone" + + ConflictingDevice [ + "Headset" + ] + + EnableSequence [ + cset "name='AIF1TX1 Input 1' IN3L" + cset "name='AIF1TX2 Input 1' IN3L" + + cset "name='Internal Mic Switch' on" + ] + + DisableSequence [ + cset "name='Internal Mic Switch' off" + ] + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId}" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/wm5102/Speaker.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/wm5102/Speaker.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/wm5102/Speaker.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/wm5102/Speaker.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,22 @@ +SectionDevice."Speaker" { + Comment "Speakers" + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + } + + ConflictingDevice [ + "Headphones" + ] + + EnableSequence [ + cset "name='Speaker Digital Switch' on" + cset "name='Speaker Switch' on" + ] + + DisableSequence [ + cset "name='Speaker Digital Switch' off" + cset "name='Speaker Switch' off" + ] +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/wsa881x/DefaultEnableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/wsa881x/DefaultEnableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/wsa881x/DefaultEnableSeq.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/wsa881x/DefaultEnableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,10 @@ +EnableSequence [ + cset "name='SpkrLeft COMP Switch' 1" + cset "name='SpkrLeft BOOST Switch' 1" + cset "name='SpkrLeft DAC Switch' 1" + cset "name='SpkrLeft VISENSE Switch' 0" + cset "name='SpkrRight COMP Switch' 1" + cset "name='SpkrRight BOOST Switch' 1" + cset "name='SpkrRight DAC Switch' 1" + cset "name='SpkrRight VISENSE Switch' 0" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/wsa881x/SpeakerDisableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/wsa881x/SpeakerDisableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/wsa881x/SpeakerDisableSeq.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/wsa881x/SpeakerDisableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,10 @@ +DisableSequence [ + cset "name='SpkrLeft COMP Switch' 0" + cset "name='SpkrLeft BOOST Switch' 0" + cset "name='SpkrLeft DAC Switch' 0" + cset "name='SpkrLeft VISENSE Switch' 0" + cset "name='SpkrRight COMP Switch' 0" + cset "name='SpkrRight BOOST Switch' 0" + cset "name='SpkrRight DAC Switch' 0" + cset "name='SpkrRight VISENSE Switch' 0" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/codecs/wsa881x/SpeakerEnableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/codecs/wsa881x/SpeakerEnableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/codecs/wsa881x/SpeakerEnableSeq.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/codecs/wsa881x/SpeakerEnableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,12 @@ +EnableSequence [ + cset "name='SpkrLeft COMP Switch' 1" + cset "name='SpkrLeft BOOST Switch' 1" + cset "name='SpkrLeft DAC Switch' 1" + cset "name='SpkrLeft VISENSE Switch' 0" + cset "name='SpkrLeft PA Volume' 12" + cset "name='SpkrRight COMP Switch' 1" + cset "name='SpkrRight BOOST Switch' 1" + cset "name='SpkrRight DAC Switch' 1" + cset "name='SpkrRight VISENSE Switch' 0" + cset "name='SpkrRight PA Volume' 12" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/common/linked-card.conf alsa-ucm-conf-1.2.6.3/ucm2/common/linked-card.conf --- alsa-ucm-conf-1.2.2/ucm2/common/linked-card.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/common/linked-card.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,3 @@ +Syntax 3 + +Include.linked.File "/common/linked.conf" diff -Nru alsa-ucm-conf-1.2.2/ucm2/common/linked.conf alsa-ucm-conf-1.2.6.3/ucm2/common/linked.conf --- alsa-ucm-conf-1.2.2/ucm2/common/linked.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/common/linked.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,3 @@ +ValueDefaults { + Linked 1 +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/DB410c/DB410c.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/DB410c/DB410c.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/DB410c/DB410c.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/DB410c/DB410c.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,10 @@ +Syntax 3 + +SectionUseCase."HiFi" { + File "/Qualcomm/apq8016-sbc/HiFi.conf" + Comment "Play HiFi quality Music" +} +SectionUseCase."HDMI" { + File "/Qualcomm/apq8016-sbc/HDMI.conf" + Comment "HDMI output" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/DB820c/DB820c.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/DB820c/DB820c.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/DB820c/DB820c.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/DB820c/DB820c.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,11 @@ +Syntax 2 + +SectionUseCase."HiFi" { + File "/Qualcomm/apq8096/HiFi.conf" + Comment "HiFi quality Music" +} + +SectionUseCase."HDMI" { + File "/Qualcomm/apq8096/HDMI.conf" + Comment "HDMI output" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/HDA-Intel/HDA-Intel.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/HDA-Intel/HDA-Intel.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/HDA-Intel/HDA-Intel.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/HDA-Intel/HDA-Intel.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,62 @@ +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.DeviceMic "Mic" + +If.dualcodec { + Condition { + Type String + Haystack "${CardLongName}" + Needle "DualCodecs" + } + True { + Define.Done y + Define.AcpCardId "" + Include.dual.File "/HDA/DualCodecs/DualCodecs.conf" + } +} + +If.acp { + Condition { + Type String + Empty "${var:AcpCardId}" + } + False { + Define.Use y + Define.DeviceMic "Mic2" + } +} + +If.use { + Condition { + Type String + Empty "${var:Use}" + } + False { + Define.Done y + + SectionUseCase."HiFi" { + File "/HDA/HiFi.conf" + Comment "Play HiFi quality Music" + } + + 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" + ] + } +} + +If.err { + Condition { + Type String + Empty "${var:Done}" + } + True.Error "UCM is not supported for this HDA model (${CardLongName})" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/SC7180/sc7180-rt5682-max98357a-1mic.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/SC7180/sc7180-rt5682-max98357a-1mic.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/SC7180/sc7180-rt5682-max98357a-1mic.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/SC7180/sc7180-rt5682-max98357a-1mic.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,11 @@ +Comment "SC7180 RT5682 MAX98357A single microphone sound card" +Syntax 4 + +SectionUseCase."HiFi" { + File "/Qualcomm/sc7180/rt5682-max98357a/HiFi.conf" + Comment "Default" +} + +Include.card-init.File "/lib/card-init.conf" +Include.ctl-remap.File "/lib/ctl-remap.conf" +Include.init.File "/Qualcomm/sc7180/rt5682-max98357a/init.conf" diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/SOF/SOF.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/SOF/SOF.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/SOF/SOF.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/SOF/SOF.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,9 @@ +Syntax 4 + +SectionUseCase."HiFi" { + File "/Intel/SOF/HiFi.conf" + Comment "Play HiFi quality Music" +} + +Include.card-init.File "/lib/card-init.conf" +Include.ctl-remap.File "/lib/ctl-remap.conf" diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/USB-Audio/USB-Audio.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/USB-Audio/USB-Audio.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/USB-Audio/USB-Audio.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/USB-Audio/USB-Audio.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,101 @@ +Syntax 4 + +Define.ProfileName "" + +If.linked { + Condition { + Type RegexMatch + String "${CardComponents}" + # Aorus Master Front Headphone 0414:a000 + Regex "USB0414:a000" + } + True.Define.ProfileName "../common/linked" +} + +If.realtek-alc1220-vb { + + Condition { + Type RegexMatch + String "${CardComponents}" + # 0414:a002 Gigabyte TRX40 Aorus Pro WiFi + # 0b05:1917 ASUS ROG Strix + # 0b05:1918 ASUS PRIME TRX40 PRO-S + # 0db0:0d64 MSI TRX40 Creator + # 0db0:543d MSI TRX40 + # 26ce:0a01 Asrock TRX40 Creator + Regex "USB((0414:a002)|(0b05:191[78])|(0db0:(0d64|543d))|(26ce:0a01))" + } + True.Define.ProfileName "Realtek/ALC1220-VB-Desktop" +} + +If.gigabyte-aorus-main { + Condition { + Type String + Haystack "${CardComponents}" + Needle "USB0414:a001" + } + True.Define.ProfileName "Gigabyte/Aorus-Master-Main-Audio" +} + +If.dell-wd15 { + Condition { + Type RegexMatch + String "${CardComponents}" + Regex "USB0bda:40(14|2e)" + } + True.Define.ProfileName "Dell/WD15-Dock" +} + +If.dell-desktop-front { + Condition { + Type String + Haystack "${CardComponents}" + Needle "USB0bda:4c54" + } + True.Define.ProfileName "Dell/Desktop-Front" +} + +If.dell-desktop-rear { + Condition { + Type String + Haystack "${CardComponents}" + Needle "USB0bda:4c55" + } + True.Define.ProfileName "Dell/Desktop-Rear" +} + +If.goxlr { + Condition { + Type RegexMatch + String "${CardComponents}" + Regex "USB1220:8fe[04]" + } + True.Define.ProfileName "GoXLR/GoXLR" +} + +If.lenovo-p620-rear { + Condition { + Type String + Haystack "${CardComponents}" + Needle "USB17aa:1046" + } + True.Define.ProfileName "Lenovo/ThinkStation-P620-Rear" +} + +If.lenovo-p620-main { + Condition { + Type String + Haystack "${CardComponents}" + Needle "USB17aa:104d" + } + True.Define.ProfileName "Lenovo/ThinkStation-P620-Main" +} + +If.inc { + Condition { + Type String + Empty "${var:ProfileName}" + } + True.Error "UCM is not supported for this USB device (${CardLongName} @ ${CardComponents})" + False.Include.prof.File "/USB-Audio/${var:ProfileName}.conf" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/acp/acp.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/acp/acp.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/acp/acp.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/acp/acp.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,3 @@ +Syntax 3 + +Include.linked.File "/common/linked.conf" diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/bdw-rt5677/bdw-rt5677.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/bdw-rt5677/bdw-rt5677.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/bdw-rt5677/bdw-rt5677.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/bdw-rt5677/bdw-rt5677.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,9 @@ +Syntax 4 + +SectionUseCase."HiFi" { + File "/Intel/bdw-rt5677/HiFi.conf" + Comment "Default" +} + +Include.card-init.File "/lib/card-init.conf" +Include.ctl-remap.File "/lib/ctl-remap.conf" diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/broadwell-rt286/broadwell-rt286.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/broadwell-rt286/broadwell-rt286.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/broadwell-rt286/broadwell-rt286.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/broadwell-rt286/broadwell-rt286.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,6 @@ +Syntax 2 + +SectionUseCase."HiFi" { + File "/Intel/broadwell-rt286/HiFi.conf" + Comment "Play HiFi quality Music" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/broxton-rt298/broxton-rt298.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/broxton-rt298/broxton-rt298.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/broxton-rt298/broxton-rt298.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/broxton-rt298/broxton-rt298.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,41 @@ +# UCM for Intel Broxton platforms +# For Audio in I2S mode + +Syntax 3 + +SectionUseCase."HiFi" { + File "/Intel/broxton-rt298/HiFi.conf" + Comment "Play and record HiFi quality Music" +} + +SectionDefaults [ + cset "name='Headphone Jack Switch' 1" + cset "name='Speaker Switch' 1" + cset "name='Speaker Playback Switch' 0,0" + cset "name='Front DAC Switch' 1" + cset "name='Front RECMIX Switch' 0" + cset "name='Mic Jack Switch' 1" + cset "name='ADC 0 Mux' 2" + cset "name='ADC 1 Mux' 0" + cset "name='DAC0 Playback Volume' 100,100" + cset "name='HPO L Switch' 0" + cset "name='HPO Mux' 0" + cset "name='HPO R Switch' 0" + cset "name='Pin 5 Mux' 1" + cset "name='Pin 6 Mux' 2" + cset "name='Pin 7 Mux' 3" + cset "name='RECMIX Beep Switch' 0" + cset "name='RECMIX Line1 Switch' 0" + cset "name='RECMIX Mic1 Switch' 0" + cset "name='SPK Mux' 0" + cset "name='SPO Switch' 1" + cset "name='codec0_out mo codec0_in mi Switch' 0" + cset "name='codec0_out mo dmic01_hifi_in mi Switch' 0" + cset "name='codec0_out mo media0_in mi Switch' 1" + cset "name='codec1_out mo codec0_in mi Switch' 0" + cset "name='codec1_out mo dmic01_hifi_in mi Switch' 0" + cset "name='codec1_out mo media0_in mi Switch' 0" + cset "name='media0_out mo codec0_in mi Switch' 1" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + cset "name='media0_out mo media0_in mi Switch' 0" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/bytcht-cx2072x/bytcht-cx2072x.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/bytcht-cx2072x/bytcht-cx2072x.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/bytcht-cx2072x/bytcht-cx2072x.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/bytcht-cx2072x/bytcht-cx2072x.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,6 @@ +Syntax 3 + +SectionUseCase."HiFi" { + File "/Intel/bytcht-cx2072x/HiFi.conf" + Comment "Play HiFi quality Music" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/bytcht-es8316/bytcht-es8316.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/bytcht-es8316/bytcht-es8316.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/bytcht-es8316/bytcht-es8316.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/bytcht-es8316/bytcht-es8316.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,6 @@ +Syntax 3 + +SectionUseCase."HiFi" { + File "/Intel/bytcht-es8316/HiFi.conf" + Comment "Play HiFi quality Music" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/bytcr-rt5640/bytcr-rt5640.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/bytcr-rt5640/bytcr-rt5640.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/bytcr-rt5640/bytcr-rt5640.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/bytcr-rt5640/bytcr-rt5640.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,16 @@ +Syntax 4 + +SectionUseCase."HiFi" { + File "/Intel/bytcr-rt5640/HiFi.conf" + Comment "Play HiFi quality Music" +} + +Include.card-init.File "/lib/card-init.conf" +Include.ctl-remap.File "/lib/ctl-remap.conf" +Include.codec-init.File "/codecs/rt5640/init.conf" + +FixedBootSequence [ + exec "-/sbin/modprobe snd_ctl_led" + sysw "-/class/sound/ctl-led/speaker/card${CardNumber}/attach:Speaker Channel Switch" + sysw "-/class/sound/ctl-led/speaker/card${CardNumber}/attach:HP Channel Switch" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/bytcr-rt5651/bytcr-rt5651.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/bytcr-rt5651/bytcr-rt5651.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/bytcr-rt5651/bytcr-rt5651.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/bytcr-rt5651/bytcr-rt5651.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,12 @@ +# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 + +Syntax 4 + +SectionUseCase."HiFi" { + File "/Intel/bytcr-rt5651/HiFi.conf" + Comment "Play HiFi quality Music" +} + +Include.card-init.File "/lib/card-init.conf" +Include.ctl-remap.File "/lib/ctl-remap.conf" +Include.codec-init.File "/codecs/rt5651/init.conf" diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/bytcr-wm5102/bytcr-wm5102.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/bytcr-wm5102/bytcr-wm5102.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/bytcr-wm5102/bytcr-wm5102.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/bytcr-wm5102/bytcr-wm5102.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,6 @@ +Syntax 3 + +SectionUseCase."HiFi" { + File "/Intel/bytcr-wm5102/HiFi.conf" + Comment "Play HiFi quality Music" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/cht-bsw-rt5672/cht-bsw-rt5672.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/cht-bsw-rt5672/cht-bsw-rt5672.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/cht-bsw-rt5672/cht-bsw-rt5672.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/cht-bsw-rt5672/cht-bsw-rt5672.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,14 @@ +# Adapted from https://github.com/plbossart/UCM/tree/master/cht-bsw-rt5672 + +Syntax 3 + +SectionUseCase."HiFi" { + File "/Intel/cht-bsw-rt5672/HiFi.conf" + Comment "Play HiFi quality Music" +} + +FixedBootSequence [ + exec "-/sbin/modprobe snd_ctl_led" + sysw "-/class/sound/ctl-led/speaker/card${CardNumber}/attach:DAC1 Playback Switch" + sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:ADC Capture Switch" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/chtmax98090/chtmax98090.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/chtmax98090/chtmax98090.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/chtmax98090/chtmax98090.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/chtmax98090/chtmax98090.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,5 @@ +Syntax 3 +SectionUseCase."HiFi" { + File "/Intel/chtmax98090/HiFi.conf" + Comment "Play HiFi quality Music" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/chtnau8824/chtnau8824.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/chtnau8824/chtnau8824.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/chtnau8824/chtnau8824.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/chtnau8824/chtnau8824.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,8 @@ +Syntax 3 + +Comment "chtnau8824 internal card" + +SectionUseCase."HiFi" { + File "/Intel/chtnau8824/HiFi.conf" + Comment "Default" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/chtrt5645/chtrt5645.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/chtrt5645/chtrt5645.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/chtrt5645/chtrt5645.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/chtrt5645/chtrt5645.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,11 @@ +Syntax 4 +Comment "Intel SoC Audio Device" + +SectionUseCase."HiFi" { + File "/Intel/chtrt5645/HiFi.conf" + Comment "Default" +} + +Include.card-init.File "/lib/card-init.conf" +Include.ctl-remap.File "/lib/ctl-remap.conf" +Include.codec-init.File "/codecs/rt5645/init.conf" diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/chtrt5650/chtrt5650.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/chtrt5650/chtrt5650.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/chtrt5650/chtrt5650.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/chtrt5650/chtrt5650.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,6 @@ +Comment "Intel SoC Audio Device" +Syntax 3 +SectionUseCase."HiFi" { + File "/Intel/chtrt5650/HiFi.conf" + Comment "Default" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/hda-dsp/hda-dsp.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/hda-dsp/hda-dsp.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/hda-dsp/hda-dsp.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/hda-dsp/hda-dsp.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,16 @@ +# UCM for Intel CAVS platforms +# For Audio in HDA and DMIC mode + +Syntax 3 + +SectionUseCase."HiFi" { + File "/Intel/hda-dsp/HiFi.conf" + Comment "Play HiFi quality Music" +} + +SectionDefaults [ + cset "name='Master Playback Switch' 1" + cset "name='codec0_out mo media0_in mi Switch' 1" + cset "name='media0_out mo codec0_in mi Switch' 1" + cset "name='mch_cap_out mo mch_cap_in mi Switch' 1" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/kblrt5660/kblrt5660.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/kblrt5660/kblrt5660.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/kblrt5660/kblrt5660.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/kblrt5660/kblrt5660.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,19 @@ +Syntax 4 + +SectionUseCase."HiFi" { + File "/Intel/kblrt5660/HiFi.conf" + Comment "Play HiFi quality Music" +} + +SectionUseCase."Hdmi1" { + File "/Intel/kblrt5660/Hdmi1.conf" + Comment "Play on Hdmi/DP 1" +} + +SectionUseCase."Hdmi2" { + File "/Intel/kblrt5660/Hdmi2.conf" + Comment "Play on Hdmi/DP 2" +} + +Include.card-init.File "/lib/card-init.conf" +Include.ctl-remap.File "/lib/ctl-remap.conf" diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/mtk-rt5650/mtk-rt5650.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/mtk-rt5650/mtk-rt5650.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/mtk-rt5650/mtk-rt5650.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/mtk-rt5650/mtk-rt5650.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,12 @@ +Comment "ALC5650 sound card on MediaTek SoC" +Syntax 4 + +SectionUseCase."HiFi" { + File "/MediaTek/mtk-rt5650/HiFi.conf" + Comment "Default" +} + +Include.card-init.File "/lib/card-init.conf" +Include.ctl-remap.File "/lib/ctl-remap.conf" +Include.codec-init.File "/codecs/rt5645/init.conf" +Include.init.File "/MediaTek/mtk-rt5650/init.conf" diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/rockchip_es8316/rockchip_es8316.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/rockchip_es8316/rockchip_es8316.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/rockchip_es8316/rockchip_es8316.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/rockchip_es8316/rockchip_es8316.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,29 @@ +Syntax 3 + +SectionUseCase."HiFi" { + File "/Rockchip/es8316/HiFi.conf" + Comment "Play HiFi quality Music" +} + +BootSequence [ + # Disable all outputs + cset "name='Speaker Switch' off" + + # Set HP vol to 0 dB (3/3) + cset "name='Headphone Playback Volume' 3" + # Set HP mixer vol to 0 dB + cset "name='Headphone Mixer Volume' 11" + # Set DAC vol to 0 dB (192/192) + cset "name='DAC Playback Volume' 192" + + # Disable Auto Level Control + cset "name='ALC Capture Switch' off" + # Set ADC vol to 0 dB (192/192) + cset "name='ADC Capture Volume' 192" + # Set Mic amplifier to +16 dB + cset "name='ADC PGA Gain Volume' 7" + + # Setup muxes / switches + cset "name='Left Headphone Mixer Left DAC Switch' on" + cset "name='Right Headphone Mixer Right DAC Switch' on" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/sdm845/DB845c.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/sdm845/DB845c.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/sdm845/DB845c.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/sdm845/DB845c.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,11 @@ +Syntax 3 + +SectionUseCase."HiFi" { + File "/Qualcomm/sdm845/HiFi.conf" + Comment "HiFi quality Music." +} + +SectionUseCase."HDMI" { + File "/Qualcomm/sdm845/HDMI.conf" + Comment "HDMI output." +} diff -Nru "/tmp/tmpgj5lswvs/UstkJCzJCi/alsa-ucm-conf-1.2.2/ucm2/conf.d/simple-card/Librem 5 Devkit.conf" "/tmp/tmpgj5lswvs/vgYrAb4sHi/alsa-ucm-conf-1.2.6.3/ucm2/conf.d/simple-card/Librem 5 Devkit.conf" --- "/tmp/tmpgj5lswvs/UstkJCzJCi/alsa-ucm-conf-1.2.2/ucm2/conf.d/simple-card/Librem 5 Devkit.conf" 1970-01-01 00:00:00.000000000 +0000 +++ "/tmp/tmpgj5lswvs/vgYrAb4sHi/alsa-ucm-conf-1.2.6.3/ucm2/conf.d/simple-card/Librem 5 Devkit.conf" 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,5 @@ +Syntax 2 + +SectionUseCase."HiFi" { + File "HiFi.conf" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/skylake-rt286/skylake-rt286.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/skylake-rt286/skylake-rt286.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/skylake-rt286/skylake-rt286.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/skylake-rt286/skylake-rt286.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,44 @@ +# UCM for Intel SKYLAKE/KABYLAKE platforms +# For Audio in I2S mode + +Syntax 3 + +SectionUseCase."HiFi" { + File "/Intel/skylake-rt286/HiFi.conf" + Comment "Play and record HiFi quality Music" +} + +SectionDefaults [ + cset "name='Headphone Jack Switch' 1" + cset "name='Speaker Switch' 1" + cset "name='Speaker Playback Switch' 0,0" + cset "name='Front DAC Switch' 1" + cset "name='Front RECMIX Switch' 0" + cset "name='Mic Jack Switch' 1" + cset "name='ADC 0 Mux' 2" + cset "name='ADC 1 Mux' 0" + cset "name='ADC0 Capture Volume' 105,105" + cset "name='ADC0 Capture Switch' 1,1" + cset "name='AMIC Volume' 3" + cset "name='DAC0 Playback Volume' 100,100" + cset "name='HPO L Switch' 0" + cset "name='HPO Mux' 0" + cset "name='HPO R Switch' 0" + cset "name='Pin 5 Mux' 1" + cset "name='Pin 6 Mux' 2" + cset "name='Pin 7 Mux' 3" + cset "name='RECMIX Beep Switch' 0" + cset "name='RECMIX Line1 Switch' 0" + cset "name='RECMIX Mic1 Switch' 0" + cset "name='SPK Mux' 0" + cset "name='SPO Switch' 1" + cset "name='codec0_out mo codec0_in mi Switch' 0" + cset "name='codec0_out mo dmic01_hifi_in mi Switch' 0" + cset "name='codec0_out mo media0_in mi Switch' 1" + cset "name='codec1_out mo codec0_in mi Switch' 0" + cset "name='codec1_out mo dmic01_hifi_in mi Switch' 0" + cset "name='codec1_out mo media0_in mi Switch' 0" + cset "name='media0_out mo codec0_in mi Switch' 1" + cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" + cset "name='media0_out mo media0_in mi Switch' 0" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,11 @@ +Syntax 3 + +SectionUseCase."HiFi" { + File "/Qualcomm/sm8250/HiFi.conf" + Comment "HiFi quality Music." +} + +SectionUseCase."HDMI" { + File "/Qualcomm/sm8250/HDMI.conf" + Comment "HDMI output." +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/sof-ehl-rt5660/sof-ehl-rt5660.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/sof-ehl-rt5660/sof-ehl-rt5660.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/sof-ehl-rt5660/sof-ehl-rt5660.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/sof-ehl-rt5660/sof-ehl-rt5660.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,19 @@ +# UCM for Intel ElkhartLake platforms +# For Audio in I2S mode + +Syntax 3 + +SectionUseCase."HiFi" { + File "/Intel/sof-ehl-rt5660/HiFi.conf" + Comment "Play and record HiFi quality Music" +} + +SectionDefaults [ + cset "name='DAC1 MIXL DAC1 Switch' on" + cset "name='DAC1 MIXR DAC1 Switch' on" + cset "name='Stereo DAC MIXL DAC L1 Switch' on" + cset "name='Stereo DAC MIXR DAC R1 Switch' on" + cset "name='LOUT MIX DAC Switch' on" + cset "name='RECMIXL BST2 Switch' on" + cset "name='RECMIXR BST2 Switch' on" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/sof-hda-dsp/sof-hda-dsp.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/sof-hda-dsp/sof-hda-dsp.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/sof-hda-dsp/sof-hda-dsp.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/sof-hda-dsp/sof-hda-dsp.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,89 @@ +Syntax 4 + +Define.DeviceMic "Mic" +Define.DeviceDmic "" + +If.dmic { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-dmics:" + } + True.Define.DeviceDmic "Mic1" + True.Define.DeviceMic "Mic2" +} + +SectionUseCase."HiFi" { + File "/Intel/sof-hda-dsp/HiFi.conf" + Comment "Play HiFi quality Music" +} + +# the kcontrols initial values, which will be set by `alsactl init` + +If.amute { + Condition { + Type ControlExists + Control "name='Auto-Mute Mode'" + } + True.BootSequence [ + cset "name='Auto-Mute Mode' off" + ] +} + +If.master { + Condition { + Type ControlExists + Control "name='Master Playback Volume'" + } + True.BootSequence [ + cset "name='Master Playback Volume' 60%" + cset "name='Master Playback Switch' on" + ] +} + +If.speaker { + Condition { + Type ControlExists + Control "name='Speaker Playback Volume'" + } + True.BootSequence [ + cset "name='Speaker Playback Volume' 60%" + ] +} + +If.headphone { + Condition { + Type ControlExists + Control "name='Headphone Playback Volume'" + } + True.BootSequence [ + cset "name='Headphone Playback Volume' 60%" + ] +} + +If.dmic { + Condition { + Type String + Empty "${var:DeviceDmic}" + } + False.If.Dmic0 { + Condition { + Type ControlExists + Control "name='Dmic0 Capture Volume'" + } + True.BootSequence [ + cset "name='Dmic0 Capture Volume' 70%" + ] + } +} + +If.Capture { + Condition { + Type ControlExists + Control "name='Capture Switch'" + } + True.BootSequence [ + cset "name='Capture Volume' 60%" + cset "name='Capture Switch' on" + ] +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/sof-hda-dsp/sof-skl_hda_card.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/sof-hda-dsp/sof-skl_hda_card.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/sof-hda-dsp/sof-skl_hda_card.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/sof-hda-dsp/sof-skl_hda_card.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,89 @@ +Syntax 4 + +Define.DeviceMic "Mic" +Define.DeviceDmic "" + +If.dmic { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-dmics:" + } + True.Define.DeviceDmic "Mic1" + True.Define.DeviceMic "Mic2" +} + +SectionUseCase."HiFi" { + File "/Intel/sof-hda-dsp/HiFi.conf" + Comment "Play HiFi quality Music" +} + +# the kcontrols initial values, which will be set by `alsactl init` + +If.amute { + Condition { + Type ControlExists + Control "name='Auto-Mute Mode'" + } + True.BootSequence [ + cset "name='Auto-Mute Mode' off" + ] +} + +If.master { + Condition { + Type ControlExists + Control "name='Master Playback Volume'" + } + True.BootSequence [ + cset "name='Master Playback Volume' 60%" + cset "name='Master Playback Switch' on" + ] +} + +If.speaker { + Condition { + Type ControlExists + Control "name='Speaker Playback Volume'" + } + True.BootSequence [ + cset "name='Speaker Playback Volume' 60%" + ] +} + +If.headphone { + Condition { + Type ControlExists + Control "name='Headphone Playback Volume'" + } + True.BootSequence [ + cset "name='Headphone Playback Volume' 60%" + ] +} + +If.dmic { + Condition { + Type String + Empty "${var:DeviceDmic}" + } + False.If.Dmic0 { + Condition { + Type ControlExists + Control "name='Dmic0 Capture Volume'" + } + True.BootSequence [ + cset "name='Dmic0 Capture Volume' 70%" + ] + } +} + +If.Capture { + Condition { + Type ControlExists + Control "name='Capture Switch'" + } + True.BootSequence [ + cset "name='Capture Volume' 60%" + cset "name='Capture Switch' on" + ] +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/sof-skl_hda_card/sof-hda-dsp.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/sof-skl_hda_card/sof-hda-dsp.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/sof-skl_hda_card/sof-hda-dsp.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/sof-skl_hda_card/sof-hda-dsp.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,89 @@ +Syntax 4 + +Define.DeviceMic "Mic" +Define.DeviceDmic "" + +If.dmic { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-dmics:" + } + True.Define.DeviceDmic "Mic1" + True.Define.DeviceMic "Mic2" +} + +SectionUseCase."HiFi" { + File "/Intel/sof-hda-dsp/HiFi.conf" + Comment "Play HiFi quality Music" +} + +# the kcontrols initial values, which will be set by `alsactl init` + +If.amute { + Condition { + Type ControlExists + Control "name='Auto-Mute Mode'" + } + True.BootSequence [ + cset "name='Auto-Mute Mode' off" + ] +} + +If.master { + Condition { + Type ControlExists + Control "name='Master Playback Volume'" + } + True.BootSequence [ + cset "name='Master Playback Volume' 60%" + cset "name='Master Playback Switch' on" + ] +} + +If.speaker { + Condition { + Type ControlExists + Control "name='Speaker Playback Volume'" + } + True.BootSequence [ + cset "name='Speaker Playback Volume' 60%" + ] +} + +If.headphone { + Condition { + Type ControlExists + Control "name='Headphone Playback Volume'" + } + True.BootSequence [ + cset "name='Headphone Playback Volume' 60%" + ] +} + +If.dmic { + Condition { + Type String + Empty "${var:DeviceDmic}" + } + False.If.Dmic0 { + Condition { + Type ControlExists + Control "name='Dmic0 Capture Volume'" + } + True.BootSequence [ + cset "name='Dmic0 Capture Volume' 70%" + ] + } +} + +If.Capture { + Condition { + Type ControlExists + Control "name='Capture Switch'" + } + True.BootSequence [ + cset "name='Capture Volume' 60%" + cset "name='Capture Switch' on" + ] +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/sof-skl_hda_card/sof-skl_hda_card.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/sof-skl_hda_card/sof-skl_hda_card.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/sof-skl_hda_card/sof-skl_hda_card.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/sof-skl_hda_card/sof-skl_hda_card.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,89 @@ +Syntax 4 + +Define.DeviceMic "Mic" +Define.DeviceDmic "" + +If.dmic { + Condition { + Type String + Haystack "${CardComponents}" + Needle "cfg-dmics:" + } + True.Define.DeviceDmic "Mic1" + True.Define.DeviceMic "Mic2" +} + +SectionUseCase."HiFi" { + File "/Intel/sof-hda-dsp/HiFi.conf" + Comment "Play HiFi quality Music" +} + +# the kcontrols initial values, which will be set by `alsactl init` + +If.amute { + Condition { + Type ControlExists + Control "name='Auto-Mute Mode'" + } + True.BootSequence [ + cset "name='Auto-Mute Mode' off" + ] +} + +If.master { + Condition { + Type ControlExists + Control "name='Master Playback Volume'" + } + True.BootSequence [ + cset "name='Master Playback Volume' 60%" + cset "name='Master Playback Switch' on" + ] +} + +If.speaker { + Condition { + Type ControlExists + Control "name='Speaker Playback Volume'" + } + True.BootSequence [ + cset "name='Speaker Playback Volume' 60%" + ] +} + +If.headphone { + Condition { + Type ControlExists + Control "name='Headphone Playback Volume'" + } + True.BootSequence [ + cset "name='Headphone Playback Volume' 60%" + ] +} + +If.dmic { + Condition { + Type String + Empty "${var:DeviceDmic}" + } + False.If.Dmic0 { + Condition { + Type ControlExists + Control "name='Dmic0 Capture Volume'" + } + True.BootSequence [ + cset "name='Dmic0 Capture Volume' 70%" + ] + } +} + +If.Capture { + Condition { + Type ControlExists + Control "name='Capture Switch'" + } + True.BootSequence [ + cset "name='Capture Volume' 60%" + cset "name='Capture Switch' on" + ] +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/sof-soundwire/sof-soundwire.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/sof-soundwire/sof-soundwire.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/sof-soundwire/sof-soundwire.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/sof-soundwire/sof-soundwire.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,63 @@ +Syntax 4 + +SectionUseCase."HiFi" { + File "/sof-soundwire/HiFi.conf" + Comment "Play HiFi quality Music" +} + +Include.card-init.File "/lib/card-init.conf" +Include.ctl-remap.File "/lib/ctl-remap.conf" + +Define { + SpeakerCodec1 "" + SpeakerChannels1 "2" + SpeakerAmps1 "0" + HeadsetCodec1 "" + MicCodec1 "" + Mics1 "0" +} + +DefineRegex { + SpeakerCodec { + Regex " spk:([a-z0-9]+(-sdca)?)" + String "${CardComponents}" + } + SpeakerChannels { + Regex " cfg-spk:([0-9]+)" + String "${CardComponents}" + } + SpeakerAmps { + Regex " cfg-amp:([0-9]+)" + String "${CardComponents}" + } + HeadsetCodec { + Regex " hs:([a-z0-9]+(-sdca)?)" + String "${CardComponents}" + } + MicCodec { + Regex " mic:([a-z0-9]+(-sdca)?)" + String "${CardComponents}" + } + Mics { + Regex " cfg-mics:([1-9][0-9]*)" + String "${CardComponents}" + } +} + +If.hs_init { + Condition { + Type RegexMatch + Regex "(rt5682|rt700|rt711(-sdca)?)" + String "${var:HeadsetCodec1}" + } + True.Include.hs_init.File "/codecs/${var:HeadsetCodec1}/init.conf" +} + +If.mic_init { + Condition { + Type RegexMatch + Regex "(rt715(-sdca)?)" + String "${var:MicCodec1}" + } + True.Include.mic_init.File "/codecs/${var:MicCodec1}/init.conf" +} diff -Nru "/tmp/tmpgj5lswvs/UstkJCzJCi/alsa-ucm-conf-1.2.2/ucm2/conf.d/tegra/ASUS Google Nexus 7 ALC5642.conf" "/tmp/tmpgj5lswvs/vgYrAb4sHi/alsa-ucm-conf-1.2.6.3/ucm2/conf.d/tegra/ASUS Google Nexus 7 ALC5642.conf" --- "/tmp/tmpgj5lswvs/UstkJCzJCi/alsa-ucm-conf-1.2.2/ucm2/conf.d/tegra/ASUS Google Nexus 7 ALC5642.conf" 1970-01-01 00:00:00.000000000 +0000 +++ "/tmp/tmpgj5lswvs/vgYrAb4sHi/alsa-ucm-conf-1.2.6.3/ucm2/conf.d/tegra/ASUS Google Nexus 7 ALC5642.conf" 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,8 @@ +# Use case Configuration for ASUS Google Nexus 7 (2012) + +Syntax 4 + +SectionUseCase."HiFi" { + File "/Tegra/rt5640/Google-Nexus-7-HiFi.conf" + Comment "Play HiFi quality Music" +} diff -Nru "/tmp/tmpgj5lswvs/UstkJCzJCi/alsa-ucm-conf-1.2.2/ucm2/conf.d/tegra/Acer Iconia Tab A500 WM8903.conf" "/tmp/tmpgj5lswvs/vgYrAb4sHi/alsa-ucm-conf-1.2.6.3/ucm2/conf.d/tegra/Acer Iconia Tab A500 WM8903.conf" --- "/tmp/tmpgj5lswvs/UstkJCzJCi/alsa-ucm-conf-1.2.2/ucm2/conf.d/tegra/Acer Iconia Tab A500 WM8903.conf" 1970-01-01 00:00:00.000000000 +0000 +++ "/tmp/tmpgj5lswvs/vgYrAb4sHi/alsa-ucm-conf-1.2.6.3/ucm2/conf.d/tegra/Acer Iconia Tab A500 WM8903.conf" 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,8 @@ +# Use case Configuration for Acer Iconia Tab A500 + +Syntax 4 + +SectionUseCase."HiFi" { + File "/Tegra/wm8903/Acer-A500-HiFi.conf" + Comment "Play HiFi quality Music" +} diff -Nru "/tmp/tmpgj5lswvs/UstkJCzJCi/alsa-ucm-conf-1.2.2/ucm2/conf.d/tegra/Compal PAZ00.conf" "/tmp/tmpgj5lswvs/vgYrAb4sHi/alsa-ucm-conf-1.2.6.3/ucm2/conf.d/tegra/Compal PAZ00.conf" --- "/tmp/tmpgj5lswvs/UstkJCzJCi/alsa-ucm-conf-1.2.2/ucm2/conf.d/tegra/Compal PAZ00.conf" 1970-01-01 00:00:00.000000000 +0000 +++ "/tmp/tmpgj5lswvs/vgYrAb4sHi/alsa-ucm-conf-1.2.6.3/ucm2/conf.d/tegra/Compal PAZ00.conf" 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,44 @@ +Syntax 2 + +Comment "PAZ00 alc5632" + +BootSequence [ + cset "name='Master Playback Switch' on" + cset "name='Master Playback Volume' 44,44" + cset "name='Headphone Playback Volume' 21,21" + cset "name='Speaker Playback Volume' 21,21" + cset "name='SpeakerOut Mux' 2" + cset "name='SpeakerOut N Mux' LN/-R" + cset "name='AB-D Amp Mux' 0" + cset "name='Left Headphone Mux' 1" + cset "name='Right Headphone Mux' 1" + cset "name='DMIC Boost Capture Volume' 4" + cset "name='Rec Capture Volume' 24" + + # Fix external mic record volumes + cset "name='Mic 1 Boost Volume' 0" + cset "name='Mic 2 Boost Volume' 0" + cset "name='Mic1 Playback Volume' 0" + cset "name='Mic2 Playback Volume' 0" + cset "name='Rec Capture Volume' 0" + + # Enable internal speaker + cset "name='Speaker Playback Switch' on" + cset "name='Int Spk Switch' on" + cset "name='Speaker Mix DAC2SPK Playback Switch' on" + + # Enable DMIC + cset "name='DMICL Mix DMICL2ADC Capture Switch' on" + cset "name='DMIC En Capture Switch' on" + cset "name='DMIC PreFilter Capture Switch' on" +] + +SectionUseCase."HiFi" { + File "/Tegra/alc5632/HiFi.conf" + Comment "Music playback" +} + +SectionUseCase."Record" { + File "/Tegra/alc5632/Record.conf" + Comment "Playback and capture" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/tegra/GoogleNyanBig.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/tegra/GoogleNyanBig.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/tegra/GoogleNyanBig.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/tegra/GoogleNyanBig.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,6 @@ +Syntax 2 +Comment "Nyan internal card" +SectionUseCase."HiFi" { + File "/Tegra/max98090/HiFi.conf" + Comment "Default" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/tegra/GoogleNyanBlaze.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/tegra/GoogleNyanBlaze.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/tegra/GoogleNyanBlaze.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/tegra/GoogleNyanBlaze.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,6 @@ +Syntax 2 +Comment "Nyan internal card" +SectionUseCase."HiFi" { + File "/Tegra/max98090/HiFi.conf" + Comment "Default" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/conf.d/tegra-hda/tegra-hda.conf alsa-ucm-conf-1.2.6.3/ucm2/conf.d/tegra-hda/tegra-hda.conf --- alsa-ucm-conf-1.2.2/ucm2/conf.d/tegra-hda/tegra-hda.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/conf.d/tegra-hda/tegra-hda.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,8 @@ +# UCM for Nvidia Tegra30 HDMI Audio + +Syntax 4 + +SectionUseCase."HiFi" { + File "/Tegra/tegra-hda/tegra-hda-HiFi.conf" + Comment "Play HiFi quality Music" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/kblrt5660/Hdmi1.conf alsa-ucm-conf-1.2.6.3/ucm2/kblrt5660/Hdmi1.conf --- alsa-ucm-conf-1.2.2/ucm2/kblrt5660/Hdmi1.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/kblrt5660/Hdmi1.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -# Usecase for device HDMI1/Display Port stereo playback on Intel KABYLAKE platforms -# For Audio in I2S mode - -SectionDevice."HDMI1" { - Comment "HDMI/Display Port 1 Stereo" - - Value { - PlaybackPriority 200 - PlaybackPCM "hw:${CardId},2" - If.1 { - Condition { - Type ControlExists - Control "iface=CARD,name='HDMI/DP,pcm=4 Jack'" - } - True { - JackControl "HDMI/DP,pcm=4 Jack" - } - False { - JackControl "HDMI/DP, pcm=4 Jack" - } - } - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/kblrt5660/Hdmi2.conf alsa-ucm-conf-1.2.6.3/ucm2/kblrt5660/Hdmi2.conf --- alsa-ucm-conf-1.2.2/ucm2/kblrt5660/Hdmi2.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/kblrt5660/Hdmi2.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -# Usecase for device HDMI1/Display Port stereo playback on Intel KABYLAKE platforms -# For Audio in I2S mode - -SectionDevice."HDMI2" { - Comment "HDMI/Display Port 2 Stereo" - - Value { - PlaybackPriority 300 - PlaybackPCM "hw:${CardId},3" - If.1 { - Condition { - Type ControlExists - Control "iface=CARD,name='HDMI/DP,pcm=5 Jack'" - } - True { - JackControl "HDMI/DP,pcm=5 Jack" - } - False { - JackControl "HDMI/DP, pcm=5 Jack" - } - } - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/kblrt5660/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/kblrt5660/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/kblrt5660/HiFi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/kblrt5660/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -# UCM for Intel Kabylake platforms with RT5660 -# For Audio in I2S mode - -SectionDevice."Line1" { - Comment "Line playback" - - EnableSequence [ - cset "name='DAC1 Playback Volume' 30" - cset "name='OUT Playback Volume' 19" - cset "name='OUT Playback Switch' on" - cset "name='codec0_out mo media0_in mi Switch' on" - cset "name='DAC1 MIXL DAC1 Switch' on" - cset "name='DAC1 MIXR DAC1 Switch' on" - cset "name='Stereo DAC MIXL DAC L1 Switch' on" - cset "name='Stereo DAC MIXR DAC L1 Switch' off" - cset "name='Stereo DAC MIXR DAC R1 Switch' on" - cset "name='Stereo DAC MIXL DAC R1 Switch' off" - cset "name='LOUT MIX DAC Switch' on" - cset "name='Line Out Switch' on" - ] - - DisableSequence [ - cset "name='Line Out Switch' off" - cset "name='DAC1 MIXL DAC1' off" - cset "name='DAC1 MIXR DAC1' off" - ] - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId}" - JackDev "rt5660-jack" - JackControl "Line Out Jack" - } -} - -SectionDevice."Line2" { - Comment "Line capture" - - EnableSequence [ - cset "name='ADC Capture Volume' 30" - cset "name='IN1 Boost Volume' 30" - cset "name='IN2 Boost Volume' 30" - cset "name='STO1 ADC Boost Gain Volume' 1" - cset "name='RECMIXL BST1 Switch' off" - cset "name='RECMIXR BST1 Switch' on" - cset "name='RECMIXL BST2 Switch' on" - cset "name='RECMIXR BST2 Switch' off" - cset "name='Line In Switch' on" - cset "name='Sto1 ADC MIXR ADC1 Switch' on" - cset "name='Sto1 ADC MIXL ADC1 Switch' on" - cset "name='media0_out mo codec0_in mi Switch' on" - ] - - DisableSequence [ - cset "name='Line In Switch' off" - cset "name='Sto1 ADC MIXR ADC1 Switch' off" - cset "name='Sto1 ADC MIXL ADC1 Switch' off" - ] - - Value { - CapturePriority 100 - CapturePCM "hw:${CardId},1" - JackDev "rt5660-jack" - JackControl "Line In Jack" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/kblrt5660/kblrt5660.conf alsa-ucm-conf-1.2.6.3/ucm2/kblrt5660/kblrt5660.conf --- alsa-ucm-conf-1.2.2/ucm2/kblrt5660/kblrt5660.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/kblrt5660/kblrt5660.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -Syntax 2 - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Play HiFi quality Music" -} - -SectionUseCase."Hdmi1" { - File "Hdmi1.conf" - Comment "Play on Hdmi/DP 1" -} - -SectionUseCase."Hdmi2" { - File "Hdmi2.conf" - Comment "Play on Hdmi/DP 2" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/lib/card-init.conf alsa-ucm-conf-1.2.6.3/ucm2/lib/card-init.conf --- alsa-ucm-conf-1.2.2/ucm2/lib/card-init.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/lib/card-init.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,10 @@ +# +# Manage directory for the card specific configuration +# + +Define.LibDir "/var/lib/alsa/card${CardNumber}.conf.d" + +FixedBootSequence [ + exec "/bin/rm -rf ${var:LibDir}" + exec "/bin/mkdir -p -m 0755 ${var:LibDir}" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/lib/ctl-remap.conf alsa-ucm-conf-1.2.6.3/ucm2/lib/ctl-remap.conf --- alsa-ucm-conf-1.2.2/ucm2/lib/ctl-remap.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/lib/ctl-remap.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,22 @@ +# +# This is generic UCM configuration for alsa-lib +# Users are not allowed to overwrite this configuration +# + +LibraryConfig.generic.Config { + + ctl.default { + @args [ CARD ] + @args.CARD.type string + type remap + child { + type hw + card $CARD + } + } + +} + +FixedBootSequence [ + cfg-save "${var:LibDir}/ctl-remap.conf:+ctl.default" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/lib/generic.conf alsa-ucm-conf-1.2.6.3/ucm2/lib/generic.conf --- alsa-ucm-conf-1.2.2/ucm2/lib/generic.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/lib/generic.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,29 @@ +# +# This is generic UCM configuration for alsa-lib +# Only hw devices are exposed to the UCM application +# Users are not allowed to overwrite this configuration +# + +LibraryConfig.generic.Config { + + ctl.hw { + @args [ CARD ] + @args.CARD.type string + type hw + card $CARD + } + + pcm.hw { + @args [ CARD DEV SUBDEV ] + @args { + CARD.type string + DEV.type integer + SUBDEV.type integer + } + type hw + card $CARD + device $DEV + subdevice $SUBDEV + } + +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/module/snd_soc_apq8016_sbc.conf alsa-ucm-conf-1.2.6.3/ucm2/module/snd_soc_apq8016_sbc.conf --- alsa-ucm-conf-1.2.2/ucm2/module/snd_soc_apq8016_sbc.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/module/snd_soc_apq8016_sbc.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,10 @@ +Syntax 3 + +SectionUseCase."HiFi" { + File "/Qualcomm/apq8016-sbc/HiFi.conf" + Comment "Play HiFi quality Music" +} +SectionUseCase."HDMI" { + File "/Qualcomm/apq8016-sbc/HDMI.conf" + Comment "HDMI output" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/module/snd_soc_apq8096.conf alsa-ucm-conf-1.2.6.3/ucm2/module/snd_soc_apq8096.conf --- alsa-ucm-conf-1.2.2/ucm2/module/snd_soc_apq8096.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/module/snd_soc_apq8096.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,11 @@ +Syntax 2 + +SectionUseCase."HiFi" { + File "/Qualcomm/apq8096/HiFi.conf" + Comment "HiFi quality Music" +} + +SectionUseCase."HDMI" { + File "/Qualcomm/apq8096/HDMI.conf" + Comment "HDMI output" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/module/snd_soc_omap_abe_twl6040.conf alsa-ucm-conf-1.2.6.3/ucm2/module/snd_soc_omap_abe_twl6040.conf --- alsa-ucm-conf-1.2.2/ucm2/module/snd_soc_omap_abe_twl6040.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/module/snd_soc_omap_abe_twl6040.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,13 @@ +# UCM configuration for PandaBoard(ES) + +Syntax 3 + +If.sdp4430 { + Condition { + Type String + String1 "${CardName}" + String2 "SDP4430" + } + True.Include.sdp4430.File "/OMAP/abe-twl6040/SDP4430/SDP4430.conf" + False.Include.pandaboard.File "/OMAP/abe-twl6040/Pandaboard/Pandaboard.conf" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/module/snd_soc_rk3399_gru_sound.conf alsa-ucm-conf-1.2.6.3/ucm2/module/snd_soc_rk3399_gru_sound.conf --- alsa-ucm-conf-1.2.2/ucm2/module/snd_soc_rk3399_gru_sound.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/module/snd_soc_rk3399_gru_sound.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,8 @@ +Syntax 2 + +Comment "Rockchip Gru card" + +SectionUseCase."HiFi" { + File "/Rockchip/rk3399-gru-sound/HiFi.conf" + Comment "Default" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/module/snd_soc_rockchip_max98090.conf alsa-ucm-conf-1.2.6.3/ucm2/module/snd_soc_rockchip_max98090.conf --- alsa-ucm-conf-1.2.2/ucm2/module/snd_soc_rockchip_max98090.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/module/snd_soc_rockchip_max98090.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,8 @@ +Syntax 2 + +Comment "Rockchip Veyron card" + +SectionUseCase."HiFi" { + File "/Rockchip/max98090/HiFi.conf" + Comment "Default" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/module/snd_soc_sdm845.conf alsa-ucm-conf-1.2.6.3/ucm2/module/snd_soc_sdm845.conf --- alsa-ucm-conf-1.2.2/ucm2/module/snd_soc_sdm845.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/module/snd_soc_sdm845.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,11 @@ +Syntax 3 + +SectionUseCase."HiFi" { + File "/Qualcomm/sdm845/HiFi.conf" + Comment "HiFi quality Music." +} + +SectionUseCase."HDMI" { + File "/Qualcomm/sdm845/HDMI.conf" + Comment "HDMI output." +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/module/snd_soc_snow.conf alsa-ucm-conf-1.2.6.3/ucm2/module/snd_soc_snow.conf --- alsa-ucm-conf-1.2.2/ucm2/module/snd_soc_snow.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/module/snd_soc_snow.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,8 @@ +Syntax 3 + +Comment "Internal card" + +SectionUseCase."HiFi" { + File "/Samsung/snow/HiFi.conf" + Comment "Default" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/module/snd_soc_tegra_alc5632.conf alsa-ucm-conf-1.2.6.3/ucm2/module/snd_soc_tegra_alc5632.conf --- alsa-ucm-conf-1.2.2/ucm2/module/snd_soc_tegra_alc5632.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/module/snd_soc_tegra_alc5632.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,44 @@ +Syntax 2 + +Comment "PAZ00 alc5632" + +BootSequence [ + cset "name='Master Playback Switch' on" + cset "name='Master Playback Volume' 44,44" + cset "name='Headphone Playback Volume' 21,21" + cset "name='Speaker Playback Volume' 21,21" + cset "name='SpeakerOut Mux' 2" + cset "name='SpeakerOut N Mux' LN/-R" + cset "name='AB-D Amp Mux' 0" + cset "name='Left Headphone Mux' 1" + cset "name='Right Headphone Mux' 1" + cset "name='DMIC Boost Capture Volume' 4" + cset "name='Rec Capture Volume' 24" + + # Fix external mic record volumes + cset "name='Mic 1 Boost Volume' 0" + cset "name='Mic 2 Boost Volume' 0" + cset "name='Mic1 Playback Volume' 0" + cset "name='Mic2 Playback Volume' 0" + cset "name='Rec Capture Volume' 0" + + # Enable internal speaker + cset "name='Speaker Playback Switch' on" + cset "name='Int Spk Switch' on" + cset "name='Speaker Mix DAC2SPK Playback Switch' on" + + # Enable DMIC + cset "name='DMICL Mix DMICL2ADC Capture Switch' on" + cset "name='DMIC En Capture Switch' on" + cset "name='DMIC PreFilter Capture Switch' on" +] + +SectionUseCase."HiFi" { + File "/Tegra/alc5632/HiFi.conf" + Comment "Music playback" +} + +SectionUseCase."Record" { + File "/Tegra/alc5632/Record.conf" + Comment "Playback and capture" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/module/snd_soc_tegra_max98090.conf alsa-ucm-conf-1.2.6.3/ucm2/module/snd_soc_tegra_max98090.conf --- alsa-ucm-conf-1.2.2/ucm2/module/snd_soc_tegra_max98090.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/module/snd_soc_tegra_max98090.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,6 @@ +Syntax 2 +Comment "Nyan internal card" +SectionUseCase."HiFi" { + File "/Tegra/max98090/HiFi.conf" + Comment "Default" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/platforms/bytcr/PlatformDisableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/platforms/bytcr/PlatformDisableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/platforms/bytcr/PlatformDisableSeq.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/platforms/bytcr/PlatformDisableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -1,20 +1,23 @@ # disable audio output path -cset "name='codec_out0 mix 0 pcm0_in Switch' off" -cset "name='modem_out mix 0 pcm0_in Switch' off" -cset "name='media0_out mix 0 media0_in Switch' off" -cset "name='media0_out mix 0 media1_in Switch' off" -cset "name='media0_out mix 0 media3_in Switch' off" +DisableSequence [ + cset "name='codec_out0 mix 0 pcm0_in Switch' off" + cset "name='modem_out mix 0 pcm0_in Switch' off" -cset "name='media0_in Gain 0 Switch' off" -cset "name='media1_in Gain 0 Switch' off" -cset "name='media3_in Gain 0 Switch' off" + cset "name='media0_out mix 0 media0_in Switch' off" + cset "name='media0_out mix 0 media1_in Switch' off" + cset "name='media0_out mix 0 media3_in Switch' off" -cset "name='pcm0_in Gain 0 Switch' off" -cset "name='codec_out0 Gain 0 Switch' off" -cset "name='modem_out Gain 0 Switch' off" + cset "name='media0_in Gain 0 Switch' off" + cset "name='media1_in Gain 0 Switch' off" + cset "name='media3_in Gain 0 Switch' off" -# disable audio input path -cset "name='pcm1_out Gain 0 Switch' off" -cset "name='codec_in0 Gain 0 Switch' off" -cset "name='modem_in Gain 0 Switch' off" + cset "name='pcm0_in Gain 0 Switch' off" + cset "name='codec_out0 Gain 0 Switch' off" + cset "name='modem_out Gain 0 Switch' off" + + # disable audio input path + cset "name='pcm1_out Gain 0 Switch' off" + cset "name='codec_in0 Gain 0 Switch' off" + cset "name='modem_in Gain 0 Switch' off" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/platforms/bytcr/PlatformEnableSeq.conf alsa-ucm-conf-1.2.6.3/ucm2/platforms/bytcr/PlatformEnableSeq.conf --- alsa-ucm-conf-1.2.2/ucm2/platforms/bytcr/PlatformEnableSeq.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/platforms/bytcr/PlatformEnableSeq.conf 2021-12-17 16:53:11.000000000 +0000 @@ -1,115 +1,118 @@ -# media mixer settings -# compress -cset "name='media0_in Gain 0 Switch' on" -cset "name='media0_in Gain 0 Volume' 0" - -# normal -cset "name='media1_in Gain 0 Switch' on" -cset "name='media1_in Gain 0 Volume' 0" -# swm loopback -cset "name='media2_in Gain 0 Switch' off" -cset "name='media2_in Gain 0 Volume' 0%" -# deep buffer -cset "name='media3_in Gain 0 Switch' on" -cset "name='media3_in Gain 0 Volume' 0" - -cset "name='media0_out mix 0 media0_in Switch' on" -cset "name='media0_out mix 0 media1_in Switch' on" -cset "name='media0_out mix 0 media2_in Switch' off" -cset "name='media0_out mix 0 media3_in Switch' on" - -cset "name='media1_out mix 0 media0_in Switch' off" -cset "name='media1_out mix 0 media1_in Switch' off" -cset "name='media1_out mix 0 media2_in Switch' off" -cset "name='media1_out mix 0 media3_in Switch' off" - -cset "name='pcm0_in Gain 0 Switch' on" -cset "name='pcm0_in Gain 0 Volume' 0" - -cset "name='pcm1_in Gain 0 Switch' off" -cset "name='pcm1_in Gain 0 Volume' 0%" - -# codec0_out settings (used if SSP2 is connected) -cset "name='codec_out0 mix 0 codec_in0 Switch' off" -cset "name='codec_out0 mix 0 codec_in1 Switch' off" -cset "name='codec_out0 mix 0 media_loop1_in Switch' off" -cset "name='codec_out0 mix 0 media_loop2_in Switch' off" -cset "name='codec_out0 mix 0 pcm0_in Switch' on" -cset "name='codec_out0 mix 0 pcm1_in Switch' off" -cset "name='codec_out0 mix 0 sprot_loop_in Switch' off" -cset "name='codec_out0 Gain 0 Switch' on" -cset "name='codec_out0 Gain 0 Volume' 0" - -# modem_out settings (used if SSP0 is connected) -cset "name='modem_out mix 0 codec_in0 Switch' off" -cset "name='modem_out mix 0 codec_in1 Switch' off" -cset "name='modem_out mix 0 media_loop1_in Switch' off" -cset "name='modem_out mix 0 media_loop2_in Switch' off" -cset "name='modem_out mix 0 pcm0_in Switch' on" -cset "name='modem_out mix 0 pcm1_in Switch' off" -cset "name='modem_out mix 0 sprot_loop_in Switch' off" -cset "name='modem_out Gain 0 Switch' on" -cset "name='modem_out Gain 0 Volume' 0" - -# input settings - -# input used when SSP2 is connected -cset "name='codec_in0 Gain 0 Switch' on" -cset "name='codec_in0 Gain 0 Volume' 0" - -# input used when SSP0 is connected -cset "name='modem_in Gain 0 Switch' on" -cset "name='modem_in Gain 0 Volume' 0" - -# pcm1_out settings -cset "name='pcm1_out mix 0 codec_in0 Switch' on" -cset "name='pcm1_out mix 0 modem_in Switch' on" -cset "name='pcm1_out mix 0 codec_in1 Switch' off" -cset "name='pcm1_out mix 0 media_loop1_in Switch' off" -cset "name='pcm1_out mix 0 media_loop2_in Switch' off" -cset "name='pcm1_out mix 0 pcm0_in Switch' off" -cset "name='pcm1_out mix 0 pcm1_in Switch' off" -cset "name='pcm1_out mix 0 sprot_loop_in Switch' off" - -cset "name='pcm1_out Gain 0 Switch' on" -cset "name='pcm1_out Gain 0 Volume' 0" - -# disable codec_out1 -cset "name='codec_out1 mix 0 codec_in0 Switch' off" -cset "name='codec_out1 mix 0 codec_in1 Switch' off" -cset "name='codec_out1 mix 0 media_loop1_in Switch' off" -cset "name='codec_out1 mix 0 media_loop2_in Switch' off" -cset "name='codec_out1 mix 0 pcm0_in Switch' off" -cset "name='codec_out1 mix 0 pcm1_in Switch' off" -cset "name='codec_out1 mix 0 sprot_loop_in Switch' off" -cset "name='codec_out1 Gain 0 Switch' off" -cset "name='codec_out1 Gain 0 Volume' 0%" - -# disable codec_in1 -cset "name='codec_in1 Gain 0 Switch' off" -cset "name='codec_in1 Gain 0 Volume' 0%" - -# disable all loops -cset "name='media_loop1_out mix 0 codec_in0 Switch' off" -cset "name='media_loop1_out mix 0 codec_in1 Switch' off" -cset "name='media_loop1_out mix 0 media_loop1_in Switch' off" -cset "name='media_loop1_out mix 0 media_loop2_in Switch' off" -cset "name='media_loop1_out mix 0 pcm0_in Switch' off" -cset "name='media_loop1_out mix 0 pcm1_in Switch' off" -cset "name='media_loop1_out mix 0 sprot_loop_in Switch' off" - -cset "name='media_loop2_out mix 0 codec_in0 Switch' off" -cset "name='media_loop2_out mix 0 codec_in1 Switch' off" -cset "name='media_loop2_out mix 0 media_loop1_in Switch' off" -cset "name='media_loop2_out mix 0 media_loop2_in Switch' off" -cset "name='media_loop2_out mix 0 pcm0_in Switch' off" -cset "name='media_loop2_out mix 0 pcm1_in Switch' off" -cset "name='media_loop2_out mix 0 sprot_loop_in Switch' off" - -cset "name='sprot_loop_out mix 0 codec_in0 Switch' off" -cset "name='sprot_loop_out mix 0 codec_in1 Switch' off" -cset "name='sprot_loop_out mix 0 media_loop1_in Switch' off" -cset "name='sprot_loop_out mix 0 media_loop2_in Switch' off" -cset "name='sprot_loop_out mix 0 pcm0_in Switch' off" -cset "name='sprot_loop_out mix 0 pcm1_in Switch' off" -cset "name='sprot_loop_out mix 0 sprot_loop_in Switch' off" +EnableSequence [ + + # media mixer settings + # compress + cset "name='media0_in Gain 0 Switch' on" + cset "name='media0_in Gain 0 Volume' 0" + + # normal + cset "name='media1_in Gain 0 Switch' on" + cset "name='media1_in Gain 0 Volume' 0" + # swm loopback + cset "name='media2_in Gain 0 Switch' off" + cset "name='media2_in Gain 0 Volume' 0%" + # deep buffer + cset "name='media3_in Gain 0 Switch' on" + cset "name='media3_in Gain 0 Volume' 0" + + cset "name='media0_out mix 0 media0_in Switch' on" + cset "name='media0_out mix 0 media1_in Switch' on" + cset "name='media0_out mix 0 media2_in Switch' off" + cset "name='media0_out mix 0 media3_in Switch' on" + + cset "name='media1_out mix 0 media0_in Switch' off" + cset "name='media1_out mix 0 media1_in Switch' off" + cset "name='media1_out mix 0 media2_in Switch' off" + cset "name='media1_out mix 0 media3_in Switch' off" + + cset "name='pcm0_in Gain 0 Switch' on" + cset "name='pcm0_in Gain 0 Volume' 0" + + cset "name='pcm1_in Gain 0 Switch' off" + cset "name='pcm1_in Gain 0 Volume' 0%" + + # codec0_out settings (used if SSP2 is connected) + cset "name='codec_out0 mix 0 codec_in0 Switch' off" + cset "name='codec_out0 mix 0 codec_in1 Switch' off" + cset "name='codec_out0 mix 0 media_loop1_in Switch' off" + cset "name='codec_out0 mix 0 media_loop2_in Switch' off" + cset "name='codec_out0 mix 0 pcm0_in Switch' on" + cset "name='codec_out0 mix 0 pcm1_in Switch' off" + cset "name='codec_out0 mix 0 sprot_loop_in Switch' off" + cset "name='codec_out0 Gain 0 Switch' on" + cset "name='codec_out0 Gain 0 Volume' 0" + + # modem_out settings (used if SSP0 is connected) + cset "name='modem_out mix 0 codec_in0 Switch' off" + cset "name='modem_out mix 0 codec_in1 Switch' off" + cset "name='modem_out mix 0 media_loop1_in Switch' off" + cset "name='modem_out mix 0 media_loop2_in Switch' off" + cset "name='modem_out mix 0 pcm0_in Switch' on" + cset "name='modem_out mix 0 pcm1_in Switch' off" + cset "name='modem_out mix 0 sprot_loop_in Switch' off" + cset "name='modem_out Gain 0 Switch' on" + cset "name='modem_out Gain 0 Volume' 0" + + # input settings + + # input used when SSP2 is connected + cset "name='codec_in0 Gain 0 Switch' on" + cset "name='codec_in0 Gain 0 Volume' 0" + + # input used when SSP0 is connected + cset "name='modem_in Gain 0 Switch' on" + cset "name='modem_in Gain 0 Volume' 0" + + # pcm1_out settings + cset "name='pcm1_out mix 0 codec_in0 Switch' on" + cset "name='pcm1_out mix 0 modem_in Switch' on" + cset "name='pcm1_out mix 0 codec_in1 Switch' off" + cset "name='pcm1_out mix 0 media_loop1_in Switch' off" + cset "name='pcm1_out mix 0 media_loop2_in Switch' off" + cset "name='pcm1_out mix 0 pcm0_in Switch' off" + cset "name='pcm1_out mix 0 pcm1_in Switch' off" + cset "name='pcm1_out mix 0 sprot_loop_in Switch' off" + + cset "name='pcm1_out Gain 0 Switch' on" + cset "name='pcm1_out Gain 0 Volume' 0" + + # disable codec_out1 + cset "name='codec_out1 mix 0 codec_in0 Switch' off" + cset "name='codec_out1 mix 0 codec_in1 Switch' off" + cset "name='codec_out1 mix 0 media_loop1_in Switch' off" + cset "name='codec_out1 mix 0 media_loop2_in Switch' off" + cset "name='codec_out1 mix 0 pcm0_in Switch' off" + cset "name='codec_out1 mix 0 pcm1_in Switch' off" + cset "name='codec_out1 mix 0 sprot_loop_in Switch' off" + cset "name='codec_out1 Gain 0 Switch' off" + cset "name='codec_out1 Gain 0 Volume' 0%" + + # disable codec_in1 + cset "name='codec_in1 Gain 0 Switch' off" + cset "name='codec_in1 Gain 0 Volume' 0%" + + # disable all loops + cset "name='media_loop1_out mix 0 codec_in0 Switch' off" + cset "name='media_loop1_out mix 0 codec_in1 Switch' off" + cset "name='media_loop1_out mix 0 media_loop1_in Switch' off" + cset "name='media_loop1_out mix 0 media_loop2_in Switch' off" + cset "name='media_loop1_out mix 0 pcm0_in Switch' off" + cset "name='media_loop1_out mix 0 pcm1_in Switch' off" + cset "name='media_loop1_out mix 0 sprot_loop_in Switch' off" + + cset "name='media_loop2_out mix 0 codec_in0 Switch' off" + cset "name='media_loop2_out mix 0 codec_in1 Switch' off" + cset "name='media_loop2_out mix 0 media_loop1_in Switch' off" + cset "name='media_loop2_out mix 0 media_loop2_in Switch' off" + cset "name='media_loop2_out mix 0 pcm0_in Switch' off" + cset "name='media_loop2_out mix 0 pcm1_in Switch' off" + cset "name='media_loop2_out mix 0 sprot_loop_in Switch' off" + + cset "name='sprot_loop_out mix 0 codec_in0 Switch' off" + cset "name='sprot_loop_out mix 0 codec_in1 Switch' off" + cset "name='sprot_loop_out mix 0 media_loop1_in Switch' off" + cset "name='sprot_loop_out mix 0 media_loop2_in Switch' off" + cset "name='sprot_loop_out mix 0 pcm0_in Switch' off" + cset "name='sprot_loop_out mix 0 pcm1_in Switch' off" + cset "name='sprot_loop_out mix 0 sprot_loop_in Switch' off" +] diff -Nru alsa-ucm-conf-1.2.2/ucm2/skylake-rt286/Hdmi1.conf alsa-ucm-conf-1.2.6.3/ucm2/skylake-rt286/Hdmi1.conf --- alsa-ucm-conf-1.2.2/ucm2/skylake-rt286/Hdmi1.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/skylake-rt286/Hdmi1.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -# Usecase for device HDMI1/Display Port stereo playback on Intel SKYLAKE/KABYLAKE platforms -# For Audio in I2S mode - -SectionDevice."HDMI1" { - Comment "HDMI/Display Port 1 Stereo" - - Value { - PlaybackPriority 300 - PlaybackPCM "hw:${CardId},4" - If.1 { - Condition { - Type ControlExists - Control "iface=CARD,name='HDMI/DP,pcm=4 Jack'" - } - True { - JackControl "HDMI/DP,pcm=4 Jack" - } - False { - JackControl "HDMI/DP, pcm=4 Jack" - } - } - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/skylake-rt286/Hdmi2.conf alsa-ucm-conf-1.2.6.3/ucm2/skylake-rt286/Hdmi2.conf --- alsa-ucm-conf-1.2.2/ucm2/skylake-rt286/Hdmi2.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/skylake-rt286/Hdmi2.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -# Usecase for device HDMI2/Display Port stereo playback on Intel SKYLAKE/KABYLAKE platforms -# For Audio in I2S mode - -SectionDevice."HDMI2" { - Comment "HDMI/Display Port 2 Stereo" - - Value { - PlaybackPriority 400 - PlaybackPCM "hw:${CardId},5" - If.1 { - Condition { - Type ControlExists - Control "iface=CARD,name='HDMI/DP,pcm=5 Jack'" - } - True { - JackControl "HDMI/DP,pcm=5 Jack" - } - False { - JackControl "HDMI/DP, pcm=5 Jack" - } - } - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/skylake-rt286/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/skylake-rt286/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/skylake-rt286/HiFi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/skylake-rt286/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,113 +0,0 @@ -# Usecase for stereo playback Speaker and Headset, Recording on DMIC and Headset MIC. -# For Audio in I2S mode on Intel SKYLAKE/KABYLAKE platforms - -SectionVerb { - EnableSequence [ - cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" - ] - - Value { - TQ "HiFi" - } -} - -SectionDevice."Headphones" { - Comment "Headphones" - - ConflictingDevice [ - "Speaker" - ] - - EnableSequence [ - cset "name='HPO L Switch' 1" - cset "name='HPO R Switch' 1" - cset "name='Headphone Jack Switch' 1" - cset "name='Speaker Playback Switch' 0,0" - ] - - Value { - PlaybackPriority 200 - PlaybackPCM "hw:${CardId}" - JackControl "Headphone Jack" - JackHWMute "Speaker" - } -} - -SectionDevice."Speaker" { - Comment "Speaker" - - ConflictingDevice [ - "Headphones" - ] - - EnableSequence [ - cset "name='SPO Switch' 1" - cset "name='Speaker Playback Switch' 1,1" - cset "name='Speaker Switch' 1" - cset "name='HPO L Switch' 0" - cset "name='HPO R Switch' 0" - ] - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId}" - JackHWMute "Headphones" - } -} - -SectionDevice."Headset" { - Comment "Headset Microphone" - - ConflictingDevice [ - "Mic" - ] - EnableSequence [ - cset "name='media0_out mo codec0_in mi Switch' 1" - cset "name='ADC0 Capture Switch' 1,1" - cset "name='ADC 0 Mux' 0" - cset "name='Mic Jack Switch' 1" - cset "name='media0_out mo dmic01_hifi_in mi Switch' 0" - ] - - DisableSequence [ - cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" - cset "name='media0_out mo codec0_in mi Switch' 0" - ] - Value { - CapturePriority 200 - CapturePCM "hw:${CardId},1" - JackControl "Mic Jack" - } -} - -SectionDevice."Mic" { - Comment "Digital Stereo Microphone" - - ConflictingDevice [ - "Headset" - ] - - EnableSequence [ - cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" - cset "name='media0_out mo codec0_in mi Switch' 0" - cset "name='ADC0 Capture Switch' 0,0" - cset "name='Mic Jack Switch' 0" - cset "name='ADC 0 Mux' 0" - - ] - - DisableSequence [ - cset "name='media0_out mo codec0_in mi Switch' 1" - cset "name='media0_out mo dmic01_hifi_in mi Switch' 0" - cset "name='ADC0 Capture Switch' 1,1" - cset "name='Mic Jack Switch' 1" - cset "name='ADC 0 Mux' 2" - ] - Value { - CapturePriority 100 - CapturePCM "hw:${CardId},1" - } -} - - - diff -Nru alsa-ucm-conf-1.2.2/ucm2/skylake-rt286/skylake-rt286.conf alsa-ucm-conf-1.2.6.3/ucm2/skylake-rt286/skylake-rt286.conf --- alsa-ucm-conf-1.2.2/ucm2/skylake-rt286/skylake-rt286.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/skylake-rt286/skylake-rt286.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -# UCM for Intel SKYLAKE/KABYLAKE platforms -# For Audio in I2S mode - -Syntax 2 - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Play and record HiFi quality Music" -} - -SectionDefaults [ - cset "name='Headphone Jack Switch' 1" - cset "name='Speaker Switch' 1" - cset "name='Speaker Playback Switch' 0,0" - cset "name='Front DAC Switch' 1" - cset "name='Front RECMIX Switch' 0" - cset "name='Mic Jack Switch' 1" - cset "name='ADC 0 Mux' 2" - cset "name='ADC 1 Mux' 0" - cset "name='ADC0 Capture Volume' 105,105" - cset "name='ADC0 Capture Switch' 1,1" - cset "name='AMIC Volume' 3" - cset "name='DAC0 Playback Volume' 100,100" - cset "name='HPO L Switch' 0" - cset "name='HPO Mux' 0" - cset "name='HPO R Switch' 0" - cset "name='Pin 5 Mux' 1" - cset "name='Pin 6 Mux' 2" - cset "name='Pin 7 Mux' 3" - cset "name='RECMIX Beep Switch' 0" - cset "name='RECMIX Line1 Switch' 0" - cset "name='RECMIX Mic1 Switch' 0" - cset "name='SPK Mux' 0" - cset "name='SPO Switch' 1" - cset "name='codec0_out mo codec0_in mi Switch' 0" - cset "name='codec0_out mo dmic01_hifi_in mi Switch' 0" - cset "name='codec0_out mo media0_in mi Switch' 1" - cset "name='codec1_out mo codec0_in mi Switch' 0" - cset "name='codec1_out mo dmic01_hifi_in mi Switch' 0" - cset "name='codec1_out mo media0_in mi Switch' 0" - cset "name='media0_out mo codec0_in mi Switch' 1" - cset "name='media0_out mo dmic01_hifi_in mi Switch' 1" - cset "name='media0_out mo media0_in mi Switch' 0" -] diff -Nru alsa-ucm-conf-1.2.2/ucm2/sof-hda-dsp/HDA-Capture-value.conf alsa-ucm-conf-1.2.6.3/ucm2/sof-hda-dsp/HDA-Capture-value.conf --- alsa-ucm-conf-1.2.2/ucm2/sof-hda-dsp/HDA-Capture-value.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/sof-hda-dsp/HDA-Capture-value.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -CapturePCM "hw:${CardId}" -CaptureMixerElem "Capture" -CaptureVolume "Capture Volume" -CaptureSwitch "Capture Switch" diff -Nru alsa-ucm-conf-1.2.2/ucm2/sof-hda-dsp/Hdmi.conf alsa-ucm-conf-1.2.6.3/ucm2/sof-hda-dsp/Hdmi.conf --- alsa-ucm-conf-1.2.2/ucm2/sof-hda-dsp/Hdmi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/sof-hda-dsp/Hdmi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -# Use case Configuration for sof-hda-dsp - -SectionDevice."HDMI1" { - Comment "HDMI1/DP1 Output" - - EnableSequence [ - cset "name='IEC958 Playback Switch' on" - ] - - DisableSequence [ - cset "name='IEC958 Playback Switch' off" - ] - - Value { - PlaybackPriority 500 - PlaybackPCM "hw:${CardId},3" - JackControl "HDMI/DP,pcm=3 Jack" - } -} - -SectionDevice."HDMI2" { - Comment "HDMI2/DP2 Output" - - EnableSequence [ - cset "name='IEC958 Playback Switch',index=1 on" - ] - - DisableSequence [ - cset "name='IEC958 Playback Switch',index=1 off" - ] - - Value { - PlaybackPriority 600 - PlaybackPCM "hw:${CardId},4" - JackControl "HDMI/DP,pcm=4 Jack" - } -} - -SectionDevice."HDMI3" { - Comment "HDMI3/DP3 Output" - - EnableSequence [ - cset "name='IEC958 Playback Switch',index=2 on" - ] - - DisableSequence [ - cset "name='IEC958 Playback Switch',index=2 off" - ] - - Value { - PlaybackPriority 700 - PlaybackPCM "hw:${CardId},5" - JackControl "HDMI/DP,pcm=5 Jack" - } -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/sof-hda-dsp/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/sof-hda-dsp/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/sof-hda-dsp/HiFi.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/sof-hda-dsp/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,170 +0,0 @@ -# Use case Configuration for sof-hda-dsp - -SectionVerb { - EnableSequence [ - cset "name='Auto-Mute Mode' 'Disabled'" - ] -} - -SectionDevice."Headphones1" { - Comment "Headphones" - - EnableSequence [ - cset "name='Headphone Playback Switch' on" - ] - - DisableSequence [ - cset "name='Headphone Playback Switch' off" - ] - - Value { - PlaybackPriority 200 - PlaybackPCM "hw:${CardId}" - PlaybackMixerElem "Headphone" - PlaybackMasterElem "Master" - PlaybackVolume "Headphone Playback Volume" - PlaybackSwitch "Headphone Playback Switch" - If.jack { - Condition { - Type ControlExists - Control "iface=CARD,name='Headphone Mic Jack'" - } - True { - JackControl "Headphone Mic Jack" - } - False { - JackControl "Headphone Jack" - } - } - } -} - -SectionDevice."Speaker" { - Comment "Speaker" - - If.seq { - Condition { - Type ControlExists - Control "name='Bass Speaker Playback Switch'" - } - True { - EnableSequence [ - cset "name='Speaker Playback Switch' on" - cset "name='Bass Speaker Playback Switch' on" - ] - - DisableSequence [ - cset "name='Speaker Playback Switch' off" - cset "name='Bass Speaker Playback Switch' off" - ] - } - False { - EnableSequence [ - cset "name='Speaker Playback Switch' on" - ] - - DisableSequence [ - cset "name='Speaker Playback Switch' off" - ] - } - } - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId}" - PlaybackMixerElem "Speaker" - PlaybackMasterElem "Master" - PlaybackVolume "Speaker Playback Volume" - PlaybackSwitch "Speaker Playback Switch" - } -} - -If.monomic { - Condition { - Type ControlExists - Control "name='Input Source'" - ControlEnum "Headphone Mic" - } - After.SectionDevice "Mic" - True { - SectionDevice."Headphones2" { - Comment "Headphones Stereo Microphone" - - ConflictingDevice [ - "Headset" - ] - - EnableSequence [ - cset "name='Input Source' 'Headphone Mic'" - ] - - Value { - CapturePriority 200 - - JackControl "Headphone Mic Jack" - } - } - - SectionDevice."Headset" { - Comment "Headset Mono Microphone" - - EnableSequence [ - cset "name='Input Source' Headset Mic" - ] - - Value { - CapturePriority 300 - - JackControl "Headphone Mic Jack" - } - } - } - False { - SectionDevice."Headphones2" { - Comment "Headphones Stereo Microphone" - - Value { - CapturePriority 200 - - JackControl "Mic Jack" - } - } - } -} - -SectionDevice."Mic" { - Comment "Digital Microphone" - - Value { - CapturePriority 100 - CapturePCM "hw:${CardId},6" - If.chn { - Condition { - Type String - Haystack "${CardComponents}" - Needle "cfg-dmics:4" - } - True { - CaptureChannels 4 - } - } - If.vol { - Condition { - Type ControlExists - Control "name='Dmic0 Capture Switch'" - } - True { - CaptureMixerElem "Dmic0" - CaptureVolume "Dmic0 Capture Volume" - CaptureSwitch "Dmic0 Capture Switch" - } - False { - # v1.3 SOF firmware - CaptureMixerElem "PGA10.0 10 Master" - CaptureVolume "PGA10.0 10 Master Capture Volume" - } - } - } -} - - diff -Nru alsa-ucm-conf-1.2.2/ucm2/sof-hda-dsp/sof-hda-dsp.conf alsa-ucm-conf-1.2.6.3/ucm2/sof-hda-dsp/sof-hda-dsp.conf --- alsa-ucm-conf-1.2.2/ucm2/sof-hda-dsp/sof-hda-dsp.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/sof-hda-dsp/sof-hda-dsp.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Syntax 2 - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Play HiFi quality Music" -} diff -Nru alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/Hdmi.conf alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/Hdmi.conf --- alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/Hdmi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/Hdmi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,40 @@ +# Use case Configuration for sof-soundwire + +If.hdmi1 { + Condition { Type String Empty "" } + True { + Define { + HdmiNum 1 + HdmiPCM 5 + HdmiCtlIndex 0 + HdmiPrio 500 + } + Include.hdmi1.File "/codecs/hda/hdmi.conf" + } +} + +If.hdmi2 { + Condition { Type String Empty "" } + True { + Define { + HdmiNum 2 + HdmiPCM 6 + HdmiCtlIndex 1 + HdmiPrio 600 + } + Include.hdmi2.File "/codecs/hda/hdmi.conf" + } +} + +If.hdmi3 { + Condition { Type String Empty "" } + True { + Define { + HdmiNum 3 + HdmiPCM 7 + HdmiCtlIndex 2 + HdmiPrio 700 + } + Include.hdmi3.File "/codecs/hda/hdmi.conf" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/HiFi.conf alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/HiFi.conf --- alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/HiFi.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/HiFi.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,31 @@ +# Use case Configuration for sof-soundwire card + +SectionVerb { + Value.TQ "HiFi" +} + +If.spkdev { + Condition { + Type String + Empty "${var:SpeakerCodec1}" + } + False.Include.spkdev.File "/sof-soundwire/${var:SpeakerCodec1}-${var:SpeakerAmps1}.conf" +} + +If.micdev { + Condition { + Type String + Empty "${var:MicCodec1}" + } + False.Include.micdev.File "/sof-soundwire/${var:MicCodec1}.conf" +} + +If.hsdev { + Condition { + Type String + Empty "${var:HeadsetCodec1}" + } + False.Include.hsdev.File "/sof-soundwire/${var:HeadsetCodec1}.conf" +} + + diff -Nru alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/dmic.conf alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/dmic.conf --- alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/dmic.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/dmic.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,21 @@ +SectionDevice."Mic" { + Comment "Digital Microphone" + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId},${find-device:type=pcm,stream=capture,field=id,regex='DMIC '}" + If.chn { + Condition { + Type RegexMatch + Regex "[34]" + String "${var:Mics1}" + } + True { + CaptureChannels 4 + } + } + CaptureMixerElem "Dmic0" + CaptureVolume "Dmic0 Capture Volume" + CaptureSwitch "Dmic0 Capture Switch" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/rt1308-1.conf alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/rt1308-1.conf --- alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/rt1308-1.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/rt1308-1.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,22 @@ +# Use case Configuration for sof-soundwire card + +SectionDevice."Speaker" { + Comment "Speaker" + + EnableSequence [ + cset "name='rt1308-1 DAC L Switch' 1" + cset "name='rt1308-1 DAC R Switch' 1" + cset "name='Speaker Switch' on" + ] + + DisableSequence [ + cset "name='rt1308-1 DAC L Switch' 0" + cset "name='rt1308-1 DAC R Switch' 0" + cset "name='Speaker Switch' off" + ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId},2" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/rt1308-2.conf alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/rt1308-2.conf --- alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/rt1308-2.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/rt1308-2.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,29 @@ +# Use case Configuration for sof-soundwire card + +SectionDevice."Speaker" { + Comment "Speaker" + + EnableSequence [ + cset "name='rt1308-1 RX Channel Select' LL" + cset "name='rt1308-2 RX Channel Select' RR" + + cset "name='rt1308-1 DAC L Switch' 1" + cset "name='rt1308-1 DAC R Switch' 1" + cset "name='rt1308-2 DAC L Switch' 1" + cset "name='rt1308-2 DAC R Switch' 1" + cset "name='Speaker Switch' on" + ] + + DisableSequence [ + cset "name='rt1308-1 DAC L Switch' 0" + cset "name='rt1308-1 DAC R Switch' 0" + cset "name='rt1308-2 DAC L Switch' 0" + cset "name='rt1308-2 DAC R Switch' 0" + cset "name='Speaker Switch' off" + ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId},2" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/rt1316-1.conf alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/rt1316-1.conf --- alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/rt1316-1.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/rt1316-1.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,41 @@ +# Use case Configuration for sof-soundwire card + +SectionDevice."Speaker" { + Comment "Speaker" + + If.lrswitch { + Condition { + Type ControlExists + Control "name='rt1316-1 DAC L Switch'" + } + True { + EnableSequence [ + cset "name='rt1316-1 DAC L Switch' 1" + cset "name='rt1316-1 DAC R Switch' 1" + cset "name='Speaker Switch' on" + ] + + DisableSequence [ + cset "name='rt1316-1 DAC L Switch' 0" + cset "name='rt1316-1 DAC R Switch' 0" + cset "name='Speaker Switch' off" + ] + } + False { + EnableSequence [ + cset "name='rt1316-1 DAC Switch' 1" + cset "name='Speaker Switch' on" + ] + + DisableSequence [ + cset "name='rt1316-1 DAC Switch' 0" + cset "name='Speaker Switch' off" + ] + } + } + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId},2" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/rt1316-2.conf alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/rt1316-2.conf --- alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/rt1316-2.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/rt1316-2.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,51 @@ +# Use case Configuration for sof-soundwire card + +SectionDevice."Speaker" { + Comment "Speaker" + + If.lrswitch { + Condition { + Type ControlExists + Control "name='rt1316-1 DAC L Switch'" + } + True { + EnableSequence [ + cset "name='rt1316-1 RX Channel Select' L,L" + cset "name='rt1316-2 RX Channel Select' R,R" + cset "name='rt1316-1 DAC L Switch' 1" + cset "name='rt1316-1 DAC R Switch' 1" + cset "name='rt1316-2 DAC L Switch' 1" + cset "name='rt1316-2 DAC R Switch' 1" + cset "name='Speaker Switch' on" + ] + + DisableSequence [ + cset "name='rt1316-1 DAC L Switch' 0" + cset "name='rt1316-1 DAC R Switch' 0" + cset "name='rt1316-2 DAC L Switch' 0" + cset "name='rt1316-2 DAC R Switch' 0" + cset "name='Speaker Switch' off" + ] + } + False { + EnableSequence [ + cset "name='rt1316-1 RX Channel Select' L,L" + cset "name='rt1316-2 RX Channel Select' R,R" + cset "name='rt1316-1 DAC Switch' 1" + cset "name='rt1316-2 DAC Switch' 1" + cset "name='Speaker Switch' on" + ] + + DisableSequence [ + cset "name='rt1316-1 DAC Switch' 0" + cset "name='rt1316-2 DAC Switch' 0" + cset "name='Speaker Switch' off" + ] + } + } + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId},2" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/rt5682.conf alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/rt5682.conf --- alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/rt5682.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/rt5682.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,50 @@ +# Use case Configuration for sof-soundwire card + +SectionDevice."Headphones" { + Comment "Headphones" + + EnableSequence [ + cset "name='Headphone Switch' on" + cset "name='rt5682 HPOL Playback Switch' 1" + cset "name='rt5682 HPOR Playback Switch' 1" + ] + + DisableSequence [ + cset "name='rt5682 HPOL Playback Switch' 0" + cset "name='rt5682 HPOR Playback Switch' 0" + cset "name='Headphone Switch' off" + + ] + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + JackControl "Headphone Jack" + } +} + +SectionDevice."Headset" { + Comment "Headset Microphone" + + EnableSequence [ + cset "name='Headset Mic Switch' on" + cset "name='rt5682 STO1 ADC Capture Switch' 1" + cset "name='rt5682 RECMIX1L CBJ Switch' 1" + cset "name='rt5682 Stereo1 ADC MIXL ADC1 Switch' 1" + cset "name='rt5682 Stereo1 ADC MIXR ADC1 Switch' 1" + ] + + DisableSequence [ + cset "name='rt5682 STO1 ADC Capture Switch' 0" + cset "name='rt5682 RECMIX1L CBJ Switch' 0" + cset "name='rt5682 Stereo1 ADC MIXL ADC1 Switch' 0" + cset "name='rt5682 Stereo1 ADC MIXR ADC1 Switch' 0" + cset "name='Headset Mic Switch' off" + ] + + Value { + CapturePriority 200 + CapturePCM "hw:${CardId},1" + JackControl "Headset Mic Jack" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/rt700.conf alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/rt700.conf --- alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/rt700.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/rt700.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,62 @@ +# Use case Configuration for sof-soundwire card + +SectionDevice."Headphones" { + Comment "Headphones" + + ConflictingDevice [ + "Speaker" + ] + + EnableSequence [ + cset "name='Headphones Switch' on" + ] + + DisableSequence [ + cset "name='Headphones Switch' off" + ] + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + JackControl "Headphone Jack" + } +} + +SectionDevice."Speaker" { + Comment "Speaker" + + ConflictingDevice [ + "Headphones" + ] + + EnableSequence [ + cset "name='Speaker Switch' on" + ] + + DisableSequence [ + cset "name='Speaker Switch' off" + ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + } +} + +SectionDevice."Headset" { + Comment "Headset Microphone" + + EnableSequence [ + cset "name='ADC 09 Capture Switch' 1" + ] + + DisableSequence [ + cset "name='ADC 09 Capture Switch' 0" + ] + + Value { + CapturePriority 200 + CapturePCM "hw:${CardId},1" + JackControl "Headset Mic Jack" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/rt711-sdca.conf alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/rt711-sdca.conf --- alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/rt711-sdca.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/rt711-sdca.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,40 @@ +# Use case Configuration for sof-soundwire card + +SectionDevice."Headphones" { + Comment "Headphones" + + EnableSequence [ + cset "name='Headphone Switch' on" + ] + + DisableSequence [ + cset "name='Headphone Switch' off" + ] + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + JackControl "Headphone Jack" + } +} + +SectionDevice."Headset" { + Comment "Headset Microphone" + + EnableSequence [ + cset "name='PGA2.0 2 Master Capture Switch' 1" + ] + + DisableSequence [ + cset "name='PGA2.0 2 Master Capture Switch' 0" + ] + + Value { + CapturePriority 200 + CapturePCM "hw:${CardId},1" + JackControl "Headset Mic Jack" + CaptureSwitch "rt711 FU0F Capture Switch" + CaptureVolume "rt711 FU0F Capture Volume" + CaptureMixerElem "rt711 FU0F" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/rt711.conf alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/rt711.conf --- alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/rt711.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/rt711.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,39 @@ +# Use case Configuration for sof-soundwire card + +SectionDevice."Headphones" { + Comment "Headphones" + + EnableSequence [ + cset "name='Headphone Switch' on" + ] + + DisableSequence [ + cset "name='Headphone Switch' off" + ] + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + JackControl "Headphone Jack" + } +} + +SectionDevice."Headset" { + Comment "Headset Microphone" + + EnableSequence [ + cset "name='PGA2.0 2 Master Capture Switch' 1" + ] + + DisableSequence [ + cset "name='PGA2.0 2 Master Capture Switch' 0" + ] + + Value { + CapturePriority 200 + CapturePCM "hw:${CardId},1" + JackControl "Headset Mic Jack" + CaptureSwitch "PGA2.0 2 Master Capture Switch" + CaptureVolume "PGA2.0 2 Master Capture Volume" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/rt715-sdca.conf alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/rt715-sdca.conf --- alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/rt715-sdca.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/rt715-sdca.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,21 @@ +# Use case Configuration for sof-soundwire card + +SectionDevice."Mic" { + Comment "SoundWire microphones" + + EnableSequence [ + cset "name='rt714 FU02 Capture Switch' 1" + ] + + DisableSequence [ + cset "name='rt714 FU02 Capture Switch' 0" + ] + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId},4" + CaptureSwitch "rt714 FU02 Capture Switch" + CaptureVolume "rt714 FU02 Capture Volume" + CaptureMixerElem "rt714 FU02" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/rt715.conf alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/rt715.conf --- alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/rt715.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/rt715.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,30 @@ +# Use case Configuration for sof-soundwire card + +If.hwctl { + Condition { + Type ControlExists + Control "name='rt715 Capture Volume'" + } + True.Define.rt715ctl "rt715 Capture" + False.Define.rt715ctl "PGA5.0 5 Master Capture" +} + +SectionDevice."Mic" { + Comment "SoundWire microphones" + + EnableSequence [ + cset "name='${var:rt715ctl} Switch' 1" + ] + + DisableSequence [ + cset "name='${var:rt715ctl} Switch' 0" + ] + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId},4" + CaptureSwitch "${var:rt715ctl} Switch" + CaptureVolume "${var:rt715ctl} Volume" + CaptureMixerElem "${var:rt715ctl}" + } +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/sof-soundwire.conf alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/sof-soundwire.conf --- alsa-ucm-conf-1.2.2/ucm2/sof-soundwire/sof-soundwire.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/sof-soundwire/sof-soundwire.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,63 @@ +Syntax 4 + +SectionUseCase."HiFi" { + File "/sof-soundwire/HiFi.conf" + Comment "Play HiFi quality Music" +} + +Include.card-init.File "/lib/card-init.conf" +Include.ctl-remap.File "/lib/ctl-remap.conf" + +Define { + SpeakerCodec1 "" + SpeakerChannels1 "2" + SpeakerAmps1 "0" + HeadsetCodec1 "" + MicCodec1 "" + Mics1 "0" +} + +DefineRegex { + SpeakerCodec { + Regex " spk:([a-z0-9]+(-sdca)?)" + String "${CardComponents}" + } + SpeakerChannels { + Regex " cfg-spk:([0-9]+)" + String "${CardComponents}" + } + SpeakerAmps { + Regex " cfg-amp:([0-9]+)" + String "${CardComponents}" + } + HeadsetCodec { + Regex " hs:([a-z0-9]+(-sdca)?)" + String "${CardComponents}" + } + MicCodec { + Regex " mic:([a-z0-9]+(-sdca)?)" + String "${CardComponents}" + } + Mics { + Regex " cfg-mics:([1-9][0-9]*)" + String "${CardComponents}" + } +} + +If.hs_init { + Condition { + Type RegexMatch + Regex "(rt5682|rt700|rt711(-sdca)?)" + String "${var:HeadsetCodec1}" + } + True.Include.hs_init.File "/codecs/${var:HeadsetCodec1}/init.conf" +} + +If.mic_init { + Condition { + Type RegexMatch + Regex "(rt715(-sdca)?)" + String "${var:MicCodec1}" + } + True.Include.mic_init.File "/codecs/${var:MicCodec1}/init.conf" +} diff -Nru alsa-ucm-conf-1.2.2/ucm2/tegraalc5632/tegraalc5632.conf alsa-ucm-conf-1.2.6.3/ucm2/tegraalc5632/tegraalc5632.conf --- alsa-ucm-conf-1.2.2/ucm2/tegraalc5632/tegraalc5632.conf 2020-02-19 09:26:11.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/tegraalc5632/tegraalc5632.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -# UCM configuration for tegra-alc5632 - -Syntax 2 - -SectionDefaults [ - cset "name='Master Playback Switch' on" - cset "name='Master Playback Volume' 44,44" - cset "name='Headphone Playback Switch' on" - cset "name='Headphone Playback Volume' 21,21" - cset "name='Speaker Playback Switch' on" - cset "name='Speaker Playback Volume' 21,21" - cset "name='Speaker Mix DAC2SPK Playback Switch' on" - cset "name='SpeakerOut Mux' 2" - cset "name='SpeakerOut N Mux' LN/-R" - cset "name='AB-D Amp Mux' 0" - cset "name='HPL Mix DACL2HP Playback Switch' on" - cset "name='HPR Mix DACR2HP Playback Switch' on" - cset "name='Int Spk Switch' on" - cset "name='Left Headphone Mux' 1" - cset "name='Right Headphone Mux' 1" - cset "name='DMIC En Capture Switch' on" - cset "name='DMIC PreFilter Capture Switch' on" - cset "name='DMIC Boost Capture Volume' 4" - cset "name='Rec Capture Volume' 24" -] diff -Nru alsa-ucm-conf-1.2.2/ucm2/ucm.conf alsa-ucm-conf-1.2.6.3/ucm2/ucm.conf --- alsa-ucm-conf-1.2.2/ucm2/ucm.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-ucm-conf-1.2.6.3/ucm2/ucm.conf 2021-12-17 16:53:11.000000000 +0000 @@ -0,0 +1,172 @@ +# +# This is the toplevel file included from the alsa-lib. +# +# It allows to add extra lookups for the old kernels or so. +# +# You may specify the directory (relative to the toplevel) and +# the master configuration file which defines the verbs. +# + +# +# Syntax version is reset for the master configuration file. +# + +Syntax 4 + +Define.V1 "" # non-empty string to enable ucm v1 paths +Define.V2ConfD yes # empty string to disable +Define.V2Module "" # non-empty string to enable module name lookups (obsolete) +Define.V2Name "" # non-empty string to enable driver & card name lookups (obsolete) + +Include.libgen.File "/lib/generic.conf" # private alsa-lib configuration + +If.driver { + Condition { + Type String + Empty "${CardNumber}" + } + True { + # + # The probed path for no-hw-card: + # + # ucm2/conf.virt.d/${OpenName}.conf + # ucm2/${OpenName}/${OpenName}.conf + # + UseCasePath { + virt { + Directory "conf.virt.d" + File "${OpenName}.conf" + } + legacy { + Directory "${OpenName}" + File "${OpenName}.conf" + } + } + } + False { + + # + # The probed path when hw-card is found: + # + # ucm2/conf.d/[${CardDriver}|${KernelDriver}]/${CardLongName}.conf + # ucm2/conf.d/[${CardDriver}|${KernelDriver}]/[${CardDriver}|${KernelDriver}].conf + # ucm2/${KernelModule}/${KernelModule}.conf (obsolete) + # ucm2/${CardDriver}/${CardLongName}.conf (obsolete) + # ucm2/${CardDriver}/${CardDriver}.conf (obsolete) + # + + If.V2ConfD { + Condition { + Type String + Empty "${var:V2ConfD}" + } + False { + Define.Driver "${CardDriver}" + If.nodrv { + Condition { + Type String + Empty "${var:Driver}" + } + True.Define { + KernelDriverPath "class/sound/card${CardNumber}/device/driver" + Driver "${sys:$KernelDriverPath}" + } + } + UseCasePath.confd1 { + Directory "conf.d/${var:Driver}" + File "${CardLongName}.conf" + } + UseCasePath.confd2 { + Directory "conf.d/${var:Driver}" + File "${var:Driver}.conf" + } + } + } + If.V2Module { + Condition { + Type String + Empty "${var:V2Module}" + } + False { + Define.KernelModulePath "class/sound/card${CardNumber}/device/driver/module" + Define.KernelModule "$${sys:$KernelModulePath}" + UseCasePath.module { + Directory "module" + File "${var:KernelModule}.conf" + } + } + } + If.V2Name { + Condition { + Type String + Empty "${var:V2Name}" + } + False.UseCasePath { + longname { + Directory "${CardDriver}" + File "${CardLongName}.conf" + } + driver { + Directory "${CardDriver}" + File "${CardDriver}.conf" + } + } + } + } +} + +If.V1 { + Condition { + Type String + Empty "${var:V1}" + } + False.If.v1_driver { + Condition { + Type String + Empty "${CardNumber}" + } + True { + # + # The probed path for no-hw-card: + # + # ucm/${OpenName}/${OpenName}.conf + # + UseCasePath.v1_legacy { + Version 1 + Directory "${OpenName}" + File "${OpenName}.conf" + } + } + False { + # + # The ucm v1 probed path when hw-card is found: + # + # ucm/${CardLongName}/${CardLongName}.conf + # ucm/${CardName}/${CardName}.conf or \ + # ucm/${OpenName}/${OpenName}.conf + # + UseCasePath.v1_longname { + Version 1 + Directory "${CardLongName}" + File "${CardLongName}.conf" + } + If.v1_hw { + Condition { + Type String + Haystack "${OpenName}" + Needle "hw:" + } + True.UseCasePath.v1_cardnamme { + Version 1 + Directory "${CardName}" + File "${CardName}.conf" + } + False.UseCasePath.v1_openname { + Version 1 + Directory "${OpenName}" + File "${OpenName}.conf" + } + } + } + } +}