October 2014 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [RFC PATCH 1/2] ALSA: hda - Fix "PCM" name being used on one DAC when there are two DACs
by David Henningsson 22 Oct '14

22 Oct '14

In the scenario where there is one "Line Out", one "Speaker" and one "Headphone", and there are only two DACs, two outputs will share a DAC. Currently any mixer on such a DAC will get the "PCM" name, which is misleading. Instead use "Headphone+LO" or "Speaker+LO" to better specify what the volume actually controls. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/hda_generic.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index 64220c0..1d742ea 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -1038,6 +1038,19 @@ static const char *get_line_out_pfx(struct hda_codec *codec, int ch, break; *index = ch; return "Headphone"; + case AUTO_PIN_LINE_OUT: + /* This deals with the case where we have two DACs and + * one LO, one HP and one Speaker */ + if (!ch && cfg->speaker_outs && cfg->hp_outs) { + bool hp_lo_shared = !path_has_mixer(codec, spec->hp_paths[0], ctl_type); + bool spk_lo_shared = !path_has_mixer(codec, spec->speaker_paths[0], ctl_type); + if (hp_lo_shared && spk_lo_shared) + return spec->vmaster_mute.hook ? "PCM" : "Master"; + if (hp_lo_shared) + return "Headphone+LO"; + if (spk_lo_shared) + return "Speaker+LO"; + } } /* for a single channel output, we don't have to name the channel */ -- 1.9.1

4 28

[alsa-devel] [PATCH] ASoC: simple-card: Add mic and hp detect gpios.
by Dylan Reid 22 Oct '14

22 Oct '14

Allow Headphone and Microphone jack detect gpios to be specified in device tree. This will allow a few systems including rk3288_max98090 to use simple-card instead of having their own board file. Signed-off-by: Dylan Reid <dgreid(a)chromium.org> --- .../devicetree/bindings/sound/simple-card.txt | 4 ++ sound/soc/generic/simple-card.c | 73 ++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt index c2e9841..72d94b7 100644 --- a/Documentation/devicetree/bindings/sound/simple-card.txt +++ b/Documentation/devicetree/bindings/sound/simple-card.txt @@ -17,6 +17,10 @@ Optional properties: source. - simple-audio-card,mclk-fs : Multiplication factor between stream rate and codec mclk. +- simple-audio-card,hp_det_gpio : Reference to GPIO that signals when + headphones are attached. +- simple-audio-card,mic_det_gpio : Reference to GPIO that signals when + a microphone is attached. Optional subnodes: diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 709ce67..fcb431f 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -10,10 +10,13 @@ */ #include <linux/clk.h> #include <linux/device.h> +#include <linux/gpio.h> #include <linux/module.h> #include <linux/of.h> +#include <linux/of_gpio.h> #include <linux/platform_device.h> #include <linux/string.h> +#include <sound/jack.h> #include <sound/simple_card.h> #include <sound/soc-dai.h> #include <sound/soc.h> @@ -25,6 +28,8 @@ struct simple_card_data { struct asoc_simple_dai codec_dai; } *dai_props; unsigned int mclk_fs; + int gpio_hp_det; + int gpio_mic_det; struct snd_soc_dai_link dai_link[]; /* dynamically allocated */ }; @@ -54,6 +59,32 @@ static struct snd_soc_ops asoc_simple_card_ops = { .hw_params = asoc_simple_card_hw_params, }; +static struct snd_soc_jack simple_card_hp_jack; +static struct snd_soc_jack_pin simple_card_hp_jack_pins[] = { + { + .pin = "Headphones", + .mask = SND_JACK_HEADPHONE, + }, +}; +static struct snd_soc_jack_gpio simple_card_hp_jack_gpio = { + .name = "Headphone detection", + .report = SND_JACK_HEADPHONE, + .debounce_time = 150, +}; + +static struct snd_soc_jack simple_card_mic_jack; +static struct snd_soc_jack_pin simple_card_mic_jack_pins[] = { + { + .pin = "Mic Jack", + .mask = SND_JACK_MICROPHONE, + }, +}; +static struct snd_soc_jack_gpio simple_card_mic_jack_gpio = { + .name = "Mic detection", + .report = SND_JACK_MICROPHONE, + .debounce_time = 150, +}; + static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai, struct asoc_simple_dai *set) { @@ -109,6 +140,28 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd) if (ret < 0) return ret; + if (gpio_is_valid(priv->gpio_hp_det)) { + snd_soc_jack_new(codec->codec, "Headphones", SND_JACK_HEADPHONE, + &simple_card_hp_jack); + snd_soc_jack_add_pins(&simple_card_hp_jack, + ARRAY_SIZE(simple_card_hp_jack_pins), + simple_card_hp_jack_pins); + + simple_card_hp_jack_gpio.gpio = priv->gpio_hp_det; + snd_soc_jack_add_gpios(&simple_card_hp_jack, 1, + &simple_card_hp_jack_gpio); + } + + if (gpio_is_valid(priv->gpio_mic_det)) { + snd_soc_jack_new(codec->codec, "Mic Jack", SND_JACK_MICROPHONE, + &simple_card_mic_jack); + snd_soc_jack_add_pins(&simple_card_mic_jack, + ARRAY_SIZE(simple_card_mic_jack_pins), + simple_card_mic_jack_pins); + simple_card_mic_jack_gpio.gpio = priv->gpio_mic_det; + snd_soc_jack_add_gpios(&simple_card_mic_jack, 1, + &simple_card_mic_jack_gpio); + } return 0; } @@ -383,6 +436,16 @@ static int asoc_simple_card_parse_of(struct device_node *node, return ret; } + priv->gpio_hp_det = of_get_named_gpio(node, + "simple-audio-card,hp-det-gpio", 0); + if (priv->gpio_hp_det == -EPROBE_DEFER) + return -EPROBE_DEFER; + + priv->gpio_mic_det = of_get_named_gpio(node, + "simple-audio-card,mic-det-gpio", 0); + if (priv->gpio_mic_det == -EPROBE_DEFER) + return -EPROBE_DEFER; + if (!priv->snd_card.name) priv->snd_card.name = priv->snd_card.dai_link->name; @@ -502,6 +565,16 @@ err: static int asoc_simple_card_remove(struct platform_device *pdev) { + struct snd_soc_card *card = platform_get_drvdata(pdev); + struct simple_card_data *priv = snd_soc_card_get_drvdata(card); + + if (gpio_is_valid(priv->gpio_hp_det)) + snd_soc_jack_free_gpios(&simple_card_hp_jack, 1, + &simple_card_hp_jack_gpio); + if (gpio_is_valid(priv->gpio_mic_det)) + snd_soc_jack_free_gpios(&simple_card_mic_jack, 1, + &simple_card_mic_jack_gpio); + return asoc_simple_card_unref(pdev); } -- 2.1.0.rc2.206.gedb03e5

