Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3823328d authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Remove ALC262 HP and sony-assamd quirks 



HP and sony-assamd models work with the BIOS auto-parser nowadays,
so let's reduce the unnecessary code.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f57c2565

Documentation/sound/alsa/HD-Audio-Models.txt

+0 −5
Original line number Diff line number Diff line
@@ -46,15 +46,10 @@ ALC260 
ALC262

======

  fujitsu	Fujitsu Laptop

  hp-bpc	HP xw4400/6400/8400/9400 laptops

  hp-bpc-d7000	HP BPC D7000

  hp-tc-t5735	HP Thin Client T5735

  hp-rp5700	HP RP5700

  benq		Benq ED8

  benq-t31	Benq T31

  hippo		Hippo (ATI) with jack detection, Sony UX-90s

  hippo_1	Hippo (Benq) with jack detection

  sony-assamd	Sony ASSAMD

  toshiba-s06	Toshiba S06

  toshiba-rx1	Toshiba RX1

  tyan		Tyan Thunder n6650W (S2915-E)

sound/pci/hda/alc262_quirks.c

+0 −475
Original line number Diff line number Diff line
@@ -10,13 +10,7 @@ enum { 
	ALC262_HIPPO,

	ALC262_HIPPO_1,

	ALC262_FUJITSU,

	ALC262_HP_BPC,

	ALC262_HP_BPC_D7000_WL,

	ALC262_HP_BPC_D7000_WF,

	ALC262_HP_TC_T5735,

	ALC262_HP_RP5700,

	ALC262_BENQ_ED8,

	ALC262_SONY_ASSAMD,

	ALC262_BENQ_T31,

	ALC262_ULTRA,

	ALC262_LENOVO_3000,
@@ -69,26 +63,6 @@ static const struct snd_kcontrol_new alc262_base_mixer[] = { 
/* update HP, line and mono-out pins according to the master switch */

#define alc262_hp_master_update		alc260_hp_master_update



static void alc262_hp_bpc_setup(struct hda_codec *codec)

{

	struct alc_spec *spec = codec->spec;



	spec->autocfg.hp_pins[0] = 0x1b;

	spec->autocfg.speaker_pins[0] = 0x16;

	spec->automute = 1;

	spec->automute_mode = ALC_AUTOMUTE_PIN;

}



static void alc262_hp_wildwest_setup(struct hda_codec *codec)

{

	struct alc_spec *spec = codec->spec;



	spec->autocfg.hp_pins[0] = 0x15;

	spec->autocfg.speaker_pins[0] = 0x16;

	spec->automute = 1;

	spec->automute_mode = ALC_AUTOMUTE_PIN;

}



#define alc262_hp_master_sw_get		alc260_hp_master_sw_get

#define alc262_hp_master_sw_put		alc260_hp_master_sw_put
@@ -106,119 +80,6 @@ static void alc262_hp_wildwest_setup(struct hda_codec *codec) 
		.private_value = 0x15 | (0x16 << 8) | (0x1b << 16),	\

	}





static const struct snd_kcontrol_new alc262_HP_BPC_mixer[] = {

	ALC262_HP_MASTER_SWITCH,

	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),

	HDA_CODEC_MUTE("Front Playback Switch", 0x15, 0x0, HDA_OUTPUT),

	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),

	HDA_CODEC_VOLUME_MONO("Speaker Playback Volume", 0x0e, 2, 0x0,

			      HDA_OUTPUT),

	HDA_CODEC_MUTE_MONO("Speaker Playback Switch", 0x16, 2, 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("Mic Boost Volume", 0x18, 0, HDA_INPUT),

	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),

	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),

	HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, HDA_INPUT),

	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),

	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),

	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),

	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),

	HDA_CODEC_VOLUME("AUX IN Playback Volume", 0x0b, 0x06, HDA_INPUT),

	HDA_CODEC_MUTE("AUX IN Playback Switch", 0x0b, 0x06, HDA_INPUT),

	{ } /* end */

};



