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

Commit 6963f84c authored by Mike Crash's avatar Mike Crash Committed by Jaroslav Kysela
Browse files

[ALSA] hda: support for S/PDIF out on ASUS M2V 



Added support for S/PDIF digital output on ASUS M2V motheboard - added
new model '3stack-660-digout' and ALC660VD_3ST_DIG

Signed-off-by: default avatarMike Crash <mike@mikecrash.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent e65365de

Documentation/sound/alsa/ALSA-Configuration.txt

+1 −0
Original line number Diff line number Diff line
@@ -863,6 +863,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	  3stack-dig	3-jack with SPDIF OUT

	  6stack-dig	6-jack with SPDIF OUT

	  3stack-660	3-jack (for ALC660VD)

	  3stack-660-digout 3-jack with SPDIF OUT (for ALC660VD)

	  lenovo	Lenovo 3000 C200

	  auto		auto-config reading BIOS (default)

sound/pci/hda/patch_realtek.c

+16 −1
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ enum { 
/* ALC861-VD models */

enum {

	ALC660VD_3ST,

	ALC660VD_3ST_DIG,

	ALC861VD_3ST,

	ALC861VD_3ST_DIG,

	ALC861VD_6ST_DIG,
@@ -9987,6 +9988,7 @@ static void alc861vd_dallas_unsol_event(struct hda_codec *codec, unsigned int re 
 */

static const char *alc861vd_models[ALC861VD_MODEL_LAST] = {

	[ALC660VD_3ST]		= "3stack-660",

	[ALC660VD_3ST_DIG]= "3stack-660-digout",

	[ALC861VD_3ST]		= "3stack",

	[ALC861VD_3ST_DIG]	= "3stack-digout",

	[ALC861VD_6ST_DIG]	= "6stack-digout",
@@ -9998,7 +10000,7 @@ static const char *alc861vd_models[ALC861VD_MODEL_LAST] = { 
static struct snd_pci_quirk alc861vd_cfg_tbl[] = {

	SND_PCI_QUIRK(0x1043, 0x12e2, "Asus z35m", ALC660VD_3ST),

	SND_PCI_QUIRK(0x1043, 0x1339, "Asus G1", ALC660VD_3ST),

	SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS", ALC660VD_3ST),

	SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS", ALC660VD_3ST_DIG),

	SND_PCI_QUIRK(0x10de, 0x03f0, "Realtek ALC660 demo", ALC660VD_3ST),

	SND_PCI_QUIRK(0x1019, 0xa88d, "Realtek ALC660 demo", ALC660VD_3ST),
@@ -10023,6 +10025,19 @@ static struct alc_config_preset alc861vd_presets[] = { 
		.channel_mode = alc861vd_3stack_2ch_modes,

		.input_mux = &alc861vd_capture_source,

	},

	[ALC660VD_3ST_DIG] = {

		.mixers = { alc861vd_3st_mixer },

		.init_verbs = { alc861vd_volume_init_verbs,

				 alc861vd_3stack_init_verbs },

		.num_dacs = ARRAY_SIZE(alc660vd_dac_nids),

		.dac_nids = alc660vd_dac_nids,

		.dig_out_nid = ALC861VD_DIGOUT_NID,

		.num_adc_nids = ARRAY_SIZE(alc861vd_adc_nids),

		.adc_nids = alc861vd_adc_nids,

		.num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),

		.channel_mode = alc861vd_3stack_2ch_modes,

		.input_mux = &alc861vd_capture_source,

	},

	[ALC861VD_3ST] = {

		.mixers = { alc861vd_3st_mixer },

		.init_verbs = { alc861vd_volume_init_verbs,