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

Merge branch 'for-linus' into for-next 



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

sound/pci/hda/hda_generic.c

+8 −4
Original line number Diff line number Diff line
@@ -1364,16 +1364,20 @@ static int try_assign_dacs(struct hda_codec *codec, int num_outs, 
		struct nid_path *path;

		hda_nid_t pin = pins[i];



		if (!spec->obey_preferred_dacs) {

			path = snd_hda_get_path_from_idx(codec, path_idx[i]);

			if (path) {

				badness += assign_out_path_ctls(codec, path);

				continue;

			}

		}



		dacs[i] = get_preferred_dac(codec, pin);

		if (dacs[i]) {

			if (is_dac_already_used(codec, dacs[i]))

				badness += bad->shared_primary;

		} else if (spec->obey_preferred_dacs) {

			badness += BAD_NO_PRIMARY_DAC;

		}



		if (!dacs[i])

sound/pci/hda/hda_generic.h

+1 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ struct hda_gen_spec { 
	unsigned int power_down_unused:1; /* power down unused widgets */

	unsigned int dac_min_mute:1; /* minimal = mute for DACs */

	unsigned int suppress_vmaster:1; /* don't create vmaster kctls */

	unsigned int obey_preferred_dacs:1; /* obey preferred_dacs assignment */



	/* other internal flags */

	unsigned int no_analog:1; /* digital I/O only */

sound/pci/hda/patch_realtek.c

+79 −6
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ struct alc_spec { 
	unsigned int no_shutup_pins:1;

	unsigned int ultra_low_power:1;

	unsigned int has_hs_key:1;

	unsigned int no_internal_mic_pin:1;



	/* for PLL fix */

	hda_nid_t pll_nid;
@@ -445,6 +446,7 @@ static void alc_fill_eapd_coef(struct hda_codec *codec) 
			alc_update_coef_idx(codec, 0x7, 1<<5, 0);

		break;

	case 0x10ec0892:

	case 0x10ec0897:

		alc_update_coef_idx(codec, 0x7, 1<<5, 0);

		break;

	case 0x10ec0899:
@@ -3102,6 +3104,7 @@ static void alc_disable_headset_jack_key(struct hda_codec *codec) 
	case 0x10ec0215:

	case 0x10ec0225:

	case 0x10ec0285:

	case 0x10ec0287:

	case 0x10ec0295:

	case 0x10ec0289:

	case 0x10ec0299:
@@ -3128,6 +3131,7 @@ static void alc_enable_headset_jack_key(struct hda_codec *codec) 
	case 0x10ec0215:

	case 0x10ec0225:

	case 0x10ec0285:

	case 0x10ec0287:

	case 0x10ec0295:

	case 0x10ec0289:

	case 0x10ec0299:
@@ -4523,6 +4527,7 @@ static const struct coef_fw alc225_pre_hsmode[] = { 


static void alc_headset_mode_unplugged(struct hda_codec *codec)

{

	struct alc_spec *spec = codec->spec;

	static const struct coef_fw coef0255[] = {

		WRITE_COEF(0x1b, 0x0c0b), /* LDO and MISC control */

		WRITE_COEF(0x45, 0xd089), /* UAJ function set to menual mode */
@@ -4597,6 +4602,11 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) 
		{}

	};



	if (spec->no_internal_mic_pin) {

		alc_update_coef_idx(codec, 0x45, 0xf<<12 | 1<<10, 5<<12);

		return;

	}



	switch (codec->core.vendor_id) {

	case 0x10ec0255:

		alc_process_coef_fw(codec, coef0255);
@@ -5163,6 +5173,11 @@ static void alc_determine_headset_type(struct hda_codec *codec) 
		{}

	};



	if (spec->no_internal_mic_pin) {

		alc_update_coef_idx(codec, 0x45, 0xf<<12 | 1<<10, 5<<12);

		return;

	}



	switch (codec->core.vendor_id) {

	case 0x10ec0255:

		alc_process_coef_fw(codec, coef0255);
@@ -6014,6 +6029,21 @@ static void alc274_fixup_bind_dacs(struct hda_codec *codec, 
	codec->power_save_node = 0;

}



/* avoid DAC 0x06 for bass speaker 0x17; it has no volume control */

static void alc289_fixup_asus_ga401(struct hda_codec *codec,

				    const struct hda_fixup *fix, int action)

{

	static const hda_nid_t preferred_pairs[] = {

		0x14, 0x02, 0x17, 0x02, 0x21, 0x03, 0

	};

	struct alc_spec *spec = codec->spec;



	if (action == HDA_FIXUP_ACT_PRE_PROBE) {

		spec->gen.preferred_dacs = preferred_pairs;

		spec->gen.obey_preferred_dacs = 1;

	}

}



/* The DAC of NID 0x3 will introduce click/pop noise on headphones, so invalidate it */

static void alc285_fixup_invalidate_dacs(struct hda_codec *codec,

			      const struct hda_fixup *fix, int action)
@@ -6121,6 +6151,23 @@ static void alc274_fixup_hp_headset_mic(struct hda_codec *codec, 
	}

}



static void alc_fixup_no_int_mic(struct hda_codec *codec,

				    const struct hda_fixup *fix, int action)

{

	struct alc_spec *spec = codec->spec;



	switch (action) {

	case HDA_FIXUP_ACT_PRE_PROBE:

		/* Mic RING SLEEVE swap for combo jack */

		alc_update_coef_idx(codec, 0x45, 0xf<<12 | 1<<10, 5<<12);

		spec->no_internal_mic_pin = true;

		break;

	case HDA_FIXUP_ACT_INIT:

		alc_combo_jack_hp_jd_restart(codec);

		break;

	}

}



/* for hda_fixup_thinkpad_acpi() */

#include "thinkpad_helper.c"
@@ -6320,6 +6367,7 @@ enum { 
	ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK,

	ALC287_FIXUP_HP_GPIO_LED,

	ALC256_FIXUP_HP_HEADSET_MIC,

	ALC236_FIXUP_DELL_AIO_HEADSET_MIC,

};



static const struct hda_fixup alc269_fixups[] = {
@@ -7569,11 +7617,10 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chain_id = ALC269_FIXUP_HEADSET_MIC

	},

	[ALC289_FIXUP_ASUS_GA401] = {

		.type = HDA_FIXUP_PINS,

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

			{ 0x19, 0x03a11020 }, /* headset mic with jack detect */

			{ }

		},

		.type = HDA_FIXUP_FUNC,

		.v.func = alc289_fixup_asus_ga401,

		.chained = true,

		.chain_id = ALC289_FIXUP_ASUS_GA502,

	},

	[ALC289_FIXUP_ASUS_GA502] = {

		.type = HDA_FIXUP_PINS,
@@ -7697,7 +7744,7 @@ static const struct hda_fixup alc269_fixups[] = { 
			{ }

		},

		.chained = true,

		.chain_id = ALC289_FIXUP_ASUS_GA401

		.chain_id = ALC289_FIXUP_ASUS_GA502

	},

	[ALC274_FIXUP_HP_MIC] = {

		.type = HDA_FIXUP_VERBS,
@@ -7738,6 +7785,12 @@ static const struct hda_fixup alc269_fixups[] = { 
		.type = HDA_FIXUP_FUNC,

		.v.func = alc274_fixup_hp_headset_mic,

	},

	[ALC236_FIXUP_DELL_AIO_HEADSET_MIC] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc_fixup_no_int_mic,

		.chained = true,

		.chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE

	},

};



static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -7815,6 +7868,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x097d, "Dell Precision", ALC289_FIXUP_DUAL_SPK),

	SND_PCI_QUIRK(0x1028, 0x098d, "Dell Precision", ALC233_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x09bf, "Dell Precision", ALC233_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0a2e, "Dell", ALC236_FIXUP_DELL_AIO_HEADSET_MIC),

	SND_PCI_QUIRK(0x1028, 0x0a30, "Dell", ALC236_FIXUP_DELL_AIO_HEADSET_MIC),

	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),
