diff options
| author | Aníbal Limón <anibal.limon@linaro.org> | 2019-10-31 12:48:52 -0600 |
|---|---|---|
| committer | Aníbal Limón <anibal.limon@linaro.org> | 2019-10-31 12:48:52 -0600 |
| commit | e21a52031f3ea0763d91043120c81cb8e9d08feb (patch) | |
| tree | 0d49867c583922ec1855ab84a9b55afff815e098 | |
| parent | f7a1ce1fa44a9077e4f015e3b4f7dcd0c514ee8a (diff) | |
debian: Add patches for DB845c audiodebian/1.1.8-2+linaro11.1.8-2+linaro1debian/master
Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
12 files changed, 993 insertions, 23 deletions
diff --git a/debian/changelog b/debian/changelog index e4ed7338..d6c6a129 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +alsa-lib (1.1.8-2+linaro1) unstable; urgency=medium + + * Add more patches for DB845c audio + + -- Aníbal Limón <anibal.limon@linaro.org> Thu, 31 Oct 2019 12:48:03 -0600 + alsa-lib (1.1.8-2) unstable; urgency=medium * Get rid of old, unused patches. diff --git a/debian/patches/0001-conf-ucm-Add-ucm-files-for-DB820c-board.patch b/debian/patches/0001-conf-ucm-Add-ucm-files-for-DB820c-board.patch index 2ce00fbf..576bada6 100644 --- a/debian/patches/0001-conf-ucm-Add-ucm-files-for-DB820c-board.patch +++ b/debian/patches/0001-conf-ucm-Add-ucm-files-for-DB820c-board.patch @@ -1,7 +1,7 @@ -From 4663bfb0b0b88800f7a277f3fcbd8991604deb14 Mon Sep 17 00:00:00 2001 +From 3f8f1126d551b0ab6dedf9247d5c80c7b5f0ebec Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Date: Fri, 28 Apr 2017 12:32:59 +0100 -Subject: [PATCH 1/3] conf/ucm: Add ucm files for DB820c board +Subject: [PATCH 01/10] conf/ucm: Add ucm files for DB820c board DB820c board is based of MSM8996 Qualcomm SoC, which has support for both Digital and Analog audio. Digital audio is over HDMI and analog is over @@ -26,7 +26,7 @@ Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> create mode 100644 src/conf/ucm/DB820c/Makefile.am diff --git a/configure.ac b/configure.ac -index a0c346e..e9e1a36 100644 +index a0c346ef..e9e1a369 100644 --- a/configure.ac +++ b/configure.ac @@ -747,6 +747,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ @@ -39,7 +39,7 @@ index a0c346e..e9e1a36 100644 src/conf/ucm/gpd-win-pocket-rt5645/Makefile \ diff --git a/src/conf/ucm/DB820c/DB820c.conf b/src/conf/ucm/DB820c/DB820c.conf new file mode 100644 -index 0000000..58b7ff4 +index 00000000..58b7ff4e --- /dev/null +++ b/src/conf/ucm/DB820c/DB820c.conf @@ -0,0 +1,9 @@ @@ -54,7 +54,7 @@ index 0000000..58b7ff4 +} diff --git a/src/conf/ucm/DB820c/HDMI b/src/conf/ucm/DB820c/HDMI new file mode 100644 -index 0000000..39b2869 +index 00000000..39b28692 --- /dev/null +++ b/src/conf/ucm/DB820c/HDMI @@ -0,0 +1,37 @@ @@ -97,7 +97,7 @@ index 0000000..39b2869 +} diff --git a/src/conf/ucm/DB820c/HiFi b/src/conf/ucm/DB820c/HiFi new file mode 100644 -index 0000000..4457329 +index 00000000..4457329f --- /dev/null +++ b/src/conf/ucm/DB820c/HiFi @@ -0,0 +1,110 @@ @@ -213,7 +213,7 @@ index 0000000..4457329 +} diff --git a/src/conf/ucm/DB820c/Makefile.am b/src/conf/ucm/DB820c/Makefile.am new file mode 100644 -index 0000000..16e985e +index 00000000..16e985e5 --- /dev/null +++ b/src/conf/ucm/DB820c/Makefile.am @@ -0,0 +1,4 @@ @@ -222,7 +222,7 @@ index 0000000..16e985e +ucm_DATA = DB820c.conf HDMI HiFi +EXTRA_DIST = $(ucm_DATA) diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am -index ee850ee..e9f88ed 100644 +index ee850ee6..e9f88ed6 100644 --- a/src/conf/ucm/Makefile.am +++ b/src/conf/ucm/Makefile.am @@ -31,6 +31,7 @@ chtrt5650 \ @@ -234,5 +234,5 @@ index ee850ee..e9f88ed 100644 GoogleNyan \ gpd-win-pocket-rt5645 \ -- -2.20.1 +2.23.0 diff --git a/debian/patches/0002-ucm-Add-ucm-files-for-DB845c-HDMI-audio.patch b/debian/patches/0002-ucm-Add-ucm-files-for-DB845c-HDMI-audio.patch index f067e2ac..b2fa44af 100644 --- a/debian/patches/0002-ucm-Add-ucm-files-for-DB845c-HDMI-audio.patch +++ b/debian/patches/0002-ucm-Add-ucm-files-for-DB845c-HDMI-audio.patch @@ -1,7 +1,7 @@ -From 2d78bbed280e2fc945e4d6ebca0f797c7c19240a Mon Sep 17 00:00:00 2001 +From 294653f6c664ac20a9b96afc736c1aeca1ce079b 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 2/3] ucm: Add: ucm files for DB845c HDMI audio +Subject: [PATCH 02/10] ucm: Add: ucm files for DB845c HDMI audio Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --- @@ -16,7 +16,7 @@ Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> create mode 100644 src/conf/ucm/DB845c/Makefile.am diff --git a/configure.ac b/configure.ac -index e9e1a36..382d7fb 100644 +index e9e1a369..382d7fb1 100644 --- a/configure.ac +++ b/configure.ac @@ -748,6 +748,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ @@ -29,7 +29,7 @@ index e9e1a36..382d7fb 100644 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 0000000..49c688e +index 00000000..49c688e5 --- /dev/null +++ b/src/conf/ucm/DB845c/DB845c.conf @@ -0,0 +1,4 @@ @@ -39,7 +39,7 @@ index 0000000..49c688e +} diff --git a/src/conf/ucm/DB845c/HDMI b/src/conf/ucm/DB845c/HDMI new file mode 100644 -index 0000000..fdac94e +index 00000000..fdac94e5 --- /dev/null +++ b/src/conf/ucm/DB845c/HDMI @@ -0,0 +1,37 @@ @@ -82,7 +82,7 @@ index 0000000..fdac94e +} diff --git a/src/conf/ucm/DB845c/Makefile.am b/src/conf/ucm/DB845c/Makefile.am new file mode 100644 -index 0000000..34b28d8 +index 00000000..34b28d86 --- /dev/null +++ b/src/conf/ucm/DB845c/Makefile.am @@ -0,0 +1,4 @@ @@ -91,7 +91,7 @@ index 0000000..34b28d8 +ucm_DATA = DB845c.conf HDMI +EXTRA_DIST = $(ucm_DATA) diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am -index e9f88ed..46d246e 100644 +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 \ @@ -103,5 +103,5 @@ index e9f88ed..46d246e 100644 GoogleNyan \ gpd-win-pocket-rt5645 \ -- -2.20.1 +2.23.0 diff --git a/debian/patches/0003-ucm-Add-ucm-files-for-DB845c-analog-audio.patch b/debian/patches/0003-ucm-Add-ucm-files-for-DB845c-analog-audio.patch index a663ccbf..7a9f58c7 100644 --- a/debian/patches/0003-ucm-Add-ucm-files-for-DB845c-analog-audio.patch +++ b/debian/patches/0003-ucm-Add-ucm-files-for-DB845c-analog-audio.patch @@ -1,7 +1,7 @@ -From 17abaea26623c6de809891f614394254afc40049 Mon Sep 17 00:00:00 2001 +From c6df679f67d74e6a086b9399846fe7d5172e1e54 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 3/3] ucm: Add: ucm files for DB845c analog audio +Subject: [PATCH 03/10] ucm: Add: ucm files for DB845c analog audio Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --- @@ -12,7 +12,7 @@ Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> create mode 100644 src/conf/ucm/DB845c/HiFi diff --git a/src/conf/ucm/DB845c/DB845c.conf b/src/conf/ucm/DB845c/DB845c.conf -index 49c688e..58b7ff4 100644 +index 49c688e5..58b7ff4e 100644 --- a/src/conf/ucm/DB845c/DB845c.conf +++ b/src/conf/ucm/DB845c/DB845c.conf @@ -1,3 +1,8 @@ @@ -26,7 +26,7 @@ index 49c688e..58b7ff4 100644 Comment "HDMI output." diff --git a/src/conf/ucm/DB845c/HiFi b/src/conf/ucm/DB845c/HiFi new file mode 100644 -index 0000000..36df8c1 +index 00000000..36df8c1f --- /dev/null +++ b/src/conf/ucm/DB845c/HiFi @@ -0,0 +1,202 @@ @@ -233,7 +233,7 @@ index 0000000..36df8c1 + } +} diff --git a/src/conf/ucm/DB845c/Makefile.am b/src/conf/ucm/DB845c/Makefile.am -index 34b28d8..f80ab88 100644 +index 34b28d86..f80ab889 100644 --- a/src/conf/ucm/DB845c/Makefile.am +++ b/src/conf/ucm/DB845c/Makefile.am @@ -1,4 +1,4 @@ @@ -243,5 +243,5 @@ index 34b28d8..f80ab88 100644 +ucm_DATA = DB845c.conf HDMI HiFi EXTRA_DIST = $(ucm_DATA) -- -2.20.1 +2.23.0 diff --git a/debian/patches/0004-DB845c-fix-Defaults.patch b/debian/patches/0004-DB845c-fix-Defaults.patch new file mode 100644 index 00000000..59affbe0 --- /dev/null +++ b/debian/patches/0004-DB845c-fix-Defaults.patch @@ -0,0 +1,134 @@ +From 3c908d2df1d12ce370020bb8b39ac5b70deaaf78 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 + +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 ++++---------------- + 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 +@@ -7,3 +7,22 @@ SectionUseCase."HDMI" { + File "HDMI" + Comment "HDMI output." + } ++ ++SectionDefaults [ ++ cdev "hw:0" ++ 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" ++ cset "name='CDC_IF RX0 MUX' SLIM RX0" ++ cset "name='RX INT7_1 MIX1 INP0' RX0" ++ cset "name='RX INT8_1 MIX1 INP0' RX0" ++ ## gain to 0dB ++ cset "name='RX0 Digital Volume' 68" ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 1" ++ cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1" ++ cset "name='AIF1_CAP Mixer SLIM TX0' 1" ++ cset "name='CDC_IF TX0 MUX' DEC0" ++ cset "name='ADC MUX0' DMIC" ++ 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 +@@ -3,17 +3,17 @@ + + SectionVerb { + EnableSequence [ +- cdev "hw:0" +- cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 1" ++ 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 { ++ cdev "hw:0" ++ cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 0" ++ ] ++ Value { + TQ "HiFi" +- PlaybackPCM "plughw:0,0" ++ PlaybackPCM "hw:0,0" + } + } + +@@ -22,13 +22,13 @@ SectionDevice."HDMI-stereo" { + Comment "HDMI Digital Stereo Output" + + EnableSequence [ +- cdev "hw:0" +- cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 1" ++ 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" ++ cdev "hw:0" ++ cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 0" + ] + + 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 +@@ -6,13 +6,7 @@ SectionVerb { + EnableSequence [ + cdev "hw:0" + cset "name='SLIM RX0 MUX' AIF1_PB" +- cset "name='SLIM RX1 MUX' ZERO" +- cset "name='SLIM RX2 MUX' ZERO" +- cset "name='SLIM RX3 MUX' ZERO" +- cset "name='SLIM RX4 MUX' ZERO" +- cset "name='SLIM RX5 MUX' ZERO" +- cset "name='SLIM RX6 MUX' ZERO" +- cset "name='SLIM RX7 MUX' ZERO" ++ cset "name='CDC_IF RX0 MUX' SLIM RX0" + cset "name='RX INT7_1 MIX1 INP0' RX0" + cset "name='RX INT8_1 MIX1 INP0' RX0" + ## gain to 0dB +@@ -35,8 +29,8 @@ SectionVerb { + # ALSA PCM + Value { + # ALSA PCM device for HiFi +- PlaybackPCM "plughw:0,1" +- CapturePCM "plughw:0,2" ++ PlaybackPCM "hw:0,1" ++ CapturePCM "hw:0,2" + } + } + +@@ -46,13 +40,7 @@ SectionDevice."Speakers" { + EnableSequence [ + cdev "hw:0" + cset "name='SLIM RX0 MUX' AIF1_PB" +- cset "name='SLIM RX1 MUX' ZERO" +- cset "name='SLIM RX2 MUX' ZERO" +- cset "name='SLIM RX3 MUX' ZERO" +- cset "name='SLIM RX4 MUX' ZERO" +- cset "name='SLIM RX5 MUX' ZERO" +- cset "name='SLIM RX6 MUX' ZERO" +- cset "name='SLIM RX7 MUX' ZERO" ++ cset "name='CDC_IF RX0 MUX' SLIM RX0" + cset "name='RX INT7_1 MIX1 INP0' RX0" + cset "name='RX INT8_1 MIX1 INP0' RX0" + ## gain to 0dB +-- +2.23.0 + diff --git a/debian/patches/0005-WIP-make-card-name-explicit.patch b/debian/patches/0005-WIP-make-card-name-explicit.patch new file mode 100644 index 00000000..c59aeea4 --- /dev/null +++ b/debian/patches/0005-WIP-make-card-name-explicit.patch @@ -0,0 +1,235 @@ +From 2b92828b0e8ff30cfe7cbd12db6e96c3860333d7 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 + +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 ++------------------------------ + 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 +@@ -9,7 +9,7 @@ SectionUseCase."HDMI" { + } + + SectionDefaults [ +- cdev "hw:0" ++ cdev "hw:DB845c" + 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 +@@ -3,17 +3,17 @@ + + SectionVerb { + EnableSequence [ +- cdev "hw:0" ++ cdev "hw:DB845c" + cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 1" + ] + + DisableSequence [ +- cdev "hw:0" ++ cdev "hw:DB845c" + cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 0" + ] + Value { + TQ "HiFi" +- PlaybackPCM "hw:0,0" ++ PlaybackPCM "hw:DB845c,0" + } + } + +@@ -22,12 +22,12 @@ SectionDevice."HDMI-stereo" { + Comment "HDMI Digital Stereo Output" + + EnableSequence [ +- cdev "hw:0" ++ cdev "hw:DB845c" + cset "name='QUAT_MI2S_RX Audio Mixer MultiMedia1' 1" + ] + + DisableSequence [ +- cdev "hw:0" ++ cdev "hw:DB845c" + 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 +@@ -4,7 +4,7 @@ + SectionVerb { + + EnableSequence [ +- cdev "hw:0" ++ cdev "hw:DB845c" + cset "name='SLIM RX0 MUX' AIF1_PB" + cset "name='CDC_IF RX0 MUX' SLIM RX0" + cset "name='RX INT7_1 MIX1 INP0' RX0" +@@ -21,7 +21,7 @@ SectionVerb { + ] + + DisableSequence [ +- cdev "hw:0" ++ cdev "hw:DB845c" + cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 0" + cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0" + ] +@@ -29,8 +29,8 @@ SectionVerb { + # ALSA PCM + Value { + # ALSA PCM device for HiFi +- PlaybackPCM "hw:0,1" +- CapturePCM "hw:0,2" ++ PlaybackPCM "hw:DB845c,1" ++ CapturePCM "hw:DB845c,2" + } + } + +@@ -38,7 +38,7 @@ SectionDevice."Speakers" { + Comment "Speakers playback" + + EnableSequence [ +- cdev "hw:0" ++ cdev "hw:DB845c" + cset "name='SLIM RX0 MUX' AIF1_PB" + cset "name='CDC_IF RX0 MUX' SLIM RX0" + cset "name='RX INT7_1 MIX1 INP0' RX0" +@@ -58,7 +58,7 @@ SectionDevice."Speakers" { + ] + + DisableSequence [ +- cdev "hw:0" ++ cdev "hw:DB845c" + cset "name='RX0 Digital Volume' 0" + cset "name='SLIM RX0 MUX' ZERO" + cset "name='COMP7 Switch' 0" +@@ -76,115 +76,3 @@ SectionDevice."Speakers" { + PlaybackChannels "2" + } + } +- +-SectionDevice."DMIC0" { +- Comment "Digital Microphone0" +- +- EnableSequence [ +- cdev "hw:0" +- cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1" +- cset "name='AIF1_CAP Mixer SLIM TX0' 1" +- cset "name='CDC_IF TX0 MUX' DEC0" +- cset "name='ADC MUX0' DMIC" +- cset "name='DMIC MUX0' DMIC0" +- cset "name='DEC0 Volume' 68" +- ] +- +- DisableSequence [ +- cdev "hw:0" +- cset "name='AIF1_CAP Mixer SLIM TX0' 0" +- cset "name='CDC_IF TX0 MUX' ZERO" +- cset "name='ADC MUX0' ZERO" +- cset "name='DMIC MUX0' ZERO" +- cset "name='DEC0 Volume' 0" +- cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0" +- ] +- +- Value { +- CaptureChannels "1" +- } +-} +- +-SectionDevice."DMIC1" { +- Comment "Digital Microphone1" +- +- EnableSequence [ +- cdev "hw:0" +- cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1" +- cset "name='AIF1_CAP Mixer SLIM TX0' 1" +- cset "name='CDC_IF TX0 MUX' DEC0" +- cset "name='ADC MUX0' DMIC" +- cset "name='DMIC MUX0' DMIC1" +- cset "name='DEC0 Volume' 68" +- ] +- +- DisableSequence [ +- cdev "hw:0" +- cset "name='AIF1_CAP Mixer SLIM TX0' 0" +- cset "name='CDC_IF TX0 MUX' ZERO" +- cset "name='ADC MUX0' ZERO" +- cset "name='DMIC MUX0' ZERO" +- cset "name='DEC0 Volume' 0" +- cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0" +- ] +- +- Value { +- CaptureChannels "1" +- } +-} +- +-SectionDevice."DMIC2" { +- Comment "Digital Microphone0" +- +- EnableSequence [ +- cdev "hw:0" +- cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1" +- cset "name='AIF1_CAP Mixer SLIM TX0' 1" +- cset "name='CDC_IF TX0 MUX' DEC0" +- cset "name='ADC MUX0' DMIC" +- cset "name='DMIC MUX0' DMIC2" +- cset "name='DEC0 Volume' 68" +- ] +- +- DisableSequence [ +- cdev "hw:0" +- cset "name='AIF1_CAP Mixer SLIM TX0' 0" +- cset "name='CDC_IF TX0 MUX' ZERO" +- cset "name='ADC MUX0' ZERO" +- cset "name='DMIC MUX0' ZERO" +- cset "name='DEC0 Volume' 0" +- cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0" +- ] +- +- Value { +- CaptureChannels "1" +- } +-} +- +-SectionDevice."DMIC4" { +- Comment "Digital Microphone0" +- +- EnableSequence [ +- cdev "hw:0" +- cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1" +- cset "name='AIF1_CAP Mixer SLIM TX0' 1" +- cset "name='CDC_IF TX0 MUX' DEC0" +- cset "name='ADC MUX0' DMIC" +- cset "name='DMIC MUX0' DMIC3" +- cset "name='DEC0 Volume' 68" +- ] +- +- DisableSequence [ +- cdev "hw:0" +- cset "name='AIF1_CAP Mixer SLIM TX0' 0" +- cset "name='CDC_IF TX0 MUX' ZERO" +- cset "name='ADC MUX0' ZERO" +- cset "name='DMIC MUX0' ZERO" +- cset "name='DEC0 Volume' 0" +- cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0" +- ] +- +- Value { +- CaptureChannels "1" +- } +-} +-- +2.23.0 + diff --git a/debian/patches/0006-DB845c-Add-headset-mixer-controls.patch b/debian/patches/0006-DB845c-Add-headset-mixer-controls.patch new file mode 100644 index 00000000..f1a4264a --- /dev/null +++ b/debian/patches/0006-DB845c-Add-headset-mixer-controls.patch @@ -0,0 +1,152 @@ +From 95da046a766a82ac2a44a2ff7746adb0621aa693 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 + +Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> +--- + src/conf/ucm/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 +@@ -5,32 +5,23 @@ SectionVerb { + + EnableSequence [ + cdev "hw:DB845c" +- cset "name='SLIM RX0 MUX' AIF1_PB" +- cset "name='CDC_IF RX0 MUX' SLIM RX0" +- cset "name='RX INT7_1 MIX1 INP0' RX0" +- cset "name='RX INT8_1 MIX1 INP0' RX0" ++ 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='RX0 Digital Volume' 68" +- cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 1" +- cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1" +- cset "name='AIF1_CAP Mixer SLIM TX0' 1" +- cset "name='CDC_IF TX0 MUX' DEC0" +- cset "name='ADC MUX0' DMIC" +- cset "name='DMIC MUX0' DMIC0" +- cset "name='DEC0 Volume' 68" ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" + ] + + DisableSequence [ + cdev "hw:DB845c" +- cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 0" +- cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0" ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" + ] + + # ALSA PCM + Value { + # ALSA PCM device for HiFi +- PlaybackPCM "hw:DB845c,1" +- CapturePCM "hw:DB845c,2" ++ PlaybackPCM "hw:DB845c,0" + } + } + +@@ -39,34 +30,38 @@ SectionDevice."Speakers" { + + EnableSequence [ + cdev "hw:DB845c" +- cset "name='SLIM RX0 MUX' AIF1_PB" +- cset "name='CDC_IF RX0 MUX' SLIM RX0" +- cset "name='RX INT7_1 MIX1 INP0' RX0" +- cset "name='RX INT8_1 MIX1 INP0' RX0" +- ## gain to 0dB +- cset "name='RX0 Digital Volume' 68" +- cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 1" ++ 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 VISENSE 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 VISENSE Switch' 1" ++ cset "name='SpkrRight DAC Switch' 1" ++ cset "name='SpkrRight VISENSE Switch' 0" + ] + + DisableSequence [ + cdev "hw:DB845c" +- cset "name='RX0 Digital Volume' 0" +- cset "name='SLIM RX0 MUX' ZERO" ++ 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 MultiMedia2' 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" +@@ -76,3 +71,43 @@ SectionDevice."Speakers" { + PlaybackChannels "2" + } + } ++ ++SectionDevice."HeadPhones" { ++ Comment "HeadPhones playback" ++ ++ EnableSequence [ ++ cdev "hw:DB845c" ++ 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:DB845c" ++ 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" ++ } ++} +-- +2.23.0 + diff --git a/debian/patches/0007-Lenovo-YOGA-C630-13Q50-Add-ucm-for-Speaker-and-Heads.patch b/debian/patches/0007-Lenovo-YOGA-C630-13Q50-Add-ucm-for-Speaker-and-Heads.patch new file mode 100644 index 00000000..ebb175fe --- /dev/null +++ b/debian/patches/0007-Lenovo-YOGA-C630-13Q50-Add-ucm-for-Speaker-and-Heads.patch @@ -0,0 +1,179 @@ +From 00b13011d51bd23dc37af5d006cd158cb808b4e1 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 382d7fb1..88812aa6 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.23.0 + diff --git a/debian/patches/0008-ucm-DB845c-update-volume-controls.patch b/debian/patches/0008-ucm-DB845c-update-volume-controls.patch new file mode 100644 index 00000000..07842b61 --- /dev/null +++ b/debian/patches/0008-ucm-DB845c-update-volume-controls.patch @@ -0,0 +1,55 @@ +From a69b39cf6a5f32b7df17c34e27c2b3875f89e9ee 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 + +Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> +--- + src/conf/ucm/DB845c/DB845c.conf | 6 ++++-- + src/conf/ucm/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 +@@ -17,8 +17,10 @@ SectionDefaults [ + cset "name='RX INT7_1 MIX1 INP0' RX0" + cset "name='RX INT8_1 MIX1 INP0' RX0" + ## gain to 0dB +- cset "name='RX0 Digital Volume' 68" +- cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 1" ++ cset "name='RX7 Digital Volume' 0" ++ cset "name='RX8 Digital Volume' 0" ++ cset "name='RX1 Mux Digital Volume' 0" ++ cset "name='RX2 Mux Digital Volume' 0" + 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 +@@ -39,6 +39,8 @@ SectionDevice."Speakers" { + cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" + cset "name='COMP7 Switch' 1" + cset "name='COMP8 Switch' 1" ++ cset "name='RX7 Digital Volume' 70" ++ cset "name='RX8 Digital Volume' 70" + ## Speakers + cset "name='SpkrLeft COMP Switch' 1" + cset "name='SpkrLeft BOOST Switch' 1" +@@ -86,8 +88,8 @@ SectionDevice."HeadPhones" { + 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='RX1 Mix Digital Volume' 68" ++ cset "name='RX2 Mix Digital Volume' 68" + cset "name='RX INT1 DEM MUX' CLSH_DSM_OUT" + cset "name='RX INT2 DEM MUX' CLSH_DSM_OUT" + ] +-- +2.23.0 + diff --git a/debian/patches/0009-ucm-DB845c-remove-headphones-for-now.patch b/debian/patches/0009-ucm-DB845c-remove-headphones-for-now.patch new file mode 100644 index 00000000..c78b3696 --- /dev/null +++ b/debian/patches/0009-ucm-DB845c-remove-headphones-for-now.patch @@ -0,0 +1,137 @@ +From 68ac97e02d62bd2881beb1f66bddcb3937a7fc8b 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 + +Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> +--- + gitcompile | 2 +- + src/conf/ucm/DB845c/DB845c.conf | 5 ++-- + src/conf/ucm/DB845c/HiFi | 50 ++++----------------------------- + 3 files changed, 8 insertions(+), 49 deletions(-) + +diff --git a/gitcompile b/gitcompile +index 2741db4c..e6f709de 100755 +--- a/gitcompile ++++ b/gitcompile +@@ -75,7 +75,7 @@ autoheader + automake --foreign --copy --add-missing + touch depcomp # seems to be missing for old automake + autoconf +-export CFLAGS='-O2 -Wall -W -Wunused-const-variable=0 -pipe -g' ++export CFLAGS='-O2 -Wall -W -pipe -g' + echo "CFLAGS=$CFLAGS" + echo "./configure $args" + ./configure $args || exit 1 +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 +@@ -13,14 +13,13 @@ SectionDefaults [ + 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" +- cset "name='CDC_IF RX0 MUX' SLIM RX0" + cset "name='RX INT7_1 MIX1 INP0' RX0" + cset "name='RX INT8_1 MIX1 INP0' RX0" + ## gain to 0dB + cset "name='RX7 Digital Volume' 0" + cset "name='RX8 Digital Volume' 0" +- cset "name='RX1 Mux Digital Volume' 0" +- cset "name='RX2 Mux Digital Volume' 0" ++ cset "name='RX1 Mix Digital Volume' 0" ++ cset "name='RX2 Mix Digital Volume' 0" + 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 +@@ -10,18 +10,18 @@ SectionVerb { + 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" ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 1" + ] + + DisableSequence [ + cdev "hw:DB845c" +- cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia2' 0" + ] + + # ALSA PCM + Value { + # ALSA PCM device for HiFi +- PlaybackPCM "hw:DB845c,0" ++ PlaybackPCM "hw:DB845c,1" + } + } + +@@ -36,7 +36,7 @@ SectionDevice."Speakers" { + 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='SLIMBUS_0_RX Audio Mixer MultiMedia2' 1" + cset "name='COMP7 Switch' 1" + cset "name='COMP8 Switch' 1" + cset "name='RX7 Digital Volume' 70" +@@ -58,7 +58,7 @@ SectionDevice."Speakers" { + 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='SLIMBUS_0_RX Audio Mixer MultiMedia2' 0" + cset "name='SpkrLeft DAC Switch' 0" + cset "name='SpkrLeft COMP Switch' 0" + cset "name='SpkrLeft BOOST Switch' 0" +@@ -73,43 +73,3 @@ SectionDevice."Speakers" { + PlaybackChannels "2" + } + } +- +-SectionDevice."HeadPhones" { +- Comment "HeadPhones playback" +- +- EnableSequence [ +- cdev "hw:DB845c" +- 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 Mix Digital Volume' 68" +- cset "name='RX2 Mix Digital Volume' 68" +- cset "name='RX INT1 DEM MUX' CLSH_DSM_OUT" +- cset "name='RX INT2 DEM MUX' CLSH_DSM_OUT" +- ] +- +- DisableSequence [ +- cdev "hw:DB845c" +- 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" +- } +-} +-- +2.23.0 + diff --git a/debian/patches/0010-ucm-DB845c-adjust-default-volume-of-speakers.patch b/debian/patches/0010-ucm-DB845c-adjust-default-volume-of-speakers.patch new file mode 100644 index 00000000..4b5c2456 --- /dev/null +++ b/debian/patches/0010-ucm-DB845c-adjust-default-volume-of-speakers.patch @@ -0,0 +1,65 @@ +From 955175f1c93f3f2c8d51595bd5cbf479250d76f8 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 + +Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> +--- + src/conf/ucm/DB845c/DB845c.conf | 15 ++++++++++----- + src/conf/ucm/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 +@@ -12,14 +12,19 @@ SectionDefaults [ + cdev "hw:DB845c" + 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" +- cset "name='RX INT7_1 MIX1 INP0' RX0" +- cset "name='RX INT8_1 MIX1 INP0' RX0" ++ cset "name='SLIM RX0 MUX' ZERO" ++ cset "name='SLIM RX1 MUX' ZERO" ++ cset "name='SLIM RX2 MUX' ZERO" ++ cset "name='SLIM RX3 MUX' ZERO" ++ cset "name='SLIM RX4 MUX' ZERO" ++ cset "name='SLIM RX5 MUX' ZERO" ++ 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='RX7 Digital Volume' 0" + cset "name='RX8 Digital Volume' 0" +- cset "name='RX1 Mix Digital Volume' 0" +- cset "name='RX2 Mix Digital Volume' 0" + 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 +@@ -32,15 +32,13 @@ SectionDevice."Speakers" { + cdev "hw:DB845c" + 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 MultiMedia2' 1" + cset "name='COMP7 Switch' 1" + cset "name='COMP8 Switch' 1" +- cset "name='RX7 Digital Volume' 70" +- cset "name='RX8 Digital Volume' 70" ++ cset "name='RX7 Digital Volume' 100" ++ cset "name='RX8 Digital Volume' 100" + ## Speakers + cset "name='SpkrLeft COMP Switch' 1" + cset "name='SpkrLeft BOOST Switch' 1" +-- +2.23.0 + diff --git a/debian/patches/series b/debian/patches/series index 06db8f60..52839b72 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,10 @@ 0001-conf-ucm-Add-ucm-files-for-DB820c-board.patch 0002-ucm-Add-ucm-files-for-DB845c-HDMI-audio.patch 0003-ucm-Add-ucm-files-for-DB845c-analog-audio.patch +0004-DB845c-fix-Defaults.patch +0005-WIP-make-card-name-explicit.patch +0006-DB845c-Add-headset-mixer-controls.patch +0007-Lenovo-YOGA-C630-13Q50-Add-ucm-for-Speaker-and-Heads.patch +0008-ucm-DB845c-update-volume-controls.patch +0009-ucm-DB845c-remove-headphones-for-now.patch +0010-ucm-DB845c-adjust-default-volume-of-speakers.patch |