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

[alsa-devel] [PATCH 1/3] ASoC: psc-ac97: Use devm_ioremap_resource()
by Mark Brown 26 Jun '13

26 Jun '13

From: Mark Brown <broonie(a)linaro.org> Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/au1x/psc-ac97.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/sound/soc/au1x/psc-ac97.c b/sound/soc/au1x/psc-ac97.c index 8f1862a..f5a3921 100644 --- a/sound/soc/au1x/psc-ac97.c +++ b/sound/soc/au1x/psc-ac97.c @@ -383,15 +383,9 @@ static int au1xpsc_ac97_drvprobe(struct platform_device *pdev) if (!iores) return -ENODEV; - if (!devm_request_mem_region(&pdev->dev, iores->start, - resource_size(iores), - pdev->name)) - return -EBUSY; - - wd->mmio = devm_ioremap(&pdev->dev, iores->start, - resource_size(iores)); - if (!wd->mmio) - return -EBUSY; + wd->mmio = devm_ioremap_resource(&pdev->dev, iores); + if (IS_ERR(wd->mmio)) + return PTR_ERR(wd->mmio); dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0); if (!dmares) -- 1.8.3.1

1 2

[alsa-devel] [PATCH 1/3] ASoC: psc-ac97: Use devm_ioremap_resource()
by Mark Brown 26 Jun '13

26 Jun '13

Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/au1x/psc-ac97.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/sound/soc/au1x/psc-ac97.c b/sound/soc/au1x/psc-ac97.c index 8f1862a..f5a3921 100644 --- a/sound/soc/au1x/psc-ac97.c +++ b/sound/soc/au1x/psc-ac97.c @@ -383,15 +383,9 @@ static int au1xpsc_ac97_drvprobe(struct platform_device *pdev) if (!iores) return -ENODEV; - if (!devm_request_mem_region(&pdev->dev, iores->start, - resource_size(iores), - pdev->name)) - return -EBUSY; - - wd->mmio = devm_ioremap(&pdev->dev, iores->start, - resource_size(iores)); - if (!wd->mmio) - return -EBUSY; + wd->mmio = devm_ioremap_resource(&pdev->dev, iores); + if (IS_ERR(wd->mmio)) + return PTR_ERR(wd->mmio); dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0); if (!dmares) -- 1.8.3.1

1 0

Re: [alsa-devel] [PATCH 2/2] ASoC: samsung-ac97: Convert to devm_ioremap_resource()
by Mark Brown 26 Jun '13

26 Jun '13

On Wed, Jun 26, 2013 at 12:10:15PM +0200, Tomasz Figa wrote: > By the way, Mark, does this driver work for you? I have tried it on both > mini6410 and smdk6410 (configured to use the onboard AC97 codec), with both > old and new DMA drivers and I couldn't get it to play a single sound. I've no access to any hardware which might use this driver, though IIRC it didn't work last time I did have such access.

1 0

[alsa-devel] [PATCH] ASoC: samsung-ac97: Convert to devm_ioremap_resource()
by Mark Brown 26 Jun '13

26 Jun '13

