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

[alsa-devel] ASoC updates for 3.4
by Mark Brown 26 Jan '12

26 Jan '12

The following changes since commit dcd6c92267155e70a94b3927bce681ce74b80d1f: Linux 3.3-rc1 (2012-01-19 15:04:48 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git asoc-3.4 for you to fetch changes up to 5509f2f80c711add6bbcec9af7f4bbba2e2cc22b: ASoC: wm5100: Fix warnings from recent patches (2012-01-24 19:51:34 +0000) ---------------------------------------------------------------- A random collection of updates, pretty much all driver specific cleanups of various kinds which have accumilated over the merge window. There's one feature (support for announcing msbits in the core) and a merge over of a new regmap feature (register patches) the initial users for which are a few ASoC drivers. ---------------------------------------------------------------- (I'm also trying this shiny new git signed tags foo, which may well not actually accomplish anything if you're not using a shiny new git 1.7.9 prerelease, though the regmap merge did the right thing at least. If the asoc-3.4 tag can't be pulled correctly then the for-3.4 branch is still there as normal.) Axel Lin (2): ASoC: jz4740: Convert qi_lb60 to use snd_soc_register_card() ASoC: Add __devinit/__devexit annotations at necessary places Dimitris Papastamos (1): ASoC: wm8983: Remove useless snd_kcontrol Fabio Estevam (2): ASoC: sgtl5000: Print revision number in hex ASoC: sgtl5000: Convert to table based DAPM and control init Javier Martin (2): ASoC: Route Mic Bias in Visstrim_M10 board. ASoC: Add external amplifier controls for Visstrim_M10. Joachim Eastwood (2): ASoC: use proper defines for stream directions in pcm engines ASoC: replace 0xffffffff with DMA_BIT_MASK macro Liam Girdwood (3): ASoC: core - Improve card registration error messaging for large DAI links. ASoC: twl6040 - add method to query HS DC offset step size in mV ASoC: utils - Add support for a dummy codec driver. Manjunath Hadli (1): ASoC: CQ93VC: remove machine specific header file inclusion from codec driver Mark Brown (66): ASoC: Mark WM5100 register map cache only when going into BIAS_OFF ASoC: Don't go through cache when applying WM5100 rev A updates ASoC: Disable register synchronisation for low frequency WM8996 SYSCLK ASoC: Make WM8978 I2C usage unconditional ASoC: Remove unused control type from wm8978 driver ASoC: Convert wm8978 to table based DAPM and control init ASoC: Convert wm8978 to devm_kzalloc() ASoC: Use standard cache sync for WM8978 ASoC: Convert wm8978 to direct regmap API usage ASoC: Push wm8978 reset down into the I2C probe ASoC: Convert WM9090 to use regmap directly ASoC: Move WM9090 device identification and reset to I2C probe ASoC: Convert wm8993 to direct regmap API usage ASoC: Move WM8993 resource acquisition and device reset to bus probe ASoC: Convert WM8753 to direct regmap API usage ASoC: Make WM8971 I2C usage unconditional ASoC: Convert wm8971 to table based DAPM and control init ASoC: Convert wm8971 to devm_kzalloc() ASoC: Make wm8974 I2C usage unconditional ASoC: Convert wm8974 to table based DAPM and control init ASoC: Remove wm8974 private data ASoC: Use standard cache sync for wm8804 ASoC: Convert wm8804 to devm_kzalloc() ASoC: Convert wm8804 to direct regmap API usage ASoC: Make WM8904 I2C usage unconditional ASoC: Convert wm8904 to devm_kzalloc() ASoC: Use standard cache sync for WM8904 ASoC: Convert WM8904 to direct regmap API usage ASoC: Make I2C usage unconditional in WM8940 ASoC: Convert WM8940 to devm_kzalloc() ASoC: Make I2C usage unconditional in WM8955 ASoC: Convert WM8955 to devm_kzalloc() ASoC: Use standard register cache sync for WM8955 ASoC: Convert WM8955 to direct regmap API usage ASoC: Convert WM8955 to table based DAPM and control init ASoC: Optimise performance of WM8904 ADC 128fs OSR mode ASoC: Make WM8962 I2C usage unconditional ASoC: Convert WM8962 register access map to modern style ASoC: Add WM8962 DAC and ADC L/R swap support ASoC: Allow drivers to specify how many bits are significant on a DAI ASoC: 24 bits are significant on the WM8996 audio interfaces ASoC: Implement basic WM8993 interrupt support ASoC: Make WM8993 I2C usage unconditional ASoC: 24 bits are significant on wm_hubs DAIs ASoC: When releasing WM5100 put /RESET into reset ASoC: Say we can't read WM5100 ID register ASoC: Remove redundant set_bias_level() from WM5100 remove() ASoC: Make WM5100 interrupt path use regmap directly ASoC: Push WM5100 interrupt request into I2C probe ASoC: Don't tell applications about msbits unless we're ignoring input ASoC: Use regmap update bits operation for drivers using regmap ASoC: Fix build of tlv320dac33 ASoC: wm8985: Convert to devm_kzalloc() ASoC: wm8985: Convert to table based DAPM and control init ASoC: wm8985: Use standard cache sync implementation ASoC: wm8985 Don't directly reference the cache data structure ASoC: wm8985: Convert to direct regmap API usage ASoC: wm8988: Convert to table based DAPM and control init ASoC: wm8988: Convert to devm_kzalloc() ASoC: sgtl5000: It's sgtl5000 not sgtl500 regmap: Support register patch sets ASoC: Convert WM8731 to direct regmap API usage ASoC: wm5100: Fix mismerge of IRQ frees Merge tag 'regmap-patch-initial' of git://git.kernel.org/.../broonie/regmap into for-3.4 ASoC: Convert the WM5100 revision A updates to a regmap patch ASoC: wm5100: Fix warnings from recent patches Peter Ujfalusi (4): ASoC: tlv320dac33: Use core to set the msbits constraint ASoC: twl4030: Use core to set the msbits constraint ASoC: omap-dmic: Use core to set the msbits constraint ASoC: omap-mcpdm: Set 24msbits constraint Ryan Mallon (1): ep93xx: Don't use system controller defines in audio drivers Wolfram Sang (2): ASoC: tlv320aic32x4: always enable dividers ASoC: tlv320aic32x4: always enable analouge block Zeng Zhaoming (1): ASoC: sgtl5000: Fix wrong register name in restore arch/arm/mach-ep93xx/core.c | 19 +- arch/arm/mach-ep93xx/include/mach/platform.h | 2 +- arch/mips/jz4740/board-qi_lb60.c | 6 + drivers/base/regmap/internal.h | 3 + drivers/base/regmap/regcache.c | 11 + drivers/base/regmap/regmap.c | 58 + include/linux/regmap.h | 3 + include/sound/soc.h | 2 + sound/soc/atmel/atmel-pcm.c | 4 +- sound/soc/codecs/alc5623.c | 4 +- sound/soc/codecs/alc5632.c | 2 +- sound/soc/codecs/cq93vc.c | 2 - sound/soc/codecs/sgtl5000.c | 36 +- sound/soc/codecs/tlv320aic32x4.c | 110 +- sound/soc/codecs/tlv320dac33.c | 6 +- sound/soc/codecs/twl4030.c | 7 +- sound/soc/codecs/twl6040.c | 13 + sound/soc/codecs/twl6040.h | 1 + sound/soc/codecs/wm5100.c | 356 +++--- sound/soc/codecs/wm8731.c | 109 ++- sound/soc/codecs/wm8753.c | 186 ++- sound/soc/codecs/wm8804.c | 146 +-- sound/soc/codecs/wm8904.c | 838 ++++-------- sound/soc/codecs/wm8904.h | 11 + sound/soc/codecs/wm8940.c | 14 +- sound/soc/codecs/wm8955.c | 247 ++-- sound/soc/codecs/wm8962.c | 1819 +++++++++----------------- sound/soc/codecs/wm8971.c | 37 +- sound/soc/codecs/wm8974.c | 45 +- sound/soc/codecs/wm8978.c | 185 ++- sound/soc/codecs/wm8978.h | 2 + sound/soc/codecs/wm8983.c | 5 - sound/soc/codecs/wm8985.c | 315 +++-- sound/soc/codecs/wm8988.c | 29 +- sound/soc/codecs/wm8993.c | 599 ++++++--- sound/soc/codecs/wm8994.c | 8 +- sound/soc/codecs/wm8996.c | 8 + sound/soc/codecs/wm8996.h | 4 + sound/soc/codecs/wm9090.c | 266 ++-- sound/soc/davinci/davinci-pcm.c | 4 +- sound/soc/ep93xx/edb93xx.c | 4 +- sound/soc/ep93xx/ep93xx-pcm.c | 4 +- sound/soc/ep93xx/snappercl15.c | 4 +- sound/soc/fsl/fsl_dma.c | 10 +- sound/soc/fsl/mpc5200_dma.c | 16 +- sound/soc/imx/mx27vis-aic32x4.c | 104 ++ sound/soc/jz4740/qi_lb60.c | 56 +- sound/soc/kirkwood/kirkwood-dma.c | 4 +- sound/soc/omap/omap-dmic.c | 7 +- sound/soc/omap/omap-mcpdm.c | 2 + sound/soc/s6000/s6000-pcm.c | 5 +- sound/soc/samsung/dma.c | 2 +- sound/soc/soc-core.c | 33 +- sound/soc/soc-dapm.c | 27 +- sound/soc/soc-io.c | 1 + sound/soc/soc-pcm.c | 38 + sound/soc/soc-utils.c | 20 +- sound/soc/tegra/tegra_pcm.c | 2 +- 58 files changed, 2917 insertions(+), 2944 deletions(-)

