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

[alsa-devel] [PATCH V4 12/16] ALSA: HDA: Make hda sound card usable for Loongson.
by Huacai Chen 03 Aug '12

03 Aug '12

Lemote A1004(Laptop) and A1205(All-In-One) use Conexant's hda codec, this patch modify patch_conexant.c to add Lemote specific code. Signed-off-by: Huacai Chen <chenhc(a)lemote.com> Signed-off-by: Hongliang Tao <taohl(a)lemote.com> Signed-off-by: Hua Yan <yanh(a)lemote.com> Cc: alsa-devel(a)alsa-project.org --- include/linux/pci_ids.h | 2 + sound/pci/hda/patch_conexant.c | 52 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index fc35260..b28270e 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2918,3 +2918,5 @@ #define PCI_DEVICE_ID_XEN_PLATFORM 0x0001 #define PCI_VENDOR_ID_OCZ 0x1b85 + +#define PCI_VENDOR_ID_LEMOTE 0x1c06 diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 1436118..6bbac39 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -142,6 +142,7 @@ struct conexant_spec { unsigned int thinkpad:1; unsigned int hp_laptop:1; unsigned int asus:1; + unsigned int lemote:1; unsigned int pin_eapd_ctrls:1; unsigned int fixup_stereo_dmic:1; @@ -2280,7 +2281,7 @@ static void cxt5066_automic(struct hda_codec *codec) cxt5066_thinkpad_automic(codec); else if (spec->hp_laptop) cxt5066_hp_laptop_automic(codec); - else if (spec->asus) + else if (spec->asus || spec->lemote) cxt5066_asus_automic(codec); } @@ -2913,6 +2914,32 @@ static const struct hda_verb cxt5066_init_verbs_hp_laptop[] = { { } /* end */ }; +static struct hda_verb cxt5066_init_verbs_lemote[] = { + {0x14, AC_VERB_SET_CONNECT_SEL, 0x0}, /* ADC1: Connection index: 0 */ + {0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT}, + {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_MIC_EVENT}, + + /* DAC2: unused */ + {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, + + /* ADC2, ADC3: unused */ + {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, + {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, + {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, + {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, + {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, + {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, + {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, + {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, + + /* Disable digital microphone port */ + {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, 0}, + + /* Disable SPDIF */ + {0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0}, + { } /* end */ +}; + /* initialize jack-sensing, too */ static int cxt5066_init(struct hda_codec *codec) { @@ -2950,6 +2977,8 @@ enum { CXT5066_THINKPAD, /* Lenovo ThinkPad T410s, others? */ CXT5066_ASUS, /* Asus K52JU, Lenovo G560 - Int mic at 0x1a and Ext mic at 0x1b */ CXT5066_HP_LAPTOP, /* HP Laptop */ + CXT5066_LEMOTE_A1004, /* Lemote Laptop A1004 */ + CXT5066_LEMOTE_A1205, /* Lemote All-In-One A1205 */ CXT5066_AUTO, /* BIOS auto-parser */ CXT5066_MODELS }; @@ -2963,6 +2992,8 @@ static const char * const cxt5066_models[CXT5066_MODELS] = { [CXT5066_THINKPAD] = "thinkpad", [CXT5066_ASUS] = "asus", [CXT5066_HP_LAPTOP] = "hp-laptop", + [CXT5066_LEMOTE_A1004] = "lemote-laptop-a1004", + [CXT5066_LEMOTE_A1205] = "lemote-aio-a1205", [CXT5066_AUTO] = "auto", }; @@ -2995,6 +3026,8 @@ static const struct snd_pci_quirk cxt5066_cfg_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo U350", CXT5066_ASUS), SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo G560", CXT5066_ASUS), SND_PCI_QUIRK(0x17aa, 0x3938, "Lenovo G565", CXT5066_AUTO), + SND_PCI_QUIRK(PCI_VENDOR_ID_LEMOTE, 0x2011, "Lemote A1004", CXT5066_LEMOTE_A1004), + SND_PCI_QUIRK(PCI_VENDOR_ID_LEMOTE, 0x2012, "Lemote A1205", CXT5066_LEMOTE_A1205), SND_PCI_QUIRK(0x1b0a, 0x2092, "CyberpowerPC Gamer Xplorer N57001", CXT5066_AUTO), {} }; @@ -3075,7 +3108,22 @@ static int patch_cxt5066(struct hda_codec *codec) spec->port_d_mode = 0; spec->mic_boost = 3; /* default 30dB gain */ break; - + case CXT5066_LEMOTE_A1004: + case CXT5066_LEMOTE_A1205: + codec->patch_ops.init = cxt5066_init; + codec->patch_ops.unsol_event = cxt5066_unsol_event; + spec->init_verbs[spec->num_init_verbs] = + cxt5066_init_verbs_lemote; + spec->num_init_verbs++; + spec->lemote = 1; + spec->mixers[spec->num_mixers++] = cxt5066_mixer_master; + spec->mixers[spec->num_mixers++] = cxt5066_mixers; + /* no S/PDIF out */ + /* input source automatically selected */ + spec->input_mux = NULL; + spec->port_d_mode = 0; + spec->mic_boost = 3; /* default 30dB gain */ + break; case CXT5066_OLPC_XO_1_5: codec->patch_ops.init = cxt5066_olpc_init; codec->patch_ops.unsol_event = cxt5066_olpc_unsol_event; -- 1.7.7.3

