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

[alsa-devel] ASoC fixes for v3.12
by Mark Brown 30 Oct '13

30 Oct '13

The following changes since commit 959f58544b7f20c92d5eb43d1232c96c15c01bfb: Linux 3.12-rc7 (2013-10-27 16:12:03 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v3.12-rc7 for you to fetch changes up to 8723b795aaa0c5f0b9db2099af575f5e089a63f1: Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus (2013-10-30 10:11:55 -0700) ---------------------------------------------------------------- ASoC: Fixes for v3.12 A few of the Coverity fixes from Takashi, one of which (the wm_hubs one) is particularly noticable. ---------------------------------------------------------------- Mark Brown (1): Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus Takashi Iwai (3): ASoC: dapm: Fix source list debugfs outputs ASoC: dapm: Return -ENOMEM in snd_soc_dapm_new_dai_widgets() ASoC: wm_hubs: Add missing break in hp_supply_event() sound/soc/codecs/wm_hubs.c | 1 + sound/soc/soc-dapm.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-)

2 2

[alsa-devel] [PATCH 1/2 v2] ASoC: wm_adsp: Print error when regmap reads/writes fail
by Dimitris Papastamos 30 Oct '13

30 Oct '13

Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm_adsp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index e09ac94..cd007cc 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -339,8 +339,8 @@ static int wm_coeff_write_control(struct snd_kcontrol *kcontrol, ret = regmap_raw_write(adsp->regmap, reg, scratch, ctl->len); if (ret) { - adsp_err(adsp, "Failed to write %zu bytes to %x\n", - ctl->len, reg); + adsp_err(adsp, "Failed to write %zu bytes to %x: %d\n", + ctl->len, reg, ret); kfree(scratch); return ret; } @@ -393,8 +393,8 @@ static int wm_coeff_read_control(struct snd_kcontrol *kcontrol, ret = regmap_raw_read(adsp->regmap, reg, scratch, ctl->len); if (ret) { - adsp_err(adsp, "Failed to read %zu bytes from %x\n", - ctl->len, reg); + adsp_err(adsp, "Failed to read %zu bytes from %x: %d\n", + ctl->len, reg, ret); kfree(scratch); return ret; } @@ -1227,8 +1227,8 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp) le32_to_cpu(blk->len)); if (ret != 0) { adsp_err(dsp, - "%s.%d: Failed to write to %x in %s\n", - file, blocks, reg, region_name); + "%s.%d: Failed to write to %x in %s: %d\n", + file, blocks, reg, region_name, ret); } kfree(buf); -- 1.8.4.2

2 2

[alsa-devel] Getting ELD and available chmaps without opening device?
by Anssi Hannula 30 Oct '13

30 Oct '13

Hi all, I want to read the ELD of a HDMI sink while another playback is ongoing. I have the device name (e.g. "hdmi:CARD=NVidia,DEV=0"), and normally I'd open the device, use snd_pcm_info() to get snd_pcm_info_t with which I can use snd_pcm_info_get_card() and snd_pcm_info_get_device() to get the necessary information to access the control with snd_ctl_open(), snd_hctl_open_ctl() etc. However, since another playback is ongoing I can't open the device. Is there another way I'm missing, or do I simply have to magically know the card/device numbers (which in my case is possible with some tricks since the playback is in the same application, but I'd guess that might not always be the case)? Same affects available chmaps from what I can see. -- Anssi Hannula

1 0

[alsa-devel] [PATCH v2] ASoC: Add pinctrl PM to components of active DAIs
by Nicolin Chen 30 Oct '13

30 Oct '13

