diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-09-17 12:23:00 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-09-17 12:23:00 -0400 |
commit | b99dba34dc9ec007a0c8be98c0333dd37463d2fd (patch) | |
tree | 757d4ec89be8dfff792dc68745404ccf7e60fbea /sound/pci | |
parent | 69b5655a85b7bbfdb724a3fb25ae01fd4bc7f53b (diff) |
ALSA: hda - Fix MSI GX620 mixer
The headphone and speaker mixer elements aren't properly set for
MSI GX620 with targa-8ch-dig quirk.
Also fixed the speaker volume control for other ALC883-targa quirks,
too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 7702f155153c..129605819560 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -7927,8 +7927,9 @@ static struct snd_kcontrol_new alc883_fivestack_mixer[] = { | |||
7927 | 7927 | ||
7928 | static struct snd_kcontrol_new alc883_targa_mixer[] = { | 7928 | static struct snd_kcontrol_new alc883_targa_mixer[] = { |
7929 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | 7929 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), |
7930 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), | ||
7930 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT), | 7931 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT), |
7931 | HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT), | 7932 | HDA_CODEC_MUTE("Speaker Playback Switch", 0x1b, 0x0, HDA_OUTPUT), |
7932 | HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT), | 7933 | HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT), |
7933 | HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT), | 7934 | HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT), |
7934 | HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT), | 7935 | HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT), |
@@ -7947,8 +7948,9 @@ static struct snd_kcontrol_new alc883_targa_mixer[] = { | |||
7947 | 7948 | ||
7948 | static struct snd_kcontrol_new alc883_targa_2ch_mixer[] = { | 7949 | static struct snd_kcontrol_new alc883_targa_2ch_mixer[] = { |
7949 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | 7950 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), |
7951 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), | ||
7950 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT), | 7952 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT), |
7951 | HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT), | 7953 | HDA_CODEC_MUTE("Speaker Playback Switch", 0x1b, 0x0, HDA_OUTPUT), |
7952 | HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT), | 7954 | HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT), |
7953 | HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT), | 7955 | HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT), |
7954 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | 7956 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), |
@@ -7960,6 +7962,15 @@ static struct snd_kcontrol_new alc883_targa_2ch_mixer[] = { | |||
7960 | { } /* end */ | 7962 | { } /* end */ |
7961 | }; | 7963 | }; |
7962 | 7964 | ||
7965 | static struct snd_kcontrol_new alc883_targa_8ch_mixer[] = { | ||
7966 | HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT), | ||
7967 | HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT), | ||
7968 | HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), | ||
7969 | HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT), | ||
7970 | HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | ||
7971 | { } /* end */ | ||
7972 | }; | ||
7973 | |||
7963 | static struct snd_kcontrol_new alc883_lenovo_101e_2ch_mixer[] = { | 7974 | static struct snd_kcontrol_new alc883_lenovo_101e_2ch_mixer[] = { |
7964 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | 7975 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), |
7965 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), | 7976 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), |
@@ -9167,7 +9178,8 @@ static struct alc_config_preset alc882_presets[] = { | |||
9167 | .init_hook = alc882_targa_automute, | 9178 | .init_hook = alc882_targa_automute, |
9168 | }, | 9179 | }, |
9169 | [ALC883_TARGA_8ch_DIG] = { | 9180 | [ALC883_TARGA_8ch_DIG] = { |
9170 | .mixers = { alc883_base_mixer, alc883_chmode_mixer }, | 9181 | .mixers = { alc883_targa_mixer, alc883_targa_8ch_mixer, |
9182 | alc883_chmode_mixer }, | ||
9171 | .init_verbs = { alc883_init_verbs, alc880_gpio3_init_verbs, | 9183 | .init_verbs = { alc883_init_verbs, alc880_gpio3_init_verbs, |
9172 | alc883_targa_verbs }, | 9184 | alc883_targa_verbs }, |
9173 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), | 9185 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), |