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

[alsa-devel] [PATCH] alsa-lib: mixer/simple_none: fix softfloat compilation
by Manuel Lauss 15 Sep '09

15 Sep '09

mixer/simple_none.c uses HAVE_SOFT_FLOAT tests to work around sqrt() uses but the definition in config.h is never picked up, leading to link errors in libasound.so when built with --with-softfloat. Signed-off-by: Manuel Lauss <manuel.lauss(a)gmail.com> --- Tested on MIPS. The pcm_ladspa plugin still calls 'sqrt()' and should be excluded from the build if --with-softfloat is specified. src/mixer/mixer_simple.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/mixer/mixer_simple.h b/src/mixer/mixer_simple.h index e88b007..bc9d20c 100644 --- a/src/mixer/mixer_simple.h +++ b/src/mixer/mixer_simple.h @@ -19,6 +19,7 @@ * */ +#include <config.h> #include "mixer_abst.h" /* make local functions really local */ -- 1.6.5.rc1

1 0

[alsa-devel] [PATCH 1/2] ak4113 build support
by pavel.hofman＠ivitera.com 15 Sep '09

15 Sep '09

From: Pavel Hofman <pavel.hofman(a)ivitera.com> Signed-off-by: Pavel Hofman <pavel.hofman(a)ivitera.com> diff --git a/i2c/other/Makefile b/i2c/other/Makefile index 37f1603..a86990e 100644 --- a/i2c/other/Makefile +++ b/i2c/other/Makefile @@ -5,7 +5,7 @@ endif include $(SND_TOPDIR)/toplevel.config include $(SND_TOPDIR)/Makefile.conf -export-objs += ak4xxx-adda.o ak4114.o ak4117.o pt2258.o tea575x-tuner.o +export-objs += ak4xxx-adda.o ak4113.o ak4114.o ak4117.o pt2258.o tea575x-tuner.o include $(SND_TOPDIR)/alsa-kernel/i2c/other/Makefile diff --git a/i2c/other/ak4113.c b/i2c/other/ak4113.c new file mode 100644 index 0000000..41cb4ce --- /dev/null +++ b/i2c/other/ak4113.c @@ -0,0 +1,2 @@ +#include "adriver.h" +#include "../../alsa-kernel/i2c/other/ak4113.c" diff --git a/utils/insert b/utils/insert index af911d1..bfbbb83 100755 --- a/utils/insert +++ b/utils/insert @@ -395,6 +395,7 @@ case "$1" in #insert snd-i2c$SUFF #insert snd-cs8427$SUFF insert snd-ak4114$SUFF + insert snd-ak4113$SUFF insert snd-ak4xxx-adda$SUFF insert snd-ice17xx-ak4xxx$SUFF insert snd-ice1724$SUFF enable=1,1 -- 1.5.6.3

1 1

[alsa-devel] Support for Infrasonic Quartet
by Pavel Hofman 15 Sep '09

15 Sep '09

Hi Takashi, I am sending patches for Infrasonic Quartet. The card has three external clock modes therefore I had to modify ice1724.c to support multiple spdif_master types. While working on the driver, I did some minor fixes to ak4xxx-adda.c too. For proc files I added a conversion function from int to string representing its binary format (quartet.c:get_binary). If you know of an existing utility, please let me know and I will use it instead. The binary output helps a lot with debugging. The quartet patch does not comply with checkpatch.pl in 2.6.27 since the script throws a false positive for [] in #define. Thanks a lot for comments. Best regards, Pavel.

1 0

[alsa-devel] [PATCH] RFC: ASoC: Davinci: Fix data_type divide by zero
by Troy Kisky 15 Sep '09

15 Sep '09

