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

[alsa-devel] [PATCH] ASoC: spdif: Add codec driver to use spdif stand-alone
by Seungwhan Youn 31 May '10

31 May '10

This patch adds spdif dummy codec driver for using spdif-dit as a stand-alone. Until this, spdif-dit can be used only with other codecs like tlv320aci3x in davinci platform. Signed-off-by: Seungwhan Youn <sw.youn(a)samsung.com> --- sound/soc/codecs/spdif_transciever.c | 93 +++++++++++++++++++++++++++++++++- 1 files changed, 92 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/spdif_transciever.c b/sound/soc/codecs/spdif_transciever.c index a631911..f0945ab 100644 --- a/sound/soc/codecs/spdif_transciever.c +++ b/sound/soc/codecs/spdif_transciever.c @@ -18,6 +18,7 @@ #include <linux/moduleparam.h> #include <sound/soc.h> #include <sound/pcm.h> +#include <sound/initval.h> #include "spdif_transciever.h" @@ -26,6 +27,48 @@ MODULE_LICENSE("GPL"); #define STUB_RATES SNDRV_PCM_RATE_8000_96000 #define STUB_FORMATS SNDRV_PCM_FMTBIT_S16_LE +static struct snd_soc_codec *spdif_dit_codec; + +static int spdif_dit_codec_probe(struct platform_device *pdev) +{ + struct snd_soc_device *socdev = platform_get_drvdata(pdev); + struct snd_soc_codec *codec; + int ret; + + if (spdif_dit_codec == NULL) { + dev_err(&pdev->dev, "Codec device not registered\n"); + return -ENODEV; + } + + socdev->card->codec = spdif_dit_codec; + codec = spdif_dit_codec; + + ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); + if (ret < 0) { + dev_err(codec->dev, "failed to create pcms: %d\n", ret); + goto err_create_pcms; + } + + return 0; + +err_create_pcms: + return ret; +} + +static int spdif_dit_codec_remove(struct platform_device *pdev) +{ + struct snd_soc_device *socdev = platform_get_drvdata(pdev); + + snd_soc_free_pcms(socdev); + + return 0; +} + +struct snd_soc_codec_device soc_codec_dev_spdif_dit = { + .probe = spdif_dit_codec_probe, + .remove = spdif_dit_codec_remove, +}; EXPORT_SYMBOL_GPL(soc_codec_dev_spdif_dit); + struct snd_soc_dai dit_stub_dai = { .name = "DIT", .playback = { @@ -40,13 +83,61 @@ EXPORT_SYMBOL_GPL(dit_stub_dai); static int spdif_dit_probe(struct platform_device *pdev) { + struct snd_soc_codec *codec; + int ret; + + if (spdif_dit_codec) { + dev_err(&pdev->dev, "Another Codec is registered\n"); + ret = -EINVAL; + goto err_reg_codec; + } + + codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL); + if (codec == NULL) + return -ENOMEM; + + codec->dev = &pdev->dev; + + mutex_init(&codec->mutex); + + INIT_LIST_HEAD(&codec->dapm_widgets); + INIT_LIST_HEAD(&codec->dapm_paths); + + codec->name = "spdif-dit"; + codec->owner = THIS_MODULE; + codec->dai = &dit_stub_dai; + codec->num_dai = 1; + + spdif_dit_codec = codec; + + ret = snd_soc_register_codec(codec); + if (ret < 0) { + dev_err(codec->dev, "Failed to register codec: %d\n", ret); + goto err_reg_codec; + } + dit_stub_dai.dev = &pdev->dev; - return snd_soc_register_dai(&dit_stub_dai); + ret = snd_soc_register_dai(&dit_stub_dai); + if (ret < 0) { + dev_err(codec->dev, "Failed to register dai: %d\n", ret); + goto err_reg_dai; + } + + return 0; + +err_reg_dai: + snd_soc_unregister_codec(codec); +err_reg_codec: + kfree(spdif_dit_codec); + return ret; } static int spdif_dit_remove(struct platform_device *pdev) { snd_soc_unregister_dai(&dit_stub_dai); + snd_soc_unregister_codec(spdif_dit_codec); + kfree(spdif_dit_codec); + spdif_dit_codec = NULL; return 0; } -- 1.6.2.5

4 4

[alsa-devel] i.MX SSI Kconfig fixes
by Sascha Hauer 31 May '10

31 May '10

