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

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

[ALSA] hda-codec - Add line_out_type to auto_pin_cfg struct 



Added line_out_type field to auto_pin_cfg struct to provide the
pin type of default line_outs.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 658fba0e

sound/pci/hda/hda_codec.c

+2 −0
Original line number Diff line number Diff line
@@ -2288,12 +2288,14 @@ int __devinit snd_hda_parse_pin_def_config(struct hda_codec *codec, 
			       sizeof(cfg->speaker_pins));

			cfg->speaker_outs = 0;

			memset(cfg->speaker_pins, 0, sizeof(cfg->speaker_pins));

			cfg->line_out_type = AUTO_PIN_SPEAKER_OUT;

		} else if (cfg->hp_outs) {

			cfg->line_outs = cfg->hp_outs;

			memcpy(cfg->line_out_pins, cfg->hp_pins,

			       sizeof(cfg->hp_pins));

			cfg->hp_outs = 0;

			memset(cfg->hp_pins, 0, sizeof(cfg->hp_pins));

			cfg->line_out_type = AUTO_PIN_HP_OUT;

		}

	}

sound/pci/hda/hda_local.h

+7 −0
Original line number Diff line number Diff line
@@ -222,6 +222,12 @@ enum { 
	AUTO_PIN_LAST

};



enum {

	AUTO_PIN_LINE_OUT,

	AUTO_PIN_SPEAKER_OUT,

	AUTO_PIN_HP_OUT

};



extern const char *auto_pin_cfg_labels[AUTO_PIN_LAST];



struct auto_pin_cfg {
@@ -230,6 +236,7 @@ struct auto_pin_cfg { 
	int speaker_outs;

	hda_nid_t speaker_pins[5];

	int hp_outs;

	int line_out_type;	/* AUTO_PIN_XXX_OUT */

	hda_nid_t hp_pins[5];

	hda_nid_t input_pins[AUTO_PIN_LAST];

	hda_nid_t dig_out_pin;