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

[alsa-devel] alsa-util.c: snd_pcm_avail() returned a value that is exceptionally large: 675220 bytes (3827 ms).
by support 26 Jan '11

26 Jan '11

alsa-util.c: snd_pcm_avail() returned a value that is exceptionally large: 675220 bytes (3827 ms). alsa-util.c: Most likely this is a bug in the ALSA driver 'snd_emu10k1'. Please report this issue to the ALSA developers. http://www.alsa-project.org/db/?f=641d9cb90af2e47e527c2912bee4e34bff41b87b # rpm -qa | grep alsa alsa-lib-devel-1.0.23-2.fc14.i686 alsa-plugins-pulseaudio-1.0.22-1.fc13.i686 alsa-utils-1.0.23-3.fc14.i686 alsa-lib-1.0.23-2.fc14.i686 # uname -a Linux wp.san.ru 2.6.35.10-74.fc14.i686 #1 SMP Thu Dec 23 16:17:40 UTC 2010 i686 i686 i386 GNU/Linux -- _________________________________________ Системный администратор Участок телематических служб Цеха передачи данных г. Саратов, OАО "ВолгаТелеком", саратовский филиал тел : (8452) 272727 e-mail: support(a)san.ru

2 2

[PATCH] OMAP4: hwmod data: Add entries for DMIC
by Benoit Cousson 25 Jan '11

25 Jan '11

Adds HWMOD entries for the OMAP DMIC. The HWMOD entires define the system resource requirements for the driver such as DMA addresses, channels, and IRQ's. Placing this information in the HWMOD database allows for more generic drivers to be written and having the specific implementation details defined in HWMOD. Signed-off-by: Benoit Cousson <b-cousson(a)ti.com> Signed-off-by: David Lambert <dlambert(a)ti.com> [b-cousson(a)ti.com: Change the wrong hwmod name, add memory name, add missing flag and re-order structures] --- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 96 +++++++++++++++++++++++++++- 1 files changed, 95 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 6665922..703f3d4 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -519,7 +519,6 @@ static struct omap_hwmod omap44xx_mpu_private_hwmod = { * ctrl_module_pad_wkup * ctrl_module_wkup * debugss - * dmic * efuse_ctrl_cust * efuse_ctrl_std * elm @@ -646,6 +645,98 @@ static struct omap_hwmod omap44xx_dma_system_hwmod = { }; /* + * 'dmic' class + * digital microphone controller + */ + +static struct omap_hwmod_class_sysconfig omap44xx_dmic_sysc = { + .rev_offs = 0x0000, + .sysc_offs = 0x0010, + .sysc_flags = (SYSC_HAS_EMUFREE | SYSC_HAS_RESET_STATUS | + SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET), + .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART | + SIDLE_SMART_WKUP), + .sysc_fields = &omap_hwmod_sysc_type2, +}; + +static struct omap_hwmod_class omap44xx_dmic_hwmod_class = { + .name = "dmic", + .sysc = &omap44xx_dmic_sysc, +}; + +/* dmic */ +static struct omap_hwmod omap44xx_dmic_hwmod; +static struct omap_hwmod_irq_info omap44xx_dmic_irqs[] = { + { .irq = 114 + OMAP44XX_IRQ_GIC_START }, +}; + +static struct omap_hwmod_dma_info omap44xx_dmic_sdma_reqs[] = { + { .dma_req = 66 + OMAP44XX_DMA_REQ_START }, +}; + +static struct omap_hwmod_addr_space omap44xx_dmic_addrs[] = { + { + .name = "mpu", + .pa_start = 0x4012e000, + .pa_end = 0x4012e07f, + .flags = ADDR_TYPE_RT + }, +}; + +/* l4_abe -> dmic */ +static struct omap_hwmod_ocp_if omap44xx_l4_abe__dmic = { + .master = &omap44xx_l4_abe_hwmod, + .slave = &omap44xx_dmic_hwmod, + .clk = "ocp_abe_iclk", + .addr = omap44xx_dmic_addrs, + .addr_cnt = ARRAY_SIZE(omap44xx_dmic_addrs), + .user = OCP_USER_MPU, +}; + +static struct omap_hwmod_addr_space omap44xx_dmic_dma_addrs[] = { + { + .name = "dma", + .pa_start = 0x4902e000, + .pa_end = 0x4902e07f, + .flags = ADDR_TYPE_RT + }, +}; + +/* l4_abe -> dmic (dma) */ +static struct omap_hwmod_ocp_if omap44xx_l4_abe__dmic_dma = { + .master = &omap44xx_l4_abe_hwmod, + .slave = &omap44xx_dmic_hwmod, + .clk = "ocp_abe_iclk", + .addr = omap44xx_dmic_dma_addrs, + .addr_cnt = ARRAY_SIZE(omap44xx_dmic_dma_addrs), + .user = OCP_USER_SDMA, +}; + +/* dmic slave ports */ +static struct omap_hwmod_ocp_if *omap44xx_dmic_slaves[] = { + &omap44xx_l4_abe__dmic, + &omap44xx_l4_abe__dmic_dma, +}; + +static struct omap_hwmod omap44xx_dmic_hwmod = { + .name = "dmic", + .class = &omap44xx_dmic_hwmod_class, + .mpu_irqs = omap44xx_dmic_irqs, + .mpu_irqs_cnt = ARRAY_SIZE(omap44xx_dmic_irqs), + .sdma_reqs = omap44xx_dmic_sdma_reqs, + .sdma_reqs_cnt = ARRAY_SIZE(omap44xx_dmic_sdma_reqs), + .main_clk = "dmic_fck", + .prcm = { + .omap4 = { + .clkctrl_reg = OMAP4430_CM1_ABE_DMIC_CLKCTRL, + }, + }, + .slaves = omap44xx_dmic_slaves, + .slaves_cnt = ARRAY_SIZE(omap44xx_dmic_slaves), + .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), +}; + +/* * 'dsp' class * dsp sub-system */ @@ -3895,6 +3986,9 @@ static __initdata struct omap_hwmod *omap44xx_hwmods[] = { /* dma class */ &omap44xx_dma_system_hwmod, + /* dmic class */ + &omap44xx_dmic_hwmod, + /* dsp class */ &omap44xx_dsp_hwmod, &omap44xx_dsp_c0_hwmod, -- 1.7.0.4

