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

[alsa-devel] [PATCH] ASoC: WM8903: Add of_match_table
by Stephen Warren 07 Dec '11

07 Dec '11

This allows the device to be matched against the device tree using the compatible flag directly, as is standard, rather than falling back to matching .id_table against the non-vendor portion of the first compatible property value. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- sound/soc/codecs/wm8903.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index adfbefa..7a14210 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c @@ -2205,6 +2205,12 @@ static __devexit int wm8903_i2c_remove(struct i2c_client *client) return 0; } +static const struct of_device_id wm8903_of_match[] = { + { .compatible = "wlf,wm8903", }, + {}, +}; +MODULE_DEVICE_TABLE(of, wm8903_of_match); + static const struct i2c_device_id wm8903_i2c_id[] = { { "wm8903", 0 }, { } @@ -2215,6 +2221,7 @@ static struct i2c_driver wm8903_i2c_driver = { .driver = { .name = "wm8903", .owner = THIS_MODULE, + .of_match_table = wm8903_of_match, }, .probe = wm8903_i2c_probe, .remove = __devexit_p(wm8903_i2c_remove), -- 1.7.0.4

2 1

[alsa-devel] Support for GT440 HDMI audio
by Andrey Tataranovich 07 Dec '11

07 Dec '11

Hi, Please include following patch to add support for NVidia GT440 HDMI audio. This patch working for me on Debian Squeeze with patched alsa-source 1.0.23-dfsg+4. -- WBR, Andrey Tataranovich

2 2

[alsa-devel] [PATCH 1/5] ASoC: Hold runtime PM references to components of active DAIs
by Mark Brown 07 Dec '11

07 Dec '11

Every device that implements runtime power management for DAIs is doing it in pretty much the same way: in the startup callback they take a runtime PM reference and then in the shutdown callback they release that reference, keeping the device active while the DAI is active. Given the frequency with which this is done and the obviousness of the need to keep the device active in this period factor the code out into the core, taking references on the device for each CPU DAI, CODEC DAI and DMA device in the core. As runtime PM is reference counted this shouldn't interfere with any other reference holding by the drivers, and since (in common with the existing implementations) we don't check for errors on enabling it shouldn't matter if the device actually has runtime PM enabled or not. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/soc-pcm.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 49aa71e..8aa7cec 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -19,6 +19,7 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/delay.h> +#include <linux/pm_runtime.h> #include <linux/slab.h> #include <linux/workqueue.h> #include <sound/core.h> @@ -77,6 +78,10 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) struct snd_soc_dai_driver *codec_dai_drv = codec_dai->driver; int ret = 0; + pm_runtime_get_sync(cpu_dai->dev); + pm_runtime_get_sync(codec_dai->dev); + pm_runtime_get_sync(platform->dev); + mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass); /* startup the audio subsystem */ @@ -233,6 +238,11 @@ platform_err: cpu_dai->driver->ops->shutdown(substream, cpu_dai); out: mutex_unlock(&rtd->pcm_mutex); + + pm_runtime_put(platform->dev); + pm_runtime_put(codec_dai->dev); + pm_runtime_put(cpu_dai->dev); + return ret; } @@ -339,6 +349,11 @@ static int soc_pcm_close(struct snd_pcm_substream *substream) } mutex_unlock(&rtd->pcm_mutex); + + pm_runtime_put(platform->dev); + pm_runtime_put(codec_dai->dev); + pm_runtime_put(cpu_dai->dev); + return 0; } -- 1.7.7.3

2 14

[alsa-devel] [PATCH] ASoC: Convert Samsung I2S driver to devm_kzalloc()
by Mark Brown 07 Dec '11

07 Dec '11

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/samsung/i2s.c | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 5de500c..ff5d919 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -945,7 +945,7 @@ struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec) { struct i2s_dai *i2s; - i2s = kzalloc(sizeof(struct i2s_dai), GFP_KERNEL); + i2s = devm_kzalloc(&pdev->dev, sizeof(struct i2s_dai), GFP_KERNEL); if (i2s == NULL) return NULL; @@ -972,10 +972,8 @@ struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec) i2s->pdev = platform_device_register_resndata(NULL, pdev->name, pdev->id + SAMSUNG_I2S_SECOFF, NULL, 0, NULL, 0); - if (IS_ERR(i2s->pdev)) { - kfree(i2s); + if (IS_ERR(i2s->pdev)) return NULL; - } } /* Pre-assign snd_soc_dai_set_drvdata */ @@ -1048,7 +1046,7 @@ static __devinit int samsung_i2s_probe(struct platform_device *pdev) if (!pri_dai) { dev_err(&pdev->dev, "Unable to alloc I2S_pri\n"); ret = -ENOMEM; - goto err1; + goto err; } pri_dai->dma_playback.dma_addr = regs_base + I2STXD; @@ -1073,7 +1071,7 @@ static __devinit int samsung_i2s_probe(struct platform_device *pdev) if (!sec_dai) { dev_err(&pdev->dev, "Unable to alloc I2S_sec\n"); ret = -ENOMEM; - goto err2; + goto err; } sec_dai->dma_playback.dma_addr = regs_base + I2STXDS; sec_dai->dma_playback.client = @@ -1092,17 +1090,13 @@ static __devinit int samsung_i2s_probe(struct platform_device *pdev) if (i2s_pdata->cfg_gpio && i2s_pdata->cfg_gpio(pdev)) { dev_err(&pdev->dev, "Unable to configure gpio\n"); ret = -EINVAL; - goto err3; + goto err; } snd_soc_register_dai(&pri_dai->pdev->dev, &pri_dai->i2s_dai_drv); return 0; -err3: - kfree(sec_dai); -err2: - kfree(pri_dai); -err1: +err: release_mem_region(regs_base, resource_size(res)); return ret; @@ -1128,8 +1122,6 @@ static __devexit int samsung_i2s_remove(struct platform_device *pdev) i2s->pri_dai = NULL; i2s->sec_dai = NULL; - kfree(i2s); - snd_soc_unregister_dai(&pdev->dev); return 0; -- 1.7.7.3

