7 files changed, 166 insertions, 171 deletions

diff --git a/recipes-multimedia/alsa/alsa-lib/0001-add-conf-for-multichannel-support-in-imx.patch b/recipes-multimedia/alsa/alsa-lib/0001-add-conf-for-multichannel-support-in-imx.patch
index 7d20c6782..7ae8b8fef 100644
--- a/recipes-multimedia/alsa/alsa-lib/0001-add-conf-for-multichannel-support-in-imx.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0001-add-conf-for-multichannel-support-in-imx.patch
@@ -1,4 +1,4 @@
-From 49a7eac8e02c33cae8a168e6d22d9ff8aaf86d44 Mon Sep 17 00:00:00 2001
+From 3fa81ebaf8bac6b167776888ae26c6c140d8aebc 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
@@ -6,19 +6,18 @@ Subject: [PATCH] add conf for multichannel support in imx
 Upstream-Status: Inappropriate [platform specific]
 
 Signed-off-by: Shengjiu Wang <b02247@freescale.com>
-
 ---
  src/conf/cards/CS42888.conf  | 94 ++++++++++++++++++++++++++++++++++++
  src/conf/cards/IMX-HDMI.conf | 67 +++++++++++++++++++++++++
- src/conf/cards/Makefile.am   |  4 +-
+ src/conf/cards/Makefile.am   |  2 +
  src/conf/cards/aliases.conf  |  2 +
- 4 files changed, 166 insertions(+), 1 deletion(-)
+ 4 files changed, 165 insertions(+)
  create mode 100644 src/conf/cards/CS42888.conf
  create mode 100644 src/conf/cards/IMX-HDMI.conf
 
 diff --git a/src/conf/cards/CS42888.conf b/src/conf/cards/CS42888.conf
 new file mode 100644
-index 0000000..671a284
+index 000000000000..671a2845894b
 --- /dev/null
 +++ b/src/conf/cards/CS42888.conf
 @@ -0,0 +1,94 @@
@@ -118,7 +117,7 @@ index 0000000..671a284
 +# vim: ft=alsaconf
 diff --git a/src/conf/cards/IMX-HDMI.conf b/src/conf/cards/IMX-HDMI.conf
 new file mode 100644
-index 0000000..a51509e
+index 000000000000..a51509e8ad5a
 --- /dev/null
 +++ b/src/conf/cards/IMX-HDMI.conf
 @@ -0,0 +1,67 @@
@@ -190,22 +189,20 @@ index 0000000..a51509e
 +
 +# vim: ft=alsaconf
 diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
-index 00999f0..fbf0697 100644
+index f387cf4197da..cbd2cd04227d 100644
 --- a/src/conf/cards/Makefile.am
 +++ b/src/conf/cards/Makefile.am
-@@ -58,7 +58,9 @@ cfg_files = aliases.conf \
-        VIA8237.conf \
-        VX222.conf \
-        VXPocket.conf \
--       VXPocket440.conf
-+       VXPocket440.conf \
+@@ -1,6 +1,8 @@
+ alsaconfigdir = @ALSA_CONFIG_DIR@
+ alsadir = $(alsaconfigdir)/cards
+ cfg_files = aliases.conf \
 +       CS42888.conf \
-+       IMX-HDMI.conf
- 
- if BUILD_ALISP
- cfg_files += aliases.alisp
++       IMX-HDMI.conf \
+        AACI.conf \
+        ATIIXP.conf \
+        ATIIXP-SPDMA.conf \
 diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
-index 7e352f7..a9e6d76 100644
+index a54824ae636b..0aa874d7434f 100644
 --- a/src/conf/cards/aliases.conf
 +++ b/src/conf/cards/aliases.conf
 @@ -57,6 +57,8 @@ CMI8786 cards.CMI8788
@@ -217,3 +214,6 @@ index 7e352f7..a9e6d76 100644
  
  <confdir:ctl/default.conf>
  <confdir:pcm/default.conf>
