diff mbox series

[1/2] alsa-ucm-conf: upgrade 1.2.15.3 -> 1.2.16.1

Message ID 20260616164959.3399737-2-nicolas.dechesne@oss.qualcomm.com
State Under Review
Headers show
Series alsa-ucm-conf: upgrade to 1.2.16.1 and cleanup | expand

Commit Message

Nicolas Dechesne June 16, 2026, 4:49 p.m. UTC 
All local backported patches are now part of this release, so drop them.

Changelog: https://www.alsa-project.org/wiki/Changes_v1.2.15.3_v1.2.16
Changelog: https://www.alsa-project.org/wiki/Changes_v1.2.16_v1.2.16.1

Signed-off-by: Nicolas Dechesne <nicolas.dechesne@oss.qualcomm.com>
---
 ...mm-glymur-Add-GLYMUR-CRD-HiFi-config.patch | 104 ------------------
 ...Remove-JackControl-from-TALOS-EVK-Hi.patch |  43 --------
 ...8775p-Remove-Fixed-channel-setting-f.patch |  32 ------
 ...ADC-switch-in-HeadphoneMic2-sequence.patch |  47 --------
 ...s8300-Remove-Fixed-channel-setting-f.patch |  32 ------
 ..._1.2.15.3.bb => alsa-ucm-conf_1.2.16.1.bb} |   7 +-
 6 files changed, 1 insertion(+), 264 deletions(-)
 delete mode 100644 meta/recipes-multimedia/alsa/alsa-ucm-conf/0001-Qualcomm-glymur-Add-GLYMUR-CRD-HiFi-config.patch
 delete mode 100644 meta/recipes-multimedia/alsa/alsa-ucm-conf/0001-Qualcomm-qcs615-Remove-JackControl-from-TALOS-EVK-Hi.patch
 delete mode 100644 meta/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-Qualcomm-sa8775p-Remove-Fixed-channel-setting-f.patch
 delete mode 100644 meta/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-da7213-Add-ADC-switch-in-HeadphoneMic2-sequence.patch
 delete mode 100644 meta/recipes-multimedia/alsa/alsa-ucm-conf/0002-ucm2-Qualcomm-qcs8300-Remove-Fixed-channel-setting-f.patch
 rename meta/recipes-multimedia/alsa/{alsa-ucm-conf_1.2.15.3.bb => alsa-ucm-conf_1.2.16.1.bb} (60%)
diff mbox series

Patch

