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

Commit 65557f35 authored by Matthew Ranostay's avatar Matthew Ranostay Committed by Takashi Iwai
Browse files

ALSA: hda: 83xxx port 0xe DAC selection



On the 92hd8xxx codecs port 0xe needs the connection selected to be the
last DAC in the list.

Signed-off-by: default avatarMatthew Ranostay <mranostay@embeddedalley.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 989738c4
Loading
Loading
Loading
Loading
+11 −5
Original line number Diff line number Diff line
@@ -841,10 +841,6 @@ static struct hda_verb stac92hd73xx_10ch_core_init[] = {
};

static struct hda_verb stac92hd83xxx_core_init[] = {
	/* start of config #1 */
	{ 0xe, AC_VERB_SET_CONNECT_SEL, 0x3},

	/* start of config #2 */
	{ 0xa, AC_VERB_SET_CONNECT_SEL, 0x0},
	{ 0xb, AC_VERB_SET_CONNECT_SEL, 0x0},
	{ 0xd, AC_VERB_SET_CONNECT_SEL, 0x1},
@@ -4754,7 +4750,9 @@ static struct hda_input_mux stac92hd83xxx_dmux = {
static int patch_stac92hd83xxx(struct hda_codec *codec)
{
	struct sigmatel_spec *spec;
	hda_nid_t conn[STAC92HD83_DAC_COUNT + 1];
	int err;
	int num_dacs;

	spec  = kzalloc(sizeof(*spec), GFP_KERNEL);
	if (spec == NULL)
@@ -4773,13 +4771,21 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
	spec->num_pwrs = ARRAY_SIZE(stac92hd83xxx_pwr_nids);
	spec->multiout.dac_nids = spec->dac_nids;


	/* set port 0xe to select the last DAC
	 */
	num_dacs = snd_hda_get_connections(codec, 0x0e,
		conn, STAC92HD83_DAC_COUNT + 1) - 1;

	snd_hda_codec_write_cache(codec, 0xe, 0,
		AC_VERB_SET_CONNECT_SEL, num_dacs);

	spec->init = stac92hd83xxx_core_init;
	switch (codec->vendor_id) {
	case 0x111d7605:
		break;
	default:
		spec->num_pwrs--;
		spec->init++; /* switch to config #2 */
	}

	spec->mixer = stac92hd83xxx_mixer;