It's quite popular that more drivers are using pinctrl PM, for example: (Documentation/devicetree/bindings/arm/primecell.txt). Just like what runtime PM does, it would de-active and en-active pin group depending on whether it's being used or not. And this pinctrl PM might be also beneficial to cpu dai drivers because they might have actual pinctrl so as to sleep their pins and wake them up as needed. To achieve this goal, this patch sets pins to the default state during resume or startup; While during suspend and shutdown, it would set pins to the sleep state. As pinctrl PM would return zero if there is no such pinctrl sleep state settings, this patch would not break current ASoC subsystem directly. [ However, there is still an exception that the patch can not handle, that is, when cpu dai driver does not have pinctrl property but another device has it. (The AUDMUX <-> SSI on Freescale i.MX6 series for example. SSI as a cpu dai doesn't contain pinctrl property while AUDMUX, an Audio Multiplexer, has it). In this case, this kind of cpu dai driver needs to find a way to obtain the pinctrl property as its own, by moving property from AUDMUX to SSI, or creating a pins link/dependency between these two devices, or using a more decent way after we figure it out. ] Signed-off-by: Nicolin Chen <b42378(a)freescale.com> --- Changelog v1->v2: * Use proper verbs in comments. * Add 'dai->active' condition for resume case. --- sound/soc/soc-core.c | 29 +++++++++++++++++++++++++++++ sound/soc/soc-pcm.c | 3 +++ 2 files changed, 32 insertions(+) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 4280c70..5c972ac 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -684,6 +684,13 @@ int snd_soc_suspend(struct device *dev) if (card->suspend_post) card->suspend_post(card); + /* deactivate pins to sleep state */ + for (i = 0; i < card->num_rtd; i++) { + struct snd_soc_pcm_runtime *rtd = &card->rtd[i]; + struct snd_soc_dai *cpu_dai = rtd->cpu_dai; + pinctrl_pm_select_sleep_state(cpu_dai->dev); + } + return 0; } EXPORT_SYMBOL_GPL(snd_soc_suspend); @@ -807,6 +814,14 @@ int snd_soc_resume(struct device *dev) if (list_empty(&card->codec_dev_list)) return 0; + /* activate pins from sleep state */ + for (i = 0; i < card->num_rtd; i++) { + struct snd_soc_pcm_runtime *rtd = &card->rtd[i]; + struct snd_soc_dai *cpu_dai = rtd->cpu_dai; + if (cpu_dai->active) + pinctrl_pm_select_default_state(cpu_dai->dev); + } + /* AC97 devices might have other drivers hanging off them so * need to resume immediately. Other drivers don't have that * problem and may take a substantial amount of time to resume @@ -1929,6 +1944,13 @@ int snd_soc_poweroff(struct device *dev) snd_soc_dapm_shutdown(card); + /* deactivate pins to sleep state */ + for (i = 0; i < card->num_rtd; i++) { + struct snd_soc_pcm_runtime *rtd = &card->rtd[i]; + struct snd_soc_dai *cpu_dai = rtd->cpu_dai; + pinctrl_pm_select_sleep_state(cpu_dai->dev); + } + return 0; } EXPORT_SYMBOL_GPL(snd_soc_poweroff); @@ -3766,6 +3788,13 @@ int snd_soc_register_card(struct snd_soc_card *card) if (ret != 0) soc_cleanup_card_debugfs(card); + /* deactivate pins to sleep state */ + for (i = 0; i < card->num_rtd; i++) { + struct snd_soc_pcm_runtime *rtd = &card->rtd[i]; + struct snd_soc_dai *cpu_dai = rtd->cpu_dai; + pinctrl_pm_select_sleep_state(cpu_dai->dev); + } + return ret; } EXPORT_SYMBOL_GPL(snd_soc_register_card); diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 330c9a6..05bdba0 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -183,6 +183,7 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) struct snd_soc_dai_driver *codec_dai_drv = codec_dai->driver; int ret = 0; + pinctrl_pm_select_default_state(cpu_dai->dev); pm_runtime_get_sync(cpu_dai->dev); pm_runtime_get_sync(codec_dai->dev); pm_runtime_get_sync(platform->dev); @@ -317,6 +318,7 @@ out: pm_runtime_put(platform->dev); pm_runtime_put(codec_dai->dev); pm_runtime_put(cpu_dai->dev); + pinctrl_pm_select_sleep_state(cpu_dai->dev); return ret; } @@ -426,6 +428,7 @@ static int soc_pcm_close(struct snd_pcm_substream *substream) pm_runtime_put(platform->dev); pm_runtime_put(codec_dai->dev); pm_runtime_put(cpu_dai->dev); + pinctrl_pm_select_sleep_state(cpu_dai->dev); return 0; } -- 1.8.4

