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

[alsa-devel] missing control in alsamixer capture for CA0110-IBG
by Susan Cragin 31 Aug '09

31 Aug '09

I have a Creative X-fi pci card (HD-Audio Generic) that uses Creative CA0110-IBG. Under alsamixer / Capture, there used to be two adjustments / sliders. The first was for "mic" and controlled the volume. I don't remember what the second was called, but it was very useful. It's default setting was "0." But recording worked ideally if it was to one notch above "mic." I used to set them at 45/46 respectively. Anyway, this handy adjustment / slider vanished a couple of weeks ago, and I was wondering where it went? Now I only see one slider, for "mic" and the performance of my microphone isn't as good, and I have to turn it up louder.

2 1

[alsa-devel] Problems with snd-hda-intel ALC1200 on msi gt725-212us laptop Only one speaker works and headphones do not mute laptop sound
by Tony Rao 31 Aug '09

31 Aug '09

msi gt725-212us Codec: Realtek ALC1200 This laptop has 4.1 sound. Sound is only coming out of subwoofer. When I plug in headphones sounds still comes out of subwoofer, but headphones work perfectly. http://www.alsa-project.org/db/?f=e95a9401ebfa6cb0133b11fc1482ea115f766d5e Thanks, Tony R

1 0

[alsa-devel] Error enabling dmix with ALSA
by ruchi sirauthiya 30 Aug '09

30 Aug '09

Hi, I am trying to enable a software mixer (using ALSA and dmix) on an OMAP3 based embedded target board using the twl4030 codec. When I try to play audio using the command, # aplay -D playback rec.wav I am getting the following error: ALSA lib pcm_direct.c:1098:(snd_pcm_direct_initialize_poll_fd) unable to open timer 'hw:CLASS=3,SCLASS=0,CARD=0,DEV=0,SUBDEV=0' ALSA lib pcm_dmix.c:943:(snd_pcm_dmix_open) unable to initialize poll_fd aplay: main:546: audio open error: No such file or directory The contents of my /etc/asound.conf is given below. pcm.playback { type dmix ipc_key 2048 ipc_key_add_uid true ipc_gid 1 slave { rate 44100 pcm hw:0 } } I have tested it on two kernel versions, 2.6.22 and 2.6.29, but it fails on both. Playback and recording works fine if -D option is not provided. I also tried configuring ALSA (dmix) with a different configuration file which is given in the following link: http://amarok.kde.org/wiki/Setting_up_Dmix_for_ALSA # aplay -D plug:ossmix /mnt/Audio1_1.wav ALSA lib pcm_direct.c:1098:(snd_pcm_direct_initialize_poll_fd) unable to open timer 'hw:CLASS=3,SCLASS=0,CARD=0,DEV=0,SUBDEV=0' ALSA lib pcm_dmix.c:943:(snd_pcm_dmix_open) unable to initialize poll_fd aplay: main:546: audio open error: No such file or directory But as you can see the same error turns up again. The topic discussed in the following link (a similar issue) suggests that it is unable to open a second timer. http://osdir.com/ml/linux.distributions.crux.general/2005-11/msg00134.html What could be the cause of this error? Is the above error related to my ALSA configuration (for dmix) or is it related to the sound hardware (or driver)? Do I need to patch the kernel or ALSA for using dmix? Please help me resolve this issue. Let me know if any more setup info is required. Thanks and Regards, Ruchi Sirauthiya. Some information I obtained from the proc filesystem is given below for your reference. ----------------------- For Linux kernel 2.6.29 ----------------------- [root@OMAP3 tests]# cat /proc/asound/version Advanced Linux Sound Architecture Driver Version 1.0.19 [root@OMAP3 tests]# cat /proc/asound/cards 0 [omap3evm ]: twl4030 - omap3evm omap3evm (twl4030) [root@OMAP3 tests]# omap-dss: Could not find exact pixel clock. Requested 25188 kHz, got 25187 kHz [root@OMAP3 tests]# cat /proc/asound/devices 2: : timer 3: [ 0- 0]: digital audio playback 4: [ 0- 0]: digital audio capture 5: [ 0] : control [root@OMAP3 tests]# cat /proc/asound/timers G0: system timer : 7812.500us (10000000 ticks) P0-0-0: PCM playback 0-0-0 : SLAVE P0-0-1: PCM capture 0-0-1 : SLAVE [root@OMAP3 tests]# cat /proc/asound/pcm 00-00: TWL4030 twl4030-0 : : playback 1 : capture 1 [root@OMAP3 tests]# cat /proc/asound/devices 2: : timer 3: [ 0- 0]: digital audio playback 4: [ 0- 0]: digital audio capture 5: [ 0] : control [root@OMAP3 tests]# cat /proc/asound/pcm 00-00: TWL4030 twl4030-0 : : playback 1 : capture 1 [root@OMAP3 tests]# cat /proc/asound/oss/devices 3: [0- 0]: digital audio 4: [0- 0]: digital audio [root@OMAP3 tests]# cat /proc/asound/oss/sndstat Sound Driver:3.8.1a-980706 (ALSA v1.0.19 emulation code) Kernel: Linux OMAP3 2.6.29-rc3-omap1 #1 Fri Jul 24 14:45:37 IST 2009 armv7l Config options: 0 Installed drivers: Type 10: ALSA emulation Card config: omap3evm (twl4030) Audio devices: 0: (DUPLEX) Synth devices: NOT ENABLED IN CONFIG Midi devices: NOT ENABLED IN CONFIG Timers: 31: system timer Mixers: NOT ENABLED IN CONFIG [root@OMAP3 tests]# aplay -D playback /mnt/Audio1_1.wav ALSA lib pcm_direct.c:1098:(snd_pcm_direct_initialize_poll_fd) unable to open timer 'hw:CLASS=3,SCLASS=0,CARD=0,DEV=0,SUBDEV=0' ALSA lib pcm_dmix.c:943:(snd_pcm_dmix_open) unable to initialize poll_fd aplay: main:546: audio open error: No such file or directory ----------------------- For Linux kernel 2.6.22 ----------------------- [root@OMAP3 tests]# cat /proc/asound/devices 2: : timer 3: [ 0- 0]: digital audio playback 4: [ 0- 0]: digital audio capture 5: [ 0] : control [root@OMAP3 tests]# cat /proc/asound/pcm 00-00: OMAP PCM : omap alsa pcm : playback 1 : capture 1 [root@OMAP3 tests]# cat /proc/asound/timers G0: system timer : 7812.500us (10000000 ticks) P0-0-0: PCM playback 0-0-0 : SLAVE P0-0-1: PCM capture 0-0-1 : SLAVE [root@OMAP3 tests]# cat /proc/asound/ /proc/asound/TWL4030/ /proc/asound/devices /proc/asound/timers /proc/asound/card0/ /proc/asound/hwdep /proc/asound/version /proc/asound/cards /proc/asound/pcm [root@OMAP3 tests]# cat /proc/asound/cards 0 [TWL4030 ]: OMAP_ALSA - TWL4030 TWL4030 /proc/asound/oss was not found in the proc file system when booted with kernel 2.6.22.