+-- 
+2.42.0
+
diff --git a/recipes-multimedia/alsa/alsa-lib/0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch b/recipes-multimedia/alsa/alsa-lib/0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch
index 5ec0d2e99..193d507eb 100644
--- a/recipes-multimedia/alsa/alsa-lib/0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch
@@ -1,4 +1,4 @@
-From aa4f56c3c952269c36464cc0da9db5a1381648fa Mon Sep 17 00:00:00 2001
+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
@@ -24,10 +24,10 @@ Signed-off-by: Jaroslav Kysela <perex@perex.cz>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c
-index 6bb90b8b..ec64604c 100644
+index 9d7e233e8437..d58789eca73b 100644
 --- a/src/pcm/pcm_plugin.c
 +++ b/src/pcm/pcm_plugin.c
-@@ -622,7 +622,7 @@ int snd_pcm_plugin_may_wait_for_avail_min_conv(
+@@ -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)
@@ -37,5 +37,5 @@ index 6bb90b8b..ec64604c 100644
                 if (slave->avail_min != needed_slave_avail_min) {
                         snd_pcm_sw_params_t *swparams;
 -- 
-2.34.1
+2.42.0
 
diff --git a/recipes-multimedia/alsa/alsa-lib/0005-add-ak4458-conf-for-multichannel-support.patch b/recipes-multimedia/alsa/alsa-lib/0005-add-ak4458-conf-for-multichannel-support.patch
index b25aa910e..51e199821 100644
--- a/recipes-multimedia/alsa/alsa-lib/0005-add-ak4458-conf-for-multichannel-support.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0005-add-ak4458-conf-for-multichannel-support.patch
@@ -1,4 +1,4 @@
-From d78b7e2b964c9713c2e9889f4ec85922528ba971 Mon Sep 17 00:00:00 2001
+From 92d2b7d91bc1ec4068ee9371753bb24ad1108827 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
@@ -12,17 +12,16 @@ maximum 8 channels, but ak4458 may support 16 channels
 Upstream-Status: Inappropriate [i.MX specific]
 
 Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
-
 ---
  src/conf/cards/AK4458.conf  | 74 +++++++++++++++++++++++++++++++++++++
- src/conf/cards/Makefile.am  |  3 +-
+ src/conf/cards/Makefile.am  |  1 +
  src/conf/cards/aliases.conf |  1 +
- 3 files changed, 77 insertions(+), 1 deletion(-)
+ 3 files changed, 76 insertions(+)
  create mode 100644 src/conf/cards/AK4458.conf
 
 diff --git a/src/conf/cards/AK4458.conf b/src/conf/cards/AK4458.conf
 new file mode 100644
-index 0000000..3b5b195
+index 000000000000..3b5b195f2ca0
 --- /dev/null
 +++ b/src/conf/cards/AK4458.conf
 @@ -0,0 +1,74 @@
@@ -101,21 +100,19 @@ index 0000000..3b5b195
 +       slave.channels 8
 +}
 diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
-index fbf0697..34fa5a3 100644
+index cbd2cd04227d..3c29bd65d341 100644
 --- a/src/conf/cards/Makefile.am
 +++ b/src/conf/cards/Makefile.am
-@@ -60,7 +60,8 @@ cfg_files = aliases.conf \
-        VXPocket.conf \
-        VXPocket440.conf \
+@@ -3,6 +3,7 @@ alsadir = $(alsaconfigdir)/cards
+ cfg_files = aliases.conf \
         CS42888.conf \
--       IMX-HDMI.conf
-+       IMX-HDMI.conf \
-+       AK4458.conf
- 
- if BUILD_ALISP
- cfg_files += aliases.alisp
+        IMX-HDMI.conf \
++       AK4458.conf \
+        AACI.conf \
+        ATIIXP.conf \
+        ATIIXP-SPDMA.conf \
 diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
-index a9e6d76..2f0a22a 100644
+index 0aa874d7434f..dda71d99916e 100644
 --- a/src/conf/cards/aliases.conf
 +++ b/src/conf/cards/aliases.conf
 @@ -59,6 +59,7 @@ pistachio cards.pistachio-card
