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

Re: [alsa-devel] Macbook[Pro] 5 6ch support
by Takashi Iwai 02 Jun '09

02 Jun '09

At Mon, 1 Jun 2009 20:21:27 +0200, Kacper Szczesniak wrote: > > On Mon, Jun 1, 2009 at 6:54 PM, Takashi Iwai <tiwai(a)suse.de> wrote: > > At Mon, 1 Jun 2009 15:36:35 +0200, > > Kacper Szczesniak wrote: > >> > >> On Mon, Jun 1, 2009 at 10:54 AM, Takashi Iwai <tiwai(a)suse.de> wrote: > >> > Hm, this patch changes the channel mapping completely. > >> > Is it intentional? > >> yes, 0xc/0xd/0xe for Front/LFE/Surr > >> > >> >> static struct snd_kcontrol_new alc885_mb5_mixer[] = { > >> >> - HDA_CODEC_VOLUME("Front Playback Volume", 0x0d, 0x00, HDA_OUTPUT), > >> >> - HDA_BIND_MUTE ("Front Playback Switch", 0x0d, 0x02, HDA_INPUT), > >> >> - HDA_CODEC_VOLUME("Line-Out Playback Volume", 0x0c, 0x00, HDA_OUTPUT), > >> >> - HDA_BIND_MUTE ("Line-Out Playback Switch", 0x0c, 0x02, HDA_INPUT), > >> >> + HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x00, HDA_OUTPUT), > >> >> + HDA_BIND_MUTE ("Front Playback Switch", 0x0c, 0x02, HDA_INPUT), > >> >> + HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x00, HDA_OUTPUT), > >> >> + HDA_BIND_MUTE ("Surround Playback Switch", 0x0d, 0x02, HDA_INPUT), > >> >> + HDA_CODEC_VOLUME("LFE Playback Volume", 0x0e, 0x00, HDA_OUTPUT), > >> >> + HDA_BIND_MUTE ("LFE Playback Switch", 0x0e, 0x02, HDA_INPUT), > >> >> + HDA_CODEC_VOLUME("HP Playback Volume", 0x0f, 0x00, HDA_OUTPUT), > >> >> + HDA_BIND_MUTE ("HP Playback Switch", 0x0f, 0x02, HDA_INPUT), > >> >> HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT), > >> >> HDA_CODEC_MUTE ("Line Playback Switch", 0x0b, 0x02, HDA_INPUT), > >> > > >> > > >> > I'm wondering whether this breaks MB5, not MB5.1. If it's MB5.1 > >> > specific, please create another model instead of breaking the old > >> > one. > >> it's confirmed to work on MB5.1 MBP5.1 MBP52 > > > > Hrm, then I wonder why the old mb5 model works as is although the > > mapping is totally different... > > /* Front mixer */ > - {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, > - {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, > - {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, > - /* LineOut mixer */ > {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, > {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, > {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, > - /* Front Pin: output 0 (0x0d) */ > + /* Surround mixer */ > + {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, > + {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, > + {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, > + /* LFE mixer */ > + {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, > + {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, > + {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, > + /* HP mixer */ > + {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, > + {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, > + {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, > + /* Front Pin (0x0c) */ > {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x01}, > {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, > - {0x18, AC_VERB_SET_CONNECT_SEL, 0x01}, > - /* HP Pin: output 0 (0x0c) */ > + {0x18, AC_VERB_SET_CONNECT_SEL, 0x00}, > + /* LFE Pin (0x0e) */ > + {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x01}, > + {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, > + {0x1a, AC_VERB_SET_CONNECT_SEL, 0x02}, > + /* HP Pin (0x0f) */ > {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, > {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, > - {0x14, AC_VERB_SET_CONNECT_SEL, 0x00}, > + {0x14, AC_VERB_SET_CONNECT_SEL, 0x03}, > > connections are different also... I've changed mixer names and connected PINs to > the right mixer nodes. Fair enough. I merged the patch now to sound git tree. Let me know if you see still any problem. thanks, Takashi

1 0

[alsa-devel] [PATCH] ALSA: hda - fix audio on LG R510
by Ozan Çağlayan 02 Jun '09