static const struct snd_kcontrol_new alc262_HP_BPC_WildWest_mixer[] = {

	ALC262_HP_MASTER_SWITCH,

	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),

	HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT),

	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT),

	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),

	HDA_CODEC_VOLUME_MONO("Speaker Playback Volume", 0x0e, 2, 0x0,

			      HDA_OUTPUT),

	HDA_CODEC_MUTE_MONO("Speaker Playback Switch", 0x16, 2, 0x0,

			    HDA_OUTPUT),

	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x02, HDA_INPUT),

	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x02, HDA_INPUT),

	HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x1a, 0, HDA_INPUT),

	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x01, HDA_INPUT),

	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x01, HDA_INPUT),

	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),

	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),

	{ } /* end */

};



static const struct snd_kcontrol_new alc262_HP_BPC_WildWest_option_mixer[] = {

	HDA_CODEC_VOLUME("Rear Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),

	HDA_CODEC_MUTE("Rear Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),

	HDA_CODEC_VOLUME("Rear Mic Boost Volume", 0x18, 0, HDA_INPUT),

	{ } /* end */

};



/* mute/unmute internal speaker according to the hp jack and mute state */

static void alc262_hp_t5735_setup(struct hda_codec *codec)

{

	struct alc_spec *spec = codec->spec;



	spec->autocfg.hp_pins[0] = 0x15;

	spec->autocfg.speaker_pins[0] = 0x14;

	spec->automute = 1;

	spec->automute_mode = ALC_AUTOMUTE_PIN;

}



static const struct snd_kcontrol_new alc262_hp_t5735_mixer[] = {

	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0c, 0x0, HDA_OUTPUT),

	HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),

	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT),

	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 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("Mic Boost Volume", 0x18, 0, HDA_INPUT),

	{ } /* end */

};



static const struct hda_verb alc262_hp_t5735_verbs[] = {

	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},



	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC_HP_EVENT | AC_USRSP_EN},

	{ }

};



static const struct snd_kcontrol_new alc262_hp_rp5700_mixer[] = {

	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),

	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),

	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0e, 0x0, HDA_OUTPUT),

	HDA_CODEC_MUTE("Speaker Playback Switch", 0x16, 0x0, HDA_OUTPUT),

	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x01, HDA_INPUT),

	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x01, HDA_INPUT),

	{ } /* end */

};



static const struct hda_verb alc262_hp_rp5700_verbs[] = {

	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},

	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},

	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},

	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},

	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},

	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},

	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x00 << 8))},

	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x00 << 8))},

	{}

};



static const struct hda_input_mux alc262_hp_rp5700_capture_source = {

	.num_items = 1,

	.items = {

		{ "Line", 0x1 },

	},

};



/* bind hp and internal speaker mute (with plug check) as master switch */

#define alc262_hippo_master_update	alc262_hp_master_update

#define alc262_hippo_master_sw_get	alc262_hp_master_sw_get
@@ -571,27 +432,6 @@ static const struct hda_input_mux alc262_fujitsu_capture_source = { 
	},

};



static const struct hda_input_mux alc262_HP_capture_source = {

	.num_items = 5,

	.items = {

		{ "Mic", 0x0 },

		{ "Front Mic", 0x1 },

		{ "Line", 0x2 },

		{ "CD", 0x4 },

		{ "AUX IN", 0x6 },

	},

};



static const struct hda_input_mux alc262_HP_D7000_capture_source = {

	.num_items = 4,

	.items = {

		{ "Mic", 0x0 },

		{ "Front Mic", 0x2 },

		{ "Line", 0x1 },

		{ "CD", 0x4 },

	},

};



static void alc262_fujitsu_setup(struct hda_codec *codec)