@@ -126,3 +123,6 @@ index a9e6d76..2f0a22a 100644
  
  <confdir:ctl/default.conf>
  <confdir:pcm/default.conf>
+-- 
+2.42.0
+
diff --git a/recipes-multimedia/alsa/alsa-lib/0006-add-conf-for-iMX-XCVR-sound-card.patch b/recipes-multimedia/alsa/alsa-lib/0006-add-conf-for-iMX-XCVR-sound-card.patch
index 1f558185d..db76eb749 100644
--- a/recipes-multimedia/alsa/alsa-lib/0006-add-conf-for-iMX-XCVR-sound-card.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0006-add-conf-for-iMX-XCVR-sound-card.patch
@@ -1,4 +1,4 @@
-From 36aae65dc913e1ebe72366d7ae361897d465e88d Mon Sep 17 00:00:00 2001
+From faa9791070520f8d5e7060e5668efd1302c86c66 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
@@ -6,17 +6,16 @@ Subject: [PATCH] add conf for iMX XCVR sound card
 Upstream-Status: Pending
 
 Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
-
 ---
  src/conf/cards/IMX-XCVR.conf | 39 ++++++++++++++++++++++++++++++++++++
- src/conf/cards/Makefile.am   |  3 ++-
+ src/conf/cards/Makefile.am   |  1 +
  src/conf/cards/aliases.conf  |  1 +
- 3 files changed, 42 insertions(+), 1 deletion(-)
+ 3 files changed, 41 insertions(+)
  create mode 100755 src/conf/cards/IMX-XCVR.conf
 
 diff --git a/src/conf/cards/IMX-XCVR.conf b/src/conf/cards/IMX-XCVR.conf
 new file mode 100755
-index 0000000..009000c
+index 000000000000..009000c63a19
 --- /dev/null
 +++ b/src/conf/cards/IMX-XCVR.conf
 @@ -0,0 +1,39 @@
@@ -60,21 +59,19 @@ index 0000000..009000c
 +       preamble.y 0x3
 +}
 diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
-index 34fa5a3..70b9bab 100644
+index 3c29bd65d341..4502919e3bec 100644
 --- a/src/conf/cards/Makefile.am
 +++ b/src/conf/cards/Makefile.am
-@@ -61,7 +61,8 @@ cfg_files = aliases.conf \
-        VXPocket440.conf \
+@@ -4,6 +4,7 @@ cfg_files = aliases.conf \
         CS42888.conf \
         IMX-HDMI.conf \
--       AK4458.conf
-+       AK4458.conf \
-+       IMX-XCVR.conf
- 
- if BUILD_ALISP
- cfg_files += aliases.alisp
+        AK4458.conf \
++       IMX-XCVR.conf \
+        AACI.conf \
+        ATIIXP.conf \
+        ATIIXP-SPDMA.conf \
 diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
-index 2f0a22a..e824145 100644
+index dda71d99916e..6dab14855f25 100644
 --- a/src/conf/cards/aliases.conf
 +++ b/src/conf/cards/aliases.conf
 @@ -60,6 +60,7 @@ VC4-HDMI cards.vc4-hdmi
@@ -85,3 +82,6 @@ index 2f0a22a..e824145 100644
  
  <confdir:ctl/default.conf>
  <confdir:pcm/default.conf>
+-- 
+2.42.0
+
diff --git a/recipes-multimedia/alsa/alsa-lib/0007-add-conf-for-imx-cs42448-sound-card.patch b/recipes-multimedia/alsa/alsa-lib/0007-add-conf-for-imx-cs42448-sound-card.patch
index 64e15be4a..fa71078e4 100644
--- a/recipes-multimedia/alsa/alsa-lib/0007-add-conf-for-imx-cs42448-sound-card.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0007-add-conf-for-imx-cs42448-sound-card.patch
@@ -1,107 +1,109 @@
-From 97d5e09a4166b45c567026e51b8a25ef5d7d587d 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

-

-Upstream-Status: Inappropriate [i.MX specific]

-

-Signed-off-by: Chancel Liu <chancel.liu@nxp.com>

----

