diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-02-11 08:52:36 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 06:00:09 -0400 |
commit | 937b416027d8f79d7b37bb63b6585ea8fdf125de (patch) | |
tree | 822d00da559d43bf179fd1508002065bc8806591 /sound/pci | |
parent | fdafad6fc24a11070bcd0885100be7143cc038f8 (diff) |
[ALSA] hda-codec - Fix ALC880 F1734 model
Fixed some issues with ALC880 F1734 model
- fix capture via mic
- enable volume-wheel control
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index e4a7c50e9f73..3a735870a071 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -1320,11 +1320,19 @@ static struct snd_kcontrol_new alc880_f1734_mixer[] = { | |||
1320 | HDA_BIND_MUTE("Speaker Playback Switch", 0x0d, 2, HDA_INPUT), | 1320 | HDA_BIND_MUTE("Speaker Playback Switch", 0x0d, 2, HDA_INPUT), |
1321 | HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT), | 1321 | HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT), |
1322 | HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT), | 1322 | HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT), |
1323 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | 1323 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), |
1324 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | 1324 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), |
1325 | { } /* end */ | 1325 | { } /* end */ |
1326 | }; | 1326 | }; |
1327 | 1327 | ||
1328 | static struct hda_input_mux alc880_f1734_capture_source = { | ||
1329 | .num_items = 2, | ||
1330 | .items = { | ||
1331 | { "Mic", 0x1 }, | ||
1332 | { "CD", 0x4 }, | ||
1333 | }, | ||
1334 | }; | ||
1335 | |||
1328 | 1336 | ||
1329 | /* | 1337 | /* |
1330 | * ALC880 ASUS model | 1338 | * ALC880 ASUS model |
@@ -1936,6 +1944,9 @@ static struct hda_verb alc880_pin_f1734_init_verbs[] = { | |||
1936 | {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | 1944 | {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, |
1937 | {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, | 1945 | {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, |
1938 | 1946 | ||
1947 | {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC880_HP_EVENT}, | ||
1948 | {0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC880_DCVOL_EVENT}, | ||
1949 | |||
1939 | { } | 1950 | { } |
1940 | }; | 1951 | }; |
1941 | 1952 | ||
@@ -3059,7 +3070,9 @@ static struct alc_config_preset alc880_presets[] = { | |||
3059 | .hp_nid = 0x02, | 3070 | .hp_nid = 0x02, |
3060 | .num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes), | 3071 | .num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes), |
3061 | .channel_mode = alc880_2_jack_modes, | 3072 | .channel_mode = alc880_2_jack_modes, |
3062 | .input_mux = &alc880_capture_source, | 3073 | .input_mux = &alc880_f1734_capture_source, |
3074 | .unsol_event = alc880_uniwill_p53_unsol_event, | ||
3075 | .init_hook = alc880_uniwill_p53_hp_automute, | ||
3063 | }, | 3076 | }, |
3064 | [ALC880_ASUS] = { | 3077 | [ALC880_ASUS] = { |
3065 | .mixers = { alc880_asus_mixer }, | 3078 | .mixers = { alc880_asus_mixer }, |