This is a proposed fix for the data_type divide by 0 error. Signed-off-by: Troy Kisky <troy.kisky(a)boundarydevices.com> --- This applies on top of my last patchset to Kevin's temp/asoc branch sound/soc/davinci/davinci-i2s.c | 18 +++++++----------- sound/soc/davinci/davinci-mcasp.h | 7 ++++++- sound/soc/davinci/davinci-pcm.c | 14 ++++++-------- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c index 5f61016..252c3ea 100644 --- a/sound/soc/davinci/davinci-i2s.c +++ b/sound/soc/davinci/davinci-i2s.c @@ -123,13 +123,18 @@ static struct davinci_pcm_dma_params davinci_i2s_pcm_in = { }; struct davinci_mcbsp_dev { + /* + * dma_params must be first because rtd->dai->cpu_dai->private_data + * is cast to an array of struct davinci_pcm_dma_params ** in + * davinci_pcm_open. + */ + struct davinci_pcm_dma_params *dma_params[2]; void __iomem *base; #define MOD_DSP_A 0 #define MOD_DSP_B 1 int mode; u32 pcr; struct clk *clk; - struct davinci_pcm_dma_params *dma_params[2]; /* * Combining both channels into 1 element will at least double the * amount of time between servicing the dma channel, increase @@ -255,14 +260,6 @@ static void davinci_mcbsp_stop(struct davinci_mcbsp_dev *dev, int playback) toggle_clock(dev, playback); } -static int davinci_i2s_startup(struct snd_pcm_substream *substream, - struct snd_soc_dai *cpu_dai) -{ - struct davinci_mcbsp_dev *dev = cpu_dai->private_data; - cpu_dai->dma_data = dev->dma_params[substream->stream]; - return 0; -} - #define DEFAULT_BITPERSAMPLE 16 static int davinci_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai, @@ -393,7 +390,6 @@ static int davinci_i2s_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - struct davinci_pcm_dma_params *dma_params = dai->dma_data; struct davinci_mcbsp_dev *dev = dai->private_data; struct snd_soc_dai *codec_dai = dev->codec_dai; struct snd_interval *i = NULL; @@ -407,6 +403,7 @@ static int davinci_i2s_hw_params(struct snd_pcm_substream *substream, int right_first = 0; int convert_mono_stereo = 0; int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ? 1 : 0; + struct davinci_pcm_dma_params *dma_params = dev->dma_params[substream->stream]; i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_SAMPLE_BITS); bits_per_sample = snd_interval_value(i); @@ -529,7 +526,6 @@ static void davinci_i2s_shutdown(struct snd_pcm_substream *substream, #define DAVINCI_I2S_RATES SNDRV_PCM_RATE_8000_96000 static struct snd_soc_dai_ops davinci_i2s_dai_ops = { - .startup = davinci_i2s_startup, .shutdown = davinci_i2s_shutdown, .prepare = davinci_i2s_prepare, .trigger = davinci_i2s_trigger, diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h index 554354c..c6ea04d 100644 --- a/sound/soc/davinci/davinci-mcasp.h +++ b/sound/soc/davinci/davinci-mcasp.h @@ -39,10 +39,15 @@ enum { }; struct davinci_audio_dev { + /* + * dma_params must be first because rtd->dai->cpu_dai->private_data + * is cast to an array of struct davinci_pcm_dma_params ** in + * davinci_pcm_open. + */ + struct davinci_pcm_dma_params *dma_params[2]; void __iomem *base; int sample_rate; struct clk *clk; - struct davinci_pcm_dma_params *dma_params[2]; unsigned int codec_fmt; /* McASP specific data */ diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c index 2729a80..0bd3b2e 100644 --- a/sound/soc/davinci/davinci-pcm.c +++ b/sound/soc/davinci/davinci-pcm.c @@ -265,8 +265,7 @@ static int ping_pong_dma_setup(struct snd_pcm_substream *substream) struct davinci_runtime_data *prtd = runtime->private_data; struct snd_dma_buffer *iram_dma = (struct snd_dma_buffer *)substream->dma_buffer.private_data; - struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct davinci_pcm_dma_params *dma_data = rtd->dai->cpu_dai->dma_data; + struct davinci_pcm_dma_params *dma_data = prtd->params; unsigned int data_type = dma_data->data_type; unsigned int acnt = dma_data->acnt; unsigned int convert_mono_stereo = dma_data->convert_mono_stereo; @@ -482,15 +481,12 @@ static int davinci_pcm_dma_request(struct snd_pcm_substream *substream) { struct snd_dma_buffer *iram_dma; struct davinci_runtime_data *prtd = substream->runtime->private_data; - struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct davinci_pcm_dma_params *dma_data = rtd->dai->cpu_dai->dma_data; + struct davinci_pcm_dma_params *dma_data = prtd->params; int link; if (!dma_data) return -ENODEV; - prtd->params = dma_data; - /* Request asp master DMA channel */ link = prtd->asp_channel = edma_alloc_channel(dma_data->channel, davinci_pcm_dma_irq, substream, EVENTQ_0); @@ -660,7 +656,8 @@ davinci_pcm_pointer(struct snd_pcm_substream *substream) static int davinci_pcm_open(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct davinci_pcm_dma_params *dma_data = rtd->dai->cpu_dai->dma_data; + struct davinci_pcm_dma_params **pa = rtd->dai->cpu_dai->private_data; + struct davinci_pcm_dma_params *dma_params = pa[substream->stream]; struct snd_pcm_runtime *runtime = substream->runtime; struct davinci_runtime_data *prtd; struct snd_pcm_hardware *ppcm; @@ -668,7 +665,7 @@ static int davinci_pcm_open(struct snd_pcm_substream *substream) ppcm = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ? &pcm_hardware_playback : &pcm_hardware_capture; - allocate_sram(substream, dma_data->sram_size, ppcm); + allocate_sram(substream, dma_params->sram_size, ppcm); snd_soc_set_runtime_hwparams(substream, ppcm); /* ensure that buffer size is a multiple of period size */ ret = snd_pcm_hw_constraint_integer(runtime, @@ -681,6 +678,7 @@ static int davinci_pcm_open(struct snd_pcm_substream *substream) return -ENOMEM; spin_lock_init(&prtd->lock); + prtd->params = dma_params; prtd->asp_channel = -1; prtd->asp_link[0] = prtd->asp_link[1] = -1; prtd->ram_channel = -1; -- 1.5.6.3