2 4

[alsa-devel] ASoC DAI on Atmel AT32AP7000
by Christos Nikolaou 30 Aug '09

30 Aug '09

Hi, Up to 2.6.28 the ASoC framework was working on AT32AP7000 Atmel platform. Now I try to recompile it on 2.6.31-rc8 and I get Advance Linux Sound Architecture Driver Version 1.0.20. No device for DAI atmel-ssc0 No device for DAI atmel-ssc1 No device for DAI atmel-ssc2 whereas the ssc devices are properly (as in 2.6.28) initialized ssc ssc.0: Atmel SSC device at 0xffe1c00 (irq 10) ssc ssc.1: Atmel SSC device at 0xffe2000 (irq 11) ssc ssc.2: Atmel SSC device at 0xffe2400 (irq 12) It looks that this message comes from snd_soc_register_dai in soc-core.c if (!dai->dev) printk(KERN_WARNING "No device for DAI %s\n", dai->name); it seems for some reason it thinks there is no device in dai->dev Unless I'm mistaken, that is being called from sound/soc/atmel/atmel_ssc_dai.c after some modifications done by broonie on these files according to http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=history;… . Is there anything that can be done to rectify this? Regards, Christos

2 3

[alsa-devel] ASoC updates for 2.6.32
by Mark Brown 30 Aug '09

30 Aug '09

