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

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

Pull sound fixes from Takashi Iwai:
 "A collection of fixes for rc1.

  The majority of changes are various ASoC driver-specific small fixes
  and usual HD-audio quirks, while there are a couple of core changes: a
  fix in ALSA core procfs code to avoid deadlocks at disconnection and
  an ASoC core fix for DAPM clock widgets"

* tag 'sound-fix-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  OSS: dmasound/paula: Convert to platform remove callback returning void
  ALSA: hda: ASUS UM5302LA: Added quirks for cs35L41/10431A83 on i2c bus
  ALSA: info: Fix potential deadlock at disconnection
  ASoC: nau8540: Add self recovery to improve capture quility
  ALSA: hda/realtek: Add support dual speaker for Dell
  ALSA: hda: Add ASRock X670E Taichi to denylist
  ALSA: hda/realtek: Add quirk for ASUS UX7602ZM
  ASoC: SOF: sof-client: trivial: fix comment typo
  ASoC: dapm: fix clock get name
  ASoC: hdmi-codec: register hpd callback on component probe
  ASoC: mediatek: mt8186_mt6366_rt1019_rt5682s: trivial: fix error messages
  ASoC: da7219: Improve system suspend and resume handling
  ASoC: codecs: Modify macro value error
  ASoC: codecs: Modify the wrong judgment of re value
  ASoC: codecs: Modify the maximum value of calib
  ASoC: amd: acp: fix for i2s mode register field update
  ASoC: codecs: aw88399: Fix -Wuninitialized in aw_dev_set_vcalb()
  ASoC: rt712-sdca: fix speaker route missing issue
  ASoC: rockchip: Fix unused rockchip_i2s_tdm_match warning for !CONFIG_OF
  ASoC: ti: omap-mcbsp: Fix runtime PM underflow warnings
parents ae4f52a7 bce36aa6

sound/core/info.c

+13 −8
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ struct snd_info_private_data { 
};



static int snd_info_version_init(void);

static void snd_info_disconnect(struct snd_info_entry *entry);

static void snd_info_clear_entries(struct snd_info_entry *entry);



/*
@@ -569,11 +569,16 @@ void snd_info_card_disconnect(struct snd_card *card) 
{

	if (!card)

		return;

	mutex_lock(&info_mutex);



	proc_remove(card->proc_root_link);

	card->proc_root_link = NULL;

	if (card->proc_root)

		snd_info_disconnect(card->proc_root);

		proc_remove(card->proc_root->p);



	mutex_lock(&info_mutex);

	if (card->proc_root)

		snd_info_clear_entries(card->proc_root);

	card->proc_root_link = NULL;

	card->proc_root = NULL;

	mutex_unlock(&info_mutex);

}
@@ -745,15 +750,14 @@ struct snd_info_entry *snd_info_create_card_entry(struct snd_card *card, 
}

EXPORT_SYMBOL(snd_info_create_card_entry);



static void snd_info_disconnect(struct snd_info_entry *entry)

static void snd_info_clear_entries(struct snd_info_entry *entry)

{

	struct snd_info_entry *p;



	if (!entry->p)

		return;

	list_for_each_entry(p, &entry->children, list)

		snd_info_disconnect(p);

	proc_remove(entry->p);

		snd_info_clear_entries(p);

	entry->p = NULL;

}
@@ -770,8 +774,9 @@ void snd_info_free_entry(struct snd_info_entry * entry) 
	if (!entry)

		return;

	if (entry->p) {

		proc_remove(entry->p);

		mutex_lock(&info_mutex);

		snd_info_disconnect(entry);

		snd_info_clear_entries(entry);

		mutex_unlock(&info_mutex);

	}

sound/oss/dmasound/dmasound_paula.c

+3 −4
Original line number Diff line number Diff line
@@ -720,14 +720,13 @@ static int __init amiga_audio_probe(struct platform_device *pdev) 
	return dmasound_init();

}



static int __exit amiga_audio_remove(struct platform_device *pdev)

static void __exit amiga_audio_remove(struct platform_device *pdev)

{

	dmasound_deinit();

	return 0;

}



static struct platform_driver amiga_audio_driver = {

	.remove = __exit_p(amiga_audio_remove),

	.remove_new = __exit_p(amiga_audio_remove),

	.driver = {

		.name	= "amiga-audio",

	},

sound/pci/hda/hda_intel.c

+1 −0
Original line number Diff line number Diff line
@@ -2068,6 +2068,7 @@ static const struct pci_device_id driver_denylist[] = { 
	{ PCI_DEVICE_SUB(0x1022, 0x1487, 0x1043, 0x874f) }, /* ASUS ROG Zenith II / Strix */

	{ PCI_DEVICE_SUB(0x1022, 0x1487, 0x1462, 0xcb59) }, /* MSI TRX40 Creator */

	{ PCI_DEVICE_SUB(0x1022, 0x1487, 0x1462, 0xcb60) }, /* MSI TRX40 */

	{ PCI_DEVICE_SUB(0x1022, 0x15e3, 0x1022, 0xd601) }, /* ASRock X670E Taichi */

	{}

};

