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

Commit ee0eb251 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda/realtek - Drop ALC262 model=toshiba-s06 



This laptop works fine with the current auto-parser and the BIOS setup,
so let's drop the static configuration.

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

sound/pci/hda/alc262_quirks.c

+0 −52
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ enum { 
	ALC262_ULTRA,

	ALC262_LENOVO_3000,

	ALC262_NEC,

	ALC262_TOSHIBA_S06,

	ALC262_MODEL_LAST /* last tag */

};
@@ -283,39 +282,6 @@ static const struct hda_verb alc262_sony_unsol_verbs[] = { 
	{}

};



static const struct snd_kcontrol_new alc262_toshiba_s06_mixer[] = {

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

	HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 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),

	{ } /* end */

};



static const struct hda_verb alc262_toshiba_s06_verbs[] = {

	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},

	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},

	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},

	{0x22, AC_VERB_SET_CONNECT_SEL, 0x09},

	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},

	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_MIC_EVENT},

	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},

	{}

};



static void alc262_toshiba_s06_setup(struct hda_codec *codec)

{

	struct alc_spec *spec = codec->spec;



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

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

	spec->ext_mic_pin = 0x18;

	spec->int_mic_pin = 0x12;

	spec->auto_mic = 1;

	alc_simple_setup_automute(spec, ALC_AUTOMUTE_PIN);

}



/*

 * nec model

 *  0x15 = headphone
@@ -608,7 +574,6 @@ static const char * const alc262_models[ALC262_MODEL_LAST] = { 
	[ALC262_FUJITSU]	= "fujitsu",

	[ALC262_BENQ_ED8]	= "benq",

	[ALC262_BENQ_T31]	= "benq-t31",

	[ALC262_TOSHIBA_S06]	= "toshiba-s06",

	[ALC262_ULTRA]		= "ultra",

	[ALC262_LENOVO_3000]	= "lenovo-3000",

	[ALC262_NEC]		= "nec",
@@ -618,7 +583,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(0x1179, 0xff7b, "Toshiba S06", ALC262_TOSHIBA_S06),

	SND_PCI_QUIRK(0x10cf, 0x1397, "Fujitsu", ALC262_FUJITSU),

	SND_PCI_QUIRK(0x10cf, 0x142d, "Fujitsu Lifebook E8410", ALC262_FUJITSU),

	SND_PCI_QUIRK_MASK(0x144d, 0xff00, 0xc032, "Samsung Q1",
@@ -750,21 +714,5 @@ static const struct alc_config_preset alc262_presets[] = { 
		.channel_mode = alc262_modes,

		.input_mux = &alc262_capture_source,

	},

	[ALC262_TOSHIBA_S06] = {

		.mixers = { alc262_toshiba_s06_mixer },

		.init_verbs = { alc262_init_verbs, alc262_toshiba_s06_verbs,

							alc262_eapd_verbs },

		.num_dacs = ARRAY_SIZE(alc262_dac_nids),

		.capsrc_nids = alc262_dmic_capsrc_nids,

		.dac_nids = alc262_dac_nids,

		.adc_nids = alc262_dmic_adc_nids, /* ADC0 */

		.num_adc_nids = 1, /* single ADC */

		.dig_out_nid = ALC262_DIGOUT_NID,

		.num_channel_mode = ARRAY_SIZE(alc262_modes),

		.channel_mode = alc262_modes,

		.unsol_event = alc_sku_unsol_event,

		.setup = alc262_toshiba_s06_setup,

		.init_hook = alc_inithook,

	},

};