2 1

Re: [alsa-devel] [PATCH 5/6] compress: add the core file
by Nallasellan, Singaravelan 06 Dec '11

06 Dec '11

> > The notion of a START threshold isn't self-explanatory for compressed data. The > decoder may or may not have enough data available for specific values of the > threshold, and the behavior would be decoder/implementation specific. > Besides, this was never implemented in the proprietary Intel API we've been using for > 2+ years and no one complained... Even the thread which actually writes the data to ring buffer may not have the idea of frames So the start threshold does not require to be on frame boundaries. It is just to avoid START when the buffer is written with the data. If the write gives more data than the ring buffer, write will not unblock and the user space application may not be able to call START. This will be an issue if you go for non-blocking implementation. Otherwise, START should be called in another thread than the thread which writes the data.

3 3

Re: [alsa-devel] [PATCH v2 5/5] ASoC: WM8903: Add device tree binding
by Stephen Warren 06 Dec '11

06 Dec '11

Rob Herring wrote at Tuesday, December 06, 2011 12:07 PM: > On 12/06/2011 12:22 PM, Stephen Warren wrote: > > Stephen Warren wrote at Friday, December 02, 2011 3:09 PM: > >> Document the device tree binding for the WM8903 codec, and modify the > >> driver to extract platform data from the device tree, if present. > > > > Mark, > > > > I just realized that when I was re-organizing all the WM8903 patches, I > > dropped the part that added the of_match table to the driver: > > > > +static const struct of_device_id wm8903_of_match[] __devinitconst = { > > + { .compatible = "wlf,wm8903", }, > > + {}, > > +}; > > +MODULE_DEVICE_TABLE(of, wm8903_of_match); > > > > Now, everything still works without this. Looking at the Linux OF code, > > it works by retrieving the compatible property, taking everything after > > the comma if present, and then creating an i2c_board_info with that > > type, which in this case is "wm8903" and matches wm8903.c's i2c_device_id > > table. See drivers/of/of_i2c.c:of_i2c_register_devices() and the call to > > base.c:of_modalias_node(). > > > > So, the question is: Should I go back and add the of_match table, or > > is I2C intended to work without it perpetually? I notice that you added > > an of_match table for all the other WM codecs. > > It definitely tries to match first with the OF match table, so it should > probably be added back. OK, I have no issues putting it back. But, I certainly can't find any code in drivers/i2c or drivers/of/of_i2c.c that matches the compatible property against the of_match_table. Can you point it out please. As best I can tell, I2C bus/controller drivers call of_i2c_register_devices() which calls of_modalias_node() which only operates in the manner I described. I don't think any generic instantiation code can be operating instead, since there's nothing in of_i2c_register_devices() that skips devices that have already been instantiated via other means. Nothing in drivers/i2c seems to touch of_node or the compatible property. -- nvpublic

1 0

[alsa-devel] [PATCH] ASoC: Don't fail if we can't read the IRQ type in WM8903
by Mark Brown 06 Dec '11

06 Dec '11

