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

[alsa-devel] MP3 files with ALSA
by Oscar Salvador 12 Aug '11

12 Aug '11

Hi, how are you. I started to read the alsa documentation a few days ago, because i want to see how works alsa internally, and because i want to write an audio application (just for fun). Well, with .wav files i don't have any problem, but i have a doubt with mp3 files. I know that i need to decode mp3 into wav, for example, for playing it with alsa, but my doubt is if alsa decode this internally, or if is my job doing it. In the last case, maybe you can give me a web that talking about this. Thanks a lot, Regards

2 1

Re: [alsa-devel] Allocating buffers for USB transfers (again)
by Daniel Mack 12 Aug '11

12 Aug '11

On Fri, Aug 12, 2011 at 6:46 AM, Sarah Sharp <sarah.a.sharp(a)linux.intel.com> wrote: > On Fri, Aug 12, 2011 at 03:28:42AM +0200, Daniel Mack wrote: >> On Fri, Aug 12, 2011 at 1:50 AM, Matěj Laitl <matej(a)laitl.cz> wrote: >> > On 12. 8. 2011 Daniel Mack wrote: >> >> > This patch actually makes the sound playback _worse_. Now I get strange >> >> > squawks where previously at least first seconds of a song sounded >> >> > normally. >> >> > >> >> > However, I no longer get "zero length buffer submitted" or that "... >> >> > Weird." debug messages, only several megabytes of: (should I post these >> >> > somewhere?) >> >> > >> >> > xhci_hcd 0000:05:00.0: Giveback URB ffff880114cec000, len = 880, >> >> > expected = 1000, status = -115 >> >> > xhci_hcd 0000:05:00.0: Giveback URB ffff880114740000, len = 352, >> >> > expected = 1000, status = -115 >> >> > xhci_hcd 0000:05:00.0: underrun event on endpoint >> >> >> >> Might be the hardware doesn't like this. As I said, the patch is blindly >> >> written and I couldn't test it. Did you test this on a EHCI port as well? >> > >> > Good point, this patch distorts the playback also on the EHCI port. (the >> > playback seems to be 10 times slower than it should be) >> >> And it is only this *last* patch that causes it, yes? >> >> If that is the case, we need empty subframes in the middle of urbs, >> and we need to figure a way how to teach the XHCI driver to cope with >> that, too. > > By empty subframes, you mean zero-length frame buffers in the middle of > the URB, correct? Yep. > Andiry and Alan had some suggestions for how to fix > that, so I'll try to cook up a patch tomorrow. Then we'll have to > "unpeel" the debug patches and make sure the system is still usable. Good :) And I'll make a patch to make double-submission impossible in a nice way. Daniel

1 0

[alsa-devel] Template Based Coefficients Setting for Filters
by Ashish Chavan 12 Aug '11

12 Aug '11

Hi, I am working on updating ASoC codec driver for Dialog's DA7210 codec (sound/soc/codec/da7210.c). This update would be a major functionality update in nature. Currently, I am implementing support for GP (general purpose) filters of this codec and need some opinions/comments. Brief info about GP filters: The additional general purpose (GP) filter engine offers up to eight 2nd order biquad filter stages with freely configurable 16 bit coefficients and supports flexible digital audio routing and mixing arrangements. This engine implements transfer function to derive Hz which uses five coefficients, a1, a1, a2, b1 and b2. The coefficients are specified as 16 bit twos-complement numbers. There are total eight blocks which can be interconnected as per requirement. Total number of registers to configure = (5 * 2 * 8) = 80 The GP filters are mainly designed to be used for following modes, (1) Stereo Playback (2) Stereo Capture (3) Capture with monitoring (4) Spatializer mode (5) Left-Sidetone filtering (6) Right-Sidetone filtering (7) Left-Right Sidetone filtering Each of this mode requires different set of coefficients to be programmed in to those 80 registers. My idea of implementation: I believe that it would be quite non practical(because of number of controls required to do that) to provide individual control to set each coefficient independently. What I am thinking is a virtual control named something like, "GP Filter Mode Selection". It would offer above seven options to user. On selection of any option, driver will populate that set of 80 registers with predefined coefficients. It would be like selecting one out of seven predefined templates. (Apart from the coefficients part, some interconnections between these blocks and IOs need to be done to achieve desired mode.) Is this a good/valid way to handle this? Is there any alternative? Thanks, -- Ashish

5 6

[alsa-devel] [PATCH] ASoC: Add device tree binding for WM8753
by Mark Brown 12 Aug '11

