Commit d460975e authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Back-merge of 5.17-devel branch for further work on Intel LPE HDMI stuff

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents d7f15bef cd94df17

sound/firewire/fcp.c

+1 −3
Original line number Diff line number Diff line
@@ -240,9 +240,7 @@ int fcp_avc_transaction(struct fw_unit *unit, 
	t.response_match_bytes = response_match_bytes;

	t.state = STATE_PENDING;

	init_waitqueue_head(&t.wait);



	if (*(const u8 *)command == 0x00 || *(const u8 *)command == 0x03)

		t.deferrable = true;

	t.deferrable = (*(const u8 *)command == 0x00 || *(const u8 *)command == 0x03);



	spin_lock_irq(&transactions_lock);

	list_add_tail(&t.list, &transactions);

sound/pci/hda/hda_intel.c

+1 −0
Original line number Diff line number Diff line
@@ -1941,6 +1941,7 @@ static int azx_first_init(struct azx *chip) 
		dma_bits = 32;

	if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(dma_bits)))

		dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(32));

	dma_set_max_seg_size(&pci->dev, UINT_MAX);



	/* read number of streams from GCAP register instead of using

	 * hardcoded value

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -9144,6 +9144,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1558, 0x8561, "Clevo NH[57][0-9][ER][ACDH]Q", ALC269_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x1558, 0x8562, "Clevo NH[57][0-9]RZ[Q]", ALC269_FIXUP_DMIC),

	SND_PCI_QUIRK(0x1558, 0x8668, "Clevo NP50B[BE]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0x867d, "Clevo NP7[01]PN[HJK]", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0x8680, "Clevo NJ50LU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1558, 0x8686, "Clevo NH50[CZ]U", ALC256_FIXUP_MIC_NO_PRESENCE_AND_RESUME),

	SND_PCI_QUIRK(0x1558, 0x8a20, "Clevo NH55DCQ-Y", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),

sound/soc/codecs/cs4265.c

+1 −2
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ static const struct snd_kcontrol_new cs4265_snd_controls[] = { 
	SOC_SINGLE("E to F Buffer Disable Switch", CS4265_SPDIF_CTL1,

				6, 1, 0),

	SOC_ENUM("C Data Access", cam_mode_enum),

	SOC_SINGLE("SPDIF Switch", CS4265_SPDIF_CTL2, 5, 1, 1),

	SOC_SINGLE("Validity Bit Control Switch", CS4265_SPDIF_CTL2,

				3, 1, 0),

	SOC_ENUM("SPDIF Mono/Stereo", spdif_mono_stereo_enum),
@@ -186,7 +185,7 @@ static const struct snd_soc_dapm_widget cs4265_dapm_widgets[] = { 


	SND_SOC_DAPM_SWITCH("Loopback", SND_SOC_NOPM, 0, 0,

			&loopback_ctl),

	SND_SOC_DAPM_SWITCH("SPDIF", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SWITCH("SPDIF", CS4265_SPDIF_CTL2, 5, 1,

			&spdif_switch),

	SND_SOC_DAPM_SWITCH("DAC", CS4265_PWRCTL, 1, 1,

			&dac_switch),

sound/soc/intel/skylake/skl.c

+1 −0
Original line number Diff line number Diff line
@@ -952,6 +952,7 @@ static int skl_first_init(struct hdac_bus *bus) 
	/* allow 64bit DMA address if supported by H/W */

	if (dma_set_mask_and_coherent(bus->dev, DMA_BIT_MASK(64)))

		dma_set_mask_and_coherent(bus->dev, DMA_BIT_MASK(32));

	dma_set_max_seg_size(bus->dev, UINT_MAX);



	/* initialize streams */

	snd_hdac_ext_stream_init_all