The following changes since commit a0a499c5792b8656cd51e11d5e0db9fb21640f58: Eduardo Valentin (1): ASoC: OMAP: Use DMA operating mode of McBSP are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.32 Ben Dooks (4): ASoC: S3C24XX: Add audio core and tlv320aic23 for Simtec boards ASoC: tlv320aic3x: Change to use device model ASoC: tlv320aic3x: fixup board device changes ASoC: S3C24XX: Support for Simtec Hermes boards Kuninori Morimoto (2): ASoC: Add ak4642/ak4643 codec support ASoC: Add FSI-AK4642 sound support for SuperH Marek Vasut (5): power_supply: Make wm97xx-core pass platform_data to battery, ts power_supply: Convert WM97xx battery to use platform_data power_supply: Let wm97xx-battery use irq to detect charger state [ARM] pxa: Convert all platforms to pass platform_data to wm97xx battery ASoC: Pass correct platform data from pxa2xx-ac97 Mark Brown (1): ASoC: Add DAPM widget power decision debugfs files Roel Kluin (1): ASoC: free socdev if init_card() fails in wm9705_soc_probe() arch/arm/mach-pxa/mioa701.c | 10 +- arch/arm/mach-pxa/palmld.c | 19 +- arch/arm/mach-pxa/palmt5.c | 19 +- arch/arm/mach-pxa/palmte2.c | 20 +- arch/arm/mach-pxa/palmtx.c | 19 +- arch/arm/mach-pxa/palmz72.c | 20 +- arch/arm/mach-pxa/treo680.c | 1 - arch/arm/plat-s3c/include/plat/audio-simtec.h | 37 ++ drivers/input/touchscreen/wm97xx-core.c | 3 + drivers/power/wm97xx_battery.c | 56 ++- include/linux/wm97xx.h | 18 + include/linux/wm97xx_batt.h | 26 -- include/sound/soc-dapm.h | 1 + include/sound/soc.h | 1 + sound/arm/pxa2xx-ac97.c | 4 +- sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/ak4642.c | 502 ++++++++++++++++++++++++ sound/soc/codecs/ak4642.h | 20 + sound/soc/codecs/tlv320aic3x.c | 221 ++++++----- sound/soc/codecs/tlv320aic3x.h | 2 - sound/soc/codecs/wm9705.c | 2 +- sound/soc/davinci/davinci-evm.c | 12 +- sound/soc/omap/n810.c | 12 +- sound/soc/pxa/pxa2xx-ac97.c | 4 +- sound/soc/s3c24xx/Kconfig | 19 + sound/soc/s3c24xx/Makefile | 7 + sound/soc/s3c24xx/s3c24xx_simtec.c | 394 +++++++++++++++++++ sound/soc/s3c24xx/s3c24xx_simtec.h | 22 + sound/soc/s3c24xx/s3c24xx_simtec_hermes.c | 153 +++++++ sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c | 137 +++++++ sound/soc/s6000/s6105-ipcam.c | 12 +- sound/soc/sh/Kconfig | 8 + sound/soc/sh/Makefile | 2 + sound/soc/sh/fsi-ak4642.c | 107 +++++ sound/soc/soc-core.c | 8 + sound/soc/soc-dapm.c | 86 ++++ 37 files changed, 1784 insertions(+), 206 deletions(-) create mode 100644 arch/arm/plat-s3c/include/plat/audio-simtec.h delete mode 100644 include/linux/wm97xx_batt.h create mode 100644 sound/soc/codecs/ak4642.c create mode 100644 sound/soc/codecs/ak4642.h create mode 100644 sound/soc/s3c24xx/s3c24xx_simtec.c create mode 100644 sound/soc/s3c24xx/s3c24xx_simtec.h create mode 100644 sound/soc/s3c24xx/s3c24xx_simtec_hermes.c create mode 100644 sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c create mode 100644 sound/soc/sh/fsi-ak4642.c

3 8

[alsa-devel] [PATCH 4/4] ASoC: Davinci: Add audio codec support for DM365 EVM
by miguel.aguilar＠ridgerun.com 29 Aug '09

29 Aug '09

