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

[alsa-devel] /dev/snd/timer behavior
by Ron Cococcia 16 Apr '09

16 Apr '09

Hello, We have been attempting to debug an issue that we have been having for a few weeks related to audio playback. Specifically, over time, the playback of audio gets 'stuck' for a while (60 seconds or so), then quickly advances forward again (for about 60 seconds), then gets stuck again. It continues to repeat this until I either stop playback or pause/play. We have dubbed it 'skip-lock' as it skips ahead, then locks for a bit. It takes a while to reproduce this behavior, typically around 6 hours. We have about 30 of these systems setup, each with the same hardware configuration. They have a VIA C7 CPU (1.5GHz), 1GB RAM, and they are using the VIA 8233A AC97 controller with an ALC655 codec. The system is SATA based (using sata_via), and an RTL8110 gigabit ethernet controller (using rtl8169). For the OS, we are using Debian Etch with the 2.6.29 kernel, and we have tested a number of these units with 2.6.24-etchnhalf as well. ALSA lib 1.0.13 (from the install) is still in use, but I am trying out 1.0.19 on a few of the units to see if it helps. The player we use is called BlueTune, which we have used in older systems for years without trouble. I plan on trying to set up another player app to do the same testing, but haven't had the time to do that yet. On most of the systems, the player is using the default alsa output. I have configured a few systems to use plughw:0,0,0 for playback (mainly so that /dev/snd/timer is not used), and they have not had any playback issues so far (about 24 hours so far). After a bunch of other tests, we started to run strace against the player. We saw that it was repeatedly getting EAGAIN when reading from /dev/snd/timer during the 'stuck' phase. I have started to poke around a bit more in the timer code and see why EAGAIN is repeatedly being generated (in snd_timer_user_read, tu->qused is stuck at 0 for a while). I figured that if anybody had some things to try or places to look, it might save a bit of time in finding the cause of this issue. Thanks! Ron PS: I apologize if this is the wrong place to post this. I had posted a not-terribly-detailed message to alsa-user a few weeks ago, but have gained more data that I felt fit better here.

1 0

[alsa-devel] /proc/asound/* shows signs of life, but alsactl see's nothing
by Justin Mattock 16 Apr '09

16 Apr '09

This is confusing to me (with or without the imac9,1 patch for the imac) there is still entries in /proc/asound lrwxrwxrwx 1 root root 5 Apr 15 22:49 NVidia -> card0 dr-xr-xr-x 7 root root 0 Apr 15 22:49 card0 -r--r--r-- 1 root root 0 Apr 15 22:49 cards -r--r--r-- 1 root root 0 Apr 15 22:49 devices -r--r--r-- 1 root root 0 Apr 15 22:49 hwdep -r--r--r-- 1 root root 0 Apr 15 22:49 pcm -r--r--r-- 1 root root 0 Apr 15 22:49 timers -r--r--r-- 1 root root 0 Apr 15 22:49 version but when I do: sudo /usr/sbin/alsactl store /usr/sbin/alsactl: save_state:1502: No soundcards found... I this a software issue, or is this because the kernel is missing something important in patch_realtek.c ? I've moved different things around in patch_realtek.c but still no speaker sound or headphone, not even the sound during boot when the module is being loaded. Also what is the best way to find PCI SSID? under codec#0:(I have) Codec: Realtek ALC889A Address: 0 Vendor Id: 0x10ec0885 Subsystem Id: 0x106b4900 Revision Id: 0x100103 No Modem Function Group found but with lspci -nnv 00:08.0 0403: 10de:0ac0 (rev b1) Subsystem: 10de:cb79 Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap+ 66MHz+ UDF- FastB2B+ ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0 (500ns min, 1250ns max) Interrupt: pin A routed to IRQ 17 Region 0: Memory at d3480000 (32-bit, non-prefetchable) [size=16K] Capabilities: <access denied> Kernel driver in use: HDA Intel Kernel modules: snd-hda-intel the subsystem is 10de:cb79 but is Subsystem Id: 0x106b4900 regards, -- Justin P. Mattock

2 4

[alsa-devel] [PATCH] hdspm: native float
by Florian Faber 16 Apr '09

16 Apr '09

Adds native float support to the driver. The interface has hardware support for CoreAudio[tm], why shouldn't jack users benefit from it. diff a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c 13a14,16 > * Modified 2009-04-14 for native float support by Florian Faber > * <faber(a)faberman.de> > * 39a43 > #include <sound/pcm_params.h> 198a203 > #define HDSPe_FLOAT_FORMAT 0x2000000 3726a3732,3747 > > > /* Switch to native float format if requested */ > if (SNDRV_PCM_FORMAT_FLOAT_LE == params_format(params)) { > if (!(hdspm->control_register & HDSPe_FLOAT_FORMAT)) { > snd_printk(KERN_INFO "hdspm: Switching to native 32bit LE float format.\n"); > } > hdspm->control_register |= HDSPe_FLOAT_FORMAT; > } else if (SNDRV_PCM_FORMAT_S32_LE == params_format(params)) { > if (hdspm->control_register & HDSPe_FLOAT_FORMAT) { > snd_printk(KERN_INFO "hdspm: Switching to native 32bit LE integer format.\n"); > } > hdspm->control_register &= ~HDSPe_FLOAT_FORMAT; > } > hdspm_write(hdspm, HDSPM_controlRegister, hdspm->control_register); > 3870c3891 < .formats = SNDRV_PCM_FMTBIT_S32_LE, --- > .formats = SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_FLOAT_LE, 3895c3916 < .formats = SNDRV_PCM_FMTBIT_S32_LE, --- > .formats = SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_FLOAT_LE, Flo -- Machines can do the work, so people have time to think. public key 6C002249 x-hkp://wwwkeys.eu.pgp.net

