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

Merge branch 'for-linus' into for-next 



Pull 6.11 devel branch for applying further updates for Cirrus codecs

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 5e1c5c5a 4178d78c

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -18525,7 +18525,6 @@ F: drivers/crypto/intel/qat/ 








QCOM AUDIO (ASoC) DRIVERS









M:	Srinivas Kandagatla <srinivas.kandagatla@linaro.org>









M:	Banajit Goswami <bgoswami@quicinc.com>









L:	alsa-devel@alsa-project.org (moderated for non-subscribers)









L:	linux-arm-msm@vger.kernel.org









S:	Supported

























sound/pci/hda/cs35l56_hda.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -1003,7 +1003,7 @@ int cs35l56_hda_common_probe(struct cs35l56_hda *cs35l56, int hid, int id)







		goto err;









	}



















	cs35l56->base.cal_index = cs35l56->index;









	cs35l56->base.cal_index = -1;



















	cs35l56_init_cs_dsp(&cs35l56->base, &cs35l56->cs_dsp);









	cs35l56->cs_dsp.client_ops = &cs35l56_hda_client_ops;
































sound/pci/hda/hda_component.c



+3
−2






























Original line number
Diff line number
Diff line







@@ -141,8 +141,7 @@ int hda_component_manager_bind(struct hda_codec *cdc,







	int ret;



















	/* Init shared and component specific data */









	memset(parent, 0, sizeof(*parent));









	mutex_init(&parent->mutex);









	memset(parent->comps, 0, sizeof(parent->comps));









	parent->codec = cdc;



















	mutex_lock(&parent->mutex);








@@ -164,6 +163,8 @@ int hda_component_manager_init(struct hda_codec *cdc,







	struct hda_scodec_match *sm;









	int ret, i;



















	mutex_init(&parent->mutex);



















	for (i = 0; i < count; i++) {









		sm = devm_kmalloc(dev, sizeof(*sm), GFP_KERNEL);









		if (!sm)
































sound/pci/hda/patch_conexant.c



+11
−0






























Original line number
Diff line number
Diff line







@@ -307,6 +307,7 @@ enum {







	CXT_FIXUP_HEADSET_MIC,









	CXT_FIXUP_HP_MIC_NO_PRESENCE,









	CXT_PINCFG_SWS_JS201D,









	CXT_PINCFG_TOP_SPEAKER,









};



















/* for hda_fixup_thinkpad_acpi() */








@@ -974,6 +975,13 @@ static const struct hda_fixup cxt_fixups[] = {







		.type = HDA_FIXUP_PINS,









		.v.pins = cxt_pincfg_sws_js201d,









	},









	[CXT_PINCFG_TOP_SPEAKER] = {









		.type = HDA_FIXUP_PINS,









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









			{ 0x1d, 0x82170111 },









			{ }









		},









	},









};



















static const struct snd_pci_quirk cxt5045_fixups[] = {








@@ -1070,6 +1078,8 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {







	SND_PCI_QUIRK_VENDOR(0x17aa, "Thinkpad", CXT_FIXUP_THINKPAD_ACPI),









	SND_PCI_QUIRK(0x1c06, 0x2011, "Lemote A1004", CXT_PINCFG_LEMOTE_A1004),









	SND_PCI_QUIRK(0x1c06, 0x2012, "Lemote A1205", CXT_PINCFG_LEMOTE_A1205),









	SND_PCI_QUIRK(0x2782, 0x12c3, "Sirius Gen1", CXT_PINCFG_TOP_SPEAKER),









	SND_PCI_QUIRK(0x2782, 0x12c5, "Sirius Gen2", CXT_PINCFG_TOP_SPEAKER),









	{}









};


















@@ -1089,6 +1099,7 @@ static const struct hda_model_fixup cxt5066_fixup_models[] = {







	{ .id = CXT_FIXUP_HP_MIC_NO_PRESENCE, .name = "hp-mic-fix" },









	{ .id = CXT_PINCFG_LENOVO_NOTEBOOK, .name = "lenovo-20149" },









	{ .id = CXT_PINCFG_SWS_JS201D, .name = "sws-js201d" },









	{ .id = CXT_PINCFG_TOP_SPEAKER, .name = "sirius-top-speaker" },









	{}









};










































sound/pci/hda/patch_realtek.c



+53
−25






























Original line number
Diff line number
Diff line







@@ -4930,6 +4930,30 @@ static void alc269_fixup_hp_line1_mic1_led(struct hda_codec *codec,







	}









}



















static void alc_hp_mute_disable(struct hda_codec *codec, unsigned int delay)









{









	if (delay <= 0)









		delay = 75;









	snd_hda_codec_write(codec, 0x21, 0,









		    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);









	msleep(delay);









	snd_hda_codec_write(codec, 0x21, 0,









		    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);









	msleep(delay);









}



















static void alc_hp_enable_unmute(struct hda_codec *codec, unsigned int delay)









{









	if (delay <= 0)









		delay = 75;









	snd_hda_codec_write(codec, 0x21, 0,









		    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);









	msleep(delay);









	snd_hda_codec_write(codec, 0x21, 0,









		    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);









	msleep(delay);









}



















static const struct coef_fw alc225_pre_hsmode[] = {









	UPDATE_COEF(0x4a, 1<<8, 0),









	UPDATE_COEFEX(0x57, 0x05, 1<<14, 0),








@@ -5031,6 +5055,7 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec)







	case 0x10ec0236:









	case 0x10ec0256:









	case 0x19e58326:









		alc_hp_mute_disable(codec, 75);









		alc_process_coef_fw(codec, coef0256);









		break;









	case 0x10ec0234:








@@ -5065,6 +5090,7 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec)







	case 0x10ec0295:









	case 0x10ec0289:









	case 0x10ec0299:









		alc_hp_mute_disable(codec, 75);









		alc_process_coef_fw(codec, alc225_pre_hsmode);









		alc_process_coef_fw(codec, coef0225);









		break;








