aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorHector Martin <hector@marcansoft.com>2009-12-20 16:51:23 -0500
committerTakashi Iwai <tiwai@suse.de>2009-12-21 05:18:31 -0500
commit556eea9a926bff8f014b4f80522b4de97ae84213 (patch)
treed2064b4a17e6da64184996f525dc1d4d20fcbd49 /sound
parent0f86a228f4a4639b3142ce0dad208433b2db377a (diff)
ALSA: HDA: remove useless mixers on Aspire 8930G
This patch removes some extra mixers that do nothing on the Acer Aspire 8930G. The CD mixer is useless because the SATA DVD/Blu-Ray drive has no analog audio output, and the Side mixer is useless because we max out at 6ch anyway. Signed-off-by: Hector Martin <hector@marcansoft.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_realtek.c21
1 files changed, 20 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index cb97323acc1..faeb74f2820 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -1777,6 +1777,25 @@ static struct snd_kcontrol_new alc888_base_mixer[] = {
1777 { } /* end */ 1777 { } /* end */
1778}; 1778};
1779 1779
1780static struct snd_kcontrol_new alc889_acer_aspire_8930g_mixer[] = {
1781 HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
1782 HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
1783 HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
1784 HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
1785 HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0,
1786 HDA_OUTPUT),
1787 HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
1788 HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
1789 HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
1790 HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
1791 HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
1792 HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
1793 HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
1794 HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
1795 { } /* end */
1796};
1797
1798
1780static void alc888_acer_aspire_4930g_setup(struct hda_codec *codec) 1799static void alc888_acer_aspire_4930g_setup(struct hda_codec *codec)
1781{ 1800{
1782 struct alc_spec *spec = codec->spec; 1801 struct alc_spec *spec = codec->spec;
@@ -9380,7 +9399,7 @@ static struct alc_config_preset alc882_presets[] = {
9380 .init_hook = alc_automute_amp, 9399 .init_hook = alc_automute_amp,
9381 }, 9400 },
9382 [ALC888_ACER_ASPIRE_8930G] = { 9401 [ALC888_ACER_ASPIRE_8930G] = {
9383 .mixers = { alc888_base_mixer, 9402 .mixers = { alc889_acer_aspire_8930g_mixer,
9384 alc883_chmode_mixer }, 9403 alc883_chmode_mixer },
9385 .init_verbs = { alc883_init_verbs, alc880_gpio1_init_verbs, 9404 .init_verbs = { alc883_init_verbs, alc880_gpio1_init_verbs,
9386 alc889_acer_aspire_8930g_verbs, 9405 alc889_acer_aspire_8930g_verbs,