7 11

[alsa-devel] [PATCH v3 0/5] ASoC: intel: fix to sst driver series
by Vinod Koul 22 Oct '14

22 Oct '14

This series fixes comments observed while applying the sst series last week. changes in v3: - fix the makefile artifact not required changes in v2: - typo fixes - make wrapper inline - add newline on err log Vinod Koul (5): ASoC: intel: use __iowrite32_copy for 32 bit copy ASoC: intel: log an error on double free ASoC: intel: fix the kernldoc comment ASoC: intel: explain why block not found isn't error always ASoC: intel: use __iowrite32_copy for 32 bit copy sound/soc/intel/sst-firmware.c | 9 +++------ sound/soc/intel/sst/sst_drv_interface.c | 4 +++- sound/soc/intel/sst/sst_ipc.c | 15 +++++++++++++++ sound/soc/intel/sst/sst_loader.c | 12 +++++------- 4 files changed, 26 insertions(+), 14 deletions(-)

2 6

[alsa-devel] [PATCH 1/2] MAINTAINERS: add atmel ssc driver maintainer entry
by Bo Shen 21 Oct '14

21 Oct '14

Signed-off-by: Bo Shen <voice.shen(a)atmel.com> --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 3705430..c004e6f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1703,6 +1703,13 @@ M: Nicolas Ferre <nicolas.ferre(a)atmel.com> S: Supported F: drivers/spi/spi-atmel.* +ATMEL SSC DRIVER +M: Bo Shen <voice.shen(a)atmel.com> +L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) +S: Supported +F: drivers/misc/atmel-ssc.c +F: include/linux/atmel-ssc.h + ATMEL Timer Counter (TC) AND CLOCKSOURCE DRIVERS M: Nicolas Ferre <nicolas.ferre(a)atmel.com> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -- 2.1.0.24.g4109c28

4 6

[alsa-devel] [PATCH] ASoC: rt5677: fix rt5677 spi driver build
by Ben Zhang 21 Oct '14

21 Oct '14