2 3

[alsa-devel] Move snd_legacy_find_free_ioport to initval.h
by Ondrej Zary 03 Aug '12

03 Aug '12

Move snd_legacy_find_free_ioport() function back to initval.h as it is used by two drivers. Signed-off-by: Ondrej Zary <linux(a)rainbow-software.org> diff --git a/include/sound/initval.h b/include/sound/initval.h index f99a0d2..ac62c67 100644 --- a/include/sound/initval.h +++ b/include/sound/initval.h @@ -50,6 +50,20 @@ #define SNDRV_DEFAULT_DMA_SIZE { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_DMA_SIZE } #define SNDRV_DEFAULT_PTR SNDRV_DEFAULT_STR +#ifdef SNDRV_LEGACY_FIND_FREE_IOPORT +static long snd_legacy_find_free_ioport(long *port_table, long size) +{ + while (*port_table != -1) { + if (request_region(*port_table, size, "ALSA test")) { + release_region(*port_table, size); + return *port_table; + } + port_table++; + } + return -1; +} +#endif + #ifdef SNDRV_LEGACY_FIND_FREE_IRQ #include <linux/interrupt.h> diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c index c24594c..3d1afb6 100644 --- a/sound/isa/opti9xx/miro.c +++ b/sound/isa/opti9xx/miro.c @@ -37,6 +37,7 @@ #include <sound/opl4.h> #include <sound/control.h> #include <sound/info.h> +#define SNDRV_LEGACY_FIND_FREE_IOPORT #define SNDRV_LEGACY_FIND_FREE_IRQ #define SNDRV_LEGACY_FIND_FREE_DMA #include <sound/initval.h> @@ -770,20 +771,6 @@ static int __devinit snd_miro_mixer(struct snd_card *card, return 0; } -static long snd_legacy_find_free_ioport(long *port_table, long size) -{ - while (*port_table != -1) { - struct resource *res; - if ((res = request_region(*port_table, size, - "ALSA test")) != NULL) { - release_and_free_resource(res); - return *port_table; - } - port_table++; - } - return -1; -} - static int __devinit snd_miro_init(struct snd_miro *chip, unsigned short hardware) { diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c index f8fbe22..2899c9f 100644 --- a/sound/isa/opti9xx/opti92x-ad1848.c +++ b/sound/isa/opti9xx/opti92x-ad1848.c @@ -39,6 +39,7 @@ #ifndef OPTi93X #include <sound/opl4.h> #endif +#define SNDRV_LEGACY_FIND_FREE_IOPORT #define SNDRV_LEGACY_FIND_FREE_IRQ #define SNDRV_LEGACY_FIND_FREE_DMA #include <sound/initval.h> @@ -185,19 +186,6 @@ static char * snd_opti9xx_names[] = { "82C930", "82C931", "82C933" }; - -static long __devinit snd_legacy_find_free_ioport(long *port_table, long size) -{ - while (*port_table != -1) { - if (request_region(*port_table, size, "ALSA test")) { - release_region(*port_table, size); - return *port_table; - } - port_table++; - } - return -1; -} - static int __devinit snd_opti9xx_init(struct snd_opti9xx *chip, unsigned short hardware) { -- Ondrej Zary

2 1

[alsa-devel] DT support for Davinci ASoC platform
by Hebbar, Gururaja 02 Aug '12

02 Aug '12

All, Are there any plans or work going on for providing Device Tree Support for Davinci ASoC? I am planning to add DT support for TI AM335x (McASP) and I don't want to do duplicate task. Regards Gururaja

3 5

[alsa-devel] Alsa: USB Class 2 Audio soundcard device disappears suddenly
by Joao Bonina 02 Aug '12

02 Aug '12