@@ -7881,6 +7936,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x820d, "HP Pavilion 15", ALC269_FIXUP_HP_MUTE_LED_MIC3),

	SND_PCI_QUIRK(0x103c, 0x8256, "HP", ALC221_FIXUP_HP_FRONT_MIC),

	SND_PCI_QUIRK(0x103c, 0x827e, "HP x360", ALC295_FIXUP_HP_X360),

	SND_PCI_QUIRK(0x103c, 0x827f, "HP x360", ALC269_FIXUP_HP_MUTE_LED_MIC3),

	SND_PCI_QUIRK(0x103c, 0x82bf, "HP G3 mini", ALC221_FIXUP_HP_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x103c, 0x82c0, "HP G3 mini premium", ALC221_FIXUP_HP_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x103c, 0x83b9, "HP Spectre x360", ALC269_FIXUP_HP_MUTE_LED_MIC3),
@@ -7902,6 +7958,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x10d0, "ASUS X540LA/X540LJ", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x115d, "Asus 1015E", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x1043, 0x11c0, "ASUS X556UR", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1271, "ASUS X430UN", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1290, "ASUS X441SA", ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x12a0, "ASUS X441UV", ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x12f0, "ASUS X541UV", ALC256_FIXUP_ASUS_MIC),
@@ -7922,6 +7979,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x1b13, "Asus U41SV", ALC269_FIXUP_INV_DMIC),

	SND_PCI_QUIRK(0x1043, 0x1bbd, "ASUS Z550MA", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1c23, "Asus X55U", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x1043, 0x125e, "ASUS Q524UQK", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1ccd, "ASUS X555UB", ALC256_FIXUP_ASUS_MIC),

	SND_PCI_QUIRK(0x1043, 0x1d4e, "ASUS TM420", ALC256_FIXUP_ASUS_HPE),

	SND_PCI_QUIRK(0x1043, 0x1e11, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA502),
