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

[alsa-devel] [PATCH] ASoC: Correct revision display for WM1250-EV1 module
by Mark Brown 14 Aug '11

14 Aug '11

The hardware documentation uses revision numbers starting at 1. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm1250-ev1.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm1250-ev1.c b/sound/soc/codecs/wm1250-ev1.c index a98a3ff1..4523c4c 100644 --- a/sound/soc/codecs/wm1250-ev1.c +++ b/sound/soc/codecs/wm1250-ev1.c @@ -74,7 +74,7 @@ static int __devinit wm1250_ev1_probe(struct i2c_client *i2c, return -ENODEV; } - dev_info(&i2c->dev, "revision %d\n", rev); + dev_info(&i2c->dev, "revision %d\n", rev + 1); return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_wm1250_ev1, &wm1250_ev1_dai, 1); -- 1.7.5.4

1 0

[alsa-devel] [PATCH 1/4] ASoC: DAPM: Allow multiple mixer sources to be routed via the same switch
by Lars-Peter Clausen 14 Aug '11

14 Aug '11

Currently it is only possible to route one source per switch into a mixer. This patch modifies the code, so that it is possible to route multiple sources into a mixer via the same switch. One use-case for this is routing a stereo channel pair into a mono-mixer via the same switch. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- sound/soc/soc-dapm.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index c265311..170c4ff 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -443,6 +443,11 @@ static int dapm_new_mixer(struct snd_soc_dapm_widget *w) if (path->name != (char *)w->kcontrol_news[i].name) continue; + if (w->kcontrols[i]) { + path->kcontrol = w->kcontrols[i]; + continue; + } + wlistsize = sizeof(struct snd_soc_dapm_widget_list) + sizeof(struct snd_soc_dapm_widget *), wlist = kzalloc(wlistsize, GFP_KERNEL); @@ -1556,7 +1561,6 @@ static int dapm_mixer_update_power(struct snd_soc_dapm_widget *widget, /* found, now check type */ found = 1; path->connect = connect; - break; } if (found) -- 1.7.2.5

3 16

[alsa-devel] [PATCH 1/3] soc/soc-io.c: Use regmap_init_{i2c, spi} only if it's available
by Vasily Khoruzhick 14 Aug '11

14 Aug '11

