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

[alsa-devel] [PATCH v2] ASoC: soc-compress: Send correct stream event for capture start
by Charles Keepax 20 May '13

20 May '13

Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- sound/soc/soc-compress.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 3853f7e..06a8000 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -220,8 +220,12 @@ static int soc_compr_set_params(struct snd_compr_stream *cstream, goto err; } - snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_PLAYBACK, - SND_SOC_DAPM_STREAM_START); + if (cstream->direction == SND_COMPRESS_PLAYBACK) + snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_PLAYBACK, + SND_SOC_DAPM_STREAM_START); + else + snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_CAPTURE, + SND_SOC_DAPM_STREAM_START); /* cancel any delayed stream shutdown that is pending */ rtd->pop_wait = 0; -- 1.7.2.5

2 1

Re: [alsa-devel] [PATCH] ASoC: max98090: request IRQF_ONESHOT interrupt
by Mark Brown 20 May '13

20 May '13

On Sun, May 19, 2013 at 10:58:07PM -0700, Andrew Bresticker wrote: > request_threaded_irq() rejects calls which both do not specify a handler > (indicating that the primary IRQ handler should be used) and do not set > IRQF_ONESHOT because the combination is unsafe with level-triggered > interrupts. It is safe in this case, though, since max98090 IRQs are Applied, thanks. If request_threaded_irq() is rejecting these that's not ideal - some threaded interrupts can only be generated from within threaded context and therefore can't have primary handlers. Unless it only rejects in the case where the parent IRQ is a hard IRQ of course.

1 0

[alsa-devel] [PATCH 0/2 V3] Power-well API implementation for Haswell
by Wang Xingchao 20 May '13

20 May '13

Hi all, This is V3 and some fixes after Takashi's review. change between V2-->V3: - make SND_HDA_I915 selectable - use snd_printdd to output message - add return error code check - use symbol_request to replace symbol_get - release power_well at azx_free - some typo fixes changes between V1-->V2: - use reference count to track power-well usage - remove external module, compiled into snd-hda-intel instead - manage symbols and module loading properly - remove IS_HSW macro, use flag instead - remove audio callback for gfx driver to avoid dependency - split whole patch into two pieces for easy review - more typo fixes Wang Xingchao (2): drm/915: Add private api for power well usage ALSA: hda - Add power-welll support for haswell HDA drivers/gpu/drm/i915/intel_pm.c | 76 +++++++++++++++++++++++++++++++++++---- include/drm/i915_powerwell.h | 36 +++++++++++++++++++ sound/pci/hda/Kconfig | 10 ++++++ sound/pci/hda/Makefile | 3 ++ sound/pci/hda/hda_i915.c | 75 ++++++++++++++++++++++++++++++++++++++ sound/pci/hda/hda_i915.h | 35 ++++++++++++++++++ sound/pci/hda/hda_intel.c | 41 +++++++++++++++++++-- 7 files changed, 262 insertions(+), 10 deletions(-) create mode 100644 include/drm/i915_powerwell.h create mode 100644 sound/pci/hda/hda_i915.c create mode 100644 sound/pci/hda/hda_i915.h -- 1.7.9.5

3 6

Re: [alsa-devel] [PATCH v2] ASoC: dfbmcs320: make the driver common for other BT modules
by Mark Brown 18 May '13

18 May '13

On Fri, May 17, 2013 at 10:19:37AM +0800, Barry Song wrote: > DFBM-CS320 is only one of bluetooth modules using CSR bluetooth chips, > we don't want everyone to have a seperate codec driver. anyway, the > feature of Bluetooth handsfree is same on all platforms, so this patch > makes the DFBM-CS320 driver become a common BT handsfree driver. Sorry, should have thought of this before but why are we calling this "handsfree"? It's just a generic bluetooth link as far as the host system is concerned, "bt-sco" might be more appropriate? Otherwise this looks OK for ASoC though I'd expect to see a change to registration of the OpenMoko BT device (perhaps I missed it though).

3 4

[alsa-devel] [patch] ASoC: wm8994: missing break in wm8994_get_fll_config()
by Dan Carpenter 18 May '13

18 May '13

