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

Commit b6482d48 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] hda-codec - Add 6stack model for ALC880 



Documentation,HDA Codec driver
- Added a new '6stack' model for ALC880.
- Fixed the typo in 6stack-digout model name.
- Added description for missing models in ALSA-Configuration.txt.

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

Documentation/sound/alsa/ALSA-Configuration.txt

+5 −0
Original line number Diff line number Diff line
@@ -636,11 +636,16 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	  3stack-digout	3-jack in back, a HP out and a SPDIF out

	  5stack	5-jack in back, 2-jack in front

	  5stack-digout	5-jack in back, 2-jack in front, a SPDIF out

	  6stack	6-jack in back, 2-jack in front

	  6stack-digout	6-jack with a SPDIF out

	  w810		3-jack

	  z71v		3-jack (HP shared SPDIF)

	  asus		3-jack

	  uniwill	3-jack

	  F1734		2-jack

	  test		for testing/debugging purpose, almost all controls can be

			adjusted.  Appearing only when compiled with

			$CONFIG_SND_DEBUG=y



	CMI9880

	  minimal	3-jack in back

sound/pci/hda/patch_realtek.c

+13 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ enum { 
	ALC880_W810,

	ALC880_Z71V,

	ALC880_AUTO,

	ALC880_6ST,

	ALC880_6ST_DIG,

	ALC880_F1734,

	ALC880_ASUS,
@@ -1559,7 +1560,9 @@ static struct hda_board_config alc880_cfg_tbl[] = { 
	{ .modelname = "z71v", .config = ALC880_Z71V },

	{ .pci_subvendor = 0x1043, .pci_subdevice = 0x1964, .config = ALC880_Z71V },



	{ .modelname = "6statack-digout", .config = ALC880_6ST_DIG },

	{ .modelname = "6stack", .config = ALC880_6ST },



	{ .modelname = "6stack-digout", .config = ALC880_6ST_DIG },

	{ .pci_subvendor = 0x2668, .pci_subdevice = 0x8086, .config = ALC880_6ST_DIG },

	{ .pci_subvendor = 0x8086, .pci_subdevice = 0x2668, .config = ALC880_6ST_DIG },

	{ .pci_subvendor = 0x1462, .pci_subdevice = 0x1150, .config = ALC880_6ST_DIG },
@@ -1646,6 +1649,15 @@ static struct alc_config_preset alc880_presets[] = { 
		.channel_mode = alc880_fivestack_modes,

		.input_mux = &alc880_capture_source,

	},

	[ALC880_6ST] = {

		.mixers = { alc880_six_stack_mixer },

		.init_verbs = { alc880_volume_init_verbs, alc880_pin_6stack_init_verbs },

		.num_dacs = ARRAY_SIZE(alc880_6st_dac_nids),

		.dac_nids = alc880_6st_dac_nids,

		.num_channel_mode = ARRAY_SIZE(alc880_sixstack_modes),

		.channel_mode = alc880_sixstack_modes,

		.input_mux = &alc880_6stack_capture_source,

	},

	[ALC880_6ST_DIG] = {

		.mixers = { alc880_six_stack_mixer },

		.init_verbs = { alc880_volume_init_verbs, alc880_pin_6stack_init_verbs },