aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerton Ronaldo Krzesinski <herton@mandriva.com>2008-03-20 07:14:28 -0400
committerTakashi Iwai <tiwai@suse.de>2008-04-24 06:00:29 -0400
commitf24dbdc61dd7ca6b97c525b40979ab7bd07c0934 (patch)
tree1d8b1edbe44b3d1b6e0286c84a2932588feab991
parent5d85f8d02af56da5e3b76805da00a0f7f7427255 (diff)
[ALSA] hda-codec - Use base ALC883 mixer for 6stack-dell model
After DAC assignment fix in ALC883, alc888_6st_dell_mixer is now the same as alc883_base_mixer. Avoid duplicated code and use alc883_base_mixer in 6stack-dell model, removing alc888_6st_dell_mixer definition. Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/patch_realtek.c42
1 files changed, 1 insertions, 41 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 15b4704539fd..e1e966982998 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -6993,46 +6993,6 @@ static struct snd_kcontrol_new alc888_3st_hp_mixer[] = {
6993 { } /* end */ 6993 { } /* end */
6994}; 6994};
6995 6995
6996static struct snd_kcontrol_new alc888_6st_dell_mixer[] = {
6997 HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
6998 HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
6999 HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
7000 HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
7001 HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),
7002 HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
7003 HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
7004 HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
7005 HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
7006 HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),
7007 HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
7008 HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
7009 HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
7010 HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
7011 HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
7012 HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
7013 HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
7014 HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
7015 HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
7016 HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
7017 HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
7018 HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
7019 HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
7020 HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
7021 HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
7022 HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT),
7023 HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT),
7024 {
7025 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
7026 /* .name = "Capture Source", */
7027 .name = "Input Source",
7028 .count = 2,
7029 .info = alc883_mux_enum_info,
7030 .get = alc883_mux_enum_get,
7031 .put = alc883_mux_enum_put,
7032 },
7033 { } /* end */
7034};
7035
7036static struct snd_kcontrol_new alc883_acer_aspire_mixer[] = { 6996static struct snd_kcontrol_new alc883_acer_aspire_mixer[] = {
7037 HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), 6997 HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
7038 HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), 6998 HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
@@ -7942,7 +7902,7 @@ static struct alc_config_preset alc883_presets[] = {
7942 .input_mux = &alc883_capture_source, 7902 .input_mux = &alc883_capture_source,
7943 }, 7903 },
7944 [ALC888_6ST_DELL] = { 7904 [ALC888_6ST_DELL] = {
7945 .mixers = { alc888_6st_dell_mixer, alc883_chmode_mixer }, 7905 .mixers = { alc883_base_mixer, alc883_chmode_mixer },
7946 .init_verbs = { alc883_init_verbs, alc888_6st_dell_verbs }, 7906 .init_verbs = { alc883_init_verbs, alc888_6st_dell_verbs },
7947 .num_dacs = ARRAY_SIZE(alc883_dac_nids), 7907 .num_dacs = ARRAY_SIZE(alc883_dac_nids),
7948 .dac_nids = alc883_dac_nids, 7908 .dac_nids = alc883_dac_nids,