From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 15 May 2026 07:12:04 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cf821727205109ff2119d2bbd45fef8239f7e2c;p=thirdparty%2Flinux.git

Merge branch 'for-linus' into for-next

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

0cf821727205109ff2119d2bbd45fef8239f7e2c
diff --cc sound/hda/codecs/realtek/alc269.c
index 3f7698b28b971,2f5d13032fd7a..6d4e8446f63bf
--- a/sound/hda/codecs/realtek/alc269.c
+++ b/sound/hda/codecs/realtek/alc269.c
@@@ -4124,7 -4154,7 +4166,8 @@@ enum 
  	ALC245_FIXUP_CS35L41_I2C_2_MUTE_LED,
  	ALC236_FIXUP_HP_DMIC,
  	ALC256_FIXUP_HONOR_MRB_XXX_M1020_AUDIO,
+ 	ALC245_FIXUP_HP_ENVY_X360_15_FH0XXX,
 +	ALC287_FIXUP_ACER_MICMUTE_LED,
  };
  
  /* A special fixup for Lenovo C940 and Yoga Duet 7;
@@@ -6678,12 -6722,12 +6735,18 @@@ static const struct hda_fixup alc269_fi
  			{ }
  		}
  	},
+ 	[ALC245_FIXUP_HP_ENVY_X360_15_FH0XXX] = {
+ 		.type = HDA_FIXUP_FUNC,
+ 		.v.func = cs35l41_fixup_i2c_two,
+ 		.chained = true,
+ 		.chain_id = ALC245_FIXUP_HP_X360_MUTE_LEDS
 -	}
++	},
 +	[ALC287_FIXUP_ACER_MICMUTE_LED] = {
 +		.type = HDA_FIXUP_FUNC,
 +		.v.func = alc287_fixup_acer_micmute_led,
 +		.chained = true,
 +		.chain_id = ALC2XX_FIXUP_HEADSET_MIC,
- 	}
++	},
  };
  
  static const struct hda_quirk alc269_fixup_tbl[] = {
@@@ -6733,9 -6777,10 +6796,10 @@@
  	SND_PCI_QUIRK(0x1025, 0x1466, "Acer Aspire A515-56", ALC255_FIXUP_ACER_HEADPHONE_AND_MIC),
  	SND_PCI_QUIRK(0x1025, 0x1534, "Acer Predator PH315-54", ALC255_FIXUP_ACER_MIC_NO_PRESENCE),
  	SND_PCI_QUIRK(0x1025, 0x1539, "Acer Nitro 5 AN515-57", ALC2XX_FIXUP_HEADSET_MIC),
 -	SND_PCI_QUIRK(0x1025, 0x159c, "Acer Nitro 5 AN515-58", ALC2XX_FIXUP_HEADSET_MIC),
 +	SND_PCI_QUIRK(0x1025, 0x159c, "Acer Nitro 5 AN515-58", ALC287_FIXUP_ACER_MICMUTE_LED),
  	SND_PCI_QUIRK(0x1025, 0x1597, "Acer Nitro 5 AN517-55", ALC2XX_FIXUP_HEADSET_MIC),
  	SND_PCI_QUIRK(0x1025, 0x160e, "Acer PT316-51S", ALC2XX_FIXUP_HEADSET_MIC),
+ 	SND_PCI_QUIRK(0x1025, 0x1640, "Acer Aspire A315-44P", ALC256_FIXUP_ACER_SFG16_MICMUTE_LED),
  	SND_PCI_QUIRK(0x1025, 0x1679, "Acer Nitro 16 AN16-41", ALC2XX_FIXUP_HEADSET_MIC),
  	SND_PCI_QUIRK(0x1025, 0x169a, "Acer Swift SFG16", ALC256_FIXUP_ACER_SFG16_MICMUTE_LED),
  	SND_PCI_QUIRK(0x1025, 0x171e, "Acer Nitro ANV15-51", ALC245_FIXUP_ACER_MICMUTE_LED),