{

	struct alc_spec *spec = codec->spec;
@@ -817,206 +657,6 @@ static const struct snd_kcontrol_new alc262_ultra_capture_mixer[] = { 
	{ } /* end */

};



static const struct hda_verb alc262_HP_BPC_init_verbs[] = {

	/*

	 * Unmute ADC0-2 and set the default input to mic-in

	 */

	{0x07, AC_VERB_SET_CONNECT_SEL, 0x00},

	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},

	{0x08, AC_VERB_SET_CONNECT_SEL, 0x00},

	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},

	{0x09, AC_VERB_SET_CONNECT_SEL, 0x00},

	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},



	/* Mute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback

	 * mixer widget

	 * Note: PASD motherboards uses the Line In 2 as the input for

	 * front panel mic (mic 2)

	 */

	/* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */

	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},

	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},

	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},

	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},

	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},

	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},

        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)},



	/*

	 * Set up output mixers (0x0c - 0x0e)

	 */

	/* set vol=0 to output mixers */

	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},

	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},

	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},



	/* set up input amps for analog loopback */

	/* Amp Indices: DAC = 0, mixer = 1 */

	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},

	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},

	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},

	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},

	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},

	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},



	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},

	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },

	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },



	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },

	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },



	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},

	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},



	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},

	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},

        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},

	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},

	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},



	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 },

	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 },

        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 },

	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 },

	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 },

	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 },





	/* FIXME: use matrix-type input source selection */

	/* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 0b, 12 */

	/* Input mixer1: only unmute Mic */

	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},

	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x01 << 8))},

	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},

	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},

	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},

	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x05 << 8))},

	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x06 << 8))},

	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x07 << 8))},

	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x08 << 8))},

	/* Input mixer2 */

	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},

	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x01 << 8))},

	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},

	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},

	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},

	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x05 << 8))},

	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x06 << 8))},

	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x07 << 8))},

	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x08 << 8))},

	/* Input mixer3 */

	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},

	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x01 << 8))},

	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},

	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},

	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},

	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x05 << 8))},

	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x06 << 8))},

	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x07 << 8))},

	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x08 << 8))},



	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC_HP_EVENT | AC_USRSP_EN},



	{ }

};



static const struct hda_verb alc262_HP_BPC_WildWest_init_verbs[] = {

	/*

	 * Unmute ADC0-2 and set the default input to mic-in

	 */

	{0x07, AC_VERB_SET_CONNECT_SEL, 0x00},

	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},

	{0x08, AC_VERB_SET_CONNECT_SEL, 0x00},

	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},

	{0x09, AC_VERB_SET_CONNECT_SEL, 0x00},

	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},



	/* Mute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback

	 * mixer widget

	 * Note: PASD motherboards uses the Line In 2 as the input for front

	 * panel mic (mic 2)

	 */

	/* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */

	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},

	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},

	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},

	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},

	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},

	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},

	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)},

	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)},

	/*

	 * Set up output mixers (0x0c - 0x0e)

	 */

	/* set vol=0 to output mixers */

	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},

	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},

	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},



	/* set up input amps for analog loopback */

	/* Amp Indices: DAC = 0, mixer = 1 */

	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},

	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},

	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},

	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},

	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},

	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},





	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },	/* HP */

	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },	/* Mono */

	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },	/* rear MIC */

	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },	/* Line in */

	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },	/* Front MIC */

	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },	/* Line out */

	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },	/* CD in */



	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },

	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },



	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},

	{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},



	/* {0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x7023 }, */

	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 },

	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 },

	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0x7023 },

	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 },

	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 },



	/* FIXME: use matrix-type input source selection */

	/* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */

	/* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */

	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))}, /*rear MIC*/

	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))}, /*Line in*/

	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8))}, /*F MIC*/

	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x03 << 8))}, /*Front*/

	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 << 8))}, /*CD*/

        /* {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x06 << 8))},  */

	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x07 << 8))}, /*HP*/

	/* Input mixer2 */

	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},

	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},

	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8))},

	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x03 << 8))},

	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 << 8))},

        /* {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x06 << 8))}, */

	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x07 << 8))},

	/* Input mixer3 */

	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},

	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},

	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8))},

	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x03 << 8))},

	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 << 8))},

        /* {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x06 << 8))}, */

	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x07 << 8))},



	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC_HP_EVENT | AC_USRSP_EN},



	{ }

};



static const struct hda_verb alc262_toshiba_rx1_unsol_verbs[] = {



	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },	/* Front Speaker */