1 0

[alsa-devel] UCM questions
by pl bossart 25 Jan '11

25 Jan '11

Hello all, I've been looking at the UCM code in git://git.alsa-project.org/alsa-lib.git branch ucm. Looks both simple/powerfl/useful, still I have a couple of questions (most likely for Liam and Mark): - how would a USB device be handled? An audio use case is defined by a verb and device parameter. My understanding is for a USB headset used for music playback, we would still use the 'HiFi' verb, but then we would need a 'USB' device added in include/use-case.h ? Then how would I make a difference between a USB headset and USB speakers? - same question for remote displays/display port. - how useful is the notion of 'card list'? Seems to me that the verbs are the main entry points, and the notion of card is abstracted away. For a given use case, the application can query the string containing the device name. Or I am misled and verbs are only related to a given card? - If I want to enable a camcorder use case, possibly with multiple microphones, do I still use the 'HiFi' verb? Or do we need a new verb for capture cases? I don't see any mics as capture devices hence the question. - how would IEC-formatted data be handled for HDMI/SPDIF? It could be a different physical device for PCM and IEC-formatted data, and you would need to enable IEC-related switches in the alsa controls. Or would a modifier be more appropriate to provide additional information on the content type? - has anyone generated a typical configuration file for USB and HDAudio? I only see an OMAP conf. Thanks for your feedback -Pierre

5 15

[alsa-devel] [GIT PULL] Branch to add harmony_audio.h to Tegra and ASoC
by Stephen Warren 25 Jan '11

25 Jan '11

