ALSA: hda - Remove ALC662 ASUS M51VA, G71V, H13 and G50V model quirks

These models work now with the BIOS auto-parser, so let's drop them.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

2 files changed, 0 insertions, 199 deletions

diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
index fbec67f29a1a..57e80eb78d72 100644
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -72,10 +72,6 @@ ALC662/663/272
   3stack-6ch-dig 3-stack (6-channel) with SPDIF
   5stack-dig     5-stack with SPDIF
   eeepc-ep20    ASUS Eeepc EP20
-  m51va         ASUS M51VA
-  g71v          ASUS G71V
-  h13           ASUS H13
-  g50v          ASUS G50V
   asus-mode1    ASUS
   asus-mode2    ASUS
   asus-mode3    ASUS
diff --git a/sound/pci/hda/alc662_quirks.c b/sound/pci/hda/alc662_quirks.c
index f5b4c9d883e8..ce342b9560ee 100644
--- a/sound/pci/hda/alc662_quirks.c
+++ b/sound/pci/hda/alc662_quirks.c
@@ -11,10 +11,6 @@ enum {
         ALC662_3ST_6ch,
         ALC662_5ST_DIG,
         ALC662_ASUS_EEEPC_EP20,
-        ALC663_ASUS_M51VA,
-        ALC663_ASUS_G71V,
-        ALC663_ASUS_H13,
-        ALC663_ASUS_G50V,
         ALC662_MODEL_LAST,
 };
 
@@ -212,60 +208,6 @@ static const struct snd_kcontrol_new alc662_eeepc_ep20_mixer[] = {
         { } /* end */
 };
 
-static const struct hda_bind_ctls alc663_asus_bind_master_vol = {
-        .ops = &snd_hda_bind_vol,
-        .values = {
-                HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
-                HDA_COMPOSE_AMP_VAL(0x03, 3, 0, HDA_OUTPUT),
-                0
-        },
-};
-
-static const struct hda_bind_ctls alc663_asus_one_bind_switch = {
-        .ops = &snd_hda_bind_sw,
-        .values = {
-                HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
-                HDA_COMPOSE_AMP_VAL(0x21, 3, 0, HDA_OUTPUT),
-                0
-        },
-};
-
-static const struct snd_kcontrol_new alc663_m51va_mixer[] = {
-        HDA_BIND_VOL("Master Playback Volume", &alc663_asus_bind_master_vol),
-        HDA_BIND_SW("Master Playback Switch", &alc663_asus_one_bind_switch),
-        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        { } /* end */
-};
-
-static const struct snd_kcontrol_new alc663_g71v_mixer[] = {
-        HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Front Playback Volume", 0x03, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Front Playback Switch", 0x15, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Headphone Playback Switch", 0x21, 0x0, HDA_OUTPUT),
-
-        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
-        { } /* end */
-};
-
-static const struct snd_kcontrol_new alc663_g50v_mixer[] = {
-        HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Headphone Playback Switch", 0x21, 0x0, HDA_OUTPUT),
-
-        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
-        HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
-        { } /* end */
-};
-
 static const struct snd_kcontrol_new alc662_chmode_mixer[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -340,44 +282,6 @@ static const struct hda_verb alc662_eeepc_ep20_sue_init_verbs[] = {
         {}
 };
 
-static const struct hda_verb alc663_m51va_init_verbs[] = {
-        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-        {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
-        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x21, AC_VERB_SET_CONNECT_SEL, 0x01},  /* Headphone */
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(9)},
-        {0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_MIC_EVENT},
-        {0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},
-        {}
-};
-
-static const struct hda_verb alc663_g71v_init_verbs[] = {
-        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
-        /* {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, */
-        /* {0x15, AC_VERB_SET_CONNECT_SEL, 0x01}, */ /* Headphone */
-
-        {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
-        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x21, AC_VERB_SET_CONNECT_SEL, 0x00},  /* Headphone */
-
-        {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC_FRONT_EVENT},
-        {0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC_MIC_EVENT},
-        {0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC_HP_EVENT},
-        {}
-};
-
-static const struct hda_verb alc663_g50v_init_verbs[] = {
-        {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
-        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x21, AC_VERB_SET_CONNECT_SEL, 0x00},  /* Headphone */
-
-        {0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_MIC_EVENT},
-        {0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},
-        {}
-};
-
 static void alc662_eeepc_ep20_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
@@ -388,36 +292,6 @@ static void alc662_eeepc_ep20_setup(struct hda_codec *codec)
         spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
-static void alc663_m51va_setup(struct hda_codec *codec)
-{
-        struct alc_spec *spec = codec->spec;
-        spec->autocfg.hp_pins[0] = 0x21;
-        spec->autocfg.speaker_pins[0] = 0x14;
-        spec->automute_mixer_nid[0] = 0x0c;
-        spec->automute = 1;
-        spec->automute_mode = ALC_AUTOMUTE_MIXER;
-        spec->ext_mic_pin = 0x18;
-        spec->int_mic_pin = 0x12;
-        spec->auto_mic = 1;
-}
-
-static void alc663_g71v_setup(struct hda_codec *codec)
-{
-        struct alc_spec *spec = codec->spec;
-        spec->autocfg.hp_pins[0] = 0x21;
-        spec->autocfg.line_out_pins[0] = 0x15;
-        spec->autocfg.speaker_pins[0] = 0x14;
-        spec->automute = 1;
-        spec->automute_mode = ALC_AUTOMUTE_AMP;
-        spec->detect_line = 1;
-        spec->automute_lines = 1;
-        spec->ext_mic_pin = 0x18;
-        spec->int_mic_pin = 0x12;
-        spec->auto_mic = 1;
-}
-
-#define alc663_g50v_setup       alc663_m51va_setup
-
 /*
  * configuration and preset
  */
