Commit ef130216 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A collection of last-minute HD- an USB-audio quirks in addition to a
  fix for the legacy ISA wavefront driver.

  All look small and easy"

* tag 'sound-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: usb-audio: Restore Rane SL-1 quirk
  ALSA: hda/realtek: fix right sounds and mute/micmute LEDs for HP machine
  ALSA: hda/realtek: Add quirk for TongFang devices with pop noise
  ALSA: hda/realtek: Add quirk for the Framework Laptop
  ALSA: wavefront: Proper check of get_user() error
  ALSA: hda/realtek: Add quirk for Dell Latitude 7520
  ALSA: hda - fix unused Realtek function when PM is not enabled
  ALSA: usb-audio: Don't get sample rate for MCT Trigger 5 USB-to-HDMI
parents 210e04ff 5c62383c

sound/isa/wavefront/wavefront_synth.c

+2 −1
Original line number Diff line number Diff line
@@ -1094,7 +1094,8 @@ wavefront_send_sample (snd_wavefront_t *dev, 


			if (dataptr < data_end) {

		

				__get_user (sample_short, dataptr);

				if (get_user(sample_short, dataptr))

					return -EFAULT;

				dataptr += skip;

		

				if (data_is_unsigned) { /* GUS ? */

sound/pci/hda/patch_realtek.c

+66 −5
Original line number Diff line number Diff line
@@ -937,6 +937,9 @@ static int alc_init(struct hda_codec *codec) 
	return 0;

}



#define alc_free	snd_hda_gen_free



#ifdef CONFIG_PM

static inline void alc_shutup(struct hda_codec *codec)

{

	struct alc_spec *spec = codec->spec;
@@ -950,9 +953,6 @@ static inline void alc_shutup(struct hda_codec *codec) 
		alc_shutup_pins(codec);

}



#define alc_free	snd_hda_gen_free



#ifdef CONFIG_PM

static void alc_power_eapd(struct hda_codec *codec)

{

	alc_auto_setup_eapd(codec, false);
@@ -966,9 +966,7 @@ static int alc_suspend(struct hda_codec *codec) 
		spec->power_hook(codec);

	return 0;

}

#endif



#ifdef CONFIG_PM

static int alc_resume(struct hda_codec *codec)

{

	struct alc_spec *spec = codec->spec;
@@ -6780,6 +6778,41 @@ static void alc256_fixup_mic_no_presence_and_resume(struct hda_codec *codec, 
	}

}



static void alc_fixup_dell4_mic_no_presence_quiet(struct hda_codec *codec,

						  const struct hda_fixup *fix,

						  int action)

{

	struct alc_spec *spec = codec->spec;

	struct hda_input_mux *imux = &spec->gen.input_mux;

	int i;



	alc269_fixup_limit_int_mic_boost(codec, fix, action);



	switch (action) {

	case HDA_FIXUP_ACT_PRE_PROBE:

		/**

		 * Set the vref of pin 0x19 (Headset Mic) and pin 0x1b (Headphone Mic)

		 * to Hi-Z to avoid pop noises at startup and when plugging and

		 * unplugging headphones.

		 */

		snd_hda_codec_set_pin_target(codec, 0x19, PIN_VREFHIZ);

		snd_hda_codec_set_pin_target(codec, 0x1b, PIN_VREFHIZ);

		break;

	case HDA_FIXUP_ACT_PROBE:

		/**

		 * Make the internal mic (0x12) the default input source to

		 * prevent pop noises on cold boot.

		 */

		for (i = 0; i < imux->num_items; i++) {

			if (spec->gen.imux_pins[i] == 0x12) {

				spec->gen.cur_mux[0] = i;

				break;

			}

		}

		break;

	}

}



enum {

	ALC269_FIXUP_GPIO2,

	ALC269_FIXUP_SONY_VAIO,
@@ -6821,6 +6854,7 @@ enum { 
	ALC269_FIXUP_DELL2_MIC_NO_PRESENCE,

	ALC269_FIXUP_DELL3_MIC_NO_PRESENCE,

	ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,

	ALC269_FIXUP_DELL4_MIC_NO_PRESENCE_QUIET,

	ALC269_FIXUP_HEADSET_MODE,

	ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC,

	ALC269_FIXUP_ASPIRE_HEADSET_MIC,
@@ -7012,6 +7046,7 @@ enum { 
	ALC245_FIXUP_CS35L41_SPI_4,

	ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED,

	ALC285_FIXUP_HP_SPEAKERS_MICMUTE_LED,

	ALC295_FIXUP_FRAMEWORK_LAPTOP_MIC_NO_PRESENCE,

};



static const struct hda_fixup alc269_fixups[] = {
@@ -8808,6 +8843,21 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC285_FIXUP_HP_MUTE_LED,

	},

	[ALC269_FIXUP_DELL4_MIC_NO_PRESENCE_QUIET] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc_fixup_dell4_mic_no_presence_quiet,

		.chained = true,

		.chain_id = ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,

	},

	[ALC295_FIXUP_FRAMEWORK_LAPTOP_MIC_NO_PRESENCE] = {

		.type = HDA_FIXUP_PINS,

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

			{ 0x19, 0x02a1112c }, /* use as headset mic, without its own jack detect */

			{ }

		},

		.chained = true,

		.chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC

	},

};



static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -8898,6 +8948,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	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, 0x0a38, "Dell Latitude 7520", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE_QUIET),

	SND_PCI_QUIRK(0x1028, 0x0a58, "Dell", ALC255_FIXUP_DELL_HEADSET_MIC),

	SND_PCI_QUIRK(0x1028, 0x0a61, "Dell XPS 15 9510", ALC289_FIXUP_DUAL_SPK),

	SND_PCI_QUIRK(0x1028, 0x0a62, "Dell Precision 5560", ALC289_FIXUP_DUAL_SPK),