Mark, Colin, Please pull: http://avon.wwwdotorg.org/downloads/kernel.git tegra_harmony_asoc_platform_data This is a branch that's suitable for merging into both ASoC's for-2.6.39 and Tegra's for-next branch, and contains a single commit to add file arch/arm/mach-tegra/include/mach/harmony_audio.h. It's branched off the latest kernel tag that Tegra's for-next pulled in (v2.6.37-rc4) and merges into both target branches without issues as far as I can tell. Note that since I wanted to avoid having to do more similar merges in the future, I added a few more fields to the platform data that I know will be needed to fully describe Harmony; the commit is now as shown below. Thanks! commit 1b1fab5161c555d25c3e3ee26b423c05b393e54c Author: Stephen Warren <swarren(a)nvidia.com> Date: Wed Jan 19 13:07:03 2011 -0700 ARM: tegra: Add Harmony sound platform data type Signed-off-by: Stephen Warren <swarren(a)nvidia.com> diff --git a/arch/arm/mach-tegra/include/mach/harmony_audio.h b/arch/arm/mach-tegra/include/mach/harmony_audio.h new file mode 100644 index 0000000..aa136a7 --- /dev/null +++ b/arch/arm/mach-tegra/include/mach/harmony_audio.h @@ -0,0 +1,23 @@ +/* + * arch/arm/mach-tegra/include/mach/harmony_audio.h + * + * Copyright 2011 NVIDIA, Inc. + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +struct harmony_audio_platform_data { + int gpio_spkr_en; + int gpio_hp_det; + int gpio_int_mic_en; + int gpio_ext_mic_en; + int gpio_cdc_irq; +};

2 2

[alsa-devel] [PATCH] ALSA: HDA: Fix dmesg output of HDMI supported bits
by David Henningsson 25 Jan '11

25 Jan '11

This typo caused the dmesg output of the supported bits of HDMI to be cut off early. Cc: stable(a)kernel.org Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> -- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic

2 1

[alsa-devel] [PATCH] alsa: fix invalid hardware.h include in ac97c for AVR32 architecture
by Hans-Christian Egtvedt 25 Jan '11

25 Jan '11

From: Hans-Christian Egtvedt <hans-christian.egtvedt(a)atmel.com> This patch fixes the non-compiling AC97C driver for AVR32 architecture by include mach/hardware.h only for AT91 architecture. The AVR32 architecture does not supply the hardware.h include file. Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt(a)atmel.com> CC: stable(a)vger.kernel.org --- This patch also applies to the stable kernels, as the ac97c.c file has not been compilable for AVR32 since commit 7177395fdd919e561544a7d1c0ac196098a2ae2d sound/atmel/ac97c.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c index 10c3a87..b310702 100644 --- a/sound/atmel/ac97c.c +++ b/sound/atmel/ac97c.c @@ -33,9 +33,12 @@ #include <linux/dw_dmac.h> #include <mach/cpu.h> -#include <mach/hardware.h> #include <mach/gpio.h> +#ifdef CONFIG_ARCH_AT91 +#include <mach/hardware.h> +#endif + #include "ac97c.h" enum { -- 1.7.1

3 3

[PATCH] ALSA: HDA: Fix dmesg output of HDMI supported bits
by David Henningsson 25 Jan '11

25 Jan '11

This typo caused the dmesg output of the supported bits of HDMI to be cut off early. Cc: stable(a)kernel.org Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/hda_eld.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c index 4a66347..74b0560 100644 --- a/sound/pci/hda/hda_eld.c +++ b/sound/pci/hda/hda_eld.c @@ -381,7 +381,7 @@ static void hdmi_show_short_audio_desc(struct cea_sad *a) snd_print_pcm_rates(a->rates, buf, sizeof(buf)); if (a->format == AUDIO_CODING_TYPE_LPCM) - snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2 - 8)); + snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2) - 8); else if (a->max_bitrate) snprintf(buf2, sizeof(buf2), ", max bitrate = %d", a->max_bitrate); -- 1.7.1 --------------090609020005060300040600--

1 0

[alsa-devel] [PATCH] davinci: da8xx/omap-l1xx: match codec_name with i2c ids
by Rajashekhara, Sudhakar 25 Jan '11

25 Jan '11