Hi, Two small fixes for i.MX SSI. Sascha The following changes since commit 67a3e12b05e055c0415c556a315a3d3eb637e29e: Linux 2.6.35-rc1 (2010-05-30 13:21:02 -0700) are available in the git repository at: git://git.pengutronix.de/git/imx/linux-2.6.git imx-ssi-fixes Sascha Hauer (2): i.MX ssi: MX31ads sound support should depend on MACH_MX31ADS i.MX ssi: Add missing Kconfig entry for Phytec boards sound/soc/imx/Kconfig | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-)

3 8

[alsa-devel] ASoC updates for 2.6.36
by Mark Brown 31 May '10

31 May '10

The following changes since commit 67a3e12b05e055c0415c556a315a3d3eb637e29e: Linux 2.6.35-rc1 (2010-05-30 13:21:02 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.36 This includes a merge up of 2.6.35-rc1, plus the commits below. Barry Song (1): ASoC: ad193x: add set_sysclk entry to support different clock input Jassi Brar (2): ASOC: S5PC100: Enable AC97 support ASOC: S5PV210: Enable AC97 support Mark Brown (7): Merge branch 'topic/asoc' of git://git.kernel.org/.../tiwai/sound-2.6 into for-2.6.36 ASoC: Remove version display from WM8990 ASoC: Fix dB scales for WM835x ASoC: Fix dB scales for WM8400 ASoC: Fix dB scales for WM8990 Merge commit 'v2.6.35-rc1' into for-2.6.36 ASoC: Fix S/PDIF build Seungwhan Youn (1): ASoC: spdif: Add codec driver to use spdif stand-alone Wan ZongShun (1): ASoC: NUC900/audio: add nuc900 audio driver support apatard(a)mandriva.com (7): ASoC: Add SOC_DOUBLE_R_SX_TLV control ASoC: Add SND_SOC_DAPM_PRE_POST_PMD event ASoC: Add driver for cs42l51 orion/kirkwood: add audio functions. openrd-client: initialise audio ASoC: kirkwood: Add i2s support ASoC: kirkwood: Add audio support to openrd client platforms arch/arm/mach-kirkwood/common.c | 38 ++ arch/arm/mach-kirkwood/common.h | 2 + arch/arm/mach-kirkwood/include/mach/kirkwood.h | 3 + arch/arm/mach-kirkwood/openrd-setup.c | 13 + arch/arm/plat-orion/include/plat/audio.h | 11 + include/sound/soc-dapm.h | 2 + include/sound/soc.h | 21 + sound/soc/Kconfig | 2 + sound/soc/Makefile | 2 + sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/ad193x.c | 41 ++- sound/soc/codecs/ad193x.h | 5 + sound/soc/codecs/cs42l51.c | 763 ++++++++++++++++++++++++ sound/soc/codecs/cs42l51.h | 163 +++++ sound/soc/codecs/spdif_transciever.c | 94 +++- sound/soc/codecs/spdif_transciever.h | 1 + sound/soc/codecs/wm8990.c | 4 - sound/soc/kirkwood/Kconfig | 20 + sound/soc/kirkwood/Makefile | 9 + sound/soc/kirkwood/kirkwood-dma.c | 383 ++++++++++++ sound/soc/kirkwood/kirkwood-dma.h | 17 + sound/soc/kirkwood/kirkwood-i2s.c | 485 +++++++++++++++ sound/soc/kirkwood/kirkwood-i2s.h | 17 + sound/soc/kirkwood/kirkwood-openrd.c | 126 ++++ sound/soc/kirkwood/kirkwood.h | 126 ++++ sound/soc/nuc900/Kconfig | 27 + sound/soc/nuc900/Makefile | 11 + sound/soc/nuc900/nuc900-ac97.c | 442 ++++++++++++++ sound/soc/nuc900/nuc900-audio.c | 81 +++ sound/soc/nuc900/nuc900-auido.h | 121 ++++ sound/soc/nuc900/nuc900-pcm.c | 352 +++++++++++ sound/soc/s3c24xx/Kconfig | 4 +- sound/soc/s3c24xx/smdk_wm9713.c | 3 + sound/soc/soc-core.c | 95 +++ 35 files changed, 3482 insertions(+), 8 deletions(-) create mode 100644 arch/arm/plat-orion/include/plat/audio.h create mode 100644 sound/soc/codecs/cs42l51.c create mode 100644 sound/soc/codecs/cs42l51.h create mode 100644 sound/soc/kirkwood/Kconfig create mode 100644 sound/soc/kirkwood/Makefile create mode 100644 sound/soc/kirkwood/kirkwood-dma.c create mode 100644 sound/soc/kirkwood/kirkwood-dma.h create mode 100644 sound/soc/kirkwood/kirkwood-i2s.c create mode 100644 sound/soc/kirkwood/kirkwood-i2s.h create mode 100644 sound/soc/kirkwood/kirkwood-openrd.c create mode 100644 sound/soc/kirkwood/kirkwood.h create mode 100644 sound/soc/nuc900/Kconfig create mode 100644 sound/soc/nuc900/Makefile create mode 100644 sound/soc/nuc900/nuc900-ac97.c create mode 100644 sound/soc/nuc900/nuc900-audio.c create mode 100644 sound/soc/nuc900/nuc900-auido.h create mode 100644 sound/soc/nuc900/nuc900-pcm.c

2 1

[alsa-devel] [GIT PULL] ASoC updates for 2.6.36
by Liam Girdwood 31 May '10

31 May '10

Hi Takashi, Please pull the following ASoC updates for 2.6.36. Thanks Liam --- The following changes since commit ad8332c1302bcb4f80d593fd3eb477be9d7f5604: Jarkko Nikula (1): ASoC: tpa6130a2: Remove CPVSS and HPVdd supplies are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6.git for-2.6.36 Jorge Eduardo Candelaria (1): ASoC: TWL6040: Fix playback with 19.2 Mhz MCLK Peter Ujfalusi (8): ASoC: TWL4030: Revisit codec defaults ASoC: TWL4030: Remove wrapper for power down ASoC: TWL4030: Make offset cancellation path configurable ASoC: TWL4030: Optimize the power up sequence ASoC: TWL4030: Helper to check chip default registers ASoC: TWL4030: Correct the ARXR2_APGA_CTL chip default ASoC: TWL4030: Use BIAS_OFF instead of BIAS_STANDBY, when not in use ASoC: TWL4030: Add functionalty to reset the registers sound/soc/codecs/twl4030.c | 291 +++++++++++++++++++++++++------------------- sound/soc/codecs/twl4030.h | 3 + sound/soc/codecs/twl6040.c | 2 +- 3 files changed, 170 insertions(+), 126 deletions(-)

2 1

[alsa-devel] alsa-driver-1.0.23 fails to build on ppc
by Elimar Riesebieter 31 May '10

31 May '10

Hi, preparing alsa-driver-1.0.23 for Debian upload I found while building modules all: LD [M] /usr/src/modass/usr_src/modules/alsa-driver/aoa/core/snd-aoa.o CC [M] /usr/src/modass/usr_src/modules/alsa-driver/aoa/fabrics/layout.o In file included from /usr/src/modass/usr_src/modules/alsa-driver/aoa/fabrics/layout.c:2: /usr/src/modass/usr_src/modules/alsa-driver/aoa/fabrics/../../alsa-kernel/aoa/fabrics/layout.c: In function 'check_codec': /usr/src/modass/usr_src/modules/alsa-driver/aoa/fabrics/../../alsa-kernel/aoa/fabrics/layout.c:772: error: 'struct device_node' has no member named 'phandle' make[8]: *** [/usr/src/modass/usr_src/modules/alsa-driver/aoa/fabrics/layout.o] Error 1 make[7]: *** [/usr/src/modass/usr_src/modules/alsa-driver/aoa/fabrics] Error 2 make[6]: *** [/usr/src/modass/usr_src/modules/alsa-driver/aoa] Error 2 make[5]: *** [_module_/usr/src/modass/usr_src/modules/alsa-driver] Error 2 make[4]: *** [sub-make] Error 2 make[3]: *** [all] Error 2 I found no fix in git. I would be glad if someone could give me a hint. Thanks Elimar -- Planung: Ersatz des Zufalls durch den Irrtum. -unknown-

2 2

Re: [alsa-devel] [PATCH] alsa/Au1xxx-PSC: use resource_size
by Manuel Lauss 31 May '10

31 May '10

2010/5/28 Wan ZongShun <mcuos.com(a)gmail.com>: > Dear Manuel & Mark, > > I make a little modification to use the 'resource_size'. It's okay with me. You could also modifiy psc-ac97.c in the same way. Manuel Lauss

3 10

[alsa-devel] [patch 0/6] kirkwood openrd client audio support - v4
by apatard＠mandriva.com 31 May '10

31 May '10

Hi, This patchset is an other try to get merged openrd audio support mainline. The main change is going back to using kirkwood instead of orion, as the only orion having i2s is not merged mainline (if I got it right). I've also fixed the lastests comments on the cs42l51 codec patch. Arnaud Changes : - changed back from orion to kirkwood - removed cs42l51 adc input register initialisation - moved the DAPM event macro to soc-dapm - fixed cs42l51_set_dai_fmt() master/slave check - removed cs42l51 startup message - use snd_soc_update_bits() in cs42l51_pdn_event()

4 18

[alsa-devel] arecord and DMA misaligned error with device
by Ruchi Sirauthiya 31 May '10

31 May '10

Hi all, I am working on an OMAP board with Linux kernel 2.6.22.18-omap3 and ALSA. I got the following stack trace when running 'arecord' continuously for a long time (~30 minutes). What could be the reason for "page allocation failure" and "DMA misaligned error"? How can I solve this issue? Thanks and Regards, Ruchi Sirauthiya ---- LOG START ---- page allocation failure. order:5, mode:0xd1 [ 1249.046875] [<c0050380>] (dump_stack+0x0/0x14) from [<c00ae260>] (__alloc_pages+0x288/0x29c) [ 1249.054687] [<c00adfd8>] (__alloc_pages+0x0/0x29c) from [<c0051cac>] (__dma_alloc+0x17c/0x3d4) [ 1249.062500] [<c0051b30>] (__dma_alloc+0x0/0x3d4) from [<c0051f58>] (dma_alloc_coherent+0x24/0x30) [ 1249.070312] [<c0051f34>] (dma_alloc_coherent+0x0/0x30) from [<c02717b4>] (snd_omap_alsa_hw_params+0x54/0x7c) [ 1249.085937] [<c0271760>] (snd_omap_alsa_hw_params+0x0/0x7c) from [<c02683dc>] (snd_pcm_hw_params+0x90/0x2e0) [ 1249.093750] r5:c19d6000 r4:c15da000 [ 1249.093750] [<c026834c>] (snd_pcm_hw_params+0x0/0x2e0) from [<c02686b0>] (snd_pcm_hw_params_user+0x84/0xe4) [ 1249.109375] r9:cb8f4000 r8:c004c028 r7:c077e360 r6:c19d6000 r5:c077e360 [ 1249.109375] r4:001bdb48 [ 1249.117187] [<c026862c>] (snd_pcm_hw_params_user+0x0/0xe4) from [<c02689c0>] (snd_pcm_common_ioctl1+0x1cc/0xf04) [ 1249.125000] r7:c077e360 r6:001bdb48 r5:001bdb48 r4:c25c4111 [ 1249.132812] [<c02687f4>] (snd_pcm_common_ioctl1+0x0/0xf04) from [<c0269b44>] (snd_pcm_capture_ioctl1+0x44c/0x470) [ 1249.140625] [<c02696f8>] (snd_pcm_capture_ioctl1+0x0/0x470) from [<c0269b9c>] (snd_pcm_capture_ioctl+0x34/0x38) [ 1249.148437] [<c0269b68>] (snd_pcm_capture_ioctl+0x0/0x38) from [<c00d0adc>] (do_ioctl+0x34/0x78) [ 1249.164062] [<c00d0aa8>] (do_ioctl+0x0/0x78) from [<c00d0d80>] (vfs_ioctl+0x260/0x278) [ 1249.171875] r5:001bdb48 r4:ccb9a4e0 [ 1249.171875] [<c00d0b20>] (vfs_ioctl+0x0/0x278) from [<c00d0dd8>] (sys_ioctl+0x40/0x64) [ 1249.179687] r7:ccb9a4e0 r6:c25c4111 r5:001bdb48 r4:00000039 [ 1249.187500] [<c00d0d98>] (sys_ioctl+0x0/0x64) from [<c004be80>] (ret_fast_syscall+0x0/0x2c) [ 1249.195312] r7:00000036 r6:001ec5c8 r5:413b3bd4 r4:001bdb48 [ 1249.203125] Mem-info: [ 1249.203125] DMA per-cpu: [ 1249.203125] CPU 0: Hot: hi: 90, btch: 15 usd: 66 Cold: hi: 30, btch: 7 usd: 24 [ 1249.210937] Active:10183 inactive:35469 dirty:4 writeback:0 unstable:0 [ 1249.210937] free:739 slab:5167 mapped:2540 pagetables:125 bounce:0 [ 1249.226562] DMA free:2956kB min:1888kB low:2360kB high:2832kB active:40732kB inactive:141876kB present:223520kB pages_scanned:0 all_unreclaimable? no [ 1249.242187] lowmem_reserve[]: 0 0 [ 1249.242187] DMA: 13*4kB 33*8kB 27*16kB 3*32kB 31*64kB 1*128kB 0*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB 0*8192kB = 2956kB [ 1249.257812] Free swap: 0kB [ 1249.265625] 56320 pages of RAM [ 1249.273437] 1016 free pages [ 1249.273437] 3616 reserved pages [ 1249.273437] 5167 slab pages [ 1249.281250] 41756 pages shared [ 1249.281250] 0 pages swap cached [ 1249.343750] DMA misaligned error with device 1 [ 1249.343750] DMA misaligned error with device 1 [ 1249.351562] DMA misaligned error with device 1 [ 1249.359375] DMA misaligned error with device 1 [ 1249.359375] DMA misaligned error with device 1 [ 1249.367187] DMA misaligned error with device 1 [ 1249.367187] DMA misaligned error with device 1 [ 1249.375000] DMA misaligned error with device 1 [ 1249.375000] DMA misaligned error with device 1 [ 1249.382812] DMA misaligned error with device 1 [ 1249.390625] DMA misaligned error with device 1 [ 1249.390625] DMA misaligned error with device 1 [ 1249.398437] DMA misaligned error with device 1 [ 1249.398437] DMA misaligned error with device 1 [ 1249.406250] DMA misaligned error with device 1 [ 1249.406250] DMA misaligned error with device 1 ... ... log truncated ... ... ---- LOG END ----

2 1

[alsa-devel] [PATCH v2 0/8] ASoC: TWL4030: put the codec to off when not active
by Peter Ujfalusi 31 May '10

31 May '10

Hello, Changes since v1: - Patch 3: removed the shifting of offset cancellation value - Added register content reset functionality as suggested by Liam and Mark I have added Mark's Acked-by to patch 1-7, patch 8 is a new one, which shall address the comments regarding to the register content reset. To-do after this series: Revisit the register reset functionality to use burst write. Intro mail from the original series: The following series at the end will let the twl4030 codec to use BIAS_OFF instead of BIAS_STANDBY. The difference in power consumption is about 0.5mA. To achieve this: - The regcache has been reseted to codec default - The codec initialization has been optimized, it is no longer writes all 73 registers at startup, but only modifies few selected one. - The power related code has been cleaned up, and optimized - Support added for machine drivers to select the offset cancellation path - debug support for checking the codec default registers (machine drivers can ask for checking, but shall be disabled in production). - Added codec register reset functionality I guess that's it. The driver has been tested on a custom board with twl5031. It passed all of our internal test cases covering much of the codec features. --- Peter Ujfalusi (8): ASoC: TWL4030: Revisit codec defaults ASoC: TWL4030: Remove wrapper for power down ASoC: TWL4030: Make offset cancellation path configurable ASoC: TWL4030: Optimize the power up sequence ASoC: TWL4030: Helper to check chip default registers ASoC: TWL4030: Correct the ARXR2_APGA_CTL chip default ASoC: TWL4030: Use BIAS_OFF instead of BIAS_STANDBY, when not in use ASoC: TWL4030: Add functionalty to reset the registers sound/soc/codecs/twl4030.c | 291 +++++++++++++++++++++++++------------------- sound/soc/codecs/twl4030.h | 3 + 2 files changed, 169 insertions(+), 125 deletions(-)

3 10

[alsa-devel] How to support software mixing on QUALCOMM 72XX without mmap?
by Berg 31 May '10

31 May '10

Hello,guys. I'm porting ASLA1.0.23 to qualcomm 72xx base on ARM11. The first instance,"aplay test.wav", works now, but the second instance should fail with "device busy" error message. I have tried plug dmix and dshare "aply -D plug:mycard test.wav", but met a fail again for the soc chip doesn't support mmap. Of course,pcm_mycard is defined in /etc/asound.conf. In my pc ,both above cmds work well . Though,the document shows that: NOTE: For ALSA 1.0.9rc2 and higher you don't need to setup dmix for analogue output. Dmix is enabled by default for soundcards which don't support hardware mixing. You still need to set it up for digital outputs. My questions are: 1)Is software mixing implemented in ALSA Driver,or in ALSA LIB? 2)What could I do to make the software mixing work? Is there any special configure which need to adjust? And when testing on pc whth HD audio, I noticed that A)when aplay instances runs WITHOUT dmix, the result of"cat /etc/one_of_my_aplay_pid/maps" should like: ... b331d000-b731e000 rw-s 00000000 00:15 862346 /dev/shm/pulse-shm-2882420837 ... B)when aplay instances runs WITH dmix,the result is: ... b7511000-b7519000 rw-s 00000000 00:0f 4560 /dev/snd/pcmC0D0p b7519000-b751a000 rw-s 81000000 00:0f 4560 /dev/snd/pcmC0D0p b751a000-b751b000 r--s 80000000 00:0f 4560 /dev/snd/pcmC0D0p ... So,the third question: 3) From A) and B),can I make a result that the mmap feacture is not necessary for the buildin software mixing ? Expect your help,please berg

3 2