3 4

[alsa-devel] SPDIF with X-Fi
by Daniel L. Miller 15 Sep '09

15 Sep '09

Perhaps I'm going about this the wrong way (if so, please tell me), but... My X-Fi card is now working with the new driver. I am connected to my amplifier via a fiber optic cable. Sending standard two-channel audio to the "front" alsa plug gets directed to the spdif output and sounds great. But I want to have my full surround active - particularly for movies already encoded with dts and/or ac-3. Thus far, I have not been able to get mplayer to send digital audio - I either get mplayer errors or silence. Once, and only once, I got xbmc to work with digital settings - never since. So I know it SHOULD be possible - I'm just missing something. Is anyone getting this to work? -- Daniel

1 0

[alsa-devel] iecset with X-Fi
by Daniel L. Miller 15 Sep '09

15 Sep '09

Is the iecset utility supposed to do anything with X-Fi cards and the new driver? For me, it reports status - but seems to ignore any parameters to change the settings. -- Daniel

1 0

[alsa-devel] [PATCH] WM8580 DAI: Debugged
by jassisinghbrar＠gmail.com 14 Sep '09

14 Sep '09

From: Jassi <jassi.brar(a)samsung.com> Debugged improper definition of 'struct snd_soc_dai wm8580_dai' Also, implemented various clock sourcing options for WM8580 blocks. Signed-Off-by: Jassi <jassi.brar(a)samsung.com> --- sound/soc/codecs/wm8580.c | 116 ++++++++++++++++++++++++++++++++------------- sound/soc/codecs/wm8580.h | 17 ++++--- 2 files changed, 93 insertions(+), 40 deletions(-) diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c index 6bded8c..105d452 100644 --- a/sound/soc/codecs/wm8580.c +++ b/sound/soc/codecs/wm8580.c @@ -106,9 +106,16 @@ /* CLKSEL (register 8h) */ #define WM8580_CLKSEL_DAC_CLKSEL_MASK 0x03 +#define WM8580_CLKSEL_DAC_CLKSEL_MCLK 0x00 #define WM8580_CLKSEL_DAC_CLKSEL_PLLA 0x01 #define WM8580_CLKSEL_DAC_CLKSEL_PLLB 0x02 +#define WM8580_CLKSEL_ADC_CLKSEL_MASK 0x0c +#define WM8580_CLKSEL_ADC_CLKSEL_ADCMCLK 0x00 +#define WM8580_CLKSEL_ADC_CLKSEL_PLLA 0x04 +#define WM8580_CLKSEL_ADC_CLKSEL_PLLB 0x08 +#define WM8580_CLKSEL_ADC_CLKSEL_MCLK 0x0c + /* AIF control 1 (registers 9h-bh) */ #define WM8580_AIF_RATE_MASK 0x7 #define WM8580_AIF_RATE_128 0x0 @@ -121,15 +128,16 @@ #define WM8580_AIF_BCLKSEL_MASK 0x18 #define WM8580_AIF_BCLKSEL_64 0x00 -#define WM8580_AIF_BCLKSEL_128 0x08 -#define WM8580_AIF_BCLKSEL_256 0x10 +#define WM8580_AIF_BCLKSEL_32 0x08 +#define WM8580_AIF_BCLKSEL_16 0x10 #define WM8580_AIF_BCLKSEL_SYSCLK 0x18 #define WM8580_AIF_MS 0x20 #define WM8580_AIF_CLKSRC_MASK 0xc0 +#define WM8580_AIF_CLKSRC_ADCMCLK 0x00 #define WM8580_AIF_CLKSRC_PLLA 0x40 -#define WM8580_AIF_CLKSRC_PLLB 0x40 +#define WM8580_AIF_CLKSRC_PLLB 0x80 #define WM8580_AIF_CLKSRC_MCLK 0xc0 /* AIF control 2 (registers ch-eh) */ @@ -630,6 +638,7 @@ static int wm8580_set_dai_clkdiv(struct snd_soc_dai *codec_dai, switch (div) { case WM8580_CLKSRC_MCLK: + reg |= WM8580_CLKSEL_DAC_CLKSEL_MCLK; break; case WM8580_CLKSRC_PLLA: @@ -646,6 +655,33 @@ static int wm8580_set_dai_clkdiv(struct snd_soc_dai *codec_dai, snd_soc_write(codec, WM8580_CLKSEL, reg); break; + case WM8580_ADC_CLKSEL: + reg = snd_soc_read(codec, WM8580_CLKSEL); + reg &= ~WM8580_CLKSEL_ADC_CLKSEL_MASK; + + switch (div) { + case WM8580_CLKSRC_ADCMCLK: + reg |= WM8580_CLKSEL_ADC_CLKSEL_ADCMCLK; + break; + + case WM8580_CLKSRC_MCLK: + reg |= WM8580_CLKSEL_ADC_CLKSEL_MCLK; + break; + + case WM8580_CLKSRC_PLLA: + reg |= WM8580_CLKSEL_ADC_CLKSEL_PLLA; + break; + + case WM8580_CLKSRC_PLLB: + reg |= WM8580_CLKSEL_ADC_CLKSEL_PLLB; + break; + + default: + return -EINVAL; + } + snd_soc_write(codec, WM8580_CLKSEL, reg); + break; + case WM8580_CLKOUTSRC: reg = snd_soc_read(codec, WM8580_PLLB4); reg &= ~WM8580_PLLB4_CLKOUTSRC_MASK; @@ -672,6 +708,32 @@ static int wm8580_set_dai_clkdiv(struct snd_soc_dai *codec_dai, snd_soc_write(codec, WM8580_PLLB4, reg); break; + case WM8580_PAIF_CLKSEL: + reg = snd_soc_read(codec, WM8580_PAIF1 + codec_dai->id); + reg &= ~WM8580_AIF_CLKSRC_MASK; + switch (div) { + case WM8580_CLKSRC_ADCMCLK: + reg |= WM8580_AIF_CLKSRC_ADCMCLK; + break; + + case WM8580_CLKSRC_PLLA: + reg |= WM8580_AIF_CLKSRC_PLLA; + break; + + case WM8580_CLKSRC_PLLB: + reg |= WM8580_AIF_CLKSRC_PLLB; + break; + + case WM8580_CLKSRC_MCLK: + reg |= WM8580_AIF_CLKSRC_MCLK; + break; + + default: + return -EINVAL; + } + snd_soc_write(codec, WM8580_PAIF1 + codec_dai->id, reg); + break; + default: return -EINVAL; } @@ -731,7 +793,7 @@ static int wm8580_set_bias_level(struct snd_soc_codec *codec, #define WM8580_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) -static struct snd_soc_dai_ops wm8580_dai_ops_playback = { +static struct snd_soc_dai_ops wm8580_dai_ops = { .hw_params = wm8580_paif_hw_params, .set_fmt = wm8580_set_paif_dai_fmt, .set_clkdiv = wm8580_set_dai_clkdiv, @@ -739,38 +801,26 @@ static struct snd_soc_dai_ops wm8580_dai_ops_playback = { .digital_mute = wm8580_digital_mute, }; -static struct snd_soc_dai_ops wm8580_dai_ops_capture = { - .hw_params = wm8580_paif_hw_params, - .set_fmt = wm8580_set_paif_dai_fmt, - .set_clkdiv = wm8580_set_dai_clkdiv, - .set_pll = wm8580_set_dai_pll, -}; - struct snd_soc_dai wm8580_dai[] = { - { - .name = "WM8580 PAIFRX", - .id = 0, - .playback = { - .stream_name = "Playback", - .channels_min = 1, - .channels_max = 6, - .rates = SNDRV_PCM_RATE_8000_192000, - .formats = WM8580_FORMATS, - }, - .ops = &wm8580_dai_ops_playback, + { + .name = "WM8580 PAIF", + .id = 0, + .playback = { + .stream_name = "Playback", + .channels_min = 1, + .channels_max = 6, + .rates = SNDRV_PCM_RATE_8000_192000, + .formats = WM8580_FORMATS, }, - { - .name = "WM8580 PAIFTX", - .id = 1, - .capture = { - .stream_name = "Capture", - .channels_min = 2, - .channels_max = 2, - .rates = SNDRV_PCM_RATE_8000_192000, - .formats = WM8580_FORMATS, - }, - .ops = &wm8580_dai_ops_capture, + .capture = { + .stream_name = "Capture", + .channels_min = 2, + .channels_max = 2, + .rates = SNDRV_PCM_RATE_8000_192000, + .formats = WM8580_FORMATS, }, + .ops = &wm8580_dai_ops, + }, }; EXPORT_SYMBOL_GPL(wm8580_dai); diff --git a/sound/soc/codecs/wm8580.h b/sound/soc/codecs/wm8580.h index 0dfb5dd..65f9225 100644 --- a/sound/soc/codecs/wm8580.h +++ b/sound/soc/codecs/wm8580.h @@ -20,13 +20,16 @@ #define WM8580_MCLK 1 #define WM8580_DAC_CLKSEL 2 -#define WM8580_CLKOUTSRC 3 - -#define WM8580_CLKSRC_MCLK 1 -#define WM8580_CLKSRC_PLLA 2 -#define WM8580_CLKSRC_PLLB 3 -#define WM8580_CLKSRC_OSC 4 -#define WM8580_CLKSRC_NONE 5 +#define WM8580_ADC_CLKSEL 3 +#define WM8580_CLKOUTSRC 4 +#define WM8580_PAIF_CLKSEL 5 + +#define WM8580_CLKSRC_ADCMCLK 0 +#define WM8580_CLKSRC_MCLK 1 +#define WM8580_CLKSRC_PLLA 2 +#define WM8580_CLKSRC_PLLB 3 +#define WM8580_CLKSRC_OSC 4 +#define WM8580_CLKSRC_NONE 5 #define WM8580_DAI_PAIFRX 0 #define WM8580_DAI_PAIFTX 1 -- 1.6.2.5