3 6

[alsa-devel] [PATCH] asoc-tools: Require bash shell when interpreting vizdapm.sh
by Jarkko Nikula 30 Oct '13

30 Oct '13

pushd and popd are built-in functions of bash shell so require it explicitly instead of relying /bin/sh. Signed-off-by: Jarkko Nikula <jarkko.nikula(a)linux.intel.com> --- For git://opensource.wolfsonmicro.com/asoc-tools.git --- bin/vizdapm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/vizdapm.sh b/bin/vizdapm.sh index 29d6b3c..11d1361 100755 --- a/bin/vizdapm.sh +++ b/bin/vizdapm.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Copyright 2011 Wolfson Microelectronics plc # Author: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> -- 1.8.4.rc3

1 0

[alsa-devel] [PATCH] ALSA: hda - Add a fixup for ASUS N76VZ
by Takashi Iwai 30 Oct '13

30 Oct '13

ASUS N76VZ needs the same fixup as N56VZ for supporting the boost speaker. Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=846529 Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index bf313bea7085..8ad554312b69 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -4623,6 +4623,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = { SND_PCI_QUIRK(0x1028, 0x05db, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800), SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_ASUS_MODE4), + SND_PCI_QUIRK(0x1043, 0x1bf3, "ASUS N76VZ", ALC662_FIXUP_ASUS_MODE4), SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT), SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_FIXUP_ASUS_MODE2), SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD), -- 1.8.4.1

1 0

[alsa-devel] [b42378@freescale.com: Re: [PATCH 1/3] dma: imx-sdma: Add ssi dual fifo script support]
by Nicolin Chen 30 Oct '13

30 Oct '13

