aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linaro.org>2019-12-03 15:43:34 -0600
committerNicolas Dechesne <nicolas.dechesne@linaro.org>2019-12-18 05:49:25 +0100
commit3e5569032856f4f1ab98687257dd0049342473c5 (patch)
tree885218d49becf5058a560f247fd469c138a5bfe1
parent875a9475050f22d3888931411d876e316dd488fb (diff)
downloadmeta-qcom-3e5569032856f4f1ab98687257dd0049342473c5.tar.gz
meta-qcom-3e5569032856f4f1ab98687257dd0049342473c5.tar.bz2
meta-qcom-3e5569032856f4f1ab98687257dd0049342473c5.zip
recipes-multimedia/alsa: Update alsa patches for DB845c
[1] Remove DB820c patch already in upstream. [2] Refresh patches for DB845c due to new version of alsa-lib 1.1.9. Signed-off-by: Aníbal Limón <anibal.limon@linaro.org> (cherry picked from commit 099f587a0086eac15c2845c5423320c4df3fc55c)
-rw-r--r--recipes-multimedia/alsa/alsa-lib/0001-conf-ucm-Add-ucm-files-for-DB820c-board.patch238
-rw-r--r--recipes-multimedia/alsa/alsa-lib/0002-ucm-Add-ucm-files-for-DB845c-HDMI-audio.patch8
-rw-r--r--recipes-multimedia/alsa/alsa-lib/0003-ucm-Add-ucm-files-for-DB845c-analog-audio.patch6
-rw-r--r--recipes-multimedia/alsa/alsa-lib/0004-DB845c-fix-Defaults.patch6
-rw-r--r--recipes-multimedia/alsa/alsa-lib/0005-WIP-make-card-name-explicit.patch6
-rw-r--r--recipes-multimedia/alsa/alsa-lib/0006-DB845c-Add-headset-mixer-controls.patch6
-rw-r--r--recipes-multimedia/alsa/alsa-lib/0007-Lenovo-YOGA-C630-13Q50-Add-ucm-for-Speaker-and-Heads.patch8
-rw-r--r--recipes-multimedia/alsa/alsa-lib/0008-ucm-DB845c-update-volume-controls.patch6
-rw-r--r--recipes-multimedia/alsa/alsa-lib/0009-ucm-DB845c-remove-headphones-for-now.patch22
-rw-r--r--recipes-multimedia/alsa/alsa-lib/0010-ucm-DB845c-adjust-default-volume-of-speakers.patch4
-rw-r--r--recipes-multimedia/alsa/alsa-lib_1.1.%.bbappend5
11 files changed, 29 insertions, 286 deletions
diff --git a/recipes-multimedia/alsa/alsa-lib/0001-conf-ucm-Add-ucm-files-for-DB820c-board.patch b/recipes-multimedia/alsa/alsa-lib/0001-conf-ucm-Add-ucm-files-for-DB820c-board.patch
deleted file mode 100644
index 6fe8b19..0000000
--- a/recipes-multimedia/alsa/alsa-lib/0001-conf-ucm-Add-ucm-files-for-DB820c-board.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-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/9] 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
-WCD9335 codec via SLIMbus.
-
-Board itself has HDMI port, a 3.5mm audio Jack and an Audio expansion
-connector.
-This patch adds ucm support for HDMI port and 3.5mm jack.
-
-Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
----
- configure.ac | 1 +
- src/conf/ucm/DB820c/DB820c.conf | 9 +++
- src/conf/ucm/DB820c/HDMI | 37 +++++++++++
- src/conf/ucm/DB820c/HiFi | 110 ++++++++++++++++++++++++++++++++
- src/conf/ucm/DB820c/Makefile.am | 4 ++
- src/conf/ucm/Makefile.am | 1 +
- 6 files changed, 162 insertions(+)
- create mode 100644 src/conf/ucm/DB820c/DB820c.conf
- create mode 100644 src/conf/ucm/DB820c/HDMI
- create mode 100644 src/conf/ucm/DB820c/HiFi
- create mode 100644 src/conf/ucm/DB820c/Makefile.am
-
-diff --git a/configure.ac b/configure.ac
-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 \
- src/conf/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/Makefile \
- src/conf/ucm/DAISY-I2S/Makefile \
- src/conf/ucm/DB410c/Makefile \
-+ src/conf/ucm/DB820c/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/DB820c/DB820c.conf b/src/conf/ucm/DB820c/DB820c.conf
-new file mode 100644
-index 00000000..58b7ff4e
---- /dev/null
-+++ b/src/conf/ucm/DB820c/DB820c.conf
-@@ -0,0 +1,9 @@
-+SectionUseCase."HiFi" {
-+ File "HiFi"
-+ Comment "HiFi quality Music."
-+}
-+
-+SectionUseCase."HDMI" {
-+ File "HDMI"
-+ Comment "HDMI output."
-+}
-diff --git a/src/conf/ucm/DB820c/HDMI b/src/conf/ucm/DB820c/HDMI
-new file mode 100644
-index 00000000..39b28692
---- /dev/null
-+++ b/src/conf/ucm/DB820c/HDMI
-@@ -0,0 +1,37 @@
-+# Use case configuration for DB820c board.
-+# Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
-+
-+SectionVerb {
-+ EnableSequence [
-+ cdev "hw:0"
-+ cset "name='HDMI Mixer MultiMedia1' 1"
-+ ]
-+
-+ DisableSequence [
-+ cdev "hw:0"
-+ cset "name='HDMI 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='HDMI Mixer MultiMedia1' 1"
-+ ]
-+
-+ DisableSequence [
-+ cdev "hw:0"
-+ cset "name='HDMI Mixer MultiMedia1' 0"
-+ ]
-+
-+ Value {
-+ PlaybackChannels "2"
-+ }
-+}
-diff --git a/src/conf/ucm/DB820c/HiFi b/src/conf/ucm/DB820c/HiFi
-new file mode 100644
-index 00000000..4457329f
---- /dev/null
-+++ b/src/conf/ucm/DB820c/HiFi
-@@ -0,0 +1,110 @@
-+# Use case configuration for DB820c board.
-+# Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
-+
-+SectionVerb {
-+
-+ EnableSequence [
-+ cdev "hw:0"
-+ 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' AIF4_PB"
-+ cset "name='SLIM RX6 MUX' AIF4_PB"
-+ cset "name='SLIM RX7 MUX' ZERO"
-+ cset "name='RX INT1_2 MUX' RX5"
-+ cset "name='RX INT2_2 MUX' RX6"
-+ ## gain to 0dB
-+ cset "name='RX5 Digital Volume' 68"
-+ ## gain to 0dB
-+ cset "name='RX6 Digital Volume' 68"
-+ cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 1"
-+ cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1"
-+ cset "name='RX INT1 DEM MUX' CLSH_DSM_OUT"
-+ cset "name='RX INT2 DEM MUX' CLSH_DSM_OUT"
-+ cset "name='AIF1_CAP Mixer SLIM TX0' 1"
-+ cset "name='SLIM TX0 MUX' DEC0"
-+ cset "name='ADC2 Volume' 12"
-+ cset "name='ADC MUX0' AMIC"
-+ cset "name='AMIC MUX0' ADC2"
-+ ]
-+
-+ DisableSequence [
-+ cdev "hw:0"
-+ cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 0"
-+ cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0"
-+ ]
-+
-+ # ALSA PCM
-+ Value {
-+ # ALSA PCM device for HiFi
-+ PlaybackPCM "plughw:0,1"
-+ CapturePCM "plughw:0,2"
-+ }
-+}
-+
-+SectionDevice."Headphones" {
-+ Comment "Headphones playback"
-+
-+ EnableSequence [
-+ cdev "hw:0"
-+ 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' AIF4_PB"
-+ cset "name='SLIM RX6 MUX' AIF4_PB"
-+ cset "name='SLIM RX7 MUX' ZERO"
-+ cset "name='RX INT1_2 MUX' RX5"
-+ cset "name='RX INT2_2 MUX' RX6"
-+ ## gain to 0dB
-+ cset "name='RX5 Digital Volume' 68"
-+ ## gain to 0dB
-+ cset "name='RX6 Digital Volume' 68"
-+ cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 1"
-+ cset "name='RX INT1 DEM MUX' CLSH_DSM_OUT"
-+ cset "name='RX INT2 DEM MUX' CLSH_DSM_OUT"
-+ ]
-+
-+ DisableSequence [
-+ cdev "hw:0"
-+ cset "name='RX5 Digital Volume' 0"
-+ cset "name='RX6 Digital Volume' 0"
-+ cset "name='SLIM RX5 MUX' ZERO"
-+ cset "name='SLIM RX6 MUX' ZERO"
-+ cset "name='SLIMBUS_6_RX Audio Mixer MultiMedia2' 0"
-+ ]
-+
-+ Value {
-+ PlaybackChannels "2"
-+ }
-+}
-+
-+SectionDevice."Handset" {
-+ Comment "Headset Microphone"
-+
-+ EnableSequence [
-+ cdev "hw:0"
-+ cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 1"
-+ cset "name='AIF1_CAP Mixer SLIM TX0' 1"
-+ cset "name='SLIM TX0 MUX' DEC0"
-+ cset "name='ADC2 Volume' 12"
-+ cset "name='ADC MUX0' AMIC"
-+ cset "name='AMIC MUX0' ADC2"
-+ ]
-+
-+ DisableSequence [
-+ cdev "hw:0"
-+ cset "name='MultiMedia3 Mixer SLIMBUS_0_TX' 0"
-+ cset "name='AIF1_CAP Mixer SLIM TX0' 0"
-+ cset "name='AMIC MUX0' ZERO"
-+ cset "name='SLIM TX0 MUX' ZERO"
-+ cset "name='ADC2 Volume' 0"
-+ ]
-+
-+ Value {
-+ CaptureChannels "1"
-+ }
-+}
-diff --git a/src/conf/ucm/DB820c/Makefile.am b/src/conf/ucm/DB820c/Makefile.am
-new file mode 100644
-index 00000000..16e985e5
---- /dev/null
-+++ b/src/conf/ucm/DB820c/Makefile.am
-@@ -0,0 +1,4 @@
-+alsaconfigdir = @ALSA_CONFIG_DIR@
-+ucmdir = $(alsaconfigdir)/ucm/DB820c
-+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 ee850ee6..e9f88ed6 100644
---- a/src/conf/ucm/Makefile.am
-+++ b/src/conf/ucm/Makefile.am
-@@ -31,6 +31,7 @@ chtrt5650 \
- cube-i1_TF-Defaultstring-CherryTrailCR \
- DAISY-I2S \
- DB410c \
-+DB820c \
- Dell-WD15-Dock \
- GoogleNyan \
- gpd-win-pocket-rt5645 \
---
-2.23.0
-
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
index c7dc3f5..6c35b35 100644
--- 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
@@ -1,7 +1,7 @@
-From 294653f6c664ac20a9b96afc736c1aeca1ce079b Mon Sep 17 00:00:00 2001
+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 2/9] 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 e9e1a369..382d7fb1 100644
+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 \
@@ -103,5 +103,5 @@ index e9f88ed6..46d246ea 100644
GoogleNyan \
gpd-win-pocket-rt5645 \
--
-2.23.0
+2.24.0
diff --git a/recipes-multimedia/alsa/alsa-lib/0003-ucm-Add-ucm-files-for-DB845c-analog-audio.patch b/recipes-multimedia/alsa/alsa-lib/0003-ucm-Add-ucm-files-for-DB845c-analog-audio.patch
index b57b9c4..a017b1a 100644
--- a/recipes-multimedia/alsa/alsa-lib/0003-ucm-Add-ucm-files-for-DB845c-analog-audio.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0003-ucm-Add-ucm-files-for-DB845c-analog-audio.patch
@@ -1,7 +1,7 @@
-From c6df679f67d74e6a086b9399846fe7d5172e1e54 Mon Sep 17 00:00:00 2001
+From 01af05eaa8727411186b68f1712242bf27f8ae51 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/9] 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>
---
@@ -243,5 +243,5 @@ index 34b28d86..f80ab889 100644
+ucm_DATA = DB845c.conf HDMI HiFi
EXTRA_DIST = $(ucm_DATA)
--
-2.23.0
+2.24.0
diff --git a/recipes-multimedia/alsa/alsa-lib/0004-DB845c-fix-Defaults.patch b/recipes-multimedia/alsa/alsa-lib/0004-DB845c-fix-Defaults.patch
index ffee642..649ea79 100644
--- a/recipes-multimedia/alsa/alsa-lib/0004-DB845c-fix-Defaults.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0004-DB845c-fix-Defaults.patch
@@ -1,7 +1,7 @@
-From 3c908d2df1d12ce370020bb8b39ac5b70deaaf78 Mon Sep 17 00:00:00 2001
+From 5f8c3f0795f463be9594aebe0d20c6a69e5ccff8 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 4/9] DB845c: fix Defaults
+Subject: [PATCH 04/10] DB845c: fix Defaults
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
@@ -130,5 +130,5 @@ index 36df8c1f..e8ede5b3 100644
cset "name='RX INT8_1 MIX1 INP0' RX0"
## gain to 0dB
--
-2.23.0
+2.24.0
diff --git a/recipes-multimedia/alsa/alsa-lib/0005-WIP-make-card-name-explicit.patch b/recipes-multimedia/alsa/alsa-lib/0005-WIP-make-card-name-explicit.patch
index c19ce27..1cc0afb 100644
--- a/recipes-multimedia/alsa/alsa-lib/0005-WIP-make-card-name-explicit.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0005-WIP-make-card-name-explicit.patch
@@ -1,7 +1,7 @@
-From 2b92828b0e8ff30cfe7cbd12db6e96c3860333d7 Mon Sep 17 00:00:00 2001
+From 30669d43de97af2b6367ef3de6f8758fe08c73c5 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 5/9] WIP: make card name explicit
+Subject: [PATCH 05/10] WIP: make card name explicit
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
@@ -231,5 +231,5 @@ index e8ede5b3..f83213c8 100644
- }
-}
--
-2.23.0
+2.24.0
diff --git a/recipes-multimedia/alsa/alsa-lib/0006-DB845c-Add-headset-mixer-controls.patch b/recipes-multimedia/alsa/alsa-lib/0006-DB845c-Add-headset-mixer-controls.patch
index fe0a375..25e98c2 100644
--- a/recipes-multimedia/alsa/alsa-lib/0006-DB845c-Add-headset-mixer-controls.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0006-DB845c-Add-headset-mixer-controls.patch
@@ -1,7 +1,7 @@
-From 95da046a766a82ac2a44a2ff7746adb0621aa693 Mon Sep 17 00:00:00 2001
+From 0bb72348330959d7b736131a0a57e01a42b0ecb4 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 6/9] DB845c: Add headset mixer controls
+Subject: [PATCH 06/10] DB845c: Add headset mixer controls
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
@@ -148,5 +148,5 @@ index f83213c8..7efd93df 100644
+ }
+}
--
-2.23.0
+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
index c24d4e6..0a84071 100644
--- 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
@@ -1,7 +1,7 @@
-From 00b13011d51bd23dc37af5d006cd158cb808b4e1 Mon Sep 17 00:00:00 2001
+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 7/9] Lenovo-YOGA-C630-13Q50: Add ucm for Speaker and Headset
+Subject: [PATCH 07/10] Lenovo-YOGA-C630-13Q50: Add ucm for Speaker and Headset
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
@@ -15,7 +15,7 @@ Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
create mode 100644 src/conf/ucm/Lenovo-YOGA-C630-13Q50/Makefile.am
diff --git a/configure.ac b/configure.ac
-index 382d7fb1..88812aa6 100644
+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 \
@@ -175,5 +175,5 @@ index 00000000..05397651
+ucm_DATA = Lenovo-YOGA-C630-13Q50.conf HiFi
+EXTRA_DIST = $(ucm_DATA)
--
-2.23.0
+2.24.0
diff --git a/recipes-multimedia/alsa/alsa-lib/0008-ucm-DB845c-update-volume-controls.patch b/recipes-multimedia/alsa/alsa-lib/0008-ucm-DB845c-update-volume-controls.patch
index b4448d3..dad6b50 100644
--- a/recipes-multimedia/alsa/alsa-lib/0008-ucm-DB845c-update-volume-controls.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0008-ucm-DB845c-update-volume-controls.patch
@@ -1,7 +1,7 @@
-From a69b39cf6a5f32b7df17c34e27c2b3875f89e9ee Mon Sep 17 00:00:00 2001
+From 1fe278ce4d1f426b6f3075575fef078e00a07d3a 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 8/9] ucm: DB845c: update volume controls
+Subject: [PATCH 08/10] ucm: DB845c: update volume controls
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
@@ -51,5 +51,5 @@ index 7efd93df..6f57068a 100644
cset "name='RX INT2 DEM MUX' CLSH_DSM_OUT"
]
--
-2.23.0
+2.24.0
diff --git a/recipes-multimedia/alsa/alsa-lib/0009-ucm-DB845c-remove-headphones-for-now.patch b/recipes-multimedia/alsa/alsa-lib/0009-ucm-DB845c-remove-headphones-for-now.patch
index 09133dc..9edd5a8 100644
--- a/recipes-multimedia/alsa/alsa-lib/0009-ucm-DB845c-remove-headphones-for-now.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0009-ucm-DB845c-remove-headphones-for-now.patch
@@ -1,28 +1,14 @@
-From 68ac97e02d62bd2881beb1f66bddcb3937a7fc8b Mon Sep 17 00:00:00 2001
+From 6bb7e968a8da057b36bdecda1843f9b0f84e5bc8 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 9/9] ucm: DB845c: remove headphones for now
+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(-)
+ 2 files changed, 7 insertions(+), 48 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
@@ -133,5 +119,5 @@ index 6f57068a..a794523b 100644
- }
-}
--
-2.23.0
+2.24.0
diff --git a/recipes-multimedia/alsa/alsa-lib/0010-ucm-DB845c-adjust-default-volume-of-speakers.patch b/recipes-multimedia/alsa/alsa-lib/0010-ucm-DB845c-adjust-default-volume-of-speakers.patch
index 4b5c245..9a75c53 100644
--- a/recipes-multimedia/alsa/alsa-lib/0010-ucm-DB845c-adjust-default-volume-of-speakers.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0010-ucm-DB845c-adjust-default-volume-of-speakers.patch
@@ -1,4 +1,4 @@
-From 955175f1c93f3f2c8d51595bd5cbf479250d76f8 Mon Sep 17 00:00:00 2001
+From a20ee1b7aa24be04bf46d6aef596e1a07ec7fb60 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
@@ -61,5 +61,5 @@ index a794523b..40f7795e 100644
cset "name='SpkrLeft COMP Switch' 1"
cset "name='SpkrLeft BOOST Switch' 1"
--
-2.23.0
+2.24.0
diff --git a/recipes-multimedia/alsa/alsa-lib_1.1.%.bbappend b/recipes-multimedia/alsa/alsa-lib_1.1.%.bbappend
index 04b4a81..1c22597 100644
--- a/recipes-multimedia/alsa/alsa-lib_1.1.%.bbappend
+++ b/recipes-multimedia/alsa/alsa-lib_1.1.%.bbappend
@@ -1,11 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
-SRC_URI_append_apq8096 = " \
- file://0001-conf-ucm-Add-ucm-files-for-DB820c-board.patch \
-"
-
SRC_URI_append_sdm845 = " \
- file://0001-conf-ucm-Add-ucm-files-for-DB820c-board.patch \
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 \