@@ -427,32 +301,19 @@ static const char * const alc662_models[ALC662_MODEL_LAST] = {
         [ALC662_3ST_6ch]        = "3stack-6ch",
         [ALC662_5ST_DIG]        = "5stack-dig",
         [ALC662_ASUS_EEEPC_EP20] = "eeepc-ep20",
-        [ALC663_ASUS_M51VA] = "m51va",
-        [ALC663_ASUS_G71V] = "g71v",
-        [ALC663_ASUS_H13] = "h13",
-        [ALC663_ASUS_G50V] = "g50v",
         [ALC662_AUTO]           = "auto",
 };
 
 static const struct snd_pci_quirk alc662_cfg_tbl[] = {
-        SND_PCI_QUIRK(0x1043, 0x17c3, "ASUS UX20", ALC663_ASUS_M51VA),
-        SND_PCI_QUIRK(0x1043, 0x1878, "ASUS M51VA", ALC663_ASUS_M51VA),
-        SND_PCI_QUIRK(0x1043, 0x19a3, "ASUS G50V", ALC663_ASUS_G50V),
-        SND_PCI_QUIRK(0x1043, 0x19d3, "ASUS NB", ALC663_ASUS_M51VA),
         SND_PCI_QUIRK(0x1043, 0x8290, "ASUS P5GC-MX", ALC662_3ST_6ch_DIG),
         SND_PCI_QUIRK(0x1043, 0x82d1, "ASUS Eeepc EP20", ALC662_ASUS_EEEPC_EP20),
         SND_PCI_QUIRK(0x105b, 0x0d47, "Foxconn 45CMX/45GMX/45CMX-K",
                       ALC662_3ST_6ch_DIG),
-        SND_PCI_QUIRK(0x1179, 0xff6e, "Toshiba NB20x", ALC662_AUTO),
         SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte 945GCM-S2L",
                       ALC662_3ST_6ch_DIG),
-        SND_PCI_QUIRK(0x152d, 0x2304, "Quanta WH1", ALC663_ASUS_H13),
         SND_PCI_QUIRK(0x1565, 0x820f, "Biostar TA780G M2+", ALC662_3ST_6ch_DIG),
-        SND_PCI_QUIRK(0x1631, 0xc10c, "PB RS65", ALC663_ASUS_M51VA),
         SND_PCI_QUIRK(0x1849, 0x3662, "ASROCK K10N78FullHD-hSLI R3.0",
                                         ALC662_3ST_6ch_DIG),
-        SND_PCI_QUIRK_MASK(0x1854, 0xf000, 0x2000, "ASUS H13-200x",
-                           ALC663_ASUS_H13),
         {}
 };
 
@@ -516,60 +377,4 @@ static const struct alc_config_preset alc662_presets[] = {
                 .setup = alc662_eeepc_ep20_setup,
                 .init_hook = alc_inithook,
         },
-        [ALC663_ASUS_M51VA] = {
-                .mixers = { alc663_m51va_mixer },
-                .init_verbs = { alc662_init_verbs,
-                                alc662_eapd_init_verbs,
-                                alc663_m51va_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc662_dac_nids),
-                .dac_nids = alc662_dac_nids,
-                .dig_out_nid = ALC662_DIGOUT_NID,
-                .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
-                .channel_mode = alc662_3ST_2ch_modes,
-                .unsol_event = alc_sku_unsol_event,
-                .setup = alc663_m51va_setup,
-                .init_hook = alc_inithook,
-        },
-        [ALC663_ASUS_G71V] = {
-                .mixers = { alc663_g71v_mixer },
-                .init_verbs = { alc662_init_verbs,
-                                alc662_eapd_init_verbs,
-                                alc663_g71v_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc662_dac_nids),
-                .dac_nids = alc662_dac_nids,
-                .dig_out_nid = ALC662_DIGOUT_NID,
-                .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
-                .channel_mode = alc662_3ST_2ch_modes,
-                .unsol_event = alc_sku_unsol_event,
-                .setup = alc663_g71v_setup,
-                .init_hook = alc_inithook,
-        },
-        [ALC663_ASUS_H13] = {
-                .mixers = { alc663_m51va_mixer },
-                .init_verbs = { alc662_init_verbs,
-                                alc662_eapd_init_verbs,
-                                alc663_m51va_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc662_dac_nids),
-                .dac_nids = alc662_dac_nids,
-                .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
-                .channel_mode = alc662_3ST_2ch_modes,
-                .setup = alc663_m51va_setup,
-                .unsol_event = alc_sku_unsol_event,
-                .init_hook = alc_inithook,
-        },
-        [ALC663_ASUS_G50V] = {
-                .mixers = { alc663_g50v_mixer },
-                .init_verbs = { alc662_init_verbs,
-                                alc662_eapd_init_verbs,
-                                alc663_g50v_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc662_dac_nids),
-                .dac_nids = alc662_dac_nids,
-                .dig_out_nid = ALC662_DIGOUT_NID,
-                .num_channel_mode = ARRAY_SIZE(alc662_3ST_6ch_modes),
-                .channel_mode = alc662_3ST_6ch_modes,
-                .input_mux = &alc663_capture_source,
-                .unsol_event = alc_sku_unsol_event,
-                .setup = alc663_g50v_setup,
-                .init_hook = alc_inithook,
-        },
 };