@@ -5290,6 +5316,7 @@ static void alc_headset_mode_default(struct hda_codec *codec)







	case 0x10ec0299:









		alc_process_coef_fw(codec, alc225_pre_hsmode);









		alc_process_coef_fw(codec, coef0225);









		alc_hp_enable_unmute(codec, 75);









		break;









	case 0x10ec0255:









		alc_process_coef_fw(codec, coef0255);








@@ -5302,6 +5329,7 @@ static void alc_headset_mode_default(struct hda_codec *codec)







		alc_write_coef_idx(codec, 0x45, 0xc089);









		msleep(50);









		alc_process_coef_fw(codec, coef0256);









		alc_hp_enable_unmute(codec, 75);









		break;









	case 0x10ec0234:









	case 0x10ec0274:








@@ -5399,6 +5427,7 @@ static void alc_headset_mode_ctia(struct hda_codec *codec)







	case 0x10ec0256:









	case 0x19e58326:









		alc_process_coef_fw(codec, coef0256);









		alc_hp_enable_unmute(codec, 75);









		break;









	case 0x10ec0234:









	case 0x10ec0274:








@@ -5447,6 +5476,7 @@ static void alc_headset_mode_ctia(struct hda_codec *codec)







			alc_process_coef_fw(codec, coef0225_2);









		else









			alc_process_coef_fw(codec, coef0225_1);









		alc_hp_enable_unmute(codec, 75);









		break;









	case 0x10ec0867:









		alc_update_coefex_idx(codec, 0x57, 0x5, 1<<14, 0);








@@ -5514,6 +5544,7 @@ static void alc_headset_mode_omtp(struct hda_codec *codec)







	case 0x10ec0256:









	case 0x19e58326:









		alc_process_coef_fw(codec, coef0256);









		alc_hp_enable_unmute(codec, 75);









		break;









	case 0x10ec0234:









	case 0x10ec0274:








@@ -5551,6 +5582,7 @@ static void alc_headset_mode_omtp(struct hda_codec *codec)







	case 0x10ec0289:









	case 0x10ec0299:









		alc_process_coef_fw(codec, coef0225);









		alc_hp_enable_unmute(codec, 75);









		break;









	}









	codec_dbg(codec, "Headset jack set to Nokia-style headset mode.\n");








@@ -5619,25 +5651,21 @@ static void alc_determine_headset_type(struct hda_codec *codec)







		alc_write_coef_idx(codec, 0x06, 0x6104);









		alc_write_coefex_idx(codec, 0x57, 0x3, 0x09a3);



















		snd_hda_codec_write(codec, 0x21, 0,









			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);









		msleep(80);









		snd_hda_codec_write(codec, 0x21, 0,









			    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);



















		alc_process_coef_fw(codec, coef0255);









		msleep(300);









		val = alc_read_coef_idx(codec, 0x46);









		is_ctia = (val & 0x0070) == 0x0070;



















		if (!is_ctia) {









			alc_write_coef_idx(codec, 0x45, 0xe089);









			msleep(100);









			val = alc_read_coef_idx(codec, 0x46);









			if ((val & 0x0070) == 0x0070)









				is_ctia = false;









			else









				is_ctia = true;









		}









		alc_write_coefex_idx(codec, 0x57, 0x3, 0x0da3);









		alc_update_coefex_idx(codec, 0x57, 0x5, 1<<14, 0);



















		snd_hda_codec_write(codec, 0x21, 0,









			    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);









		msleep(80);









		snd_hda_codec_write(codec, 0x21, 0,









			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);









		break;









	case 0x10ec0234:









	case 0x10ec0274:








@@ -5714,12 +5742,6 @@ static void alc_determine_headset_type(struct hda_codec *codec)







	case 0x10ec0295:









	case 0x10ec0289:









	case 0x10ec0299:









		snd_hda_codec_write(codec, 0x21, 0,









			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);









		msleep(80);









		snd_hda_codec_write(codec, 0x21, 0,









			    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);



















		alc_process_coef_fw(codec, alc225_pre_hsmode);









		alc_update_coef_idx(codec, 0x67, 0xf000, 0x1000);









		val = alc_read_coef_idx(codec, 0x45);








@@ -5736,15 +5758,19 @@ static void alc_determine_headset_type(struct hda_codec *codec)







			val = alc_read_coef_idx(codec, 0x46);









			is_ctia = (val & 0x00f0) == 0x00f0;









		}









		if (!is_ctia) {









			alc_update_coef_idx(codec, 0x45, 0x3f<<10, 0x38<<10);









			alc_update_coef_idx(codec, 0x49, 3<<8, 1<<8);









			msleep(100);









			val = alc_read_coef_idx(codec, 0x46);









			if ((val & 0x00f0) == 0x00f0)









				is_ctia = false;









			else









				is_ctia = true;









		}









		alc_update_coef_idx(codec, 0x4a, 7<<6, 7<<6);









		alc_update_coef_idx(codec, 0x4a, 3<<4, 3<<4);









		alc_update_coef_idx(codec, 0x67, 0xf000, 0x3000);



















		snd_hda_codec_write(codec, 0x21, 0,









			    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);









		msleep(80);









		snd_hda_codec_write(codec, 0x21, 0,









			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);









		break;









	case 0x10ec0867:









		is_ctia = true;








@@ -10326,6 +10352,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {







	SND_PCI_QUIRK(0x103c, 0x8ca2, "HP ZBook Power", ALC236_FIXUP_HP_GPIO_LED),









	SND_PCI_QUIRK(0x103c, 0x8ca4, "HP ZBook Fury", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),









	SND_PCI_QUIRK(0x103c, 0x8ca7, "HP ZBook Fury", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),









	SND_PCI_QUIRK(0x103c, 0x8cbd, "HP Pavilion Aero Laptop 13-bg0xxx", ALC245_FIXUP_HP_X360_MUTE_LEDS),









	SND_PCI_QUIRK(0x103c, 0x8cdd, "HP Spectre", ALC287_FIXUP_CS35L41_I2C_2),









	SND_PCI_QUIRK(0x103c, 0x8cde, "HP Spectre", ALC287_FIXUP_CS35L41_I2C_2),









	SND_PCI_QUIRK(0x103c, 0x8cdf, "HP SnowWhite", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),








@@ -10487,6 +10514,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {







	SND_PCI_QUIRK(0x144d, 0xca03, "Samsung Galaxy Book2 Pro 360 (NP930QED)", ALC298_FIXUP_SAMSUNG_AMP),









	SND_PCI_QUIRK(0x144d, 0xc868, "Samsung Galaxy Book2 Pro (NP930XED)", ALC298_FIXUP_SAMSUNG_AMP),









	SND_PCI_QUIRK(0x144d, 0xc1ca, "Samsung Galaxy Book3 Pro 360 (NP960QFG-KB1US)", ALC298_FIXUP_SAMSUNG_AMP2),









	SND_PCI_QUIRK(0x144d, 0xc1cc, "Samsung Galaxy Book3 Ultra (NT960XFH-XD92G))", ALC298_FIXUP_SAMSUNG_AMP2),









	SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_HEADSET_MIC),









	SND_PCI_QUIRK(0x1462, 0xb120, "MSI Cubi MS-B120", ALC283_FIXUP_HEADSET_MIC),









	SND_PCI_QUIRK(0x1462, 0xb171, "Cubi N 8GL (MS-B171)", ALC283_FIXUP_HEADSET_MIC),