02 Jun '09

Currently, LG R510 is only able to produce sound on headphones, the internal speakers are not working. The user tested and confirmed that with model=Dell headphones, internal speakers and the microphone are working flawlessly. Tested-by: Serdar Soytetir <tulliana(a)gmail.com> Signed-off-by: Ozan Çağlayan <ozan(a)pardus.org.tr> --- sound/pci/hda/patch_realtek.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 0fd258e..a2133ac 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -12063,6 +12063,7 @@ static struct snd_pci_quirk alc268_cfg_tbl[] = { ALC268_ACER_ASPIRE_ONE), SND_PCI_QUIRK(0x1028, 0x0253, "Dell OEM", ALC268_DELL), SND_PCI_QUIRK(0x1028, 0x02b0, "Dell Inspiron Mini9", ALC268_DELL), + SND_PCI_QUIRK(0x1854, 0x1775, "LG R510", ALC268_DELL), SND_PCI_QUIRK(0x103c, 0x30cc, "TOSHIBA", ALC268_TOSHIBA), SND_PCI_QUIRK(0x103c, 0x30f1, "HP TX25xx series", ALC268_TOSHIBA), SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC268_3ST), -- 1.6.2

2 2

[alsa-devel] [PATCH 0/1] ASoC: TWL4030: Additional check for 4 channel mode
by Peter Ujfalusi 02 Jun '09

02 Jun '09

Hello, the following patch adds additional check in case of four channel mode. The codec has to be configured for TDM (DSP_A) mode when using 4 channel audio. Without the patch boards which does not prepared for the four channel mode could try to play four channel audio, but configure the interface to be in I2S mode, which is not valid. --- Peter Ujfalusi (1): ASoC: TWL4030: Check the interface format for 4 channel mode sound/soc/codecs/twl4030.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-)

2 2

[alsa-devel] [PATCH] alsa-info.sh: Provide system manufacturer and product name from DMI
by Ozan Çağlayan 02 Jun '09

02 Jun '09

This commit adds system manufacturer and product name informations acquired using dmidecode to the output of the alsa-info script. Note that those informations will only be available when dmidecode utility is installed and alsa-info is run with root privileges. Signed-off-by: Ozan Çağlayan <ozan(a)pardus.org.tr> --- utils/alsa-info.sh | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/utils/alsa-info.sh b/utils/alsa-info.sh index f1660f8..4be4e05 100755 --- a/utils/alsa-info.sh +++ b/utils/alsa-info.sh @@ -400,6 +400,12 @@ ESDINST=$(which esd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null) PAINST=$(which pulseaudio 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null) ARTSINST=$(which artsd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null) JACKINST=$(which jackd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null) +DMIDECODE=$(which dmidecode 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null) + +if [ -x $DMIDECODE ]; then + DMI_SYSTEM_MANUFACTURER=$($DMIDECODE -s system-manufacturer 2>/dev/null) + DMI_SYSTEM_PRODUCT_NAME=$($DMIDECODE -s system-product-name 2>/dev/null) +fi cat /proc/asound/modules 2>/dev/null|awk {'print $2'}>$TEMPDIR/alsamodules.tmp cat /proc/asound/cards >$TEMPDIR/alsacards.tmp @@ -431,6 +437,13 @@ echo "" >> $FILE echo $DISTRO >> $FILE echo "" >> $FILE echo "" >> $FILE +echo "!!DMI Information" >> $FILE +echo "!!---------------" >> $FILE +echo "" >> $FILE +echo "Manufacturer: $DMI_SYSTEM_MANUFACTURER" >> $FILE +echo "Product Name: $DMI_SYSTEM_PRODUCT_NAME" >> $FILE +echo "" >> $FILE +echo "" >> $FILE echo "!!Kernel Information" >> $FILE echo "!!------------------" >> $FILE echo "" >> $FILE -- 1.6.3

2 3

Re: [alsa-devel] Macbook[Pro] 5 6ch support
by Takashi Iwai 01 Jun '09

01 Jun '09

