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

[alsa-devel] [PATCH] hda: Added mono mux mixer for some STAC92HD7XXX family codecs
by Matthew Ranostay 21 Jan '08

21 Jan '08

Some 92HD7XXX family codecs have a mono mux, added support for selecting the input path to the mono out. Signed-off-by: Matthew Ranostay <mranostay(a)embeddedalley.com> --- diff -r a035d5e4801c pci/hda/patch_sigmatel.c --- a/pci/hda/patch_sigmatel.c Fri Jan 18 15:32:32 2008 +0100 +++ b/pci/hda/patch_sigmatel.c Fri Jan 18 14:53:36 2008 -0500 @@ -131,6 +131,8 @@ struct sigmatel_spec { hda_nid_t *pwr_nids; /* playback */ + struct hda_input_mux *mono_mux; + unsigned int cur_mmux; struct hda_multi_out multiout; hda_nid_t dac_nids[5]; @@ -144,6 +146,7 @@ struct sigmatel_spec { hda_nid_t *dmux_nids; unsigned int num_dmuxes; hda_nid_t dig_in_nid; + hda_nid_t mono_nid; /* pin widgets */ hda_nid_t *pin_nids; @@ -399,6 +402,31 @@ static int stac92xx_mux_enum_put(struct return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol, spec->mux_nids[adc_idx], &spec->cur_mux[adc_idx]); +} + +static int stac92xx_mono_mux_enum_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) +{ + struct hda_codec *codec = snd_kcontrol_chip(kcontrol); + struct sigmatel_spec *spec = codec->spec; + return snd_hda_input_mux_info(spec->mono_mux, uinfo); +} + +static int stac92xx_mono_mux_enum_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) +{ + struct hda_codec *codec = snd_kcontrol_chip(kcontrol); + struct sigmatel_spec *spec = codec->spec; + + ucontrol->value.enumerated.item[0] = spec->cur_mmux; + return 0; +} + +static int stac92xx_mono_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) +{ + struct hda_codec *codec = snd_kcontrol_chip(kcontrol); + struct sigmatel_spec *spec = codec->spec; + + return snd_hda_input_mux_put(codec, spec->mono_mux, ucontrol, + spec->mono_nid, &spec->cur_mmux); } #define stac92xx_aloopback_info snd_ctl_boolean_mono_info @@ -603,6 +631,16 @@ static struct hda_verb stac9205_core_ini {} }; +#define STAC_MONO_MUX \ + { \ + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \ + .name = "Mono Mux", \ + .count = 1, \ + .info = stac92xx_mono_mux_enum_info, \ + .get = stac92xx_mono_mux_enum_get, \ + .put = stac92xx_mono_mux_enum_put, \ + } + #define STAC_INPUT_SOURCE(cnt) \ { \ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \ @@ -714,6 +752,7 @@ static struct snd_kcontrol_new stac92hd7 static struct snd_kcontrol_new stac92hd71bxx_analog_mixer[] = { STAC_INPUT_SOURCE(2), + STAC_MONO_MUX, HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x1c, 0x0, HDA_OUTPUT), HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x1c, 0x0, HDA_OUTPUT), @@ -733,6 +772,7 @@ static struct snd_kcontrol_new stac92hd7 static struct snd_kcontrol_new stac92hd71bxx_mixer[] = { STAC_INPUT_SOURCE(2), STAC_ANALOG_LOOPBACK(0xFA0, 0x7A0, 2), + STAC_MONO_MUX, HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x1c, 0x0, HDA_OUTPUT), HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x1c, 0x0, HDA_OUTPUT), @@ -1180,7 +1220,7 @@ static struct snd_pci_quirk stac92hd73xx static unsigned int ref92hd71bxx_pin_configs[10] = { 0x02214030, 0x02a19040, 0x01a19020, 0x01014010, - 0x0181302e, 0x01114010, 0x01a19020, 0x90a000f0, + 0x0181302e, 0x01114010, 0x01019020, 0x90a000f0, 0x90a000f0, 0x01452050, }; @@ -3188,6 +3228,16 @@ again: return 0; } +static struct hda_input_mux stac92hd71bxx_mono_mux = { + /* count set later */ + .items = { + { "DAC0", 0x0 }, + { "DAC1", 0x1 }, + /* not an option on all cards */ + { "Mixer", 0x2 }, + }, +}; + static int patch_stac92hd71bxx(struct hda_codec *codec) { struct sigmatel_spec *spec; @@ -3224,10 +3274,12 @@ again: case 0x111d76b7: case 0x111d76b4: /* 6 Port without Analog Mixer */ case 0x111d76b5: + stac92hd71bxx_mono_mux.num_items = 2, spec->mixer = stac92hd71bxx_mixer; spec->init = stac92hd71bxx_core_init; break; default: + stac92hd71bxx_mono_mux.num_items = 3, spec->mixer = stac92hd71bxx_analog_mixer; spec->init = stac92hd71bxx_analog_core_init; } @@ -3237,6 +3289,8 @@ again: spec->gpio_mask = spec->gpio_data = 0x00000001; /* GPIO0 High = EAPD */ + spec->mono_mux = &stac92hd71bxx_mono_mux; + spec->mono_nid = 0x15; spec->mux_nids = stac92hd71bxx_mux_nids; spec->adc_nids = stac92hd71bxx_adc_nids; spec->dmic_nids = stac92hd71bxx_dmic_nids;