- src/conf/cards/CS42448.conf | 58 +++++++++++++++++++++++++++++++++++++

- src/conf/cards/Makefile.am  |  3 +-

- src/conf/cards/aliases.conf |  1 +

- 3 files changed, 61 insertions(+), 1 deletion(-)

- create mode 100644 src/conf/cards/CS42448.conf

-

-diff --git a/src/conf/cards/CS42448.conf b/src/conf/cards/CS42448.conf

-new file mode 100644

-index 00000000..28ba5c48

---- /dev/null

-+++ b/src/conf/cards/CS42448.conf

-@@ -0,0 +1,58 @@

-+#

-+# Configuration for the CS42448 chip

-+#

-+

-+# default with dmix & dsnoop

-+CS42448.pcm.default {

-+       @args [ CARD ]

-+       @args.CARD {

-+               type string

-+       }

-+       type asym

-+       playback.pcm {

-+               type plug

-+               slave.pcm {

-+                       @func concat

-+                       strings [ "dmix:" $CARD ",FORMAT=S32_LE" ]

-+               }

-+       }

-+       capture.pcm {

-+               type plug

-+               slave.pcm {

-+                       @func concat

-+                       strings [ "dsnoop:" $CARD ",FORMAT=S32_LE" ]

-+               }

-+       }

-+}

-+

-+<confdir:pcm/surround51.conf>

-+

-+CS42448.pcm.surround51.0 {

-+       @args [ CARD ]

-+       @args.CARD {

-+               type string

-+       }

-+       type plug

-+       slave.pcm {

-+               type hw

-+               card $CARD

-+       }

-+       slave.channels 6

-+}

-+

-+<confdir:pcm/surround71.conf>

-+

-+CS42448.pcm.surround71.0 {

-+       @args [ CARD ]

-+       @args.CARD {

-+               type string

-+       }

-+       type plug

-+       slave.pcm {

-+               type hw

-+               card $CARD

-+       }

-+       slave.channels 8

-+}

-+

-+# vim: ft=alsaconf

-diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am

-index 70b9bab3..6aba20b4 100644

---- a/src/conf/cards/Makefile.am

-+++ b/src/conf/cards/Makefile.am

-@@ -62,7 +62,8 @@ cfg_files = aliases.conf \

-        CS42888.conf \

-        IMX-HDMI.conf \

-        AK4458.conf \

--       IMX-XCVR.conf

-+       IMX-XCVR.conf \

-+       CS42448.conf

- 

- if BUILD_ALISP

- cfg_files += aliases.alisp

-diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf

-index e824145d..a40d3731 100644

---- a/src/conf/cards/aliases.conf

-+++ b/src/conf/cards/aliases.conf

-@@ -61,6 +61,7 @@ imx-cs42888 cards.CS42888

- imx-hdmi-soc cards.IMX-HDMI

- ak4458-audio cards.AK4458

- imx-audio-xcvr cards.IMX-XCVR

-+imx-cs42448 cards.CS42448

- 

- <confdir:ctl/default.conf>

- <confdir:pcm/default.conf>

--- 

-2.17.1