At Mon, 1 Jun 2009 15:36:35 +0200, Kacper Szczesniak wrote: > > On Mon, Jun 1, 2009 at 10:54 AM, Takashi Iwai <tiwai(a)suse.de> wrote: > > Hm, this patch changes the channel mapping completely. > > Is it intentional? > yes, 0xc/0xd/0xe for Front/LFE/Surr > > >> static struct snd_kcontrol_new alc885_mb5_mixer[] = { > >> - HDA_CODEC_VOLUME("Front Playback Volume", 0x0d, 0x00, HDA_OUTPUT), > >> - HDA_BIND_MUTE ("Front Playback Switch", 0x0d, 0x02, HDA_INPUT), > >> - HDA_CODEC_VOLUME("Line-Out Playback Volume", 0x0c, 0x00, HDA_OUTPUT), > >> - HDA_BIND_MUTE ("Line-Out Playback Switch", 0x0c, 0x02, HDA_INPUT), > >> + HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x00, HDA_OUTPUT), > >> + HDA_BIND_MUTE ("Front Playback Switch", 0x0c, 0x02, HDA_INPUT), > >> + HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x00, HDA_OUTPUT), > >> + HDA_BIND_MUTE ("Surround Playback Switch", 0x0d, 0x02, HDA_INPUT), > >> + HDA_CODEC_VOLUME("LFE Playback Volume", 0x0e, 0x00, HDA_OUTPUT), > >> + HDA_BIND_MUTE ("LFE Playback Switch", 0x0e, 0x02, HDA_INPUT), > >> + HDA_CODEC_VOLUME("HP Playback Volume", 0x0f, 0x00, HDA_OUTPUT), > >> + HDA_BIND_MUTE ("HP Playback Switch", 0x0f, 0x02, HDA_INPUT), > >> HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT), > >> HDA_CODEC_MUTE ("Line Playback Switch", 0x0b, 0x02, HDA_INPUT), > > > > > > I'm wondering whether this breaks MB5, not MB5.1. If it's MB5.1 > > specific, please create another model instead of breaking the old > > one. > it's confirmed to work on MB5.1 MBP5.1 MBP52 Hrm, then I wonder why the old mb5 model works as is although the mapping is totally different... Takashi

1 0

[alsa-devel] [PATCH/RFC] alsa-info: add DMI data to the alsa-info output
by Ozan Çağlayan 01 Jun '09

01 Jun '09

This is a working but not a clean/good patch for doing that because I'm not very good at shell scripting but I'm posting it just to give a possible idea. dmidecode should be run as root because it reads /dev/mem. If alsa-info is run as root, providing at least the system-manufacturer and system-product-name in the output will be very useful for distro maintainers. Thanks, Ozan Caglayan Index: alsa-info.sh =================================================================== --- alsa-info.sh (revision 69253) +++ alsa-info.sh (working copy) @@ -361,6 +361,18 @@ ARTSINST=$(which artsd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null) JACKINST=$(which jackd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null) +DMIDECODE=$(which dmidecode) +DMI_SYSTEM_MANUFACTURER="Not provided" +DMI_SYSTEM_PRODUCT_NAME="Not provided" + +if [ -f $DMIDECODE ]; then + $DMIDECODE -q &> /dev/null + if [ x$? != "x1" ]; then + DMI_SYSTEM_MANUFACTURER=$($DMIDECODE -s system-manufacturer) + DMI_SYSTEM_PRODUCT_NAME=$($DMIDECODE -s system-product-name) + fi +fi + cat /proc/asound/modules 2>/dev/null|awk {'print $2'}>$TEMPDIR/alsamodules.tmp cat /proc/asound/cards >$TEMPDIR/alsacards.tmp lspci |grep -i "multi\|audio">$TEMPDIR/lspci.tmp @@ -391,6 +403,13 @@ echo $DISTRO >> $FILE echo "" >> $FILE echo "" >> $FILE +echo "!!DMI Information" >> $FILE +echo "!!---------------" >> $FILE +echo "" >> $FILE +echo "Manufacturer: $DMI_SYSTEM_MANUFACTURER" >> $FILE +echo "Product Name: $DMI_SYSTEM_PRODUCT_NAME" >> $FILE +echo "" >> $FILE +echo "" >> $FILE echo "!!Kernel Information" >> $FILE echo "!!------------------" >> $FILE echo "" >> $FILE