6 8

[alsa-devel] [PATCH v2 2/6] ARM: DaVinci: ASoC: Add the platform devices for ASP
by Naresh Medisetty 16 Apr '09

16 Apr '09

1)Registers the platform devices for ASP on dm355, dm644x and dm646x so that the machine driver can probe to get ASP related platform data. 2)Move towards definition of the asp clocks using phyisical name(for dm355 and dm644x) Signed-off-by: Naresh Medisetty <naresh(a)ti.com> --- This patch applies to the DaVinci git tree available at http://git.kernel.org/?p=linux/kernel/git/khilman/linux-davinci.git arch/arm/mach-davinci/dm355.c | 29 ++++++++++++- arch/arm/mach-davinci/dm644x.c | 27 +++++++++++- arch/arm/mach-davinci/dm646x.c | 67 ++++++++++++++++++++++++++++++ arch/arm/mach-davinci/include/mach/asp.h | 39 ++++++++++++++++- 4 files changed, 157 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index c20211c..222c3f3 100755 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -23,6 +23,7 @@ #include <mach/psc.h> #include <mach/mux.h> #include <mach/irqs.h> +#include <mach/asp.h> #include "clock.h" #include "mux.h" @@ -351,8 +352,8 @@ static struct davinci_clk dm355_clks[] = { CLK(NULL, "uart1", &uart1_clk), CLK(NULL, "uart2", &uart2_clk), CLK("i2c_davinci.1", NULL, &i2c_clk), - CLK("soc-audio.0", NULL, &asp0_clk), - CLK("soc-audio.1", NULL, &asp1_clk), + CLK(NULL, "asp0", &asp0_clk), + CLK(NULL, "asp1", &asp1_clk), CLK("davinci_mmc.0", NULL, &mmcsd0_clk), CLK("davinci_mmc.1", NULL, &mmcsd1_clk), CLK(NULL, "spi0", &spi0_clk), @@ -540,6 +541,29 @@ static struct platform_device dm355_edma_device = { .resource = edma_resources, }; +/* DM335 EVM uses ASP1; line-out is a stereo mini-jack */ +static struct resource dm355_evm_snd_resources[] = { + { + .start = DAVINCI_ASP1_BASE, + .end = DAVINCI_ASP1_BASE + SZ_8K - 1, + .flags = IORESOURCE_MEM, + }, +}; + +static struct evm_snd_platform_data dm355_evm_snd_data = { + .clk_name = "asp1", + .tx_dma_ch = DAVINCI_DMA_ASP1_TX, + .rx_dma_ch = DAVINCI_DMA_ASP1_RX, +}; + +static struct platform_device dm355_asoc_device = { + .name = "davinci-asoc", + .id = -1, + .dev.platform_data = &dm355_evm_snd_data, + .num_resources = ARRAY_SIZE(dm355_evm_snd_resources), + .resource = dm355_evm_snd_resources, +}; + /*----------------------------------------------------------------------*/ void __init dm355_init(void) @@ -555,6 +579,7 @@ static int __init dm355_init_devices(void) davinci_cfg_reg(DM355_INT_EDMA_CC); platform_device_register(&dm355_edma_device); + platform_device_register(&dm355_asoc_device); return 0; } postcore_initcall(dm355_init_devices); diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index 9878c17..01112ca 100755 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -20,6 +20,7 @@ #include <mach/irqs.h> #include <mach/psc.h> #include <mach/mux.h> +#include <mach/asp.h> #include "clock.h" #include "mux.h" @@ -296,7 +297,7 @@ struct davinci_clk dm644x_clks[] = { CLK("davinci_emac.1", NULL, &emac_clk), CLK("i2c_davinci.1", NULL, &i2c_clk), CLK("palm_bk3710", NULL, &ide_clk), - CLK("soc-audio.0", NULL, &asp_clk), + CLK(NULL, "asp0", &asp_clk), CLK("davinci_mmc.0", NULL, &mmcsd_clk), CLK(NULL, "spi", &spi_clk), CLK(NULL, "gpio", &gpio_clk), @@ -463,6 +464,29 @@ static struct platform_device dm644x_edma_device = { .resource = edma_resources, }; +/* DM6446 EVM uses ASP0; line-out is a pair of RCA jacks */ +static struct resource dm644x_evm_snd_resources[] = { + { + .start = DAVINCI_ASP0_BASE, + .end = DAVINCI_ASP0_BASE + SZ_8K - 1, + .flags = IORESOURCE_MEM, + }, +}; + +static struct evm_snd_platform_data dm644x_evm_snd_data = { + .clk_name = "asp0", + .tx_dma_ch = DAVINCI_DMA_ASP0_TX, + .rx_dma_ch = DAVINCI_DMA_ASP0_RX, +}; + +static struct platform_device dm644x_asoc_device = { + .name = "davinci-asoc", + .id = -1, + .dev.platform_data = &dm644x_evm_snd_data, + .num_resources = ARRAY_SIZE(dm644x_evm_snd_resources), + .resource = dm644x_evm_snd_resources, +}; + /*----------------------------------------------------------------------*/ #if defined(CONFIG_TI_DAVINCI_EMAC) || defined(CONFIG_TI_DAVINCI_EMAC_MODULE) @@ -495,6 +519,7 @@ static int __init dm644x_init_devices(void) return 0; platform_device_register(&dm644x_edma_device); + platform_device_register(&dm644x_asoc_device); return 0; } postcore_initcall(dm644x_init_devices); diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index 39ffd17..bb8c65a 100755 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -20,6 +20,7 @@ #include <mach/irqs.h> #include <mach/psc.h> #include <mach/mux.h> +#include <mach/asp.h> #include "clock.h" #include "mux.h" @@ -499,6 +500,70 @@ static struct platform_device dm646x_edma_device = { .resource = edma_resources, }; +static u8 dm6467_iis_serializer_direction[] = { + TX_MODE, RX_MODE, INACTIVE_MODE, INACTIVE_MODE, +}; + +static u8 dm6467_dit_serializer_direction[] = { + TX_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, +}; + +static struct evm_snd_platform_data dm6467_evm_snd_data[] = { + { + .clk_name = "mcasp0", + .tx_dma_ch = DAVINCI_DM646X_DMA_MCASP0_AXEVT0, + .rx_dma_ch = DAVINCI_DM646X_DMA_MCASP0_AREVT0, + .tx_dma_offset = 0x400, + .rx_dma_offset = 0x400, + .op_mode = DAVINCI_MCASP_IIS_MODE, + .num_serializer = 4, + .tdm_slots = 2, + .serial_dir = dm6467_iis_serializer_direction, + .eventq_no = EVENTQ_0, + }, + { + .clk_name = "mcasp1", + .tx_dma_ch = DAVINCI_DM646X_DMA_MCASP1_AXEVT1, + .rx_dma_ch = -1, + .tx_dma_offset = 0x400, + .rx_dma_offset = 0, + .op_mode = DAVINCI_MCASP_DIT_MODE, + .num_serializer = 4, + .tdm_slots = 32, + .serial_dir = dm6467_dit_serializer_direction, + .eventq_no = EVENTQ_0, + }, +}; + +static struct resource dm6467_evm_snd_resources[] = { + { + .name = "mcasp0", + .start = DAVINCI_DM646X_MCASP0_REG_BASE, + .end = DAVINCI_DM646X_MCASP0_REG_BASE + (SZ_1K << 1) - 1, + .flags = IORESOURCE_MEM, + }, + { + .name = "mcasp1", + .start = DAVINCI_DM646X_MCASP1_REG_BASE, + .end = DAVINCI_DM646X_MCASP1_REG_BASE + (SZ_1K << 1) - 1, + .flags = IORESOURCE_MEM, + }, +}; + +static struct platform_device dm646x_asoc_device = { + .name = "davinci-asoc", + .id = -1, + .dev.platform_data = dm6467_evm_snd_data, + .num_resources = ARRAY_SIZE(dm6467_evm_snd_resources), + .resource = dm6467_evm_snd_resources, +}; + +static struct platform_device dm646x_dit_device = { + .name = "davinci-dit", + .id = -1, + +}; + /*----------------------------------------------------------------------*/ #if defined(CONFIG_TI_DAVINCI_EMAC) || defined(CONFIG_TI_DAVINCI_EMAC_MODULE) @@ -532,6 +597,8 @@ static int __init dm646x_init_devices(void) return 0; platform_device_register(&dm646x_edma_device); + platform_device_register(&dm646x_asoc_device); + platform_device_register(&dm646x_dit_device); return 0; } postcore_initcall(dm646x_init_devices); diff --git a/arch/arm/mach-davinci/include/mach/asp.h b/arch/arm/mach-davinci/include/mach/asp.h index e0abc43..1bb1f0b 100644 --- a/arch/arm/mach-davinci/include/mach/asp.h +++ b/arch/arm/mach-davinci/include/mach/asp.h @@ -5,21 +5,56 @@ #define __ASM_ARCH_DAVINCI_ASP_H #include <mach/irqs.h> +#include <mach/edma.h> -/* Bases of register banks */ +/* Bases of dm644x and dm355 register banks */ #define DAVINCI_ASP0_BASE 0x01E02000 #define DAVINCI_ASP1_BASE 0x01E04000 -/* EDMA channels */ + +/* Bases of dm646x register banks */ +#define DAVINCI_DM646X_MCASP0_REG_BASE 0x01D01000 +#define DAVINCI_DM646X_MCASP1_REG_BASE 0x01D01800 + +/* EDMA channels of dm644x and dm355 */ #define DAVINCI_DMA_ASP0_TX 2 #define DAVINCI_DMA_ASP0_RX 3 #define DAVINCI_DMA_ASP1_TX 8 #define DAVINCI_DMA_ASP1_RX 9 + +/* EDMA channels of dm646x */ +#define DAVINCI_DM646X_DMA_MCASP0_AXEVT0 6 +#define DAVINCI_DM646X_DMA_MCASP0_AREVT0 9 +#define DAVINCI_DM646X_DMA_MCASP1_AXEVT1 12 /* Interrupts */ #define DAVINCI_ASP0_RX_INT IRQ_MBRINT #define DAVINCI_ASP0_TX_INT IRQ_MBXINT #define DAVINCI_ASP1_RX_INT IRQ_MBRINT #define DAVINCI_ASP1_TX_INT IRQ_MBXINT +struct evm_snd_platform_data { + char *clk_name; + int tx_dma_ch; + int rx_dma_ch; + u32 tx_dma_offset; + u32 rx_dma_offset; + enum dma_event_q eventq_no; /* event queue number */ + unsigned int codec_fmt; + + /* McASP specific fields */ + int tdm_slots; + u8 op_mode; + u8 num_serializer; + u8 *serial_dir; +}; + +#define INACTIVE_MODE 0 +#define TX_MODE 1 +#define RX_MODE 2 + +#define DAVINCI_MCASP_IIS_MODE 0 +#define DAVINCI_MCASP_DIT_MODE 1 + + #endif /* __ASM_ARCH_DAVINCI_ASP_H */ -- 1.5.6

