- Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 2/4 v2] pxa2xx-i2s: Handle SACR1_DRPL and SACR1_DREC separately
by Karl Beldan 13 May '09

13 May '09

- hw_params enables both RPL and REC functions each time : Enable the appropriate function in pxa2xx_i2s_trigger. - pxa2xx_i2s_shutdown disables i2s anytime one of RPL or REC function is off : Turn it off only when both functions are off. Signed-off-by: Karl Beldan <karl.beldan(a)mobile-devices.fr> --- sound/soc/pxa/pxa2xx-i2s.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index 59cc4f5..a461c8d 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c @@ -176,9 +176,7 @@ static int pxa2xx_i2s_hw_params(struct snd_pcm_substream *substream, /* is port used by another stream */ if (!(SACR0 & SACR0_ENB)) { - SACR0 = 0; - SACR1 = 0; if (pxa_i2s.master) SACR0 |= SACR0_BCKD; @@ -224,6 +222,10 @@ static int pxa2xx_i2s_trigger(struct snd_pcm_substream *substream, int cmd, switch (cmd) { case SNDRV_PCM_TRIGGER_START: + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + SACR1 &= ~SACR1_DRPL; + else + SACR1 &= ~SACR1_DREC; SACR0 |= SACR0_ENB; break; case SNDRV_PCM_TRIGGER_RESUME: @@ -250,7 +252,7 @@ static void pxa2xx_i2s_shutdown(struct snd_pcm_substream *substream, SAIMR &= ~SAIMR_RFS; } - if (SACR1 & (SACR1_DREC | SACR1_DRPL)) { + if ((SACR1 & (SACR1_DREC | SACR1_DRPL)) == (SACR1_DREC | SACR1_DRPL)) { SACR0 &= ~SACR0_ENB; pxa_i2s_wait(); clk_disable(clk_i2s); -- 1.6.3.rc1.34.g0be9b -- Karl

1 0

[alsa-devel] [PATCH 0/4 v2] pxa2xx-i2s: Rework
by Karl Beldan 13 May '09

13 May '09

Following is a rework of the i2s code for the pxa. I tested it with the ac97 clock as the master clock. Feedbacks are welcome. Diff with initial version: - hw init from 1/4 is moved from pxa2xx_i2s_init to pxa2xx_i2s_probe - moved 'removal of hw reset from pxa2xx_i2s_startup' from 3/4 to 1/4v2 - moved 'clk_put(clk_i2s) removal' from 2/4 to 3/4v2 - 3/4 was also removing FIFOs flushes, 3/4v2 consists of 'clk_put(clk_i2s) removal' only, -- Karl

1 1

[alsa-devel] [PATCH 4/4] pxa2xx-i2s: Fix suspend/resume
by Karl Beldan 13 May '09

13 May '09

pxa2xx_i2s_resume is : - unconditionnaly setting SACR0_ENB - unsetting SACR0_ENB in saved SACR0 pxa_i2s.sacr0 fix these. In pxa2xx_i2s_{resume,suspend}, save/restore registers even when !dai->active. Signed-off-by: Karl Beldan <karl.beldan(a)mobile-devices.fr> --- sound/soc/pxa/pxa2xx-i2s.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index a423637..efe499e 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c @@ -262,9 +262,6 @@ static void pxa2xx_i2s_shutdown(struct snd_pcm_substream *substream, #ifdef CONFIG_PM static int pxa2xx_i2s_suspend(struct snd_soc_dai *dai) { - if (!dai->active) - return 0; - /* store registers */ pxa_i2s.sacr0 = SACR0; pxa_i2s.sacr1 = SACR1; @@ -279,16 +276,14 @@ static int pxa2xx_i2s_suspend(struct snd_soc_dai *dai) static int pxa2xx_i2s_resume(struct snd_soc_dai *dai) { - if (!dai->active) - return 0; - pxa_i2s_wait(); - SACR0 = pxa_i2s.sacr0 &= ~SACR0_ENB; + SACR0 = pxa_i2s.sacr0 & ~SACR0_ENB; SACR1 = pxa_i2s.sacr1; SAIMR = pxa_i2s.saimr; SADIV = pxa_i2s.sadiv; - SACR0 |= SACR0_ENB; + + SACR0 = pxa_i2s.sacr0; return 0; } -- 1.6.3.rc1.34.g0be9b -- Karl

1 0

[alsa-devel] [PATCH 3/4] pxa2xx-i2s: Fix inappropriate release of i2s clock
by Karl Beldan 13 May '09

13 May '09

i2s_clk is 'put' for no reason in pxa2xx_i2s_shutdown. Now we 'get' i2s_clk at probe and 'put' it at driver removal or when probe fails. Signed-off-by: Karl Beldan <karl.beldan(a)mobile-devices.fr> --- sound/soc/pxa/pxa2xx-i2s.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index a461c8d..a423637 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c @@ -257,8 +257,6 @@ static void pxa2xx_i2s_shutdown(struct snd_pcm_substream *substream, pxa_i2s_wait(); clk_disable(clk_i2s); } - - clk_put(clk_i2s); } #ifdef CONFIG_PM -- 1.6.3.rc1.34.g0be9b -- Karl

1 0

[alsa-devel] [PATCH 2/4] pxa2xx-i2s: Handle SACR1_DRPL and SACR1_DREC separately
by Karl Beldan 13 May '09

13 May '09

- hw_params enables both RPL and REC functions each time : Enable the appropriate function in pxa2xx_i2s_trigger. - pxa2xx_i2s_shutdown disables i2s anytime one of RPL or REC function is off : Turn it off only when both functions are off. Signed-off-by: Karl Beldan <karl.beldan(a)mobile-devices.fr> --- sound/soc/pxa/pxa2xx-i2s.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index 59cc4f5..a461c8d 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c @@ -176,9 +176,7 @@ static int pxa2xx_i2s_hw_params(struct snd_pcm_substream *substream, /* is port used by another stream */ if (!(SACR0 & SACR0_ENB)) { - SACR0 = 0; - SACR1 = 0; if (pxa_i2s.master) SACR0 |= SACR0_BCKD; @@ -224,6 +222,10 @@ static int pxa2xx_i2s_trigger(struct snd_pcm_substream *substream, int cmd, switch (cmd) { case SNDRV_PCM_TRIGGER_START: + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + SACR1 &= ~SACR1_DRPL; + else + SACR1 &= ~SACR1_DREC; SACR0 |= SACR0_ENB; break; case SNDRV_PCM_TRIGGER_RESUME: @@ -250,7 +252,7 @@ static void pxa2xx_i2s_shutdown(struct snd_pcm_substream *substream, SAIMR &= ~SAIMR_RFS; } - if (SACR1 & (SACR1_DREC | SACR1_DRPL)) { + if ((SACR1 & (SACR1_DREC | SACR1_DRPL)) == (SACR1_DREC | SACR1_DRPL)) { SACR0 &= ~SACR0_ENB; pxa_i2s_wait(); clk_disable(clk_i2s); -- 1.6.3.rc1.34.g0be9b -- Karl

1 0

[alsa-devel] [PATCH 1/4] pxa2xx-i2s: Proper hw initialization
by Karl Beldan 13 May '09

13 May '09

Make sure we are in a know good state at end of probe : Reset FIFO logic and registers, and make sure REC and RPL functions along with FIFO service are disabled (SACR0_RST enables REC and RPL). Resetting loses current settings so remove reset from stream startup. Now reset occurs only at probe. Signed-off-by: Karl Beldan <karl.beldan(a)mobile-devices.fr> --- sound/soc/pxa/pxa2xx-i2s.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index 2f4b6e4..59cc4f5 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c @@ -106,10 +106,8 @@ static int pxa2xx_i2s_startup(struct snd_pcm_substream *substream, if (IS_ERR(clk_i2s)) return PTR_ERR(clk_i2s); - if (!cpu_dai->active) { - SACR0 |= SACR0_RST; + if (!cpu_dai->active) SACR0 = 0; - } return 0; } @@ -346,6 +344,19 @@ static int pxa2xx_i2s_probe(struct platform_device *dev) if (ret != 0) clk_put(clk_i2s); + /* + * PXA Developer's Manual: + * If SACR0[ENB] is toggled in the middle of a normal operation, + * the SACR0[RST] bit must also be set and cleared to reset all + * I2S controller registers. + */ + SACR0 = SACR0_RST; + SACR0 = 0; + /* Make sure RPL and REC are disabled */ + SACR1 = SACR1_DRPL | SACR1_DREC; + /* Along with FIFO servicing */ + SAIMR &= ~(SAIMR_RFS | SAIMR_TFS); + return ret; } -- 1.6.3.rc1.34.g0be9b -- Karl

1 0

[alsa-devel] [PATCH 0/1] Add AIC3106 support.
by Ambrose, Martin 13 May '09

13 May '09

Hello, I patched in support for the AIC3106 codec which is the IC on the DA830 EVM. This patch applies to the ASoC tree: ddc4097b77bbb227851a44287acb2fb8a9896cc1 But it also applies cleanly to the Davinci tree: Unfortunately there are missing pieces needed (e.g. edma/mcasp) for this board on the Davinci tree to test directly. But it passes the smoke test of building and running on the Davinci EVM. -Martin

2 3

[alsa-devel] asoundconf removed from alsa-utils?
by Susan Cragin 13 May '09

13 May '09

The message says that asoundconf is not present because alsa-utils is not installed. However, I have just installed the latest. 20090512. And the following alsa-utils work: arecord works, as well as alsamixer and alsactl. I hesitate to even report this, because I'm on karmic with 2.6.30-5-generic kernel, and I know there are bugs, and that I am pre-alpha. So this is FYI -- no response needed or expected. Susan

3 2

[alsa-devel] emu10k1 TRAM access ?
by mAdVax 13 May '09

13 May '09

Hello I would like to send some data to a DSP patch. I can use alsa controls (easy) but I need more : TRAM and lookup table. I read many lines of code, but all this is still quite obscure... Here are 3 questions : How can I fill the TRAM ? (from user space) How can I know which TRAM area has been allocated to a given patch ? Do 'lookup tables' work ? Some code samples will be greatly appreciated :) Thanks in advance. Xavier

1 0

[alsa-devel] ALSA 1.0.20 PCM Capture Problem (Does not happen on ALSA 1.0.19)
by Robert Vincent Krakora 13 May '09

13 May '09

Hello, I am utilizing an external mic on my machine in conjunction with a VF0560 Live! Cam Optia AF webcam. I am running CentOS 5.3 with the kernel listed below and ALSA 1.0.20. I using the machine to stream video with VLC 9.9 (see further below). VLC spits out the following on the console of my machine whist capturing A/V and serving it up on the network...ALSA 1.0.19 did not exhibit this problem while streaming it did lock up after 20 minutes or so (audio could be heard on the VLC or mplayer client with ALSA 1.0.19...just bits and pieces of audio every now and then with ALSA 1.0.20. V4L is not the culprit here as video streams and can be received without incident if I do not also capture audio. The mic is plugged into the onboard sound on the motherboard. I have not yet tried my USB mic with ALSA 1.0.20, but I will try it later tonight. Any and all help would be greatly appreciate. Thanks in advance. [00000473] main audio output warning: audio drift is too big (-146765), clearing out [00000473] main audio output warning: mixer start isn't output start (-29715) [00000473] main audio output warning: audio drift is too big (-150692), clearing out [00000473] main audio output warning: mixer start isn't output start (-30980) [00000493] main spu text debug: looking for text renderer module: 3 candidates [00000493] freetype spu text error: failed to load font file /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf [00000493] main spu text debug: using text renderer module "svg" [00000493] main spu text debug: TIMER module_Need() : 29.750 ms - Total 29.750 ms / 1 intvls (Avg 29.750 ms) [00000492] main blend debug: looking for video blending module: 1 candidate [00000492] blend blend debug: chroma: YUVA -> I420 [00000492] main blend debug: using video blending module "blend" [00000492] main blend debug: TIMER module_Need() : 0.433 ms - Total 0.433 ms / 1 intvls (Avg 0.433 ms) [00000473] main audio output warning: audio drift is too big (-147017), clearing out [00000473] main audio output warning: mixer start isn't output start (-29763) [00000473] main audio output warning: audio drift is too big (-147157), clearing out [00000473] main audio output warning: mixer start isn't output start (-30302) [00000473] main audio output warning: audio drift is too big (-150434), clearing out [00000473] main audio output warning: mixer start isn't output start (-30931) [00000473] main audio output warning: buffer is 114796 in advance, triggering downsampling [00000473] main audio output warning: audio drift is too big (-261628), clearing out [00000473] main audio output warning: timing screwed, stopping resampling [00000473] main audio output warning: mixer start isn't output start (-53788) [00000473] main audio output warning: audio drift is too big (-146580), clearing out [00000473] main audio output warning: mixer start isn't output start (-29711) [00000473] main audio output warning: audio drift is too big (-150686), clearing out [00000473] main audio output warning: mixer start isn't output start (-30979) [00000473] main audio output warning: audio drift is too big (-146733), clearing out [00000473] main audio output warning: mixer start isn't output start (-29708) [00000473] main audio output warning: audio drift is too big (-146978), clearing out [00000473] main audio output warning: mixer start isn't output start (-30267) [00000473] main audio output warning: audio drift is too big (-150569), clearing out [00000473] main audio output warning: mixer start isn't output start (-30445) [00000473] main audio output warning: buffer is 114650 in advance, triggering downsampling [00000473] main audio output warning: audio drift is too big (-261447), clearing out [00000473] main audio output warning: timing screwed, stopping resampling [00000473] main audio output warning: mixer start isn't output start (-54265) [00000473] main audio output warning: audio drift is too big (-146518), clearing out [00000473] main audio output warning: mixer start isn't output start (-29699) [00000473] main audio output warning: audio drift is too big (-146731), clearing out [00000473] main audio output warning: mixer start isn't output start (-30220) [00000473] main audio output warning: audio drift is too big (-150880), clearing out [00000473] main audio output warning: mixer start isn't output start (-30505) [00000473] main audio output warning: audio drift is too big (-146644), clearing out [00000473] main audio output warning: mixer start isn't output start (-30203) [00000473] main audio output warning: audio drift is too big (-146701), clearing out [00000473] main audio output warning: mixer start isn't output start (-29702) [00000473] main audio output warning: audio drift is too big (-150683), clearing out [00000473] main audio output warning: mixer start isn't output start (-30979) [00000473] main audio output warning: audio drift is too big (-146706), clearing out [00000473] main audio output warning: mixer start isn't output start (-29703) [00000473] main audio output warning: audio drift is too big (-146916), clearing out [00000473] main audio output warning: mixer start isn't output start (-30255) [00000473] main audio output warning: audio drift is too big (-150819), clearing out [00000473] main audio output warning: mixer start isn't output start (-31005) [00000473] main audio output warning: audio drift is too big (-147003), clearing out [00000473] main audio output warning: mixer start isn't output start (-29760) [00000473] main audio output warning: audio drift is too big (-146886), clearing out [00000473] main audio output warning: mixer start isn't output start (-30250) [00000473] main audio output warning: audio drift is too big (-150552), clearing out [root@vizioroom105 ~]# uname -a Linux vizioroom105.msgnet.com 2.6.27.10 #2 SMP Thu Jan 22 09:09:44 EST 2009 x86_64 x86_64 x86_64 GNU/Linux [root@vizioroom105 ~]# arecord -l **** List of CAPTURE Hardware Devices **** card 0: AF [VF0560 Live! Cam Optia AF], device 0: USB Audio [USB Audio] Subdevices: 1/1 Subdevice #0: subdevice #0 card 1: SB [HDA ATI SB], device 0: ALC883 Analog [ALC883 Analog] Subdevices: 1/1 Subdevice #0: subdevice #0 card 1: SB [HDA ATI SB], device 1: ALC883 Digital [ALC883 Digital] Subdevices: 1/1 Subdevice #0: subdevice #0 card 1: SB [HDA ATI SB], device 2: ALC883 Analog [ALC883 Analog] Subdevices: 0/1 Subdevice #0: subdevice #0 [root@vizioroom105 ~]# su silentm -c "/usr/bin/vcamera -vvvvv -I dummy -V dummy --dscp=0x01 v4l2:// :v4l2-dev=/dev/video0 :v4l2-adev=hw.1,0 :v4l2-width=720 :v4l2-height=480 :v4l2-standard=0 --sout '#transcode{vcodec=mp4v,vb=6000,fps=30,scale=1,acodec=mpga,ab=32,channels=1}:duplicate{dst=rtp{mux=ts,port=1234,sdp=rtsp://192.168.1.179:8080/test.sdp}}' vlc://quit" Best Regards, -- Rob Krakora Senior Software Engineer MessageNet Systems 101 East Carmel Dr. Suite 105 Carmel, IN 46032 (317)566-1677 Ext. 206 (317)663-0808 Fax

3 2