12 Aug '11

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- Documentation/devicetree/bindings/sound/wm8753.txt | 18 ++++++++++++++++++ sound/soc/codecs/wm8753.c | 9 +++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/wm8753.txt diff --git a/Documentation/devicetree/bindings/sound/wm8753.txt b/Documentation/devicetree/bindings/sound/wm8753.txt new file mode 100644 index 0000000..e65277a --- /dev/null +++ b/Documentation/devicetree/bindings/sound/wm8753.txt @@ -0,0 +1,18 @@ +WM8753 audio CODEC + +This device supports both I2C and SPI (configured with pin strapping +on the board). + +Required properties: + + - compatible : "wlf,wm8753" + + - reg : the I2C address of the device for I2C, the chip select + number for SPI. + +Example: + +codec: wm8737@1a { + compatible = "wlf,wm8753"; + reg = <0x1a>; +}; diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index a702550..fe04a10 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c @@ -38,6 +38,7 @@ #include <linux/delay.h> #include <linux/pm.h> #include <linux/i2c.h> +#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/spi/spi.h> #include <linux/slab.h> @@ -1490,6 +1491,12 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8753 = { .reg_cache_default = wm8753_reg, }; +static const struct of_device_id wm8753_of_match[] = { + { .compatible = "wlf,wm8753", }, + { } +}; +MODULE_DEVICE_TABLE(of, wm8753_of_match); + #if defined(CONFIG_SPI_MASTER) static int __devinit wm8753_spi_probe(struct spi_device *spi) { @@ -1521,6 +1528,7 @@ static struct spi_driver wm8753_spi_driver = { .driver = { .name = "wm8753", .owner = THIS_MODULE, + .of_match_table = wm8753_of_match, }, .probe = wm8753_spi_probe, .remove = __devexit_p(wm8753_spi_remove), @@ -1565,6 +1573,7 @@ static struct i2c_driver wm8753_i2c_driver = { .driver = { .name = "wm8753", .owner = THIS_MODULE, + .of_match_table = wm8753_of_match, }, .probe = wm8753_i2c_probe, .remove = __devexit_p(wm8753_i2c_remove), -- 1.7.5.4

4 15

Re: [alsa-devel] [uclinux-dist-devel] [PATCH 3.0]ASoC: ad193x: add spi_hw_read, fix sysclk and register definition
by Greg KH 12 Aug '11

12 Aug '11

On Thu, Aug 11, 2011 at 04:52:18AM -0400, Zhang, Sonic wrote: > > > >-----Original Message----- > >From: uclinux-dist-devel-bounces(a)blackfin.uclinux.org > >[mailto:uclinux-dist-devel-bounces@blackfin.uclinux.org] On > >Behalf Of Scott Jiang > >Sent: Thursday, August 11, 2011 4:27 PM > >To: Greg Kroah-Hartman > >Cc: uclinux-dist-devel(a)blackfin.uclinux.org; > >alsa-devel(a)alsa-project.org; stable(a)kernel.org > >Subject: [uclinux-dist-devel] [alsa-devel][PATCH 3.0]ASoC: > >ad193x: add spi_hw_read, fix sysclk and register definition > > > >asoc cache layer can't support this kind of spi registers, so > >bypass cache and read regiters directly > > > > This patch is against stable kernel 3.0 only, the ASOC framework in kernel 3.1 and later are different. Then I need some acks from all of the relevant maintainers before I can apply it to the stable kernel tree. Is there a corrisponding patch in Linus's tree that does the same thing already? greg k-h

4 8

[alsa-devel] [PATCH 1/2] regmap: Specify a module license
by Stephen Warren 12 Aug '11

12 Aug '11

CONFIG_REGMAP_I2C/SPI are set to m when selected by a tristate config option that's set to m. The regmap modules don't specify a license, so fail to link to regmap_init at load time, since that is EXPORT_SYMBOL_GPL. Fix this by specifying a license for the regmap modules. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- drivers/base/regmap/regmap-i2c.c | 1 + drivers/base/regmap/regmap-spi.c | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/base/regmap/regmap-i2c.c b/drivers/base/regmap/regmap-i2c.c index e6ce82d..e7d916d 100644 --- a/drivers/base/regmap/regmap-i2c.c +++ b/drivers/base/regmap/regmap-i2c.c @@ -112,3 +112,4 @@ struct regmap *regmap_init_i2c(struct i2c_client *i2c, } EXPORT_SYMBOL_GPL(regmap_init_i2c); +MODULE_LICENSE("GPL"); diff --git a/drivers/base/regmap/regmap-spi.c b/drivers/base/regmap/regmap-spi.c index 07633bd..cc0f116 100644 --- a/drivers/base/regmap/regmap-spi.c +++ b/drivers/base/regmap/regmap-spi.c @@ -69,3 +69,5 @@ struct regmap *regmap_init_spi(struct spi_device *spi, return regmap_init(&spi->dev, &regmap_spi, config); } EXPORT_SYMBOL_GPL(regmap_init_spi); + +MODULE_LICENSE("GPL"); -- 1.7.0.4

