Merge branch 'for-linus' into for-next

Back-merge 5.7-devel branch for further development.

Signed-off-by: Takashi Iwai <[email protected]>

diff --combined sound/pci/hda/patch_hdmi.c
index f21b66abb271d372b19cc3f6341ecb83fd4caa54,93760a3564cfa5261e2f00f10863d971730b4d05..9b604ecade03bf4971f7a8637870644cbc1b1a8b
--- 1/sound/pci/hda/patch_hdmi.c
--- 2/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@@ -1848,8 -1848,10 +1848,10 @@@ static bool check_non_pcm_per_cvt(struc
        /* Add sanity check to pass klockwork check.
         * This should never happen.
         */
-       if (WARN_ON(spdif == NULL))
+       if (WARN_ON(spdif == NULL)) {
+               mutex_unlock(&codec->spdif_mutex);
                return true;
+       }
        non_pcm = !!(spdif->status & IEC958_AES0_NONAUDIO);
        mutex_unlock(&codec->spdif_mutex);
        return non_pcm;
@@@ -2022,7 -2024,7 +2024,7 @@@ static const struct hda_pcm_ops generic
  
  static int hdmi_get_spk_alloc(struct hdac_device *hdac, int pcm_idx)
  {
 -      struct hda_codec *codec = container_of(hdac, struct hda_codec, core);
 +      struct hda_codec *codec = hdac_to_hda_codec(hdac);
        struct hdmi_spec *spec = codec->spec;
        struct hdmi_spec_per_pin *per_pin = pcm_idx_to_pin(spec, pcm_idx);
  
@@@ -2035,7 -2037,7 +2037,7 @@@
  static void hdmi_get_chmap(struct hdac_device *hdac, int pcm_idx,
                                        unsigned char *chmap)
  {
 -      struct hda_codec *codec = container_of(hdac, struct hda_codec, core);
 +      struct hda_codec *codec = hdac_to_hda_codec(hdac);
        struct hdmi_spec *spec = codec->spec;
        struct hdmi_spec_per_pin *per_pin = pcm_idx_to_pin(spec, pcm_idx);
  
@@@ -2049,7 -2051,7 +2051,7 @@@
  static void hdmi_set_chmap(struct hdac_device *hdac, int pcm_idx,
                                unsigned char *chmap, int prepared)
  {
 -      struct hda_codec *codec = container_of(hdac, struct hda_codec, core);
 +      struct hda_codec *codec = hdac_to_hda_codec(hdac);
        struct hdmi_spec *spec = codec->spec;
        struct hdmi_spec_per_pin *per_pin = pcm_idx_to_pin(spec, pcm_idx);
  
@@@ -2065,7 -2067,7 +2067,7 @@@
  
  static bool is_hdmi_pcm_attached(struct hdac_device *hdac, int pcm_idx)
  {
 -      struct hda_codec *codec = container_of(hdac, struct hda_codec, core);
 +      struct hda_codec *codec = hdac_to_hda_codec(hdac);
        struct hdmi_spec *spec = codec->spec;
        struct hdmi_spec_per_pin *per_pin = pcm_idx_to_pin(spec, pcm_idx);
  
@@@ -2198,7 -2200,9 +2200,9 @@@ static int generic_hdmi_build_controls(
  
        for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) {
                struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);
+               struct hdmi_eld *pin_eld = &per_pin->sink_eld;
  
+               pin_eld->eld_valid = false;
                hdmi_present_sense(per_pin, 0);
        }
  
@@@ -3783,7 -3787,7 +3787,7 @@@ static int atihdmi_paired_chmap_validat
  static int atihdmi_pin_set_slot_channel(struct hdac_device *hdac,
                hda_nid_t pin_nid, int hdmi_slot, int stream_channel)
  {
 -      struct hda_codec *codec = container_of(hdac, struct hda_codec, core);
 +      struct hda_codec *codec = hdac_to_hda_codec(hdac);
        int verb;
        int ati_channel_setup = 0;
  
@@@ -3819,7 -3823,7 +3823,7 @@@
  static int atihdmi_pin_get_slot_channel(struct hdac_device *hdac,
                                hda_nid_t pin_nid, int asp_slot)
  {
 -      struct hda_codec *codec = container_of(hdac, struct hda_codec, core);
 +      struct hda_codec *codec = hdac_to_hda_codec(hdac);
        bool was_odd = false;
        int ati_asp_slot = asp_slot;
        int verb;

diff --combined sound/pci/hda/patch_realtek.c
index 670e59b081d5ae6b6afa46f81a16f110b9e89411,e62d58872b6e600c9f12788a8d03a3bde6b9ed0e..0aa778ff7f2b2cf7ffbaed5cdafbe9a2526bd2ef
--- 1/sound/pci/hda/patch_realtek.c
--- 2/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@@ -17,7 -17,6 +17,7 @@@
  #include <linux/dmi.h>
  #include <linux/module.h>
  #include <linux/input.h>
 +#include <linux/leds.h>
  #include <sound/core.h>
  #include <sound/jack.h>
  #include <sound/hda_codec.h>
@@@ -82,7 -81,6 +82,7 @@@ struct alc_spec 
  
        /* mute LED for HP laptops, see alc269_fixup_mic_mute_hook() */
        int mute_led_polarity;
 +      int micmute_led_polarity;
        hda_nid_t mute_led_nid;
        hda_nid_t cap_mute_led_nid;
  
@@@ -386,6 -384,7 +386,7 @@@ static void alc_fill_eapd_coef(struct h
        case 0x10ec0282:
        case 0x10ec0283:
        case 0x10ec0286:
+       case 0x10ec0287:
        case 0x10ec0288:
        case 0x10ec0285:
        case 0x10ec0298:
@@@ -2459,6 -2458,7 +2460,7 @@@ static const struct snd_pci_quirk alc88
        SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte EP45-DS3/Z87X-UD3H", ALC889_FIXUP_FRONT_HP_NO_PRESENCE),
        SND_PCI_QUIRK(0x1458, 0xa0b8, "Gigabyte AZ370-Gaming", ALC1220_FIXUP_GB_DUAL_CODECS),
        SND_PCI_QUIRK(0x1458, 0xa0cd, "Gigabyte X570 Aorus Master", ALC1220_FIXUP_CLEVO_P950),
+       SND_PCI_QUIRK(0x1458, 0xa0ce, "Gigabyte X570 Aorus Xtreme", ALC1220_FIXUP_CLEVO_P950),
        SND_PCI_QUIRK(0x1462, 0x1228, "MSI-GP63", ALC1220_FIXUP_CLEVO_P950),
        SND_PCI_QUIRK(0x1462, 0x1275, "MSI-GL63", ALC1220_FIXUP_CLEVO_P950),
        SND_PCI_QUIRK(0x1462, 0x1276, "MSI-GL73", ALC1220_FIXUP_CLEVO_P950),
@@@ -2474,6 -2474,9 +2476,9 @@@
        SND_PCI_QUIRK(0x1558, 0x97e1, "Clevo P970[ER][CDFN]", ALC1220_FIXUP_CLEVO_P950),
        SND_PCI_QUIRK(0x1558, 0x65d1, "Clevo PB51[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
        SND_PCI_QUIRK(0x1558, 0x67d1, "Clevo PB71[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
+       SND_PCI_QUIRK(0x1558, 0x50d3, "Clevo PC50[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
+       SND_PCI_QUIRK(0x1558, 0x70d1, "Clevo PC70[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
+       SND_PCI_QUIRK(0x1558, 0x7714, "Clevo X170", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
        SND_PCI_QUIRK_VENDOR(0x1558, "Clevo laptop", ALC882_FIXUP_EAPD),
        SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_FIXUP_EAPD),
        SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Y530", ALC882_FIXUP_LENOVO_Y530),
@@@ -4077,9 -4080,11 +4082,9 @@@ static void alc269_fixup_hp_mute_led_mi
  
  /* update LED status via GPIO */
  static void alc_update_gpio_led(struct hda_codec *codec, unsigned int mask,
 -                              bool enabled)
 +                              int polarity, bool enabled)
  {
 -      struct alc_spec *spec = codec->spec;
 -
 -      if (spec->mute_led_polarity)
 +      if (polarity)
                enabled = !enabled;
        alc_update_gpio_data(codec, mask, !enabled); /* muted -> LED on */
  }
@@@ -4090,8 -4095,7 +4095,8 @@@ static void alc_fixup_gpio_mute_hook(vo
        struct hda_codec *codec = private_data;
        struct alc_spec *spec = codec->spec;
  
 -      alc_update_gpio_led(codec, spec->gpio_mute_led_mask, enabled);
 +      alc_update_gpio_led(codec, spec->gpio_mute_led_mask,
 +                          spec->mute_led_polarity, enabled);
  }
  
  /* turn on/off mic-mute LED via GPIO per capture hook */
@@@ -4100,30 -4104,9 +4105,30 @@@ static void alc_gpio_micmute_update(str
        struct alc_spec *spec = codec->spec;
  
        alc_update_gpio_led(codec, spec->gpio_mic_led_mask,
 +                          spec->micmute_led_polarity,
                            spec->gen.micmute_led.led_value);
  }
  
 +#if IS_REACHABLE(CONFIG_LEDS_TRIGGER_AUDIO)
 +static int micmute_led_set(struct led_classdev *led_cdev,
 +                         enum led_brightness brightness)
 +{
 +      struct hda_codec *codec = dev_to_hda_codec(led_cdev->dev->parent);
 +      struct alc_spec *spec = codec->spec;
 +
 +      alc_update_gpio_led(codec, spec->gpio_mic_led_mask,
 +                          spec->micmute_led_polarity, !!brightness);
 +      return 0;
 +}
 +
 +static struct led_classdev micmute_led_cdev = {
 +      .name = "hda::micmute",
 +      .max_brightness = 1,
 +      .brightness_set_blocking = micmute_led_set,
 +      .default_trigger = "audio-micmute",
 +};
 +#endif
 +
  /* setup mute and mic-mute GPIO bits, add hooks appropriately */
  static void alc_fixup_hp_gpio_led(struct hda_codec *codec,
                                  int action,
@@@ -4131,9 -4114,6 +4136,9 @@@
                                  unsigned int micmute_mask)
  {
        struct alc_spec *spec = codec->spec;
 +#if IS_REACHABLE(CONFIG_LEDS_TRIGGER_AUDIO)
 +      int err;
 +#endif
  
        alc_fixup_gpio(codec, action, mute_mask | micmute_mask);
  
@@@ -4146,13 -4126,6 +4151,13 @@@
        if (micmute_mask) {
                spec->gpio_mic_led_mask = micmute_mask;
                snd_hda_gen_add_micmute_led(codec, alc_gpio_micmute_update);
 +
 +#if IS_REACHABLE(CONFIG_LEDS_TRIGGER_AUDIO)
 +              micmute_led_cdev.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE);
 +              err = devm_led_classdev_register(&codec->core.dev, &micmute_led_cdev);
 +              if (err)
 +                      codec_warn(codec, "failed to register micmute LED\n");
 +#endif
        }
  }
  
@@@ -4165,11 -4138,7 +4170,11 @@@ static void alc269_fixup_hp_gpio_led(st
  static void alc285_fixup_hp_gpio_led(struct hda_codec *codec,
                                const struct hda_fixup *fix, int action)
  {
 -      alc_fixup_hp_gpio_led(codec, action, 0x04, 0x00);
 +      struct alc_spec *spec = codec->spec;
 +
 +      spec->micmute_led_polarity = 1;
 +
 +      alc_fixup_hp_gpio_led(codec, action, 0x04, 0x01);
  }
  
  static void alc286_fixup_hp_gpio_led(struct hda_codec *codec,
@@@ -5516,18 -5485,9 +5521,9 @@@ static void alc_fixup_tpt470_dock(struc
                { 0x19, 0x21a11010 }, /* dock mic */
                { }
        };
-       /* Assure the speaker pin to be coupled with DAC NID 0x03; otherwise
-        * the speaker output becomes too low by some reason on Thinkpads with
-        * ALC298 codec
-        */
-       static const hda_nid_t preferred_pairs[] = {
-               0x14, 0x03, 0x17, 0x02, 0x21, 0x02,
-               0
-       };
        struct alc_spec *spec = codec->spec;
  
        if (action == HDA_FIXUP_ACT_PRE_PROBE) {
-               spec->gen.preferred_dacs = preferred_pairs;
                spec->parse_flags = HDA_PINCFG_NO_HP_FIXUP;
                snd_hda_apply_pincfgs(codec, pincfgs);
        } else if (action == HDA_FIXUP_ACT_INIT) {
@@@ -5540,6 -5500,23 +5536,23 @@@
        }
  }
  
+ static void alc_fixup_tpt470_dacs(struct hda_codec *codec,
+                                 const struct hda_fixup *fix, int action)
+ {
+       /* Assure the speaker pin to be coupled with DAC NID 0x03; otherwise
+        * the speaker output becomes too low by some reason on Thinkpads with
+        * ALC298 codec
+        */
+       static const hda_nid_t preferred_pairs[] = {
+               0x14, 0x03, 0x17, 0x02, 0x21, 0x02,
+               0
+       };
+       struct alc_spec *spec = codec->spec;
+ 
+       if (action == HDA_FIXUP_ACT_PRE_PROBE)
+               spec->gen.preferred_dacs = preferred_pairs;
+ }
+ 
  static void alc_shutup_dell_xps13(struct hda_codec *codec)
  {
        struct alc_spec *spec = codec->spec;
@@@ -5831,8 -5808,7 +5844,8 @@@ static void alc280_hp_gpio4_automute_ho
  
        snd_hda_gen_hp_automute(codec, jack);
        /* mute_led_polarity is set to 0, so we pass inverted value here */
 -      alc_update_gpio_led(codec, 0x10, !spec->gen.hp_jack_present);
 +      alc_update_gpio_led(codec, 0x10, spec->mute_led_polarity,
 +                          !spec->gen.hp_jack_present);
  }
  
  /* Manage GPIOs for HP EliteBook Folio 9480m.
@@@ -5893,6 -5869,15 +5906,15 @@@ static void alc233_alc662_fixup_lenovo_
        }
  }
  
+ static void alc225_fixup_s3_pop_noise(struct hda_codec *codec,
+                                     const struct hda_fixup *fix, int action)
+ {
+       if (action != HDA_FIXUP_ACT_PRE_PROBE)
+               return;
+ 
+       codec->power_save_node = 1;
+ }
+ 
  /* Forcibly assign NID 0x03 to HP/LO while NID 0x02 to SPK for EQ */
  static void alc274_fixup_bind_dacs(struct hda_codec *codec,
                                    const struct hda_fixup *fix, int action)
@@@ -5997,6 -5982,7 +6019,7 @@@ enum 
        ALC269_FIXUP_HP_LINE1_MIC1_LED,
        ALC269_FIXUP_INV_DMIC,
        ALC269_FIXUP_LENOVO_DOCK,
+       ALC269_FIXUP_LENOVO_DOCK_LIMIT_BOOST,
        ALC269_FIXUP_NO_SHUTUP,
        ALC286_FIXUP_SONY_MIC_NO_PRESENCE,
        ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT,
@@@ -6082,9 -6068,11 +6105,11 @@@
        ALC233_FIXUP_ACER_HEADSET_MIC,
        ALC294_FIXUP_LENOVO_MIC_LOCATION,
        ALC225_FIXUP_DELL_WYSE_MIC_NO_PRESENCE,
+       ALC225_FIXUP_S3_POP_NOISE,
        ALC700_FIXUP_INTEL_REFERENCE,
        ALC274_FIXUP_DELL_BIND_DACS,
        ALC274_FIXUP_DELL_AIO_LINEOUT_VERB,
+       ALC298_FIXUP_TPT470_DOCK_FIX,
        ALC298_FIXUP_TPT470_DOCK,
        ALC255_FIXUP_DUMMY_LINEOUT_VERB,
        ALC255_FIXUP_DELL_HEADSET_MIC,
@@@ -6117,9 -6105,12 +6142,12 @@@
        ALC294_FIXUP_ASUS_DUAL_SPK,
        ALC285_FIXUP_THINKPAD_HEADSET_JACK,
        ALC294_FIXUP_ASUS_HPE,
+       ALC294_FIXUP_ASUS_COEF_1B,
        ALC285_FIXUP_HP_GPIO_LED,
        ALC285_FIXUP_HP_MUTE_LED,
        ALC236_FIXUP_HP_MUTE_LED,
+       ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET,
+       ALC295_FIXUP_ASUS_MIC_NO_PRESENCE,
  };
  
  static const struct hda_fixup alc269_fixups[] = {
@@@ -6317,6 -6308,12 +6345,12 @@@
                .chained = true,
                .chain_id = ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT
        },
+       [ALC269_FIXUP_LENOVO_DOCK_LIMIT_BOOST] = {
+               .type = HDA_FIXUP_FUNC,
+               .v.func = alc269_fixup_limit_int_mic_boost,
+               .chained = true,
+               .chain_id = ALC269_FIXUP_LENOVO_DOCK,
+       },
        [ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT] = {
                .type = HDA_FIXUP_FUNC,
                .v.func = alc269_fixup_pincfg_no_hp_to_lineout,
@@@ -6969,6 -6966,12 +7003,12 @@@
                        { }
                },
                .chained = true,
+               .chain_id = ALC225_FIXUP_S3_POP_NOISE
+       },
+       [ALC225_FIXUP_S3_POP_NOISE] = {
+               .type = HDA_FIXUP_FUNC,
+               .v.func = alc225_fixup_s3_pop_noise,
+               .chained = true,
                .chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC
        },
        [ALC700_FIXUP_INTEL_REFERENCE] = {
@@@ -7001,12 -7004,18 +7041,18 @@@
                .chained = true,
                .chain_id = ALC274_FIXUP_DELL_BIND_DACS
        },
-       [ALC298_FIXUP_TPT470_DOCK] = {
+       [ALC298_FIXUP_TPT470_DOCK_FIX] = {
                .type = HDA_FIXUP_FUNC,
                .v.func = alc_fixup_tpt470_dock,
                .chained = true,
                .chain_id = ALC293_FIXUP_LENOVO_SPK_NOISE
        },
+       [ALC298_FIXUP_TPT470_DOCK] = {
+               .type = HDA_FIXUP_FUNC,
+               .v.func = alc_fixup_tpt470_dacs,
+               .chained = true,
+               .chain_id = ALC298_FIXUP_TPT470_DOCK_FIX
+       },
        [ALC255_FIXUP_DUMMY_LINEOUT_VERB] = {
                .type = HDA_FIXUP_PINS,
                .v.pins = (const struct hda_pintbl[]) {
@@@ -7241,6 -7250,17 +7287,17 @@@
                .chained = true,
                .chain_id = ALC294_FIXUP_ASUS_HEADSET_MIC
        },
+       [ALC294_FIXUP_ASUS_COEF_1B] = {
+               .type = HDA_FIXUP_VERBS,
+               .v.verbs = (const struct hda_verb[]) {
+                       /* Set bit 10 to correct noisy output after reboot from
+                        * Windows 10 (due to pop noise reduction?)
+                        */
+                       { 0x20, AC_VERB_SET_COEF_INDEX, 0x1b },
+                       { 0x20, AC_VERB_SET_PROC_COEF, 0x4e4b },
+                       { }
+               },
+       },
        [ALC285_FIXUP_HP_GPIO_LED] = {
                .type = HDA_FIXUP_FUNC,
                .v.func = alc285_fixup_hp_gpio_led,
@@@ -7253,6 -7273,22 +7310,22 @@@
                .type = HDA_FIXUP_FUNC,
                .v.func = alc236_fixup_hp_mute_led,
        },
+       [ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET] = {
+               .type = HDA_FIXUP_VERBS,
+               .v.verbs = (const struct hda_verb[]) {
+                       { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc5 },
+                       { }
+               },
+       },
+       [ALC295_FIXUP_ASUS_MIC_NO_PRESENCE] = {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
+                       { 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */
+                       { }
+               },
+               .chained = true,
+               .chain_id = ALC269_FIXUP_HEADSET_MODE
+       },
  };
  
  static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@@ -7420,8 -7456,10 +7493,10 @@@
        SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC),
        SND_PCI_QUIRK(0x1043, 0x18f1, "Asus FX505DT", ALC256_FIXUP_ASUS_HEADSET_MIC),
        SND_PCI_QUIRK(0x1043, 0x19ce, "ASUS B9450FA", ALC294_FIXUP_ASUS_HPE),
+       SND_PCI_QUIRK(0x1043, 0x19e1, "ASUS UX581LV", ALC295_FIXUP_ASUS_MIC_NO_PRESENCE),
        SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW),
        SND_PCI_QUIRK(0x1043, 0x1a30, "ASUS X705UD", ALC256_FIXUP_ASUS_MIC),
+       SND_PCI_QUIRK(0x1043, 0x1b11, "ASUS UX431DA", ALC294_FIXUP_ASUS_COEF_1B),
        SND_PCI_QUIRK(0x1043, 0x1b13, "Asus U41SV", ALC269_FIXUP_INV_DMIC),
        SND_PCI_QUIRK(0x1043, 0x1bbd, "ASUS Z550MA", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),
        SND_PCI_QUIRK(0x1043, 0x1c23, "Asus X55U", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
@@@ -7447,6 -7485,8 +7522,8 @@@
        SND_PCI_QUIRK(0x10ec, 0x10f2, "Intel Reference board", ALC700_FIXUP_INTEL_REFERENCE),
        SND_PCI_QUIRK(0x10f7, 0x8338, "Panasonic CF-SZ6", ALC269_FIXUP_HEADSET_MODE),
        SND_PCI_QUIRK(0x144d, 0xc109, "Samsung Ativ book 9 (NP900X3G)", ALC269_FIXUP_INV_DMIC),
+       SND_PCI_QUIRK(0x144d, 0xc169, "Samsung Notebook 9 Pen (NP930SBE-K01US)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
+       SND_PCI_QUIRK(0x144d, 0xc176, "Samsung Notebook 9 Pro (NP930MBE-K04US)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
        SND_PCI_QUIRK(0x144d, 0xc740, "Samsung Ativ book 8 (NP870Z5G)", ALC269_FIXUP_ATIV_BOOK_8),
        SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_HEADSET_MIC),
        SND_PCI_QUIRK(0x1462, 0xb120, "MSI Cubi MS-B120", ALC283_FIXUP_HEADSET_MIC),
@@@ -7457,12 -7497,13 +7534,13 @@@
        SND_PCI_QUIRK(0x1558, 0x8560, "System76 Gazelle (gaze14)", ALC269_FIXUP_HEADSET_MIC),
        SND_PCI_QUIRK(0x1558, 0x8561, "System76 Gazelle (gaze14)", ALC269_FIXUP_HEADSET_MIC),
        SND_PCI_QUIRK(0x17aa, 0x1036, "Lenovo P520", ALC233_FIXUP_LENOVO_MULTI_CODECS),
+       SND_PCI_QUIRK(0x17aa, 0x1048, "ThinkCentre Station", ALC283_FIXUP_HEADSET_MIC),
        SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE),
        SND_PCI_QUIRK(0x17aa, 0x215e, "Thinkpad L512", ALC269_FIXUP_SKU_IGNORE),
        SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE),
        SND_PCI_QUIRK(0x17aa, 0x21ca, "Thinkpad L412", ALC269_FIXUP_SKU_IGNORE),
        SND_PCI_QUIRK(0x17aa, 0x21e9, "Thinkpad Edge 15", ALC269_FIXUP_SKU_IGNORE),
-       SND_PCI_QUIRK(0x17aa, 0x21f6, "Thinkpad T530", ALC269_FIXUP_LENOVO_DOCK),
+       SND_PCI_QUIRK(0x17aa, 0x21f6, "Thinkpad T530", ALC269_FIXUP_LENOVO_DOCK_LIMIT_BOOST),
        SND_PCI_QUIRK(0x17aa, 0x21fa, "Thinkpad X230", ALC269_FIXUP_LENOVO_DOCK),
        SND_PCI_QUIRK(0x17aa, 0x21f3, "Thinkpad T430", ALC269_FIXUP_LENOVO_DOCK),
        SND_PCI_QUIRK(0x17aa, 0x21fb, "Thinkpad T430s", ALC269_FIXUP_LENOVO_DOCK),
@@@ -7601,6 -7642,7 +7679,7 @@@ static const struct hda_model_fixup alc
        {.id = ALC269_FIXUP_HEADSET_MODE, .name = "headset-mode"},
        {.id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC, .name = "headset-mode-no-hp-mic"},
        {.id = ALC269_FIXUP_LENOVO_DOCK, .name = "lenovo-dock"},
+       {.id = ALC269_FIXUP_LENOVO_DOCK_LIMIT_BOOST, .name = "lenovo-dock-limit-boost"},
        {.id = ALC269_FIXUP_HP_GPIO_LED, .name = "hp-gpio-led"},
        {.id = ALC269_FIXUP_HP_DOCK_GPIO_MIC1_LED, .name = "hp-dock-gpio-mic1-led"},
        {.id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE, .name = "dell-headset-multi"},
@@@ -7612,6 -7654,7 +7691,7 @@@
        {.id = ALC292_FIXUP_TPT440_DOCK, .name = "tpt440-dock"},
        {.id = ALC292_FIXUP_TPT440, .name = "tpt440"},
        {.id = ALC292_FIXUP_TPT460, .name = "tpt460"},
+       {.id = ALC298_FIXUP_TPT470_DOCK_FIX, .name = "tpt470-dock-fix"},
        {.id = ALC298_FIXUP_TPT470_DOCK, .name = "tpt470-dock"},
        {.id = ALC233_FIXUP_LENOVO_MULTI_CODECS, .name = "dual-codecs"},
        {.id = ALC700_FIXUP_INTEL_REFERENCE, .name = "alc700-ref"},
@@@ -8029,6 -8072,18 +8109,18 @@@ static const struct snd_hda_pin_quirk a
                {0x12, 0x90a60130},
                {0x17, 0x90170110},
                {0x21, 0x03211020}),
+       SND_HDA_PIN_QUIRK(0x10ec0295, 0x1043, "ASUS", ALC295_FIXUP_ASUS_MIC_NO_PRESENCE,
+               {0x12, 0x90a60120},
+               {0x17, 0x90170110},
+               {0x21, 0x04211030}),
+       SND_HDA_PIN_QUIRK(0x10ec0295, 0x1043, "ASUS", ALC295_FIXUP_ASUS_MIC_NO_PRESENCE,
+               {0x12, 0x90a60130},
+               {0x17, 0x90170110},
+               {0x21, 0x03211020}),
+       SND_HDA_PIN_QUIRK(0x10ec0295, 0x1043, "ASUS", ALC295_FIXUP_ASUS_MIC_NO_PRESENCE,
+               {0x12, 0x90a60130},
+               {0x17, 0x90170110},
+               {0x21, 0x03211020}),
        SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,
                {0x14, 0x90170110},
                {0x21, 0x04211020}),
@@@ -8238,6 -8293,7 +8330,7 @@@ static int patch_alc269(struct hda_code
        case 0x10ec0215:
        case 0x10ec0245:
        case 0x10ec0285:
+       case 0x10ec0287:
        case 0x10ec0289:
                spec->codec_variant = ALC269_TYPE_ALC215;
                spec->shutup = alc225_shutup;
@@@ -8245,8 -8301,6 +8338,6 @@@
                spec->gen.mixer_nid = 0;
                break;
        case 0x10ec0225:
-               codec->power_save_node = 1;
-               /* fall through */
        case 0x10ec0295:
        case 0x10ec0299:
                spec->codec_variant = ALC269_TYPE_ALC225;
@@@ -9518,6 -9572,7 +9609,7 @@@ static const struct hda_device_id snd_h
        HDA_CODEC_ENTRY(0x10ec0284, "ALC284", patch_alc269),
        HDA_CODEC_ENTRY(0x10ec0285, "ALC285", patch_alc269),
        HDA_CODEC_ENTRY(0x10ec0286, "ALC286", patch_alc269),
+       HDA_CODEC_ENTRY(0x10ec0287, "ALC287", patch_alc269),
        HDA_CODEC_ENTRY(0x10ec0288, "ALC288", patch_alc269),
        HDA_CODEC_ENTRY(0x10ec0289, "ALC289", patch_alc269),
        HDA_CODEC_ENTRY(0x10ec0290, "ALC290", patch_alc269),

diff --combined sound/usb/quirks.c
index a8ece17010686da6628b6961970ed1fda27cd4d2,d8a765be5dfe8e2f62d240e4f1a83da13febab5c..c0e3bc4afec6a0defbaf2953f6e3f74ee6ef54f6
--- 1/sound/usb/quirks.c
--- 2/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@@ -1636,13 -1636,14 +1636,14 @@@ void snd_usb_ctl_msg_quirk(struct usb_d
            && (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS)
                msleep(20);
  
-       /* Zoom R16/24, Logitech H650e, Jabra 550a needs a tiny delay here,
-        * otherwise requests like get/set frequency return as failed despite
-        * actually succeeding.
+       /* Zoom R16/24, Logitech H650e, Jabra 550a, Kingston HyperX needs a tiny
+        * delay here, otherwise requests like get/set frequency return as
+        * failed despite actually succeeding.
         */
        if ((chip->usb_id == USB_ID(0x1686, 0x00dd) ||
             chip->usb_id == USB_ID(0x046d, 0x0a46) ||
-            chip->usb_id == USB_ID(0x0b0e, 0x0349)) &&
+            chip->usb_id == USB_ID(0x0b0e, 0x0349) ||
+            chip->usb_id == USB_ID(0x0951, 0x16ad)) &&
            (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS)
                usleep_range(1000, 2000);
  }
@@@ -1687,7 -1688,7 +1688,7 @@@ u64 snd_usb_interface_dsd_format_quirks
  
        case USB_ID(0x0d8c, 0x0316): /* Hegel HD12 DSD */
        case USB_ID(0x10cb, 0x0103): /* The Bit Opus #3; with fp->dsd_raw */
-       case USB_ID(0x16b0, 0x06b2): /* NuPrime DAC-10 */
+       case USB_ID(0x16d0, 0x06b2): /* NuPrime DAC-10 */
        case USB_ID(0x16d0, 0x09dd): /* Encore mDSD */
        case USB_ID(0x16d0, 0x0733): /* Furutech ADL Stratos */
        case USB_ID(0x16d0, 0x09db): /* NuPrime Audio DAC-9 */
@@@ -1806,6 -1807,20 +1807,6 @@@ void snd_usb_audioformat_attributes_qui
                 */
                fp->attributes &= ~UAC_EP_CS_ATTR_FILL_MAX;
                break;
 -      case USB_ID(0x1235, 0x8200):  /* Focusrite Scarlett 2i4 2nd gen */
 -      case USB_ID(0x1235, 0x8202):  /* Focusrite Scarlett 2i2 2nd gen */
 -      case USB_ID(0x1235, 0x8205):  /* Focusrite Scarlett Solo 2nd gen */
 -              /*
 -               * Reports that playback should use Synch: Synchronous
 -               * while still providing a feedback endpoint.
 -               * Synchronous causes snapping on some sample rates.
 -               * Force it to use Synch: Asynchronous.
 -               */
 -              if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
 -                      fp->ep_attr &= ~USB_ENDPOINT_SYNCTYPE;
 -                      fp->ep_attr |= USB_ENDPOINT_SYNC_ASYNC;
 -              }
 -              break;
        }
  }