3 2

Re: [alsa-devel] 15 April unstable does not handle wave-in
by Susan Cragin 16 Apr '09

16 Apr '09

>Works perfectly. Thank you. >Susan > > Whoops. Spoke too soon. Does not save alsa settings. They have to be re-set after each boot. Susan

1 0

Re: [alsa-devel] 15 April unstable does not handle wave-in
by Susan Cragin 16 Apr '09

16 Apr '09

>> Meanwhile, if ca0110 worked fine with unstable tree before, it means that the hda-ca0110 patch can go in to the sound git tree. This would be a better option for both of us. >> >> Now I merged hda-ca0110 patch to sound git tree. >> So alsa-driver snapshot (no unstable version) should work for your >> CA0110 board. Give it a try. >Takashi Works perfectly. Thank you. Susan

1 0

[alsa-devel] No sound with Creative Labs CA0106 Soundblaster
by Bernhard Posselt 16 Apr '09

16 Apr '09

Hi, some months ago i bought a new soundcard for my PC which costed 20€. This card is not working. Im using Kubuntu Jaunty Beta, its a fresh install from the beta iso. I also upgraded the alsadrivers with this package http://ftp.kernel.org/pub/linux/kernel/people/tiwai/snapshot/alsa-driver-sn… Still no sound Heres my bug report: https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4490 I hope you can help me regards Ray -- Psssst! Schon vom neuen GMX MultiMessenger gehört? Der kann`s mit allen: http://www.gmx.net/de/go/multimessenger01