+From 38d84440a7bec9e26380f08f050b2ada772b822e 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
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [i.MX specific]
+
+Signed-off-by: Chancel Liu <chancel.liu@nxp.com>
+---
+ src/conf/cards/CS42448.conf | 58 +++++++++++++++++++++++++++++++++++++
+ src/conf/cards/Makefile.am  |  1 +
+ src/conf/cards/aliases.conf |  1 +
+ 3 files changed, 60 insertions(+)
+ create mode 100644 src/conf/cards/CS42448.conf
+
+diff --git a/src/conf/cards/CS42448.conf b/src/conf/cards/CS42448.conf
+new file mode 100644
+index 000000000000..28ba5c485837
+--- /dev/null
++++ b/src/conf/cards/CS42448.conf
+@@ -0,0 +1,58 @@
++#
++# Configuration for the CS42448 chip
++#
++
++# default with dmix & dsnoop
++CS42448.pcm.default {
++       @args [ CARD ]
++       @args.CARD {
++               type string
++       }
++       type asym
++       playback.pcm {
++               type plug
++               slave.pcm {
++                       @func concat
++                       strings [ "dmix:" $CARD ",FORMAT=S32_LE" ]
++               }
++       }
++       capture.pcm {
++               type plug
++               slave.pcm {
++                       @func concat
++                       strings [ "dsnoop:" $CARD ",FORMAT=S32_LE" ]
++               }
++       }
++}
++
++<confdir:pcm/surround51.conf>
++
++CS42448.pcm.surround51.0 {
++       @args [ CARD ]
++       @args.CARD {
++               type string
++       }
++       type plug
++       slave.pcm {
++               type hw
++               card $CARD
++       }
++       slave.channels 6
++}
++
++<confdir:pcm/surround71.conf>
++
++CS42448.pcm.surround71.0 {
++       @args [ CARD ]
++       @args.CARD {
++               type string
++       }
++       type plug
++       slave.pcm {
++               type hw
++               card $CARD
++       }
++       slave.channels 8
++}
++
++# vim: ft=alsaconf
+diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
+index 4502919e3bec..da2def3a9498 100644
+--- a/src/conf/cards/Makefile.am
++++ b/src/conf/cards/Makefile.am
+@@ -5,6 +5,7 @@ cfg_files = aliases.conf \
+        IMX-HDMI.conf \
+        AK4458.conf \
+        IMX-XCVR.conf \
++       CS42448.conf \
+        AACI.conf \
+        ATIIXP.conf \
+        ATIIXP-SPDMA.conf \
+diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
+index 6dab14855f25..554db846f8e5 100644
+--- a/src/conf/cards/aliases.conf
++++ b/src/conf/cards/aliases.conf
+@@ -61,6 +61,7 @@ imx-cs42888 cards.CS42888
+ imx-hdmi-soc cards.IMX-HDMI
+ ak4458-audio cards.AK4458
+ imx-audio-xcvr cards.IMX-XCVR
++imx-cs42448 cards.CS42448
+ 
+ <confdir:ctl/default.conf>
+ <confdir:pcm/default.conf>
+-- 
+2.42.0
+
diff --git a/recipes-multimedia/alsa/alsa-lib_%.bbappend b/recipes-multimedia/alsa/alsa-lib_%.bbappend
index 65498aed1..230cf0957 100644
--- a/recipes-multimedia/alsa/alsa-lib_%.bbappend
+++ b/recipes-multimedia/alsa/alsa-lib_%.bbappend
@@ -10,6 +10,3 @@ IMX_PATCH = " \
 SRC_URI:append:imx-nxp-bsp = "${IMX_PATCH}"
 
 PACKAGE_ARCH:imx-nxp-bsp = "${MACHINE_SOCARCH}"
-
-GLIBC_64BIT_TIME_FLAGS = ""
-INSANE_SKIP:append = " 32bit-time"
diff --git a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
index e2acf7676..e87a47020 100644
--- a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
+++ b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
@@ -1,5 +1,5 @@
 # Copyright 2013-2016 Freescale Semiconductor
-# Copyright 2017-2023 NXP
+# Copyright 2017-2024 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 DESCRIPTION = "Freescale alsa-lib plugins"
@@ -20,14 +20,10 @@ inherit autotools pkgconfig use-imx-headers
 PV = "1.0.26+${SRCPV}"
 
 SRC_URI = "git://github.com/nxp-imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "MM_04.08.03_2312_L6.6.y"
-SRCREV = "b2ba082e70333f187972ee4e85f63f9d2f608331"
+SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
+SRCREV = "eaf0900662d6381bcc433165219280cca1752890"
 
-S = "${WORKDIR}/git"
-
-INCLUDE_DIR = "-I${STAGING_INCDIR_IMX}"
-
-EXTRA_OECONF = "CFLAGS="${INCLUDE_DIR}""
+CFLAGS:append = " -I${STAGING_INCDIR_IMX}"
 
 PACKAGECONFIG ??= "${PACKAGECONFIG_SWPDM}"
 PACKAGECONFIG_SWPDM             = ""