@@ -1042,13 +682,8 @@ static const char * const alc262_models[ALC262_MODEL_LAST] = { 
	[ALC262_HIPPO]		= "hippo",

	[ALC262_HIPPO_1]	= "hippo_1",

	[ALC262_FUJITSU]	= "fujitsu",

	[ALC262_HP_BPC]		= "hp-bpc",

	[ALC262_HP_BPC_D7000_WL]= "hp-bpc-d7000",

	[ALC262_HP_TC_T5735]	= "hp-tc-t5735",

	[ALC262_HP_RP5700]	= "hp-rp5700",

	[ALC262_BENQ_ED8]	= "benq",

	[ALC262_BENQ_T31]	= "benq-t31",

	[ALC262_SONY_ASSAMD]	= "sony-assamd",

	[ALC262_TOSHIBA_S06]	= "toshiba-s06",

	[ALC262_TOSHIBA_RX1]	= "toshiba-rx1",

	[ALC262_ULTRA]		= "ultra",
@@ -1061,41 +696,6 @@ static const char * const alc262_models[ALC262_MODEL_LAST] = { 
static const struct snd_pci_quirk alc262_cfg_tbl[] = {

	SND_PCI_QUIRK(0x1002, 0x437b, "Hippo", ALC262_HIPPO),

	SND_PCI_QUIRK(0x1033, 0x8895, "NEC Versa S9100", ALC262_NEC),

	SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1200, "HP xw series",

			   ALC262_HP_BPC),

	SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1300, "HP xw series",

			   ALC262_HP_BPC),

	SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1500, "HP z series",

			   ALC262_HP_BPC),

	SND_PCI_QUIRK(0x103c, 0x170b, "HP Z200",

			   ALC262_AUTO),

	SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1700, "HP xw series",

			   ALC262_HP_BPC),

	SND_PCI_QUIRK(0x103c, 0x2800, "HP D7000", ALC262_HP_BPC_D7000_WL),

	SND_PCI_QUIRK(0x103c, 0x2801, "HP D7000", ALC262_HP_BPC_D7000_WF),

	SND_PCI_QUIRK(0x103c, 0x2802, "HP D7000", ALC262_HP_BPC_D7000_WL),

	SND_PCI_QUIRK(0x103c, 0x2803, "HP D7000", ALC262_HP_BPC_D7000_WF),

	SND_PCI_QUIRK(0x103c, 0x2804, "HP D7000", ALC262_HP_BPC_D7000_WL),

	SND_PCI_QUIRK(0x103c, 0x2805, "HP D7000", ALC262_HP_BPC_D7000_WF),

	SND_PCI_QUIRK(0x103c, 0x2806, "HP D7000", ALC262_HP_BPC_D7000_WL),

	SND_PCI_QUIRK(0x103c, 0x2807, "HP D7000", ALC262_HP_BPC_D7000_WF),

	SND_PCI_QUIRK(0x103c, 0x280c, "HP xw4400", ALC262_HP_BPC),

	SND_PCI_QUIRK(0x103c, 0x3014, "HP xw6400", ALC262_HP_BPC),

	SND_PCI_QUIRK(0x103c, 0x3015, "HP xw8400", ALC262_HP_BPC),

	SND_PCI_QUIRK(0x103c, 0x302f, "HP Thin Client T5735",

		      ALC262_HP_TC_T5735),

	SND_PCI_QUIRK(0x103c, 0x2817, "HP RP5700", ALC262_HP_RP5700),

	SND_PCI_QUIRK(0x104d, 0x1f00, "Sony ASSAMD", ALC262_SONY_ASSAMD),

	SND_PCI_QUIRK(0x104d, 0x8203, "Sony UX-90", ALC262_HIPPO),

	SND_PCI_QUIRK(0x104d, 0x820f, "Sony ASSAMD", ALC262_SONY_ASSAMD),

	SND_PCI_QUIRK(0x104d, 0x9016, "Sony VAIO", ALC262_AUTO), /* dig-only */

	SND_PCI_QUIRK(0x104d, 0x9025, "Sony VAIO Z21MN", ALC262_TOSHIBA_S06),

	SND_PCI_QUIRK(0x104d, 0x9035, "Sony VAIO VGN-FW170J", ALC262_AUTO),

	SND_PCI_QUIRK(0x104d, 0x9047, "Sony VAIO Type G", ALC262_AUTO),

#if 0 /* disable the quirk since model=auto works better in recent versions */

	SND_PCI_QUIRK_MASK(0x104d, 0xff00, 0x9000, "Sony VAIO",

			   ALC262_SONY_ASSAMD),

#endif

	SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba dynabook SS RX1",

		      ALC262_TOSHIBA_RX1),

	SND_PCI_QUIRK(0x1179, 0xff7b, "Toshiba S06", ALC262_TOSHIBA_S06),