Just found that I missed Sascha's mail address in my TO list of last reply. So resend it. And sorry for the duplicated mails. ----- Forwarded message from Nicolin Chen <b42378(a)freescale.com> ----- Date: Wed, 30 Oct 2013 12:48:48 +0800 From: Nicolin Chen <b42378(a)freescale.com> Subject: Re: [PATCH 1/3] dma: imx-sdma: Add ssi dual fifo script support User-Agent: Mutt/1.5.21 (2010-09-15) Hi Sascha, On Tue, Oct 29, 2013 at 02:51:43PM +0100, Sascha Hauer wrote: > Look at drivers/dma/imx-sdma.c: > > > /** > > * struct sdma_firmware_header - Layout of the firmware image > > * > > * @magic "SDMA" > > * @version_major increased whenever layout of struct > > * sdma_script_start_addrs > > * changes. > > Can you image why this firmware has a version field? Right, it's because > it encodes the layout of struct sdma_script_start_addrs. > > As the comment clearly states you have to *increase this field* when you > add scripts. > > Obviously you missed that, as the firmware on lkml posted recently > shows: > > > 00000000: 414d4453 00000001 00000001 0000001c SDMA............ > ^^^^^^^^ > Still '1' > > > 00000010: 00000026 000000b4 0000067a 00000282 &.......z....... > > 00000020: ffffffff 00000000 ffffffff ffffffff ................ > > 00000030: ffffffff ffffffff ffffffff ffffffff ................ > > 00000040: ffffffff ffffffff 00001a6a ffffffff ........j....... > > 00000050: 000002eb 000018bb ffffffff 00000408 ................ > > 00000060: ffffffff 000003c0 ffffffff ffffffff ................ > > 00000070: ffffffff 000002ab ffffffff 0000037b ............{... > > 00000080: ffffffff ffffffff 0000044c 0000046e ........L...n... > > 00000090: ffffffff 00001800 ffffffff ffffffff ................ > > 000000a0: 00000000 00001800 00001862 00001a16 ........b....... > ^^^^^^^^^^^^^^^^^ > new script addresses introduced > > > > -#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1 34 > > +#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1 37 > > And no, this is not a bug. It's your firmware header that is buggy. > I wasn't aware that the problem is far more complicated than I thought. And thank you for telling me all this. > What you need is: > > #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V2 37 > > You (you as a company, not you as a person) knew that it was me who > created this firmware format. So it was absolutely unnecessary to create > an incompatible firmware instead of dropping me a short note. > > Please add a version check to the driver as necessary and provide a proper > firmware. > Just currently it's not easy for me to create a new proper firmware, and I's been told that besides this version number, it also lacks a decent license info. So may I just refine this patch as you suggested to add a version check and add those new scripts first? Thank you, Nicolin Chen > Sascha > > -- > Pengutronix e.K. | | > Industrial Linux Solutions | http://www.pengutronix.de/ | > Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | > ----- End forwarded message -----

1 0

[alsa-devel] [PATCH] ALSA: hda - Disable AA-loopback on ALC283 Chromebook
by Takashi Iwai 30 Oct '13

30 Oct '13

ALC283-based Chromebook suffers from occasional white noise, and it turned out that this comes from AA-loopback. Disable this output path by just clearing mixer_nid, then the generic parser will skip the creation of AA-loopback path. Reported-and-tested-by: Kailang Yang <kailang(a)realtek.com> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 894703532ab7..c516fa93ee63 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3445,6 +3445,8 @@ static void alc283_fixup_chromebook(struct hda_codec *codec, switch (action) { case HDA_FIXUP_ACT_PRE_PROBE: alc283_chromebook_caps(codec); + /* Disable AA-loopback as it causes white noise */ + spec->gen.mixer_nid = 0; spec->gen.hp_automute_hook = alc283_hp_automute_hook; /* MIC2-VREF control */ /* Set to manual mode */ -- 1.8.4.1

1 0

[alsa-devel] Getting Error While cross compiling to arm linux
by ranjith vs 30 Oct '13

30 Oct '13

hi, I want to cross compile alsa-lib to arm-linux platform.But I Cross compiled successfully but while giving make it is giving following errors ./opt/freescale/usr/local/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/../lib/gcc/arm-fsl-linux-gnueabi/4.6.2/../../../../arm-fsl-linux-gnueabi/bin/ld: .libs/conf.o: Relocations in generic ELF (EM: 3) .libs/conf.o: could not read symbols: File in wrong format collect2: ld returned 1 exit status make[2]: *** [libasound.la] Error 1 make[2]: Leaving directory `/home/ranjithvs/Downloads/alsa-lib-1.0.27.2/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/ranjithvs/Downloads/alsa-lib-1.0.27.2/src' make: *** [all-recursive] Error 1 Regards, Ranjith

1 0

[alsa-devel] [PATCH 0/3] Add dual-fifo mode support of i.MX ssi
by Nicolin Chen 30 Oct '13

30 Oct '13

Changelog v1: * SSI can reduce hardware overrun/underrun possibility when using dual * fifo mode. To support this mode, we need to first update sdma sciprt * list, and then enable dual fifo BIT in SSI driver, and last update DT * bindings of i.MX series. * * ! This series of patches has a direct dependency between them. When * ! applying them, we need to apply in one single branch. Otherwise, * ! it would break currect branches. Nicolin Chen (3): dma: imx-sdma: Add ssi dual fifo script support ASoC: fsl_ssi: Add dual fifo mode support ARM: dts: imx: use dual-fifo sdma script for ssi .../devicetree/bindings/dma/fsl-imx-sdma.txt | 1 + arch/arm/boot/dts/imx51.dtsi | 4 ++-- arch/arm/boot/dts/imx53.dtsi | 4 ++-- arch/arm/boot/dts/imx6qdl.dtsi | 12 +++++------ arch/arm/boot/dts/imx6sl.dtsi | 12 +++++------ drivers/dma/imx-sdma.c | 6 +++++- include/linux/platform_data/dma-imx-sdma.h | 2 ++ include/linux/platform_data/dma-imx.h | 1 + sound/soc/fsl/fsl_ssi.c | 24 +++++++++++++++++++++- 9 files changed, 48 insertions(+), 18 deletions(-) -- 1.8.4

5 10