Create a separate module for rt5677 spi driver. Without this patch, the build fails due to multiple defs of 'init_module' and 'cleanup_module'. module_spi_driver() defines its own module, so it can't be part of the rt5677 module. Signed-off-by: Ben Zhang <benzh(a)chromium.org> --- sound/soc/codecs/Kconfig | 4 ++++ sound/soc/codecs/Makefile | 4 +++- sound/soc/codecs/rt5677-spi.c | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 2c7482e..6f21a76 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -504,6 +504,10 @@ config SND_SOC_RT5670 config SND_SOC_RT5677 tristate +config SND_SOC_RT5677_SPI + tristate + default SND_SOC_RT5677 + #Freescale sgtl5000 codec config SND_SOC_SGTL5000 tristate "Freescale SGTL5000 CODEC" diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 4435f9f..3e57edc 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -79,7 +79,8 @@ snd-soc-rt5640-objs := rt5640.o snd-soc-rt5645-objs := rt5645.o snd-soc-rt5651-objs := rt5651.o snd-soc-rt5670-objs := rt5670.o -snd-soc-rt5677-objs := rt5677.o rt5677-spi.o +snd-soc-rt5677-objs := rt5677.o +snd-soc-rt5677-spi-objs := rt5677-spi.o snd-soc-sgtl5000-objs := sgtl5000.o snd-soc-alc5623-objs := alc5623.o snd-soc-alc5632-objs := alc5632.o @@ -256,6 +257,7 @@ obj-$(CONFIG_SND_SOC_RT5645) += snd-soc-rt5645.o obj-$(CONFIG_SND_SOC_RT5651) += snd-soc-rt5651.o obj-$(CONFIG_SND_SOC_RT5670) += snd-soc-rt5670.o obj-$(CONFIG_SND_SOC_RT5677) += snd-soc-rt5677.o +obj-$(CONFIG_SND_SOC_RT5677_SPI) += snd-soc-rt5677-spi.o obj-$(CONFIG_SND_SOC_SGTL5000) += snd-soc-sgtl5000.o obj-$(CONFIG_SND_SOC_SIGMADSP) += snd-soc-sigmadsp.o obj-$(CONFIG_SND_SOC_SIGMADSP_I2C) += snd-soc-sigmadsp-i2c.o diff --git a/sound/soc/codecs/rt5677-spi.c b/sound/soc/codecs/rt5677-spi.c index 11c38f3..ef6348c 100644 --- a/sound/soc/codecs/rt5677-spi.c +++ b/sound/soc/codecs/rt5677-spi.c @@ -52,6 +52,7 @@ int rt5677_spi_write(u8 *txbuf, size_t len) return status; } +EXPORT_SYMBOL_GPL(rt5677_spi_write); /** * rt5677_spi_burst_write - Write data to SPI by rt5677 dsp memory address. @@ -107,6 +108,7 @@ int rt5677_spi_burst_write(u32 addr, const struct firmware *fw) return 0; } +EXPORT_SYMBOL_GPL(rt5677_spi_burst_write); static int rt5677_spi_probe(struct spi_device *spi) { -- 2.1.0.rc2.206.gedb03e5

2 1

[alsa-devel] [PATCH] ASoC: dapm: Remove redundant cast
by Rasmus Villemoes 21 Oct '14

21 Oct '14