@@ -8353,6 +8411,8 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { 
		{0x19, 0x02a11020},

		{0x1a, 0x02a11030},

		{0x21, 0x0221101f}),

	SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC236_FIXUP_DELL_AIO_HEADSET_MIC,

		{0x21, 0x02211010}),

	SND_HDA_PIN_QUIRK(0x10ec0236, 0x103c, "HP", ALC256_FIXUP_HP_HEADSET_MIC,

		{0x14, 0x90170110},

		{0x19, 0x02a11020},
@@ -8517,11 +8577,20 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { 
		{0x12, 0x90a60130},

		{0x19, 0x03a11020},

		{0x21, 0x0321101f}),

	SND_HDA_PIN_QUIRK(0x10ec0285, 0x17aa, "Lenovo", ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK,

		{0x14, 0x90170110},

		{0x19, 0x04a11040},

		{0x21, 0x04211020}),

	SND_HDA_PIN_QUIRK(0x10ec0285, 0x17aa, "Lenovo", ALC285_FIXUP_LENOVO_PC_BEEP_IN_NOISE,

		{0x12, 0x90a60130},

		{0x14, 0x90170110},

		{0x19, 0x04a11040},

		{0x21, 0x04211020}),

	SND_HDA_PIN_QUIRK(0x10ec0287, 0x17aa, "Lenovo", ALC285_FIXUP_THINKPAD_HEADSET_JACK,

		{0x14, 0x90170110},

		{0x17, 0x90170111},

		{0x19, 0x03a11030},

		{0x21, 0x03211020}),

	SND_HDA_PIN_QUIRK(0x10ec0286, 0x1025, "Acer", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE,

		{0x12, 0x90a60130},

		{0x17, 0x90170110},
@@ -8585,6 +8654,9 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { 
	SND_HDA_PIN_QUIRK(0x10ec0293, 0x1028, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE,

		ALC292_STANDARD_PINS,

		{0x13, 0x90a60140}),

	SND_HDA_PIN_QUIRK(0x10ec0294, 0x1043, "ASUS", ALC294_FIXUP_ASUS_HPE,

		{0x17, 0x90170110},

		{0x21, 0x04211020}),

	SND_HDA_PIN_QUIRK(0x10ec0294, 0x1043, "ASUS", ALC294_FIXUP_ASUS_MIC,

		{0x14, 0x90170110},

		{0x1b, 0x90a70130},
@@ -10171,6 +10243,7 @@ static const struct hda_device_id snd_hda_id_realtek[] = { 
	HDA_CODEC_ENTRY(0x10ec0888, "ALC888", patch_alc882),

	HDA_CODEC_ENTRY(0x10ec0889, "ALC889", patch_alc882),

	HDA_CODEC_ENTRY(0x10ec0892, "ALC892", patch_alc662),

	HDA_CODEC_ENTRY(0x10ec0897, "ALC897", patch_alc662),

	HDA_CODEC_ENTRY(0x10ec0899, "ALC898", patch_alc882),

	HDA_CODEC_ENTRY(0x10ec0900, "ALC1150", patch_alc882),

	HDA_CODEC_ENTRY(0x10ec0b00, "ALCS1200A", patch_alc882),

sound/soc/codecs/rt5682.c

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ static const struct reg_sequence patch_list[] = { 
	{RT5682_DAC_ADC_DIG_VOL1, 0xa020},

	{RT5682_I2C_CTRL, 0x000f},

	{RT5682_PLL2_INTERNAL, 0x8266},

	{RT5682_SAR_IL_CMD_3, 0x8365},

};



void rt5682_apply_patch_list(struct rt5682_priv *rt5682, struct device *dev)

sound/soc/codecs/wm_adsp.c

+1 −0
Original line number Diff line number Diff line
@@ -1937,6 +1937,7 @@ static int wm_adsp_load(struct wm_adsp *dsp) 
			mem = wm_adsp_find_region(dsp, type);

			if (!mem) {

				adsp_err(dsp, "No region of type: %x\n", type);

				ret = -EINVAL;

				goto out_fw;

			}