The codec_name entry for da8xx evm in sound/soc/davinci/davinci-evm.c is not matching with the i2c ids in the board file. Without this fix the soundcard does not get detected on da850/omap-l138/am18x evm. Signed-off-by: Rajashekhara, Sudhakar <sudhakar.raj(a)ti.com> Tested-by: Dan Sharon <dansharon(a)nanometrics.ca> --- This patch applies to Linus's kernel tree. sound/soc/davinci/davinci-evm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index 0c2d6ba..b36f0b3 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c @@ -223,7 +223,7 @@ static struct snd_soc_dai_link da8xx_evm_dai = { .stream_name = "AIC3X", .cpu_dai_name= "davinci-mcasp.0", .codec_dai_name = "tlv320aic3x-hifi", - .codec_name = "tlv320aic3x-codec.0-001a", + .codec_name = "tlv320aic3x-codec.1-0018", .platform_name = "davinci-pcm-audio", .init = evm_aic3x_init, .ops = &evm_ops, -- 1.7.1

4 6

[alsa-devel] Fwd: aseqview patch for building with new autoconf
by Bas Wijnen 25 Jan '11

25 Jan '11

Hello, When trying to build aseqview from source (autoreconf -fis; ./configure; make), I found that it produced errors in configure. The web told me that those were caused by underquoted constructs in configure.in, which newer autoconf version have stricter requirements for than older versions. I've attached a patch which makes it build. Thanks, Bas Wijnen

1 0

[alsa-devel] [PATCH] ASoC: cs4271.c: improve error handling
by Alexander Sverdlin 25 Jan '11

25 Jan '11