2 1

[alsa-devel] ASoC updates for 2.6.31
by Mark Brown 16 Apr '09

16 Apr '09

The following changes since commit 6967963d6d5cac40a091d075326f0e3ccb95c58a: Mark Brown (1): Merge branch 'for-2.6.30' into for-2.6.31 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.31 Ben Dooks (4): ASoC: Fix jive_wm8750.c build problems ASoC: s3c-i2s-v2.c fix for s3c_i2sv2_iis_calc_rate ASoC: Fix s3c-i2s-v2.c snd_soc_dai changes ASoC: Fix include build error in s3c2412-i2s.c Daniel Mack (1): ASoC: pxa-ssp: allow setting of dai format 0 Jarkko Nikula (2): ASoC: OMAP: Fix DSP_B format in OMAP McBSP DAI driver ASoC: OMAP: Fix FS polarity in OSK5912 machine driver Mark Brown (4): ASoC: Check we have DAI ops when calling via accessor functions ASoC: Volume controls are never of boolean type ASoC: Request shared rates for WM8903 Merge branch 'for-2.6.30' into for-2.6.31 Peter Ujfalusi (2): ASoC: OMAP: Use single-phase for DSP mode ASoC: OMAP: Add DSP_A mode support for mcbsp sound/soc/codecs/wm8903.c | 1 + sound/soc/omap/omap-mcbsp.c | 45 ++++++++++++++++++++++++++------------ sound/soc/omap/osk5912.c | 4 +- sound/soc/pxa/pxa-ssp.c | 1 + sound/soc/s3c24xx/jive_wm8750.c | 12 +++++----- sound/soc/s3c24xx/s3c-i2s-v2.c | 18 ++++++++------- sound/soc/s3c24xx/s3c2412-i2s.c | 2 +- sound/soc/soc-core.c | 20 ++++++++-------- 8 files changed, 62 insertions(+), 41 deletions(-)

