diff options
8 files changed, 0 insertions, 622 deletions
diff --git a/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-codecs-wcd934x-Add-Codec-sequences.patch b/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-codecs-wcd934x-Add-Codec-sequences.patch deleted file mode 100644 index d8bd3a3..0000000 --- a/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-codecs-wcd934x-Add-Codec-sequences.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 816bd950c67f114068761cb311a8185cd2c3f6dd Mon Sep 17 00:00:00 2001 -From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> -Date: Mon, 1 Jun 2020 15:12:57 +0100 -Subject: [PATCH 1/4] ucm2: codecs: wcd934x: Add Codec sequences. - -Add WCD934x codec sequences to be used by other platforms like DB845c -and Lenovo YOGA C630 - -Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> ---- - ucm2/codecs/wcd934x/DefaultDisableSeq.conf | 5 +++++ - ucm2/codecs/wcd934x/DefaultEnableSeq.conf | 14 ++++++++++++++ - ucm2/codecs/wcd934x/HeadphoneDisableSeq.conf | 6 ++++++ - ucm2/codecs/wcd934x/HeadphoneEnableSeq.conf | 6 ++++++ - ucm2/codecs/wcd934x/HeadphoneMicDisableSeq.conf | 2 ++ - ucm2/codecs/wcd934x/HeadphoneMicEnableSeq.conf | 3 +++ - ucm2/codecs/wcd934x/SpeakerDisableSeq.conf | 4 ++++ - ucm2/codecs/wcd934x/SpeakerEnableSeq.conf | 4 ++++ - 8 files changed, 44 insertions(+) - create mode 100644 ucm2/codecs/wcd934x/DefaultDisableSeq.conf - create mode 100644 ucm2/codecs/wcd934x/DefaultEnableSeq.conf - create mode 100644 ucm2/codecs/wcd934x/HeadphoneDisableSeq.conf - create mode 100644 ucm2/codecs/wcd934x/HeadphoneEnableSeq.conf - create mode 100644 ucm2/codecs/wcd934x/HeadphoneMicDisableSeq.conf - create mode 100644 ucm2/codecs/wcd934x/HeadphoneMicEnableSeq.conf - create mode 100644 ucm2/codecs/wcd934x/SpeakerDisableSeq.conf - create mode 100644 ucm2/codecs/wcd934x/SpeakerEnableSeq.conf - -diff --git a/ucm2/codecs/wcd934x/DefaultDisableSeq.conf b/ucm2/codecs/wcd934x/DefaultDisableSeq.conf -new file mode 100644 -index 0000000..88d82a3 ---- /dev/null -+++ b/ucm2/codecs/wcd934x/DefaultDisableSeq.conf -@@ -0,0 +1,5 @@ -+cset "name='RX INT7_1 MIX1 INP0' ZERO" -+cset "name='RX INT8_1 MIX1 INP0' ZERO" -+cset "name='RX INT1_2 MUX' ZERO" -+cset "name='RX INT2_2 MUX' ZERO" -+cset "name='CDC_IF TX0 MUX' ZERO" -diff --git a/ucm2/codecs/wcd934x/DefaultEnableSeq.conf b/ucm2/codecs/wcd934x/DefaultEnableSeq.conf -new file mode 100644 -index 0000000..e5bdbbd ---- /dev/null -+++ b/ucm2/codecs/wcd934x/DefaultEnableSeq.conf -@@ -0,0 +1,14 @@ -+cset "name='SLIM RX1 MUX' AIF1_PB" -+cset "name='SLIM RX2 MUX' AIF1_PB" -+cset "name='SLIM RX6 MUX' ZERO" -+cset "name='SLIM RX7 MUX' ZERO" -+cset "name='SLIM RX3 MUX' ZERO" -+cset "name='SLIM RX4 MUX' ZERO" -+cset "name='SLIM RX5 MUX' ZERO" -+cset "name='AIF1_CAP Mixer SLIM TX0' 1" -+ -+cset "name='RX INT7_1 MIX1 INP0' RX1" -+cset "name='RX INT8_1 MIX1 INP0' RX2" -+cset "name='RX INT1_2 MUX' RX1" -+cset "name='RX INT2_2 MUX' RX2" -+cset "name='CDC_IF TX0 MUX' DEC0" -diff --git a/ucm2/codecs/wcd934x/HeadphoneDisableSeq.conf b/ucm2/codecs/wcd934x/HeadphoneDisableSeq.conf -new file mode 100644 -index 0000000..0206e87 ---- /dev/null -+++ b/ucm2/codecs/wcd934x/HeadphoneDisableSeq.conf -@@ -0,0 +1,6 @@ -+cset "name='COMP1 Switch' 0" -+cset "name='COMP2 Switch' 0" -+cset "name='RX1 Digital Volume' 0" -+cset "name='RX2 Digital Volume' 0" -+cset "name='RX INT1 DEM MUX' ZERO" -+cset "name='RX INT2 DEM MUX' ZERO" -diff --git a/ucm2/codecs/wcd934x/HeadphoneEnableSeq.conf b/ucm2/codecs/wcd934x/HeadphoneEnableSeq.conf -new file mode 100644 -index 0000000..5ce7950 ---- /dev/null -+++ b/ucm2/codecs/wcd934x/HeadphoneEnableSeq.conf -@@ -0,0 +1,6 @@ -+cset "name='COMP1 Switch' 1" -+cset "name='COMP2 Switch' 1" -+cset "name='RX INT1 DEM MUX' CLSH_DSM_OUT" -+cset "name='RX INT2 DEM MUX' CLSH_DSM_OUT" -+cset "name='RX1 Digital Volume' 68" -+cset "name='RX2 Digital Volume' 68" -diff --git a/ucm2/codecs/wcd934x/HeadphoneMicDisableSeq.conf b/ucm2/codecs/wcd934x/HeadphoneMicDisableSeq.conf -new file mode 100644 -index 0000000..5558446 ---- /dev/null -+++ b/ucm2/codecs/wcd934x/HeadphoneMicDisableSeq.conf -@@ -0,0 +1,2 @@ -+cset "name='AMIC MUX0' ZERO" -+cset "name='ADC2 Volume' 0" -diff --git a/ucm2/codecs/wcd934x/HeadphoneMicEnableSeq.conf b/ucm2/codecs/wcd934x/HeadphoneMicEnableSeq.conf -new file mode 100644 -index 0000000..ad43830 ---- /dev/null -+++ b/ucm2/codecs/wcd934x/HeadphoneMicEnableSeq.conf -@@ -0,0 +1,3 @@ -+cset "name='AMIC MUX0' ADC2" -+cset "name='ADC2 Volume' 12" -+cset "name='ADC MUX0' AMIC" -diff --git a/ucm2/codecs/wcd934x/SpeakerDisableSeq.conf b/ucm2/codecs/wcd934x/SpeakerDisableSeq.conf -new file mode 100644 -index 0000000..3c977c8 ---- /dev/null -+++ b/ucm2/codecs/wcd934x/SpeakerDisableSeq.conf -@@ -0,0 +1,4 @@ -+cset "name='RX7 Digital Volume' 0" -+cset "name='RX8 Digital Volume' 0" -+cset "name='COMP7 Switch' 0" -+cset "name='COMP8 Switch' 0" -diff --git a/ucm2/codecs/wcd934x/SpeakerEnableSeq.conf b/ucm2/codecs/wcd934x/SpeakerEnableSeq.conf -new file mode 100644 -index 0000000..2d9a3d8 ---- /dev/null -+++ b/ucm2/codecs/wcd934x/SpeakerEnableSeq.conf -@@ -0,0 +1,4 @@ -+cset "name='COMP7 Switch' 1" -+cset "name='COMP8 Switch' 1" -+cset "name='RX7 Digital Volume' 80" -+cset "name='RX8 Digital Volume' 80" --- -2.27.0.rc0 - diff --git a/recipes-multimedia/alsa/alsa-ucm-conf/0002-ucm2-codecs-wsa881x-add-codec-sequences.patch b/recipes-multimedia/alsa/alsa-ucm-conf/0002-ucm2-codecs-wsa881x-add-codec-sequences.patch deleted file mode 100644 index 6bdeeb9..0000000 --- a/recipes-multimedia/alsa/alsa-ucm-conf/0002-ucm2-codecs-wsa881x-add-codec-sequences.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 81689f1b4b8b511cc51a7dee4a3151b6fcb8cd2c Mon Sep 17 00:00:00 2001 -From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> -Date: Mon, 1 Jun 2020 15:12:58 +0100 -Subject: [PATCH 2/4] ucm2: codecs: wsa881x: add codec sequences - -Add default, enable/disable codec sequence for wsa881x codec - -Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> ---- - ucm2/codecs/wsa881x/DefaultEnableSeq.conf | 8 ++++++++ - ucm2/codecs/wsa881x/SpeakerDisableSeq.conf | 8 ++++++++ - ucm2/codecs/wsa881x/SpeakerEnableSeq.conf | 10 ++++++++++ - 3 files changed, 26 insertions(+) - create mode 100644 ucm2/codecs/wsa881x/DefaultEnableSeq.conf - create mode 100644 ucm2/codecs/wsa881x/SpeakerDisableSeq.conf - create mode 100644 ucm2/codecs/wsa881x/SpeakerEnableSeq.conf - -diff --git a/ucm2/codecs/wsa881x/DefaultEnableSeq.conf b/ucm2/codecs/wsa881x/DefaultEnableSeq.conf -new file mode 100644 -index 0000000..499342b ---- /dev/null -+++ b/ucm2/codecs/wsa881x/DefaultEnableSeq.conf -@@ -0,0 +1,8 @@ -+cset "name='SpkrLeft COMP Switch' 1" -+cset "name='SpkrLeft BOOST Switch' 1" -+cset "name='SpkrLeft DAC Switch' 1" -+cset "name='SpkrLeft VISENSE Switch' 0" -+cset "name='SpkrRight COMP Switch' 1" -+cset "name='SpkrRight BOOST Switch' 1" -+cset "name='SpkrRight DAC Switch' 1" -+cset "name='SpkrRight VISENSE Switch' 0" -diff --git a/ucm2/codecs/wsa881x/SpeakerDisableSeq.conf b/ucm2/codecs/wsa881x/SpeakerDisableSeq.conf -new file mode 100644 -index 0000000..9614422 ---- /dev/null -+++ b/ucm2/codecs/wsa881x/SpeakerDisableSeq.conf -@@ -0,0 +1,8 @@ -+cset "name='SpkrLeft COMP Switch' 0" -+cset "name='SpkrLeft BOOST Switch' 0" -+cset "name='SpkrLeft DAC Switch' 0" -+cset "name='SpkrLeft VISENSE Switch' 0" -+cset "name='SpkrRight COMP Switch' 0" -+cset "name='SpkrRight BOOST Switch' 0" -+cset "name='SpkrRight DAC Switch' 0" -+cset "name='SpkrRight VISENSE Switch' 0" -diff --git a/ucm2/codecs/wsa881x/SpeakerEnableSeq.conf b/ucm2/codecs/wsa881x/SpeakerEnableSeq.conf -new file mode 100644 -index 0000000..31c27f3 ---- /dev/null -+++ b/ucm2/codecs/wsa881x/SpeakerEnableSeq.conf -@@ -0,0 +1,10 @@ -+cset "name='SpkrLeft COMP Switch' 1" -+cset "name='SpkrLeft BOOST Switch' 1" -+cset "name='SpkrLeft DAC Switch' 1" -+cset "name='SpkrLeft VISENSE Switch' 0" -+cset "name='SpkrLeft PA Volume' 12" -+cset "name='SpkrRight COMP Switch' 1" -+cset "name='SpkrRight BOOST Switch' 1" -+cset "name='SpkrRight DAC Switch' 1" -+cset "name='SpkrRight VISENSE Switch' 0" -+cset "name='SpkrRight PA Volume' 12" --- -2.27.0.rc0 - diff --git a/recipes-multimedia/alsa/alsa-ucm-conf/0003-ucm2-DB845c-Add-ucm-for-DB845c-board.patch b/recipes-multimedia/alsa/alsa-ucm-conf/0003-ucm2-DB845c-Add-ucm-for-DB845c-board.patch deleted file mode 100644 index caa6741..0000000 --- a/recipes-multimedia/alsa/alsa-ucm-conf/0003-ucm2-DB845c-Add-ucm-for-DB845c-board.patch +++ /dev/null @@ -1,129 +0,0 @@ -From b225c35639a76b07f90c4bc310b9d4c057d8ae42 Mon Sep 17 00:00:00 2001 -From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> -Date: Mon, 1 Jun 2020 15:12:59 +0100 -Subject: [PATCH 3/4] ucm2: DB845c: Add ucm for DB845c board - -DB845c board by default has two WSA881x speakers and HDMI -audio connections. - -Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> ---- - ucm2/DB845c/DB845c.conf | 11 ++++++++++ - ucm2/DB845c/HDMI.conf | 33 +++++++++++++++++++++++++++++ - ucm2/DB845c/HiFi.conf | 46 +++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 90 insertions(+) - create mode 100644 ucm2/DB845c/DB845c.conf - create mode 100644 ucm2/DB845c/HDMI.conf - create mode 100644 ucm2/DB845c/HiFi.conf - -diff --git a/ucm2/DB845c/DB845c.conf b/ucm2/DB845c/DB845c.conf -new file mode 100644 -index 0000000..bfd1ee5 ---- /dev/null -+++ b/ucm2/DB845c/DB845c.conf -@@ -0,0 +1,11 @@ -+Syntax 2 -+ -+SectionUseCase."HiFi" { -+ File "HiFi.conf" -+ Comment "HiFi quality Music." -+} -+ -+SectionUseCase."HDMI" { -+ File "HDMI.conf" -+ Comment "HDMI output." -+} -diff --git a/ucm2/DB845c/HDMI.conf b/ucm2/DB845c/HDMI.conf -new file mode 100644 -index 0000000..fe1045c ---- /dev/null -+++ b/ucm2/DB845c/HDMI.conf -@@ -0,0 +1,33 @@ -+# Use case configuration for DB845c board. -+# Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> -+ -+SectionVerb { -+ EnableSequence [ -+ cdev "hw:${CardId}" -+ cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 1" -+ ] -+ -+ DisableSequence [ -+ cdev "hw:${CardId}" -+ cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 0" -+ ] -+ Value { -+ TQ "HiFi" -+ PlaybackPCM "hw:${CardId}" -+ } -+} -+ -+SectionDevice."HDMI-stereo" { -+ #Name "HDMI-stereo" -+ Comment "HDMI Digital Stereo Output" -+ -+ EnableSequence [ -+ ] -+ -+ DisableSequence [ -+ ] -+ -+ Value { -+ PlaybackPriority 200 -+ } -+} -diff --git a/ucm2/DB845c/HiFi.conf b/ucm2/DB845c/HiFi.conf -new file mode 100644 -index 0000000..f88e8ec ---- /dev/null -+++ b/ucm2/DB845c/HiFi.conf -@@ -0,0 +1,46 @@ -+# Use case configuration for DB845c. -+# Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> -+ -+SectionVerb { -+ -+ EnableSequence [ -+ cdev "hw:${CardId}" -+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 1" -+ -+ <codecs/wcd934x/DefaultEnableSeq.conf> -+ <codecs/wsa881x/DefaultEnableSeq.conf> -+ ] -+ -+ DisableSequence [ -+ cdev "hw:${CardId}" -+ <codecs/wcd934x/DefaultDisableSeq.conf> -+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 0" -+ ] -+ -+ Value { -+ TQ "HiFi" -+ } -+} -+ -+SectionDevice."Speaker" { -+ Comment "Speaker playback" -+ -+ EnableSequence [ -+ cdev "hw:${CardId}" -+ <codecs/wcd934x/SpeakerEnableSeq.conf> -+ <codecs/wsa881x/SpeakerEnableSeq.conf> -+ ] -+ -+ DisableSequence [ -+ cdev "hw:${CardId}" -+ <codecs/wsa881x/SpeakerDisableSeq.conf> -+ <codecs/wcd934x/SpeakerDisableSeq.conf> -+ ] -+ -+ Value { -+ PlaybackPriority 100 -+ PlaybackPCM "hw:${CardId},1" -+ PlaybackVolume "RX1 Digital Volume" -+ PlaybackVolume "RX2 Digital Volume" -+ } -+} --- -2.27.0.rc0 - diff --git a/recipes-multimedia/alsa/alsa-ucm-conf/0004-ucm2-Add-ucm-for-Lenovo-YOGA-C630-13Q50-laptop.patch b/recipes-multimedia/alsa/alsa-ucm-conf/0004-ucm2-Add-ucm-for-Lenovo-YOGA-C630-13Q50-laptop.patch deleted file mode 100644 index c415af7..0000000 --- a/recipes-multimedia/alsa/alsa-ucm-conf/0004-ucm2-Add-ucm-for-Lenovo-YOGA-C630-13Q50-laptop.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 0c817e5a484960787d4cf46ba18cfcbca40ff8b2 Mon Sep 17 00:00:00 2001 -From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> -Date: Mon, 1 Jun 2020 15:13:00 +0100 -Subject: [PATCH 4/4] ucm2: Add ucm for Lenovo-YOGA-C630-13Q50 laptop - -This laptop has by 2 WSA Smart speakers over Soundwire and 3.5mm -headset audio connection. - -Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> ---- - ucm2/Lenovo-YOGA-C630-13Q50/HiFi.conf | 98 +++++++++++++++++++ - .../Lenovo-YOGA-C630-13Q50.conf | 6 ++ - 2 files changed, 104 insertions(+) - create mode 100644 ucm2/Lenovo-YOGA-C630-13Q50/HiFi.conf - create mode 100644 ucm2/Lenovo-YOGA-C630-13Q50/Lenovo-YOGA-C630-13Q50.conf - -diff --git a/ucm2/Lenovo-YOGA-C630-13Q50/HiFi.conf b/ucm2/Lenovo-YOGA-C630-13Q50/HiFi.conf -new file mode 100644 -index 0000000..0bd68f0 ---- /dev/null -+++ b/ucm2/Lenovo-YOGA-C630-13Q50/HiFi.conf -@@ -0,0 +1,98 @@ -+# Use case configuration for LenovoYOGAC6301. -+# Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> -+ -+SectionVerb { -+ -+ EnableSequence [ -+ cdev "hw:${CardId}" -+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" -+ cset "name='MultiMedia2 Mixer SLIMBUS_0_TX' 1" -+ -+ <codecs/wcd934x/DefaultEnableSeq.conf> -+ <codecs/wsa881x/DefaultEnableSeq.conf> -+ ] -+ -+ DisableSequence [ -+ cdev "hw:${CardId}" -+ <codecs/wcd934x/DefaultDisableSeq.conf> -+ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" -+ cset "name='MultiMedia2 Mixer SLIMBUS_0_TX' 0" -+ ] -+ -+ Value { -+ TQ "HiFi" -+ } -+} -+ -+SectionDevice."Speaker" { -+ Comment "Speaker playback" -+ -+ ConflictingDevice [ -+ "Headphones" -+ ] -+ -+ -+ EnableSequence [ -+ cdev "hw:${CardId}" -+ <codecs/wcd934x/SpeakerEnableSeq.conf> -+ <codecs/wsa881x/SpeakerEnableSeq.conf> -+ ] -+ -+ DisableSequence [ -+ cdev "hw:${CardId}" -+ <codecs/wsa881x/SpeakerDisableSeq.conf> -+ <codecs/wcd934x/SpeakerDisableSeq.conf> -+ ] -+ -+ Value { -+ PlaybackPriority 100 -+ PlaybackPCM "hw:${CardId}" -+ PlaybackVolume "RX7 Digital Volume" -+ PlaybackVolume "RX8 Digital Volume" -+ } -+} -+ -+SectionDevice."Headphones" { -+ Comment "Headphones playback" -+ -+ ConflictingDevice [ -+ "Speaker" -+ ] -+ -+ EnableSequence [ -+ cdev "hw:${CardId}" -+ <codecs/wcd934x/HeadphoneEnableSeq.conf> -+ ] -+ -+ DisableSequence [ -+ cdev "hw:${CardId}" -+ <codecs/wcd934x/HeadphoneDisableSeq.conf> -+ ] -+ -+ Value { -+ PlaybackPriority 200 -+ PlaybackPCM "hw:${CardId}" -+ PlaybackVolume "RX1 Digital Volume" -+ PlaybackVolume "RX2 Digital Volume" -+ } -+} -+ -+SectionDevice."Mic" { -+ Comment "Mic" -+ -+ EnableSequence [ -+ <codecs/wcd934x/HeadphoneMicEnableSeq.conf> -+ ] -+ -+ DisableSequence [ -+ <codecs/wcd934x/HeadphoneMicDisableSeq.conf> -+ cset "name='AMIC MUX0' ZERO" -+ cset "name='ADC2 Volume' 0" -+ ] -+ -+ Value { -+ CapturePriority 100 -+ CapturePCM "hw:${CardId},1" -+ CaptureVolume "ADC2 Volume" -+ } -+} -diff --git a/ucm2/Lenovo-YOGA-C630-13Q50/Lenovo-YOGA-C630-13Q50.conf b/ucm2/Lenovo-YOGA-C630-13Q50/Lenovo-YOGA-C630-13Q50.conf -new file mode 100644 -index 0000000..114466a ---- /dev/null -+++ b/ucm2/Lenovo-YOGA-C630-13Q50/Lenovo-YOGA-C630-13Q50.conf -@@ -0,0 +1,6 @@ -+Syntax 2 -+ -+SectionUseCase."HiFi" { -+ File "HiFi.conf" -+ Comment "HiFi Music." -+} --- -2.27.0.rc0 - diff --git a/recipes-multimedia/alsa/alsa-ucm-conf/0005-ucm2-Lenovo-YOGA-C630-remove-cdev-which-is-already-p.patch b/recipes-multimedia/alsa/alsa-ucm-conf/0005-ucm2-Lenovo-YOGA-C630-remove-cdev-which-is-already-p.patch deleted file mode 100644 index 56682a3..0000000 --- a/recipes-multimedia/alsa/alsa-ucm-conf/0005-ucm2-Lenovo-YOGA-C630-remove-cdev-which-is-already-p.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 9353445dab6c863dd031161fa37009e4bba31821 Mon Sep 17 00:00:00 2001 -From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> -Date: Mon, 1 Jun 2020 17:20:26 +0100 -Subject: [PATCH 5/6] ucm2: Lenovo-YOGA-C630: remove cdev which is already - present in ucm2 - -Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> ---- - ucm2/Lenovo-YOGA-C630-13Q50/HiFi.conf | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/ucm2/Lenovo-YOGA-C630-13Q50/HiFi.conf b/ucm2/Lenovo-YOGA-C630-13Q50/HiFi.conf -index 0bd68f0..39e91f4 100644 ---- a/ucm2/Lenovo-YOGA-C630-13Q50/HiFi.conf -+++ b/ucm2/Lenovo-YOGA-C630-13Q50/HiFi.conf -@@ -4,7 +4,6 @@ - SectionVerb { - - EnableSequence [ -- cdev "hw:${CardId}" - cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" - cset "name='MultiMedia2 Mixer SLIMBUS_0_TX' 1" - -@@ -13,7 +12,6 @@ SectionVerb { - ] - - DisableSequence [ -- cdev "hw:${CardId}" - <codecs/wcd934x/DefaultDisableSeq.conf> - cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" - cset "name='MultiMedia2 Mixer SLIMBUS_0_TX' 0" -@@ -33,13 +31,11 @@ SectionDevice."Speaker" { - - - EnableSequence [ -- cdev "hw:${CardId}" - <codecs/wcd934x/SpeakerEnableSeq.conf> - <codecs/wsa881x/SpeakerEnableSeq.conf> - ] - - DisableSequence [ -- cdev "hw:${CardId}" - <codecs/wsa881x/SpeakerDisableSeq.conf> - <codecs/wcd934x/SpeakerDisableSeq.conf> - ] -@@ -60,12 +56,10 @@ SectionDevice."Headphones" { - ] - - EnableSequence [ -- cdev "hw:${CardId}" - <codecs/wcd934x/HeadphoneEnableSeq.conf> - ] - - DisableSequence [ -- cdev "hw:${CardId}" - <codecs/wcd934x/HeadphoneDisableSeq.conf> - ] - --- -2.27.0.rc0 - diff --git a/recipes-multimedia/alsa/alsa-ucm-conf/0006-ucm2-DB845c-remove-cdev-which-is-already-present-in-.patch b/recipes-multimedia/alsa/alsa-ucm-conf/0006-ucm2-DB845c-remove-cdev-which-is-already-present-in-.patch deleted file mode 100644 index 6ed85d4..0000000 --- a/recipes-multimedia/alsa/alsa-ucm-conf/0006-ucm2-DB845c-remove-cdev-which-is-already-present-in-.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 604914c07ffb10946711c2e5ca95d3a9bb6ad399 Mon Sep 17 00:00:00 2001 -From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> -Date: Mon, 1 Jun 2020 17:20:25 +0100 -Subject: [PATCH 6/6] ucm2: DB845c: remove cdev which is already present in - ucm2 - -Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> ---- - ucm2/DB845c/HDMI.conf | 2 -- - ucm2/DB845c/HiFi.conf | 4 ---- - 2 files changed, 6 deletions(-) - -diff --git a/ucm2/DB845c/HDMI.conf b/ucm2/DB845c/HDMI.conf -index fe1045c..5a0a933 100644 ---- a/ucm2/DB845c/HDMI.conf -+++ b/ucm2/DB845c/HDMI.conf -@@ -3,12 +3,10 @@ - - SectionVerb { - EnableSequence [ -- cdev "hw:${CardId}" - cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 1" - ] - - DisableSequence [ -- cdev "hw:${CardId}" - cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 0" - ] - Value { -diff --git a/ucm2/DB845c/HiFi.conf b/ucm2/DB845c/HiFi.conf -index f88e8ec..ef7c341 100644 ---- a/ucm2/DB845c/HiFi.conf -+++ b/ucm2/DB845c/HiFi.conf -@@ -4,7 +4,6 @@ - SectionVerb { - - EnableSequence [ -- cdev "hw:${CardId}" - cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 1" - - <codecs/wcd934x/DefaultEnableSeq.conf> -@@ -12,7 +11,6 @@ SectionVerb { - ] - - DisableSequence [ -- cdev "hw:${CardId}" - <codecs/wcd934x/DefaultDisableSeq.conf> - cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 0" - ] -@@ -26,13 +24,11 @@ SectionDevice."Speaker" { - Comment "Speaker playback" - - EnableSequence [ -- cdev "hw:${CardId}" - <codecs/wcd934x/SpeakerEnableSeq.conf> - <codecs/wsa881x/SpeakerEnableSeq.conf> - ] - - DisableSequence [ -- cdev "hw:${CardId}" - <codecs/wsa881x/SpeakerDisableSeq.conf> - <codecs/wcd934x/SpeakerDisableSeq.conf> - ] --- -2.27.0.rc0 - diff --git a/recipes-multimedia/alsa/alsa-ucm-conf/0007-ucm2-DB845c-HDMI-update-cdev-to-correct-value.patch b/recipes-multimedia/alsa/alsa-ucm-conf/0007-ucm2-DB845c-HDMI-update-cdev-to-correct-value.patch deleted file mode 100644 index b148078..0000000 --- a/recipes-multimedia/alsa/alsa-ucm-conf/0007-ucm2-DB845c-HDMI-update-cdev-to-correct-value.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 1448e9df35c7773e197c868a9463e9edfc7b1998 Mon Sep 17 00:00:00 2001 -From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> -Date: Tue, 2 Jun 2020 10:23:54 +0100 -Subject: [PATCH 7/7] ucm2: DB845c: HDMI: update cdev to correct value - -Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> ---- - ucm2/DB845c/HDMI.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ucm2/DB845c/HDMI.conf b/ucm2/DB845c/HDMI.conf -index 5a0a933..c233cef 100644 ---- a/ucm2/DB845c/HDMI.conf -+++ b/ucm2/DB845c/HDMI.conf -@@ -11,7 +11,6 @@ SectionVerb { - ] - Value { - TQ "HiFi" -- PlaybackPCM "hw:${CardId}" - } - } - -@@ -26,6 +25,7 @@ SectionDevice."HDMI-stereo" { - ] - - Value { -+ PlaybackPCM "hw:${CardId},0" - PlaybackPriority 200 - } - } --- -2.27.0.rc0 - diff --git a/recipes-multimedia/alsa/alsa-ucm-conf_1.2.%.bbappend b/recipes-multimedia/alsa/alsa-ucm-conf_1.2.%.bbappend deleted file mode 100644 index 0c346e4..0000000 --- a/recipes-multimedia/alsa/alsa-ucm-conf_1.2.%.bbappend +++ /dev/null @@ -1,11 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" - -SRC_URI_append_sdm845 = " \ - file://0001-ucm2-codecs-wcd934x-Add-Codec-sequences.patch \ - file://0002-ucm2-codecs-wsa881x-add-codec-sequences.patch \ - file://0003-ucm2-DB845c-Add-ucm-for-DB845c-board.patch \ - file://0004-ucm2-Add-ucm-for-Lenovo-YOGA-C630-13Q50-laptop.patch \ - file://0005-ucm2-Lenovo-YOGA-C630-remove-cdev-which-is-already-p.patch \ - file://0006-ucm2-DB845c-remove-cdev-which-is-already-present-in-.patch \ - file://0007-ucm2-DB845c-HDMI-update-cdev-to-correct-value.patch \ -" |