Commit 4a935059 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Includes a few usual updates for HD- and USB-audio and a trivial
  cleanup patch"

* tag 'sound-fix-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda: Fix crash due to jack poll in suspend
  ALSA: hda/cirrus - support for iMac 12,1 model
  ALSA: usb-audio: make read-only array marker static const
  ALSA: hda/realtek: Add a quirk for HP OMEN 15 (8786) mute LED
  ALSA: usb-audio: More comprehensive mixer map for ASUS ROG Zenith II
  ALSA: scarlett2: Add Focusrite Clarett+ 8Pre support
  ALSA: hda/conexant: Add quirk for LENOVO 20149 Notebook model
  ALSA: ice1712: remove redundant assignment to new
  ALSA: hda/realtek: Add quirk for another Asus K42JZ model
parents 7a53e17a 636aa880

sound/pci/hda/hda_codec.c

+9 −5
Original line number Diff line number Diff line
@@ -2940,7 +2940,6 @@ static int hda_codec_runtime_suspend(struct device *dev) 
	if (!codec->card)

		return 0;



	if (!codec->bus->jackpoll_in_suspend)

	cancel_delayed_work_sync(&codec->jackpoll_work);



	state = hda_call_codec_suspend(codec);
@@ -2949,6 +2948,11 @@ static int hda_codec_runtime_suspend(struct device *dev) 
	     (state & AC_PWRST_CLK_STOP_OK)))

		snd_hdac_codec_link_down(&codec->core);

	snd_hda_codec_display_power(codec, false);



	if (codec->bus->jackpoll_in_suspend &&

		(dev->power.power_state.event != PM_EVENT_SUSPEND))

		schedule_delayed_work(&codec->jackpoll_work,

					codec->jackpoll_interval);

	return 0;

}
@@ -2972,6 +2976,9 @@ static int hda_codec_runtime_resume(struct device *dev) 
#ifdef CONFIG_PM_SLEEP

static int hda_codec_pm_prepare(struct device *dev)

{

	struct hda_codec *codec = dev_to_hda_codec(dev);



	cancel_delayed_work_sync(&codec->jackpoll_work);

	dev->power.power_state = PMSG_SUSPEND;

	return pm_runtime_suspended(dev);

}
@@ -2991,9 +2998,6 @@ static void hda_codec_pm_complete(struct device *dev) 


static int hda_codec_pm_suspend(struct device *dev)

{

	struct hda_codec *codec = dev_to_hda_codec(dev);



	cancel_delayed_work_sync(&codec->jackpoll_work);

	dev->power.power_state = PMSG_SUSPEND;

	return pm_runtime_force_suspend(dev);

}

sound/pci/hda/patch_cirrus.c