@@ -1166,68 +766,6 @@ static const struct alc_config_preset alc262_presets[] = { 
		.setup = alc262_fujitsu_setup,

		.init_hook = alc_inithook,

	},

	[ALC262_HP_BPC] = {

		.mixers = { alc262_HP_BPC_mixer },

		.init_verbs = { alc262_HP_BPC_init_verbs },

		.num_dacs = ARRAY_SIZE(alc262_dac_nids),

		.dac_nids = alc262_dac_nids,

		.hp_nid = 0x03,

		.num_channel_mode = ARRAY_SIZE(alc262_modes),

		.channel_mode = alc262_modes,

		.input_mux = &alc262_HP_capture_source,

		.unsol_event = alc_sku_unsol_event,

		.setup = alc262_hp_bpc_setup,

		.init_hook = alc_inithook,

	},

	[ALC262_HP_BPC_D7000_WF] = {

		.mixers = { alc262_HP_BPC_WildWest_mixer },

		.init_verbs = { alc262_HP_BPC_WildWest_init_verbs },

		.num_dacs = ARRAY_SIZE(alc262_dac_nids),

		.dac_nids = alc262_dac_nids,

		.hp_nid = 0x03,

		.num_channel_mode = ARRAY_SIZE(alc262_modes),

		.channel_mode = alc262_modes,

		.input_mux = &alc262_HP_D7000_capture_source,

		.unsol_event = alc_sku_unsol_event,

		.setup = alc262_hp_wildwest_setup,

		.init_hook = alc_inithook,

	},

	[ALC262_HP_BPC_D7000_WL] = {

		.mixers = { alc262_HP_BPC_WildWest_mixer,

			    alc262_HP_BPC_WildWest_option_mixer },

		.init_verbs = { alc262_HP_BPC_WildWest_init_verbs },

		.num_dacs = ARRAY_SIZE(alc262_dac_nids),

		.dac_nids = alc262_dac_nids,

		.hp_nid = 0x03,

		.num_channel_mode = ARRAY_SIZE(alc262_modes),

		.channel_mode = alc262_modes,

		.input_mux = &alc262_HP_D7000_capture_source,

		.unsol_event = alc_sku_unsol_event,

		.setup = alc262_hp_wildwest_setup,

		.init_hook = alc_inithook,

	},

	[ALC262_HP_TC_T5735] = {

		.mixers = { alc262_hp_t5735_mixer },

		.init_verbs = { alc262_init_verbs, alc262_hp_t5735_verbs },

		.num_dacs = ARRAY_SIZE(alc262_dac_nids),

		.dac_nids = alc262_dac_nids,

		.hp_nid = 0x03,

		.num_channel_mode = ARRAY_SIZE(alc262_modes),

		.channel_mode = alc262_modes,

		.input_mux = &alc262_capture_source,

		.unsol_event = alc_sku_unsol_event,

		.setup = alc262_hp_t5735_setup,

		.init_hook = alc_inithook,

	},

	[ALC262_HP_RP5700] = {

		.mixers = { alc262_hp_rp5700_mixer },

		.init_verbs = { alc262_init_verbs, alc262_hp_rp5700_verbs },

		.num_dacs = ARRAY_SIZE(alc262_dac_nids),

		.dac_nids = alc262_dac_nids,

		.num_channel_mode = ARRAY_SIZE(alc262_modes),

		.channel_mode = alc262_modes,

		.input_mux = &alc262_hp_rp5700_capture_source,

        },

	[ALC262_BENQ_ED8] = {

		.mixers = { alc262_base_mixer },

		.init_verbs = { alc262_init_verbs, alc262_EAPD_verbs },
@@ -1238,19 +776,6 @@ static const struct alc_config_preset alc262_presets[] = { 
		.channel_mode = alc262_modes,

		.input_mux = &alc262_capture_source,

	},

	[ALC262_SONY_ASSAMD] = {

		.mixers = { alc262_sony_mixer },

		.init_verbs = { alc262_init_verbs, alc262_sony_unsol_verbs},

		.num_dacs = ARRAY_SIZE(alc262_dac_nids),

		.dac_nids = alc262_dac_nids,

		.hp_nid = 0x02,

		.num_channel_mode = ARRAY_SIZE(alc262_modes),

		.channel_mode = alc262_modes,

		.input_mux = &alc262_capture_source,

		.unsol_event = alc_sku_unsol_event,

		.setup = alc262_hippo_setup,

		.init_hook = alc_inithook,

	},

	[ALC262_BENQ_T31] = {

		.mixers = { alc262_benq_t31_mixer },

		.init_verbs = { alc262_init_verbs, alc262_benq_t31_EAPD_verbs,