2 files changed, 128 insertions, 3 deletions
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
new file mode 100644
index 000000000..a07f60d64
--- /dev/null
+++ b/recipes-multimedia/alsa/alsa-lib/0005-add-ak4458-conf-for-multichannel-support.patch
@@ -0,0 +1,123 @@
+From 1641ce8c724018365d7fa598f9a70c6492e7c271 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
+one limitation is that ALSA and pulseaudio only support
+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/aliases.conf |  1 +
+ 3 files changed, 77 insertions(+), 1 deletion(-)
+ create mode 100644 src/conf/cards/AK4458.conf
+Index: alsa-lib-1.1.6/src/conf/cards/AK4458.conf
+===================================================================
+--- /dev/null
+++ alsa-lib-1.1.6/src/conf/cards/AK4458.conf
+@@ -0,0 +1,74 @@
+#
+# Configuration for the AK4458 chip
+#
+
+# default with dmix & dsnoop
+AK4458.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/surround40.conf>
+
+AK4458.pcm.surround40.0 {
+       @args [ CARD ]
+       @args.CARD {
+               type string
+       }
+       type plug
+       slave.pcm {
+               type hw
+               card $CARD
+       }
+       slave.channels 4
+}
+
+
+<confdir:pcm/surround41.conf>
+<confdir:pcm/surround50.conf>
+<confdir:pcm/surround51.conf>
+
+AK4458.pcm.surround51.0 {
+       @args [ CARD ]
+       @args.CARD {
+               type string
+       }
+       type plug
+       slave.pcm {
+               type hw
+               card $CARD
+       }
+       slave.channels 6
+}
+
+<confdir:pcm/surround71.conf>
+
+AK4458.pcm.surround71.0 {
+       @args [ CARD ]
+       @args.CARD {
+               type string
+       }
+       type plug
+       slave.pcm {
+               type hw
+               card $CARD
+       }
+       slave.channels 8
+}
+Index: alsa-lib-1.1.6/src/conf/cards/Makefile.am
+===================================================================
+--- alsa-lib-1.1.6.orig/src/conf/cards/Makefile.am
+++ alsa-lib-1.1.6/src/conf/cards/Makefile.am
+@@ -60,7 +60,8 @@ cfg_files = aliases.conf \
+        VXPocket.conf \
+        VXPocket440.conf \
+        CS42888.conf \
+-       IMX-HDMI.conf
+       IMX-HDMI.conf \
+       AK4458.conf
+ 
+ if BUILD_ALISP
+ cfg_files += aliases.alisp
+Index: alsa-lib-1.1.6/src/conf/cards/aliases.conf
+===================================================================
+--- alsa-lib-1.1.6.orig/src/conf/cards/aliases.conf
+++ alsa-lib-1.1.6/src/conf/cards/aliases.conf
+@@ -59,6 +59,7 @@ pistachio cards.pistachio-card
+ VC4-HDMI cards.vc4-hdmi
+ cs42888-audio cards.CS42888
+ imx-hdmi-soc cards.IMX-HDMI
+ak4458-audio cards.AK4458
+ 
+ <confdir:pcm/default.conf>
+ <confdir:pcm/dmix.conf>
diff --git a/recipes-multimedia/alsa/alsa-lib_%.bbappend b/recipes-multimedia/alsa/alsa-lib_%.bbappend
index 235a3b149..3bf3abffd 100644
--- a/recipes-multimedia/alsa/alsa-lib_%.bbappend
+++ b/recipes-multimedia/alsa/alsa-lib_%.bbappend
@@ -1,8 +1,10 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-IMX_PATCH = " file://0001-add-conf-for-multichannel-support-in-imx.patch \
+IMX_PATCH = " \
-              file://0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch"
+    file://0001-add-conf-for-multichannel-support-in-imx.patch \
+    file://0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch \
+    file://0005-add-ak4458-conf-for-multichannel-support.patch \
+"
 SRC_URI_append_imx = "${IMX_PATCH}"
 PACKAGE_ARCH_imx = "${MACHINE_SOCARCH}"

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 new file mode 100644 index 000000000..a07f60d64 --- /dev/null +++ b/recipes-multimedia/alsa/alsa-lib/0005-add-ak4458-conf-for-multichannel-support.patch
@@ -0,0 +1,123 @@
		1	From 1641ce8c724018365d7fa598f9a70c6492e7c271 Mon Sep 17 00:00:00 2001
		2	From: Shengjiu Wang <shengjiu.wang@nxp.com>
		3	Date: Wed, 31 Jan 2018 15:06:53 +0800
		4	Subject: [PATCH] add ak4458 conf for multichannel support
		5
		6	one limitation is that ALSA and pulseaudio only support
		7	maximum 8 channels, but ak4458 may support 16 channels
		8
		9	Upstream-Status: Inappropriate [i.MX specific]
		10
		11	Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
		12	---
		13	src/conf/cards/AK4458.conf \| 74 +++++++++++++++++++++++++++++++++++++++++++++
		14	src/conf/cards/Makefile.am \| 3 +-
		15	src/conf/cards/aliases.conf \| 1 +
		16	3 files changed, 77 insertions(+), 1 deletion(-)
		17	create mode 100644 src/conf/cards/AK4458.conf
		18
		19	Index: alsa-lib-1.1.6/src/conf/cards/AK4458.conf
		20	===================================================================
		21	--- /dev/null
		22	+++ alsa-lib-1.1.6/src/conf/cards/AK4458.conf
		23	@@ -0,0 +1,74 @@
		24	+#
		25	+# Configuration for the AK4458 chip
		26	+#
		27	+
		28	+# default with dmix & dsnoop
		29	+AK4458.pcm.default {
		30	+ @args [ CARD ]
		31	+ @args.CARD {
		32	+ type string
		33	+ }
		34	+ type asym
		35	+ playback.pcm {
		36	+ type plug
		37	+ slave.pcm {
		38	+ @func concat
		39	+ strings [ "dmix:" $CARD ",FORMAT=S32_LE" ]
		40	+ }
		41	+ }
		42	+ capture.pcm {
		43	+ type plug
		44	+ slave.pcm {
		45	+ @func concat
		46	+ strings [ "dsnoop:" $CARD ",FORMAT=S32_LE" ]
		47	+ }
		48	+ }
		49	+}
		50	+
		51	+<confdir:pcm/surround40.conf>
		52	+
		53	+AK4458.pcm.surround40.0 {
		54	+ @args [ CARD ]
		55	+ @args.CARD {
		56	+ type string
		57	+ }
		58	+ type plug
		59	+ slave.pcm {
		60	+ type hw
		61	+ card $CARD
		62	+ }
		63	+ slave.channels 4
		64	+}
		65	+
		66	+
		67	+<confdir:pcm/surround41.conf>
		68	+<confdir:pcm/surround50.conf>
		69	+<confdir:pcm/surround51.conf>
		70	+
		71	+AK4458.pcm.surround51.0 {
		72	+ @args [ CARD ]
		73	+ @args.CARD {
		74	+ type string
		75	+ }
		76	+ type plug
		77	+ slave.pcm {
		78	+ type hw
		79	+ card $CARD
		80	+ }
		81	+ slave.channels 6
		82	+}
		83	+
		84	+<confdir:pcm/surround71.conf>
		85	+
		86	+AK4458.pcm.surround71.0 {
		87	+ @args [ CARD ]
		88	+ @args.CARD {
		89	+ type string
		90	+ }
		91	+ type plug
		92	+ slave.pcm {
		93	+ type hw
		94	+ card $CARD
		95	+ }
		96	+ slave.channels 8
		97	+}
		98	Index: alsa-lib-1.1.6/src/conf/cards/Makefile.am
		99	===================================================================
		100	--- alsa-lib-1.1.6.orig/src/conf/cards/Makefile.am
		101	+++ alsa-lib-1.1.6/src/conf/cards/Makefile.am
		102	@@ -60,7 +60,8 @@ cfg_files = aliases.conf \
		103	VXPocket.conf \
		104	VXPocket440.conf \
		105	CS42888.conf \
		106	- IMX-HDMI.conf
		107	+ IMX-HDMI.conf \
		108	+ AK4458.conf
		109
		110	if BUILD_ALISP
		111	cfg_files += aliases.alisp
		112	Index: alsa-lib-1.1.6/src/conf/cards/aliases.conf
		113	===================================================================
		114	--- alsa-lib-1.1.6.orig/src/conf/cards/aliases.conf
		115	+++ alsa-lib-1.1.6/src/conf/cards/aliases.conf
		116	@@ -59,6 +59,7 @@ pistachio cards.pistachio-card
		117	VC4-HDMI cards.vc4-hdmi
		118	cs42888-audio cards.CS42888
		119	imx-hdmi-soc cards.IMX-HDMI
		120	+ak4458-audio cards.AK4458
		121
		122	<confdir:pcm/default.conf>
		123	<confdir:pcm/dmix.conf>


diff --git a/recipes-multimedia/alsa/alsa-lib_%.bbappend b/recipes-multimedia/alsa/alsa-lib_%.bbappend index 235a3b149..3bf3abffd 100644 --- a/recipes-multimedia/alsa/alsa-lib_%.bbappend +++ b/recipes-multimedia/alsa/alsa-lib_%.bbappend
@@ -1,8 +1,10 @@
1	FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"	1	FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2		2
3	IMX_PATCH = " file://0001-add-conf-for-multichannel-support-in-imx.patch \	3	IMX_PATCH = " \
4	file://0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch"	4	file://0001-add-conf-for-multichannel-support-in-imx.patch \
5		5	file://0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch \
		6	file://0005-add-ak4458-conf-for-multichannel-support.patch \
		7	"
6	SRC_URI_append_imx = "${IMX_PATCH}"	8	SRC_URI_append_imx = "${IMX_PATCH}"
7		9
8	PACKAGE_ARCH_imx = "${MACHINE_SOCARCH}"	10	PACKAGE_ARCH_imx = "${MACHINE_SOCARCH}"