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

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

ALSA: hda/realtek - Drop model=favorit100 for ALC260 



It's working with the auto-parser just with the standard GPIO 1 setup.

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

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

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ ALC880 
ALC260

======

  fujitsu	Fujitsu S7020

  favorit100	Maxdata Favorit 100XS

  basic		fixed pin assignment (old default model)

  test		for testing/debugging purpose, almost all controls can

		adjusted.  Appearing only when compiled with

sound/pci/hda/alc260_quirks.c

+0 −129
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ enum { 
	ALC260_AUTO,

	ALC260_BASIC,

	ALC260_FUJITSU_S702X,

	ALC260_FAVORIT100,

#ifdef CONFIG_SND_DEBUG

	ALC260_TEST,

#endif
@@ -103,25 +102,6 @@ static const struct hda_input_mux alc260_acer_capture_sources[2] = { 
	},

};



/* Maxdata Favorit 100XS */

static const struct hda_input_mux alc260_favorit100_capture_sources[2] = {

	{

		.num_items = 2,

		.items = {

			{ "Line/Mic", 0x0 },

			{ "CD", 0x4 },

		},

	},

	{

		.num_items = 3,

		.items = {

			{ "Line/Mic", 0x0 },

			{ "CD", 0x4 },

			{ "Mixer", 0x5 },

		},

	},

};



/*

 * This is just place-holder, so there's something for alc_build_pcms to look

 * at when it calculates the maximum number of channels. ALC260 has no mixer
@@ -179,18 +159,6 @@ static const struct snd_kcontrol_new alc260_fujitsu_mixer[] = { 
	{ } /* end */

};



/* Maxdata Favorit 100XS: one output and one input (0x12) jack

 */

static const struct snd_kcontrol_new alc260_favorit100_mixer[] = {

	HDA_CODEC_VOLUME("Master Playback Volume", 0x08, 0x0, HDA_OUTPUT),

	HDA_BIND_MUTE("Master Playback Switch", 0x08, 2, HDA_INPUT),

	ALC_PIN_MODE("Output Jack Mode", 0x0f, ALC_PIN_DIR_INOUT),

	HDA_CODEC_VOLUME("Line/Mic Playback Volume", 0x07, 0x0, HDA_INPUT),

	HDA_CODEC_MUTE("Line/Mic Playback Switch", 0x07, 0x0, HDA_INPUT),

	ALC_PIN_MODE("Line/Mic Jack Mode", 0x12, ALC_PIN_DIR_IN),

	{ } /* end */

};



/*

 * initialization verbs

 */
@@ -340,89 +308,6 @@ static const struct hda_verb alc260_fujitsu_init_verbs[] = { 
	{ }

};



/* Initialisation sequence for Maxdata Favorit 100XS

 * (adapted from Acer init verbs).

 */

static const struct hda_verb alc260_favorit100_init_verbs[] = {

	/* GPIO 0 enables the output jack.

	 * Turn this on and rely on the standard mute

	 * methods whenever the user wants to turn these outputs off.

	 */

	{0x01, AC_VERB_SET_GPIO_MASK, 0x01},

	{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x01},

	{0x01, AC_VERB_SET_GPIO_DATA, 0x01},

	/* Line/Mic input jack is connected to Mic1 pin */

	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50},

	/* Ensure all other unused pins are disabled and muted. */

	{0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},

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

	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},

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

	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},

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

	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},

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

	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},

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

	/* Disable digital (SPDIF) pins */

	{0x03, AC_VERB_SET_DIGI_CONVERT_1, 0},

	{0x06, AC_VERB_SET_DIGI_CONVERT_1, 0},



	/* Ensure Mic1 and Line1 pin widgets take input from the OUT1 sum

	 * bus when acting as outputs.

	 */

	{0x0b, AC_VERB_SET_CONNECT_SEL, 0},

	{0x0d, AC_VERB_SET_CONNECT_SEL, 0},



	/* Start with output sum widgets muted and their output gains at min */

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

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

	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},

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

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

	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},

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

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

	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},



	/* Unmute Line-out pin widget amp left and right

	 * (no equiv mixer ctrl)

	 */

	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},

	/* Unmute Mic1 and Line1 pin widget input buffers since they start as

	 * inputs. If the pin mode is changed by the user the pin mode control

	 * will take care of enabling the pin's input/output buffers as needed.

	 * Therefore there's no need to enable the input buffer at this

	 * stage.

	 */

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



	/* Mute capture amp left and right */

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

	/* Set ADC connection select to match default mixer setting - mic

	 * (on mic1 pin)

	 */

	{0x04, AC_VERB_SET_CONNECT_SEL, 0x00},



	/* Do similar with the second ADC: mute capture input amp and

	 * set ADC connection to mic to match ALSA's default state.

	 */

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

	{0x05, AC_VERB_SET_CONNECT_SEL, 0x00},



	/* Mute all inputs to mixer widget (even unconnected ones) */

	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* mic1 pin */

	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, /* mic2 pin */

	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, /* line1 pin */

	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, /* line2 pin */

	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, /* CD pin */

	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, /* Beep-gen pin */

	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)}, /* Line-out pin */

	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)}, /* HP-pin pin */



	{ }

};