It doesn't show anything when that happens. Looking at dmesg (I'm attaching it), it shows this: [ 350.170478] usb 1-4: config 1 has an invalid interface number: 3 but max is 2 [ 350.170500] usb 1-4: config 1 has no interface number 2 [ 350.170843] usb 1-4: config 1 has an invalid interface number: 3 but max is 2 [ 350.170864] usb 1-4: config 1 has no interface number 2 [ 350.171344] usb 1-4: New USB device found, idVendor=21b4, idProduct=0230 [ 350.171366] usb 1-4: New USB device strings: Mfr=1, Product=2, SerialNumber=3 [ 350.171385] usb 1-4: Product: Ayre USB Interface [ 350.171401] usb 1-4: Manufacturer: Ayre Acoustics [ 350.171418] usb 1-4: SerialNumber: (C) 2010 XMOS/Wavelength Audio Don't know if those 'invalid interface number' messages are relevant for the issue. Joao ----- Original Message ----- From: Daniel Mack <zonque(a)gmail.com> To: Joao Bonina <bonina_2001(a)yahoo.com> Cc: "alsa-devel(a)alsa-project.org" <alsa-devel(a)alsa-project.org> Sent: Tuesday, 31 July 2012, 6:24 Subject: Re: [alsa-devel] Alsa: USB Class 2 Audio soundcard device disappears suddenly On 31.07.2012 00:32, Joao Bonina wrote: > Hi, > > I'm using an USB Class 2 Audio DAC (basically a soundcard) with my Linux box and MPD software. > > It works great when playing files stored in a remote share, but when > playing files from an USB pen, it stops playing in a few minutes. > > Mpd.log shows this: > > Code: > Jul 30 13:03 : output: "USB" [alsa] failed to play: No such device > Jul 30 13:03 : output: closed plugin=alsa name="USB" > ALSA lib pcm_hw.c:1401:(_snd_pcm_hw_open) Invalid value for card > Jul 30 13:03 : output: Failed to open "USB" [alsa]: Failed to open ALSA device "hw:0,0": No such file or directoryIt seems to be somewhat related to the USB bus not being able to > cope with both PCM streaming to the soundcard and reading from the flash pen simultaneously, I guess. > > So, anybody faced this issue previously and can provide some hints to solve this? > > MPD is 0.17, kernel is 3.2.17, alsa-utils is 1.0.25. Does the kernel log or 'dmesg' show anything weird what that happens? Daniel _______________________________________________ Alsa-devel mailing list Alsa-devel(a)alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

3 6

[alsa-devel] [PATCH 01/19] Configure ux500 Audio Drivers for Device Tree
by Lee Jones 02 Aug '12

02 Aug '12

This patch-set sees many of the ux500 related Audio drivers gain Device Tree enablement. There are also some fixes to issues which where encountered along the way. Documentation/devicetree/bindings/mfd/ab8500.txt | 15 + .../devicetree/bindings/sound/ux500-mop500.txt | 39 ++ .../devicetree/bindings/sound/ux500-msp.txt | 43 ++ arch/arm/boot/dts/db8500.dtsi | 597 ------------------ arch/arm/boot/dts/dbx5x0.dtsi | 636 ++++++++++++++++++++ arch/arm/boot/dts/snowball.dts | 18 +- arch/arm/mach-ux500/Makefile | 2 +- arch/arm/mach-ux500/board-mop500-audio.c | 189 ++++++ arch/arm/mach-ux500/board-mop500-msp.c | 267 -------- arch/arm/mach-ux500/board-mop500-msp.h | 14 - arch/arm/mach-ux500/board-mop500.c | 22 +- arch/arm/mach-ux500/board-mop500.h | 6 + arch/arm/mach-ux500/include/mach/msp.h | 2 - include/linux/mfd/abx500/ab8500-codec.h | 6 +- sound/soc/codecs/ab8500-codec.c | 81 +++ sound/soc/ux500/mop500.c | 42 +- sound/soc/ux500/ux500_msp_dai.c | 20 +- sound/soc/ux500/ux500_msp_i2s.c | 97 ++- sound/soc/ux500/ux500_msp_i2s.h | 2 - sound/soc/ux500/ux500_pcm.c | 19 +- sound/soc/ux500/ux500_pcm.h | 3 + 21 files changed, 1189 insertions(+), 931 deletions(-)

2 26

[alsa-devel] [PATCH] ASoC: core: Fix check before defaulting to regmap
by Mark Brown 02 Aug '12

02 Aug '12