Smatch complains that: sound/soc/codecs/wm8994.c:2087 wm8994_get_fll_config() warn: missing break? reassigning 'fll->k' Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 9f32dd8..303d755 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -2080,6 +2080,7 @@ static int wm8994_get_fll_config(struct wm8994 *control, struct fll_div *fll, fll->k = K / 10; pr_debug("N=%x K=%x\n", fll->n, fll->k); + break; default: gcd_fll = gcd(freq_out, freq_in);

2 1

[alsa-devel] [PATCH v3] ASoC: dfbmcs320: make the driver common for other BT modules
by Barry Song 18 May '13

18 May '13

DFBM-CS320 is only one of bluetooth modules using CSR bluetooth chips, we don't want everyone to have a seperate codec driver. anyway, the feature of Bluetooth SCO is same on all platforms, so this patch makes the DFBM-CS320 driver become a common BT SCO link driver. Cc: Graeme Gregory <graeme(a)openmoko.org> Cc: Lars-Peter Clausen <lars(a)metafoo.de> Signed-off-by: Barry Song <Baohua.Song(a)csr.com> --- -v3: rename to sco according to Mark's comment sound/soc/codecs/Kconfig | 4 ++-- sound/soc/codecs/Makefile | 4 ++-- sound/soc/codecs/{dfbmcs320.c => bt-sco.c} | 37 +++++++++++++++++++----------- sound/soc/samsung/neo1973_wm8753.c | 2 +- 4 files changed, 28 insertions(+), 19 deletions(-) rename sound/soc/codecs/{dfbmcs320.c => bt-sco.c} (53%) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index d8c4f3d..386292d 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -40,7 +40,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_DA7213 if I2C select SND_SOC_DA732X if I2C select SND_SOC_DA9055 if I2C - select SND_SOC_DFBMCS320 + select SND_SOC_BT_SCO select SND_SOC_ISABELLE if I2C select SND_SOC_JZ4740_CODEC select SND_SOC_LM4857 if I2C @@ -263,7 +263,7 @@ config SND_SOC_DA732X config SND_SOC_DA9055 tristate -config SND_SOC_DFBMCS320 +config SND_SOC_BT_SCO tristate config SND_SOC_DMIC diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 49ff127..82aa34e 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -27,7 +27,7 @@ snd-soc-da7210-objs := da7210.o snd-soc-da7213-objs := da7213.o snd-soc-da732x-objs := da732x.o snd-soc-da9055-objs := da9055.o -snd-soc-dfbmcs320-objs := dfbmcs320.o +snd-soc-bt-sco-objs := bt-sco.o snd-soc-dmic-objs := dmic.o snd-soc-isabelle-objs := isabelle.o snd-soc-jz4740-codec-objs := jz4740.o @@ -154,7 +154,7 @@ obj-$(CONFIG_SND_SOC_DA7210) += snd-soc-da7210.o obj-$(CONFIG_SND_SOC_DA7213) += snd-soc-da7213.o obj-$(CONFIG_SND_SOC_DA732X) += snd-soc-da732x.o obj-$(CONFIG_SND_SOC_DA9055) += snd-soc-da9055.o -obj-$(CONFIG_SND_SOC_DFBMCS320) += snd-soc-dfbmcs320.o +obj-$(CONFIG_SND_SOC_BT_SCO) += snd-soc-bt-sco.o obj-$(CONFIG_SND_SOC_DMIC) += snd-soc-dmic.o obj-$(CONFIG_SND_SOC_ISABELLE) += snd-soc-isabelle.o obj-$(CONFIG_SND_SOC_JZ4740_CODEC) += snd-soc-jz4740-codec.o diff --git a/sound/soc/codecs/dfbmcs320.c b/sound/soc/codecs/bt-sco.c similarity index 53% rename from sound/soc/codecs/dfbmcs320.c rename to sound/soc/codecs/bt-sco.c index 4f4f7f4..a081d9f 100644 --- a/sound/soc/codecs/dfbmcs320.c +++ b/sound/soc/codecs/bt-sco.c @@ -1,5 +1,5 @@ /* - * Driver for the DFBM-CS320 bluetooth module + * Driver for generic Bluetooth SCO link * Copyright 2011 Lars-Peter Clausen <lars(a)metafoo.de> * * This program is free software; you can redistribute it and/or modify it @@ -15,8 +15,8 @@ #include <sound/soc.h> -static struct snd_soc_dai_driver dfbmcs320_dai = { - .name = "dfbmcs320-pcm", +static struct snd_soc_dai_driver bt_sco_dai = { + .name = "bt-sco-pcm", .playback = { .channels_min = 1, .channels_max = 1, @@ -31,32 +31,41 @@ static struct snd_soc_dai_driver dfbmcs320_dai = { }, }; -static struct snd_soc_codec_driver soc_codec_dev_dfbmcs320; +static struct snd_soc_codec_driver soc_codec_dev_bt_sco; -static int dfbmcs320_probe(struct platform_device *pdev) +static int bt_sco_probe(struct platform_device *pdev) { - return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_dfbmcs320, - &dfbmcs320_dai, 1); + return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_bt_sco, + &bt_sco_dai, 1); } -static int dfbmcs320_remove(struct platform_device *pdev) +static int bt_sco_remove(struct platform_device *pdev) { snd_soc_unregister_codec(&pdev->dev); return 0; } -static struct platform_driver dfmcs320_driver = { +static struct platform_device_id bt_sco_driver_ids[] = { + { + .name = "dfbmcs320", + }, + {}, +}; +MODULE_DEVICE_TABLE(platform, bt_sco_driver_ids); + +static struct platform_driver bt_sco_driver = { .driver = { - .name = "dfbmcs320", + .name = "bt-sco", .owner = THIS_MODULE, }, - .probe = dfbmcs320_probe, - .remove = dfbmcs320_remove, + .probe = bt_sco_probe, + .remove = bt_sco_remove, + .id_table = bt_sco_driver_ids, }; -module_platform_driver(dfmcs320_driver); +module_platform_driver(bt_sco_driver); MODULE_AUTHOR("Lars-Peter Clausen <lars(a)metafoo.de>"); -MODULE_DESCRIPTION("ASoC DFBM-CS320 bluethooth module driver"); +MODULE_DESCRIPTION("ASoC generic bluethooth sco link driver"); MODULE_LICENSE("GPL"); diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c index e591c38..807db41 100644 --- a/sound/soc/samsung/neo1973_wm8753.c +++ b/sound/soc/samsung/neo1973_wm8753.c @@ -373,7 +373,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { { /* Voice via BT */ .name = "Bluetooth", .stream_name = "Voice", - .cpu_dai_name = "dfbmcs320-pcm", + .cpu_dai_name = "bt-sco-pcm", .codec_dai_name = "wm8753-voice", .codec_name = "wm8753.0-001a", .ops = &neo1973_voice_ops, -- 1.8.2.3

1 0

[alsa-devel] [PATCH 0/6] Second set of fixes for ux500 ASoC drivers
by Fabio Baltieri 18 May '13

18 May '13

Hi, These are some others fixes for various small issues I found while testing the ux500 ASoC driver on -next. Patch 1 adds some missing declarations for AD controls that were causing some weird behaviour in alsamixer, as the default state was outside the declared range. Patch 2 fixes a kernel crash when opening and closing the audio device without sending any data. Patch 3 drops pinctrl code altogether from the driver. The actual implementation is buggy as the pins are only registered to the playback interfaces, which gives a bunch of warnings during kernel startup and also kills the capture interface by setting the shared pins to hi-z mode even if that's still active. As putting those pins in high-z is not really needed and was removed from the internal STE driver anyway, I'm just dropping that code form here as well. In parallel, I'm sending a pinctrl patch to declare those pin as a hog. Patches 4 to 6 fixes some weirdness with time slot usage. After this series the driver seems to work fine for both capture and playback interface (tested on a snowball v11). Thanks, Fabio Fabio Baltieri (6): ASoC: ab8500-codec: Add missing ad_to_slot definitions ASoC: ux500: Do not clear state if already idle ASoC: ux500: Drop pinctrl sleep support ASoC: ux500: Update tx tdm slots configuration ASoC: ux500: Swap even/odd AD slot definitions ASoC: ux500: Use the first two AD slots for capture sound/soc/codecs/ab8500-codec.c | 39 +++++++++++++++------------ sound/soc/codecs/ab8500-codec.h | 36 ++++++++++++------------- sound/soc/ux500/mop500_ab8500.c | 4 +-- sound/soc/ux500/ux500_msp_i2s.c | 58 +++-------------------------------------- sound/soc/ux500/ux500_msp_i2s.h | 6 ----- 5 files changed, 46 insertions(+), 97 deletions(-) -- 1.8.2

4 54

[alsa-devel] [PATCH] ASoC: soc-compress: Send correct stream event for capture start
by Charles Keepax 17 May '13

17 May '13

Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- Sorry little bug I missed due to some integration bugs in our setup here. Again this applies onto Takashi's sound for-next branch. Thanks, Charles sound/soc/soc-compress.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 3853f7e..a5107df 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -220,8 +220,13 @@ static int soc_compr_set_params(struct snd_compr_stream *cstream, goto err; } - snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_PLAYBACK, - SND_SOC_DAPM_STREAM_START); + if (cstream->direction == SND_COMPRESS_PLAYBACK) { + snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_PLAYBACK, + SND_SOC_DAPM_STREAM_START); + } else { + snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_CAPTURE, + SND_SOC_DAPM_STREAM_START); + } /* cancel any delayed stream shutdown that is pending */ rtd->pop_wait = 0; -- 1.7.2.5

2 1

[alsa-devel] [PATCH] ASoC: wm8994: Handle LRCLK inversion for WM8958 and WM1811A
by Mark Brown 17 May '13

17 May '13

On WM8958 and WM1811A separate control of the LRCLK inversion bit is available for the DAC and ADC LRCLKs which for compatibility reasons is done in a new register bit. Since writes to each scheme have no effect on parts using the other just always write to both for simplicity. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8994.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index ab7ebd9..74238bd 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -2573,17 +2573,24 @@ static int wm8994_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) struct wm8994 *control = wm8994->wm8994; int ms_reg; int aif1_reg; + int dac_reg; + int adc_reg; int ms = 0; int aif1 = 0; + int lrclk = 0; switch (dai->id) { case 1: ms_reg = WM8994_AIF1_MASTER_SLAVE; aif1_reg = WM8994_AIF1_CONTROL_1; + dac_reg = WM8994_AIF1DAC_LRCLK; + adc_reg = WM8994_AIF1ADC_LRCLK; break; case 2: ms_reg = WM8994_AIF2_MASTER_SLAVE; aif1_reg = WM8994_AIF2_CONTROL_1; + dac_reg = WM8994_AIF1DAC_LRCLK; + adc_reg = WM8994_AIF1ADC_LRCLK; break; default: return -EINVAL; @@ -2602,6 +2609,7 @@ static int wm8994_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { case SND_SOC_DAIFMT_DSP_B: aif1 |= WM8994_AIF1_LRCLK_INV; + lrclk |= WM8958_AIF1_LRCLK_INV; case SND_SOC_DAIFMT_DSP_A: aif1 |= 0x18; break; @@ -2640,12 +2648,14 @@ static int wm8994_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) break; case SND_SOC_DAIFMT_IB_IF: aif1 |= WM8994_AIF1_BCLK_INV | WM8994_AIF1_LRCLK_INV; + lrclk |= WM8958_AIF1_LRCLK_INV; break; case SND_SOC_DAIFMT_IB_NF: aif1 |= WM8994_AIF1_BCLK_INV; break; case SND_SOC_DAIFMT_NB_IF: aif1 |= WM8994_AIF1_LRCLK_INV; + lrclk |= WM8958_AIF1_LRCLK_INV; break; default: return -EINVAL; @@ -2676,6 +2686,10 @@ static int wm8994_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) aif1); snd_soc_update_bits(codec, ms_reg, WM8994_AIF1_MSTR, ms); + snd_soc_update_bits(codec, dac_reg, + WM8958_AIF1_LRCLK_INV, lrclk); + snd_soc_update_bits(codec, adc_reg, + WM8958_AIF1_LRCLK_INV, lrclk); return 0; } -- 1.7.10.4

1 0

[alsa-devel] [PATCH] ASoC: wm5110: Add missing speaker initialisation
by Mark Brown 17 May '13

17 May '13

Add callback to initialise the speaker in the core following the recent changes to handling of integration with the thermal interrupts. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm5110.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index e77410e..91a7015 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c @@ -1252,6 +1252,8 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec) if (ret != 0) return ret; + arizona_init_spk(codec); + snd_soc_dapm_disable_pin(&codec->dapm, "HAPTICS"); priv->core.arizona->dapm = &codec->dapm; -- 1.7.10.4

1 0