diff --git a/meta/recipes-multimedia/alsa/alsa-ucm-conf/0001-Qualcomm-glymur-Add-GLYMUR-CRD-HiFi-config.patch b/meta/recipes-multimedia/alsa/alsa-ucm-conf/0001-Qualcomm-glymur-Add-GLYMUR-CRD-HiFi-config.patch
deleted file mode 100644
index 33b82f1316..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-ucm-conf/0001-Qualcomm-glymur-Add-GLYMUR-CRD-HiFi-config.patch
+++ /dev/null
@@ -1,104 +0,0 @@ 
-From 41cfa5498ab37b67ae474abc88f08c9ef1bf9cc3 Mon Sep 17 00:00:00 2001
-From: Mohammad Rafi Shaik <mohammad.rafi.shaik@oss.qualcomm.com>
-Date: Wed, 4 Mar 2026 15:09:06 +0530
-Subject: [PATCH] Qualcomm: glymur: Add GLYMUR CRD HiFi config
-
-Add UCM2 configs for the Qualcomm GLYMUR CRD Board.
-
-Upstream-Status: Backport
-[https://github.com/alsa-project/alsa-ucm-conf/commit/41cfa5498ab37b67ae474abc88f08c9ef1bf9cc3]
-Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/713
-Signed-off-by: Mohammad Rafi Shaik <mohammad.rafi.shaik@oss.qualcomm.com>
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- ucm2/Qualcomm/glymur/GLYMUR-CRD.conf | 11 +++++++
- ucm2/Qualcomm/glymur/HiFi.conf       | 49 ++++++++++++++++++++++++++++
- ucm2/conf.d/glymur/GLYMUR-CRD.conf   |  1 +
- 3 files changed, 61 insertions(+)
- create mode 100755 ucm2/Qualcomm/glymur/GLYMUR-CRD.conf
- create mode 100755 ucm2/Qualcomm/glymur/HiFi.conf
- create mode 120000 ucm2/conf.d/glymur/GLYMUR-CRD.conf
-
-diff --git a/ucm2/Qualcomm/glymur/GLYMUR-CRD.conf b/ucm2/Qualcomm/glymur/GLYMUR-CRD.conf
-new file mode 100755
-index 0000000..15deae9
---- /dev/null
-+++ b/ucm2/Qualcomm/glymur/GLYMUR-CRD.conf
-@@ -0,0 +1,11 @@
-+Syntax 4
-+
-+SectionUseCase."HiFi" {
-+	File "/Qualcomm/glymur/HiFi.conf"
-+	Comment "HiFi quality Music."
-+}
-+
-+Include.card-init.File "/lib/card-init.conf"
-+Include.ctl-remap.File "/lib/ctl-remap.conf"
-+Include.wsa-init.File "/codecs/wsa884x/four-speakers/init.conf"
-+Include.wsam-init.File "/codecs/qcom-lpass/wsa-macro/four-speakers/init.conf"
-diff --git a/ucm2/Qualcomm/glymur/HiFi.conf b/ucm2/Qualcomm/glymur/HiFi.conf
-new file mode 100755
-index 0000000..7419c1e
---- /dev/null
-+++ b/ucm2/Qualcomm/glymur/HiFi.conf
-@@ -0,0 +1,49 @@
-+# Use case configuration for X1E80100.
-+# Author: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
-+
-+SectionVerb {
-+	EnableSequence [
-+		cset "name='WSA_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 1"
-+		cset "name='MultiMedia2 Mixer VA_CODEC_DMA_TX_0' 1"
-+	]
-+
-+	Include.wsae.File "/codecs/wsa884x/four-speakers/DefaultEnableSeq.conf"
-+	Include.wsm1e.File "/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerEnableSeq.conf"
-+	Include.wsm2e.File "/codecs/qcom-lpass/wsa-macro/Wsa2SpeakerEnableSeq.conf"
-+
-+	Value {
-+		TQ "HiFi"
-+	}
-+}
-+
-+SectionDevice."Speaker" {
-+	Comment "Speaker playback"
-+
-+	Include.wsmspk1e.File "/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerEnableSeq.conf"
-+	Include.wsmspk2e.File "/codecs/qcom-lpass/wsa-macro/Wsa2SpeakerEnableSeq.conf"
-+	Include.wsmspk1d.File "/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerDisableSeq.conf"
-+	Include.wsmspk2d.File "/codecs/qcom-lpass/wsa-macro/Wsa2SpeakerDisableSeq.conf"
-+	Include.wsaspk.File "/codecs/wsa884x/four-speakers/SpeakerSeq.conf"
-+
-+	Value {
-+		PlaybackChannels 4
-+		PlaybackPriority 100
-+		PlaybackPCM "hw:${CardId},0"
-+		PlaybackMixer "default:${CardId}"
-+		PlaybackMixerElem "Speakers"
-+	}
-+}
-+
-+SectionDevice."Mic" {
-+	Comment "Internal microphones"
-+
-+	Include.vadm0e.File "/codecs/qcom-lpass/va-macro/DMIC0EnableSeq.conf"
-+	Include.vadm0d.File "/codecs/qcom-lpass/va-macro/DMIC0DisableSeq.conf"
-+	Include.vadm1e.File "/codecs/qcom-lpass/va-macro/DMIC1EnableSeq.conf"
-+	Include.vadm1d.File "/codecs/qcom-lpass/va-macro/DMIC1DisableSeq.conf"
-+
-+	Value {
-+		CapturePriority 100
-+		CapturePCM "hw:${CardId},1"
-+	}
-+}
-diff --git a/ucm2/conf.d/glymur/GLYMUR-CRD.conf b/ucm2/conf.d/glymur/GLYMUR-CRD.conf
-new file mode 120000
-index 0000000..f90f419
---- /dev/null
-+++ b/ucm2/conf.d/glymur/GLYMUR-CRD.conf
-@@ -0,0 +1 @@
-+../../Qualcomm/glymur/GLYMUR-CRD.conf
-\ No newline at end of file
--- 
-2.34.1
-
diff --git a/meta/recipes-multimedia/alsa/alsa-ucm-conf/0001-Qualcomm-qcs615-Remove-JackControl-from-TALOS-EVK-Hi.patch b/meta/recipes-multimedia/alsa/alsa-ucm-conf/0001-Qualcomm-qcs615-Remove-JackControl-from-TALOS-EVK-Hi.patch
deleted file mode 100644
index ff08ebe6f7..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-ucm-conf/0001-Qualcomm-qcs615-Remove-JackControl-from-TALOS-EVK-Hi.patch
+++ /dev/null
@@ -1,43 +0,0 @@ 
-From 3e414225c90de8a9371076bcdd33693dfe8e54c2 Mon Sep 17 00:00:00 2001
-From: Le Qi <le.qi@oss.qualcomm.com>
-Date: Thu, 12 Feb 2026 15:16:41 +0800
-Subject: [PATCH] Qualcomm: qcs615: Remove JackControl from TALOS EVK HiFi
- config
-
-The EVK board does not support headset or jack detection.
-Keeping JackControl entries prevents PipeWire (wpctl) from
-exposing sinks and sources correctly.
-
-Remove JackControl from Headphones and Headset devices so
-PipeWire can enumerate playback and capture nodes normally.
-
-Signed-off-by: Le Qi <le.qi@oss.qualcomm.com>
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
-Upstream-Status: Backport [https://github.com/alsa-project/alsa-ucm-conf/commit/e513b19d223f1559f43579e881ba86c618c142a9]
----
- ucm2/Qualcomm/qcs615/HiFi.conf | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/ucm2/Qualcomm/qcs615/HiFi.conf b/ucm2/Qualcomm/qcs615/HiFi.conf
-index 8978b2cb539d..a20fc89fa8f4 100644
---- a/ucm2/Qualcomm/qcs615/HiFi.conf
-+++ b/ucm2/Qualcomm/qcs615/HiFi.conf
-@@ -20,7 +20,6 @@ SectionDevice."Headphones" {
- 		PlaybackPCM "hw:${CardId},0"
- 		PlaybackMixer "default:${CardId}"
- 		PlaybackMixerElem "HP Digital"
--		JackControl "Headphone Jack"
- 	}
- }
- 
-@@ -33,7 +32,6 @@ SectionDevice."Headset" {
- 	Value {
- 		CapturePriority 100
- 		CapturePCM "hw:${CardId},1"
--		JackControl "Mic Jack"
- 		JackHWMute "Mic"
- 	}
- }
--- 
-2.34.1
-
diff --git a/meta/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-Qualcomm-sa8775p-Remove-Fixed-channel-setting-f.patch b/meta/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-Qualcomm-sa8775p-Remove-Fixed-channel-setting-f.patch
deleted file mode 100644
index 6ebc4f04c2..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-Qualcomm-sa8775p-Remove-Fixed-channel-setting-f.patch
+++ /dev/null
@@ -1,32 +0,0 @@ 
-From ba4126955f3e145d3a70171b5e8a23aafa157052 Mon Sep 17 00:00:00 2001
-From: Mohammad Rafi Shaik <mohammad.rafi.shaik@oss.qualcomm.com>
-Date: Fri, 23 Jan 2026 15:26:17 +0530
-Subject: [PATCH 01/02] ucm2: Qualcomm: sa8775p: Remove Fixed channel setting
- for lemans-evk
-
-Remove Fixed channel setting for lemans-evk to support stereo
-capture.
-
-Upstream-Status: Backport
-[https://github.com/alsa-project/alsa-ucm-conf/commit/ba4126955f3e145d3a70171b5e8a23aafa157052]
-Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/694
-Signed-off-by: Mohammad Rafi Shaik <mohammad.rafi.shaik@oss.qualcomm.com>
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- ucm2/Qualcomm/sa8775p/lemans-evk/HiFi.conf | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/ucm2/Qualcomm/sa8775p/lemans-evk/HiFi.conf b/ucm2/Qualcomm/sa8775p/lemans-evk/HiFi.conf
-index 5915d1c..f2be928 100644
---- a/ucm2/Qualcomm/sa8775p/lemans-evk/HiFi.conf
-+++ b/ucm2/Qualcomm/sa8775p/lemans-evk/HiFi.conf
-@@ -25,6 +25,5 @@ SectionDevice."Mic" {
- 	Value {
- 		CapturePriority 100
- 		CapturePCM "hw:${CardId},1"
--		CaptureChannels 1
- 	}
- }
--- 
-2.34.1
-
diff --git a/meta/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-da7213-Add-ADC-switch-in-HeadphoneMic2-sequence.patch b/meta/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-da7213-Add-ADC-switch-in-HeadphoneMic2-sequence.patch
deleted file mode 100644
index 4ff933cc0c..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-da7213-Add-ADC-switch-in-HeadphoneMic2-sequence.patch
+++ /dev/null
@@ -1,47 +0,0 @@ 
-From 8a9581426459e1b423ef87d5ae0fe0a9e21eeaad Mon Sep 17 00:00:00 2001
-From: Le Qi <le.qi@oss.qualcomm.com>
-Date: Wed, 7 Jan 2026 11:20:54 +0800
-Subject: [PATCH] ucm2: da7213: Add ADC switch in HeadphoneMic2 sequences
-
-Enable and disable the ADC switch in HeadphoneMic2EnableSeq.conf and
-HeadphoneMic2DisableSeq.conf to ensure headset microphone audio works
-properly on Talos EVK with DA7213 codec.
-
-Without this change, the headset mic path remains muted and capture
-does not function.
-
-Signed-off-by: Le Qi <le.qi@oss.qualcomm.com>
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
-Upstream-Status: Backport [https://github.com/alsa-project/alsa-ucm-conf/commit/8a9581426459e1b423ef87d5ae0fe0a9e21eeaad]
----
- ucm2/codecs/da7213/HeadphoneMic2DisableSeq.conf | 1 +
- ucm2/codecs/da7213/HeadphoneMic2EnableSeq.conf  | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/ucm2/codecs/da7213/HeadphoneMic2DisableSeq.conf b/ucm2/codecs/da7213/HeadphoneMic2DisableSeq.conf
-index a42f5f12be93..a9693af90acc 100644
---- a/ucm2/codecs/da7213/HeadphoneMic2DisableSeq.conf
-+++ b/ucm2/codecs/da7213/HeadphoneMic2DisableSeq.conf
-@@ -3,6 +3,7 @@ DisableSequence [
- 	cset "name='Mixin Left Mic 2 Switch' off"
- 	cset "name='Mixin Right Mic 2 Switch' off"
- 	cset "name='Mixin PGA Switch' off"
-+	cset "name='ADC Switch' off"
- 	cset "name='Headphone Switch' off"
- 	cset "name='Mixout Left DAC Left Switch' off"
- 	cset "name='Mixout Right DAC Right Switch' off"
-diff --git a/ucm2/codecs/da7213/HeadphoneMic2EnableSeq.conf b/ucm2/codecs/da7213/HeadphoneMic2EnableSeq.conf
-index d3a69e0a550c..42bd9e2ba1fd 100644
---- a/ucm2/codecs/da7213/HeadphoneMic2EnableSeq.conf
-+++ b/ucm2/codecs/da7213/HeadphoneMic2EnableSeq.conf
-@@ -5,6 +5,7 @@ EnableSequence [
- 	cset "name='Mixin Left Mic 2 Switch' on"
- 	cset "name='Mixin Right Mic 2 Switch' on"
- 	cset "name='Mixin PGA Switch' on"
-+	cset "name='ADC Switch' on"
- 	cset "name='DAI Left Source MUX' ADC Left"
- 	cset "name='DAI Right Source MUX' ADC Right"
- 	cset "name='Headphone Volume' 85"
--- 
-2.34.1
-
diff --git a/meta/recipes-multimedia/alsa/alsa-ucm-conf/0002-ucm2-Qualcomm-qcs8300-Remove-Fixed-channel-setting-f.patch b/meta/recipes-multimedia/alsa/alsa-ucm-conf/0002-ucm2-Qualcomm-qcs8300-Remove-Fixed-channel-setting-f.patch
deleted file mode 100644
index db561cdd55..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-ucm-conf/0002-ucm2-Qualcomm-qcs8300-Remove-Fixed-channel-setting-f.patch
+++ /dev/null
@@ -1,32 +0,0 @@ 
-From 5c7b40c96b6cefd4d1d545d89b6d030248f0bb1c Mon Sep 17 00:00:00 2001
-From: Mohammad Rafi Shaik <mohammad.rafi.shaik@oss.qualcomm.com>
-Date: Fri, 23 Jan 2026 15:31:34 +0530
-Subject: [PATCH 02/02] ucm2: Qualcomm: qcs8300: Remove Fixed channel setting
- for monaco-evk
-
-Remove Fixed channel setting for monaco-evk to support stereo
-capture.
-
-Upstream-Status: Backport
-[https://github.com/alsa-project/alsa-ucm-conf/commit/5c7b40c96b6cefd4d1d545d89b6d030248f0bb1c]
-Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/694
-Signed-off-by: Mohammad Rafi Shaik <mohammad.rafi.shaik@oss.qualcomm.com>
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- ucm2/Qualcomm/qcs8300/monaco-evk/HiFi.conf | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/ucm2/Qualcomm/qcs8300/monaco-evk/HiFi.conf b/ucm2/Qualcomm/qcs8300/monaco-evk/HiFi.conf
-index 8345129..b60a310 100644
---- a/ucm2/Qualcomm/qcs8300/monaco-evk/HiFi.conf
-+++ b/ucm2/Qualcomm/qcs8300/monaco-evk/HiFi.conf
-@@ -25,6 +25,5 @@ SectionDevice."Mic" {
- 	Value {
- 		CapturePriority 100
- 		CapturePCM "hw:${CardId},1"
--		CaptureChannels 1
- 	}
- }
--- 
-2.34.1
-
diff --git a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.15.3.bb b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.16.1.bb
similarity index 60%
rename from meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.15.3.bb
rename to meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.16.1.bb
index 0a6f884e5e..095deca908 100644
--- a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.15.3.bb
+++ b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.16.1.bb
@@ -8,12 +8,7 @@  LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=20d74d74db9741697903372ad001d3b4"
 
 SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2"
-SRC_URI += "file://0001-Qualcomm-qcs615-Remove-JackControl-from-TALOS-EVK-Hi.patch"
-SRC_URI += "file://0001-ucm2-da7213-Add-ADC-switch-in-HeadphoneMic2-sequence.patch"
-SRC_URI += "file://0001-ucm2-Qualcomm-sa8775p-Remove-Fixed-channel-setting-f.patch"
-SRC_URI += "file://0002-ucm2-Qualcomm-qcs8300-Remove-Fixed-channel-setting-f.patch"
-SRC_URI += "file://0001-Qualcomm-glymur-Add-GLYMUR-CRD-HiFi-config.patch"
-SRC_URI[sha256sum] = "9f79e813c08fc86cfa46dd75c4fcda1a4a51b482db2607e1fcfaafb92f588a31"
+SRC_URI[sha256sum] = "cf3d1c07e089a83c4ece2c20f05dd6a8aab7fcd108768c38811386880575492b"
 # Something went wrong at upstream tarballing
 
 inherit allarch