Reviewed-by: Jingoo Han <jg1.han(a)samsung.com> Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/samsung/ac97.c | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c index 1c85999..04d7fd4 100644 --- a/sound/soc/samsung/ac97.c +++ b/sound/soc/samsung/ac97.c @@ -417,11 +417,9 @@ static int s3c_ac97_probe(struct platform_device *pdev) return -ENXIO; } - if (!request_mem_region(mem_res->start, - resource_size(mem_res), "ac97")) { - dev_err(&pdev->dev, "Unable to request register region\n"); - return -EBUSY; - } + s3c_ac97.regs = devm_ioremap_resource(&pdev->dev, mem_res); + if (IS_ERR(s3c_ac97.regs)) + return PTR_ERR(s3c_ac97.regs); s3c_ac97_pcm_out.channel = dmatx_res->start; s3c_ac97_pcm_out.dma_addr = mem_res->start + S3C_AC97_PCM_DATA; @@ -433,13 +431,6 @@ static int s3c_ac97_probe(struct platform_device *pdev) init_completion(&s3c_ac97.done); mutex_init(&s3c_ac97.lock); - s3c_ac97.regs = ioremap(mem_res->start, resource_size(mem_res)); - if (s3c_ac97.regs == NULL) { - dev_err(&pdev->dev, "Unable to ioremap register region\n"); - ret = -ENXIO; - goto err1; - } - s3c_ac97.ac97_clk = devm_clk_get(&pdev->dev, "ac97"); if (IS_ERR(s3c_ac97.ac97_clk)) { dev_err(&pdev->dev, "ac97 failed to get ac97_clock\n"); @@ -481,16 +472,13 @@ err4: err3: clk_disable_unprepare(s3c_ac97.ac97_clk); err2: - iounmap(s3c_ac97.regs); -err1: - release_mem_region(mem_res->start, resource_size(mem_res)); return ret; } static int s3c_ac97_remove(struct platform_device *pdev) { - struct resource *mem_res, *irq_res; + struct resource *irq_res; asoc_dma_platform_unregister(&pdev->dev); snd_soc_unregister_component(&pdev->dev); @@ -501,12 +489,6 @@ static int s3c_ac97_remove(struct platform_device *pdev) clk_disable_unprepare(s3c_ac97.ac97_clk); - iounmap(s3c_ac97.regs); - - mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (mem_res) - release_mem_region(mem_res->start, resource_size(mem_res)); - return 0; } -- 1.8.3.1

1 0

[alsa-devel] [PATCH 1/2] ASoC: samsung-ac97: Use devm_clk_get()
by Mark Brown 26 Jun '13

26 Jun '13

Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/samsung/ac97.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c index cb88ead..1c85999 100644 --- a/sound/soc/samsung/ac97.c +++ b/sound/soc/samsung/ac97.c @@ -440,7 +440,7 @@ static int s3c_ac97_probe(struct platform_device *pdev) goto err1; } - s3c_ac97.ac97_clk = clk_get(&pdev->dev, "ac97"); + s3c_ac97.ac97_clk = devm_clk_get(&pdev->dev, "ac97"); if (IS_ERR(s3c_ac97.ac97_clk)) { dev_err(&pdev->dev, "ac97 failed to get ac97_clock\n"); ret = -ENODEV; @@ -480,7 +480,6 @@ err5: err4: err3: clk_disable_unprepare(s3c_ac97.ac97_clk); - clk_put(s3c_ac97.ac97_clk); err2: iounmap(s3c_ac97.regs); err1: @@ -501,7 +500,6 @@ static int s3c_ac97_remove(struct platform_device *pdev) free_irq(irq_res->start, NULL); clk_disable_unprepare(s3c_ac97.ac97_clk); - clk_put(s3c_ac97.ac97_clk); iounmap(s3c_ac97.regs); -- 1.8.3.1

1 1

[alsa-devel] [PATCH alsa-lib 1/2] pcm_hw: Remove unused fields in struct
by David Henningsson 26 Jun '13

26 Jun '13

These fields are not used, and their name similarity to other fields are quite confusing when trying to debug alsa-lib. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- src/pcm/pcm_hw.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c index 0f3226d..196393d 100644 --- a/src/pcm/pcm_hw.c +++ b/src/pcm/pcm_hw.c @@ -95,8 +95,6 @@ typedef struct { volatile struct snd_pcm_mmap_status * mmap_status; struct snd_pcm_mmap_control *mmap_control; struct snd_pcm_sync_ptr *sync_ptr; - snd_pcm_uframes_t hw_ptr; - snd_pcm_uframes_t appl_ptr; int period_event; snd_timer_t *period_timer; struct pollfd period_timer_pfd; -- 1.7.9.5

3 4

[alsa-devel] *.alsa-project.org web services down?
by Arun Raghavan 26 Jun '13

26 Jun '13

Hello, I can't seem to get to alsa-project.org or git.alsa-project.org. Is the web server down? -- Arun

2 1

[alsa-devel] [patch] ALSA: ak4xx-adda: info leak in ak4xxx_capture_source_info()
by Dan Carpenter 26 Jun '13

26 Jun '13

"idx" is controled by the user and can be a negative offset into the input_names[] array. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/i2c/other/ak4xxx-adda.c b/sound/i2c/other/ak4xxx-adda.c index cef813d2..ed726d1 100644 --- a/sound/i2c/other/ak4xxx-adda.c +++ b/sound/i2c/other/ak4xxx-adda.c @@ -571,7 +571,7 @@ static int ak4xxx_capture_source_info(struct snd_kcontrol *kcontrol, struct snd_akm4xxx *ak = snd_kcontrol_chip(kcontrol); int mixer_ch = AK_GET_SHIFT(kcontrol->private_value); const char **input_names; - int num_names, idx; + unsigned int num_names, idx; num_names = ak4xxx_capture_num_inputs(ak, mixer_ch); if (!num_names)

2 1

[alsa-devel] PulseAudio and softvol
by Arun Raghavan 26 Jun '13

26 Jun '13

Hello, A number of users have intermittently(?) been hitting a crash in alsa-lib 1.0.27 [1, 2] related to the softvol plugin. I'm not able to reproduce this reliably, so can't find an easy way to debug/fix. However, this raises a tangential question - why do we need softvol to be plugged for 'front' at all? David explained to me that this is to guarantee the existence of a PCM control. Perhaps I don't fully understand this, because I'm unconvinced by the reason. Could someone explain/refute? This is especially bad for us, from PulseAudio's perspective, because we aren't getting a zero-copy path. Cheers, Arun [1] https://bugzilla.redhat.com/show_bug.cgi?id=953352 [2] https://bugs.freedesktop.org/show_bug.cgi?id=64299

5 25

[alsa-devel] [PATCH 1/3] clk: mxs: clk-imx28: Provide a dummy clock
by Fabio Estevam 26 Jun '13

26 Jun '13

Sometimes it is useful to be able to pass a dummy clock for a driver. Add support for a dummy clock. Cc: Mike Turquette <mturquette(a)linaro.org> Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Documentation/devicetree/bindings/clock/imx28-clock.txt | 1 + drivers/clk/mxs/clk-imx28.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/clock/imx28-clock.txt b/Documentation/devicetree/bindings/clock/imx28-clock.txt index e6587af..5a153ef 100644 --- a/Documentation/devicetree/bindings/clock/imx28-clock.txt +++ b/Documentation/devicetree/bindings/clock/imx28-clock.txt @@ -76,6 +76,7 @@ clocks and IDs. usb0_phy 62 usb1_phy 63 enet_out 64 + dummy 65 Examples: diff --git a/drivers/clk/mxs/clk-imx28.c b/drivers/clk/mxs/clk-imx28.c index 4faf0af..6b55211 100644 --- a/drivers/clk/mxs/clk-imx28.c +++ b/drivers/clk/mxs/clk-imx28.c @@ -143,7 +143,7 @@ enum imx28_clk { emi_xtal, lcdif_div, etm_div, ptp, saif0_div, saif1_div, clk32k_div, rtc, lradc, spdif_div, clk32k, pwm, uart, ssp0, ssp1, ssp2, ssp3, gpmi, spdif, emi, saif0, saif1, lcdif, etm, - fec, can0, can1, usb0, usb1, usb0_phy, usb1_phy, enet_out, + fec, can0, can1, usb0, usb1, usb0_phy, usb1_phy, enet_out, dummy, clk_max }; @@ -234,6 +234,7 @@ int __init mx28_clocks_init(void) clks[usb0_phy] = clk_register_gate(NULL, "usb0_phy", "pll0", 0, PLL0CTRL0, 18, 0, &mxs_lock); clks[usb1_phy] = clk_register_gate(NULL, "usb1_phy", "pll1", 0, PLL1CTRL0, 18, 0, &mxs_lock); clks[enet_out] = clk_register_gate(NULL, "enet_out", "pll2", 0, ENET, 18, 0, &mxs_lock); + clks[dummy] = mxs_clk_fixed("dummy", 0); for (i = 0; i < ARRAY_SIZE(clks); i++) if (IS_ERR(clks[i])) { -- 1.8.1.2

3 4