Commit 40d6b7e0 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Pull 6.12 devel branch for further HD-audio and USB-audio fixes.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 1a7585c3 5ec23a1b

sound/pci/hda/patch_realtek.c

+11 −2
Original line number Diff line number Diff line
@@ -7450,7 +7450,6 @@ static void alc287_alc1318_playback_pcm_hook(struct hda_pcm_stream *hinfo, 
				   struct snd_pcm_substream *substream,

				   int action)

{

	alc_write_coef_idx(codec, 0x10, 0x8806); /* Change MLK to GPIO3 */

	switch (action) {

	case HDA_GEN_PCM_ACT_OPEN:

		alc_write_coefex_idx(codec, 0x5a, 0x00, 0x954f); /* write gpio3 to high */
@@ -7464,7 +7463,6 @@ static void alc287_alc1318_playback_pcm_hook(struct hda_pcm_stream *hinfo, 
static void alc287_s4_power_gpio3_default(struct hda_codec *codec)

{

	if (is_s4_suspend(codec)) {

		alc_write_coef_idx(codec, 0x10, 0x8806); /* Change MLK to GPIO3 */

		alc_write_coefex_idx(codec, 0x5a, 0x00, 0x554f); /* write gpio3 as default value */

	}

}
@@ -7473,9 +7471,17 @@ static void alc287_fixup_lenovo_thinkpad_with_alc1318(struct hda_codec *codec, 
			       const struct hda_fixup *fix, int action)

{

	struct alc_spec *spec = codec->spec;

	static const struct coef_fw coefs[] = {

		WRITE_COEF(0x24, 0x0013), WRITE_COEF(0x25, 0x0000), WRITE_COEF(0x26, 0xC300),

		WRITE_COEF(0x28, 0x0001), WRITE_COEF(0x29, 0xb023),

		WRITE_COEF(0x24, 0x0013), WRITE_COEF(0x25, 0x0000), WRITE_COEF(0x26, 0xC301),

		WRITE_COEF(0x28, 0x0001), WRITE_COEF(0x29, 0xb023),

	};



	if (action != HDA_FIXUP_ACT_PRE_PROBE)

		return;

	alc_update_coef_idx(codec, 0x10, 1<<11, 1<<11);

	alc_process_coef_fw(codec, coefs);

	spec->power_hook = alc287_s4_power_gpio3_default;

	spec->gen.pcm_playback_hook = alc287_alc1318_playback_pcm_hook;

}
@@ -10410,6 +10416,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8b59, "HP Elite mt645 G7 Mobile Thin Client U89", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),

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

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

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

	SND_PCI_QUIRK(0x103c, 0x8b63, "HP Elite Dragonfly 13.5 inch G4", ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8b65, "HP ProBook 455 15.6 inch G10 Notebook PC", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),

	SND_PCI_QUIRK(0x103c, 0x8b66, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
@@ -11591,6 +11598,8 @@ static const struct snd_hda_pin_quirk alc269_fallback_pin_fixup_tbl[] = { 
		{0x1a, 0x40000000}),

	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1043, "ASUS", ALC2XX_FIXUP_HEADSET_MIC,

		{0x19, 0x40000000}),

	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1558, "Clevo", ALC2XX_FIXUP_HEADSET_MIC,

		{0x19, 0x40000000}),

	{}

};

sound/usb/quirks-table.h

+13 −1
Original line number Diff line number Diff line
@@ -324,7 +324,6 @@ YAMAHA_DEVICE(0x105a, NULL), 
YAMAHA_DEVICE(0x105b, NULL),

YAMAHA_DEVICE(0x105c, NULL),

YAMAHA_DEVICE(0x105d, NULL),

YAMAHA_DEVICE(0x1718, "P-125"),

{

	USB_DEVICE(0x0499, 0x1503),

	QUIRK_DRIVER_INFO {
@@ -391,6 +390,19 @@ YAMAHA_DEVICE(0x1718, "P-125"), 
		}

	}

},

{

	USB_DEVICE(0x0499, 0x1718),

	QUIRK_DRIVER_INFO {

		/* .vendor_name = "Yamaha", */

		/* .product_name = "P-125", */

		QUIRK_DATA_COMPOSITE {

			{ QUIRK_DATA_STANDARD_AUDIO(1) },

			{ QUIRK_DATA_STANDARD_AUDIO(2) },

			{ QUIRK_DATA_MIDI_YAMAHA(3) },

			QUIRK_COMPOSITE_END

		}

	}

},

YAMAHA_DEVICE(0x2000, "DGP-7"),

YAMAHA_DEVICE(0x2001, "DGP-5"),

YAMAHA_DEVICE(0x2002, NULL),