Both path->name and e->texts[i] have type const char*, so the cast is slightly confusing and certainly unnecessary. Signed-off-by: Rasmus Villemoes <linux(a)rasmusvillemoes.dk> --- sound/soc/soc-dapm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index c61cb9c..39f992b 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -496,7 +496,7 @@ static int dapm_connect_mux(struct snd_soc_dapm_context *dapm, list_add(&path->list, &dapm->card->paths); list_add(&path->list_sink, &dest->sources); list_add(&path->list_source, &src->sinks); - path->name = (char*)e->texts[i]; + path->name = e->texts[i]; if (i == item) path->connect = 1; else -- 2.0.4

2 1

[alsa-devel] [PATCH] ASoC: tegra: Read and use the GPIO flags of the headphone detect
by Alban Bedel 21 Oct '14

21 Oct '14

The headphone detect was hardcoded to low-active, use the flags from DT to allow high-active as well. Signed-off-by: Alban Bedel <alban.bedel(a)avionic-design.de> --- sound/soc/tegra/tegra_rt5640.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/soc/tegra/tegra_rt5640.c b/sound/soc/tegra/tegra_rt5640.c index a689883..4ebe387 100644 --- a/sound/soc/tegra/tegra_rt5640.c +++ b/sound/soc/tegra/tegra_rt5640.c @@ -44,6 +44,7 @@ struct tegra_rt5640 { struct tegra_asoc_utils_data util_data; int gpio_hp_det; + enum of_gpio_flags gpio_hp_det_flags; }; static int tegra_rt5640_asoc_hw_params(struct snd_pcm_substream *substream, @@ -119,6 +120,8 @@ static int tegra_rt5640_asoc_init(struct snd_soc_pcm_runtime *rtd) if (gpio_is_valid(machine->gpio_hp_det)) { tegra_rt5640_hp_jack_gpio.gpio = machine->gpio_hp_det; + tegra_rt5640_hp_jack_gpio.invert = + !!(machine->gpio_hp_det_flags & OF_GPIO_ACTIVE_LOW); snd_soc_jack_add_gpios(&tegra_rt5640_hp_jack, 1, &tegra_rt5640_hp_jack_gpio); @@ -180,7 +183,8 @@ static int tegra_rt5640_probe(struct platform_device *pdev) platform_set_drvdata(pdev, card); snd_soc_card_set_drvdata(card, machine); - machine->gpio_hp_det = of_get_named_gpio(np, "nvidia,hp-det-gpios", 0); + machine->gpio_hp_det = of_get_named_gpio_flags( + np, "nvidia,hp-det-gpios", 0, &machine->gpio_hp_det_flags); if (machine->gpio_hp_det == -EPROBE_DEFER) return -EPROBE_DEFER; -- 2.1.1

3 2

[alsa-devel] [PATCH 1/2] ARM: pxa: spitz: register spitz-audio device
by Dmitry Eremin-Solenikov 21 Oct '14

21 Oct '14

Register spitz-audio device to be used by ASoC driver. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov(a)gmail.com> --- arch/arm/mach-pxa/spitz.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 840c3a4..a9f971f 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c @@ -924,6 +924,23 @@ static inline void spitz_i2c_init(void) {} #endif /****************************************************************************** + * Audio devices + ******************************************************************************/ +#if defined(CONFIG_SND_PXA2XX_SOC_SPITZ) || defined(SND_PXA2XX_SOC_SPITZ_MODULE) +static struct platform_device spitz_audio_device = { + .name = "spitz-audio", + .id = -1, +}; + +static inline void spitz_audio_init(void) +{ + platform_device_register(&spitz_audio_device); +} +#else +static inline void spitz_audio_init(void) {} +#endif + +/****************************************************************************** * Machine init ******************************************************************************/ static void spitz_poweroff(void) @@ -970,6 +987,7 @@ static void __init spitz_init(void) spitz_nor_init(); spitz_nand_init(); spitz_i2c_init(); + spitz_audio_init(); } static void __init spitz_fixup(struct tag *tags, char **cmdline) -- 2.1.1

2 3

[alsa-devel] 3.18.0-rc1 pulseaudio possible recursive locking
by Arthur Marsh 21 Oct '14

21 Oct '14

Hi, I have been seeing this a few times lately, and noticed that it was still present Is this the right place to report it or should I be reporting a bug against pulseaudio? [ 182.273991] ============================================= [ 182.273996] [ INFO: possible recursive locking detected ] [ 182.274003] 3.18.0-rc1 #1297 Not tainted [ 182.274008] --------------------------------------------- [ 182.274013] pulseaudio/5183 is trying to acquire lock: [ 182.274018] (&(&substream->self_group.lock)->rlock/1){......}, at: [<f8432284>] snd_pcm_action_group+0x96/0x215 [snd_pcm] [ 182.274063] but task is already holding lock: [ 182.274069] (&(&substream->self_group.lock)->rlock/1){......}, at: [<f8432284>] snd_pcm_action_group+0x96/0x215 [snd_pcm] [ 182.274092] other info that might help us debug this: [ 182.274098] Possible unsafe locking scenario: [ 182.274104] CPU0 [ 182.274108] ---- [ 182.274112] lock(&(&substream->self_group.lock)->rlock/1); [ 182.274122] lock(&(&substream->self_group.lock)->rlock/1); [ 182.274132] *** DEADLOCK *** [ 182.274138] May be due to missing lock nesting notation [ 182.274146] 4 locks held by pulseaudio/5183: [ 182.274151] #0: (snd_pcm_link_rwlock){......}, at: [<f8432fe3>] snd_pcm_stream_lock+0x1b/0x43 [snd_pcm] [ 182.274177] #1: (&(&substream->self_group.lock)->rlock){......}, at: [<f8432fee>] snd_pcm_stream_lock+0x26/0x43 [snd_pcm] [ 182.274202] #2: (&(&substream->group->lock)->rlock){......}, at: [<f8432cf4>] snd_pcm_action+0x34/0x10b [snd_pcm] [ 182.274227] #3: (&(&substream->self_group.lock)->rlock/1){......}, at: [<f8432284>] snd_pcm_action_group+0x96/0x215 [snd_pcm] [ 182.274254] stack backtrace: [ 182.274263] CPU: 1 PID: 5183 Comm: pulseaudio Not tainted 3.18.0-rc1 #1297 [ 182.274269] Hardware name: System Manufacturer System Name/P4S800, BIOS ASUS P4S800 ACPI BIOS Revision 1011 Beta 001 08/30/2005 [ 182.274275] c1bfc4e0 00000000 e55c9d50 c145d969 c1bfc4e0 e55c9dd4 c1082b7b c15b7f9a [ 182.274295] e55b630c 0000143f 00000000 e55b6010 e55b6070 00000000 5402a095 00000004 [ 182.274315] c17a4034 c1bfc4e0 e55b6508 e55b6520 00000000 00000008 00000000 e55b6508 [ 182.274335] Call Trace: [ 182.274353] [<c145d969>] dump_stack+0x4b/0x75 [ 182.274366] [<c1082b7b>] __lock_acquire+0x187c/0x19b3 [ 182.274378] [<c10834ad>] lock_acquire+0xa1/0x126 [ 182.274394] [<f8432284>] ? snd_pcm_action_group+0x96/0x215 [snd_pcm] [ 182.274404] [<c1463a9d>] _raw_spin_lock_nested+0x41/0x4e [ 182.274420] [<f8432284>] ? snd_pcm_action_group+0x96/0x215 [snd_pcm] [ 182.274436] [<f8432284>] snd_pcm_action_group+0x96/0x215 [snd_pcm] [ 182.274445] [<c146393b>] ? _raw_spin_trylock+0x6b/0x80 [ 182.274462] [<f8432d0f>] snd_pcm_action+0x4f/0x10b [snd_pcm] [ 182.274479] [<f843332a>] snd_pcm_drop+0x4a/0x7d [snd_pcm] [ 182.274496] [<f84351d9>] snd_pcm_common_ioctl1+0x7b0/0xcc4 [snd_pcm] [ 182.274514] [<f84357ce>] snd_pcm_playback_ioctl1+0xe1/0x3a8 [snd_pcm] [ 182.274532] [<f8435ab7>] snd_pcm_playback_ioctl+0x22/0x35 [snd_pcm] [ 182.274549] [<f8435a95>] ? snd_pcm_playback_ioctl1+0x3a8/0x3a8 [snd_pcm] [ 182.274561] [<c1171e82>] do_vfs_ioctl+0x306/0x576 [ 182.274573] [<c117d3ca>] ? mntput_no_expire+0x61/0x1e7 [ 182.274583] [<c117d377>] ? mntput_no_expire+0xe/0x1e7 [ 182.274594] [<c117d56b>] ? mntput+0x1b/0x29 [ 182.274603] [<c1161438>] ? __fput+0x144/0x1aa [ 182.274614] [<c1172147>] SyS_ioctl+0x55/0x75 [ 182.274624] [<c14646e0>] sysenter_do_call+0x12/0x12 Regards, Arthur.

2 3

[alsa-devel] [PATCH] ALSA: ctxfi: remove unused variable
by Sudip Mukherjee 21 Oct '14

21 Oct '14

As of now the pointer to struct dai is not being used anywhere in the function. So it is safe to remove the variable. If we are ever doing anything with the container_of(daio, struct dai, daio), then at that time we can again add the variable. Signed-off-by: Sudip Mukherjee <sudip(a)vectorindia.org> --- sound/pci/ctxfi/ctatc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c index 4546590..632e843 100644 --- a/sound/pci/ctxfi/ctatc.c +++ b/sound/pci/ctxfi/ctatc.c @@ -1145,7 +1145,6 @@ static int atc_release_resources(struct ct_atc *atc) int i; struct daio_mgr *daio_mgr = NULL; struct dao *dao = NULL; - struct dai *dai = NULL; struct daio *daio = NULL; struct sum_mgr *sum_mgr = NULL; struct src_mgr *src_mgr = NULL; @@ -1172,9 +1171,6 @@ static int atc_release_resources(struct ct_atc *atc) dao = container_of(daio, struct dao, daio); dao->ops->clear_left_input(dao); dao->ops->clear_right_input(dao); - } else { - dai = container_of(daio, struct dai, daio); - /* some thing to do for dai ... */ } daio_mgr->put_daio(daio_mgr, daio); } -- 1.8.1.2

2 1