diff options
author | Matthew Ranostay <mranostay@embeddedalley.com> | 2008-01-24 05:48:01 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 11:30:13 -0500 |
commit | 90da78bf6aaabd4d31c6663b7c1d1b9c5a8c023f (patch) | |
tree | 933a6832988e1e2cffa0eaba278944ddc0722450 /sound/pci/hda/hda_codec.c | |
parent | cd93dc8ccad8680f104c9134ae73888feb14e946 (diff) |
[ALSA] hda: Added mono_out_pin to autoconfig
Added a mono_out_pin field to autocfg struct, and code to parse
for the mono_out_line.
Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
-rw-r--r-- | sound/pci/hda/hda_codec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index f6a9a5dd9b74..df927be176af 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
@@ -2708,6 +2708,10 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec, | |||
2708 | case AC_JACK_LINE_OUT: | 2708 | case AC_JACK_LINE_OUT: |
2709 | seq = get_defcfg_sequence(def_conf); | 2709 | seq = get_defcfg_sequence(def_conf); |
2710 | assoc = get_defcfg_association(def_conf); | 2710 | assoc = get_defcfg_association(def_conf); |
2711 | |||
2712 | if (!(wid_caps & AC_WCAP_STEREO)) | ||
2713 | if (!cfg->mono_out_pin) | ||
2714 | cfg->mono_out_pin = nid; | ||
2711 | if (!assoc) | 2715 | if (!assoc) |
2712 | continue; | 2716 | continue; |
2713 | if (!assoc_line_out) | 2717 | if (!assoc_line_out) |
@@ -2856,6 +2860,7 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec, | |||
2856 | cfg->hp_outs, cfg->hp_pins[0], | 2860 | cfg->hp_outs, cfg->hp_pins[0], |
2857 | cfg->hp_pins[1], cfg->hp_pins[2], | 2861 | cfg->hp_pins[1], cfg->hp_pins[2], |
2858 | cfg->hp_pins[3], cfg->hp_pins[4]); | 2862 | cfg->hp_pins[3], cfg->hp_pins[4]); |
2863 | snd_printd(" mono: mono_out=0x%x\n", cfg->mono_out_pin); | ||
2859 | snd_printd(" inputs: mic=0x%x, fmic=0x%x, line=0x%x, fline=0x%x," | 2864 | snd_printd(" inputs: mic=0x%x, fmic=0x%x, line=0x%x, fline=0x%x," |
2860 | " cd=0x%x, aux=0x%x\n", | 2865 | " cd=0x%x, aux=0x%x\n", |
2861 | cfg->input_pins[AUTO_PIN_MIC], | 2866 | cfg->input_pins[AUTO_PIN_MIC], |