Commit fdfa38e9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-fix-6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "A few more small fixes for 6.18-rc1.

  Most of changes are about ASoC Intel and SOF drivers, while a few
  other device-specific fixes are found for HD-audio, USB-audio, ASoC
  RT722VB and Meson"

* tag 'sound-fix-6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ASoC: rt722: add settings for rt722VB
  ASoC: meson: aiu-encoder-i2s: fix bit clock polarity
  ALSA: usb: fpc: replace kmalloc_array followed by copy_from_user with memdup_array_user
  ALSA: hda/tas2781: Enable init_profile_id for device initialization
  ALSA: emu10k1: Fix typo in docs
  ALSA: hda/realtek: Add quirk for ASUS ROG Zephyrus Duo
  ASoC: SOF: Intel: Read the LLP via the associated Link DMA channel
  ASoC: SOF: ipc4-pcm: do not report invalid delay values
  ASoC: SOF: sof-audio: add dev_dbg_ratelimited wrapper
  ASoC: SOF: Intel: hda-pcm: Place the constraint on period time instead of buffer time
  ASoC: SOF: ipc4-topology: Account for different ChainDMA host buffer size
  ASoC: SOF: ipc4-topology: Correct the minimum host DMA buffer size
  ASoC: SOF: ipc4-pcm: fix start offset calculation for chain DMA
  ASoC: SOF: ipc4-pcm: fix delay calculation when DSP resamples
  ASoC: SOF: ipc3-topology: Fix multi-core and static pipelines tear down
  ALSA: hda/hdmi: Add pin fix for HP ProDesk model
parents 06a88f47 ca7a2317

Documentation/sound/cards/emu-mixer.rst

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ FX-bus 


name='Clock Source',index=0

---------------------------

This control allows switching the word clock between interally generated

This control allows switching the word clock between internally generated

44.1 or 48 kHz, or a number of external sources.



Note: the sources for the 1616 CardBus card are unclear. Please report your

sound/hda/codecs/hdmi/hdmi.c

+1 −0
Original line number Diff line number Diff line
@@ -1549,6 +1549,7 @@ static const struct snd_pci_quirk force_connect_list[] = { 
	SND_PCI_QUIRK(0x103c, 0x83e2, "HP EliteDesk 800 G4", 1),

	SND_PCI_QUIRK(0x103c, 0x83ef, "HP MP9 G4 Retail System AMS", 1),

	SND_PCI_QUIRK(0x103c, 0x845a, "HP EliteDesk 800 G4 DM 65W", 1),

	SND_PCI_QUIRK(0x103c, 0x83f3, "HP ProDesk 400", 1),

	SND_PCI_QUIRK(0x103c, 0x870f, "HP", 1),

	SND_PCI_QUIRK(0x103c, 0x871a, "HP", 1),

	SND_PCI_QUIRK(0x103c, 0x8711, "HP", 1),

sound/hda/codecs/realtek/alc269.c

+10 −0
Original line number Diff line number Diff line
@@ -3735,6 +3735,7 @@ enum { 
	ALC285_FIXUP_ASUS_GA605K_HEADSET_MIC,

	ALC285_FIXUP_ASUS_GA605K_I2C_SPEAKER2_TO_DAC1,

	ALC269_FIXUP_POSITIVO_P15X_HEADSET_MIC,

	ALC289_FIXUP_ASUS_ZEPHYRUS_DUAL_SPK,

};



/* A special fixup for Lenovo C940 and Yoga Duet 7;
@@ -6164,6 +6165,14 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC269VC_FIXUP_ACER_MIC_NO_PRESENCE,

	},

	[ALC289_FIXUP_ASUS_ZEPHYRUS_DUAL_SPK] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {

			{ 0x17, 0x90170151 }, /* Internal Speaker LFE */

			{ 0x1e, 0x90170150 }, /* Internal Speaker */

			{ }

		},

	}

};



static const struct hda_quirk alc269_fixup_tbl[] = {
@@ -6718,6 +6727,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A),

	SND_PCI_QUIRK(0x1043, 0x1533, "ASUS GV302XA/XJ/XQ/XU/XV/XI", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1043, 0x1573, "ASUS GZ301VV/VQ/VU/VJ/VA/VC/VE/VVC/VQC/VUC/VJC/VEC/VCC", ALC285_FIXUP_ASUS_HEADSET_MIC),

	SND_PCI_QUIRK(0x1043, 0x1652, "ASUS ROG Zephyrus Do 15 SE", ALC289_FIXUP_ASUS_ZEPHYRUS_DUAL_SPK),

	SND_PCI_QUIRK(0x1043, 0x1662, "ASUS GV301QH", ALC294_FIXUP_ASUS_DUAL_SPK),

	SND_PCI_QUIRK(0x1043, 0x1663, "ASUS GU603ZI/ZJ/ZQ/ZU/ZV", ALC285_FIXUP_ASUS_HEADSET_MIC),

	SND_PCI_QUIRK(0x1043, 0x1683, "ASUS UM3402YAR", ALC287_FIXUP_CS35L41_I2C_2),

sound/hda/codecs/side-codecs/tas2781_hda_i2c.c

+12 −0
Original line number Diff line number Diff line
@@ -474,6 +474,12 @@ static void tasdevice_dspfw_init(void *context) 
	if (tas_priv->fmw->nr_configurations > 0)

		tas_priv->cur_conf = 0;



	/* Init common setting for different audio profiles */

	if (tas_priv->rcabin.init_profile_id >= 0)

		tasdevice_select_cfg_blk(tas_priv,

			tas_priv->rcabin.init_profile_id,

			TASDEVICE_BIN_BLK_PRE_POWER_UP);



	/* If calibrated data occurs error, dsp will still works with default

	 * calibrated data inside algo.

	 */
@@ -770,6 +776,12 @@ static int tas2781_system_resume(struct device *dev) 
	tasdevice_reset(tas_hda->priv);

	tasdevice_prmg_load(tas_hda->priv, tas_hda->priv->cur_prog);



	/* Init common setting for different audio profiles */

	if (tas_hda->priv->rcabin.init_profile_id >= 0)

		tasdevice_select_cfg_blk(tas_hda->priv,

			tas_hda->priv->rcabin.init_profile_id,

			TASDEVICE_BIN_BLK_PRE_POWER_UP);



	if (tas_hda->priv->playback_started)

		tasdevice_tuning_switch(tas_hda->priv, 0);

sound/soc/codecs/rt722-sdca-sdw.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ static int rt722_sdca_mbq_size(struct device *dev, unsigned int reg) 
	switch (reg) {

	case 0x2f01 ... 0x2f0a:

	case 0x2f35 ... 0x2f36:

	case 0x2f50:

	case 0x2f50 ... 0x2f52:

	case 0x2f54:

	case 0x2f58 ... 0x2f5d:

	case SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT722_SDCA_ENT0, RT722_SDCA_CTL_FUNC_STATUS, 0):