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

Commit 18768991 authored by Tobin Davis's avatar Tobin Davis Committed by Jaroslav Kysela
Browse files

[ALSA] hda-codec - more systems for Analog Devices 



This patch adds support for more systems using Analog Devices codecs.
    Asus P5B-DLX - AD1988
    Toshiba U205 - AD1981
    Lenovo M55 - AD1986
    Samsung R55 - AD1986

Signed-off-by: default avatarTobin Davis <tdavis@dsl-only.net>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent a9995a35

Documentation/sound/alsa/ALSA-Configuration.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -866,6 +866,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	  basic		3-jack (default)

	  basic		3-jack (default)

	  hp		HP nx6320

	  hp		HP nx6320

	  thinkpad	Lenovo Thinkpad T60/X60/Z60

	  thinkpad	Lenovo Thinkpad T60/X60/Z60

	  toshiba	Toshiba U205





	AD1986A

	AD1986A

	  6stack	6-jack, separate surrounds (default)

	  6stack	6-jack, separate surrounds (default)

sound/pci/hda/patch_analog.c

+32 −2
Original line number Original line Diff line number Diff line
@@ -833,12 +833,14 @@ static struct snd_pci_quirk ad1986a_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS P5", AD1986A_3STACK),

	SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS P5", AD1986A_3STACK),

	SND_PCI_QUIRK(0x1043, 0x81cb, "ASUS M2N", AD1986A_3STACK),

	SND_PCI_QUIRK(0x1043, 0x81cb, "ASUS M2N", AD1986A_3STACK),

	SND_PCI_QUIRK(0x1043, 0x8234, "ASUS M2N", AD1986A_3STACK),

	SND_PCI_QUIRK(0x1043, 0x8234, "ASUS M2N", AD1986A_3STACK),

	SND_PCI_QUIRK(0x144d, 0xb03c, "Samsung R55", AD1986A_3STACK),

	SND_PCI_QUIRK(0x144d, 0xc01e, "FSC V2060", AD1986A_LAPTOP),

	SND_PCI_QUIRK(0x144d, 0xc01e, "FSC V2060", AD1986A_LAPTOP),

	SND_PCI_QUIRK(0x144d, 0xc023, "Samsung X60", AD1986A_LAPTOP_EAPD),

	SND_PCI_QUIRK(0x144d, 0xc023, "Samsung X60", AD1986A_LAPTOP_EAPD),

	SND_PCI_QUIRK(0x144d, 0xc024, "Samsung R65", AD1986A_LAPTOP_EAPD),

	SND_PCI_QUIRK(0x144d, 0xc024, "Samsung R65", AD1986A_LAPTOP_EAPD),

	SND_PCI_QUIRK(0x144d, 0xc026, "Samsung X11", AD1986A_LAPTOP_EAPD),

	SND_PCI_QUIRK(0x144d, 0xc026, "Samsung X11", AD1986A_LAPTOP_EAPD),

	SND_PCI_QUIRK(0x144d, 0xc504, "Samsung Q35", AD1986A_3STACK),

	SND_PCI_QUIRK(0x144d, 0xc504, "Samsung Q35", AD1986A_3STACK),

	SND_PCI_QUIRK(0x144d, 0xc027, "Samsung Q1", AD1986A_ULTRA),

	SND_PCI_QUIRK(0x144d, 0xc027, "Samsung Q1", AD1986A_ULTRA),

	SND_PCI_QUIRK(0x17aa, 0x1011, "Lenovo M55", AD1986A_LAPTOP),

	SND_PCI_QUIRK(0x17aa, 0x1017, "Lenovo A60", AD1986A_3STACK),

	SND_PCI_QUIRK(0x17aa, 0x1017, "Lenovo A60", AD1986A_3STACK),

	SND_PCI_QUIRK(0x17aa, 0x2066, "Lenovo N100", AD1986A_LAPTOP_EAPD),

	SND_PCI_QUIRK(0x17aa, 0x2066, "Lenovo N100", AD1986A_LAPTOP_EAPD),

	SND_PCI_QUIRK(0x17c0, 0x2017, "Samsung M50", AD1986A_LAPTOP),

	SND_PCI_QUIRK(0x17c0, 0x2017, "Samsung M50", AD1986A_LAPTOP),
@@ -1205,7 +1207,7 @@ static struct hda_verb ad1981_init_verbs[] = { 
/*

/*

 * Patch for HP nx6320

 * Patch for HP nx6320

 *

 *

 * nx6320 uses EAPD in the reserve way - EAPD-on means the internal

 * nx6320 uses EAPD in the reverse way - EAPD-on means the internal

 * speaker output enabled _and_ mute-LED off.

 * speaker output enabled _and_ mute-LED off.

 */

 */
@@ -1373,6 +1375,21 @@ static int ad1981_hp_init(struct hda_codec *codec) 
	return 0;

	return 0;

}

}