2 3

[alsa-devel] [PATCH] ASoC: omap: Update e-mail address of Jarkko Nikula
by Jarkko Nikula 12 Aug '11

12 Aug '11

My gmail account got disabled and I'm not going to reopen it. Signed-off-by: Jarkko Nikula <jarkko.nikula(a)bitmer.com> --- Be careful about your age in google+ registration... --- MAINTAINERS | 2 +- include/sound/tlv320aic3x.h | 2 +- sound/soc/omap/n810.c | 4 ++-- sound/soc/omap/omap-mcbsp.c | 4 ++-- sound/soc/omap/omap-mcbsp.h | 2 +- sound/soc/omap/omap-pcm.c | 4 ++-- sound/soc/omap/omap-pcm.h | 2 +- sound/soc/omap/rx51.c | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 1f8267f..3e6b34c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4604,7 +4604,7 @@ F: arch/arm/mach-omap2/clockdomain2xxx_3xxx.c F: arch/arm/mach-omap2/clockdomain44xx.c OMAP AUDIO SUPPORT -M: Jarkko Nikula <jhnikula(a)gmail.com> +M: Jarkko Nikula <jarkko.nikula(a)bitmer.com> L: alsa-devel(a)alsa-project.org (subscribers-only) L: linux-omap(a)vger.kernel.org S: Maintained diff --git a/include/sound/tlv320aic3x.h b/include/sound/tlv320aic3x.h index 99e0308..ffd9bc7 100644 --- a/include/sound/tlv320aic3x.h +++ b/include/sound/tlv320aic3x.h @@ -1,7 +1,7 @@ /* * Platform data for Texas Instruments TLV320AIC3x codec * - * Author: Jarkko Nikula <jhnikula(a)gmail.com> + * Author: Jarkko Nikula <jarkko.nikula(a)bitmer.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index 83d213b..62e292f 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c @@ -3,7 +3,7 @@ * * Copyright (C) 2008 Nokia Corporation * - * Contact: Jarkko Nikula <jhnikula(a)gmail.com> + * Contact: Jarkko Nikula <jarkko.nikula(a)bitmer.com> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -402,6 +402,6 @@ static void __exit n810_soc_exit(void) module_init(n810_soc_init); module_exit(n810_soc_exit); -MODULE_AUTHOR("Jarkko Nikula <jhnikula(a)gmail.com>"); +MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula(a)bitmer.com>"); MODULE_DESCRIPTION("ALSA SoC Nokia N810"); MODULE_LICENSE("GPL"); diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 07b7723..ebcc2d4 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -3,7 +3,7 @@ * * Copyright (C) 2008 Nokia Corporation * - * Contact: Jarkko Nikula <jhnikula(a)gmail.com> + * Contact: Jarkko Nikula <jarkko.nikula(a)bitmer.com> * Peter Ujfalusi <peter.ujfalusi(a)ti.com> * * This program is free software; you can redistribute it and/or @@ -780,6 +780,6 @@ static void __exit snd_omap_mcbsp_exit(void) } module_exit(snd_omap_mcbsp_exit); -MODULE_AUTHOR("Jarkko Nikula <jhnikula(a)gmail.com>"); +MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula(a)bitmer.com>"); MODULE_DESCRIPTION("OMAP I2S SoC Interface"); MODULE_LICENSE("GPL"); diff --git a/sound/soc/omap/omap-mcbsp.h b/sound/soc/omap/omap-mcbsp.h index 9a7dedd..65cde9d 100644 --- a/sound/soc/omap/omap-mcbsp.h +++ b/sound/soc/omap/omap-mcbsp.h @@ -3,7 +3,7 @@ * * Copyright (C) 2008 Nokia Corporation * - * Contact: Jarkko Nikula <jhnikula(a)gmail.com> + * Contact: Jarkko Nikula <jarkko.nikula(a)bitmer.com> * Peter Ujfalusi <peter.ujfalusi(a)ti.com> * * This program is free software; you can redistribute it and/or diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index b2f5751..9b5c88a 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c @@ -3,7 +3,7 @@ * * Copyright (C) 2008 Nokia Corporation * - * Contact: Jarkko Nikula <jhnikula(a)gmail.com> + * Contact: Jarkko Nikula <jarkko.nikula(a)bitmer.com> * Peter Ujfalusi <peter.ujfalusi(a)ti.com> * * This program is free software; you can redistribute it and/or @@ -436,6 +436,6 @@ static void __exit snd_omap_pcm_exit(void) } module_exit(snd_omap_pcm_exit); -MODULE_AUTHOR("Jarkko Nikula <jhnikula(a)gmail.com>"); +MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula(a)bitmer.com>"); MODULE_DESCRIPTION("OMAP PCM DMA module"); MODULE_LICENSE("GPL"); diff --git a/sound/soc/omap/omap-pcm.h b/sound/soc/omap/omap-pcm.h index a0ed1db..f95fe30 100644 --- a/sound/soc/omap/omap-pcm.h +++ b/sound/soc/omap/omap-pcm.h @@ -3,7 +3,7 @@ * * Copyright (C) 2008 Nokia Corporation * - * Contact: Jarkko Nikula <jhnikula(a)gmail.com> + * Contact: Jarkko Nikula <jarkko.nikula(a)bitmer.com> * Peter Ujfalusi <peter.ujfalusi(a)ti.com> * * This program is free software; you can redistribute it and/or diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c index 0aae998..893300a 100644 --- a/sound/soc/omap/rx51.c +++ b/sound/soc/omap/rx51.c @@ -5,7 +5,7 @@ * * Contact: Peter Ujfalusi <peter.ujfalusi(a)ti.com> * Eduardo Valentin <eduardo.valentin(a)nokia.com> - * Jarkko Nikula <jhnikula(a)gmail.com> + * Jarkko Nikula <jarkko.nikula(a)bitmer.com> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License -- 1.7.2.5

