mirror of
git://git.yoctoproject.org/meta-freescale.git
synced 2026-01-27 11:52:04 +01:00
Merge pull request #2426 from MaxKrummenacher/master
alsa-lib.bbappend: Follow OE-Core update to v1.2.15
This commit is contained in:
commit
513970e120
|
|
@ -1,4 +1,4 @@
|
|||
From 3fa81ebaf8bac6b167776888ae26c6c140d8aebc Mon Sep 17 00:00:00 2001
|
||||
From c9b12504edea5280b41645da703ac478c1341dcf Mon Sep 17 00:00:00 2001
|
||||
From: Shengjiu Wang <b02247@freescale.com>
|
||||
Date: Thu, 5 Jun 2014 17:37:47 +0800
|
||||
Subject: [PATCH] add conf for multichannel support in imx
|
||||
|
|
@ -202,13 +202,13 @@ index f387cf4197da..cbd2cd04227d 100644
|
|||
ATIIXP.conf \
|
||||
ATIIXP-SPDMA.conf \
|
||||
diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
|
||||
index a54824ae636b..0aa874d7434f 100644
|
||||
index e2d59aa770dc..e05c372a0cf7 100644
|
||||
--- a/src/conf/cards/aliases.conf
|
||||
+++ b/src/conf/cards/aliases.conf
|
||||
@@ -57,6 +57,8 @@ CMI8786 cards.CMI8788
|
||||
CMI8787 cards.CMI8788
|
||||
@@ -58,6 +58,8 @@ CMI8787 cards.CMI8788
|
||||
pistachio cards.pistachio-card
|
||||
VC4-HDMI cards.vc4-hdmi
|
||||
hda-acpi cards.HDA-Intel
|
||||
+imx-cs42888 cards.CS42888
|
||||
+imx-hdmi-soc cards.IMX-HDMI
|
||||
|
||||
|
|
|
|||
|
|
@ -1,41 +0,0 @@
|
|||
From 3950e1ae36ca53a67b7248137e6033e7e99f79a3 Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Kysela <perex@perex.cz>
|
||||
Date: Wed, 9 Nov 2022 08:11:42 +0100
|
||||
Subject: [PATCH] pcm: rate - fix the crash in
|
||||
|
||||
Upstream-Status: Backport
|
||||
|
||||
snd_pcm_rate_may_wait_for_avail_min()
|
||||
|
||||
The pcm argument passed to the conversion function in
|
||||
snd_pcm_plugin_may_wait_for_avail_min_conv() should be
|
||||
pcm->fast_op_arg.
|
||||
|
||||
Test command: arecord -Dplughw:x -r12000 -c2 -fS16_LE -M temp.wav
|
||||
|
||||
Fixes: d9dbb57b ("pcm: rate - rewrite the may_wait_for_avail_min callback for the rate plugin")
|
||||
|
||||
BugLink: https://lore.kernel.org/alsa-devel/1667793912-18957-1-git-send-email-shengjiu.wang@nxp.com/
|
||||
Fixes: https://github.com/alsa-project/alsa-lib/issues/282
|
||||
Reported-by: Shengjiu Wang <shengjiu.wang@nxp.com>
|
||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||
---
|
||||
src/pcm/pcm_plugin.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c
|
||||
index 9d7e233e8437..d58789eca73b 100644
|
||||
--- a/src/pcm/pcm_plugin.c
|
||||
+++ b/src/pcm/pcm_plugin.c
|
||||
@@ -626,7 +626,7 @@ int snd_pcm_plugin_may_wait_for_avail_min_conv(
|
||||
* This code is also used by extplug, but extplug does not allow to alter the sampling rate.
|
||||
*/
|
||||
if (conv)
|
||||
- needed_slave_avail_min = conv(pcm, needed_slave_avail_min);
|
||||
+ needed_slave_avail_min = conv(pcm->fast_op_arg, needed_slave_avail_min);
|
||||
|
||||
if (slave->avail_min != needed_slave_avail_min) {
|
||||
snd_pcm_sw_params_t *swparams;
|
||||
--
|
||||
2.42.0
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 92d2b7d91bc1ec4068ee9371753bb24ad1108827 Mon Sep 17 00:00:00 2001
|
||||
From b582b2f3054fc402604b068d470c4eeb19b06e13 Mon Sep 17 00:00:00 2001
|
||||
From: Shengjiu Wang <shengjiu.wang@nxp.com>
|
||||
Date: Wed, 31 Jan 2018 15:06:53 +0800
|
||||
Subject: [PATCH] add ak4458 conf for multichannel support
|
||||
|
|
@ -112,11 +112,11 @@ index cbd2cd04227d..3c29bd65d341 100644
|
|||
ATIIXP.conf \
|
||||
ATIIXP-SPDMA.conf \
|
||||
diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
|
||||
index 0aa874d7434f..dda71d99916e 100644
|
||||
index e05c372a0cf7..bbbf226a95a7 100644
|
||||
--- a/src/conf/cards/aliases.conf
|
||||
+++ b/src/conf/cards/aliases.conf
|
||||
@@ -59,6 +59,7 @@ pistachio cards.pistachio-card
|
||||
VC4-HDMI cards.vc4-hdmi
|
||||
@@ -60,6 +60,7 @@ VC4-HDMI cards.vc4-hdmi
|
||||
hda-acpi cards.HDA-Intel
|
||||
imx-cs42888 cards.CS42888
|
||||
imx-hdmi-soc cards.IMX-HDMI
|
||||
+ak4458-audio cards.AK4458
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From faa9791070520f8d5e7060e5668efd1302c86c66 Mon Sep 17 00:00:00 2001
|
||||
From e6934385a773a8f6d713984716adbba5af0ead03 Mon Sep 17 00:00:00 2001
|
||||
From: Viorel Suman <viorel.suman@nxp.com>
|
||||
Date: Mon, 9 Mar 2020 14:25:46 +0200
|
||||
Subject: [PATCH] add conf for iMX XCVR sound card
|
||||
|
|
@ -71,10 +71,10 @@ index 3c29bd65d341..4502919e3bec 100644
|
|||
ATIIXP.conf \
|
||||
ATIIXP-SPDMA.conf \
|
||||
diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
|
||||
index dda71d99916e..6dab14855f25 100644
|
||||
index bbbf226a95a7..e6dd2cf69a9c 100644
|
||||
--- a/src/conf/cards/aliases.conf
|
||||
+++ b/src/conf/cards/aliases.conf
|
||||
@@ -60,6 +60,7 @@ VC4-HDMI cards.vc4-hdmi
|
||||
@@ -61,6 +61,7 @@ hda-acpi cards.HDA-Intel
|
||||
imx-cs42888 cards.CS42888
|
||||
imx-hdmi-soc cards.IMX-HDMI
|
||||
ak4458-audio cards.AK4458
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 38d84440a7bec9e26380f08f050b2ada772b822e Mon Sep 17 00:00:00 2001
|
||||
From 38bbc66434e1cbf71197bfbd5a3bf06efbfaa319 Mon Sep 17 00:00:00 2001
|
||||
From: Chancel Liu <chancel.liu@nxp.com>
|
||||
Date: Fri, 29 Jul 2022 16:12:37 +0800
|
||||
Subject: [PATCH] add conf for imx-cs42448 sound card
|
||||
|
|
@ -93,10 +93,10 @@ index 4502919e3bec..da2def3a9498 100644
|
|||
ATIIXP.conf \
|
||||
ATIIXP-SPDMA.conf \
|
||||
diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
|
||||
index 6dab14855f25..554db846f8e5 100644
|
||||
index e6dd2cf69a9c..a97ed9c289c6 100644
|
||||
--- a/src/conf/cards/aliases.conf
|
||||
+++ b/src/conf/cards/aliases.conf
|
||||
@@ -61,6 +61,7 @@ imx-cs42888 cards.CS42888
|
||||
@@ -62,6 +62,7 @@ imx-cs42888 cards.CS42888
|
||||
imx-hdmi-soc cards.IMX-HDMI
|
||||
ak4458-audio cards.AK4458
|
||||
imx-audio-xcvr cards.IMX-XCVR
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ IMX_PATCH = " \
|
|||
file://0005-add-ak4458-conf-for-multichannel-support.patch \
|
||||
file://0006-add-conf-for-iMX-XCVR-sound-card.patch \
|
||||
file://0007-add-conf-for-imx-cs42448-sound-card.patch \
|
||||
file://0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch \
|
||||
"
|
||||
SRC_URI:append:imx-nxp-bsp = "${IMX_PATCH}"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user