aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda
diff options
context:
space:
mode:
authorHerton Ronaldo Krzesinski <herton@mandriva.com>2008-03-20 07:13:46 -0400
committerTakashi Iwai <tiwai@suse.de>2008-04-24 06:00:29 -0400
commit5d85f8d02af56da5e3b76805da00a0f7f7427255 (patch)
tree9a10aa7dcd9e09f5a90c213a34e294c0a49395e7 /sound/pci/hda
parent0e31daf7d6484c60e96f63a905eb9b959b975da5 (diff)
[ALSA] hda-codec - Remove now uneeded 6stack-hp model from ALC883
After DAC assignment fix in ALC883, the 6stack-hp model is now the same as 6stack-dig. So just remove 6stack-hp model and replace its use with 6stack-dig. Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda')
-rw-r--r--sound/pci/hda/patch_realtek.c55
1 files changed, 1 insertions, 54 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 8b819072af3a..15b4704539fd 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -198,7 +198,6 @@ enum {
198 ALC883_LENOVO_NB0763, 198 ALC883_LENOVO_NB0763,
199 ALC888_LENOVO_MS7195_DIG, 199 ALC888_LENOVO_MS7195_DIG,
200 ALC883_HAIER_W66, 200 ALC883_HAIER_W66,
201 ALC888_6ST_HP,
202 ALC888_3ST_HP, 201 ALC888_3ST_HP,
203 ALC888_6ST_DELL, 202 ALC888_6ST_DELL,
204 ALC883_MITAC, 203 ALC883_MITAC,
@@ -6956,46 +6955,6 @@ static struct snd_kcontrol_new alc883_medion_md2_mixer[] = {
6956 { } /* end */ 6955 { } /* end */
6957}; 6956};
6958 6957
6959static struct snd_kcontrol_new alc888_6st_hp_mixer[] = {
6960 HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
6961 HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
6962 HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
6963 HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
6964 HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),
6965 HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
6966 HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
6967 HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
6968 HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
6969 HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),
6970 HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
6971 HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
6972 HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
6973 HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
6974 HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
6975 HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
6976 HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
6977 HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
6978 HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
6979 HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
6980 HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
6981 HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
6982 HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
6983 HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
6984 HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
6985 HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT),
6986 HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT),
6987 {
6988 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
6989 /* .name = "Capture Source", */
6990 .name = "Input Source",
6991 .count = 2,
6992 .info = alc883_mux_enum_info,
6993 .get = alc883_mux_enum_get,
6994 .put = alc883_mux_enum_put,
6995 },
6996 { } /* end */
6997};
6998
6999static struct snd_kcontrol_new alc888_3st_hp_mixer[] = { 6958static struct snd_kcontrol_new alc888_3st_hp_mixer[] = {
7000 HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), 6959 HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
7001 HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), 6960 HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
@@ -7721,7 +7680,6 @@ static const char *alc883_models[ALC883_MODEL_LAST] = {
7721 [ALC883_LENOVO_NB0763] = "lenovo-nb0763", 7680 [ALC883_LENOVO_NB0763] = "lenovo-nb0763",
7722 [ALC888_LENOVO_MS7195_DIG] = "lenovo-ms7195-dig", 7681 [ALC888_LENOVO_MS7195_DIG] = "lenovo-ms7195-dig",
7723 [ALC883_HAIER_W66] = "haier-w66", 7682 [ALC883_HAIER_W66] = "haier-w66",
7724 [ALC888_6ST_HP] = "6stack-hp",
7725 [ALC888_3ST_HP] = "3stack-hp", 7683 [ALC888_3ST_HP] = "3stack-hp",
7726 [ALC888_6ST_DELL] = "6stack-dell", 7684 [ALC888_6ST_DELL] = "6stack-dell",
7727 [ALC883_MITAC] = "mitac", 7685 [ALC883_MITAC] = "mitac",
@@ -7740,7 +7698,7 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
7740 SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavillion", ALC883_6ST_DIG), 7698 SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavillion", ALC883_6ST_DIG),
7741 SND_PCI_QUIRK(0x103c, 0x2a4f, "HP Samba", ALC888_3ST_HP), 7699 SND_PCI_QUIRK(0x103c, 0x2a4f, "HP Samba", ALC888_3ST_HP),
7742 SND_PCI_QUIRK(0x103c, 0x2a60, "HP Lucknow", ALC888_3ST_HP), 7700 SND_PCI_QUIRK(0x103c, 0x2a60, "HP Lucknow", ALC888_3ST_HP),
7743 SND_PCI_QUIRK(0x103c, 0x2a61, "HP Nettle", ALC888_6ST_HP), 7701 SND_PCI_QUIRK(0x103c, 0x2a61, "HP Nettle", ALC883_6ST_DIG),
7744 SND_PCI_QUIRK(0x1043, 0x8249, "Asus M2A-VM HDMI", ALC883_3ST_6ch_DIG), 7702 SND_PCI_QUIRK(0x1043, 0x8249, "Asus M2A-VM HDMI", ALC883_3ST_6ch_DIG),
7745 SND_PCI_QUIRK(0x105b, 0x6668, "Foxconn", ALC883_6ST_DIG), 7703 SND_PCI_QUIRK(0x105b, 0x6668, "Foxconn", ALC883_6ST_DIG),
7746 SND_PCI_QUIRK(0x1071, 0x8253, "Mitac 8252d", ALC883_MITAC), 7704 SND_PCI_QUIRK(0x1071, 0x8253, "Mitac 8252d", ALC883_MITAC),
@@ -7973,17 +7931,6 @@ static struct alc_config_preset alc883_presets[] = {
7973 .unsol_event = alc883_haier_w66_unsol_event, 7931 .unsol_event = alc883_haier_w66_unsol_event,
7974 .init_hook = alc883_haier_w66_automute, 7932 .init_hook = alc883_haier_w66_automute,
7975 }, 7933 },
7976 [ALC888_6ST_HP] = {
7977 .mixers = { alc888_6st_hp_mixer, alc883_chmode_mixer },
7978 .init_verbs = { alc883_init_verbs },
7979 .num_dacs = ARRAY_SIZE(alc883_dac_nids),
7980 .dac_nids = alc883_dac_nids,
7981 .dig_out_nid = ALC883_DIGOUT_NID,
7982 .dig_in_nid = ALC883_DIGIN_NID,
7983 .num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes),
7984 .channel_mode = alc883_sixstack_modes,
7985 .input_mux = &alc883_capture_source,
7986 },
7987 [ALC888_3ST_HP] = { 7934 [ALC888_3ST_HP] = {
7988 .mixers = { alc888_3st_hp_mixer, alc883_chmode_mixer }, 7935 .mixers = { alc888_3st_hp_mixer, alc883_chmode_mixer },
7989 .init_verbs = { alc883_init_verbs, alc888_3st_hp_verbs }, 7936 .init_verbs = { alc883_init_verbs, alc888_3st_hp_verbs },