sound/pci/hda/patch_realtek.c

+40 −7
Original line number Diff line number Diff line
@@ -7343,8 +7343,10 @@ enum { 
	ALC256_FIXUP_ASUS_MIC_NO_PRESENCE,

	ALC299_FIXUP_PREDATOR_SPK,

	ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE,

	ALC289_FIXUP_DELL_SPK1,

	ALC289_FIXUP_DELL_SPK2,

	ALC289_FIXUP_DUAL_SPK,

	ALC289_FIXUP_RTK_AMP_DUAL_SPK,

	ALC294_FIXUP_SPK2_TO_DAC1,

	ALC294_FIXUP_ASUS_DUAL_SPK,

	ALC285_FIXUP_THINKPAD_X1_GEN7,
@@ -7444,6 +7446,8 @@ enum { 
	ALC287_FIXUP_THINKPAD_I2S_SPK,

	ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD,

	ALC2XX_FIXUP_HEADSET_MIC,

	ALC289_FIXUP_DELL_CS35L41_SPI_2,

	ALC294_FIXUP_CS35L41_I2C_2,

};



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

		.chain_id = ALC256_FIXUP_ASUS_HEADSET_MODE

	},

	[ALC289_FIXUP_DELL_SPK1] = {

		.type = HDA_FIXUP_PINS,

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

			{ 0x14, 0x90170140 },

			{ }

		},

		.chained = true,

		.chain_id = ALC269_FIXUP_DELL4_MIC_NO_PRESENCE

	},

	[ALC289_FIXUP_DELL_SPK2] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {
@@ -8685,6 +8698,12 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC289_FIXUP_DELL_SPK2

	},

	[ALC289_FIXUP_RTK_AMP_DUAL_SPK] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc285_fixup_speaker2_to_dac1,

		.chained = true,

		.chain_id = ALC289_FIXUP_DELL_SPK1

	},

	[ALC294_FIXUP_SPK2_TO_DAC1] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc285_fixup_speaker2_to_dac1,
@@ -9552,6 +9571,16 @@ static const struct hda_fixup alc269_fixups[] = { 
		.type = HDA_FIXUP_FUNC,

		.v.func = alc_fixup_headset_mic,

	},

	[ALC289_FIXUP_DELL_CS35L41_SPI_2] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = cs35l41_fixup_spi_two,

		.chained = true,

		.chain_id = ALC289_FIXUP_DUAL_SPK

	},

	[ALC294_FIXUP_CS35L41_I2C_2] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = cs35l41_fixup_i2c_two,

	},

};



