Merge branch 'for-linus' into for-next (88f1236b) · Commits · jan.koester / Linux

sound/pci/hda/patch_realtek.c

+15 −2

Original line number	Diff line number	Diff line
		@@ -4521,6 +4521,8 @@ enum {
		ALC288_FIXUP_DELL_HEADSET_MODE,
		ALC288_FIXUP_DELL1_MIC_NO_PRESENCE,
		ALC288_FIXUP_DELL_XPS_13_GPIO6,
		ALC292_FIXUP_DELL_E7X,
		ALC292_FIXUP_DISABLE_AAMIX,
		ALC298_FIXUP_DELL1_MIC_NO_PRESENCE,
		};

		@@ -5044,6 +5046,16 @@ static const struct hda_fixup alc269_fixups[] = {
		.chained = true,
		.chain_id = ALC288_FIXUP_DELL1_MIC_NO_PRESENCE
		},
		[ALC292_FIXUP_DISABLE_AAMIX] = {
		.type = HDA_FIXUP_FUNC,
		.v.func = alc_fixup_disable_aamix,
		},
		[ALC292_FIXUP_DELL_E7X] = {
		.type = HDA_FIXUP_FUNC,
		.v.func = alc_fixup_dell_xps13,
		.chained = true,
		.chain_id = ALC292_FIXUP_DISABLE_AAMIX
		},
		[ALC298_FIXUP_DELL1_MIC_NO_PRESENCE] = {
		.type = HDA_FIXUP_PINS,
		.v.pins = (const struct hda_pintbl[]) {
		@@ -5066,6 +5078,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
		SND_PCI_QUIRK(0x1025, 0x0775, "Acer Aspire E1-572", ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572),
		SND_PCI_QUIRK(0x1025, 0x079b, "Acer Aspire V5-573G", ALC282_FIXUP_ASPIRE_V5_PINS),
		SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),
		SND_PCI_QUIRK(0x1028, 0x05ca, "Dell Latitude E7240", ALC292_FIXUP_DELL_E7X),
		SND_PCI_QUIRK(0x1028, 0x05cb, "Dell Latitude E7440", ALC292_FIXUP_DELL_E7X),
		SND_PCI_QUIRK(0x1028, 0x05da, "Dell Vostro 5460", ALC290_FIXUP_SUBWOOFER),
		SND_PCI_QUIRK(0x1028, 0x05f4, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
		SND_PCI_QUIRK(0x1028, 0x05f5, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
		@@ -5671,7 +5685,6 @@ static int patch_alc269(struct hda_codec *codec)

		spec = codec->spec;
		spec->gen.shared_mic_vref_pin = 0x18;
		if (codec->core.vendor_id != 0x10ec0292)
		codec->power_save_node = 1;

		#ifdef CONFIG_PM

sound/pci/hda/patch_sigmatel.c

+25 −0

Original line number	Diff line number	Diff line
		@@ -100,6 +100,7 @@ enum {
		STAC_HP_ENVY_BASS,
		STAC_HP_BNB13_EQ,
		STAC_HP_ENVY_TS_BASS,
		STAC_HP_ENVY_TS_DAC_BIND,
		STAC_92HD83XXX_GPIO10_EAPD,
		STAC_92HD83XXX_MODELS
		};
		@@ -2171,6 +2172,22 @@ static void stac92hd83xxx_fixup_gpio10_eapd(struct hda_codec *codec,
		spec->eapd_switch = 0;
		}

		static void hp_envy_ts_fixup_dac_bind(struct hda_codec *codec,
		const struct hda_fixup *fix,
		int action)
		{
		struct sigmatel_spec *spec = codec->spec;
		static hda_nid_t preferred_pairs[] = {
		0xd, 0x13,
		0
		};

		if (action != HDA_FIXUP_ACT_PRE_PROBE)
		return;

		spec->gen.preferred_dacs = preferred_pairs;
		}

		static const struct hda_verb hp_bnb13_eq_verbs[] = {
		/* 44.1KHz base */
		{ 0x22, 0x7A6, 0x3E },
		@@ -2686,6 +2703,12 @@ static const struct hda_fixup stac92hd83xxx_fixups[] = {
		{}
		},
		},
		[STAC_HP_ENVY_TS_DAC_BIND] = {
		.type = HDA_FIXUP_FUNC,
		.v.func = hp_envy_ts_fixup_dac_bind,
		.chained = true,
		.chain_id = STAC_HP_ENVY_TS_BASS,
		},
		[STAC_92HD83XXX_GPIO10_EAPD] = {
		.type = HDA_FIXUP_FUNC,
		.v.func = stac92hd83xxx_fixup_gpio10_eapd,
		@@ -2764,6 +2787,8 @@ static const struct snd_pci_quirk stac92hd83xxx_fixup_tbl[] = {
		"HP bNB13", STAC_HP_BNB13_EQ),
		SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x190e,
		"HP ENVY TS", STAC_HP_ENVY_TS_BASS),
		SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1967,
		"HP ENVY TS", STAC_HP_ENVY_TS_DAC_BIND),
		SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1940,
		"HP bNB13", STAC_HP_BNB13_EQ),
		SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1941,