+1 −0
Original line number Diff line number Diff line
@@ -395,6 +395,7 @@ static const struct snd_pci_quirk cs420x_fixup_tbl[] = { 


	/* codec SSID */

	SND_PCI_QUIRK(0x106b, 0x0600, "iMac 14,1", CS420X_IMAC27_122),

	SND_PCI_QUIRK(0x106b, 0x0900, "iMac 12,1", CS420X_IMAC27_122),

	SND_PCI_QUIRK(0x106b, 0x1c00, "MacBookPro 8,1", CS420X_MBP81),

	SND_PCI_QUIRK(0x106b, 0x2000, "iMac 12,2", CS420X_IMAC27_122),

	SND_PCI_QUIRK(0x106b, 0x2800, "MacBookPro 10,1", CS420X_MBP101),

sound/pci/hda/patch_conexant.c

+10 −1
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ enum { 
	CXT_PINCFG_LEMOTE_A1205,

	CXT_PINCFG_COMPAQ_CQ60,

	CXT_FIXUP_STEREO_DMIC,

	CXT_PINCFG_LENOVO_NOTEBOOK,

	CXT_FIXUP_INC_MIC_BOOST,

	CXT_FIXUP_HEADPHONE_MIC_PIN,

	CXT_FIXUP_HEADPHONE_MIC,
@@ -772,6 +773,14 @@ static const struct hda_fixup cxt_fixups[] = { 
		.type = HDA_FIXUP_FUNC,

		.v.func = cxt_fixup_stereo_dmic,

	},

	[CXT_PINCFG_LENOVO_NOTEBOOK] = {

		.type = HDA_FIXUP_PINS,

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

			{ 0x1a, 0x05d71030 },

			{ }

		},

		.chain_id = CXT_FIXUP_STEREO_DMIC,

	},

	[CXT_FIXUP_INC_MIC_BOOST] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = cxt5066_increase_mic_boost,
@@ -971,7 +980,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { 
	SND_PCI_QUIRK(0x17aa, 0x3905, "Lenovo G50-30", CXT_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK(0x17aa, 0x390b, "Lenovo G50-80", CXT_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK(0x17aa, 0x3975, "Lenovo U300s", CXT_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK(0x17aa, 0x3977, "Lenovo IdeaPad U310", CXT_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK(0x17aa, 0x3977, "Lenovo IdeaPad U310", CXT_PINCFG_LENOVO_NOTEBOOK),

	SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo G50-70", CXT_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC),

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

sound/pci/hda/patch_realtek.c

+12 −0
Original line number Diff line number Diff line
@@ -6909,6 +6909,7 @@ enum { 
	ALC269_FIXUP_LIMIT_INT_MIC_BOOST,

	ALC269VB_FIXUP_ASUS_ZENBOOK,

	ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A,

	ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE,

	ALC269_FIXUP_LIMIT_INT_MIC_BOOST_MUTE_LED,

	ALC269VB_FIXUP_ORDISSIMO_EVE2,

	ALC283_FIXUP_CHROME_BOOK,
@@ -7497,6 +7498,15 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC269VB_FIXUP_ASUS_ZENBOOK,

	},

	[ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE] = {

		.type = HDA_FIXUP_PINS,

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

			{ 0x18, 0x01a110f0 },  /* use as headset mic */

			{ }

		},

		.chained = true,

		.chain_id = ALC269_FIXUP_HEADSET_MIC

	},

	[ALC269_FIXUP_LIMIT_INT_MIC_BOOST_MUTE_LED] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc269_fixup_limit_int_mic_boost,
@@ -9203,6 +9213,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
		      ALC285_FIXUP_HP_GPIO_AMP_INIT),

	SND_PCI_QUIRK(0x103c, 0x8783, "HP ZBook Fury 15 G7 Mobile Workstation",

		      ALC285_FIXUP_HP_GPIO_AMP_INIT),

	SND_PCI_QUIRK(0x103c, 0x8786, "HP OMEN 15", ALC285_FIXUP_HP_MUTE_LED),

	SND_PCI_QUIRK(0x103c, 0x8787, "HP OMEN 15", ALC285_FIXUP_HP_MUTE_LED),

	SND_PCI_QUIRK(0x103c, 0x8788, "HP OMEN 15", ALC285_FIXUP_HP_MUTE_LED),

	SND_PCI_QUIRK(0x103c, 0x87c8, "HP", ALC287_FIXUP_HP_GPIO_LED),
@@ -9274,6 +9285,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x12a0, "ASUS X441UV", ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x12e0, "ASUS X541SA", ALC256_FIXUP_ASUS_MIC),

	SND_PCI_QUIRK(0x1043, 0x12f0, "ASUS X541UV", ALC256_FIXUP_ASUS_MIC),

	SND_PCI_QUIRK(0x1043, 0x1313, "Asus K42JZ", ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x13b0, "ASUS Z550SA", ALC256_FIXUP_ASUS_MIC),

	SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_ASUS_ZENBOOK),

	SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A),

sound/pci/ice1712/quartet.c

+1 −1
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ static int qtet_ain12_sw_put(struct snd_kcontrol *kcontrol, 
{

	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);

	unsigned int old, new, tmp, masked_old;

	old = new = get_scr(ice);

	old = get_scr(ice);

	masked_old = old & (SCR_AIN12_SEL1 | SCR_AIN12_SEL0);

	tmp = ucontrol->value.integer.value[0];

	if (tmp == 2)