3 3

Re: [alsa-devel] [uclinux-dist-devel] [PATCH 3.0]ASoC: ad193x: add spi_hw_read, fix sysclk and register definition
by Barry Song 12 Aug '11

12 Aug '11

>>Subject: [uclinux-dist-devel] [alsa-devel][PATCH 3.0]ASoC: >>ad193x: add spi_hw_read, fix sysclk and register definition >> >>asoc cache layer can't support this kind of spi registers, so >>bypass cache and read regiters directly >> > > This patch is against stable kernel 3.0 only, the ASOC framework in kernel 3.1 and later are different. this can't be one patch, but be n patches since it is doing n different work. it is really difficult to understand what the patch is really doing. > > Sonic > >>Signed-off-by: Scott Jiang <scott.jiang.linux(a)gmail.com> -barry

1 0

Re: [alsa-devel] [PATCH] ASoC: sgtl5000: fix module device table type for sgtl5000_dt_ids
by Mark Brown 12 Aug '11

12 Aug '11

On Thu, Aug 11, 2011 at 10:19:16PM +0800, Axel Lin wrote: > The module device table for of_device_id should use "of" type. Applied, thanks.

1 0

[alsa-devel] [PATCH 3.1]ASoC: ad193x: add spi_hw_read, fix sysclk and register definition
by Scott Jiang 12 Aug '11

12 Aug '11