3 3

[alsa-devel] [PATCH] snd-hda-intel: Jack Mode changes for Sigmatel boards
by Nickolas Lloyd 01 Jun '09

01 Jun '09

This patch changes Line In as Out Switch and Mic In as Out Switch to enums for consistency, and causes all mic ports to be probed and controls to be added appropriately. Signed-off-by: Nickolas Lloyd <ultrageek.lloyd(a)gmail.com> Note: diffed against alsa-driver-20090520 ---- --- alsa-driver/sound/pci/hda/patch_sigmatel.c 2009-05-19 22:05:02.000000000 +0000 +++ alsa-driver.a/sound/pci/hda/patch_sigmatel.c 2009-05-20 12:17:49.000000000 +0000 @@ -668,62 +668,6 @@ static unsigned int stac92xx_vref_get(st return vref; } -static int stac92xx_dc_bias_put(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) -{ - struct hda_codec *codec = snd_kcontrol_chip(kcontrol); - unsigned int new_vref; - unsigned int error; - - if (ucontrol->value.enumerated.item[0] == 0) - new_vref = AC_PINCTL_VREF_80; - else if (ucontrol->value.enumerated.item[0] == 1) - new_vref = AC_PINCTL_VREF_GRD; - else - new_vref = AC_PINCTL_VREF_HIZ; - - if (new_vref != stac92xx_vref_get(codec, kcontrol->private_value)) { - error = stac92xx_vref_set(codec, - kcontrol->private_value, new_vref); - return error; - } - - return 0; -} - -static int stac92xx_dc_bias_get(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) -{ - struct hda_codec *codec = snd_kcontrol_chip(kcontrol); - unsigned int vref = stac92xx_vref_get(codec, kcontrol->private_value); - if (vref == AC_PINCTL_VREF_80) - ucontrol->value.enumerated.item[0] = 0; - else if (vref == AC_PINCTL_VREF_GRD) - ucontrol->value.enumerated.item[0] = 1; - else if (vref == AC_PINCTL_VREF_HIZ) - ucontrol->value.enumerated.item[0] = 2; - - return 0; -} - -static int stac92xx_dc_bias_info(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_info *uinfo) -{ - static char *texts[] = { - "Mic In", "Line In", "Line Out" - }; - - uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; - uinfo->value.enumerated.items = 3; - uinfo->count = 1; - if (uinfo->value.enumerated.item >= 3) - uinfo->value.enumerated.item = 2; - strcpy(uinfo->value.enumerated.name, - texts[uinfo->value.enumerated.item]); - - return 0; -} - static int stac92xx_mux_enum_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { struct hda_codec *codec = snd_kcontrol_chip(kcontrol); @@ -2695,7 +2639,93 @@ static int stac92xx_hp_switch_put(struct return 1; } -#define stac92xx_io_switch_info snd_ctl_boolean_mono_info +static int stac92xx_dc_bias_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + int i; + static char *texts[] = { + "Mic In", "Line In", "Line Out" + }; + + if (kcontrol->private_value & 0x100) + i = 3; + else + i = 2; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; + uinfo->value.enumerated.items = i; + uinfo->count = 1; + if (uinfo->value.enumerated.item >= i) + uinfo->value.enumerated.item = i-1; + strcpy(uinfo->value.enumerated.name, + texts[uinfo->value.enumerated.item]); + + return 0; +} + +static int stac92xx_dc_bias_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct hda_codec *codec = snd_kcontrol_chip(kcontrol); + hda_nid_t nid = kcontrol->private_value & 0x0ff; + unsigned int vref = stac92xx_vref_get(codec, nid); + + if (vref == stac92xx_get_vref(codec, nid)) + ucontrol->value.enumerated.item[0] = 0; + else if (vref == AC_PINCTL_VREF_GRD) + ucontrol->value.enumerated.item[0] = 1; + else if (vref == AC_PINCTL_VREF_HIZ) + ucontrol->value.enumerated.item[0] = 2; + + return 0; +} + +static int stac92xx_dc_bias_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct hda_codec *codec = snd_kcontrol_chip(kcontrol); + unsigned int new_vref = 0; + unsigned int error; + hda_nid_t nid = (kcontrol->private_value & 0x0ff); + + if (ucontrol->value.enumerated.item[0] == 0) + new_vref = stac92xx_get_vref(codec, nid); + else if (ucontrol->value.enumerated.item[0] == 1) + new_vref = AC_PINCTL_VREF_GRD; + else if (ucontrol->value.enumerated.item[0] == 2) + new_vref = AC_PINCTL_VREF_HIZ; + else + return 1; + + if (new_vref != stac92xx_vref_get(codec, nid)) { + error = stac92xx_vref_set(codec, nid, new_vref); + return error; + } + + return 0; +} + + + +static int stac92xx_io_switch_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + static char *texts[2]; + if (kcontrol->private_value & 0xff) + texts[0] = "Mic In"; + else + texts[0] = "Line In"; + texts[1] = "Line Out"; + uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; + uinfo->value.enumerated.items = 2; + uinfo->count = 1; + if (uinfo->value.enumerated.item >= 2) + uinfo->value.enumerated.item = 1; + strcpy(uinfo->value.enumerated.name, + texts[uinfo->value.enumerated.item]); + + return 0; +} static int stac92xx_io_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { @@ -2703,7 +2733,7 @@ static int stac92xx_io_switch_get(struct struct sigmatel_spec *spec = codec->spec; int io_idx = kcontrol-> private_value & 0xff; - ucontrol->value.integer.value[0] = spec->io_switch[io_idx]; + ucontrol->value.enumerated.item[0] = spec->io_switch[io_idx]; return 0; } @@ -2713,7 +2743,7 @@ static int stac92xx_io_switch_put(struct struct sigmatel_spec *spec = codec->spec; hda_nid_t nid = kcontrol->private_value >> 8; int io_idx = kcontrol-> private_value & 0xff; - unsigned short val = !!ucontrol->value.integer.value[0]; + unsigned short val = !!ucontrol->value.enumerated.item[0]; spec->io_switch[io_idx] = val; @@ -3242,7 +3272,10 @@ static int stac92xx_auto_create_multi_ou const struct auto_pin_cfg *cfg) { struct sigmatel_spec *spec = codec->spec; + hda_nid_t nid; + int def_conf; int err; + int idx; err = create_multi_out_ctls(codec, cfg->line_outs, cfg->line_out_pins, spec->multiout.dac_nids, @@ -3261,18 +3294,34 @@ static int stac92xx_auto_create_multi_ou if (spec->line_switch) { err = stac92xx_add_control(spec, STAC_CTL_WIDGET_IO_SWITCH, - "Line In as Output Switch", + "Line In Jack Mode", spec->line_switch << 8); if (err < 0) return err; } - if (spec->mic_switch) { - err = stac92xx_add_control(spec, STAC_CTL_WIDGET_DC_BIAS, - "Mic Jack Mode", - spec->mic_switch); - if (err < 0) - return err; + nid = cfg->input_pins[AUTO_PIN_MIC]; + idx = 0; +again: + if (nid) { + def_conf = snd_hda_codec_get_pincfg(codec, nid); + if (!((get_defcfg_connect(def_conf)) & AC_JACK_PORT_FIXED)) { + if (snd_hda_query_pin_caps(codec, nid) + & (AC_PINCAP_VREF_GRD << AC_PINCAP_VREF_SHIFT)) + stac92xx_add_control_idx(spec, + STAC_CTL_WIDGET_DC_BIAS, idx++, + "Mic Jack Mode", nid + | ((nid == spec->mic_switch) + ? 0x100 : 0)); + else if (nid == spec->mic_switch) + stac92xx_add_control_idx(spec, + STAC_CTL_WIDGET_IO_SWITCH, idx++, + "Mic Jack Mode", ((nid << 8) | 1)); + } + } + if (nid == cfg->input_pins[AUTO_PIN_MIC]) { + nid = cfg->input_pins[AUTO_PIN_FRONT_MIC]; + goto again; } return 0; --- alsa-driver/sound/pci/hda/patch_sigmatel.c 2009-05-19 22:05:02.000000000 +0000 +++ alsa-driver.a/sound/pci/hda/patch_sigmatel.c 2009-05-20 12:17:49.000000000 +0000 @@ -668,62 +668,6 @@ static unsigned int stac92xx_vref_get(st return vref; } -static int stac92xx_dc_bias_put(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) -{ - struct hda_codec *codec = snd_kcontrol_chip(kcontrol); - unsigned int new_vref; - unsigned int error; - - if (ucontrol->value.enumerated.item[0] == 0) - new_vref = AC_PINCTL_VREF_80; - else if (ucontrol->value.enumerated.item[0] == 1) - new_vref = AC_PINCTL_VREF_GRD; - else - new_vref = AC_PINCTL_VREF_HIZ; - - if (new_vref != stac92xx_vref_get(codec, kcontrol->private_value)) { - error = stac92xx_vref_set(codec, - kcontrol->private_value, new_vref); - return error; - } - - return 0; -} - -static int stac92xx_dc_bias_get(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) -{ - struct hda_codec *codec = snd_kcontrol_chip(kcontrol); - unsigned int vref = stac92xx_vref_get(codec, kcontrol->private_value); - if (vref == AC_PINCTL_VREF_80) - ucontrol->value.enumerated.item[0] = 0; - else if (vref == AC_PINCTL_VREF_GRD) - ucontrol->value.enumerated.item[0] = 1; - else if (vref == AC_PINCTL_VREF_HIZ) - ucontrol->value.enumerated.item[0] = 2; - - return 0; -} - -static int stac92xx_dc_bias_info(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_info *uinfo) -{ - static char *texts[] = { - "Mic In", "Line In", "Line Out" - }; - - uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; - uinfo->value.enumerated.items = 3; - uinfo->count = 1; - if (uinfo->value.enumerated.item >= 3) - uinfo->value.enumerated.item = 2; - strcpy(uinfo->value.enumerated.name, - texts[uinfo->value.enumerated.item]); - - return 0; -} - static int stac92xx_mux_enum_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { struct hda_codec *codec = snd_kcontrol_chip(kcontrol); @@ -2695,7 +2639,93 @@ static int stac92xx_hp_switch_put(struct return 1; } -#define stac92xx_io_switch_info snd_ctl_boolean_mono_info +static int stac92xx_dc_bias_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + int i; + static char *texts[] = { + "Mic In", "Line In", "Line Out" + }; + + if (kcontrol->private_value & 0x100) + i = 3; + else + i = 2; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; + uinfo->value.enumerated.items = i; + uinfo->count = 1; + if (uinfo->value.enumerated.item >= i) + uinfo->value.enumerated.item = i-1; + strcpy(uinfo->value.enumerated.name, + texts[uinfo->value.enumerated.item]); + + return 0; +} + +static int stac92xx_dc_bias_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct hda_codec *codec = snd_kcontrol_chip(kcontrol); + hda_nid_t nid = kcontrol->private_value & 0x0ff; + unsigned int vref = stac92xx_vref_get(codec, nid); + + if (vref == stac92xx_get_vref(codec, nid)) + ucontrol->value.enumerated.item[0] = 0; + else if (vref == AC_PINCTL_VREF_GRD) + ucontrol->value.enumerated.item[0] = 1; + else if (vref == AC_PINCTL_VREF_HIZ) + ucontrol->value.enumerated.item[0] = 2; + + return 0; +} + +static int stac92xx_dc_bias_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct hda_codec *codec = snd_kcontrol_chip(kcontrol); + unsigned int new_vref = 0; + unsigned int error; + hda_nid_t nid = (kcontrol->private_value & 0x0ff); + + if (ucontrol->value.enumerated.item[0] == 0) + new_vref = stac92xx_get_vref(codec, nid); + else if (ucontrol->value.enumerated.item[0] == 1) + new_vref = AC_PINCTL_VREF_GRD; + else if (ucontrol->value.enumerated.item[0] == 2) + new_vref = AC_PINCTL_VREF_HIZ; + else + return 1; + + if (new_vref != stac92xx_vref_get(codec, nid)) { + error = stac92xx_vref_set(codec, nid, new_vref); + return error; + } + + return 0; +} + + + +static int stac92xx_io_switch_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + static char *texts[2]; + if (kcontrol->private_value & 0xff) + texts[0] = "Mic In"; + else + texts[0] = "Line In"; + texts[1] = "Line Out"; + uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; + uinfo->value.enumerated.items = 2; + uinfo->count = 1; + if (uinfo->value.enumerated.item >= 2) + uinfo->value.enumerated.item = 1; + strcpy(uinfo->value.enumerated.name, + texts[uinfo->value.enumerated.item]); + + return 0; +} static int stac92xx_io_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { @@ -2703,7 +2733,7 @@ static int stac92xx_io_switch_get(struct struct sigmatel_spec *spec = codec->spec; int io_idx = kcontrol-> private_value & 0xff; - ucontrol->value.integer.value[0] = spec->io_switch[io_idx]; + ucontrol->value.enumerated.item[0] = spec->io_switch[io_idx]; return 0; } @@ -2713,7 +2743,7 @@ static int stac92xx_io_switch_put(struct struct sigmatel_spec *spec = codec->spec; hda_nid_t nid = kcontrol->private_value >> 8; int io_idx = kcontrol-> private_value & 0xff; - unsigned short val = !!ucontrol->value.integer.value[0]; + unsigned short val = !!ucontrol->value.enumerated.item[0]; spec->io_switch[io_idx] = val; @@ -3242,7 +3272,10 @@ static int stac92xx_auto_create_multi_ou const struct auto_pin_cfg *cfg) { struct sigmatel_spec *spec = codec->spec; + hda_nid_t nid; + int def_conf; int err; + int idx; err = create_multi_out_ctls(codec, cfg->line_outs, cfg->line_out_pins, spec->multiout.dac_nids, @@ -3261,18 +3294,34 @@ static int stac92xx_auto_create_multi_ou if (spec->line_switch) { err = stac92xx_add_control(spec, STAC_CTL_WIDGET_IO_SWITCH, - "Line In as Output Switch", + "Line In Jack Mode", spec->line_switch << 8); if (err < 0) return err; } - if (spec->mic_switch) { - err = stac92xx_add_control(spec, STAC_CTL_WIDGET_DC_BIAS, - "Mic Jack Mode", - spec->mic_switch); - if (err < 0) - return err; + nid = cfg->input_pins[AUTO_PIN_MIC]; + idx = 0; +again: + if (nid) { + def_conf = snd_hda_codec_get_pincfg(codec, nid); + if (!((get_defcfg_connect(def_conf)) & AC_JACK_PORT_FIXED)) { + if (snd_hda_query_pin_caps(codec, nid) + & (AC_PINCAP_VREF_GRD << AC_PINCAP_VREF_SHIFT)) + stac92xx_add_control_idx(spec, + STAC_CTL_WIDGET_DC_BIAS, idx++, + "Mic Jack Mode", nid + | ((nid == spec->mic_switch) + ? 0x100 : 0)); + else if (nid == spec->mic_switch) + stac92xx_add_control_idx(spec, + STAC_CTL_WIDGET_IO_SWITCH, idx++, + "Mic Jack Mode", ((nid << 8) | 1)); + } + } + if (nid == cfg->input_pins[AUTO_PIN_MIC]) { + nid = cfg->input_pins[AUTO_PIN_FRONT_MIC]; + goto again; } return 0;

2 9

[alsa-devel] Roland/Edirol M-16DX
by Lasse Kärkkäinen 01 Jun '09

01 Jun '09

This device doesn't seem to be supported yet. Does Roland make the specifications available, etc? The device is not compatible with USB Audio, but rather uses Vendor Specific Class. lsusb -vvv is attached below and if you need more information, I can debug the device on Linux and on Vista. Bus 007 Device 025: ID 0582:00c4 Roland Corp. Device Descriptor: bLength 18 bDescriptorType 1 bcdUSB 2.00 bDeviceClass 255 Vendor Specific Class bDeviceSubClass 0 bDeviceProtocol 255 bMaxPacketSize0 64 idVendor 0x0582 Roland Corp. idProduct 0x00c4 bcdDevice 0.00 iManufacturer 1 EDIROL iProduct 2 M-16DX iSerial 0 bNumConfigurations 1 Configuration Descriptor: bLength 9 bDescriptorType 2 wTotalLength 167 bNumInterfaces 3 bConfigurationValue 1 iConfiguration 0 bmAttributes 0xc0 Self Powered MaxPower 0mA Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 0 bAlternateSetting 0 bNumEndpoints 0 bInterfaceClass 255 Vendor Specific Class bInterfaceSubClass 1 bInterfaceProtocol 2 iInterface 0 ** UNRECOGNIZED: 06 24 f1 01 00 00 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 0 bAlternateSetting 1 bNumEndpoints 1 bInterfaceClass 255 Vendor Specific Class bInterfaceSubClass 2 bInterfaceProtocol 2 iInterface 0 ** UNRECOGNIZED: 07 24 01 01 00 01 00 ** UNRECOGNIZED: 0b 24 02 01 02 04 18 01 80 bb 00 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x02 EP 2 OUT bmAttributes 5 Transfer Type Isochronous Synch Type Asynchronous Usage Type Data wMaxPacketSize 0x0038 1x 56 bytes bInterval 1 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 1 bAlternateSetting 0 bNumEndpoints 0 bInterfaceClass 255 Vendor Specific Class bInterfaceSubClass 1 bInterfaceProtocol 2 iInterface 0 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 1 bAlternateSetting 1 bNumEndpoints 1 bInterfaceClass 255 Vendor Specific Class bInterfaceSubClass 2 bInterfaceProtocol 1 iInterface 0 ** UNRECOGNIZED: 07 24 01 07 00 01 00 ** UNRECOGNIZED: 0b 24 02 01 12 04 18 01 80 bb 00 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x81 EP 1 IN bmAttributes 37 Transfer Type Isochronous Synch Type Asynchronous Usage Type Implicit feedback Data wMaxPacketSize 0x01f8 1x 504 bytes bInterval 1 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 2 bAlternateSetting 0 bNumEndpoints 2 bInterfaceClass 255 Vendor Specific Class bInterfaceSubClass 1 bInterfaceProtocol 3 iInterface 0 ** UNRECOGNIZED: 06 24 f1 02 01 01 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x04 EP 4 OUT bmAttributes 2 Transfer Type Bulk Synch Type None Usage Type Data wMaxPacketSize 0x0200 1x 512 bytes bInterval 1 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x83 EP 3 IN bmAttributes 2 Transfer Type Bulk Synch Type None Usage Type Data wMaxPacketSize 0x0200 1x 512 bytes bInterval 1 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 2 bAlternateSetting 1 bNumEndpoints 2 bInterfaceClass 255 Vendor Specific Class bInterfaceSubClass 1 bInterfaceProtocol 3 iInterface 0 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x04 EP 4 OUT bmAttributes 2 Transfer Type Bulk Synch Type None Usage Type Data wMaxPacketSize 0x0200 1x 512 bytes bInterval 1 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x83 EP 3 IN bmAttributes 3 Transfer Type Interrupt Synch Type None Usage Type Data wMaxPacketSize 0x0200 1x 512 bytes bInterval 1

4 10

[alsa-devel] [PATCH] Support NVIDIA 8 channel HDMI audio
by Wei Ni 01 Jun '09

01 Jun '09

Hi, Takashi I'm a Nvidia engineer, we wish to support 8 channel HDMI audio for MCP78/7A. I attached the patch file, it based on the latest sound git tree, please check it. <<0001-Support-NVIDIA-8-channel-HDMI-audio.patch>> Thanks Wei. ----------------------------------------------------------------------------------- This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. -----------------------------------------------------------------------------------

3 4

[alsa-devel] Macbook[Pro] 5 6ch support
by Kacper Szczesniak 01 Jun '09

01 Jun '09

Hi, this is a patch against current snapshot that adds: 6 channels support for the MB5 model Kacper Szczesniak <kacper(a)qwe.pl>

2 1