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

Merge branch 'for-linus' into for-next 



Pull 6.10-rc devel branch for applying more Cirrus codec changes.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 19765dbe 70794b95

sound/hda/intel-dsp-config.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
static int dsp_driver;



module_param(dsp_driver, int, 0444);

MODULE_PARM_DESC(dsp_driver, "Force the DSP driver for Intel DSP (0=auto, 1=legacy, 2=SST, 3=SOF)");

MODULE_PARM_DESC(dsp_driver, "Force the DSP driver for Intel DSP (0=auto, 1=legacy, 2=SST, 3=SOF, 4=AVS)");



#define FLAG_SST			BIT(0)

#define FLAG_SOF			BIT(1)

sound/oss/dmasound/dmasound_core.c

+1 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ module_param(numWriteBufs, int, 0); 
static unsigned int writeBufSize = DEFAULT_BUFF_SIZE ;	/* in bytes */

module_param(writeBufSize, int, 0);



MODULE_DESCRIPTION("Atari/Amiga/Q40 core DMA sound driver");

MODULE_LICENSE("GPL");



static int sq_unit = -1;

sound/pci/hda/cs35l41_hda.c

+2 −2
Original line number Diff line number Diff line
@@ -2019,6 +2019,8 @@ void cs35l41_hda_remove(struct device *dev) 
{

	struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);



	component_del(cs35l41->dev, &cs35l41_hda_comp_ops);



	pm_runtime_get_sync(cs35l41->dev);

	pm_runtime_dont_use_autosuspend(cs35l41->dev);

	pm_runtime_disable(cs35l41->dev);
@@ -2026,8 +2028,6 @@ void cs35l41_hda_remove(struct device *dev) 
	if (cs35l41->halo_initialized)

		cs35l41_remove_dsp(cs35l41);



	component_del(cs35l41->dev, &cs35l41_hda_comp_ops);



	acpi_dev_put(cs35l41->dacpi);



	pm_runtime_put_noidle(cs35l41->dev);

sound/pci/hda/cs35l56_hda.c

