Commit 8f7ac50c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-5.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "A collection of fixes; almost all changes are device-specific small
  fixes over ASoC, HD-audio and USB-audio. No sign of serious breakage,
  so far"

* tag 'sound-5.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (23 commits)
  ALSA: hda/realtek: Add quirk for HP Dev One
  ALSA: hda/realtek - Add HW8326 support
  ALSA: hda/conexant - Fix loopback issue with CX20632
  ALSA: hda: MTL: add HD Audio PCI ID and HDMI codec vendor ID
  ALSA: usb-audio: Set up (implicit) sync for Saffire 6
  ALSA: usb-audio: Skip generic sync EP parse for secondary EP
  ASoC: wm_adsp: Fix event generation for wm_adsp_fw_put()
  ASoC: es8328: Fix event generation for deemphasis control
  ASoC: wm8962: Fix suspend while playing music
  ASoC: SOF: ipc-msg-injector: Fix reversed if statement
  ASoC: SOF: ipc-msg-injector: Propagate write errors correctly
  ASoC: fsl_sai: Add support for i.MX8MN
  ASoC: SOF: Fix potential NULL pointer dereference
  ALSA: hda/realtek: Fix for quirk to enable speaker output on the Lenovo Yoga DuetITL 2021
  ASoC: cs42l51: Correct minimum value for SX volume control
  ASoC: cs42l56: Correct typo in minimum level for SX volume controls
  ASoC: cs42l52: Correct TLV for Bypass Volume
  ASoC: cs53l30: Correct number of volume levels on SX controls
  ASoC: cs35l36: Update digital volume TLV
  ASoC: cs42l52: Fix TLV scales for mixer controls
  ...
parents 8dd77d44 5f3d696e

sound/hda/hdac_device.c

+1 −0
Original line number Diff line number Diff line
@@ -660,6 +660,7 @@ static const struct hda_vendor_id hda_vendor_ids[] = { 
	{ 0x14f1, "Conexant" },

	{ 0x17e8, "Chrontel" },

	{ 0x1854, "LG" },

	{ 0x19e5, "Huawei" },

	{ 0x1aec, "Wolfson Microelectronics" },

	{ 0x1af4, "QEMU" },

	{ 0x434d, "C-Media" },

sound/pci/hda/hda_intel.c

+3 −0
Original line number Diff line number Diff line
@@ -2525,6 +2525,9 @@ static const struct pci_device_id azx_ids[] = { 
	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},

	{ PCI_DEVICE(0x8086, 0x51cf),

	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},

	/* Meteorlake-P */

	{ PCI_DEVICE(0x8086, 0x7e28),

	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},

	/* Broxton-P(Apollolake) */

	{ PCI_DEVICE(0x8086, 0x5a98),

	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },

sound/pci/hda/patch_conexant.c

+7 −0
Original line number Diff line number Diff line
@@ -1052,6 +1052,13 @@ static int patch_conexant_auto(struct hda_codec *codec) 
		snd_hda_pick_fixup(codec, cxt5051_fixup_models,

				   cxt5051_fixups, cxt_fixups);

		break;

	case 0x14f15098:

		codec->pin_amp_workaround = 1;

		spec->gen.mixer_nid = 0x22;

		spec->gen.add_stereo_mix_input = HDA_HINT_STEREO_MIX_AUTO;

		snd_hda_pick_fixup(codec, cxt5066_fixup_models,

				   cxt5066_fixups, cxt_fixups);

		break;

	case 0x14f150f2:

		codec->power_save_node = 1;

		fallthrough;

sound/pci/hda/patch_hdmi.c

+1 −0
Original line number Diff line number Diff line
@@ -4554,6 +4554,7 @@ HDA_CODEC_ENTRY(0x8086281a, "Jasperlake HDMI", patch_i915_icl_hdmi), 
HDA_CODEC_ENTRY(0x8086281b, "Elkhartlake HDMI",	patch_i915_icl_hdmi),

HDA_CODEC_ENTRY(0x8086281c, "Alderlake-P HDMI", patch_i915_adlp_hdmi),

HDA_CODEC_ENTRY(0x8086281f, "Raptorlake-P HDMI",	patch_i915_adlp_hdmi),

HDA_CODEC_ENTRY(0x8086281d, "Meteorlake HDMI",	patch_i915_adlp_hdmi),

HDA_CODEC_ENTRY(0x80862880, "CedarTrail HDMI",	patch_generic_hdmi),

HDA_CODEC_ENTRY(0x80862882, "Valleyview2 HDMI",	patch_i915_byt_hdmi),

HDA_CODEC_ENTRY(0x80862883, "Braswell HDMI",	patch_i915_byt_hdmi),

sound/pci/hda/patch_realtek.c

+16 −0
Original line number Diff line number Diff line
@@ -443,6 +443,7 @@ static void alc_fill_eapd_coef(struct hda_codec *codec) 
	case 0x10ec0245:

	case 0x10ec0255:

	case 0x10ec0256:

	case 0x19e58326:

	case 0x10ec0257:

	case 0x10ec0282:

	case 0x10ec0283:
@@ -580,6 +581,7 @@ static void alc_shutup_pins(struct hda_codec *codec) 
	switch (codec->core.vendor_id) {

	case 0x10ec0236:

	case 0x10ec0256:

	case 0x19e58326:

	case 0x10ec0283:

	case 0x10ec0286:

	case 0x10ec0288:
@@ -3247,6 +3249,7 @@ static void alc_disable_headset_jack_key(struct hda_codec *codec) 
	case 0x10ec0230:

	case 0x10ec0236:

	case 0x10ec0256:

	case 0x19e58326:

		alc_write_coef_idx(codec, 0x48, 0x0);

		alc_update_coef_idx(codec, 0x49, 0x0045, 0x0);

		break;
@@ -3275,6 +3278,7 @@ static void alc_enable_headset_jack_key(struct hda_codec *codec) 
	case 0x10ec0230:

	case 0x10ec0236:

	case 0x10ec0256:

	case 0x19e58326:

		alc_write_coef_idx(codec, 0x48, 0xd011);

		alc_update_coef_idx(codec, 0x49, 0x007f, 0x0045);

		break;
@@ -4910,6 +4914,7 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) 
	case 0x10ec0230:

	case 0x10ec0236:

	case 0x10ec0256:

	case 0x19e58326:

		alc_process_coef_fw(codec, coef0256);

		break;

	case 0x10ec0234:
@@ -5025,6 +5030,7 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin, 
	case 0x10ec0230:

	case 0x10ec0236:

	case 0x10ec0256:

	case 0x19e58326:

		alc_write_coef_idx(codec, 0x45, 0xc489);

		snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);

		alc_process_coef_fw(codec, coef0256);