asoc cache layer can't support this kind of spi registers, so bypass cache and read regiters directly Signed-off-by: Scott Jiang <scott.jiang.linux(a)gmail.com> --- sound/soc/blackfin/bf5xx-ad193x.c | 2 +- sound/soc/codecs/ad193x.c | 8 ++++++-- sound/soc/codecs/ad193x.h | 5 +++-- sound/soc/soc-io.c | 23 +++++++++++++++++++++++ 4 files changed, 33 insertions(+), 5 deletions(-) diff --git a/sound/soc/blackfin/bf5xx-ad193x.c b/sound/soc/blackfin/bf5xx-ad193x.c index d6651c0..a118a0f 100644 --- a/sound/soc/blackfin/bf5xx-ad193x.c +++ b/sound/soc/blackfin/bf5xx-ad193x.c @@ -56,7 +56,7 @@ static int bf5xx_ad193x_hw_params(struct snd_pcm_substream *substream, switch (params_rate(params)) { case 48000: - clk = 12288000; + clk = 24576000; break; } diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c index 2374ca5..1447cc8 100644 --- a/sound/soc/codecs/ad193x.c +++ b/sound/soc/codecs/ad193x.c @@ -307,7 +307,8 @@ static int ad193x_hw_params(struct snd_pcm_substream *substream, snd_soc_write(codec, AD193X_PLL_CLK_CTRL0, reg); reg = snd_soc_read(codec, AD193X_DAC_CTRL2); - reg = (reg & (~AD193X_DAC_WORD_LEN_MASK)) | word_len; + reg = (reg & (~AD193X_DAC_WORD_LEN_MASK)) + | (word_len << AD193X_DAC_WORD_LEN_SHFT); snd_soc_write(codec, AD193X_DAC_CTRL2, reg); reg = snd_soc_read(codec, AD193X_ADC_CTRL1); @@ -361,7 +362,10 @@ static int ad193x_probe(struct snd_soc_codec *codec) dev_err(codec->dev, "failed to set cache I/O: %d\n", ret); return ret; } - +#if defined(CONFIG_SPI_MASTER) + /* asoc cache layer can't support this kind of spi registers now */ + codec->cache_bypass = 1; +#endif /* default setting for ad193x */ /* unmute dac channels */ diff --git a/sound/soc/codecs/ad193x.h b/sound/soc/codecs/ad193x.h index 9747b54..cccc2e8 100644 --- a/sound/soc/codecs/ad193x.h +++ b/sound/soc/codecs/ad193x.h @@ -34,7 +34,8 @@ #define AD193X_DAC_LEFT_HIGH (1 << 3) #define AD193X_DAC_BCLK_INV (1 << 7) #define AD193X_DAC_CTRL2 0x804 -#define AD193X_DAC_WORD_LEN_MASK 0xC +#define AD193X_DAC_WORD_LEN_SHFT 3 +#define AD193X_DAC_WORD_LEN_MASK 0x18 #define AD193X_DAC_MASTER_MUTE 1 #define AD193X_DAC_CHNL_MUTE 0x805 #define AD193X_DACL1_MUTE 0 @@ -63,7 +64,7 @@ #define AD193X_ADC_CTRL1 0x80f #define AD193X_ADC_SERFMT_MASK 0x60 #define AD193X_ADC_SERFMT_STEREO (0 << 5) -#define AD193X_ADC_SERFMT_TDM (1 << 2) +#define AD193X_ADC_SERFMT_TDM (1 << 5) #define AD193X_ADC_SERFMT_AUX (2 << 5) #define AD193X_ADC_WORD_LEN_MASK 0x3 #define AD193X_ADC_CTRL2 0x810 diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c index cca490c..a62f7dd 100644 --- a/sound/soc/soc-io.c +++ b/sound/soc/soc-io.c @@ -205,6 +205,25 @@ static unsigned int snd_soc_16_8_read_i2c(struct snd_soc_codec *codec, #define snd_soc_16_8_read_i2c NULL #endif +#if defined(CONFIG_SPI_MASTER) +static unsigned int snd_soc_16_8_read_spi(struct snd_soc_codec *codec, + unsigned int r) +{ + struct spi_device *spi = codec->control_data; + + const u16 reg = cpu_to_be16(r | 0x100); + u8 data; + int ret; + + ret = spi_write_then_read(spi, &reg, 2, &data, 1); + if (ret < 0) + return 0; + return data; +} +#else +#define snd_soc_16_8_read_spi NULL +#endif + static int snd_soc_16_8_write(struct snd_soc_codec *codec, unsigned int reg, unsigned int value) { @@ -295,6 +314,7 @@ static struct { int (*write)(struct snd_soc_codec *codec, unsigned int, unsigned int); unsigned int (*read)(struct snd_soc_codec *, unsigned int); unsigned int (*i2c_read)(struct snd_soc_codec *, unsigned int); + unsigned int (*spi_read)(struct snd_soc_codec *, unsigned int); } io_types[] = { { .addr_bits = 4, .data_bits = 12, @@ -318,6 +338,7 @@ static struct { .addr_bits = 16, .data_bits = 8, .write = snd_soc_16_8_write, .i2c_read = snd_soc_16_8_read_i2c, + .spi_read = snd_soc_16_8_read_spi, }, { .addr_bits = 16, .data_bits = 16, @@ -383,6 +404,8 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec, #ifdef CONFIG_SPI_MASTER codec->hw_write = do_spi_write; #endif + if (io_types[i].spi_read) + codec->hw_read = io_types[i].spi_read; codec->control_data = container_of(codec->dev, struct spi_device, -- 1.7.0.4

2 3