diff -Nru alsa-ucm-conf-1.2.10/debian/changelog alsa-ucm-conf-1.2.10/debian/changelog --- alsa-ucm-conf-1.2.10/debian/changelog 2024-01-16 18:23:07.000000000 +0800 +++ alsa-ucm-conf-1.2.10/debian/changelog 2024-01-25 13:29:18.000000000 +0800 @@ -1,3 +1,21 @@ +alsa-ucm-conf (1.2.10-1ubuntu3) noble; urgency=medium + + * 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-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) + + -- Ethan Hsieh Thu, 25 Jan 2024 13:29:18 +0800 + alsa-ucm-conf (1.2.10-1ubuntu2) noble; urgency=medium * d/p/0001-Add-initial-support-for-MediaTek-Genio-boards.patch diff -Nru alsa-ucm-conf-1.2.10/debian/patches/0001-Add-initial-support-for-MediaTek-mt8390-evk-and-mt83.patch alsa-ucm-conf-1.2.10/debian/patches/0001-Add-initial-support-for-MediaTek-mt8390-evk-and-mt83.patch --- alsa-ucm-conf-1.2.10/debian/patches/0001-Add-initial-support-for-MediaTek-mt8390-evk-and-mt83.patch 2024-01-16 18:23:07.000000000 +0800 +++ alsa-ucm-conf-1.2.10/debian/patches/0001-Add-initial-support-for-MediaTek-mt8390-evk-and-mt83.patch 1970-01-01 08:00:00.000000000 +0800 @@ -1,576 +0,0 @@ -From b6ee0f5a6f0c932fa4b9ae613b95790611669f75 Mon Sep 17 00:00:00 2001 -From: Ethan Hsieh -Date: Mon, 18 Sep 2023 16:10:42 +0800 -Subject: [PATCH] Add initial support for MediaTek mt8390-evk and mt8395-evk - -X-Background-info: This is not yet accepeted upstream, but to enable -hardware in time was discussed between Ethan Hsieh and Łukasz Zemczak -and accepted as is. Ethan plans to create another bug once it is fully -accepted upstream to update it with the final content - until then it -stays as-is. -Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/pull/321 -Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/pull/322 -Bug: https://bugs.launchpad.net/baoshan/+bug/2037058 -Last-Update: 2023-11-24 - ---- - ucm2/MediaTek/mt8390-evk/HiFi.conf | 217 +++++++++++++++++++++++ - ucm2/MediaTek/mt8390-evk/mt8390-evk.conf | 40 +++++ - ucm2/MediaTek/mt8395-evk/HiFi.conf | 200 +++++++++++++++++++++ - ucm2/MediaTek/mt8395-evk/mt8395-evk.conf | 46 +++++ - ucm2/conf.d/mt8390-evk/mt8390-evk.conf | 1 + - ucm2/conf.d/mt8395-evk/mt8395-evk.conf | 1 + - 6 files changed, 505 insertions(+) - create mode 100644 ucm2/MediaTek/mt8390-evk/HiFi.conf - create mode 100644 ucm2/MediaTek/mt8390-evk/mt8390-evk.conf - 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/mt8390-evk/mt8390-evk.conf - create mode 120000 ucm2/conf.d/mt8395-evk/mt8395-evk.conf - -diff --git a/ucm2/MediaTek/mt8390-evk/HiFi.conf b/ucm2/MediaTek/mt8390-evk/HiFi.conf -new file mode 100644 -index 0000000..cc1b3e8 ---- /dev/null -+++ b/ucm2/MediaTek/mt8390-evk/HiFi.conf -@@ -0,0 +1,217 @@ -+SectionVerb { -+ EnableSequence [ -+ cset "name='HDMI_OUT_MUX' Connect" -+ cset "name='DPTX_OUT_MUX' Disconnect" -+ 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" -+ ] -+ -+ DisableSequence [ -+ cset "name='HDMI_OUT_MUX' Disconnect" -+ cset "name='DPTX_OUT_MUX' Disconnect" -+ cset "name='O000 I000 Switch' off" -+ cset "name='O001 I001 Switch' off" -+ cset "name='O002 I004 Switch' off" -+ cset "name='O003 I006 Switch' off" -+ cset "name='O034 I168 Switch' off" -+ cset "name='O035 I169 Switch' off" -+ cset "name='O036 I012 Switch' off" -+ cset "name='O037 I013 Switch' off" -+ cset "name='O040 I002 Switch' off" -+ cset "name='O041 I003 Switch' off" -+ cset "name='O048 I022 Switch' off" -+ cset "name='O049 I023 Switch' off" -+ cset "name='O050 I024 Switch' off" -+ cset "name='O051 I025 Switch' off" -+ cset "name='O052 I026 Switch' off" -+ cset "name='O053 I027 Switch' off" -+ cset "name='O054 I028 Switch' off" -+ cset "name='O055 I029 Switch' off" -+ cset "name='O176 I070 Switch' off" -+ cset "name='O177 I071 Switch' off" -+ ] -+} -+ -+SectionDevice."Line4" { -+ Comment "I2S output" -+ -+ Value { -+ PlaybackPriority 100 -+ PlaybackChannels 8 -+ PlaybackPCM "hw:${CardId},6" -+ } -+} -+ -+SectionDevice."Line2" { -+ Comment "PCM output" -+ -+ Value { -+ PlaybackPriority 200 -+ PlaybackChannels 2 -+ PlaybackPCM "hw:${CardId},2" -+ } -+} -+ -+SectionDevice."HDMI" { -+ Comment "HDMI/DP 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."DP" { -+ Comment "HDMI/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."Line3" { -+ Comment "I2S input" -+ -+ Value { -+ CapturePriority 100 -+ CaptureChannels 2 -+ CapturePCM "hw:${CardId},11" -+ } -+} -+ -+SectionDevice."Line1" { -+ Comment "PCM input" -+ -+ Value { -+ CapturePriority 200 -+ CaptureChannels 2 -+ CapturePCM "hw:${CardId},8" -+ } -+} -+ -+SectionDevice."Mic2" { -+ Comment "Dmic" -+ -+ Value { -+ CapturePriority 300 -+ CaptureChannels 2 -+ CapturePCM "hw:${CardId},14" -+ } -+} -+ -+SectionDevice."Mic1" { -+ Comment "Amic" -+ -+ ConflictingDevice [ -+ "Headset" -+ ] -+ -+ EnableSequence [ -+ cset "name='PGA_L_Mux' AIN0" -+ ] -+ -+ Value { -+ CapturePriority 400 -+ CaptureChannels 1 -+ CapturePCM "hw:${CardId},10" -+ } -+} -+ -+SectionDevice."Headset" { -+ Comment "Earphone microphone" -+ -+ ConflictingDevice [ -+ "Mic1" -+ ] -+ -+ EnableSequence [ -+ cset "name='PGA_L_Mux' AIN1" -+ ] -+ -+ Value { -+ CapturePriority 500 -+ CaptureChannels 1 -+ CapturePCM "hw:${CardId},10" -+ } -+} -diff --git a/ucm2/MediaTek/mt8390-evk/mt8390-evk.conf b/ucm2/MediaTek/mt8390-evk/mt8390-evk.conf -new file mode 100644 -index 0000000..5ab5c36 ---- /dev/null -+++ b/ucm2/MediaTek/mt8390-evk/mt8390-evk.conf -@@ -0,0 +1,40 @@ -+Syntax 4 -+ -+SectionUseCase."HiFi" { -+ File "/MediaTek/mt8390-evk/HiFi.conf" -+ Comment "Play high quality music" -+} -+ -+BootSequence [ -+ cset "name='Headset Volume' 2" -+ cset "name='Lineout Volume' 10" -+ cset "name='PGA1 Volume' 4" -+ 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='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" -+] -diff --git a/ucm2/MediaTek/mt8395-evk/HiFi.conf b/ucm2/MediaTek/mt8395-evk/HiFi.conf -new file mode 100644 -index 0000000..4344e31 ---- /dev/null -+++ b/ucm2/MediaTek/mt8395-evk/HiFi.conf -@@ -0,0 +1,200 @@ -+SectionVerb { -+ EnableSequence [ -+ cset "name='HDMI_OUT_MUX' Connect" -+ cset "name='DPTX_OUT_MUX' Disconnect" -+ 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='O040 I002 Switch' on" -+ cset "name='O041 I003 Switch' on" -+ cset "name='O176 I070 Switch' on" -+ cset "name='O177 I071 Switch' on" -+ ] -+ -+ DisableSequence [ -+ cset "name='HDMI_OUT_MUX' Disconnect" -+ cset "name='DPTX_OUT_MUX' Disconnect" -+ cset "name='O000 I000 Switch' off" -+ cset "name='O001 I001 Switch' off" -+ cset "name='O002 I004 Switch' off" -+ cset "name='O003 I005 Switch' off" -+ cset "name='O004 I006 Switch' off" -+ cset "name='O005 I007 Switch' off" -+ cset "name='O006 I008 Switch' off" -+ cset "name='O007 I009 Switch' off" -+ cset "name='O008 I010 Switch' off" -+ cset "name='O009 I011 Switch' off" -+ cset "name='O034 I168 Switch' off" -+ cset "name='O035 I169 Switch' off" -+ cset "name='O038 I168 Switch' off" -+ cset "name='O040 I002 Switch' off" -+ cset "name='O041 I003 Switch' off" -+ cset "name='O176 I070 Switch' off" -+ cset "name='O177 I071 Switch' off" -+ ] -+} -+ -+SectionDevice."Line2" { -+ Comment "PCM output" -+ -+ Value { -+ PlaybackPriority 100 -+ PlaybackChannels 2 -+ PlaybackPCM "hw:${CardId},2" -+ } -+} -+ -+SectionDevice."HDMI" { -+ Comment "HDMI/DP 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."DP" { -+ Comment "HDMI/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."Line1" { -+ Comment "PCM input" -+ -+ Value { -+ CapturePriority 100 -+ CaptureChannels 2 -+ CapturePCM "hw:${CardId},8" -+ } -+} -+ -+SectionDevice."Mic2" { -+ Comment "Dmic" -+ -+ Value { -+ CapturePriority 200 -+ CaptureChannels 2 -+ CapturePCM "hw:${CardId},14" -+ } -+} -+ -+SectionDevice."Mic1" { -+ Comment "Amic" -+ -+ 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."Headset" { -+ Comment "Earphone microphone" -+ -+ ConflictingDevice [ -+ "Mic1" -+ ] -+ -+ EnableSequence [ -+ cset "name='PGA_L_Mux' AIN1" -+ ] -+ -+ Value { -+ CapturePriority 400 -+ CaptureChannels 3 -+ CapturePCM "hw:${CardId},15" -+ } -+} -diff --git a/ucm2/MediaTek/mt8395-evk/mt8395-evk.conf b/ucm2/MediaTek/mt8395-evk/mt8395-evk.conf -new file mode 100644 -index 0000000..3f8c618 ---- /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='Headset Volume' 2" -+ cset "name='Lineout Volume' 10" -+ cset "name='PGA1 Volume' 4" -+ cset "name='PGA2 Volume' 4" -+ cset "name='PGA3 Volume' 4" -+ 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='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/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 -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.10/debian/patches/0001-ucm2-conf.d-mt8370-evk-Fix-the-type-of-mt8370-evk.co.patch alsa-ucm-conf-1.2.10/debian/patches/0001-ucm2-conf.d-mt8370-evk-Fix-the-type-of-mt8370-evk.co.patch --- alsa-ucm-conf-1.2.10/debian/patches/0001-ucm2-conf.d-mt8370-evk-Fix-the-type-of-mt8370-evk.co.patch 1970-01-01 08:00:00.000000000 +0800 +++ alsa-ucm-conf-1.2.10/debian/patches/0001-ucm2-conf.d-mt8370-evk-Fix-the-type-of-mt8370-evk.co.patch 2024-01-25 13:29:18.000000000 +0800 @@ -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 +Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commit/d864e945ce4171fcaf6249bebec4f683fef0f5cf +Bug: https://bugs.launchpad.net/ubuntu/+source/alsa-ucm-conf/+bug/2051199 +--- + 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.10/debian/patches/0001-ucm2-MediaTek-mt8390-evk-Add-alsa-ucm-support.patch alsa-ucm-conf-1.2.10/debian/patches/0001-ucm2-MediaTek-mt8390-evk-Add-alsa-ucm-support.patch --- alsa-ucm-conf-1.2.10/debian/patches/0001-ucm2-MediaTek-mt8390-evk-Add-alsa-ucm-support.patch 1970-01-01 08:00:00.000000000 +0800 +++ alsa-ucm-conf-1.2.10/debian/patches/0001-ucm2-MediaTek-mt8390-evk-Add-alsa-ucm-support.patch 2024-01-25 13:29:18.000000000 +0800 @@ -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 +Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commit/c5366bdff656092241225d2ad663c3e41b146f8b +Bug: https://bugs.launchpad.net/ubuntu/+source/alsa-ucm-conf/+bug/2051199 +--- + 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.10/debian/patches/0001-ucm-MediaTek-mt8395-evk-Add-HDMIRX-config.patch alsa-ucm-conf-1.2.10/debian/patches/0001-ucm-MediaTek-mt8395-evk-Add-HDMIRX-config.patch --- alsa-ucm-conf-1.2.10/debian/patches/0001-ucm-MediaTek-mt8395-evk-Add-HDMIRX-config.patch 1970-01-01 08:00:00.000000000 +0800 +++ alsa-ucm-conf-1.2.10/debian/patches/0001-ucm-MediaTek-mt8395-evk-Add-HDMIRX-config.patch 2024-01-25 13:29:18.000000000 +0800 @@ -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 +Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commit/1ab2d020d71a570f691fafbd341782fabb6569d1 +Bug: https://bugs.launchpad.net/ubuntu/+source/alsa-ucm-conf/+bug/2051199 +--- + 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.10/debian/patches/0002-ucm2-MediaTek-mt8395-evk-Add-alsa-ucm-support.patch alsa-ucm-conf-1.2.10/debian/patches/0002-ucm2-MediaTek-mt8395-evk-Add-alsa-ucm-support.patch --- alsa-ucm-conf-1.2.10/debian/patches/0002-ucm2-MediaTek-mt8395-evk-Add-alsa-ucm-support.patch 1970-01-01 08:00:00.000000000 +0800 +++ alsa-ucm-conf-1.2.10/debian/patches/0002-ucm2-MediaTek-mt8395-evk-Add-alsa-ucm-support.patch 2024-01-25 13:29:18.000000000 +0800 @@ -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 +Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commit/5e75929e8a487498e24db27023be0b57bac222b0 +Bug: https://bugs.launchpad.net/ubuntu/+source/alsa-ucm-conf/+bug/2051199 +--- + 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.10/debian/patches/0003-ucm2-MediaTek-mt8370-evk-Add-alsa-ucm-support.patch alsa-ucm-conf-1.2.10/debian/patches/0003-ucm2-MediaTek-mt8370-evk-Add-alsa-ucm-support.patch --- alsa-ucm-conf-1.2.10/debian/patches/0003-ucm2-MediaTek-mt8370-evk-Add-alsa-ucm-support.patch 1970-01-01 08:00:00.000000000 +0800 +++ alsa-ucm-conf-1.2.10/debian/patches/0003-ucm2-MediaTek-mt8370-evk-Add-alsa-ucm-support.patch 2024-01-25 13:29:18.000000000 +0800 @@ -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 +Origin: upstream, https://github.com/alsa-project/alsa-ucm-conf/commit/a0856afae4e8e071e7626958667cde049ec81e97 +Bug: https://bugs.launchpad.net/ubuntu/+source/alsa-ucm-conf/+bug/2051199 +--- + 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.10/debian/patches/series alsa-ucm-conf-1.2.10/debian/patches/series --- alsa-ucm-conf-1.2.10/debian/patches/series 2023-11-24 16:12:05.000000000 +0800 +++ alsa-ucm-conf-1.2.10/debian/patches/series 2024-01-25 13:29:18.000000000 +0800 @@ -1,5 +1,9 @@ 0001-ucm2-add-PinePhone-configuration.patch 0002-ucm2-add-PineTab-configuration.patch 0003-ucm2-add-improved-Librem-5-profiles.patch -0001-Add-initial-support-for-MediaTek-mt8390-evk-and-mt83.patch 0001-ucm2-soundwire-add-rt713-SDCA-device.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