@@ -5175,6 +5181,7 @@ static void alc_headset_mode_default(struct hda_codec *codec) 
	case 0x10ec0230:

	case 0x10ec0236:

	case 0x10ec0256:

	case 0x19e58326:

		alc_write_coef_idx(codec, 0x1b, 0x0e4b);

		alc_write_coef_idx(codec, 0x45, 0xc089);

		msleep(50);
@@ -5274,6 +5281,7 @@ static void alc_headset_mode_ctia(struct hda_codec *codec) 
	case 0x10ec0230:

	case 0x10ec0236:

	case 0x10ec0256:

	case 0x19e58326:

		alc_process_coef_fw(codec, coef0256);

		break;

	case 0x10ec0234:
@@ -5388,6 +5396,7 @@ static void alc_headset_mode_omtp(struct hda_codec *codec) 
	case 0x10ec0230:

	case 0x10ec0236:

	case 0x10ec0256:

	case 0x19e58326:

		alc_process_coef_fw(codec, coef0256);

		break;

	case 0x10ec0234:
@@ -5489,6 +5498,7 @@ static void alc_determine_headset_type(struct hda_codec *codec) 
	case 0x10ec0230:

	case 0x10ec0236:

	case 0x10ec0256:

	case 0x19e58326:

		alc_write_coef_idx(codec, 0x1b, 0x0e4b);

		alc_write_coef_idx(codec, 0x06, 0x6104);

		alc_write_coefex_idx(codec, 0x57, 0x3, 0x09a3);
@@ -5783,6 +5793,7 @@ static void alc255_set_default_jack_type(struct hda_codec *codec) 
	case 0x10ec0230:

	case 0x10ec0236:

	case 0x10ec0256:

	case 0x19e58326:

		alc_process_coef_fw(codec, alc256fw);

		break;

	}
@@ -6385,6 +6396,7 @@ static void alc_combo_jack_hp_jd_restart(struct hda_codec *codec) 
	case 0x10ec0236:

	case 0x10ec0255:

	case 0x10ec0256:

	case 0x19e58326:

		alc_update_coef_idx(codec, 0x1b, 0x8000, 1 << 15); /* Reset HP JD */

		alc_update_coef_idx(codec, 0x1b, 0x8000, 0 << 15);

		break;
@@ -9059,6 +9071,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x89c3, "Zbook Studio G9", ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x89c6, "Zbook Fury 17 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x89ca, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),

	SND_PCI_QUIRK(0x103c, 0x8a78, "HP Dev One", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),

	SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300),

	SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
@@ -9258,6 +9271,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x3176, "ThinkCentre Station", ALC283_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x17aa, 0x3178, "ThinkCentre Station", ALC283_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x17aa, 0x31af, "ThinkCentre Station", ALC623_FIXUP_LENOVO_THINKSTATION_P340),

	SND_PCI_QUIRK(0x17aa, 0x3802, "Lenovo Yoga DuetITL 2021", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS),

	SND_PCI_QUIRK(0x17aa, 0x3813, "Legion 7i 15IMHG05", ALC287_FIXUP_LEGION_15IMHG05_SPEAKERS),

	SND_PCI_QUIRK(0x17aa, 0x3818, "Lenovo C940", ALC298_FIXUP_LENOVO_SPK_VOLUME),

	SND_PCI_QUIRK(0x17aa, 0x3819, "Lenovo 13s Gen2 ITL", ALC287_FIXUP_13S_GEN2_SPEAKERS),
@@ -10095,6 +10109,7 @@ static int patch_alc269(struct hda_codec *codec) 
	case 0x10ec0230:

	case 0x10ec0236:

	case 0x10ec0256:

	case 0x19e58326:

		spec->codec_variant = ALC269_TYPE_ALC256;

		spec->shutup = alc256_shutup;

		spec->init_hook = alc256_init;
@@ -11545,6 +11560,7 @@ static const struct hda_device_id snd_hda_id_realtek[] = { 
	HDA_CODEC_ENTRY(0x10ec0b00, "ALCS1200A", patch_alc882),

	HDA_CODEC_ENTRY(0x10ec1168, "ALC1220", patch_alc882),

	HDA_CODEC_ENTRY(0x10ec1220, "ALC1220", patch_alc882),

	HDA_CODEC_ENTRY(0x19e58326, "HW8326", patch_alc269),

	{} /* terminator */

};

MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_realtek);