3 3

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

14 Sep '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. 3) Set i2c address for audio codec at DM365 EVM board file. Note: This patch was created based on temp/asoc branch Signed-off-by: Miguel Aguilar <miguel.aguilar(a)ridgerun.com> --- arch/arm/mach-davinci/board-dm365-evm.c | 7 ++++ arch/arm/mach-davinci/dm365.c | 45 +++++++++++++++++++++++++++- arch/arm/mach-davinci/include/mach/asp.h | 3 ++ arch/arm/mach-davinci/include/mach/dm365.h | 2 + 4 files changed, 56 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..77f815c 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), @@ -185,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 = { @@ -476,6 +481,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..c8bff14 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), @@ -603,6 +604,9 @@ INT_CFG(DM365, INT_IMX1_ENABLE, 24, 1, 1, false) INT_CFG(DM365, INT_IMX1_DISABLE, 24, 1, 0, false) INT_CFG(DM365, INT_NSF_ENABLE, 25, 1, 1, false) INT_CFG(DM365, INT_NSF_DISABLE, 25, 1, 0, false) + +EVT_CFG(DM365, EVT2_ASP_TX, 0, 1, 0, false) +EVT_CFG(DM365, EVT3_ASP_RX, 1, 1, 0, false) #endif }; @@ -806,6 +810,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 +936,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..fef12b9 100644 --- a/arch/arm/mach-davinci/include/mach/asp.h +++ b/arch/arm/mach-davinci/include/mach/asp.h @@ -11,6 +11,9 @@ #define DAVINCI_ASP0_BASE 0x01E02000 #define DAVINCI_ASP1_BASE 0x01E04000 +/* Bases of dm365 register banks */ +#define DAVINCI_DM365_ASP0_BASE 0x01D02000 + /* Bases of dm646x register banks */ #define DAVINCI_DM646X_MCASP0_REG_BASE 0x01D01000 #define DAVINCI_DM646X_MCASP1_REG_BASE 0x01D01800 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