2 7

[alsa-devel] Building for 2.4 kernel..
by marcus hall 21 Jan '08

21 Jan '08

I support a product that is running the 2.4.18 linux kernel, and was trying to install alsa-driver-1.0.15, and ran into a problem. The alsa-kernel/pci/cs5535audio/cs5535audio_pm.c contains: if (pci_save_state(pci)) { ... and a similar line for pci_restore_state(). But, in include/adriver.h, pci_save_state is #defined to snd_pci_compat_save_state, which is declared to return void, so the compiler complains that the void return isn't being ignored. Now, pci_save_state() appears to be supposed to return status, although in the 2.4 kernel at least, it returns a constant 0. Nevertheless, to get things to work, I changed snd_pci_compat_save_state(), snd_pci_orig_save_state(), and the corresponding restore functions to return an int with the following patch. (The other obvious solution would be to remove the test in cs5535audio_pm.c, but pci_save_state() is *supposed* to return an int...) -- Marcus Hall marcus(a)tuells.org --------- Index: alsa-driver/acore/misc_driver.c =================================================================== RCS file: /usr/local/cvs_repos/almond/alsa/alsa-driver/acore/misc_driver.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- alsa-driver/acore/misc_driver.c 20 Jan 2008 16:52:35 -0000 1.1 +++ alsa-driver/acore/misc_driver.c 20 Jan 2008 17:14:23 -0000 1.2 @@ -105,14 +105,14 @@ #ifdef CONFIG_PCI #ifndef CONFIG_HAVE_NEW_PCI_SAVE_STATE #ifdef CONFIG_HAVE_PCI_SAVED_CONFIG -void snd_pci_compat_save_state(struct pci_dev *pci) +int snd_pci_compat_save_state(struct pci_dev *pci) { - snd_pci_orig_save_state(pci, pci->saved_config_space); + return snd_pci_orig_save_state(pci, pci->saved_config_space); } EXPORT_SYMBOL(snd_pci_compat_save_state); -void snd_pci_compat_restore_state(struct pci_dev *pci) +int snd_pci_compat_restore_state(struct pci_dev *pci) { - snd_pci_orig_restore_state(pci, pci->saved_config_space); + return snd_pci_orig_restore_state(pci, pci->saved_config_space); } EXPORT_SYMBOL(snd_pci_compat_restore_state); #else /* !CONFIG_HAVE_PCI_SAVED_CONFIG */ @@ -122,7 +122,7 @@ }; static struct saved_config_tbl saved_tbl[16]; -void snd_pci_compat_save_state(struct pci_dev *pci) +int snd_pci_compat_save_state(struct pci_dev *pci) { int i; /* FIXME: mutex needed for race? */ @@ -130,14 +130,15 @@ if (! saved_tbl[i].pci) { saved_tbl[i].pci = pci; snd_pci_orig_save_state(pci, saved_tbl[i].config); - return; + return 0; } } printk(KERN_DEBUG "snd: no pci config space found!\n"); + return 1; } EXPORT_SYMBOL(snd_pci_compat_save_state); -void snd_pci_compat_restore_state(struct pci_dev *pci) +int snd_pci_compat_restore_state(struct pci_dev *pci) { int i; /* FIXME: mutex needed for race? */ @@ -145,10 +146,11 @@ if (saved_tbl[i].pci == pci) { saved_tbl[i].pci = NULL; snd_pci_orig_restore_state(pci, saved_tbl[i].config); - return; + return 0; } } printk(KERN_DEBUG "snd: no saved pci config!\n"); + return 1; } EXPORT_SYMBOL(snd_pci_compat_restore_state); #endif /* CONFIG_HAVE_PCI_SAVED_CONFIG */ Index: alsa-driver/include/adriver.h =================================================================== RCS file: /usr/local/cvs_repos/almond/alsa/alsa-driver/include/adriver.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- alsa-driver/include/adriver.h 20 Jan 2008 16:52:37 -0000 1.1 +++ alsa-driver/include/adriver.h 20 Jan 2008 17:14:23 -0000 1.2 @@ -1165,15 +1165,15 @@ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) #ifdef CONFIG_PCI #ifndef CONFIG_HAVE_NEW_PCI_SAVE_STATE -void snd_pci_compat_save_state(struct pci_dev *pci); -void snd_pci_compat_restore_state(struct pci_dev *pci); -static inline void snd_pci_orig_save_state(struct pci_dev *pci, u32 *buffer) +int snd_pci_compat_save_state(struct pci_dev *pci); +int snd_pci_compat_restore_state(struct pci_dev *pci); +static inline int snd_pci_orig_save_state(struct pci_dev *pci, u32 *buffer) { - pci_save_state(pci, buffer); + return pci_save_state(pci, buffer); } -static inline void snd_pci_orig_restore_state(struct pci_dev *pci, u32 *buffer) +static inline int snd_pci_orig_restore_state(struct pci_dev *pci, u32 *buffer) { - pci_restore_state(pci, buffer); + return pci_restore_state(pci, buffer); } #undef pci_save_state

2 1

[alsa-devel] [PATCH] Fix lockdep warning in ASoC machine probe
by Mark Brown 21 Jan '08

21 Jan '08

Don't take the codec mutex during machine probe until we have registered with ALSA, fixing a lockdep warning reported by Dmitry Baryshkov. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Cc: Dmitry Baryshkov <dbaryshkov(a)gmail.com> --- sound/soc/soc-core.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 2eb9b20..78d1662 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1098,7 +1098,6 @@ int snd_soc_register_card(struct snd_soc_device *socdev) struct snd_soc_machine *machine = socdev->machine; int ret = 0, i, ac97 = 0, err = 0; - mutex_lock(&codec->mutex); for(i = 0; i < machine->num_links; i++) { if (socdev->machine->dai_link[i].init) { err = socdev->machine->dai_link[i].init(codec); @@ -1124,12 +1123,14 @@ int snd_soc_register_card(struct snd_soc_device *socdev) goto out; } + mutex_lock(&codec->mutex); #ifdef CONFIG_SND_SOC_AC97_BUS if (ac97) { ret = soc_ac97_dev_register(codec); if (ret < 0) { printk(KERN_ERR "asoc: AC97 device register failed\n"); snd_card_free(codec->card); + mutex_unlock(&codec->mutex); goto out; } } @@ -1142,8 +1143,10 @@ int snd_soc_register_card(struct snd_soc_device *socdev) err = device_create_file(socdev->dev, &dev_attr_codec_reg); if (err < 0) printk(KERN_WARNING "asoc: failed to add codec sysfs entries\n"); -out: + mutex_unlock(&codec->mutex); + +out: return ret; } EXPORT_SYMBOL_GPL(snd_soc_register_card); -- 1.5.3.8

2 1

Re: [alsa-devel] [alsa-cvslog] alsa-driver: Added CONFIG_HAVE_INIT_UTSNAME test
by Takashi Iwai 21 Jan '08

21 Jan '08

At Mon, 21 Jan 2008 11:48:06 +0100 (CET), Jaroslav Kysela wrote: > > changeset: 3491:94a0c6eeb244 > tag: tip > user: perex > date: Mon Jan 21 11:48:04 2008 +0100 > files: acore/info_oss.c configure.in include/config.h.in > description: > Added CONFIG_HAVE_INIT_UTSNAME test > > > diff -r f8ead0afa48d -r 94a0c6eeb244 acore/info_oss.c > --- a/acore/info_oss.c Mon Jan 21 10:42:45 2008 +0100 > +++ b/acore/info_oss.c Mon Jan 21 11:48:04 2008 +0100 > @@ -1,6 +1,6 @@ > #define __NO_VERSION__ > #include <linux/version.h> > -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) > +#ifdef CONFIG_HAVE_INIT_UTSNAME > #define init_utsname() (&system_utsname) > #endif > #include "adriver.h" > diff -r f8ead0afa48d -r 94a0c6eeb244 configure.in > --- a/configure.in Mon Jan 21 10:42:45 2008 +0100 > +++ b/configure.in Mon Jan 21 11:48:04 2008 +0100 > @@ -2566,6 +2566,32 @@ if test "$CONFIG_HAVE_GFP_T" = "1"; then > AC_DEFINE(CONFIG_HAVE_GFP_T) > fi > > +dnl Check for init_utsname... > +AC_MSG_CHECKING(for init_utsname) > +gfp_t="0" > +ac_save_CFLAGS="$CFLAGS" > +ac_save_CC="$CC" > +CFLAGS="$KERNEL_CHECK_CFLAGS" > +CC=$KCC > +AC_TRY_COMPILE([ > +#define __KERNEL__ > +#include <linux/config.h> > +#include <linux/utsname.h> > +],[ > + void *x = init_utsname(); > +], I'm afraid it won't work. In C, it's fine to call undeclared functions. It's supposed to be an int function. Takashi

2 1

[alsa-devel] [PATCH] dapm_new_mixer and 32 bytes limitation
by Robert Jarzmik 21 Jan '08

21 Jan '08

Dapm mixer names are truncated to 32 bytes, while alsa control names are 44 bytes wide. Subsequent usage of functions like snd_ctl_find_id fail because of the mismatch. Unless there's a limitation I don't understand, the following patch fixes the limit back to 44 bytes. -- Robert

3 3

[alsa-devel] alsaconf usefulness
by Alexander E. Patrakov 21 Jan '08

21 Jan '08

Hello developers, Debian applies the following patch to alsaconf: Index: alsa-utils-1.0.15/alsaconf/alsaconf.in =================================================================== --- alsa-utils-1.0.15.orig/alsaconf/alsaconf.in 2007-10-21 14:57:02.000000000 +0200 +++ alsa-utils-1.0.15/alsaconf/alsaconf.in 2007-10-21 14:57:02.000000000 +0200 @@ -458,8 +458,16 @@ Advanced Linux Sound Architecture (ALSA) driver. - You should stop all sound applications now." $version) - $DIALOG --msgbox "$msg" 20 63 || acex 0 + You should stop all sound applications now. + + Please notice, that sound configuration with this script + is not needed if you are running testing/sid with an up + to date kernel and your sound device is a supported PCI + one. In that case *udev* is predestinated to load your + driver ;) + But any way, you can finish this procedure with a working + PCI-Sound at the end." $version) + $DIALOG --msgbox "$msg" 24 63 || acex 0 } # FAREWELL The added note is completely valid: in most cases, there is nothing to do, even for ISA-PnP cards (because all self-respecting distributions already contain a rule for loading ISA-PnP drivers). However, the very presence of alsaconf generates a lot of support traffic on forums in the form "I have tried alsaconf and it didn't help" (or worse, ruined a working setup). Also, it cannot deal with more than one sound card. Could you please either apply the above patch (of course, replacing the wording with a distro-neutral one), or just drop this obsolete program and replace it with the "alsa-unmute" script which essentially contains the same as the set_mixers() function (but allows to specify the card to unmute)? -- Alexander E. Patrakov