From: Alexander Sverdlin <subaparts(a)yandex.ru> CS4271 CODEC driver adapted to recently introduced error handling in snd_soc_update_bits(). Added snd_soc_cache_sync() error handling. Signed-off-by: Alexander Sverdlin <subaparts(a)yandex.ru> --- sound/soc/codecs/cs4271.c | 59 +++++++++++++++++++++++++++++++++----------- 1 files changed, 44 insertions(+), 15 deletions(-) diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c index 25fed1b..5357ec5 100644 --- a/sound/soc/codecs/cs4271.c +++ b/sound/soc/codecs/cs4271.c @@ -209,6 +209,7 @@ static int cs4271_set_dai_fmt(struct snd_soc_dai *codec_dai, struct snd_soc_codec *codec = codec_dai->codec; struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec); unsigned int val = 0; + int ret; switch (format & SND_SOC_DAIFMT_MASTER_MASK) { case SND_SOC_DAIFMT_CBS_CFS: @@ -226,22 +227,27 @@ static int cs4271_set_dai_fmt(struct snd_soc_dai *codec_dai, switch (format & SND_SOC_DAIFMT_FORMAT_MASK) { case SND_SOC_DAIFMT_LEFT_J: val |= CS4271_MODE1_DAC_DIF_LJ; - snd_soc_update_bits(codec, CS4271_ADCCTL, + ret = snd_soc_update_bits(codec, CS4271_ADCCTL, CS4271_ADCCTL_ADC_DIF_MASK, CS4271_ADCCTL_ADC_DIF_LJ); + if (ret < 0) + return ret; break; case SND_SOC_DAIFMT_I2S: val |= CS4271_MODE1_DAC_DIF_I2S; - snd_soc_update_bits(codec, CS4271_ADCCTL, + ret = snd_soc_update_bits(codec, CS4271_ADCCTL, CS4271_ADCCTL_ADC_DIF_MASK, CS4271_ADCCTL_ADC_DIF_I2S); + if (ret < 0) + return ret; break; default: dev_err(codec->dev, "Invalid DAI format\n"); return -EINVAL; } - snd_soc_update_bits(codec, CS4271_MODE1, + ret = snd_soc_update_bits(codec, CS4271_MODE1, CS4271_MODE1_DAC_DIF_MASK | CS4271_MODE1_MASTER, val); - + if (ret < 0) + return ret; return 0; } @@ -250,7 +256,7 @@ static int cs4271_deemph[] = {0, 44100, 48000, 32000}; static int cs4271_set_deemph(struct snd_soc_codec *codec) { struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec); - int i; + int i, ret; int val = CS4271_DACCTL_DEM_DIS; if (cs4271->deemph) { @@ -263,8 +269,11 @@ static int cs4271_set_deemph(struct snd_soc_codec *codec) val <<= 4; } - return snd_soc_update_bits(codec, CS4271_DACCTL, + ret = snd_soc_update_bits(codec, CS4271_DACCTL, CS4271_DACCTL_DEM_MASK, val); + if (ret < 0) + return ret; + return 0; } static int cs4271_get_deemph(struct snd_kcontrol *kcontrol, @@ -294,7 +303,8 @@ static int cs4271_hw_params(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_codec *codec = rtd->codec; struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec); - unsigned int i, ratio, val; + int i, ret; + unsigned int ratio, val; cs4271->rate = params_rate(params); ratio = cs4271->mclk / cs4271->rate; @@ -315,8 +325,10 @@ static int cs4271_hw_params(struct snd_pcm_substream *substream, else val |= cs4271_clk_tab[i].mclk_slave; - snd_soc_update_bits(codec, CS4271_MODE1, + ret = snd_soc_update_bits(codec, CS4271_MODE1, CS4271_MODE1_MODE_MASK | CS4271_MODE1_DIV_MASK, val); + if (ret < 0) + return ret; return cs4271_set_deemph(codec); } @@ -324,6 +336,7 @@ static int cs4271_hw_params(struct snd_pcm_substream *substream, static int cs4271_digital_mute(struct snd_soc_dai *dai, int mute) { struct snd_soc_codec *codec = dai->codec; + int ret; int val_a = 0; int val_b = 0; @@ -332,8 +345,12 @@ static int cs4271_digital_mute(struct snd_soc_dai *dai, int mute) val_b = CS4271_VOLB_MUTE; } - snd_soc_update_bits(codec, CS4271_VOLA, CS4271_VOLA_MUTE, val_a); - snd_soc_update_bits(codec, CS4271_VOLB, CS4271_VOLB_MUTE, val_b); + ret = snd_soc_update_bits(codec, CS4271_VOLA, CS4271_VOLA_MUTE, val_a); + if (ret < 0) + return ret; + ret = snd_soc_update_bits(codec, CS4271_VOLB, CS4271_VOLB_MUTE, val_b); + if (ret < 0) + return ret; return 0; } @@ -392,17 +409,25 @@ struct snd_soc_dai_driver cs4271_dai = { #ifdef CONFIG_PM static int cs4271_soc_suspend(struct snd_soc_codec *codec, pm_message_t mesg) { + int ret; /* Set power-down bit */ - snd_soc_update_bits(codec, CS4271_MODE2, 0, CS4271_MODE2_PDN); + ret = snd_soc_update_bits(codec, CS4271_MODE2, 0, CS4271_MODE2_PDN); + if (ret < 0) + return ret; return 0; } static int cs4271_soc_resume(struct snd_soc_codec *codec) { + int ret; /* Restore codec state */ - snd_soc_cache_sync(codec); + ret = snd_soc_cache_sync(codec); + if (ret < 0) + return ret; /* then disable the power-down bit */ - snd_soc_update_bits(codec, CS4271_MODE2, CS4271_MODE2_PDN, 0); + ret = snd_soc_update_bits(codec, CS4271_MODE2, CS4271_MODE2_PDN, 0); + if (ret < 0) + return ret; return 0; } #else @@ -467,9 +492,13 @@ static int cs4271_probe(struct snd_soc_codec *codec) return ret; } - snd_soc_update_bits(codec, CS4271_MODE2, 0, + ret = snd_soc_update_bits(codec, CS4271_MODE2, 0, CS4271_MODE2_PDN | CS4271_MODE2_CPEN); - snd_soc_update_bits(codec, CS4271_MODE2, CS4271_MODE2_PDN, 0); + if (ret < 0) + return ret; + ret = snd_soc_update_bits(codec, CS4271_MODE2, CS4271_MODE2_PDN, 0); + if (ret < 0) + return ret; /* Power-up sequence requires 85 uS */ udelay(85);

3 2