2 9

Re: [alsa-devel] soc-dsp programming model for loopbacks
by Mark Brown 26 Jan '12

26 Jan '12

On Wed, Jan 25, 2012 at 12:03:42PM -0800, Pierre-Louis Bossart wrote: > > That's what the CODEC<->CODEC stuff is all about, hiding the link from > > userspace. > I can see how this would simplify the loopback part, but doesn't it make the > 'regular' playback/capture functionality more complex? If my DSP is seen as > a CODEC, how do I represent the CPU-DSP interface (DMA or shared memory)? You'd need a DAI for that interface but you'll need that no matter what you do, it'll just be a very simple DAI that needs no configuration for things like AIF format. With the soc-pcm setup you also need the front and back end DAIs so it's about the same, the benefit comes at runtime. My primary focus for the CODEC<->CODEC links is actually things like basebands rather than on-SoC DSPs, it's just that if the hardware can be thought of in the same way it should simplify things a little.

3 5

[alsa-devel] [PATCH 3/3] ASoC: dt: tegra: Enable headphone autodetection on PAZ00 board.
by Leon Romanovsky 26 Jan '12

26 Jan '12

This patch is adding support of headphone autodetection on PAZ00 board. Signed-off-by: Leon Romanovsky <leon(a)leon.nu> --- arch/arm/boot/dts/tegra-paz00.dts | 1 + sound/soc/tegra/tegra_alc5632.c | 40 +++++++++++++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts index 692d20c..f95bade 100644 --- a/arch/arm/boot/dts/tegra-paz00.dts +++ b/arch/arm/boot/dts/tegra-paz00.dts @@ -64,6 +64,7 @@ nvidia,audio-codec = <&alc5632>; nvidia,i2s-controller = <&tegra_i2s1>; + nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */ }; serial@70006000 { diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c index 22348e8..ce211af 100644 --- a/sound/soc/tegra/tegra_alc5632.c +++ b/sound/soc/tegra/tegra_alc5632.c @@ -18,6 +18,7 @@ #include <linux/platform_device.h> #include <linux/slab.h> #include <linux/gpio.h> +#include <linux/of_gpio.h> #include <sound/core.h> #include <sound/jack.h> @@ -34,9 +35,14 @@ #define DRV_NAME "tegra-alc5632" +#define GPIO_HP_DET BIT(1) + + struct tegra_alc5632 { struct tegra_asoc_utils_data util_data; struct platform_device *pcm_dev; + int gpio_requested; + int gpio_hp_det; }; static int tegra_alc5632_asoc_hw_params(struct snd_pcm_substream *substream, @@ -86,6 +92,13 @@ static struct snd_soc_jack_pin tegra_alc5632_hs_jack_pins[] = { }, }; +static struct snd_soc_jack_gpio tegra_alc5632_hp_jack_gpio = { + .name = "Headphone detect", + .report = SND_JACK_HEADPHONE, + .debounce_time = 150, + .invert = 1, +}; + static const struct snd_soc_dapm_widget tegra_alc5632_dapm_widgets[] = { SND_SOC_DAPM_SPK("Int Spk", NULL), SND_SOC_DAPM_HP("Headset Stereophone", NULL), @@ -114,6 +127,9 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_codec *codec = rtd->codec; struct snd_soc_dapm_context *dapm = &codec->dapm; + struct device_node *np = codec->card->dev->of_node; + struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(codec->card); + int ret; snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET, &tegra_alc5632_hs_jack); @@ -121,6 +137,16 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd) ARRAY_SIZE(tegra_alc5632_hs_jack_pins), tegra_alc5632_hs_jack_pins); + machine->gpio_hp_det = of_get_named_gpio(np, "nvidia,hp-det-gpios", 0); + + if (gpio_is_valid(machine->gpio_hp_det)) { + tegra_alc5632_hp_jack_gpio.gpio = machine->gpio_hp_det; + snd_soc_jack_add_gpios(&tegra_alc5632_hs_jack, + 1, + &tegra_alc5632_hp_jack_gpio); + machine->gpio_requested |= GPIO_HP_DET; + } + snd_soc_dapm_force_enable_pin(dapm, "MICBIAS1"); return 0; @@ -243,13 +269,19 @@ err: static int __devexit tegra_alc5632_remove(struct platform_device *pdev) { struct snd_soc_card *card = platform_get_drvdata(pdev); - struct tegra_alc5632 *alc5632 = snd_soc_card_get_drvdata(card); + struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(card); + + if (machine->gpio_requested & GPIO_HP_DET) + snd_soc_jack_free_gpios(&tegra_alc5632_hs_jack, + 1, + &tegra_alc5632_hp_jack_gpio); + machine->gpio_requested = 0; snd_soc_unregister_card(card); - tegra_asoc_utils_fini(&alc5632->util_data); - if (!IS_ERR(alc5632->pcm_dev)) - platform_device_unregister(alc5632->pcm_dev); + tegra_asoc_utils_fini(&machine->util_data); + if (!IS_ERR(machine->pcm_dev)) + platform_device_unregister(machine->pcm_dev); return 0; } -- 1.7.3.4

3 2

[alsa-devel] E-mu 1616 PCIe support.
by Сергей Королёв 26 Jan '12

26 Jan '12

Hello, This is my first email to developers' mailing list so I apologise for inconvinience. Yesterday 1.0.25 was released and I was hoping that small patch that fixes E-mu 1616 PCIe support has made it's way up to the final release. It didn't happen. Patch that should be applied to sound/pci/emu10k1/emu10k1_main.c is here - https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5250 So I'm here just to remind you that there are bunch of E-mu users who will be very glad if you will free them from hard burden of recompiling the kernel and adding patch after every new kernel release. Thank you.

1 0

[alsa-devel] [PATCH 2/3] ARM: tegra: Enable the headphone detection gpio on PAZ00 board.
by Leon Romanovsky 26 Jan '12

26 Jan '12

Signed-off-by: Leon Romanovsky <leon(a)leon.nu> --- arch/arm/mach-tegra/board-paz00-pinmux.c | 1 + arch/arm/mach-tegra/board-paz00.h | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-tegra/board-paz00-pinmux.c b/arch/arm/mach-tegra/board-paz00-pinmux.c index c775572..4e261d3 100644 --- a/arch/arm/mach-tegra/board-paz00-pinmux.c +++ b/arch/arm/mach-tegra/board-paz00-pinmux.c @@ -152,6 +152,7 @@ static struct tegra_gpio_table gpio_table[] = { { .gpio = TEGRA_WIFI_PWRN, .enable = true }, { .gpio = TEGRA_WIFI_RST, .enable = true }, { .gpio = TEGRA_WIFI_LED, .enable = true }, + { .gpio = TEGRA_HP_DET, .enable = true }, }; static struct tegra_board_pinmux_conf conf = { diff --git a/arch/arm/mach-tegra/board-paz00.h b/arch/arm/mach-tegra/board-paz00.h index ffa83f5..77c8d83 100644 --- a/arch/arm/mach-tegra/board-paz00.h +++ b/arch/arm/mach-tegra/board-paz00.h @@ -32,6 +32,9 @@ #define TEGRA_WIFI_RST TEGRA_GPIO_PD1 #define TEGRA_WIFI_LED TEGRA_GPIO_PD0 +/* Audio */ +#define TEGRA_HP_DET TEGRA_GPIO_PW2 + /* WakeUp */ #define TEGRA_GPIO_POWERKEY TEGRA_GPIO_PJ7 -- 1.7.3.4

2 2

[alsa-devel] [PATCH] ASoC: dapm: Ignore isolated signal generators for power purposes
by Mark Brown 25 Jan '12

25 Jan '12

A signal generator has no power control itself and so shouldn't cause a power up of the device. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- 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 ff9939c..15c0821 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1435,9 +1435,13 @@ static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event) /* Supplies and micbiases only bring the * context up to STANDBY as unless something * else is active and passing audio they - * generally don't require full power. + * generally don't require full power. Signal + * generators are virtual pins and have no + * power impact themselves. */ switch (w->id) { + case snd_soc_dapm_siggen: + break; case snd_soc_dapm_supply: case snd_soc_dapm_regulator_supply: case snd_soc_dapm_micbias: -- 1.7.9.rc1

1 0

[alsa-devel] [PATCH] ASoC: wm5100: Mark register cache as dirty when regulators are disabled
by Mark Brown 25 Jan '12

25 Jan '12

Otherwise we won't resync later. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm5100.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index 51b281b..273093f 100644 --- a/sound/soc/codecs/wm5100.c +++ b/sound/soc/codecs/wm5100.c @@ -1376,6 +1376,7 @@ static int wm5100_set_bias_level(struct snd_soc_codec *codec, case SND_SOC_BIAS_OFF: regcache_cache_only(wm5100->regmap, true); + regcache_mark_dirty(wm5100->regmap); for (i = 0; i < ARRAY_SIZE(wm5100->adsp1); i++) wm_adsp1_reinit(wm5100->adsp1[i]); regcache_cache_only(wm5100->regmap, true); -- 1.7.9.rc1

1 0

[alsa-devel] [PATCH] ASoC: dapm: Drop runtime PM references asynchronously
by Mark Brown 25 Jan '12

25 Jan '12

We don't really care if any action is taken immediately so let the PM core defer things if it wants to. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/soc-dapm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 131508a..ff9939c 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1285,7 +1285,7 @@ static void dapm_post_sequence_async(void *data, async_cookie_t cookie) dev_err(d->dev, "Failed to turn off bias: %d\n", ret); if (d->dev) - pm_runtime_put_sync(d->dev); + pm_runtime_put(d->dev); } /* If we just powered up then move to active bias */ -- 1.7.9.rc1

1 0

[alsa-devel] [PATCH 1/3] ASoC: wm8996: Mark register cache as dirty when regulators are disabled
by Mark Brown 25 Jan '12

25 Jan '12

Otherwise we won't resync later. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8996.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index e4fa104..4062679 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c @@ -104,7 +104,7 @@ static int wm8996_regulator_event_##n(struct notifier_block *nb, \ struct wm8996_priv *wm8996 = container_of(nb, struct wm8996_priv, \ disable_nb[n]); \ if (event & REGULATOR_EVENT_DISABLE) { \ - regcache_cache_only(wm8996->regmap, true); \ + regcache_mark_dirty(wm8996->regmap); \ } \ return 0; \ } -- 1.7.9.rc1

1 2

[alsa-devel] [PATCH] ASoC: fsi: Remove unneeded empty runtime PM callbacks
by Mark Brown 25 Jan '12

25 Jan '12

The runtime PM core no longer requires any callbacks so don't provide empty ones for it any more. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/sh/fsi.c | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index db6c89a..3241e5b 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -1408,23 +1408,9 @@ static int fsi_resume(struct device *dev) return 0; } -static int fsi_runtime_nop(struct device *dev) -{ - /* Runtime PM callback shared between ->runtime_suspend() - * and ->runtime_resume(). Simply returns success. - * - * This driver re-initializes all registers after - * pm_runtime_get_sync() anyway so there is no need - * to save and restore registers here. - */ - return 0; -} - static struct dev_pm_ops fsi_pm_ops = { .suspend = fsi_suspend, .resume = fsi_resume, - .runtime_suspend = fsi_runtime_nop, - .runtime_resume = fsi_runtime_nop, }; static struct fsi_core fsi1_core = { -- 1.7.9.rc1

1 0