[PATCH] ASoC: Make WM8580 DAI clocking more standard
by Mark Brown 14 Sep '09

14 Sep '09

Move the WM8580 driver over to more of a standard clocking setup method, specifying the master clock rate for the DAI using the set_sysclk() API and configuring the LRCLK automatically using that. This is an initial update only to present external APIs, further work that needs doing includes enforcing the constraints flowing from the SYSCLK selection, automatic tie in with PLL configuration and BCLK configuration (the current BCLK configuration is compatible with all sample rates). Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8580.c | 121 +++++++++++++++++++++++++++++++-------------- sound/soc/codecs/wm8580.h | 4 +- 2 files changed, 85 insertions(+), 40 deletions(-) diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c index 6bded8c..dffc093 100644 --- a/sound/soc/codecs/wm8580.c +++ b/sound/soc/codecs/wm8580.c @@ -105,19 +105,18 @@ #define WM8580_PLLB4_CLKOUTSRC_OSCCLK 0x180 /* CLKSEL (register 8h) */ -#define WM8580_CLKSEL_DAC_CLKSEL_MASK 0x03 -#define WM8580_CLKSEL_DAC_CLKSEL_PLLA 0x01 -#define WM8580_CLKSEL_DAC_CLKSEL_PLLB 0x02 +#define WM8580_CLKSEL_DAC_CLKSEL_MASK 0x03 +#define WM8580_CLKSEL_DAC_CLKSEL_SHIFT 0 +#define WM8580_CLKSEL_ADC_CLKSEL_MASK 0x0c +#define WM8580_CLKSEL_ADC_CLKSEL_SHIFT 2 + +#define WM8580_CLKSEL_PLLA 0x01 +#define WM8580_CLKSEL_PLLB 0x02 +#define WM8580_CLKSEL_MCLK 0x03 /* AIF control 1 (registers 9h-bh) */ #define WM8580_AIF_RATE_MASK 0x7 -#define WM8580_AIF_RATE_128 0x0 -#define WM8580_AIF_RATE_192 0x1 -#define WM8580_AIF_RATE_256 0x2 -#define WM8580_AIF_RATE_384 0x3 -#define WM8580_AIF_RATE_512 0x4 -#define WM8580_AIF_RATE_768 0x5 -#define WM8580_AIF_RATE_1152 0x6 +#define WM8580_AIF_RATE_SHIFT 0x2 #define WM8580_AIF_BCLKSEL_MASK 0x18 #define WM8580_AIF_BCLKSEL_64 0x00 @@ -203,6 +202,7 @@ struct wm8580_priv { u16 reg_cache[WM8580_MAX_REGISTER + 1]; struct pll_state a; struct pll_state b; + int sysclk[WM8580_NUM_DAI]; }; static const DECLARE_TLV_DB_SCALE(dac_tlv, -12750, 50, 1); @@ -476,6 +476,10 @@ static int wm8580_set_dai_pll(struct snd_soc_dai *codec_dai, return 0; } +static int lrclk_ratios[] = { + 128, 192, 256, 384, 512, 768, 1152 +}; + /* * Set PCM DAI bit size and sample rate. */ @@ -483,12 +487,31 @@ static int wm8580_paif_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_device *socdev = rtd->socdev; - struct snd_soc_codec *codec = socdev->card->codec; + struct snd_soc_codec *codec = dai->codec; + struct wm8580_priv *priv = codec->private_data; u16 paifb = snd_soc_read(codec, WM8580_PAIF3 + dai->id); + int sysclk, i; + + /* SYSCLK needs to be configured prior to this being called. */ + if (!priv->sysclk[dai->id]) { + dev_err(dai->dev, "SYSCLK not configured\n"); + return -EINVAL; + } + sysclk = priv->sysclk[dai->id]; + dev_dbg(dai->dev, "SYSCLK is %dHz\n", sysclk); + + paifb &= ~(WM8580_AIF_LENGTH_MASK | WM8580_AIF_RATE_MASK); + + /* Look for an exact match; the steps are too big otherwise */ + for (i = 0; i < ARRAY_SIZE(lrclk_ratios); i++) { + if (params_rate(params) == sysclk / lrclk_ratios[i]) + break; + } + if (i == ARRAY_SIZE(lrclk_ratios)) + return -EINVAL; + dev_dbg(dai->dev, "LRCLK ratio %d\n", lrclk_ratios[i]); + paifb |= i << WM8580_AIF_RATE_SHIFT; - paifb &= ~WM8580_AIF_LENGTH_MASK; /* bit size */ switch (params_format(params)) { case SNDRV_PCM_FORMAT_S16_LE: @@ -624,28 +647,6 @@ static int wm8580_set_dai_clkdiv(struct snd_soc_dai *codec_dai, snd_soc_write(codec, WM8580_PLLB4, reg); break; - case WM8580_DAC_CLKSEL: - reg = snd_soc_read(codec, WM8580_CLKSEL); - reg &= ~WM8580_CLKSEL_DAC_CLKSEL_MASK; - - switch (div) { - case WM8580_CLKSRC_MCLK: - break; - - case WM8580_CLKSRC_PLLA: - reg |= WM8580_CLKSEL_DAC_CLKSEL_PLLA; - break; - - case WM8580_CLKSRC_PLLB: - reg |= WM8580_CLKSEL_DAC_CLKSEL_PLLB; - break; - - default: - return -EINVAL; - } - snd_soc_write(codec, WM8580_CLKSEL, reg); - break; - case WM8580_CLKOUTSRC: reg = snd_soc_read(codec, WM8580_PLLB4); reg &= ~WM8580_PLLB4_CLKOUTSRC_MASK; @@ -679,6 +680,48 @@ static int wm8580_set_dai_clkdiv(struct snd_soc_dai *codec_dai, return 0; } +static int wm8580_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id, + unsigned int freq, int dir) +{ + struct snd_soc_codec *codec = dai->codec; + struct wm8580_priv *priv = codec->private_data; + int mask, val, ret; + + switch (clk_id) { + case WM8580_CLKSRC_MCLK: + val = WM8580_CLKSEL_MCLK; + break; + case WM8580_CLKSRC_PLLA: + val = WM8580_CLKSEL_PLLA; + break; + case WM8580_CLKSRC_PLLB: + val = WM8580_CLKSEL_PLLB; + break; + default: + return -EINVAL; + } + + switch (dai->id) { + case WM8580_DAI_PAIFRX: + mask = WM8580_CLKSEL_DAC_CLKSEL_MASK; + break; + + case WM8580_DAI_PAIFTX: + mask = WM8580_CLKSEL_ADC_CLKSEL_MASK; + val <<= WM8580_CLKSEL_ADC_CLKSEL_SHIFT; + break; + + default: + return -EINVAL; + } + + ret = snd_soc_update_bits(codec, WM8580_CLKSEL, mask, val); + if (ret == 0) + priv->sysclk[dai->id] = freq; + + return ret; +} + static int wm8580_digital_mute(struct snd_soc_dai *codec_dai, int mute) { struct snd_soc_codec *codec = codec_dai->codec; @@ -736,6 +779,7 @@ static struct snd_soc_dai_ops wm8580_dai_ops_playback = { .set_fmt = wm8580_set_paif_dai_fmt, .set_clkdiv = wm8580_set_dai_clkdiv, .set_pll = wm8580_set_dai_pll, + .set_sysclk = wm8580_set_dai_sysclk, .digital_mute = wm8580_digital_mute, }; @@ -743,13 +787,14 @@ static struct snd_soc_dai_ops wm8580_dai_ops_capture = { .hw_params = wm8580_paif_hw_params, .set_fmt = wm8580_set_paif_dai_fmt, .set_clkdiv = wm8580_set_dai_clkdiv, + .set_sysclk = wm8580_set_dai_sysclk, .set_pll = wm8580_set_dai_pll, }; struct snd_soc_dai wm8580_dai[] = { { .name = "WM8580 PAIFRX", - .id = 0, + .id = WM8580_DAI_PAIFRX, .playback = { .stream_name = "Playback", .channels_min = 1, @@ -761,7 +806,7 @@ struct snd_soc_dai wm8580_dai[] = { }, { .name = "WM8580 PAIFTX", - .id = 1, + .id = WM8580_DAI_PAIFTX, .capture = { .stream_name = "Capture", .channels_min = 2, diff --git a/sound/soc/codecs/wm8580.h b/sound/soc/codecs/wm8580.h index 0dfb5dd..f03ae9e 100644 --- a/sound/soc/codecs/wm8580.h +++ b/sound/soc/codecs/wm8580.h @@ -19,8 +19,7 @@ #define WM8580_PLLB 2 #define WM8580_MCLK 1 -#define WM8580_DAC_CLKSEL 2 -#define WM8580_CLKOUTSRC 3 +#define WM8580_CLKOUTSRC 2 #define WM8580_CLKSRC_MCLK 1 #define WM8580_CLKSRC_PLLA 2 @@ -30,6 +29,7 @@ #define WM8580_DAI_PAIFRX 0 #define WM8580_DAI_PAIFTX 1 +#define WM8580_NUM_DAI 2 extern struct snd_soc_dai wm8580_dai[]; extern struct snd_soc_codec_device soc_codec_dev_wm8580; -- 1.6.3.3