static const struct hda_verb alc260_hp_dc7600_verbs[] = {

	{0x05, AC_VERB_SET_CONNECT_SEL, 0x01},

	{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
@@ -631,7 +516,6 @@ static const struct hda_verb alc260_test_init_verbs[] = { 
static const char * const alc260_models[ALC260_MODEL_LAST] = {

	[ALC260_BASIC]		= "basic",

	[ALC260_FUJITSU_S702X]	= "fujitsu",

	[ALC260_FAVORIT100]	= "favorit100",

#ifdef CONFIG_SND_DEBUG

	[ALC260_TEST]		= "test",

#endif
@@ -639,7 +523,6 @@ static const char * const alc260_models[ALC260_MODEL_LAST] = { 
};



static const struct snd_pci_quirk alc260_cfg_tbl[] = {

	SND_PCI_QUIRK(0x1509, 0x4540, "Favorit 100XS", ALC260_FAVORIT100),

	SND_PCI_QUIRK(0x104d, 0x81bb, "Sony VAIO", ALC260_BASIC),

	SND_PCI_QUIRK(0x104d, 0x81cc, "Sony VAIO", ALC260_BASIC),

	SND_PCI_QUIRK(0x104d, 0x81cd, "Sony VAIO", ALC260_BASIC),
@@ -673,18 +556,6 @@ static const struct alc_config_preset alc260_presets[] = { 
		.num_mux_defs = ARRAY_SIZE(alc260_fujitsu_capture_sources),

		.input_mux = alc260_fujitsu_capture_sources,

	},

	[ALC260_FAVORIT100] = {

		.mixers = { alc260_favorit100_mixer },

		.init_verbs = { alc260_favorit100_init_verbs },

		.num_dacs = ARRAY_SIZE(alc260_dac_nids),

		.dac_nids = alc260_dac_nids,

		.num_adc_nids = ARRAY_SIZE(alc260_dual_adc_nids),

		.adc_nids = alc260_dual_adc_nids,

		.num_channel_mode = ARRAY_SIZE(alc260_modes),

		.channel_mode = alc260_modes,

		.num_mux_defs = ARRAY_SIZE(alc260_favorit100_capture_sources),

		.input_mux = alc260_favorit100_capture_sources,

	},

#ifdef CONFIG_SND_DEBUG

	[ALC260_TEST] = {

		.mixers = { alc260_test_mixer },

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -4300,6 +4300,7 @@ static const struct snd_pci_quirk alc260_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1025, 0x008f, "Acer", ALC260_FIXUP_GPIO1),

	SND_PCI_QUIRK(0x103c, 0x280a, "HP dc5750", ALC260_FIXUP_HP_DC5750),

	SND_PCI_QUIRK(0x103c, 0x30ba, "HP Presario B1900", ALC260_FIXUP_HP_B1900),

	SND_PCI_QUIRK(0x1509, 0x4540, "Favorit 100XS", ALC260_FIXUP_GPIO1),

	SND_PCI_QUIRK(0x161f, 0x2057, "Replacer 672V", ALC260_FIXUP_REPLACER),

	SND_PCI_QUIRK(0x1631, 0xc017, "PB V7900", ALC260_FIXUP_COEF),

	{}