If we fail to read the IRQ type from the interrupt controller don't fail, just assume a value and solider on - we may fail later when we try to request the IRQ but it's possible we'll succeed. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8903.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index adfbefa..21b9fdc 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c @@ -2049,6 +2049,7 @@ static int wm8903_set_pdata_irq_trigger(struct i2c_client *i2c, switch (irqd_get_trigger_type(irq_data)) { case IRQ_TYPE_NONE: + default: /* * We assume the controller imposes no restrictions, * so we are able to select active-high @@ -2060,11 +2061,6 @@ static int wm8903_set_pdata_irq_trigger(struct i2c_client *i2c, case IRQ_TYPE_LEVEL_LOW: pdata->irq_active_low = true; break; - default: - dev_err(&i2c->dev, - "Unsupported IRQ_TYPE %x\n", - irqd_get_trigger_type(irq_data)); - return -EINVAL; } return 0; -- 1.7.7.3

2 1

[alsa-devel] ASoC: Build error if CONFIG_I2C=m && CONFIG_SND_SOC=y
by Axel Lin 06 Dec '11

06 Dec '11

Hi, I got below build error if CONFIG_I2C=m && CONFIG_SND_SOC=y. LD vmlinux sound/built-in.o: In function `snd_soc_codec_set_cache_io': last.c:(.text+0x2a0a8): undefined reference to `regmap_init_i2c' make: *** [vmlinux] Error 1 ( I test the build on linux-next 20111206 ) Regards, Axel

2 1

[alsa-devel] [PATCH] ASoC: Provide a more complete DMA driver stub
by Mark Brown 06 Dec '11

06 Dec '11

Allow userspace applications to do more parameter setting by providing a more complete stub DMA driver specifying a wildcard set of formats and channels and essentially random values for the DMA parameters. This is required for useful runtime operation of the dummy DMA driver until we are able to figure out how to power up links and do hw_params() from DAPM. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/soc-utils.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c index 0c12b98..4220bb0 100644 --- a/sound/soc/soc-utils.c +++ b/sound/soc/soc-utils.c @@ -58,7 +58,36 @@ int snd_soc_params_to_bclk(struct snd_pcm_hw_params *params) } EXPORT_SYMBOL_GPL(snd_soc_params_to_bclk); -static struct snd_soc_platform_driver dummy_platform; +static const struct snd_pcm_hardware dummy_dma_hardware = { + .formats = 0xffffffff, + .channels_min = 1, + .channels_max = UINT_MAX, + + /* Random values to keep userspace happy when checking constraints */ + .info = SNDRV_PCM_INFO_INTERLEAVED | + SNDRV_PCM_INFO_BLOCK_TRANSFER, + .buffer_bytes_max = 128*1024, + .period_bytes_min = PAGE_SIZE, + .period_bytes_max = PAGE_SIZE*2, + .periods_min = 2, + .periods_max = 128, +}; + +static int dummy_dma_open(struct snd_pcm_substream *substream) +{ + snd_soc_set_runtime_hwparams(substream, &dummy_dma_hardware); + + return 0; +} + +static struct snd_pcm_ops dummy_dma_ops = { + .open = dummy_dma_open, + .ioctl = snd_pcm_lib_ioctl, +}; + +static struct snd_soc_platform_driver dummy_platform = { + .ops = &dummy_dma_ops, +}; static __devinit int snd_soc_dummy_probe(struct platform_device *pdev) { -- 1.7.7.3

3 3

Re: [alsa-devel] [PATCH] ALSA: ctxf: Use kcalloc instead of kzalloc to allocate array
by Takashi Iwai 06 Dec '11

06 Dec '11

At Tue, 29 Nov 2011 22:08:00 +0100, Thomas Meyer wrote: > > The advantage of kcalloc is, that will prevent integer overflows which could > result from the multiplication of number of elements and size and it is also > a bit nicer to read. > > The semantic patch that makes this change is available > in https://lkml.org/lkml/2011/11/25/107 > > Signed-off-by: Thomas Meyer <thomas(a)m3y3r.de> Thanks, applied both this and asihpi patches. Takashi > --- > > diff -u -p a/sound/pci/ctxfi/ctsrc.c b/sound/pci/ctxfi/ctsrc.c > --- a/sound/pci/ctxfi/ctsrc.c 2011-11-13 11:08:15.090921741 +0100 > +++ b/sound/pci/ctxfi/ctsrc.c 2011-11-28 20:14:46.651112893 +0100 > @@ -437,7 +437,7 @@ get_src_rsc(struct src_mgr *mgr, const s > > /* Allocate mem for master src resource */ > if (MEMRD == desc->mode) > - src = kzalloc(sizeof(*src)*desc->multi, GFP_KERNEL); > + src = kcalloc(desc->multi, sizeof(*src), GFP_KERNEL); > else > src = kzalloc(sizeof(*src), GFP_KERNEL); > >

1 0