aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Dechesne <ndechesne@users.noreply.github.com>2021-02-17 15:24:37 +0100
committerGitHub <noreply@github.com>2021-02-17 15:24:37 +0100
commitc552911cf83a8fe9b0f86d64c60c4852fb1ac255 (patch)
tree139358d668121ca042cd7cdc68e8bebd751ac825
parente292c39da25d4c163df8a0fb27a81514eb62377b (diff)
parentcd7a3371bb927df90e64d3b91f9a09375f143f08 (diff)
downloadmeta-qcom-c552911cf83a8fe9b0f86d64c60c4852fb1ac255.tar.gz
meta-qcom-c552911cf83a8fe9b0f86d64c60c4852fb1ac255.tar.bz2
meta-qcom-c552911cf83a8fe9b0f86d64c60c4852fb1ac255.zip
Merge pull request #260 from lumag/alsa-ucm-fixup
Alsa ucm fixup
-rw-r--r--recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-conf.d-add-symlinks-for-Qualcomm-cards.patch44
-rw-r--r--recipes-multimedia/alsa/alsa-ucm-conf/0002-ucm2-add-support-to-for-Qualcomm-RB5-Platform.patch12
-rw-r--r--recipes-multimedia/alsa/alsa-ucm-conf/0003-ucm.conf-support-KernelModule-CardLongName.conf-path.patch28
-rw-r--r--recipes-multimedia/alsa/alsa-ucm-conf/0004-module-add-new-symlink-for-Qualcomm-sdm845-driver.patch21
-rw-r--r--recipes-multimedia/alsa/alsa-ucm-conf/0007-ucm2-module-add-snd_soc_sm8250-symlink.patch19
-rw-r--r--recipes-multimedia/alsa/alsa-ucm-conf_%.bbappend7
6 files changed, 58 insertions, 73 deletions
diff --git a/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-conf.d-add-symlinks-for-Qualcomm-cards.patch b/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-conf.d-add-symlinks-for-Qualcomm-cards.patch
new file mode 100644
index 0000000..bd93c9f
--- /dev/null
+++ b/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-conf.d-add-symlinks-for-Qualcomm-cards.patch
@@ -0,0 +1,44 @@
+From 2957017f9ca01b0e1e127c04ba47e0147bff7e47 Mon Sep 17 00:00:00 2001
+From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+Date: Fri, 5 Feb 2021 20:45:40 +0300
+Subject: [PATCH] ucm2/conf.d: add symlinks for Qualcomm cards
+
+Add ucm2/conf.d symlinks for all defined Qualcomm sound cards.
+
+Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+---
+ ucm2/conf.d/DB820c/DB820c.conf | 1 +
+ ucm2/conf.d/DB410c/DB410c.conf | 1 +
+ ucm2/conf.d/sdm845/DB845c.conf | 1 +
+ 4 files changed, 4 insertions(+)
+ create mode 120000 ucm2/conf.d/DB820c/DB820c.conf
+ create mode 120000 ucm2/conf.d/DB410c/DB410c.conf
+ create mode 120000 ucm2/conf.d/sdm845/DB845c.conf
+
+diff --git a/ucm2/conf.d/DB820c/DB820c.conf b/ucm2/conf.d/DB820c/DB820c.conf
+new file mode 120000
+index 000000000000..b8ceeabaa70d
+--- /dev/null
++++ b/ucm2/conf.d/DB820c/DB820c.conf
+@@ -0,0 +1 @@
++../../Qualcomm/apq8096/apq8096.conf
+\ No newline at end of file
+diff --git a/ucm2/conf.d/DB410c/DB410c.conf b/ucm2/conf.d/DB410c/DB410c.conf
+new file mode 120000
+index 000000000000..551122e14c16
+--- /dev/null
++++ b/ucm2/conf.d/DB410c/DB410c.conf
+@@ -0,0 +1 @@
++../../Qualcomm/apq8016-sbc/apq8016-sbc.conf
+\ No newline at end of file
+diff --git a/ucm2/conf.d/sdm845/DB845c.conf b/ucm2/conf.d/sdm845/DB845c.conf
+new file mode 120000
+index 000000000000..fad79da8dd8e
+--- /dev/null
++++ b/ucm2/conf.d/sdm845/DB845c.conf
+@@ -0,0 +1 @@
++../../Qualcomm/sdm845/sdm845.conf
+\ No newline at end of file
+--
+2.30.0
+
diff --git a/recipes-multimedia/alsa/alsa-ucm-conf/0002-ucm2-add-support-to-for-Qualcomm-RB5-Platform.patch b/recipes-multimedia/alsa/alsa-ucm-conf/0002-ucm2-add-support-to-for-Qualcomm-RB5-Platform.patch
index 452128e..b972cf5 100644
--- a/recipes-multimedia/alsa/alsa-ucm-conf/0002-ucm2-add-support-to-for-Qualcomm-RB5-Platform.patch
+++ b/recipes-multimedia/alsa/alsa-ucm-conf/0002-ucm2-add-support-to-for-Qualcomm-RB5-Platform.patch
@@ -12,10 +12,12 @@ Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
ucm2/Qualcomm/sm8250/HDMI.conf | 26 ++++++++++++
ucm2/Qualcomm/sm8250/HiFi.conf | 46 ++++++++++++++++++++++
.../Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf | 11 ++++++
- 3 files changed, 83 insertions(+)
+ ucm2/conf.d/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf | 1 +
+ 4 files changed, 84 insertions(+)
create mode 100644 ucm2/Qualcomm/sm8250/HDMI.conf
create mode 100644 ucm2/Qualcomm/sm8250/HiFi.conf
create mode 100644 ucm2/Qualcomm/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf
+ create mode 120000 ucm2/conf.d/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf
diff --git a/ucm2/Qualcomm/sm8250/HDMI.conf b/ucm2/Qualcomm/sm8250/HDMI.conf
new file mode 100644
@@ -118,3 +120,11 @@ index 0000000..2fbca31
+ File "/Qualcomm/sm8250/HDMI.conf"
+ Comment "HDMI output."
+}
+diff --git a/ucm2/conf.d/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf b/ucm2/conf.d/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf
+new file mode 120000
+index 000000000000..9f551b74ebf2
+--- /dev/null
++++ b/ucm2/conf.d/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf
+@@ -0,0 +1 @@
++../../Qualcomm/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf
+\ No newline at end of file
diff --git a/recipes-multimedia/alsa/alsa-ucm-conf/0003-ucm.conf-support-KernelModule-CardLongName.conf-path.patch b/recipes-multimedia/alsa/alsa-ucm-conf/0003-ucm.conf-support-KernelModule-CardLongName.conf-path.patch
deleted file mode 100644
index 49f02b0..0000000
--- a/recipes-multimedia/alsa/alsa-ucm-conf/0003-ucm.conf-support-KernelModule-CardLongName.conf-path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Date: Fri, 29 Jan 2021 15:31:35 +0300
-Subject: ucm.conf: support KernelModule/CardLongName.conf paths
-
-Add support for 'ucm2/module/${KernelModule}/${CardLongName}.conf'
-paths.
-
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Change-Id: Ib006691e4b384543f97897c03fe575f8278e66f5
----
- ucm2/ucm.conf | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/ucm2/ucm.conf b/ucm2/ucm.conf
-index 9e78df1..a9613a2 100644
---- a/ucm2/ucm.conf
-+++ b/ucm2/ucm.conf
-@@ -53,6 +53,10 @@ If.driver {
- False {
- Define.KernelModulePath "class/sound/card${CardNumber}/device/driver/module"
- Define.KernelModule "$${sys:$KernelModulePath}"
-+ UseCasePath.modulelongname {
-+ Directory "module/${var:KernelModule}"
-+ File "${CardLongName}.conf"
-+ }
- UseCasePath.module {
- Directory "module"
- File "${var:KernelModule}.conf"
diff --git a/recipes-multimedia/alsa/alsa-ucm-conf/0004-module-add-new-symlink-for-Qualcomm-sdm845-driver.patch b/recipes-multimedia/alsa/alsa-ucm-conf/0004-module-add-new-symlink-for-Qualcomm-sdm845-driver.patch
deleted file mode 100644
index 6d46996..0000000
--- a/recipes-multimedia/alsa/alsa-ucm-conf/0004-module-add-new-symlink-for-Qualcomm-sdm845-driver.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Date: Fri, 29 Jan 2021 15:32:06 +0300
-Subject: module: add new symlink for Qualcomm/sdm845 driver
-
-Add module/snd_soc_sdm845 -> Qualcomm/sdm845 link.
-
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Change-Id: I5325033f47ee131499ed406ec56284bbf2f58b8d
----
- ucm2/module/snd_soc_sdm845 | 1 +
- 1 file changed, 1 insertion(+)
- create mode 120000 ucm2/module/snd_soc_sdm845
-
-diff --git a/ucm2/module/snd_soc_sdm845 b/ucm2/module/snd_soc_sdm845
-new file mode 120000
-index 0000000..6800b66
---- /dev/null
-+++ b/ucm2/module/snd_soc_sdm845
-@@ -0,0 +1 @@
-+../Qualcomm/sdm845
-\ No newline at end of file
diff --git a/recipes-multimedia/alsa/alsa-ucm-conf/0007-ucm2-module-add-snd_soc_sm8250-symlink.patch b/recipes-multimedia/alsa/alsa-ucm-conf/0007-ucm2-module-add-snd_soc_sm8250-symlink.patch
deleted file mode 100644
index 30d61c4..0000000
--- a/recipes-multimedia/alsa/alsa-ucm-conf/0007-ucm2-module-add-snd_soc_sm8250-symlink.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Date: Fri, 29 Jan 2021 15:41:39 +0300
-Subject: ucm2/module: add snd_soc_sm8250 symlink
-
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Change-Id: I9818a19ef812d715d65345ea3733f635d5505c2e
----
- ucm2/module/snd_soc_sm8250 | 1 +
- 1 file changed, 1 insertion(+)
- create mode 120000 ucm2/module/snd_soc_sm8250
-
-diff --git a/ucm2/module/snd_soc_sm8250 b/ucm2/module/snd_soc_sm8250
-new file mode 120000
-index 0000000..faf64f1
---- /dev/null
-+++ b/ucm2/module/snd_soc_sm8250
-@@ -0,0 +1 @@
-+../Qualcomm/sm8250
-\ No newline at end of file
diff --git a/recipes-multimedia/alsa/alsa-ucm-conf_%.bbappend b/recipes-multimedia/alsa/alsa-ucm-conf_%.bbappend
index d2b6180..ef4fa85 100644
--- a/recipes-multimedia/alsa/alsa-ucm-conf_%.bbappend
+++ b/recipes-multimedia/alsa/alsa-ucm-conf_%.bbappend
@@ -1,9 +1,8 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
-SRC_URI_append_sm8250 = "\
+SRC_URI_append_qcom = "\
+ file://0001-ucm2-Separate-the-configuration-lookups-hw-based-fro.patch \
file://0001-ucm2-codecs-lpass-add-codec-sequences-for-wsa-and-va.patch \
file://0002-ucm2-add-support-to-for-Qualcomm-RB5-Platform.patch \
- file://0003-ucm.conf-support-KernelModule-CardLongName.conf-path.patch \
- file://0004-module-add-new-symlink-for-Qualcomm-sdm845-driver.patch \
- file://0007-ucm2-module-add-snd_soc_sm8250-symlink.patch \
+ file://0001-ucm2-conf.d-add-symlinks-for-Qualcomm-cards.patch \
"