Otherwise we get linker error like: ERROR: "regmap_init_spi" [sound/soc/snd-soc-core.ko] undefined! Signed-off-by: Vasily Khoruzhick <anarsoul(a)gmail.com> --- sound/soc/soc-io.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c index e471ed6..c1565e4 100644 --- a/sound/soc/soc-io.c +++ b/sound/soc/soc-io.c @@ -122,16 +122,18 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec, config.val_bits = data_bits; switch (control) { +#ifdef CONFIG_REGMAP_I2C case SND_SOC_I2C: codec->control_data = regmap_init_i2c(to_i2c_client(codec->dev), &config); break; - +#endif +#ifdef CONFIG_REGMAP_SPI case SND_SOC_SPI: codec->control_data = regmap_init_spi(to_spi_device(codec->dev), &config); break; - +#endif case SND_SOC_REGMAP: /* Device has made its own regmap arrangements */ break; -- 1.7.5.rc3

3 5

Re: [alsa-devel] [PATCH] ASoC: soc-core: Fix checking return value of debugfs_create_dir
by Mark Brown 14 Aug '11

14 Aug '11

On Sun, Aug 14, 2011 at 11:23:13AM +0800, Axel Lin wrote: > We have CONFIG_DEBUG_FS guard around the place calling debugfs_create_dir, > thus debugfs_create_dir returns NULL on failure. On the other hand the existing code doesn't actually have any problem, the IS_ERR() won't give false positives, so the changelog isn't really accurate and if anything we'll introduce a bug if someone cut'n'pastes the code elsewhere.

1 0

Re: [alsa-devel] [linux-next] ASoC: sound/soc/samsung/i2s.c build failure
by Mark Brown 13 Aug '11

13 Aug '11

On Sat, Aug 13, 2011 at 12:00:43PM +0800, Axel Lin wrote: > CC sound/soc/samsung/i2s.o > sound/soc/samsung/i2s.c:24:18: error: idma.h: No such file or directory > sound/soc/samsung/i2s.c: In function 'samsung_i2s_dai_probe': > sound/soc/samsung/i2s.c:883: error: implicit declaration of function 'idma_reg_addr_init' > make[3]: *** [sound/soc/samsung/i2s.o] Error 1 > make[2]: *** [sound/soc/samsung] Error 2 > make[1]: *** [sound/soc] Error 2 > make: *** [sound] Error 2 > It is caused by commit a0c27ab2421c47dc7c53f797fffcc0d17cdb122c > ASoC: Revert "ASoC: SAMSUNG: Add I2S0 internal dma driver" > To fix the build error, I think we also need to revert > commit 61100f405de5c16a0866de7843ed442090436e6a > "ASoC: SAMSUNG: Modify I2S driver to support idma". This is already fixed by cherry picking back the original commit, it depended on some stuff from Kukjin's tree.

1 0

Re: [alsa-devel] [PATCH] ASoC: wm8750: Fix missing braces around initializer warning
by Mark Brown 13 Aug '11

13 Aug '11

On Sat, Aug 13, 2011 at 11:45:14AM +0800, Axel Lin wrote: > Fix below warning: > CC sound/soc/codecs/wm8750.o > sound/soc/codecs/wm8750.c:784: warning: missing braces around initializer > sound/soc/codecs/wm8750.c:784: warning: (near initialization for 'wm8750_spi_ids[2].name') Takashi already made this change.

1 0

[alsa-devel] [PATCH] ASoC: Support !CONFIG_REGMAP builds
by Mark Brown 13 Aug '11

13 Aug '11

Since we changed regmap to be selected and register per bus rather than via the core only we can't rely on it being enabled by the ASoC core. Support compiling it out. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Reported-by: Axel Lin <axel.lin(a)gmail.com> --- sound/soc/soc-io.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c index be5aac3..3f56d52 100644 --- a/sound/soc/soc-io.c +++ b/sound/soc/soc-io.c @@ -18,6 +18,7 @@ #include <trace/events/asoc.h> +#ifdef CONFIG_REGMAP static int hw_write(struct snd_soc_codec *codec, unsigned int reg, unsigned int value) { @@ -150,4 +151,12 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec, return 0; } EXPORT_SYMBOL_GPL(snd_soc_codec_set_cache_io); - +#else +int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec, + int addr_bits, int data_bits, + enum snd_soc_control_type control) +{ + return -ENOTSUPP; +} +EXPORT_SYMBOL_GPL(snd_soc_codec_set_cache_io); +#endif -- 1.7.5.4

1 0

Re: [alsa-devel] [linux-next] ASoC: build failure with make eseries_pxa_defconfig
by Mark Brown 13 Aug '11

13 Aug '11

On Sat, Aug 13, 2011 at 10:12:01AM +0800, Axel Lin wrote: > In the case of build with "make eseries_pxa_defconfig;make", > both i2c and spi support are not configured. > Thus CONFIG_REGMAP is default to disable. Meh, right. This is all due to Grant insisting on having direct registration functions for each bus, previously we could just select regmap.

1 0

[alsa-devel] ASoC updates for 3.2
by Mark Brown 12 Aug '11

12 Aug '11

The following changes since commit 7ec41ee5ad5f716f67041c0d49014d0becb5332c: ASoC: omap: Update e-mail address of Jarkko Nikula (2011-08-12 11:45:10 +0900) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-3.2 Axel Lin (2): ASoC: soc-io: Add CONFIG_REGMAP_I2C/CONFIG_REGMAP_SPI guards for regmap_init_i2c/regmap_init_spi ASoC: sgtl5000: fix module device table type for sgtl5000_dt_ids Dong Aisheng (5): ASoC: mxs: add mxs-pcm driver ASoC: mxs: add mxs-saif driver ASoC: mxs: add mxs-sgtl5000 machine driver ASoC: mxs: add asoc configuration files ASoC: sgtl5000: add one missed cache reg Liam Girdwood (2): ASoC: dapm - Add DAPM stream completion event. ASoC: dapm - change stream event dbg to vdgb Manuel Lauss (6): ASoC: Alchemy AC97C/I2SC audio support ASoC: Add a DB1x00 AC97 machine driver ALSA: deprecate MIPS AU1X00 AC97 driver ASoC: au1x: remove automatic DMA device registration from PSC drivers ASoC: au1x: update db1200 machine to the new way of things ASoC: au1x: use substream stream info directly Mark Brown (26): ASoC: Add device tree binding for WM8731 ASoC: Trivial formatting fix in soc-core.c ASoC: Implement new DC servo readback mode for late WM8994 revisions ASoC: Support separate left and right channel dcs_codes values ASoC: Parse board ID/revision information from WM1250-EV1 board ASoC: Remove -codec from WM8523 driver name ASoC: Remove redundant -codec from WM8580 driver name Merge branch 'for-3.1' into for-3.2 ASoC: Use new register map API for ASoC generic physical I/O ASoC: Add regmap as a control type Merge branch 'regmap-asoc' into for-3.2 ASoC: Remove unneeded -codec from WM8753 driver name Merge branch 'for-3.1' into for-3.2 ASoC: Update SMDKs for WM8580 -codec removal ASoC: Remove some more redundant -codecs from driver names Merge branch 'for-3.1' into for-3.2 ASoC: Refactor WM8741 regulator handling into CODEC generic code ASoC: Add SPI support for WM8741 ASoC: Fix warning in WM1250-EV1 driver Merge branch 'for-3.1' into for-3.2 ASoC: Specify register defaults for WM8958 MICBIAS1 and MICBIAS2 Merge branch 'for-3.1' into for-3.2 Merge branch 'for-3.1' into for-3.2 Merge branch 'for-3.1' into for-3.2 ASoC: Allow userspace control of Speyside headphone output ASoC: Add bitfield definitions for WM8958 MICBIAS registers Shawn Guo (1): ASoC: sgtl5000: add device tree probe support Stephen Warren (1): ASoC: soc-io: Fix CONFIG_REGMAP_I2C/SPI guards to support regmap modules .../bindings/sound/soc/codecs/fsl-sgtl5000.txt | 11 + Documentation/devicetree/bindings/sound/wm8731.txt | 18 + arch/mips/alchemy/devboards/db1200/platform.c | 16 + arch/mips/alchemy/devboards/db1x00/platform.c | 48 ++ include/linux/mfd/wm8994/registers.h | 39 ++ include/sound/soc-dapm.h | 2 + include/sound/soc.h | 9 + sound/mips/Kconfig | 5 +- sound/soc/Kconfig | 3 + sound/soc/Makefile | 1 + sound/soc/au1x/Kconfig | 28 + sound/soc/au1x/Makefile | 10 + sound/soc/au1x/ac97c.c | 365 +++++++++++ sound/soc/au1x/db1000.c | 75 +++ sound/soc/au1x/db1200.c | 64 ++- sound/soc/au1x/dbdma2.c | 91 +--- sound/soc/au1x/dma.c | 377 +++++++++++ sound/soc/au1x/i2sc.c | 347 ++++++++++ sound/soc/au1x/psc-ac97.c | 48 +- sound/soc/au1x/psc-i2s.c | 42 +- sound/soc/au1x/psc.h | 16 +- sound/soc/codecs/sgtl5000.c | 8 + sound/soc/codecs/wm1250-ev1.c | 20 +- sound/soc/codecs/wm8523.c | 2 +- sound/soc/codecs/wm8580.c | 2 +- sound/soc/codecs/wm8711.c | 4 +- sound/soc/codecs/wm8728.c | 4 +- sound/soc/codecs/wm8731.c | 10 + sound/soc/codecs/wm8741.c | 126 +++- sound/soc/codecs/wm8753.c | 4 +- sound/soc/codecs/wm8993.c | 3 +- sound/soc/codecs/wm8994-tables.c | 4 +- sound/soc/codecs/wm8994.c | 6 +- sound/soc/codecs/wm_hubs.c | 32 +- sound/soc/codecs/wm_hubs.h | 3 +- sound/soc/mxs/Kconfig | 20 + sound/soc/mxs/Makefile | 10 + sound/soc/mxs/mxs-pcm.c | 359 +++++++++++ sound/soc/mxs/mxs-pcm.h | 43 ++ sound/soc/mxs/mxs-saif.c | 677 ++++++++++++++++++++ sound/soc/mxs/mxs-saif.h | 130 ++++ sound/soc/mxs/mxs-sgtl5000.c | 165 +++++ sound/soc/samsung/smdk_wm8580.c | 6 +- sound/soc/samsung/smdk_wm8580pcm.c | 4 +- sound/soc/samsung/speyside.c | 5 +- sound/soc/soc-core.c | 4 +- sound/soc/soc-dapm.c | 6 +- sound/soc/soc-io.c | 323 ++-------- 48 files changed, 3101 insertions(+), 494 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/soc/codecs/fsl-sgtl5000.txt create mode 100644 Documentation/devicetree/bindings/sound/wm8731.txt create mode 100644 sound/soc/au1x/ac97c.c create mode 100644 sound/soc/au1x/db1000.c create mode 100644 sound/soc/au1x/dma.c create mode 100644 sound/soc/au1x/i2sc.c create mode 100644 sound/soc/mxs/Kconfig create mode 100644 sound/soc/mxs/Makefile create mode 100644 sound/soc/mxs/mxs-pcm.c create mode 100644 sound/soc/mxs/mxs-pcm.h create mode 100644 sound/soc/mxs/mxs-saif.c create mode 100644 sound/soc/mxs/mxs-saif.h create mode 100644 sound/soc/mxs/mxs-sgtl5000.c

2 1

[alsa-devel] ASoC updates for 3.1
by Mark Brown 12 Aug '11

12 Aug '11

The following changes since commit 8c285645ab3b05942124020b5f0b89d3b539823a: Merge branch 'wm8996-rename' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc (2011-08-08 10:45:31 +0200) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-3.1 So more changes ended up cooking in -next for the wm8750 than had been anticipated - it should've been a simple SPI driver ID addition but it got messed up for the modular x86_64 builds that I have difficultly in doing while travelling. The change from Sangbeom is another change percolating through after the merge window that I'd forgotten about until Kukjin reminded me. Jarkko Nikula (1): ASoC: omap: Update e-mail address of Jarkko Nikula Mark Brown (8): Merge branch 'for-3.1' of git://git.kernel.org/.../broonie/sound-2.6.git into for-3.1 Merge branch 'fix/asoc' of git://git.kernel.org/.../tiwai/sound-2.6 into for-3.1 ASoC: Fix binding of WM8750 on Jive ASoC: Fix SPI driver binding for WM8987 ASoC: Fix warning in Speyside WM8962 ASoC: Fix typo in wm8750 spi_ids ASoC: Add missing break in WM8994 probe ASoC: Terminate WM8750 SPI device ID table Sangbeom Kim (1): ASoC: SAMSUNG: Add I2S0 internal dma driver Stephen Warren (3): ASoC: Tegra: tegra_pcm_deallocate_dma_buffer: Don't OOPS ASoC: Tegra: wm8903 machine driver: Allow re-insertion of module ASoC: WM8903: Free IRQ on device removal MAINTAINERS | 2 +- include/sound/tlv320aic3x.h | 2 +- sound/soc/codecs/wm8750.c | 8 + sound/soc/codecs/wm8903.c | 5 + sound/soc/codecs/wm8994.c | 1 + 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 +- sound/soc/samsung/Makefile | 2 + sound/soc/samsung/idma.c | 453 +++++++++++++++++++++++++++++++++++ sound/soc/samsung/idma.h | 26 ++ sound/soc/samsung/jive_wm8750.c | 2 +- sound/soc/samsung/speyside_wm8962.c | 2 +- sound/soc/tegra/tegra_pcm.c | 9 +- sound/soc/tegra/tegra_wm8903.c | 15 +- 18 files changed, 526 insertions(+), 19 deletions(-) create mode 100644 sound/soc/samsung/idma.c create mode 100644 sound/soc/samsung/idma.h

2 1