Check if the chip has provided a write operation (which is mandatory for I/O) rather than looking for control data as some of the MFDs use a global for this. Also skip the attempt if there's no regmap available by device in case things get confused by the attempt to default. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/soc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index b1fd043..5359623 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1096,7 +1096,7 @@ static int soc_probe_codec(struct snd_soc_card *card, } /* If the driver didn't set I/O up try regmap */ - if (!codec->control_data) + if (!codec->write && dev_get_regmap(codec->dev, NULL)) snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP); if (driver->controls) -- 1.7.10.4

3 2

[alsa-devel] [ALC882/883/885/888/889] Problems with snd-hda-intel after 3.1.6 and the FIX
by Misha Ketslah 02 Aug '12

02 Aug '12

Hello, As i can't reach bugtracker (is it down, or problem on my side?), i'll post here. Though there is already few open bugs there i saw. I just found temp solution. Bug itslef: After updating to greater version of kernel than 3.1.6 speakers stoped working anymore on most vaio z and similar models, though there is still sound through headphones. (ithere are a lot of people reporting it on different distro bug trackers and forums as well) My specific cards are 00:1b.0 Audio device: Intel Corporation 5 Series/3400 Series Chipset High Definition Audio (rev 05) 01:00.1 Audio device: NVIDIA Corporation High Definition Audio Controller (rev ff) The only solution was to use model=generic, but than most of features wouldn't work.(plugin jack automute, missing most settings in alsamixer). Solution: And as bug was reported for a long time, i waited through kernel updates to fix it. But yesterday as i updated to 3.5 it was still there. And as 3.5 has fewer models for [ALC882/883/885/888/889], as my card is ALC889 i just tried all 3 of them, and it seems everyting working when setting model=acer-aspire-8930g (cant and didn't try HDMI out). But the problem is that it still not that obvious for people with other than acer laptops to set this as model, as well as before (<3.1.6) it worked out-of-box with not model setting at all. thanks, Michael Ketslah. -- To unsubscribe from this list: send the line "unsubscribe alsa-devel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

2 1

[alsa-devel] [RFC PATCH 1/1] ASoC: soc-dapm: warn if no avaiable path found for widget kcontrol
by Dong Aisheng 02 Aug '12

02 Aug '12

From: Dong Aisheng <dong.aisheng(a)linaro.org> This could help people know what's wrong going on if the required path is not registered. Signed-off-by: Dong Aisheng <dong.aisheng(a)linaro.org> --- sound/soc/soc-dapm.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 4d181df..b9b94c5 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1879,6 +1879,9 @@ static int soc_dapm_mux_update_power(struct snd_soc_dapm_widget *widget, } } + WARN(!found, "did not find dapm widget path associated with kcontrol %s\n", + kcontrol->id.name); + if (found) { dapm_mark_dirty(widget, "mux change"); dapm_power_widgets(widget->dapm, SND_SOC_DAPM_STREAM_NOP); -- 1.7.0.4

2 4

[alsa-devel] [PATCH] ASoC: sta529: Staticise non-exported codec driver struct
by Mark Brown 01 Aug '12

01 Aug '12

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/sta529.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/sta529.c b/sound/soc/codecs/sta529.c index 0c225cd..9e31448 100644 --- a/sound/soc/codecs/sta529.c +++ b/sound/soc/codecs/sta529.c @@ -358,7 +358,7 @@ static int sta529_resume(struct snd_soc_codec *codec) return 0; } -struct snd_soc_codec_driver sta529_codec_driver = { +static const struct snd_soc_codec_driver sta529_codec_driver = { .probe = sta529_probe, .remove = sta529_remove, .set_bias_level = sta529_set_bias_level, -- 1.7.10.4

1 0

[alsa-devel] [PATCH] Revert "ASoC: core: Try to use regmap if the driver doesn't set up any I/O"
by Peter Ujfalusi 01 Aug '12

01 Aug '12

Some codec driver can not have regmap implementation so core should not assume that codecs without control_data have implemented regmap of it's own. This reverts commit 38cbf9598feba97de9f9b43efa9153fd7c1a2ec9. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> --- Hi Mark, the reverted patch broke the audio on OMAP based board using twl4030, twl6040 as codec. We can not have regmap implementaion within these codec drivers since they rely on the MFD core to do the IO towards the chip. Regards, Peter sound/soc/soc-core.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index f219b2f..da31aa4 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1095,10 +1095,6 @@ static int soc_probe_codec(struct snd_soc_card *card, } } - /* If the driver didn't set I/O up try regmap */ - if (!codec->control_data) - snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP); - if (driver->controls) snd_soc_add_codec_controls(codec, driver->controls, driver->num_controls); -- 1.7.8.6

3 3