diff options
12 files changed, 178 insertions, 407 deletions
diff --git a/recipes-multimedia/alsa/alsa-lib/0002-ucm-Add-ucm-files-for-DB845c-HDMI-audio.patch b/recipes-multimedia/alsa/alsa-lib/0002-ucm-Add-ucm-files-for-DB845c-HDMI-audio.patch deleted file mode 100644 index 6c35b35..0000000 --- a/recipes-multimedia/alsa/alsa-lib/0002-ucm-Add-ucm-files-for-DB845c-HDMI-audio.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 220efcf59c12bb3b6022bdbc3fc54e689451b6ba Mon Sep 17 00:00:00 2001 -From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> -Date: Wed, 17 Apr 2019 15:20:27 +0100 -Subject: [PATCH 02/10] ucm: Add: ucm files for DB845c HDMI audio - -Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> ---- - configure.ac | 1 + - src/conf/ucm/DB845c/DB845c.conf | 4 ++++ - src/conf/ucm/DB845c/HDMI | 37 +++++++++++++++++++++++++++++++++ - src/conf/ucm/DB845c/Makefile.am | 4 ++++ - src/conf/ucm/Makefile.am | 1 + - 5 files changed, 47 insertions(+) - create mode 100644 src/conf/ucm/DB845c/DB845c.conf - create mode 100644 src/conf/ucm/DB845c/HDMI - create mode 100644 src/conf/ucm/DB845c/Makefile.am - -diff --git a/configure.ac b/configure.ac -index 0fb34de4..ebea5949 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -748,6 +748,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ - src/conf/ucm/DAISY-I2S/Makefile \ - src/conf/ucm/DB410c/Makefile \ - src/conf/ucm/DB820c/Makefile \ -+ src/conf/ucm/DB845c/Makefile \ - src/conf/ucm/Dell-WD15-Dock/Makefile \ - src/conf/ucm/GoogleNyan/Makefile \ - src/conf/ucm/gpd-win-pocket-rt5645/Makefile \ -diff --git a/src/conf/ucm/DB845c/DB845c.conf b/src/conf/ucm/DB845c/DB845c.conf -new file mode 100644 -index 00000000..49c688e5 ---- /dev/null -+++ b/src/conf/ucm/DB845c/DB845c.conf -@@ -0,0 +1,4 @@ -+SectionUseCase."HDMI" { -+ File "HDMI" -+ Comment "HDMI output." -+} -diff --git a/src/conf/ucm/DB845c/HDMI b/src/conf/ucm/DB845c/HDMI -new file mode 100644 -index 00000000..fdac94e5 ---- /dev/null -+++ b/src/conf/ucm/DB845c/HDMI -@@ -0,0 +1,37 @@ -+# Use case configuration for DB845c board. -+# Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> -+ -+SectionVerb { -+ EnableSequence [ -+ cdev "hw:0" -+ cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 1" -+ ] -+ -+ DisableSequence [ -+ cdev "hw:0" -+ cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 0" -+ ] -+ Value { -+ TQ "HiFi" -+ PlaybackPCM "plughw:0,0" -+ } -+} -+ -+SectionDevice."HDMI-stereo" { -+ #Name "HDMI-stereo" -+ Comment "HDMI Digital Stereo Output" -+ -+ EnableSequence [ -+ cdev "hw:0" -+ cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 1" -+ ] -+ -+ DisableSequence [ -+ cdev "hw:0" -+ cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 0" -+ ] -+ -+ Value { -+ PlaybackChannels "2" -+ } -+} -diff --git a/src/conf/ucm/DB845c/Makefile.am b/src/conf/ucm/DB845c/Makefile.am -new file mode 100644 -index 00000000..34b28d86 ---- /dev/null -+++ b/src/conf/ucm/DB845c/Makefile.am -@@ -0,0 +1,4 @@ -+alsaconfigdir = @ALSA_CONFIG_DIR@ -+ucmdir = $(alsaconfigdir)/ucm/DB845c -+ucm_DATA = DB845c.conf HDMI -+EXTRA_DIST = $(ucm_DATA) -diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am -index e9f88ed6..46d246ea 100644 ---- a/src/conf/ucm/Makefile.am -+++ b/src/conf/ucm/Makefile.am -@@ -32,6 +32,7 @@ cube-i1_TF-Defaultstring-CherryTrailCR \ - DAISY-I2S \ - DB410c \ - DB820c \ -+DB845c \ - Dell-WD15-Dock \ - GoogleNyan \ - gpd-win-pocket-rt5645 \ --- -2.24.0 - diff --git a/recipes-multimedia/alsa/alsa-lib/0007-Lenovo-YOGA-C630-13Q50-Add-ucm-for-Speaker-and-Heads.patch b/recipes-multimedia/alsa/alsa-lib/0007-Lenovo-YOGA-C630-13Q50-Add-ucm-for-Speaker-and-Heads.patch deleted file mode 100644 index 0a84071..0000000 --- a/recipes-multimedia/alsa/alsa-lib/0007-Lenovo-YOGA-C630-13Q50-Add-ucm-for-Speaker-and-Heads.patch +++ /dev/null @@ -1,179 +0,0 @@ -From 0b1e5ae38b2b27722fb85c2c7fda1e591cd4adf3 Mon Sep 17 00:00:00 2001 -From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> -Date: Fri, 18 Oct 2019 00:37:29 +0100 -Subject: [PATCH 07/10] Lenovo-YOGA-C630-13Q50: Add ucm for Speaker and Headset - -Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> ---- - configure.ac | 1 + - src/conf/ucm/Lenovo-YOGA-C630-13Q50/HiFi | 113 ++++++++++++++++++ - .../Lenovo-YOGA-C630-13Q50.conf | 13 ++ - .../ucm/Lenovo-YOGA-C630-13Q50/Makefile.am | 4 + - 4 files changed, 131 insertions(+) - create mode 100644 src/conf/ucm/Lenovo-YOGA-C630-13Q50/HiFi - create mode 100644 src/conf/ucm/Lenovo-YOGA-C630-13Q50/Lenovo-YOGA-C630-13Q50.conf - create mode 100644 src/conf/ucm/Lenovo-YOGA-C630-13Q50/Makefile.am - -diff --git a/configure.ac b/configure.ac -index ebea5949..d8e6794a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -756,6 +756,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ - src/conf/ucm/HDAudio-Lenovo-DualCodecs/Makefile \ - src/conf/ucm/kblrt5660/Makefile \ - src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/Makefile \ -+ src/conf/ucm/Lenovo-YOGA-C630-13Q50/Makefile \ - src/conf/ucm/PandaBoard/Makefile \ - src/conf/ucm/PandaBoardES/Makefile \ - src/conf/ucm/PAZ00/Makefile \ -diff --git a/src/conf/ucm/Lenovo-YOGA-C630-13Q50/HiFi b/src/conf/ucm/Lenovo-YOGA-C630-13Q50/HiFi -new file mode 100644 -index 00000000..b3ba8be0 ---- /dev/null -+++ b/src/conf/ucm/Lenovo-YOGA-C630-13Q50/HiFi -@@ -0,0 +1,113 @@ -+# Use case configuration for Lenovo-YOGA-C630-13Q50 board. -+# Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> -+ -+SectionVerb { -+ -+ EnableSequence [ -+ cdev "hw:Lenovo-YOGA-C630-13Q50" -+ cset "name='SLIM RX6 MUX' AIF1_PB" -+ cset "name='SLIM RX7 MUX' AIF1_PB" -+ cset "name='RX INT7_1 MIX1 INP0' RX6" -+ cset "name='RX INT8_1 MIX1 INP0' RX7" -+ ## gain to 0dB -+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" -+ ] -+ -+ DisableSequence [ -+ cdev "hw:Lenovo-YOGA-C630-13Q50" -+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" -+ ] -+ -+ # ALSA PCM -+ Value { -+ # ALSA PCM device for HiFi -+ PlaybackPCM "hw:Lenovo-YOGA-C630-13Q50,0" -+ } -+} -+ -+SectionDevice."Speakers" { -+ Comment "Speakers playback" -+ -+ EnableSequence [ -+ cdev "hw:Lenovo-YOGA-C630-13Q50" -+ cset "name='SLIM RX6 MUX' AIF1_PB" -+ cset "name='SLIM RX7 MUX' AIF1_PB" -+ cset "name='SLIM RX1 MUX' ZERO" -+ cset "name='SLIM RX2 MUX' ZERO" -+ cset "name='RX INT7_1 MIX1 INP0' RX6" -+ cset "name='RX INT8_1 MIX1 INP0' RX7" -+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" -+ cset "name='COMP7 Switch' 1" -+ cset "name='COMP8 Switch' 1" -+ ## Speakers -+ 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" -+ ] -+ -+ DisableSequence [ -+ cdev "hw:Lenovo-YOGA-C630-13Q50" -+ cset "name='SLIM RX6 MUX' ZERO" -+ cset "name='SLIM RX7 MUX' ZERO" -+ cset "name='COMP7 Switch' 0" -+ cset "name='COMP8 Switch' 0" -+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" -+ cset "name='SpkrLeft DAC Switch' 0" -+ cset "name='SpkrLeft COMP Switch' 0" -+ cset "name='SpkrLeft BOOST Switch' 0" -+ cset "name='SpkrLeft VISENSE Switch' 0" -+ cset "name='SpkrRight DAC Switch' 0" -+ cset "name='SpkrRight COMP Switch' 0" -+ cset "name='SpkrRight BOOST Switch' 0" -+ cset "name='SpkrRight VISENSE Switch' 0" -+ ] -+ -+ Value { -+ PlaybackChannels "2" -+ } -+} -+ -+SectionDevice."HeadPhones" { -+ Comment "HeadPhones playback" -+ -+ EnableSequence [ -+ cdev "hw:Lenovo-YOGA-C630-13Q50" -+ cset "name='SLIM RX1 MUX' AIF1_PB" -+ cset "name='SLIM RX2 MUX' AIF1_PB" -+ cset "name='SLIM RX7 MUX' ZERO" -+ cset "name='SLIM RX6 MUX' ZERO" -+ cset "name='RX INT1_2 MUX' RX1" -+ cset "name='RX INT2_2 MUX' RX2" -+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" -+ cset "name='COMP1 Switch' 1" -+ cset "name='COMP2 Switch' 1" -+ cset "name='RX1 Digital Volume' 68" -+ cset "name='RX2 Digital Volume' 68" -+ cset "name='RX INT1 DEM MUX' CLSH_DSM_OUT" -+ cset "name='RX INT2 DEM MUX' CLSH_DSM_OUT" -+ ] -+ -+ DisableSequence [ -+ cdev "hw:Lenovo-YOGA-C630-13Q50" -+ cset "name='SLIM RX1 MUX' ZERO" -+ cset "name='SLIM RX2 MUX' ZERO" -+ cset "name='RX INT1_2 MUX' ZERO" -+ cset "name='RX INT2_2 MUX' ZERO" -+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" -+ cset "name='COMP1 Switch' 0" -+ cset "name='COMP2 Switch' 0" -+ cset "name='RX1 Digital Volume' 68" -+ cset "name='RX2 Digital Volume' 68" -+ cset "name='RX INT1 DEM MUX' ZERO" -+ cset "name='RX INT2 DEM MUX' ZERO" -+ ] -+ -+ Value { -+ PlaybackChannels "2" -+ } -+} -diff --git a/src/conf/ucm/Lenovo-YOGA-C630-13Q50/Lenovo-YOGA-C630-13Q50.conf b/src/conf/ucm/Lenovo-YOGA-C630-13Q50/Lenovo-YOGA-C630-13Q50.conf -new file mode 100644 -index 00000000..dae84a1c ---- /dev/null -+++ b/src/conf/ucm/Lenovo-YOGA-C630-13Q50/Lenovo-YOGA-C630-13Q50.conf -@@ -0,0 +1,13 @@ -+SectionUseCase."HiFi" { -+ File "HiFi" -+ Comment "HiFi quality Music." -+} -+ -+SectionDefaults [ -+ cdev "hw:Lenovo-YOGA-C630-13Q50" -+ cset "name='SLIM RX6 MUX' AIF1_PB" -+ cset "name='SLIM RX7 MUX' AIF1_PB" -+ cset "name='RX INT7_1 MIX1 INP0' RX6" -+ cset "name='RX INT8_1 MIX1 INP0' RX7" -+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" -+] -diff --git a/src/conf/ucm/Lenovo-YOGA-C630-13Q50/Makefile.am b/src/conf/ucm/Lenovo-YOGA-C630-13Q50/Makefile.am -new file mode 100644 -index 00000000..05397651 ---- /dev/null -+++ b/src/conf/ucm/Lenovo-YOGA-C630-13Q50/Makefile.am -@@ -0,0 +1,4 @@ -+alsaconfigdir = @ALSA_CONFIG_DIR@ -+ucmdir = $(alsaconfigdir)/ucm/Lenovo-YOGA-C630-13Q50 -+ucm_DATA = Lenovo-YOGA-C630-13Q50.conf HiFi -+EXTRA_DIST = $(ucm_DATA) --- -2.24.0 - diff --git a/recipes-multimedia/alsa/alsa-lib_1.1.%.bbappend b/recipes-multimedia/alsa/alsa-lib_1.1.%.bbappend deleted file mode 100644 index 1c22597..0000000 --- a/recipes-multimedia/alsa/alsa-lib_1.1.%.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" - -SRC_URI_append_sdm845 = " \ - file://0002-ucm-Add-ucm-files-for-DB845c-HDMI-audio.patch \ - file://0003-ucm-Add-ucm-files-for-DB845c-analog-audio.patch \ - file://0004-DB845c-fix-Defaults.patch \ - file://0005-WIP-make-card-name-explicit.patch \ - file://0006-DB845c-Add-headset-mixer-controls.patch \ - file://0007-Lenovo-YOGA-C630-13Q50-Add-ucm-for-Speaker-and-Heads.patch \ - file://0008-ucm-DB845c-update-volume-controls.patch \ - file://0009-ucm-DB845c-remove-headphones-for-now.patch \ - file://0010-ucm-DB845c-adjust-default-volume-of-speakers.patch \ -" diff --git a/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm-Add-ucm-files-for-DB845c-HDMI-audio.patch b/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm-Add-ucm-files-for-DB845c-HDMI-audio.patch new file mode 100644 index 0000000..10b9173 --- /dev/null +++ b/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm-Add-ucm-files-for-DB845c-HDMI-audio.patch @@ -0,0 +1,69 @@ +From 26431e6a8301d3908074edc0c3afdcc1edab08ce Mon Sep 17 00:00:00 2001 +From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> +Date: Wed, 17 Apr 2019 15:20:27 +0100 +Subject: [PATCH 01/10] ucm: Add: ucm files for DB845c HDMI audio + +Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> +--- + ucm2/DB845c/DB845c.conf | 4 ++++ + ucm2/DB845c/HDMI | 37 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 41 insertions(+) + create mode 100644 ucm2/DB845c/DB845c.conf + create mode 100644 ucm2/DB845c/HDMI + +diff --git a/ucm2/DB845c/DB845c.conf b/ucm2/DB845c/DB845c.conf +new file mode 100644 +index 0000000..49c688e +--- /dev/null ++++ b/ucm2/DB845c/DB845c.conf +@@ -0,0 +1,4 @@ ++SectionUseCase."HDMI" { ++ File "HDMI" ++ Comment "HDMI output." ++} +diff --git a/ucm2/DB845c/HDMI b/ucm2/DB845c/HDMI +new file mode 100644 +index 0000000..fdac94e +--- /dev/null ++++ b/ucm2/DB845c/HDMI +@@ -0,0 +1,37 @@ ++# Use case configuration for DB845c board. ++# Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> ++ ++SectionVerb { ++ EnableSequence [ ++ cdev "hw:0" ++ cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 1" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:0" ++ cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 0" ++ ] ++ Value { ++ TQ "HiFi" ++ PlaybackPCM "plughw:0,0" ++ } ++} ++ ++SectionDevice."HDMI-stereo" { ++ #Name "HDMI-stereo" ++ Comment "HDMI Digital Stereo Output" ++ ++ EnableSequence [ ++ cdev "hw:0" ++ cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 1" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:0" ++ cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 0" ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ } ++} +-- +2.20.1 + diff --git a/recipes-multimedia/alsa/alsa-lib/0003-ucm-Add-ucm-files-for-DB845c-analog-audio.patch b/recipes-multimedia/alsa/alsa-ucm-conf/0002-ucm-Add-ucm-files-for-DB845c-analog-audio.patch index a017b1a..84abe19 100644 --- a/recipes-multimedia/alsa/alsa-lib/0003-ucm-Add-ucm-files-for-DB845c-analog-audio.patch +++ b/recipes-multimedia/alsa/alsa-ucm-conf/0002-ucm-Add-ucm-files-for-DB845c-analog-audio.patch @@ -1,20 +1,19 @@ -From 01af05eaa8727411186b68f1712242bf27f8ae51 Mon Sep 17 00:00:00 2001 +From 0ccc5cf2257da567e9651eec66d97bebf14797f0 Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Date: Thu, 4 Jul 2019 09:57:24 +0100 -Subject: [PATCH 03/10] ucm: Add: ucm files for DB845c analog audio +Subject: [PATCH 02/10] ucm: Add: ucm files for DB845c analog audio Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --- - src/conf/ucm/DB845c/DB845c.conf | 5 + - src/conf/ucm/DB845c/HiFi | 202 ++++++++++++++++++++++++++++++++ - src/conf/ucm/DB845c/Makefile.am | 2 +- - 3 files changed, 208 insertions(+), 1 deletion(-) - create mode 100644 src/conf/ucm/DB845c/HiFi + ucm2/DB845c/DB845c.conf | 5 + + ucm2/DB845c/HiFi | 202 ++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 207 insertions(+) + create mode 100644 ucm2/DB845c/HiFi -diff --git a/src/conf/ucm/DB845c/DB845c.conf b/src/conf/ucm/DB845c/DB845c.conf -index 49c688e5..58b7ff4e 100644 ---- a/src/conf/ucm/DB845c/DB845c.conf -+++ b/src/conf/ucm/DB845c/DB845c.conf +diff --git a/ucm2/DB845c/DB845c.conf b/ucm2/DB845c/DB845c.conf +index 49c688e..58b7ff4 100644 +--- a/ucm2/DB845c/DB845c.conf ++++ b/ucm2/DB845c/DB845c.conf @@ -1,3 +1,8 @@ +SectionUseCase."HiFi" { + File "HiFi" @@ -24,11 +23,11 @@ index 49c688e5..58b7ff4e 100644 SectionUseCase."HDMI" { File "HDMI" Comment "HDMI output." -diff --git a/src/conf/ucm/DB845c/HiFi b/src/conf/ucm/DB845c/HiFi +diff --git a/ucm2/DB845c/HiFi b/ucm2/DB845c/HiFi new file mode 100644 -index 00000000..36df8c1f +index 0000000..36df8c1 --- /dev/null -+++ b/src/conf/ucm/DB845c/HiFi ++++ b/ucm2/DB845c/HiFi @@ -0,0 +1,202 @@ +# Use case configuration for DB845c board. +# Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> @@ -232,16 +231,6 @@ index 00000000..36df8c1f + CaptureChannels "1" + } +} -diff --git a/src/conf/ucm/DB845c/Makefile.am b/src/conf/ucm/DB845c/Makefile.am -index 34b28d86..f80ab889 100644 ---- a/src/conf/ucm/DB845c/Makefile.am -+++ b/src/conf/ucm/DB845c/Makefile.am -@@ -1,4 +1,4 @@ - alsaconfigdir = @ALSA_CONFIG_DIR@ - ucmdir = $(alsaconfigdir)/ucm/DB845c --ucm_DATA = DB845c.conf HDMI -+ucm_DATA = DB845c.conf HDMI HiFi - EXTRA_DIST = $(ucm_DATA) -- -2.24.0 +2.20.1 diff --git a/recipes-multimedia/alsa/alsa-lib/0004-DB845c-fix-Defaults.patch b/recipes-multimedia/alsa/alsa-ucm-conf/0003-DB845c-fix-Defaults.patch index 649ea79..9f753de 100644 --- a/recipes-multimedia/alsa/alsa-lib/0004-DB845c-fix-Defaults.patch +++ b/recipes-multimedia/alsa/alsa-ucm-conf/0003-DB845c-fix-Defaults.patch @@ -1,19 +1,19 @@ -From 5f8c3f0795f463be9594aebe0d20c6a69e5ccff8 Mon Sep 17 00:00:00 2001 +From 56a1eecb553007c08848e61c0e03de7111889563 Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Date: Thu, 19 Sep 2019 12:30:35 +0100 -Subject: [PATCH 04/10] DB845c: fix Defaults +Subject: [PATCH 03/10] DB845c: fix Defaults Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --- - src/conf/ucm/DB845c/DB845c.conf | 19 +++++++++++++++++++ - src/conf/ucm/DB845c/HDMI | 22 +++++++++++----------- - src/conf/ucm/DB845c/HiFi | 20 ++++---------------- + ucm2/DB845c/DB845c.conf | 19 +++++++++++++++++++ + ucm2/DB845c/HDMI | 22 +++++++++++----------- + ucm2/DB845c/HiFi | 20 ++++---------------- 3 files changed, 34 insertions(+), 27 deletions(-) -diff --git a/src/conf/ucm/DB845c/DB845c.conf b/src/conf/ucm/DB845c/DB845c.conf -index 58b7ff4e..c4f958e0 100644 ---- a/src/conf/ucm/DB845c/DB845c.conf -+++ b/src/conf/ucm/DB845c/DB845c.conf +diff --git a/ucm2/DB845c/DB845c.conf b/ucm2/DB845c/DB845c.conf +index 58b7ff4..c4f958e 100644 +--- a/ucm2/DB845c/DB845c.conf ++++ b/ucm2/DB845c/DB845c.conf @@ -7,3 +7,22 @@ SectionUseCase."HDMI" { File "HDMI" Comment "HDMI output." @@ -37,10 +37,10 @@ index 58b7ff4e..c4f958e0 100644 + cset "name='DMIC MUX0' DMIC0" + cset "name='DEC0 Volume' 68" +] -diff --git a/src/conf/ucm/DB845c/HDMI b/src/conf/ucm/DB845c/HDMI -index fdac94e5..8354033d 100644 ---- a/src/conf/ucm/DB845c/HDMI -+++ b/src/conf/ucm/DB845c/HDMI +diff --git a/ucm2/DB845c/HDMI b/ucm2/DB845c/HDMI +index fdac94e..8354033 100644 +--- a/ucm2/DB845c/HDMI ++++ b/ucm2/DB845c/HDMI @@ -3,17 +3,17 @@ SectionVerb { @@ -84,10 +84,10 @@ index fdac94e5..8354033d 100644 ] Value { -diff --git a/src/conf/ucm/DB845c/HiFi b/src/conf/ucm/DB845c/HiFi -index 36df8c1f..e8ede5b3 100644 ---- a/src/conf/ucm/DB845c/HiFi -+++ b/src/conf/ucm/DB845c/HiFi +diff --git a/ucm2/DB845c/HiFi b/ucm2/DB845c/HiFi +index 36df8c1..e8ede5b 100644 +--- a/ucm2/DB845c/HiFi ++++ b/ucm2/DB845c/HiFi @@ -6,13 +6,7 @@ SectionVerb { EnableSequence [ cdev "hw:0" @@ -130,5 +130,5 @@ index 36df8c1f..e8ede5b3 100644 cset "name='RX INT8_1 MIX1 INP0' RX0" ## gain to 0dB -- -2.24.0 +2.20.1 diff --git a/recipes-multimedia/alsa/alsa-lib/0005-WIP-make-card-name-explicit.patch b/recipes-multimedia/alsa/alsa-ucm-conf/0004-WIP-make-card-name-explicit.patch index 1cc0afb..b358b64 100644 --- a/recipes-multimedia/alsa/alsa-lib/0005-WIP-make-card-name-explicit.patch +++ b/recipes-multimedia/alsa/alsa-ucm-conf/0004-WIP-make-card-name-explicit.patch @@ -1,19 +1,19 @@ -From 30669d43de97af2b6367ef3de6f8758fe08c73c5 Mon Sep 17 00:00:00 2001 +From d49db4501231b9b6a536cf3a0a949048ff6bd531 Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Date: Fri, 20 Sep 2019 13:12:05 +0100 -Subject: [PATCH 05/10] WIP: make card name explicit +Subject: [PATCH 04/10] WIP: make card name explicit Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --- - src/conf/ucm/DB845c/DB845c.conf | 2 +- - src/conf/ucm/DB845c/HDMI | 10 +-- - src/conf/ucm/DB845c/HiFi | 124 ++------------------------------ + ucm2/DB845c/DB845c.conf | 2 +- + ucm2/DB845c/HDMI | 10 ++-- + ucm2/DB845c/HiFi | 124 ++-------------------------------------- 3 files changed, 12 insertions(+), 124 deletions(-) -diff --git a/src/conf/ucm/DB845c/DB845c.conf b/src/conf/ucm/DB845c/DB845c.conf -index c4f958e0..d3cf0b7d 100644 ---- a/src/conf/ucm/DB845c/DB845c.conf -+++ b/src/conf/ucm/DB845c/DB845c.conf +diff --git a/ucm2/DB845c/DB845c.conf b/ucm2/DB845c/DB845c.conf +index c4f958e..d3cf0b7 100644 +--- a/ucm2/DB845c/DB845c.conf ++++ b/ucm2/DB845c/DB845c.conf @@ -9,7 +9,7 @@ SectionUseCase."HDMI" { } @@ -23,10 +23,10 @@ index c4f958e0..d3cf0b7d 100644 cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 1" cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 1" cset "name='SLIM RX0 MUX' AIF1_PB" -diff --git a/src/conf/ucm/DB845c/HDMI b/src/conf/ucm/DB845c/HDMI -index 8354033d..435e6d82 100644 ---- a/src/conf/ucm/DB845c/HDMI -+++ b/src/conf/ucm/DB845c/HDMI +diff --git a/ucm2/DB845c/HDMI b/ucm2/DB845c/HDMI +index 8354033..435e6d8 100644 +--- a/ucm2/DB845c/HDMI ++++ b/ucm2/DB845c/HDMI @@ -3,17 +3,17 @@ SectionVerb { @@ -63,10 +63,10 @@ index 8354033d..435e6d82 100644 cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 0" ] -diff --git a/src/conf/ucm/DB845c/HiFi b/src/conf/ucm/DB845c/HiFi -index e8ede5b3..f83213c8 100644 ---- a/src/conf/ucm/DB845c/HiFi -+++ b/src/conf/ucm/DB845c/HiFi +diff --git a/ucm2/DB845c/HiFi b/ucm2/DB845c/HiFi +index e8ede5b..f83213c 100644 +--- a/ucm2/DB845c/HiFi ++++ b/ucm2/DB845c/HiFi @@ -4,7 +4,7 @@ SectionVerb { @@ -231,5 +231,5 @@ index e8ede5b3..f83213c8 100644 - } -} -- -2.24.0 +2.20.1 diff --git a/recipes-multimedia/alsa/alsa-lib/0006-DB845c-Add-headset-mixer-controls.patch b/recipes-multimedia/alsa/alsa-ucm-conf/0005-DB845c-Add-headset-mixer-controls.patch index 25e98c2..452eddb 100644 --- a/recipes-multimedia/alsa/alsa-lib/0006-DB845c-Add-headset-mixer-controls.patch +++ b/recipes-multimedia/alsa/alsa-ucm-conf/0005-DB845c-Add-headset-mixer-controls.patch @@ -1,17 +1,17 @@ -From 0bb72348330959d7b736131a0a57e01a42b0ecb4 Mon Sep 17 00:00:00 2001 +From 27bdf93e1f0cd0cdcd4942dfd8cd30ba594a4718 Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Date: Fri, 18 Oct 2019 00:33:02 +0100 -Subject: [PATCH 06/10] DB845c: Add headset mixer controls +Subject: [PATCH 05/10] DB845c: Add headset mixer controls Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --- - src/conf/ucm/DB845c/HiFi | 91 +++++++++++++++++++++++++++------------- + ucm2/DB845c/HiFi | 91 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 63 insertions(+), 28 deletions(-) -diff --git a/src/conf/ucm/DB845c/HiFi b/src/conf/ucm/DB845c/HiFi -index f83213c8..7efd93df 100644 ---- a/src/conf/ucm/DB845c/HiFi -+++ b/src/conf/ucm/DB845c/HiFi +diff --git a/ucm2/DB845c/HiFi b/ucm2/DB845c/HiFi +index f83213c..7efd93d 100644 +--- a/ucm2/DB845c/HiFi ++++ b/ucm2/DB845c/HiFi @@ -5,32 +5,23 @@ SectionVerb { EnableSequence [ @@ -148,5 +148,5 @@ index f83213c8..7efd93df 100644 + } +} -- -2.24.0 +2.20.1 diff --git a/recipes-multimedia/alsa/alsa-lib/0008-ucm-DB845c-update-volume-controls.patch b/recipes-multimedia/alsa/alsa-ucm-conf/0007-ucm-DB845c-update-volume-controls.patch index dad6b50..e2374c5 100644 --- a/recipes-multimedia/alsa/alsa-lib/0008-ucm-DB845c-update-volume-controls.patch +++ b/recipes-multimedia/alsa/alsa-ucm-conf/0007-ucm-DB845c-update-volume-controls.patch @@ -1,18 +1,18 @@ -From 1fe278ce4d1f426b6f3075575fef078e00a07d3a Mon Sep 17 00:00:00 2001 +From 468099d5527dc9eaa6b7187195cfa4d6d2d31b07 Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Date: Thu, 24 Oct 2019 14:13:30 +0100 -Subject: [PATCH 08/10] ucm: DB845c: update volume controls +Subject: [PATCH 07/10] ucm: DB845c: update volume controls Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --- - src/conf/ucm/DB845c/DB845c.conf | 6 ++++-- - src/conf/ucm/DB845c/HiFi | 6 ++++-- + ucm2/DB845c/DB845c.conf | 6 ++++-- + ucm2/DB845c/HiFi | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) -diff --git a/src/conf/ucm/DB845c/DB845c.conf b/src/conf/ucm/DB845c/DB845c.conf -index d3cf0b7d..79efd81e 100644 ---- a/src/conf/ucm/DB845c/DB845c.conf -+++ b/src/conf/ucm/DB845c/DB845c.conf +diff --git a/ucm2/DB845c/DB845c.conf b/ucm2/DB845c/DB845c.conf +index d3cf0b7..79efd81 100644 +--- a/ucm2/DB845c/DB845c.conf ++++ b/ucm2/DB845c/DB845c.conf @@ -17,8 +17,10 @@ SectionDefaults [ cset "name='RX INT7_1 MIX1 INP0' RX0" cset "name='RX INT8_1 MIX1 INP0' RX0" @@ -26,10 +26,10 @@ index d3cf0b7d..79efd81e 100644 cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1" cset "name='AIF1_CAP Mixer SLIM TX0' 1" cset "name='CDC_IF TX0 MUX' DEC0" -diff --git a/src/conf/ucm/DB845c/HiFi b/src/conf/ucm/DB845c/HiFi -index 7efd93df..6f57068a 100644 ---- a/src/conf/ucm/DB845c/HiFi -+++ b/src/conf/ucm/DB845c/HiFi +diff --git a/ucm2/DB845c/HiFi b/ucm2/DB845c/HiFi +index 7efd93d..6f57068 100644 +--- a/ucm2/DB845c/HiFi ++++ b/ucm2/DB845c/HiFi @@ -39,6 +39,8 @@ SectionDevice."Speakers" { cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" cset "name='COMP7 Switch' 1" @@ -51,5 +51,5 @@ index 7efd93df..6f57068a 100644 cset "name='RX INT2 DEM MUX' CLSH_DSM_OUT" ] -- -2.24.0 +2.20.1 diff --git a/recipes-multimedia/alsa/alsa-lib/0009-ucm-DB845c-remove-headphones-for-now.patch b/recipes-multimedia/alsa/alsa-ucm-conf/0008-ucm-DB845c-remove-headphones-for-now.patch index 9edd5a8..aa0a59e 100644 --- a/recipes-multimedia/alsa/alsa-lib/0009-ucm-DB845c-remove-headphones-for-now.patch +++ b/recipes-multimedia/alsa/alsa-ucm-conf/0008-ucm-DB845c-remove-headphones-for-now.patch @@ -1,18 +1,18 @@ -From 6bb7e968a8da057b36bdecda1843f9b0f84e5bc8 Mon Sep 17 00:00:00 2001 +From 8ced22f95d41ce9f294d1d1ad3866af15164db76 Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Date: Thu, 24 Oct 2019 18:10:38 +0100 -Subject: [PATCH 09/10] ucm: DB845c: remove headphones for now +Subject: [PATCH 08/10] ucm: DB845c: remove headphones for now Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --- - src/conf/ucm/DB845c/DB845c.conf | 5 ++-- - src/conf/ucm/DB845c/HiFi | 50 ++++----------------------------- + ucm2/DB845c/DB845c.conf | 5 ++--- + ucm2/DB845c/HiFi | 50 +++++------------------------------------ 2 files changed, 7 insertions(+), 48 deletions(-) -diff --git a/src/conf/ucm/DB845c/DB845c.conf b/src/conf/ucm/DB845c/DB845c.conf -index 79efd81e..5765aacd 100644 ---- a/src/conf/ucm/DB845c/DB845c.conf -+++ b/src/conf/ucm/DB845c/DB845c.conf +diff --git a/ucm2/DB845c/DB845c.conf b/ucm2/DB845c/DB845c.conf +index 79efd81..5765aac 100644 +--- a/ucm2/DB845c/DB845c.conf ++++ b/ucm2/DB845c/DB845c.conf @@ -13,14 +13,13 @@ SectionDefaults [ cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 1" cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 1" @@ -30,10 +30,10 @@ index 79efd81e..5765aacd 100644 cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1" cset "name='AIF1_CAP Mixer SLIM TX0' 1" cset "name='CDC_IF TX0 MUX' DEC0" -diff --git a/src/conf/ucm/DB845c/HiFi b/src/conf/ucm/DB845c/HiFi -index 6f57068a..a794523b 100644 ---- a/src/conf/ucm/DB845c/HiFi -+++ b/src/conf/ucm/DB845c/HiFi +diff --git a/ucm2/DB845c/HiFi b/ucm2/DB845c/HiFi +index 6f57068..a794523 100644 +--- a/ucm2/DB845c/HiFi ++++ b/ucm2/DB845c/HiFi @@ -10,18 +10,18 @@ SectionVerb { cset "name='RX INT7_1 MIX1 INP0' RX6" cset "name='RX INT8_1 MIX1 INP0' RX7" @@ -119,5 +119,5 @@ index 6f57068a..a794523b 100644 - } -} -- -2.24.0 +2.20.1 diff --git a/recipes-multimedia/alsa/alsa-lib/0010-ucm-DB845c-adjust-default-volume-of-speakers.patch b/recipes-multimedia/alsa/alsa-ucm-conf/0009-ucm-DB845c-adjust-default-volume-of-speakers.patch index 9a75c53..f1865de 100644 --- a/recipes-multimedia/alsa/alsa-lib/0010-ucm-DB845c-adjust-default-volume-of-speakers.patch +++ b/recipes-multimedia/alsa/alsa-ucm-conf/0009-ucm-DB845c-adjust-default-volume-of-speakers.patch @@ -1,18 +1,18 @@ -From a20ee1b7aa24be04bf46d6aef596e1a07ec7fb60 Mon Sep 17 00:00:00 2001 +From 97291862280a88fc60e2e192b3a99b4874680d8e Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Date: Thu, 31 Oct 2019 10:10:15 +0000 -Subject: [PATCH 10/10] ucm: DB845c: adjust default volume of speakers +Subject: [PATCH 09/10] ucm: DB845c: adjust default volume of speakers Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --- - src/conf/ucm/DB845c/DB845c.conf | 15 ++++++++++----- - src/conf/ucm/DB845c/HiFi | 6 ++---- + ucm2/DB845c/DB845c.conf | 15 ++++++++++----- + ucm2/DB845c/HiFi | 6 ++---- 2 files changed, 12 insertions(+), 9 deletions(-) -diff --git a/src/conf/ucm/DB845c/DB845c.conf b/src/conf/ucm/DB845c/DB845c.conf -index 5765aacd..d1bf6e3e 100644 ---- a/src/conf/ucm/DB845c/DB845c.conf -+++ b/src/conf/ucm/DB845c/DB845c.conf +diff --git a/ucm2/DB845c/DB845c.conf b/ucm2/DB845c/DB845c.conf +index 5765aac..d1bf6e3 100644 +--- a/ucm2/DB845c/DB845c.conf ++++ b/ucm2/DB845c/DB845c.conf @@ -12,14 +12,19 @@ SectionDefaults [ cdev "hw:DB845c" cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 1" @@ -38,10 +38,10 @@ index 5765aacd..d1bf6e3e 100644 cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1" cset "name='AIF1_CAP Mixer SLIM TX0' 1" cset "name='CDC_IF TX0 MUX' DEC0" -diff --git a/src/conf/ucm/DB845c/HiFi b/src/conf/ucm/DB845c/HiFi -index a794523b..40f7795e 100644 ---- a/src/conf/ucm/DB845c/HiFi -+++ b/src/conf/ucm/DB845c/HiFi +diff --git a/ucm2/DB845c/HiFi b/ucm2/DB845c/HiFi +index a794523..40f7795 100644 +--- a/ucm2/DB845c/HiFi ++++ b/ucm2/DB845c/HiFi @@ -32,15 +32,13 @@ SectionDevice."Speakers" { cdev "hw:DB845c" cset "name='SLIM RX6 MUX' AIF1_PB" @@ -61,5 +61,5 @@ index a794523b..40f7795e 100644 cset "name='SpkrLeft COMP Switch' 1" cset "name='SpkrLeft BOOST Switch' 1" -- -2.24.0 +2.20.1 diff --git a/recipes-multimedia/alsa/alsa-ucm-conf_1.2.%.bbappend b/recipes-multimedia/alsa/alsa-ucm-conf_1.2.%.bbappend new file mode 100644 index 0000000..9aeec20 --- /dev/null +++ b/recipes-multimedia/alsa/alsa-ucm-conf_1.2.%.bbappend @@ -0,0 +1,12 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" + +SRC_URI_append_sdm845 = " \ + file://0001-ucm-Add-ucm-files-for-DB845c-HDMI-audio.patch \ + file://0002-ucm-Add-ucm-files-for-DB845c-analog-audio.patch \ + file://0003-DB845c-fix-Defaults.patch \ + file://0004-WIP-make-card-name-explicit.patch \ + file://0005-DB845c-Add-headset-mixer-controls.patch \ + file://0007-ucm-DB845c-update-volume-controls.patch \ + file://0008-ucm-DB845c-remove-headphones-for-now.patch \ + file://0009-ucm-DB845c-adjust-default-volume-of-speakers.patch \ +" |