@@ -9040,6 +9091,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8995, "HP EliteBook 855 G9", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x89a4, "HP ProBook 440 G9", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x89a6, "HP ProBook 450 G9", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x89aa, "HP EliteBook 630 G9", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x89ac, "HP EliteBook 640 G9", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x89ae, "HP EliteBook 650 G9", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x89c3, "Zbook Studio G9", ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED),
@@ -9290,6 +9342,14 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1c06, 0x2013, "Lemote A1802", ALC269_FIXUP_LEMOTE_A1802),

	SND_PCI_QUIRK(0x1c06, 0x2015, "Lemote A190X", ALC269_FIXUP_LEMOTE_A190X),

	SND_PCI_QUIRK(0x1d05, 0x1132, "TongFang PHxTxX1", ALC256_FIXUP_SET_COEF_DEFAULTS),

	SND_PCI_QUIRK(0x1d05, 0x1096, "TongFang GMxMRxx", ALC269_FIXUP_NO_SHUTUP),

	SND_PCI_QUIRK(0x1d05, 0x1100, "TongFang GKxNRxx", ALC269_FIXUP_NO_SHUTUP),

	SND_PCI_QUIRK(0x1d05, 0x1111, "TongFang GMxZGxx", ALC269_FIXUP_NO_SHUTUP),

	SND_PCI_QUIRK(0x1d05, 0x1119, "TongFang GMxZGxx", ALC269_FIXUP_NO_SHUTUP),

	SND_PCI_QUIRK(0x1d05, 0x1129, "TongFang GMxZGxx", ALC269_FIXUP_NO_SHUTUP),

	SND_PCI_QUIRK(0x1d05, 0x1147, "TongFang GMxTGxx", ALC269_FIXUP_NO_SHUTUP),

	SND_PCI_QUIRK(0x1d05, 0x115c, "TongFang GMxTGxx", ALC269_FIXUP_NO_SHUTUP),

	SND_PCI_QUIRK(0x1d05, 0x121b, "TongFang GMxAGxx", ALC269_FIXUP_NO_SHUTUP),

	SND_PCI_QUIRK(0x1d72, 0x1602, "RedmiBook", ALC255_FIXUP_XIAOMI_HEADSET_MIC),

	SND_PCI_QUIRK(0x1d72, 0x1701, "XiaomiNotebook Pro", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1d72, 0x1901, "RedmiBook 14", ALC256_FIXUP_ASUS_HEADSET_MIC),
@@ -9297,6 +9357,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x8086, 0x2074, "Intel NUC 8", ALC233_FIXUP_INTEL_NUC8_DMIC),

	SND_PCI_QUIRK(0x8086, 0x2080, "Intel NUC 8 Rugged", ALC256_FIXUP_INTEL_NUC8_RUGGED),

	SND_PCI_QUIRK(0x8086, 0x2081, "Intel NUC 10", ALC256_FIXUP_INTEL_NUC10),

	SND_PCI_QUIRK(0xf111, 0x0001, "Framework Laptop", ALC295_FIXUP_FRAMEWORK_LAPTOP_MIC_NO_PRESENCE),



#if 0

	/* Below is a quirk table taken from the old code.

sound/usb/quirks-table.h

+9 −0
Original line number Diff line number Diff line
@@ -3235,6 +3235,15 @@ YAMAHA_DEVICE(0x7010, "UB99"), 
	}

},



/* Rane SL-1 */

{

	USB_DEVICE(0x13e5, 0x0001),

	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {

		.ifnum = QUIRK_ANY_INTERFACE,

		.type = QUIRK_AUDIO_STANDARD_INTERFACE

        }

},



/* disabled due to regression for other devices;

 * see https://bugzilla.kernel.org/show_bug.cgi?id=199905

 */

sound/usb/quirks.c

+2 −0
Original line number Diff line number Diff line
@@ -1822,6 +1822,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { 
		   QUIRK_FLAG_IGNORE_CTL_ERROR),

	DEVICE_FLG(0x06f8, 0xd002, /* Hercules DJ Console (Macintosh Edition) */

		   QUIRK_FLAG_IGNORE_CTL_ERROR),

	DEVICE_FLG(0x0711, 0x5800, /* MCT Trigger 5 USB-to-HDMI */

		   QUIRK_FLAG_GET_SAMPLE_RATE),

	DEVICE_FLG(0x074d, 0x3553, /* Outlaw RR2150 (Micronas UAC3553B) */

		   QUIRK_FLAG_GET_SAMPLE_RATE),

	DEVICE_FLG(0x08bb, 0x2702, /* LineX FM Transmitter */