/* configuration for Toshiba Laptops */

static struct hda_verb ad1981_toshiba_init_verbs[] = {

	{0x05, AC_VERB_SET_EAPD_BTLENABLE, 0x01 }, /* default on */

	/* pin sensing on HP and Mic jacks */

	{0x06, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1981_HP_EVENT},

	{0x08, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1981_MIC_EVENT},

	{}

};



static struct snd_kcontrol_new ad1981_toshiba_mixers[] = {

	HDA_CODEC_VOLUME("Amp Volume", 0x1a, 0x0, HDA_OUTPUT),

	HDA_CODEC_MUTE("Amp Switch", 0x1a, 0x0, HDA_OUTPUT),

	{ }

};



/* configuration for Lenovo Thinkpad T60 */

/* configuration for Lenovo Thinkpad T60 */

static struct snd_kcontrol_new ad1981_thinkpad_mixers[] = {

static struct snd_kcontrol_new ad1981_thinkpad_mixers[] = {

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

	HDA_CODEC_VOLUME("Master Playback Volume", 0x05, 0x0, HDA_OUTPUT),
@@ -1418,6 +1435,7 @@ enum { 
	AD1981_BASIC,

	AD1981_BASIC,

	AD1981_HP,

	AD1981_HP,

	AD1981_THINKPAD,

	AD1981_THINKPAD,

	AD1981_TOSHIBA,

	AD1981_MODELS

	AD1981_MODELS

};

};
@@ -1425,6 +1443,7 @@ static const char *ad1981_models[AD1981_MODELS] = { 
	[AD1981_HP]		= "hp",

	[AD1981_HP]		= "hp",

	[AD1981_THINKPAD]	= "thinkpad",

	[AD1981_THINKPAD]	= "thinkpad",

	[AD1981_BASIC]		= "basic",

	[AD1981_BASIC]		= "basic",

	[AD1981_TOSHIBA]	= "toshiba"

};

};





static struct snd_pci_quirk ad1981_cfg_tbl[] = {

static struct snd_pci_quirk ad1981_cfg_tbl[] = {
@@ -1435,6 +1454,7 @@ static struct snd_pci_quirk ad1981_cfg_tbl[] = { 
	/* Lenovo Thinkpad T60/X60/Z6xx */

	/* Lenovo Thinkpad T60/X60/Z6xx */

	SND_PCI_QUIRK(0x17aa, 0, "Lenovo Thinkpad", AD1981_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0, "Lenovo Thinkpad", AD1981_THINKPAD),

	SND_PCI_QUIRK(0x1014, 0x0597, "Lenovo Z60", AD1981_THINKPAD),

	SND_PCI_QUIRK(0x1014, 0x0597, "Lenovo Z60", AD1981_THINKPAD),

	SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba U205", AD1981_TOSHIBA),

	{}

	{}

};

};
@@ -1485,8 +1505,17 @@ static int patch_ad1981(struct hda_codec *codec) 
		spec->mixers[0] = ad1981_thinkpad_mixers;

		spec->mixers[0] = ad1981_thinkpad_mixers;

		spec->input_mux = &ad1981_thinkpad_capture_source;

		spec->input_mux = &ad1981_thinkpad_capture_source;

		break;

		break;

	case AD1981_TOSHIBA:

		spec->mixers[0] = ad1981_hp_mixers;

		spec->mixers[1] = ad1981_toshiba_mixers;

		spec->num_init_verbs = 2;

		spec->init_verbs[1] = ad1981_toshiba_init_verbs;

		spec->multiout.dig_out_nid = 0;

		spec->input_mux = &ad1981_hp_capture_source;

		codec->patch_ops.init = ad1981_hp_init;

		codec->patch_ops.unsol_event = ad1981_hp_unsol_event;

		break;

	}

	}



	return 0;

	return 0;

}

}
@@ -2609,6 +2638,7 @@ static const char *ad1988_models[AD1988_MODEL_LAST] = { 




static struct snd_pci_quirk ad1988_cfg_tbl[] = {

static struct snd_pci_quirk ad1988_cfg_tbl[] = {

	SND_PCI_QUIRK(0x1043, 0x81f6, "Asus M2N-SLI", AD1988_6STACK_DIG),

	SND_PCI_QUIRK(0x1043, 0x81f6, "Asus M2N-SLI", AD1988_6STACK_DIG),

	SND_PCI_QUIRK(0x1043, 0x81ec, "Asus P5B-DLX", AD1988_6STACK_DIG),

	{}

	{}

};

};