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

Commit a65cc60f authored by ddiaz@cenditel.gob.ve's avatar ddiaz@cenditel.gob.ve Committed by Takashi Iwai
Browse files

ALSA: hda/realtek: Added support for CLEVO M540R subsystem, 6 channel + digital 



The model clevo-m540r was created with 6-channel and digital support. All
functions verified except spdif. Tested with a VIT D2000 laptop which has:

[lspci extract]
 Audio device [0403]: Intel Corporation 82801H (ICH8 Family) HD Audio
Controller [8086:284b] (rev 03)
        Subsystem: CLEVO/KAPOK Computer Device [1558:5409]

[/proc/asound/card0/codec\#0 header]
Codec: Realtek ALC883
Address: 0
Function Id: 0x1
Vendor Id: 0x10ec0883
Subsystem Id: 0x15585409
Revision Id: 0x100002

[Added a comment about HP mute and the model description by tiwai]

Signed-off-by: default avatarDhionel Diaz <ddiaz@cenditel.gob.ve>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 842ae638

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

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ ALC882/883/885/888/889 
  3stack-hp	HP machines with 3stack (Lucknow, Samba boards)

  6stack-dell	Dell machines with 6stack (Inspiron 530)

  mitac		Mitac 8252D

  clevo-m540r	Clevo M540R (6ch + digital)

  clevo-m720	Clevo M720 laptop series

  fujitsu-pi2515 Fujitsu AMILO Pi2515

  fujitsu-xa3530 Fujitsu AMILO XA3530

sound/pci/hda/patch_realtek.c

+80 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ enum { 
	ALC888_3ST_HP,

	ALC888_6ST_DELL,

	ALC883_MITAC,

	ALC883_CLEVO_M540R,

	ALC883_CLEVO_M720,

	ALC883_FUJITSU_PI2515,

	ALC888_FUJITSU_XA3530,
@@ -6656,6 +6657,52 @@ static struct hda_channel_mode alc882_3ST_6ch_modes[3] = { 














#define alc883_3ST_6ch_modes	alc882_3ST_6ch_modes



























/*













 * 2ch mode













 */













static struct hda_verb alc883_3ST_ch2_clevo_init[] = {













	{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },













	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },













	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },













	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },













	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },













	{ } /* end */













};

























/*













 * 4ch mode













 */













static struct hda_verb alc883_3ST_ch4_clevo_init[] = {













	{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },













	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },













	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },













	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },













	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },













	{ 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 },













	{ } /* end */













};

























/*













 * 6ch mode













 */













static struct hda_verb alc883_3ST_ch6_clevo_init[] = {













	{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },













	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },













	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },













	{ 0x18, AC_VERB_SET_CONNECT_SEL, 0x02 },













	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },













	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },













	{ 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 },













	{ } /* end */













};

























static struct hda_channel_mode alc883_3ST_6ch_clevo_modes[3] = {













	{ 2, alc883_3ST_ch2_clevo_init },













	{ 4, alc883_3ST_ch4_clevo_init },













	{ 6, alc883_3ST_ch6_clevo_init },













};







































/*















 * 6ch mode















 */










@@ -8134,6 +8181,22 @@ static struct hda_verb alc883_mitac_verbs[] = {













	{ } /* end */















};



























static struct hda_verb alc883_clevo_m540r_verbs[] = {













	/* HP */













	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},













	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},













	/* Int speaker */













	/*{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},*/

























	/* enable unsolicited event */













	/*













	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},













	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_MIC_EVENT | AC_USRSP_EN},













	*/

























	{ } /* end */













};



























static struct hda_verb alc883_clevo_m720_verbs[] = {















	/* HP */















	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},










@@ -8670,6 +8733,7 @@ static const char *alc882_models[ALC882_MODEL_LAST] = {













	[ALC888_3ST_HP]		= "3stack-hp",















	[ALC888_6ST_DELL]	= "6stack-dell",















	[ALC883_MITAC]		= "mitac",













	[ALC883_CLEVO_M540R]	= "clevo-m540r",















	[ALC883_CLEVO_M720]	= "clevo-m720",















	[ALC883_FUJITSU_PI2515] = "fujitsu-pi2515",















	[ALC888_FUJITSU_XA3530] = "fujitsu-xa3530",










@@ -8776,6 +8840,7 @@ static struct snd_pci_quirk alc882_cfg_tbl[] = {













	SND_PCI_QUIRK(0x147b, 0x1083, "Abit IP35-PRO", ALC883_6ST_DIG),















	SND_PCI_QUIRK(0x1558, 0x0721, "Clevo laptop M720R", ALC883_CLEVO_M720),















	SND_PCI_QUIRK(0x1558, 0x0722, "Clevo laptop M720SR", ALC883_CLEVO_M720),













	SND_PCI_QUIRK(0x1558, 0x5409, "Clevo laptop M540R", ALC883_CLEVO_M540R),















	SND_PCI_QUIRK_VENDOR(0x1558, "Clevo laptop", ALC883_LAPTOP_EAPD),















	SND_PCI_QUIRK(0x15d9, 0x8780, "Supermicro PDSBA", ALC883_3ST_6ch),















	/* SND_PCI_QUIRK(0x161f, 0x2054, "Arima W820", ALC882_ARIMA), */










@@ -9264,6 +9329,21 @@ static struct alc_config_preset alc882_presets[] = {













		.channel_mode = alc883_3ST_2ch_modes,















		.input_mux = &alc883_capture_source,















	},













	[ALC883_CLEVO_M540R] = {













		.mixers = { alc883_3ST_6ch_mixer, alc883_chmode_mixer },













		.init_verbs = { alc883_init_verbs, alc883_clevo_m540r_verbs },













		.num_dacs = ARRAY_SIZE(alc883_dac_nids),













		.dac_nids = alc883_dac_nids,













		.dig_out_nid = ALC883_DIGOUT_NID,













		.dig_in_nid = ALC883_DIGIN_NID,













		.num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_clevo_modes),













		.channel_mode = alc883_3ST_6ch_clevo_modes,













		.need_dac_fix = 1,













		.input_mux = &alc883_capture_source,













		/* This machine has the hardware HP auto-muting, thus













		 * we need no software mute via unsol event













		 */













	},















	[ALC883_CLEVO_M720] = {















		.mixers = { alc883_clevo_m720_mixer },















		.init_verbs = { alc883_init_verbs, alc883_clevo_m720_verbs },