diff options
author | Herton Ronaldo Krzesinski <herton@mandriva.com> | 2008-03-20 07:14:59 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 06:00:29 -0400 |
commit | eea6419ea18ed9dfc16f9a262e96cdb832376e88 (patch) | |
tree | 0d4e9c8b8c390ee30271964e8abe2d3604e2bb80 /sound | |
parent | f24dbdc61dd7ca6b97c525b40979ab7bd07c0934 (diff) |
[ALSA] hda-codec - Use common 3stack-6ch mixer for 3stack-hp model
Forgot one more: 3stack-hp model also have now the same mixer as
3stack-6ch (after DAC assignment fix in ALC883), so use it avoiding
duplicating the same mixer definition.
Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 42 |
1 files changed, 2 insertions, 40 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index e1e966982998..198facf01780 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -6955,44 +6955,6 @@ static struct snd_kcontrol_new alc883_medion_md2_mixer[] = { | |||
6955 | { } /* end */ | 6955 | { } /* end */ |
6956 | }; | 6956 | }; |
6957 | 6957 | ||
6958 | static struct snd_kcontrol_new alc888_3st_hp_mixer[] = { | ||
6959 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | ||
6960 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), | ||
6961 | HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT), | ||
6962 | HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT), | ||
6963 | HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT), | ||
6964 | HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT), | ||
6965 | HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT), | ||
6966 | HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT), | ||
6967 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT), | ||
6968 | HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT), | ||
6969 | HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT), | ||
6970 | HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT), | ||
6971 | HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT), | ||
6972 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | ||
6973 | HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), | ||
6974 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | ||
6975 | HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), | ||
6976 | HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT), | ||
6977 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | ||
6978 | HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT), | ||
6979 | HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT), | ||
6980 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | ||
6981 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | ||
6982 | HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT), | ||
6983 | HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT), | ||
6984 | { | ||
6985 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
6986 | /* .name = "Capture Source", */ | ||
6987 | .name = "Input Source", | ||
6988 | .count = 2, | ||
6989 | .info = alc883_mux_enum_info, | ||
6990 | .get = alc883_mux_enum_get, | ||
6991 | .put = alc883_mux_enum_put, | ||
6992 | }, | ||
6993 | { } /* end */ | ||
6994 | }; | ||
6995 | |||
6996 | static struct snd_kcontrol_new alc883_acer_aspire_mixer[] = { | 6958 | static struct snd_kcontrol_new alc883_acer_aspire_mixer[] = { |
6997 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | 6959 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), |
6998 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), | 6960 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), |
@@ -7890,9 +7852,9 @@ static struct alc_config_preset alc883_presets[] = { | |||
7890 | .input_mux = &alc883_capture_source, | 7852 | .input_mux = &alc883_capture_source, |
7891 | .unsol_event = alc883_haier_w66_unsol_event, | 7853 | .unsol_event = alc883_haier_w66_unsol_event, |
7892 | .init_hook = alc883_haier_w66_automute, | 7854 | .init_hook = alc883_haier_w66_automute, |
7893 | }, | 7855 | }, |
7894 | [ALC888_3ST_HP] = { | 7856 | [ALC888_3ST_HP] = { |
7895 | .mixers = { alc888_3st_hp_mixer, alc883_chmode_mixer }, | 7857 | .mixers = { alc883_3ST_6ch_mixer, alc883_chmode_mixer }, |
7896 | .init_verbs = { alc883_init_verbs, alc888_3st_hp_verbs }, | 7858 | .init_verbs = { alc883_init_verbs, alc888_3st_hp_verbs }, |
7897 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), | 7859 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), |
7898 | .dac_nids = alc883_dac_nids, | 7860 | .dac_nids = alc883_dac_nids, |