2 1

[alsa-devel] ASoC updates for 2.6.30
by Mark Brown 16 Apr '09

16 Apr '09

The following changes since commit 9dd175f7d2db1826c891855d3d150da3a5792e94: Takashi Iwai (1): Merge branch 'topic/hda' into for-linus are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.30 Ben Dooks (4): ASoC: Fix jive_wm8750.c build problems ASoC: s3c-i2s-v2.c fix for s3c_i2sv2_iis_calc_rate ASoC: Fix s3c-i2s-v2.c snd_soc_dai changes ASoC: Fix include build error in s3c2412-i2s.c Daniel Mack (1): ASoC: pxa-ssp: allow setting of dai format 0 Jarkko Nikula (2): ASoC: OMAP: Fix DSP_B format in OMAP McBSP DAI driver ASoC: OMAP: Fix FS polarity in OSK5912 machine driver sound/soc/omap/omap-mcbsp.c | 7 +++++-- sound/soc/omap/osk5912.c | 4 ++-- sound/soc/pxa/pxa-ssp.c | 1 + sound/soc/s3c24xx/jive_wm8750.c | 12 ++++++------ sound/soc/s3c24xx/s3c-i2s-v2.c | 18 ++++++++++-------- sound/soc/s3c24xx/s3c2412-i2s.c | 2 +- 6 files changed, 25 insertions(+), 19 deletions(-)