1 0

[alsa-devel] [PATCH 3/3] ASoC: TWL6030: Handle power-up seq completion thru audio interrupt
by Lopez Cruz, Misael 14 Sep '09

14 Sep '09

NAUDINT interrupt line is provided by the TWL6030 codec to signal externally events like headset plug/unplug, hook, power-up sequence completion, etc. When the codec is powered-up through external AUDPWRON line it will start its power-up sequence. The completion of the sequence is signaled through the audio interrupt, and then codec is operational. CODEC driver starts a wait_for_completion just after calling external power-up callback. It's signaled as complete when servicing READYINT interrupt. MACHINE drivers should request IRQ line used in corresponding hardware platform and initialize workqueue and completion structs of twl6030_setup_data as well. Signed-off-by: Misael Lopez Cruz <x0052729(a)ti.com> --- sound/soc/codecs/twl6030.c | 103 +++++++++++++++++++++++++++++++++++++++++--- sound/soc/codecs/twl6030.h | 17 +++++++ 2 files changed, 113 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/twl6030.c b/sound/soc/codecs/twl6030.c index 0f2269e..dc85399 100644 --- a/sound/soc/codecs/twl6030.c +++ b/sound/soc/codecs/twl6030.c @@ -43,6 +43,7 @@ /* codec private data */ struct twl6030_priv_data { + int codec_powered; unsigned int sysclk; }; @@ -54,7 +55,7 @@ static const u8 twl6030_reg[TWL6030_CACHEREGNUM] = { 0x4B, /* TWL6030_ASICID (ro) 0x01 */ 0x00, /* TWL6030_ASICREV (ro) 0x02 */ 0x00, /* TWL6030_INTID 0x03 */ - 0x41, /* TWL6030_INTMR 0x04 */ + 0x00, /* TWL6030_INTMR 0x04 */ 0x00, /* TWL6030_NCPCTRL 0x05 */ 0x00, /* TWL6030_LDOCTL 0x06 */ 0x00, /* TWL6030_HPPLLCTL 0x07 */ @@ -127,6 +128,23 @@ static inline void twl6030_write_reg_cache(struct snd_soc_codec *codec, } /* + * read from twl6030 hardware register + */ +static int twl6030_read(struct snd_soc_codec *codec, + unsigned int reg) +{ + u8 value; + + if (reg > TWL6030_CACHEREGNUM) + return -EIO; + + twl_i2c_read_u8(TWL6030_MODULE_AUDIO, &value, reg); + twl6030_write_reg_cache(codec, reg, value); + + return value; +} + +/* * write to the twl6030 register space */ static int twl6030_write(struct snd_soc_codec *codec, @@ -159,27 +177,89 @@ static void twl6030_init_chip(struct snd_soc_codec *codec) static void twl6030_power_up(struct snd_soc_codec *codec) { struct snd_soc_device *socdev = codec->socdev; + struct twl6030_priv_data *priv = codec->private_data; struct twl6030_setup_data *setup = socdev->codec_data; + if (priv->codec_powered) + return; + setup->codec_enable(1); + /* wait for ready interrupt */ + wait_for_completion(&setup->ready_completion); + /* sync registers updated during power-up sequence */ - twl6030_write_reg_cache(codec, TWL6030_REG_NCPCTL, 0x81); - twl6030_write_reg_cache(codec, TWL6030_REG_LDOCTL, 0x45); - twl6030_write_reg_cache(codec, TWL6030_REG_LPPLLCTL, 0x01); + twl6030_read(codec, TWL6030_REG_NCPCTL); + twl6030_read(codec, TWL6030_REG_LDOCTL); + twl6030_read(codec, TWL6030_REG_LPPLLCTL); } static void twl6030_power_down(struct snd_soc_codec *codec) { struct snd_soc_device *socdev = codec->socdev; + struct twl6030_priv_data *priv = codec->private_data; struct twl6030_setup_data *setup = socdev->codec_data; setup->codec_enable(0); + udelay(500); /* sync registers updated during power-down sequence */ - twl6030_write_reg_cache(codec, TWL6030_REG_NCPCTL, 0x00); - twl6030_write_reg_cache(codec, TWL6030_REG_LDOCTL, 0x00); - twl6030_write_reg_cache(codec, TWL6030_REG_LPPLLCTL, 0x00); + twl6030_read(codec, TWL6030_REG_NCPCTL); + twl6030_read(codec, TWL6030_REG_LDOCTL); + twl6030_read(codec, TWL6030_REG_LPPLLCTL); + + priv->codec_powered = 0; +} + +/* audio interrupt handler */ +irqreturn_t twl6030_naudint_handler(int irq, void *data) +{ + struct twl6030_setup_data *setup = data; + + schedule_work(&setup->audint_work); + + /* disable audint irq to let workqueue to execute */ + disable_irq_nosync(irq); + + return IRQ_HANDLED; +} + +void twl6030_naudint_work(struct work_struct *work) +{ + struct snd_soc_codec *codec; + struct twl6030_setup_data *setup; + struct twl6030_priv_data *priv; + u8 intid; + + setup = container_of(work, struct twl6030_setup_data, audint_work); + codec = setup->codec; + priv = codec->private_data; + + twl_i2c_read_u8(TWL6030_MODULE_AUDIO, &intid, TWL6030_REG_INTID); + + switch (intid) { + case TWL6030_THINT: + dev_alert(codec->dev, "die temp over-limit detection\n"); + break; + case TWL6030_PLUGINT: + case TWL6030_UNPLUGINT: + case TWL6030_HOOKINT: + break; + case TWL6030_HFINT: + dev_alert(codec->dev, "hf drivers over current detection\n"); + break; + case TWL6030_VIBINT: + dev_alert(codec->dev, "vib drivers over current detection\n"); + break; + case TWL6030_READYINT: + priv->codec_powered = 1; + complete(&setup->ready_completion); + break; + default: + dev_err(codec->dev, "unknown twl6030 audio interrupt\n"); + } + + enable_irq(setup->irq); } /* set headset dac and driver power mode */ @@ -679,6 +759,7 @@ static int twl6030_resume(struct platform_device *pdev) static int twl6030_init(struct snd_soc_device *socdev) { struct snd_soc_codec *codec = socdev->card->codec; + struct twl6030_setup_data *setup = socdev->codec_data; int ret = 0; dev_info(codec->dev, "TWL6030 Audio Codec init\n"); @@ -703,6 +784,14 @@ static int twl6030_init(struct snd_soc_device *socdev) goto pcm_err; } + /* platform setup data is required for power-off/off the device */ + if (setup == NULL) { + printk(KERN_ERR "twl6030: platform setup data missing\n"); + goto pcm_err; + } + + setup->codec = codec; + /* power on device */ twl6030_set_bias_level(codec, SND_SOC_BIAS_STANDBY); diff --git a/sound/soc/codecs/twl6030.h b/sound/soc/codecs/twl6030.h index 9e49c85..1e1fb3f 100644 --- a/sound/soc/codecs/twl6030.h +++ b/sound/soc/codecs/twl6030.h @@ -64,6 +64,16 @@ #define TWL6030_CACHEREGNUM (TWL6030_REG_STATUS + 1) +/* INTID (0x03) fields */ + +#define TWL6030_THINT 0x01 +#define TWL6030_PLUGINT 0x02 +#define TWL6030_UNPLUGINT 0x04 +#define TWL6030_HOOKINT 0x08 +#define TWL6030_HFINT 0x10 +#define TWL6030_VIBINT 0x20 +#define TWL6030_READYINT 0x40 + /* HPPLLCTL (0x07) fields */ #define TWL6030_HPLLENA 0x01 @@ -105,8 +115,15 @@ extern struct snd_soc_dai twl6030_dai; extern struct snd_soc_codec_device soc_codec_dev_twl6030; +irqreturn_t twl6030_naudint_handler(int irq, void *data); +void twl6030_naudint_work(struct work_struct *work); + struct twl6030_setup_data { void (*codec_enable)(int enable); + int irq; + struct work_struct audint_work; + struct completion ready_completion; + struct snd_soc_codec *codec; }; #endif /* End of __TWL6030_H__ */ -- 1.5.4.3

2 1