static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -9662,13 +9691,15 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x0c1c, "Dell Precision 3540", ALC236_FIXUP_DELL_DUAL_CODECS),

	SND_PCI_QUIRK(0x1028, 0x0c1d, "Dell Precision 3440", ALC236_FIXUP_DELL_DUAL_CODECS),

	SND_PCI_QUIRK(0x1028, 0x0c1e, "Dell Precision 3540", ALC236_FIXUP_DELL_DUAL_CODECS),

	SND_PCI_QUIRK(0x1028, 0x0cbd, "Dell Oasis 13 CS MTL-U", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cbe, "Dell Oasis 13 2-IN-1 MTL-U", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cbf, "Dell Oasis 13 Low Weight MTU-L", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cc1, "Dell Oasis 14 MTL-H/U", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cc2, "Dell Oasis 14 2-in-1 MTL-H/U", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cc3, "Dell Oasis 14 Low Weight MTL-U", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cc4, "Dell Oasis 16 MTL-H/U", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cbd, "Dell Oasis 13 CS MTL-U", ALC289_FIXUP_DELL_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cbe, "Dell Oasis 13 2-IN-1 MTL-U", ALC289_FIXUP_DELL_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cbf, "Dell Oasis 13 Low Weight MTU-L", ALC289_FIXUP_DELL_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cc0, "Dell Oasis 13", ALC289_FIXUP_RTK_AMP_DUAL_SPK),

	SND_PCI_QUIRK(0x1028, 0x0cc1, "Dell Oasis 14 MTL-H/U", ALC289_FIXUP_DELL_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cc2, "Dell Oasis 14 2-in-1 MTL-H/U", ALC289_FIXUP_DELL_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cc3, "Dell Oasis 14 Low Weight MTL-U", ALC289_FIXUP_DELL_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cc4, "Dell Oasis 16 MTL-H/U", ALC289_FIXUP_DELL_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1028, 0x0cc5, "Dell Oasis 14", ALC289_FIXUP_RTK_AMP_DUAL_SPK),

	SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),
@@ -9913,6 +9944,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x19e1, "ASUS UX581LV", ALC295_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW),

	SND_PCI_QUIRK(0x1043, 0x1a30, "ASUS X705UD", ALC256_FIXUP_ASUS_MIC),

	SND_PCI_QUIRK(0x1043, 0x1a83, "ASUS UM5302LA", ALC294_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1043, 0x1a8f, "ASUS UX582ZS", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x1b11, "ASUS UX431DA", ALC294_FIXUP_ASUS_COEF_1B),

	SND_PCI_QUIRK(0x1043, 0x1b13, "Asus U41SV", ALC269_FIXUP_INV_DMIC),
@@ -9929,6 +9961,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x1d4e, "ASUS TM420", ALC256_FIXUP_ASUS_HPE),

	SND_PCI_QUIRK(0x1043, 0x1e02, "ASUS UX3402ZA", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x16a3, "ASUS UX3402VA", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x1f62, "ASUS UX7602ZM", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x1e11, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA502),

	SND_PCI_QUIRK(0x1043, 0x1e12, "ASUS UM3402", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1043, 0x1e51, "ASUS Zephyrus M15", ALC294_FIXUP_ASUS_GU502_PINS),

sound/soc/amd/acp/acp-i2s.c

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 


#define DRV_NAME "acp_i2s_playcap"

#define	I2S_MASTER_MODE_ENABLE		1

#define	I2S_MODE_ENABLE			0

#define	LRCLK_DIV_FIELD			GENMASK(10, 2)

#define	BCLK_DIV_FIELD			GENMASK(23, 11)

#define	ACP63_LRCLK_DIV_FIELD		GENMASK(12, 2)
@@ -56,7 +55,8 @@ static inline void acp_set_i2s_clk(struct acp_dev_data *adata, int dai_id) 
	}



	val  = I2S_MASTER_MODE_ENABLE;

	val |= I2S_MODE_ENABLE & BIT(1);

	if (adata->tdm_mode)

		val |= BIT(1);



	switch (chip->acp_rev) {

	case ACP63_DEV: