Commit 539a5093 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next

parents 2231af79 13d9c6b9

sound/pci/hda/patch_realtek.c

+19 −2
Original line number Diff line number Diff line
@@ -6645,6 +6645,7 @@ enum { 
	ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP,

	ALC623_FIXUP_LENOVO_THINKSTATION_P340,

	ALC255_FIXUP_ACER_HEADPHONE_AND_MIC,

	ALC236_FIXUP_HP_LIMIT_INT_MIC_BOOST,

};



static const struct hda_fixup alc269_fixups[] = {
@@ -8229,6 +8230,12 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC255_FIXUP_XIAOMI_HEADSET_MIC

	},

	[ALC236_FIXUP_HP_LIMIT_INT_MIC_BOOST] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc269_fixup_limit_int_mic_boost,

		.chained = true,

		.chain_id = ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF,

	},

};



static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -8425,8 +8432,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8847, "HP EliteBook x360 830 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x884b, "HP EliteBook 840 Aero G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x884c, "HP EliteBook 840 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8862, "HP ProBook 445 G8 Notebook PC", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),

	SND_PCI_QUIRK(0x103c, 0x8863, "HP ProBook 445 G8 Notebook PC", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),

	SND_PCI_QUIRK(0x103c, 0x8862, "HP ProBook 445 G8 Notebook PC", ALC236_FIXUP_HP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x103c, 0x8863, "HP ProBook 445 G8 Notebook PC", ALC236_FIXUP_HP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x103c, 0x886d, "HP ZBook Fury 17.3 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),

	SND_PCI_QUIRK(0x103c, 0x8870, "HP ZBook Fury 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),

	SND_PCI_QUIRK(0x103c, 0x8873, "HP ZBook Studio 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),
@@ -9501,6 +9508,16 @@ static int patch_alc269(struct hda_codec *codec) 


	snd_hda_pick_fixup(codec, alc269_fixup_models,

		       alc269_fixup_tbl, alc269_fixups);

	/* FIXME: both TX300 and ROG Strix G17 have the same SSID, and

	 * the quirk breaks the latter (bko#214101).

	 * Clear the wrong entry.

	 */

	if (codec->fixup_id == ALC282_FIXUP_ASUS_TX300 &&

	    codec->core.vendor_id == 0x10ec0294) {

		codec_dbg(codec, "Clear wrong fixup for ASUS ROG Strix G17\n");

		codec->fixup_id = HDA_FIXUP_ID_NOT_SET;

	}



	snd_hda_pick_pin_fixup(codec, alc269_pin_fixup_tbl, alc269_fixups, true);

	snd_hda_pick_pin_fixup(codec, alc269_fallback_pin_fixup_tbl, alc269_fixups, false);

	snd_hda_pick_fixup(codec, NULL,	alc269_fixup_vendor_tbl,

sound/soc/intel/atom/sst-mfld-platform-pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static void sst_fill_alloc_params(struct snd_pcm_substream *substream, 
	snd_pcm_uframes_t period_size;

	ssize_t periodbytes;

	ssize_t buffer_bytes = snd_pcm_lib_buffer_bytes(substream);

	u32 buffer_addr = substream->runtime->dma_addr;

	u32 buffer_addr = virt_to_phys(substream->runtime->dma_area);



	channels = substream->runtime->channels;

	period_size = substream->runtime->period_size;