From: Miguel Aguilar <miguel.aguilar(a)ridgerun.com> 1) Enables tlv320aic3101 support on DM365 EVM. 2) Set tlv320aic3x i2c setup into DM365 EVM board file. This patch was tested on DM365 EVM rev c. Signed-off-by: Miguel Aguilar <miguel.aguilar(a)ridgerun.com> --- arch/arm/mach-davinci/board-dm365-evm.c | 3 +++ sound/soc/davinci/Kconfig | 9 +++++++++ sound/soc/davinci/Makefile | 1 + sound/soc/davinci/davinci-evm.c | 29 +++++++++++++++++++++++++++-- 4 files changed, 40 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c index fd2db78..cff68e1 100644 --- a/arch/arm/mach-davinci/board-dm365-evm.c +++ b/arch/arm/mach-davinci/board-dm365-evm.c @@ -187,6 +187,9 @@ static struct i2c_board_info i2c_info[] = { I2C_BOARD_INFO("24c256", 0x50), .platform_data = &eeprom_info, }, + { + I2C_BOARD_INFO("tlv320aic3x", 0x18), + }, }; static struct davinci_i2c_platform_data i2c_pdata = { diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig index 6802dd5..b78b882 100644 --- a/sound/soc/davinci/Kconfig +++ b/sound/soc/davinci/Kconfig @@ -32,6 +32,15 @@ config SND_DM6467_SOC_EVM help Say Y if you want to add support for SoC audio on TI +config SND_DM365_SOC_EVM + tristate "SoC Audio support for DaVinci DM365 EVM" + depends on SND_DAVINCI_SOC && MACH_DAVINCI_DM365_EVM + select SND_DAVINCI_SOC_I2S + select SND_SOC_TLV320AIC3X + + help + Say Y if you want to add support for SoC audio on TI + config SND_DAVINCI_SOC_SFFSDR tristate "SoC Audio support for SFFSDR" depends on SND_DAVINCI_SOC && MACH_SFFSDR diff --git a/sound/soc/davinci/Makefile b/sound/soc/davinci/Makefile index 67be54f..8238612 100644 --- a/sound/soc/davinci/Makefile +++ b/sound/soc/davinci/Makefile @@ -13,4 +13,5 @@ snd-soc-sffsdr-objs := davinci-sffsdr.o obj-$(CONFIG_SND_DAVINCI_SOC_EVM) += snd-soc-evm.o obj-$(CONFIG_SND_DM6467_SOC_EVM) += snd-soc-evm.o +obj-$(CONFIG_SND_DM365_SOC_EVM) += snd-soc-evm.o obj-$(CONFIG_SND_DAVINCI_SOC_SFFSDR) += snd-soc-sffsdr.o diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index f3bb6f6..a859208 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c @@ -44,7 +44,8 @@ static int evm_hw_params(struct snd_pcm_substream *substream, unsigned sysclk; /* ASP1 on DM355 EVM is clocked by an external oscillator */ - if (machine_is_davinci_dm355_evm() || machine_is_davinci_dm6467_evm()) + if (machine_is_davinci_dm355_evm() || machine_is_davinci_dm6467_evm() + || machine_is_davinci_dm365_evm()) sysclk = 27000000; /* ASP0 in DM6446 EVM is clocked by U55, as configured by @@ -179,6 +180,14 @@ static struct snd_soc_card dm6467_snd_soc_card_evm = { .num_links = ARRAY_SIZE(dm6467_evm_dai), }; +/* davinci dm365 evm audio machine driver */ +static struct snd_soc_card dm365_snd_soc_card_evm = { + .name = "DaVinci DM365 EVM", + .platform = &davinci_soc_platform, + .dai_link = &evm_dai, + .num_links = 1, +}; + /* evm audio private data */ static struct aic3x_setup_data evm_aic3x_setup = { .i2c_bus = 1, @@ -191,6 +200,12 @@ static struct aic3x_setup_data dm6467_evm_aic3x_setup = { .i2c_address = 0x18, }; +/* dm365 evm audio private data */ +static struct aic3x_setup_data dm365_evm_aic3x_setup = { + .i2c_bus = 1, + .i2c_address = 0x18, +}; + /* evm audio subsystem */ static struct snd_soc_device evm_snd_devdata = { .card = &snd_soc_card_evm, @@ -198,13 +213,20 @@ static struct snd_soc_device evm_snd_devdata = { .codec_data = &evm_aic3x_setup, }; -/* evm audio subsystem */ +/* dm6467 evm audio subsystem */ static struct snd_soc_device dm6467_evm_snd_devdata = { .card = &dm6467_snd_soc_card_evm, .codec_dev = &soc_codec_dev_aic3x, .codec_data = &dm6467_evm_aic3x_setup, }; +/* dm365 evm audio subsystem */ +static struct snd_soc_device dm365_evm_snd_devdata = { + .card = &dm365_snd_soc_card_evm, + .codec_dev = &soc_codec_dev_aic3x, + .codec_data = &dm365_evm_aic3x_setup, +}; + static struct platform_device *evm_snd_device; static int __init evm_init(void) @@ -222,6 +244,9 @@ static int __init evm_init(void) } else if (machine_is_davinci_dm6467_evm()) { evm_snd_dev_data = &dm6467_evm_snd_devdata; index = 0; + }else if (machine_is_davinci_dm365_evm()) { + evm_snd_dev_data = &dm365_evm_snd_devdata; + index = 0; } else return -EINVAL; -- 1.6.0.4

2 1

[alsa-devel] [PATCH 3/4] Davinci: DM365: Add platform device for McBSP
by miguel.aguilar＠ridgerun.com 29 Aug '09

29 Aug '09

From: Miguel Aguilar <miguel.aguilar(a)ridgerun.com> 1) Registers the platform device for McBSP on DM365. 2) Add platform data to DM365 EVM board file. Signed-off-by: Miguel Aguilar <miguel.aguilar(a)ridgerun.com> --- arch/arm/mach-davinci/board-dm365-evm.c | 4 ++ arch/arm/mach-davinci/dm365.c | 42 +++++++++++++++++++++++++++- arch/arm/mach-davinci/include/mach/asp.h | 3 ++ arch/arm/mach-davinci/include/mach/dm365.h | 2 + 4 files changed, 50 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c index f6adf79..fd2db78 100644 --- a/arch/arm/mach-davinci/board-dm365-evm.c +++ b/arch/arm/mach-davinci/board-dm365-evm.c @@ -177,6 +177,8 @@ static struct at24_platform_data eeprom_info = { .context = (void *)0x7f00, }; +static struct snd_platform_data dm365_evm_snd_data; + static struct i2c_board_info i2c_info[] = { { I2C_BOARD_INFO("dm365evm_keys", 0x25), @@ -476,6 +478,8 @@ static __init void dm365_evm_init(void) /* maybe setup mmc1/etc ... _after_ mmc0 */ evm_init_cpld(); + + dm365_init_asp(&dm365_evm_snd_data); } static __init void dm365_evm_irq_init(void) diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index e815174..cba09b0 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -32,6 +32,7 @@ #include <mach/time.h> #include <mach/serial.h> #include <mach/common.h> +#include <mach/asp.h> #include "clock.h" #include "mux.h" @@ -456,7 +457,7 @@ static struct davinci_clk dm365_clks[] = { CLK(NULL, "usb", &usb_clk), CLK("davinci_emac.1", NULL, &emac_clk), CLK("voice_codec", NULL, &voicecodec_clk), - CLK("soc-audio.0", NULL, &asp0_clk), + CLK("davinci-asp.0", NULL, &asp0_clk), CLK(NULL, "rto", &rto_clk), CLK(NULL, "mjcp", &mjcp_clk), CLK(NULL, NULL, NULL), @@ -806,6 +807,31 @@ static struct platform_device dm365_edma_device = { .resource = edma_resources, }; +static struct resource dm365_asp_resources[] = { + { + .start = DAVINCI_DM365_ASP0_BASE, + .end = DAVINCI_DM365_ASP0_BASE + SZ_8K - 1, + .flags = IORESOURCE_MEM, + }, + { + .start = DAVINCI_DMA_ASP0_TX, + .end = DAVINCI_DMA_ASP0_TX, + .flags = IORESOURCE_DMA, + }, + { + .start = DAVINCI_DMA_ASP0_RX, + .end = DAVINCI_DMA_ASP0_RX, + .flags = IORESOURCE_DMA, + }, +}; + +static struct platform_device dm365_asp_device = { + .name = "davinci-asp", + .id = 0, + .num_resources = ARRAY_SIZE(dm365_asp_resources), + .resource = dm365_asp_resources, +}; + static struct map_desc dm365_io_desc[] = { { .virtual = IO_VIRT, @@ -907,6 +933,20 @@ static struct davinci_soc_info davinci_soc_info_dm365 = { .sram_len = SZ_32K, }; +void __init dm365_init_asp(struct snd_platform_data *pdata) +{ + davinci_cfg_reg(DM365_MCBSP0_BDX); + davinci_cfg_reg(DM365_MCBSP0_X); + davinci_cfg_reg(DM365_MCBSP0_BFSX); + davinci_cfg_reg(DM365_MCBSP0_BDR); + davinci_cfg_reg(DM365_MCBSP0_R); + davinci_cfg_reg(DM365_MCBSP0_BFSR); + davinci_cfg_reg(DM365_EVT2_ASP_TX); + davinci_cfg_reg(DM365_EVT3_ASP_RX); + dm365_asp_device.dev.platform_data = pdata; + platform_device_register(&dm365_asp_device); +} + void __init dm365_init(void) { davinci_common_init(&davinci_soc_info_dm365); diff --git a/arch/arm/mach-davinci/include/mach/asp.h b/arch/arm/mach-davinci/include/mach/asp.h index 18e4ce3..fbcbed0 100644 --- a/arch/arm/mach-davinci/include/mach/asp.h +++ b/arch/arm/mach-davinci/include/mach/asp.h @@ -15,6 +15,9 @@ #define DAVINCI_DM646X_MCASP0_REG_BASE 0x01D01000 #define DAVINCI_DM646X_MCASP1_REG_BASE 0x01D01800 +/* Bases of dm365 register banks */ +#define DAVINCI_DM365_ASP0_BASE 0x01D02000 + /* Bases of da850/da830 McASP0 register banks */ #define DAVINCI_DA8XX_MCASP0_REG_BASE 0x01D00000 diff --git a/arch/arm/mach-davinci/include/mach/dm365.h b/arch/arm/mach-davinci/include/mach/dm365.h index 09db434..2291c0d 100644 --- a/arch/arm/mach-davinci/include/mach/dm365.h +++ b/arch/arm/mach-davinci/include/mach/dm365.h @@ -16,6 +16,7 @@ #include <linux/platform_device.h> #include <mach/hardware.h> #include <mach/emac.h> +#include <mach/asp.h> #define DM365_EMAC_BASE (0x01D07000) #define DM365_EMAC_CNTRL_OFFSET (0x0000) @@ -25,5 +26,6 @@ #define DM365_EMAC_CNTRL_RAM_SIZE (0x2000) void __init dm365_init(void); +void __init dm365_init_asp(struct snd_platform_data *pdata); #endif /* __ASM_ARCH_DM365_H */ -- 1.6.0.4

2 1

[alsa-devel] [PATCH v2 2/2] ASoC: Davinci: Add audio codec support for DM365 EVM
by miguel.aguilar＠ridgerun.com 29 Aug '09

29 Aug '09

From: Miguel Aguilar <miguel.aguilar(a)ridgerun.com> This patch enables tlv320aic3101 support on DM365 EVM and it was tested on DM365 EVM rev c. Signed-off-by: Miguel Aguilar <miguel.aguilar(a)ridgerun.com> --- sound/soc/davinci/Kconfig | 9 +++++++++ sound/soc/davinci/Makefile | 1 + sound/soc/davinci/davinci-evm.c | 29 +++++++++++++++++++++++++++-- 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig index 6802dd5..b78b882 100644 --- a/sound/soc/davinci/Kconfig +++ b/sound/soc/davinci/Kconfig @@ -32,6 +32,15 @@ config SND_DM6467_SOC_EVM help Say Y if you want to add support for SoC audio on TI +config SND_DM365_SOC_EVM + tristate "SoC Audio support for DaVinci DM365 EVM" + depends on SND_DAVINCI_SOC && MACH_DAVINCI_DM365_EVM + select SND_DAVINCI_SOC_I2S + select SND_SOC_TLV320AIC3X + + help + Say Y if you want to add support for SoC audio on TI + config SND_DAVINCI_SOC_SFFSDR tristate "SoC Audio support for SFFSDR" depends on SND_DAVINCI_SOC && MACH_SFFSDR diff --git a/sound/soc/davinci/Makefile b/sound/soc/davinci/Makefile index 67be54f..8238612 100644 --- a/sound/soc/davinci/Makefile +++ b/sound/soc/davinci/Makefile @@ -13,4 +13,5 @@ snd-soc-sffsdr-objs := davinci-sffsdr.o obj-$(CONFIG_SND_DAVINCI_SOC_EVM) += snd-soc-evm.o obj-$(CONFIG_SND_DM6467_SOC_EVM) += snd-soc-evm.o +obj-$(CONFIG_SND_DM365_SOC_EVM) += snd-soc-evm.o obj-$(CONFIG_SND_DAVINCI_SOC_SFFSDR) += snd-soc-sffsdr.o diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index f3bb6f6..a859208 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c @@ -44,7 +44,8 @@ static int evm_hw_params(struct snd_pcm_substream *substream, unsigned sysclk; /* ASP1 on DM355 EVM is clocked by an external oscillator */ - if (machine_is_davinci_dm355_evm() || machine_is_davinci_dm6467_evm()) + if (machine_is_davinci_dm355_evm() || machine_is_davinci_dm6467_evm() + || machine_is_davinci_dm365_evm()) sysclk = 27000000; /* ASP0 in DM6446 EVM is clocked by U55, as configured by @@ -179,6 +180,14 @@ static struct snd_soc_card dm6467_snd_soc_card_evm = { .num_links = ARRAY_SIZE(dm6467_evm_dai), }; +/* davinci dm365 evm audio machine driver */ +static struct snd_soc_card dm365_snd_soc_card_evm = { + .name = "DaVinci DM365 EVM", + .platform = &davinci_soc_platform, + .dai_link = &evm_dai, + .num_links = 1, +}; + /* evm audio private data */ static struct aic3x_setup_data evm_aic3x_setup = { .i2c_bus = 1, @@ -191,6 +200,12 @@ static struct aic3x_setup_data dm6467_evm_aic3x_setup = { .i2c_address = 0x18, }; +/* dm365 evm audio private data */ +static struct aic3x_setup_data dm365_evm_aic3x_setup = { + .i2c_bus = 1, + .i2c_address = 0x18, +}; + /* evm audio subsystem */ static struct snd_soc_device evm_snd_devdata = { .card = &snd_soc_card_evm, @@ -198,13 +213,20 @@ static struct snd_soc_device evm_snd_devdata = { .codec_data = &evm_aic3x_setup, }; -/* evm audio subsystem */ +/* dm6467 evm audio subsystem */ static struct snd_soc_device dm6467_evm_snd_devdata = { .card = &dm6467_snd_soc_card_evm, .codec_dev = &soc_codec_dev_aic3x, .codec_data = &dm6467_evm_aic3x_setup, }; +/* dm365 evm audio subsystem */ +static struct snd_soc_device dm365_evm_snd_devdata = { + .card = &dm365_snd_soc_card_evm, + .codec_dev = &soc_codec_dev_aic3x, + .codec_data = &dm365_evm_aic3x_setup, +}; + static struct platform_device *evm_snd_device; static int __init evm_init(void) @@ -222,6 +244,9 @@ static int __init evm_init(void) } else if (machine_is_davinci_dm6467_evm()) { evm_snd_dev_data = &dm6467_evm_snd_devdata; index = 0; + }else if (machine_is_davinci_dm365_evm()) { + evm_snd_dev_data = &dm365_evm_snd_devdata; + index = 0; } else return -EINVAL; -- 1.6.0.4

1 0

[alsa-devel] ASoC: at91sam9260-PCM1808/TAS5709-based board driver
by Pedro Sanchez 29 Aug '09

29 Aug '09

Hello, I have to develop a driver for a custom board based on the at91sam9260 with a PCM1808/TAS5709 chipset combo. I am addressing the PCM1808 first because it is a simpler device. Since I'm new to ASoC I'm looking for some help in this list on how to go about writing this driver. So far I have identified two files that I need to work on (other than the needed kconfig modifications). First is the codec driver at sound/soc/codecs/PCM1808.[c|h] which is based on the existent pcm3008 driver; I believe I'm fine with this. The second file is the machine driver at sound/soc/atmel/myBoard.c. I'm using sam9g20_wm8731.c as reference, on which I believe I found a typo which I reported in a separated e-mail. So my first question is, is this two-files step the right approach? am I in the right track? I'm using the 2.6.30 kernel. Other questions will come and I hope I will get some cycles from you to help me direct my work. Of course I'll be glad to submit my driver work for inclusion in the kernel if it proves useful. Regards, -- Pedro

5 16

[alsa-devel] [PATCH 1/2] Davinci: DM365: Add platform device for McBSP
by miguel.aguilar＠ridgerun.com 28 Aug '09

28 Aug '09

From: Miguel Aguilar <miguel.aguilar(a)ridgerun.com> 1) Registers the platform device for McBSP on DM365. 2) Add platform data to DM365 EVM board file. Signed-off-by: Miguel Aguilar <miguel.aguilar(a)ridgerun.com> --- arch/arm/mach-davinci/board-dm365-evm.c | 4 ++ arch/arm/mach-davinci/dm365.c | 42 +++++++++++++++++++++++++++- arch/arm/mach-davinci/include/mach/asp.h | 3 ++ arch/arm/mach-davinci/include/mach/dm365.h | 2 + 4 files changed, 50 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c index f6adf79..fd2db78 100644 --- a/arch/arm/mach-davinci/board-dm365-evm.c +++ b/arch/arm/mach-davinci/board-dm365-evm.c @@ -177,6 +177,8 @@ static struct at24_platform_data eeprom_info = { .context = (void *)0x7f00, }; +static struct snd_platform_data dm365_evm_snd_data; + static struct i2c_board_info i2c_info[] = { { I2C_BOARD_INFO("dm365evm_keys", 0x25), @@ -476,6 +478,8 @@ static __init void dm365_evm_init(void) /* maybe setup mmc1/etc ... _after_ mmc0 */ evm_init_cpld(); + + dm365_init_asp(&dm365_evm_snd_data); } static __init void dm365_evm_irq_init(void) diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index e815174..cba09b0 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -32,6 +32,7 @@ #include <mach/time.h> #include <mach/serial.h> #include <mach/common.h> +#include <mach/asp.h> #include "clock.h" #include "mux.h" @@ -456,7 +457,7 @@ static struct davinci_clk dm365_clks[] = { CLK(NULL, "usb", &usb_clk), CLK("davinci_emac.1", NULL, &emac_clk), CLK("voice_codec", NULL, &voicecodec_clk), - CLK("soc-audio.0", NULL, &asp0_clk), + CLK("davinci-asp.0", NULL, &asp0_clk), CLK(NULL, "rto", &rto_clk), CLK(NULL, "mjcp", &mjcp_clk), CLK(NULL, NULL, NULL), @@ -806,6 +807,31 @@ static struct platform_device dm365_edma_device = { .resource = edma_resources, }; +static struct resource dm365_asp_resources[] = { + { + .start = DAVINCI_DM365_ASP0_BASE, + .end = DAVINCI_DM365_ASP0_BASE + SZ_8K - 1, + .flags = IORESOURCE_MEM, + }, + { + .start = DAVINCI_DMA_ASP0_TX, + .end = DAVINCI_DMA_ASP0_TX, + .flags = IORESOURCE_DMA, + }, + { + .start = DAVINCI_DMA_ASP0_RX, + .end = DAVINCI_DMA_ASP0_RX, + .flags = IORESOURCE_DMA, + }, +}; + +static struct platform_device dm365_asp_device = { + .name = "davinci-asp", + .id = 0, + .num_resources = ARRAY_SIZE(dm365_asp_resources), + .resource = dm365_asp_resources, +}; + static struct map_desc dm365_io_desc[] = { { .virtual = IO_VIRT, @@ -907,6 +933,20 @@ static struct davinci_soc_info davinci_soc_info_dm365 = { .sram_len = SZ_32K, }; +void __init dm365_init_asp(struct snd_platform_data *pdata) +{ + davinci_cfg_reg(DM365_MCBSP0_BDX); + davinci_cfg_reg(DM365_MCBSP0_X); + davinci_cfg_reg(DM365_MCBSP0_BFSX); + davinci_cfg_reg(DM365_MCBSP0_BDR); + davinci_cfg_reg(DM365_MCBSP0_R); + davinci_cfg_reg(DM365_MCBSP0_BFSR); + davinci_cfg_reg(DM365_EVT2_ASP_TX); + davinci_cfg_reg(DM365_EVT3_ASP_RX); + dm365_asp_device.dev.platform_data = pdata; + platform_device_register(&dm365_asp_device); +} + void __init dm365_init(void) { davinci_common_init(&davinci_soc_info_dm365); diff --git a/arch/arm/mach-davinci/include/mach/asp.h b/arch/arm/mach-davinci/include/mach/asp.h index 18e4ce3..fbcbed0 100644 --- a/arch/arm/mach-davinci/include/mach/asp.h +++ b/arch/arm/mach-davinci/include/mach/asp.h @@ -15,6 +15,9 @@ #define DAVINCI_DM646X_MCASP0_REG_BASE 0x01D01000 #define DAVINCI_DM646X_MCASP1_REG_BASE 0x01D01800 +/* Bases of dm365 register banks */ +#define DAVINCI_DM365_ASP0_BASE 0x01D02000 + /* Bases of da850/da830 McASP0 register banks */ #define DAVINCI_DA8XX_MCASP0_REG_BASE 0x01D00000 diff --git a/arch/arm/mach-davinci/include/mach/dm365.h b/arch/arm/mach-davinci/include/mach/dm365.h index 09db434..2291c0d 100644 --- a/arch/arm/mach-davinci/include/mach/dm365.h +++ b/arch/arm/mach-davinci/include/mach/dm365.h @@ -16,6 +16,7 @@ #include <linux/platform_device.h> #include <mach/hardware.h> #include <mach/emac.h> +#include <mach/asp.h> #define DM365_EMAC_BASE (0x01D07000) #define DM365_EMAC_CNTRL_OFFSET (0x0000) @@ -25,5 +26,6 @@ #define DM365_EMAC_CNTRL_RAM_SIZE (0x2000) void __init dm365_init(void); +void __init dm365_init_asp(struct snd_platform_data *pdata); #endif /* __ASM_ARCH_DM365_H */ -- 1.6.0.4

2 1