2 1

[alsa-devel] [PATCH v2 6/6] ARM: DaVinci: ASoC: Introduce platform driver model for dm644x, dm355
by Naresh Medisetty 16 Apr '09

16 Apr '09

From: Naresh.Medisetty <naresh(a)ti.com> Introduce the platform driver model to get platform data for dm355 and dm644x. Register platform driver and acquire the resources in the probe function Since the platform specific code had been moved from machine driver to dm<soc>.c Signed-off-by: Naresh Medisetty <naresh(a)ti.com> --- This patch applies against ALSA mainline - that's the topic/asoc branch of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git sound/soc/davinci/davinci-i2s.c | 97 +++++++++++++++++++++------------------ 1 files changed, 52 insertions(+), 45 deletions(-) diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c index ffdb943..f5cea59 100644 --- a/sound/soc/davinci/davinci-i2s.c +++ b/sound/soc/davinci/davinci-i2s.c @@ -416,16 +416,40 @@ static int davinci_i2s_trigger(struct snd_pcm_substream *substream, int cmd, return ret; } -static int davinci_i2s_probe(struct platform_device *pdev, - struct snd_soc_dai *dai) +#define DAVINCI_I2S_RATES SNDRV_PCM_RATE_8000_96000 + +static struct snd_soc_dai_ops davinci_i2s_dai_ops = { + .startup = davinci_i2s_startup, + .trigger = davinci_i2s_trigger, + .hw_params = davinci_i2s_hw_params, + .set_fmt = davinci_i2s_set_dai_fmt, + +}; + +struct snd_soc_dai davinci_i2s_dai = { + .name = "davinci-i2s", + .id = 0, + .playback = { + .channels_min = 2, + .channels_max = 2, + .rates = DAVINCI_I2S_RATES, + .formats = SNDRV_PCM_FMTBIT_S16_LE,}, + .capture = { + .channels_min = 2, + .channels_max = 2, + .rates = DAVINCI_I2S_RATES, + .formats = SNDRV_PCM_FMTBIT_S16_LE,}, + .ops = &davinci_i2s_dai_ops, + +}; +EXPORT_SYMBOL_GPL(davinci_i2s_dai); + +static int davinci_i2s_probe(struct platform_device *pdev) { - struct snd_soc_device *socdev = platform_get_drvdata(pdev); - struct snd_soc_card *card = socdev->card; - struct snd_soc_dai *cpu_dai = card->dai_link[pdev->id].cpu_dai; + int ret; struct davinci_mcbsp_dev *dev; struct resource *mem, *ioarea; - struct evm_snd_platform_data *pdata; - int ret; + struct evm_snd_platform_data *pdata = pdev->dev.platform_data;; mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!mem) { @@ -446,9 +470,7 @@ static int davinci_i2s_probe(struct platform_device *pdev, goto err_release_region; } - cpu_dai->private_data = dev; - - dev->clk = clk_get(&pdev->dev, "McBSPCLK"); + dev->clk = clk_get(&pdev->dev, pdata->clk_name); if (IS_ERR(dev->clk)) { ret = -ENODEV; goto err_free_mem; @@ -456,7 +478,6 @@ static int davinci_i2s_probe(struct platform_device *pdev, clk_enable(dev->clk); dev->base = (void __iomem *)IO_ADDRESS(mem->start); - pdata = pdev->dev.platform_data; dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK] = &davinci_i2s_pcm_out; dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK]->channel = pdata->tx_dma_ch; @@ -467,7 +488,10 @@ static int davinci_i2s_probe(struct platform_device *pdev, dev->dma_params[SNDRV_PCM_STREAM_CAPTURE]->channel = pdata->rx_dma_ch; dev->dma_params[SNDRV_PCM_STREAM_CAPTURE]->dma_addr = (dma_addr_t)(io_v2p(dev->base) + DAVINCI_MCBSP_DRR_REG); - + davinci_i2s_dai.private_data = dev; + ret = snd_soc_register_dai(&davinci_i2s_dai); + if (ret != 0) + goto err_free_mem; return 0; err_free_mem: @@ -478,15 +502,13 @@ err_release_region: return ret; } -static void davinci_i2s_remove(struct platform_device *pdev, - struct snd_soc_dai *dai) +static int davinci_i2s_remove(struct platform_device *pdev) { - struct snd_soc_device *socdev = platform_get_drvdata(pdev); - struct snd_soc_card *card = socdev->card; - struct snd_soc_dai *cpu_dai = card->dai_link[pdev->id].cpu_dai; - struct davinci_mcbsp_dev *dev = cpu_dai->private_data; + struct davinci_mcbsp_dev *dev = davinci_i2s_dai.private_data; struct resource *mem; + snd_soc_unregister_dai(&davinci_i2s_dai); + clk_disable(dev->clk); clk_put(dev->clk); dev->clk = NULL; @@ -495,45 +517,30 @@ static void davinci_i2s_remove(struct platform_device *pdev, mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); release_mem_region(mem->start, (mem->end - mem->start) + 1); + return 0; } -#define DAVINCI_I2S_RATES SNDRV_PCM_RATE_8000_96000 -static struct snd_soc_dai_ops davinci_i2s_dai_ops = { - .startup = davinci_i2s_startup, - .trigger = davinci_i2s_trigger, - .hw_params = davinci_i2s_hw_params, - .set_fmt = davinci_i2s_set_dai_fmt, +static struct platform_driver davinci_asoc_driver = { + .probe = davinci_i2s_probe, + .remove = davinci_i2s_remove, + .driver = { + .name = "davinci-asoc", + .owner = THIS_MODULE, + }, }; -struct snd_soc_dai davinci_i2s_dai = { - .name = "davinci-i2s", - .id = 0, - .probe = davinci_i2s_probe, - .remove = davinci_i2s_remove, - .playback = { - .channels_min = 2, - .channels_max = 2, - .rates = DAVINCI_I2S_RATES, - .formats = SNDRV_PCM_FMTBIT_S16_LE,}, - .capture = { - .channels_min = 2, - .channels_max = 2, - .rates = DAVINCI_I2S_RATES, - .formats = SNDRV_PCM_FMTBIT_S16_LE,}, - .ops = &davinci_i2s_dai_ops, -}; -EXPORT_SYMBOL_GPL(davinci_i2s_dai); - static int __init davinci_i2s_init(void) { - return snd_soc_register_dai(&davinci_i2s_dai); + return platform_driver_register(&davinci_asoc_driver); + } module_init(davinci_i2s_init); static void __exit davinci_i2s_exit(void) { - snd_soc_unregister_dai(&davinci_i2s_dai); + platform_driver_unregister(&davinci_asoc_driver); + } module_exit(davinci_i2s_exit); -- 1.5.6

2 1