2 1

[alsa-devel] [PATCH] wm9713 and virtual Line mixer
by Robert Jarzmik 21 Jan '08

21 Jan '08

Trivial patch for the forgotten virtual line mixer in wm9713. Missing this mixer causes Mono Mixer and Speaker Mixer lack of support for input from Line Left and Line Right signals. -- Robert

2 1

[alsa-devel] "Help to debug" in ALSA wiki
by Jaroslav Kysela 21 Jan '08

21 Jan '08

Hi all, I would like to introduce "Help to debug" link in the ALSA wiki. The primary motivation is to provide information to users what we need to know to help us to debug things. Also next information is for potential developers to debug our code providing links to hardware specification and debug tools. Actually, I feel that especially for HDA support information is split in a group of main HDA developers, but we are lacking other links like how to compile ALSA driver from sources using a distribution or so. I would like to ask all developers to add and improve texts in this section of wiki, so we can just redirect users there (if required, of course). Thanks, Jaroslav ----- Jaroslav Kysela <perex(a)perex.cz> Linux Kernel Sound Maintainer ALSA Project, Red Hat, Inc.

1 0

[alsa-devel] [Fwd: problem with audigy2 ZS remote]
by Stefano Radaelli 21 Jan '08

21 Jan '08

The problem still exists. Also the mic on the livedrive panel don't works without initialization. If I start windows and reboot in linux the panel is initialized and works(that confirm it is not an hardware problem) Thanks -------- Messaggio Originale -------- Oggetto: problem with audigy2 ZS remote Data: Mon, 25 Jun 2007 18:47:59 +0200 Da: Stefano Radaelli <puttext(a)tiscali.it> A: alsa-devel(a)alsa-project.org Hi all! Sorry for my bad english. I have a problem with the livedrive of an audigy2 ZS. After some upgrades (on a gentoo linux system) the eternal panel seems to stop working. Even after the "initialization" (with echo on the midi device), the IR led not blink on remote action. This worked correctly in the past but after some upgrade (i don't know exactly what) it stoipped working. I don't known where i have to look (logs?) or what type of debugging it's necessary. Help me please

