Merge branch 'topic/hda' into for-linus (9177b42b) · Commits · e / devices / android_kernel_xiaomi_markw

sound/pci/hda/patch_realtek.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -8478,6 +8478,7 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
		SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_ASUS_EEE1601),
		SND_PCI_QUIRK(0x105b, 0x0ce8, "Foxconn P35AX-S", ALC883_6ST_DIG),
		SND_PCI_QUIRK(0x105b, 0x6668, "Foxconn", ALC883_6ST_DIG),
		SND_PCI_QUIRK(0x1071, 0x8227, "Mitac 82801H", ALC883_MITAC),
		SND_PCI_QUIRK(0x1071, 0x8253, "Mitac 8252d", ALC883_MITAC),
		SND_PCI_QUIRK(0x1071, 0x8258, "Evesham Voyaeger", ALC883_LAPTOP_EAPD),
		SND_PCI_QUIRK(0x10f1, 0x2350, "TYAN-S2350", ALC888_6ST_DELL),
		@@ -8526,6 +8527,7 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
		SND_PCI_QUIRK(0x1991, 0x5625, "Haier W66", ALC883_HAIER_W66),
		SND_PCI_QUIRK(0x8086, 0x0001, "DG33BUC", ALC883_3ST_6ch_INTEL),
		SND_PCI_QUIRK(0x8086, 0x0002, "DG33FBC", ALC883_3ST_6ch_INTEL),
		SND_PCI_QUIRK(0x8086, 0x2503, "82801H", ALC883_MITAC),
		SND_PCI_QUIRK(0x8086, 0x0022, "DX58SO", ALC883_3ST_6ch_INTEL),
		SND_PCI_QUIRK(0x8086, 0xd601, "D102GGC", ALC883_3ST_6ch),
		{}

+8 −7

Original line number	Diff line number	Diff line
		@@ -885,8 +885,8 @@ static struct hda_verb stac92hd71bxx_analog_core_init[] = {
		static struct hda_verb stac925x_core_init[] = {
		/* set dac0mux for dac converter */
		{ 0x06, AC_VERB_SET_CONNECT_SEL, 0x00},
		/* unmute and set max the selector */
		{ 0x0e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb01f },
		/* mute the master volume */
		{ 0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
		{}
		};

		@@ -1138,6 +1138,8 @@ static struct snd_kcontrol_new stac92hd71bxx_mixer[] = {
		};

		static struct snd_kcontrol_new stac925x_mixer[] = {
		HDA_CODEC_VOLUME("Master Playback Volume", 0x0e, 0, HDA_OUTPUT),
		HDA_CODEC_MUTE("Master Playback Switch", 0x0e, 0, HDA_OUTPUT),
		STAC_INPUT_SOURCE(1),
		HDA_CODEC_VOLUME("Capture Volume", 0x09, 0, HDA_OUTPUT),
		HDA_CODEC_MUTE("Capture Switch", 0x14, 0, HDA_OUTPUT),
		@@ -3573,12 +3575,11 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
		err = stac92xx_auto_fill_dac_nids(codec);
		if (err < 0)
		return err;
		}

		err = stac92xx_auto_create_multi_out_ctls(codec, &spec->autocfg);

		err = stac92xx_auto_create_multi_out_ctls(codec,
		&spec->autocfg);
		if (err < 0)
		return err;
		}

		/* setup analog beep controls */
		if (spec->anabeep_nid > 0) {