]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 3 Sep 2024 16:07:46 +0000 (18:07 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 3 Sep 2024 16:07:46 +0000 (18:07 +0200)
Pull 6.11 devel branch.  The conflicts in HD-audio Realtek codec driver
got resolved.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
1  2 
sound/pci/hda/patch_realtek.c

index 2d4db5ce862461836146e5f3468c68ce9137c286,fd7711d698233e687c6975393a1e07dfdba3cbe3..f67190a8cd93d39d1255434b9a5a694c4ab3ebd8
@@@ -7606,6 -7637,8 +7607,7 @@@ enum 
        ALC256_FIXUP_CHROME_BOOK,
        ALC287_FIXUP_LENOVO_14ARP8_LEGION_IAH7,
        ALC287_FIXUP_LENOVO_SSID_17AA3820,
 -      ALCXXX_FIXUP_CS35LXX,
+       ALC245_FIXUP_CLEVO_NOISY_MIC,
  };
  
  /* A special fixup for Lenovo C940 and Yoga Duet 7;
@@@ -9921,6 -9974,16 +9929,12 @@@ static const struct hda_fixup alc269_fi
                .type = HDA_FIXUP_FUNC,
                .v.func = alc287_fixup_lenovo_ssid_17aa3820,
        },
 -      [ALCXXX_FIXUP_CS35LXX] = {
 -              .type = HDA_FIXUP_FUNC,
 -              .v.func = cs35lxx_autodet_fixup,
 -      },
+       [ALC245_FIXUP_CLEVO_NOISY_MIC] = {
+               .type = HDA_FIXUP_FUNC,
+               .v.func = alc269_fixup_limit_int_mic_boost,
+               .chained = true,
+               .chain_id = ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE,
+       },
  };
  
  static const struct snd_pci_quirk alc269_fixup_tbl[] = {