1 0

Re: [alsa-devel] Si3054 and Lenovo3000 n100
by Brian Hinz 20 Jan '08

20 Jan '08

11c1:1040 is not an SiLabs chip, it's an agere - see alsa bug #0003316: https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3316 and agere still has not released a driver or documentation yet: http://linmodems.technion.ac.il/archive-seventh/msg03029.html it probably should be removed from patch_si3054.c though... -brian ------------------------------ Message: 3 Date: Mon, 14 Jan 2008 12:07:15 +0100 From: Takashi Iwai Subject: Re: [alsa-devel] Si3054 and Lenovo3000 n100 To: Vasily Khoruzhick Cc: Andy Shevchenko , alsa-devel(a)alsa-project.org Message-ID: Content-Type: text/plain; charset=US-ASCII At Sun, 13 Jan 2008 19:10:44 +0200, Vasily Khoruzhick wrote: > > On 13 January 2008 18:15:06 Andy Shevchenko wrote: >> Hi Vasily Khoruzhick! >> >> On Sun, Jan 13, 2008 at 04:49:45PM +0200, Vasily Khoruzhick wrote next: >>> Hi, I have problems with setting up internal modem (regular si3054 >>> sitting on hda bus) with subj notebook. >> >> Do you belive that the Si3054 clone? What is ids of your modem codec? >> If you get 11c1:1040 you lose this game. >> >> P.S. IIRC the n200 has unsupported modem codec. I guess your model too. > > Btw, if it isn't compatible with Si3054, why its id added to patch_si3054.c > file? Possibly mistakenly :) Takashi

1 0