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

Commit 90da78bf authored by Matt Ranostay's avatar Matt Ranostay Committed by Jaroslav Kysela
Browse files

[ALSA] hda: Added mono_out_pin to autoconfig 



Added a mono_out_pin field to autocfg struct, and code to parse
for the mono_out_line.

Signed-off-by: default avatarMatthew Ranostay <mranostay@embeddedalley.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent cd93dc8c

sound/pci/hda/hda_codec.c

+5 −0
Original line number Diff line number Diff line
@@ -2708,6 +2708,10 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec, 
		case AC_JACK_LINE_OUT:

			seq = get_defcfg_sequence(def_conf);

			assoc = get_defcfg_association(def_conf);



			if (!(wid_caps & AC_WCAP_STEREO))

				if (!cfg->mono_out_pin)

					cfg->mono_out_pin = nid;

			if (!assoc)

				continue;

			if (!assoc_line_out)
@@ -2856,6 +2860,7 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec, 
		   cfg->hp_outs, cfg->hp_pins[0],

		   cfg->hp_pins[1], cfg->hp_pins[2],

		   cfg->hp_pins[3], cfg->hp_pins[4]);

	snd_printd("   mono: mono_out=0x%x\n", cfg->mono_out_pin);

	snd_printd("   inputs: mic=0x%x, fmic=0x%x, line=0x%x, fline=0x%x,"

		   " cd=0x%x, aux=0x%x\n",

		   cfg->input_pins[AUTO_PIN_MIC],

sound/pci/hda/hda_local.h

+1 −0
Original line number Diff line number Diff line
@@ -332,6 +332,7 @@ struct auto_pin_cfg { 
	hda_nid_t input_pins[AUTO_PIN_LAST];

	hda_nid_t dig_out_pin;

	hda_nid_t dig_in_pin;

	hda_nid_t mono_out_pin;

};



#define get_defcfg_connect(cfg) \