+2 −2
Original line number Diff line number Diff line
@@ -1077,12 +1077,12 @@ void cs35l56_hda_remove(struct device *dev) 
{

	struct cs35l56_hda *cs35l56 = dev_get_drvdata(dev);



	component_del(cs35l56->base.dev, &cs35l56_hda_comp_ops);



	pm_runtime_dont_use_autosuspend(cs35l56->base.dev);

	pm_runtime_get_sync(cs35l56->base.dev);

	pm_runtime_disable(cs35l56->base.dev);



	component_del(cs35l56->base.dev, &cs35l56_hda_comp_ops);



	cs_dsp_remove(&cs35l56->cs_dsp);



	kfree(cs35l56->system_name);

sound/pci/hda/patch_realtek.c

+26 −2
Original line number Diff line number Diff line
@@ -583,10 +583,14 @@ static void alc_shutup_pins(struct hda_codec *codec) 
	switch (codec->core.vendor_id) {

	case 0x10ec0236:

	case 0x10ec0256:

	case 0x10ec0257:

	case 0x19e58326:

	case 0x10ec0283:

	case 0x10ec0285:

	case 0x10ec0286:

	case 0x10ec0287:

	case 0x10ec0288:

	case 0x10ec0295:

	case 0x10ec0298:

		alc_headset_mic_no_shutup(codec);

		break;
@@ -7520,6 +7524,7 @@ enum { 
	ALC285_FIXUP_ASUS_GU605_SPI_SPEAKER2_TO_DAC1,

	ALC287_FIXUP_LENOVO_THKPAD_WH_ALC1318,

	ALC256_FIXUP_CHROME_BOOK,

	ALC287_FIXUP_LENOVO_14ARP8_LEGION_IAH7,

};



/* A special fixup for Lenovo C940 and Yoga Duet 7;
@@ -7559,6 +7564,21 @@ static void alc287_fixup_lenovo_14irp8_duetitl(struct hda_codec *codec, 
	__snd_hda_apply_fixup(codec, id, action, 0);

}



/* Similar to above the Lenovo Yoga Pro 7 14ARP8 PCI SSID matches the codec SSID of the

   Legion Y9000X 2022 IAH7.*/

static void alc287_fixup_lenovo_14arp8_legion_iah7(struct hda_codec *codec,

					   const struct hda_fixup *fix,

					   int action)

{

	int id;



	if (codec->core.subsystem_id == 0x17aa386e)

		id = ALC287_FIXUP_CS35L41_I2C_2; /* Legion Y9000X 2022 IAH7 */

	else

		id = ALC285_FIXUP_SPEAKER2_TO_DAC1; /* Yoga Pro 7 14ARP8 */

	__snd_hda_apply_fixup(codec, id, action, 0);

}



/* Another hilarious PCI SSID conflict with Lenovo Legion Pro 7 16ARX8H (with

 * TAS2781 codec) and Legion 7i 16IAX7 (with CS35L41 codec);

 * we apply a corresponding fixup depending on the codec SSID instead
@@ -9658,6 +9678,10 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK,

	},

	[ALC287_FIXUP_LENOVO_14ARP8_LEGION_IAH7] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc287_fixup_lenovo_14arp8_legion_iah7,

	},

	[ALC287_FIXUP_YOGA9_14IMH9_BASS_SPK_PIN] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc287_fixup_yoga9_14iap7_bass_spk_pin,
@@ -10506,7 +10530,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x3813, "Legion 7i 15IMHG05", ALC287_FIXUP_LEGION_15IMHG05_SPEAKERS),

	SND_PCI_QUIRK(0x17aa, 0x3818, "Lenovo C940 / Yoga Duet 7", ALC298_FIXUP_LENOVO_C940_DUET7),

	SND_PCI_QUIRK(0x17aa, 0x3819, "Lenovo 13s Gen2 ITL", ALC287_FIXUP_13S_GEN2_SPEAKERS),

	SND_PCI_QUIRK(0x17aa, 0x3820, "Yoga Duet 7 13ITL6", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS),

	SND_PCI_QUIRK(0x17aa, 0x3820, "IdeaPad 330-17IKB 81DM", ALC269_FIXUP_ASPIRE_HEADSET_MIC),

	SND_PCI_QUIRK(0x17aa, 0x3824, "Legion Y9000X 2020", ALC285_FIXUP_LEGION_Y9000X_SPEAKERS),

	SND_PCI_QUIRK(0x17aa, 0x3827, "Ideapad S740", ALC285_FIXUP_IDEAPAD_S740_COEF),

	SND_PCI_QUIRK(0x17aa, 0x3834, "Lenovo IdeaPad Slim 9i 14ITL5", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS),
@@ -10520,7 +10544,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x3865, "Lenovo 13X", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x17aa, 0x3866, "Lenovo 13X", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x17aa, 0x3869, "Lenovo Yoga7 14IAL7", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),

	SND_PCI_QUIRK(0x17aa, 0x386e, "Legion Y9000X 2022 IAH7", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x17aa, 0x386e, "Legion Y9000X 2022 IAH7 / Yoga Pro 7 14ARP8",  ALC287_FIXUP_LENOVO_14ARP8_LEGION_IAH7),

	SND_PCI_QUIRK(0x17aa, 0x386f, "Legion Pro 7/7i", ALC287_FIXUP_LENOVO_LEGION_7),

	SND_PCI_QUIRK(0x17aa, 0x3870, "Lenovo Yoga 7 14ARB7", ALC287_FIXUP_YOGA7_14ARB7_I2C),

	SND_PCI_QUIRK(0x17aa, 0x3877, "Lenovo Legion 7 Slim 16ARHA7", ALC287_FIXUP_CS35L41_I2C_2),