summaryrefslogtreecommitdiffstats
path: root/recipes-multimedia/alsa/alsa-lib
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-multimedia/alsa/alsa-lib')
-rw-r--r--recipes-multimedia/alsa/alsa-lib/0001-add-conf-for-multichannel-support-in-imx.patch14
-rw-r--r--[-rwxr-xr-x]recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch20
-rw-r--r--recipes-multimedia/alsa/alsa-lib/0005-add-ak4458-conf-for-multichannel-support.patch37
-rw-r--r--[-rwxr-xr-x]recipes-multimedia/alsa/alsa-lib/0006-add-conf-for-iMX-XCVR-sound-card.patch12
4 files changed, 43 insertions, 40 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 747b62c5..6894deae 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 @@
1From cc06048dcd722049f92ab17958760bd798fb4781 Mon Sep 17 00:00:00 2001 1From e6cea74cad98963d3b0b1c267d4988be4263215c Mon Sep 17 00:00:00 2001
2From: Shengjiu Wang <b02247@freescale.com> 2From: Shengjiu Wang <b02247@freescale.com>
3Date: Thu, 5 Jun 2014 17:37:47 +0800 3Date: Thu, 5 Jun 2014 17:37:47 +0800
4Subject: [PATCH] add conf for multichannel support in imx 4Subject: [PATCH] add conf for multichannel support in imx
@@ -6,9 +6,10 @@ Subject: [PATCH] add conf for multichannel support in imx
6Upstream Status: Inappropriate [platform specific] 6Upstream Status: Inappropriate [platform specific]
7 7
8Signed-off-by: Shengjiu Wang <b02247@freescale.com> 8Signed-off-by: Shengjiu Wang <b02247@freescale.com>
9
9--- 10---
10 src/conf/cards/CS42888.conf | 94 ++++++++++++++++++++++++++++++++++++++++++++ 11 src/conf/cards/CS42888.conf | 94 ++++++++++++++++++++++++++++++++++++
11 src/conf/cards/IMX-HDMI.conf | 67 +++++++++++++++++++++++++++++++ 12 src/conf/cards/IMX-HDMI.conf | 67 +++++++++++++++++++++++++
12 src/conf/cards/Makefile.am | 4 +- 13 src/conf/cards/Makefile.am | 4 +-
13 src/conf/cards/aliases.conf | 2 + 14 src/conf/cards/aliases.conf | 2 +
14 4 files changed, 166 insertions(+), 1 deletion(-) 15 4 files changed, 166 insertions(+), 1 deletion(-)
@@ -204,18 +205,15 @@ index 00999f0..fbf0697 100644
204 if BUILD_ALISP 205 if BUILD_ALISP
205 cfg_files += aliases.alisp 206 cfg_files += aliases.alisp
206diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf 207diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
207index 18a920f..2c422ee 100644 208index 18a920f..7a4f444 100644
208--- a/src/conf/cards/aliases.conf 209--- a/src/conf/cards/aliases.conf
209+++ b/src/conf/cards/aliases.conf 210+++ b/src/conf/cards/aliases.conf
210@@ -57,6 +57,8 @@ CMI8786 cards.CMI8788 211@@ -57,6 +57,8 @@ CMI8786 cards.CMI8788
211 CMI8787 cards.CMI8788 212 CMI8787 cards.CMI8788
212 pistachio cards.pistachio-card 213 pistachio cards.pistachio-card
213 VC4-HDMI cards.vc4-hdmi 214 VC4-HDMI cards.vc4-hdmi
214+cs42888-audio cards.CS42888 215+imx-cs42888 cards.CS42888
215+imx-hdmi-soc cards.IMX-HDMI 216+imx-hdmi-soc cards.IMX-HDMI
216 217
217 <confdir:pcm/default.conf> 218 <confdir:pcm/default.conf>
218 <confdir:pcm/dmix.conf> 219 <confdir:pcm/dmix.conf>
219--
2202.7.4
221
diff --git a/recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch b/recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch
index 4d28a77f..1d58aeba 100755..100644
--- a/recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch
@@ -1,7 +1,7 @@
1From 93607819d90ddf9bbdad8bbbe4af5d917ca572dc Mon Sep 17 00:00:00 2001 1From 754e0c6112a181b30bd46aa13812f37db01c3387 Mon Sep 17 00:00:00 2001
2From: Shengjiu Wang <shengjiu.wang@freescale.com> 2From: Shengjiu Wang <shengjiu.wang@freescale.com>
3Date: Tue, 10 May 2016 15:09:26 +0800 3Date: Tue, 10 May 2016 15:09:26 +0800
4Subject: [PATCH 2/2] pcm: Don't store the state for SND_PCM_STATE_SUSPENDED 4Subject: [PATCH] pcm: Don't store the state for SND_PCM_STATE_SUSPENDED
5 5
6The resume function don't update the dmix->state, if store SUSPENDED 6The resume function don't update the dmix->state, if store SUSPENDED
7state in snd_pcm_dmix_state, the write function after resume will 7state in snd_pcm_dmix_state, the write function after resume will
@@ -13,6 +13,7 @@ for dmix,dshare,dsnoop.
13Upstream-Status: Pending 13Upstream-Status: Pending
14 14
15Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com> 15Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
16
16--- 17---
17 src/pcm/pcm_dmix.c | 2 +- 18 src/pcm/pcm_dmix.c | 2 +-
18 src/pcm/pcm_dshare.c | 2 +- 19 src/pcm/pcm_dshare.c | 2 +-
@@ -20,10 +21,10 @@ Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
20 3 files changed, 3 insertions(+), 3 deletions(-) 21 3 files changed, 3 insertions(+), 3 deletions(-)
21 22
22diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c 23diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c
23index a6a8f3a..89c07d1 100644 24index 5b7472d..e08e46f 100644
24--- a/src/pcm/pcm_dmix.c 25--- a/src/pcm/pcm_dmix.c
25+++ b/src/pcm/pcm_dmix.c 26+++ b/src/pcm/pcm_dmix.c
26@@ -466,9 +466,9 @@ static snd_pcm_state_t snd_pcm_dmix_state(snd_pcm_t *pcm) 27@@ -460,9 +460,9 @@ static snd_pcm_state_t snd_pcm_dmix_state(snd_pcm_t *pcm)
27 snd_pcm_state_t state; 28 snd_pcm_state_t state;
28 state = snd_pcm_state(dmix->spcm); 29 state = snd_pcm_state(dmix->spcm);
29 switch (state) { 30 switch (state) {
@@ -35,10 +36,10 @@ index a6a8f3a..89c07d1 100644
35 case SND_PCM_STATE_XRUN: 36 case SND_PCM_STATE_XRUN:
36 if ((err = snd_pcm_direct_slave_recover(dmix)) < 0) 37 if ((err = snd_pcm_direct_slave_recover(dmix)) < 0)
37diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c 38diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c
38index 7cdfea2..e0b4ea7 100644 39index 8a67257..8ba61b4 100644
39--- a/src/pcm/pcm_dshare.c 40--- a/src/pcm/pcm_dshare.c
40+++ b/src/pcm/pcm_dshare.c 41+++ b/src/pcm/pcm_dshare.c
41@@ -261,9 +261,9 @@ static snd_pcm_state_t snd_pcm_dshare_state(snd_pcm_t *pcm) 42@@ -258,9 +258,9 @@ static snd_pcm_state_t snd_pcm_dshare_state(snd_pcm_t *pcm)
42 snd_pcm_state_t state; 43 snd_pcm_state_t state;
43 state = snd_pcm_state(dshare->spcm); 44 state = snd_pcm_state(dshare->spcm);
44 switch (state) { 45 switch (state) {
@@ -50,10 +51,10 @@ index 7cdfea2..e0b4ea7 100644
50 case SND_PCM_STATE_XRUN: 51 case SND_PCM_STATE_XRUN:
51 if ((err = snd_pcm_direct_slave_recover(dshare)) < 0) 52 if ((err = snd_pcm_direct_slave_recover(dshare)) < 0)
52diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c 53diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c
53index 539b671..03df6ff 100644 54index c6e8cd2..9610482 100644
54--- a/src/pcm/pcm_dsnoop.c 55--- a/src/pcm/pcm_dsnoop.c
55+++ b/src/pcm/pcm_dsnoop.c 56+++ b/src/pcm/pcm_dsnoop.c
56@@ -212,9 +212,9 @@ static snd_pcm_state_t snd_pcm_dsnoop_state(snd_pcm_t *pcm) 57@@ -208,9 +208,9 @@ static snd_pcm_state_t snd_pcm_dsnoop_state(snd_pcm_t *pcm)
57 snd_pcm_state_t state; 58 snd_pcm_state_t state;
58 state = snd_pcm_state(dsnoop->spcm); 59 state = snd_pcm_state(dsnoop->spcm);
59 switch (state) { 60 switch (state) {
@@ -64,6 +65,3 @@ index 539b671..03df6ff 100644
64 return state; 65 return state;
65 case SND_PCM_STATE_XRUN: 66 case SND_PCM_STATE_XRUN:
66 if ((err = snd_pcm_direct_slave_recover(dsnoop)) < 0) 67 if ((err = snd_pcm_direct_slave_recover(dsnoop)) < 0)
67--
682.7.4
69
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 a07f60d6..63af83f7 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,7 +1,14 @@
1From 1641ce8c724018365d7fa598f9a70c6492e7c271 Mon Sep 17 00:00:00 2001 1From bbfa5f555f8d2c448c9f36fbea11ea3e32dcdcc6 Mon Sep 17 00:00:00 2001
2From: Shengjiu Wang <shengjiu.wang@nxp.com> 2From: Shengjiu Wang <shengjiu.wang@nxp.com>
3Date: Wed, 31 Jan 2018 15:06:53 +0800 3Date: Wed, 31 Jan 2018 15:06:53 +0800
4Subject: [PATCH] add ak4458 conf for multichannel support 4Subject: [PATCH] add ak4458 conf for multichannel support
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9MIME-Version: 1.0
10Content-Type: text/plain; charset=UTF-8
11Content-Transfer-Encoding: 8bit
5 12
6one limitation is that ALSA and pulseaudio only support 13one limitation is that ALSA and pulseaudio only support
7maximum 8 channels, but ak4458 may support 16 channels 14maximum 8 channels, but ak4458 may support 16 channels
@@ -9,17 +16,19 @@ maximum 8 channels, but ak4458 may support 16 channels
9Upstream-Status: Inappropriate [i.MX specific] 16Upstream-Status: Inappropriate [i.MX specific]
10 17
11Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> 18Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
19
12--- 20---
13 src/conf/cards/AK4458.conf | 74 +++++++++++++++++++++++++++++++++++++++++++++ 21 src/conf/cards/AK4458.conf | 74 +++++++++++++++++++++++++++++++++++++
14 src/conf/cards/Makefile.am | 3 +- 22 src/conf/cards/Makefile.am | 3 +-
15 src/conf/cards/aliases.conf | 1 + 23 src/conf/cards/aliases.conf | 1 +
16 3 files changed, 77 insertions(+), 1 deletion(-) 24 3 files changed, 77 insertions(+), 1 deletion(-)
17 create mode 100644 src/conf/cards/AK4458.conf 25 create mode 100644 src/conf/cards/AK4458.conf
18 26
19Index: alsa-lib-1.1.6/src/conf/cards/AK4458.conf 27diff --git a/src/conf/cards/AK4458.conf b/src/conf/cards/AK4458.conf
20=================================================================== 28new file mode 100644
29index 0000000..3b5b195
21--- /dev/null 30--- /dev/null
22+++ alsa-lib-1.1.6/src/conf/cards/AK4458.conf 31+++ b/src/conf/cards/AK4458.conf
23@@ -0,0 +1,74 @@ 32@@ -0,0 +1,74 @@
24+# 33+#
25+# Configuration for the AK4458 chip 34+# Configuration for the AK4458 chip
@@ -95,10 +104,10 @@ Index: alsa-lib-1.1.6/src/conf/cards/AK4458.conf
95+ } 104+ }
96+ slave.channels 8 105+ slave.channels 8
97+} 106+}
98Index: alsa-lib-1.1.6/src/conf/cards/Makefile.am 107diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
99=================================================================== 108index fbf0697..34fa5a3 100644
100--- alsa-lib-1.1.6.orig/src/conf/cards/Makefile.am 109--- a/src/conf/cards/Makefile.am
101+++ alsa-lib-1.1.6/src/conf/cards/Makefile.am 110+++ b/src/conf/cards/Makefile.am
102@@ -60,7 +60,8 @@ cfg_files = aliases.conf \ 111@@ -60,7 +60,8 @@ cfg_files = aliases.conf \
103 VXPocket.conf \ 112 VXPocket.conf \
104 VXPocket440.conf \ 113 VXPocket440.conf \
@@ -109,13 +118,13 @@ Index: alsa-lib-1.1.6/src/conf/cards/Makefile.am
109 118
110 if BUILD_ALISP 119 if BUILD_ALISP
111 cfg_files += aliases.alisp 120 cfg_files += aliases.alisp
112Index: alsa-lib-1.1.6/src/conf/cards/aliases.conf 121diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
113=================================================================== 122index 7a4f444..e41f89e 100644
114--- alsa-lib-1.1.6.orig/src/conf/cards/aliases.conf 123--- a/src/conf/cards/aliases.conf
115+++ alsa-lib-1.1.6/src/conf/cards/aliases.conf 124+++ b/src/conf/cards/aliases.conf
116@@ -59,6 +59,7 @@ pistachio cards.pistachio-card 125@@ -59,6 +59,7 @@ pistachio cards.pistachio-card
117 VC4-HDMI cards.vc4-hdmi 126 VC4-HDMI cards.vc4-hdmi
118 cs42888-audio cards.CS42888 127 imx-cs42888 cards.CS42888
119 imx-hdmi-soc cards.IMX-HDMI 128 imx-hdmi-soc cards.IMX-HDMI
120+ak4458-audio cards.AK4458 129+ak4458-audio cards.AK4458
121 130
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 d72fb02c..3b5f90ec 100755..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 @@
1From 2fd2737a1a0553e164d1b4f78687edf573f8e621 Mon Sep 17 00:00:00 2001 1From dec68918e07d6a7f4397b55b35dd5bed9c114ea9 Mon Sep 17 00:00:00 2001
2From: Viorel Suman <viorel.suman@nxp.com> 2From: Viorel Suman <viorel.suman@nxp.com>
3Date: Mon, 9 Mar 2020 14:25:46 +0200 3Date: Mon, 9 Mar 2020 14:25:46 +0200
4Subject: [PATCH] add conf for iMX XCVR sound card 4Subject: [PATCH] add conf for iMX XCVR sound card
@@ -6,8 +6,9 @@ Subject: [PATCH] add conf for iMX XCVR sound card
6Upstream Status: Pending 6Upstream Status: Pending
7 7
8Signed-off-by: Viorel Suman <viorel.suman@nxp.com> 8Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
9
9--- 10---
10 src/conf/cards/IMX-XCVR.conf | 69 ++++++++++++++++++++++++++++++++++++++++++++ 11 src/conf/cards/IMX-XCVR.conf | 69 ++++++++++++++++++++++++++++++++++++
11 src/conf/cards/Makefile.am | 3 +- 12 src/conf/cards/Makefile.am | 3 +-
12 src/conf/cards/aliases.conf | 1 + 13 src/conf/cards/aliases.conf | 1 +
13 3 files changed, 72 insertions(+), 1 deletion(-) 14 3 files changed, 72 insertions(+), 1 deletion(-)
@@ -103,17 +104,14 @@ index 34fa5a3..70b9bab 100644
103 if BUILD_ALISP 104 if BUILD_ALISP
104 cfg_files += aliases.alisp 105 cfg_files += aliases.alisp
105diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf 106diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
106index 5d92ac7..c195848 100644 107index e41f89e..d9bfcd6 100644
107--- a/src/conf/cards/aliases.conf 108--- a/src/conf/cards/aliases.conf
108+++ b/src/conf/cards/aliases.conf 109+++ b/src/conf/cards/aliases.conf
109@@ -60,6 +60,7 @@ VC4-HDMI cards.vc4-hdmi 110@@ -60,6 +60,7 @@ VC4-HDMI cards.vc4-hdmi
110 cs42888-audio cards.CS42888 111 imx-cs42888 cards.CS42888
111 imx-hdmi-soc cards.IMX-HDMI 112 imx-hdmi-soc cards.IMX-HDMI
112 ak4458-audio cards.AK4458 113 ak4458-audio cards.AK4458
113+imx-audio-xcvr cards.IMX-XCVR 114+imx-audio-xcvr cards.IMX-XCVR
114 115
115 <confdir:pcm/default.conf> 116 <confdir:pcm/default.conf>
116 <confdir:pcm/dmix.conf> 117 <confdir:pcm/dmix.conf>
117--
1182.7.4
119
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-23 23:28:30 +0000