Changeset 772 for GPL/trunk/alsa-kernel/pci/hda

Timestamp:

Apr 19, 2025, 8:08:37 PM (7 months ago)

Author:

David Azarewicz

Message:

Merge in changes from 6.6-LTS branch.
Fixed additional 25+ problems.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/hda/alc260_quirks.c (deleted)
• alsa-kernel/pci/hda/alc262_quirks.c (deleted)
• alsa-kernel/pci/hda/alc880_quirks.c (deleted)
• alsa-kernel/pci/hda/alc882_quirks.c (deleted)
• alsa-kernel/pci/hda/alc_quirks.c (deleted)
• alsa-kernel/pci/hda/hda_auto_parser.c (modified) (7 diffs)
• alsa-kernel/pci/hda/hda_auto_parser.h (modified) (2 diffs)
• alsa-kernel/pci/hda/hda_beep.h (modified) (1 diff)
• alsa-kernel/pci/hda/hda_bind.c (modified) (6 diffs)
• alsa-kernel/pci/hda/hda_codec.c (modified) (25 diffs)
• alsa-kernel/pci/hda/hda_component2.h (copied) (copied from GPL/branches/uniaud32-exp/alsa-kernel/pci/hda/hda_component2.h )
• alsa-kernel/pci/hda/hda_controller.c (modified) (3 diffs)
• alsa-kernel/pci/hda/hda_controller.h (modified) (1 diff)
• alsa-kernel/pci/hda/hda_eld.c (modified) (3 diffs)
• alsa-kernel/pci/hda/hda_generic.c (modified) (7 diffs)
• alsa-kernel/pci/hda/hda_generic.h (modified) (3 diffs)
• alsa-kernel/pci/hda/hda_hwdep.c (modified) (1 diff)
• alsa-kernel/pci/hda/hda_i915.c (deleted)
• alsa-kernel/pci/hda/hda_intel.c (modified) (42 diffs)
• alsa-kernel/pci/hda/hda_jack.c (modified) (1 diff)
• alsa-kernel/pci/hda/hda_jack.h (modified) (1 diff)
• alsa-kernel/pci/hda/hda_local.h (modified) (4 diffs)
• alsa-kernel/pci/hda/hda_sysfs.c (modified) (9 diffs)
• alsa-kernel/pci/hda/patch_analog.c (modified) (3 diffs)
• alsa-kernel/pci/hda/patch_ca0132.c (modified) (15 diffs)
• alsa-kernel/pci/hda/patch_cirrus.c (modified) (5 diffs)
• alsa-kernel/pci/hda/patch_conexant.c (modified) (27 diffs)
• alsa-kernel/pci/hda/patch_hdmi.c (modified) (67 diffs)
• alsa-kernel/pci/hda/patch_realtek.c (modified) (182 diffs)
• alsa-kernel/pci/hda/patch_sigmatel.c (modified) (20 diffs)
• alsa-kernel/pci/hda/patch_via.c (modified) (3 diffs)

GPL/trunk/alsa-kernel/pci/hda/hda_auto_parser.c

@@ -85 +85 @@
         /* In case one has boost and the other one has not,
            pick the one with boost first. */
-        return (int)(b->has_boost_on_pin - a->has_boost_on_pin);
-}
-
+        if (a->has_boost_on_pin != b->has_boost_on_pin)
+                return (int)(b->has_boost_on_pin - a->has_boost_on_pin);
+
+        /* Keep the original order */
+        return a->order - b->order;
+}
+
+#ifdef TARGET_OS2
+/**
+ * swap - swap values of @a and @b
+ * @a: first value
+ * @b: second value
+ */
+#define swap(a, b) \
+        do { u16 __tmp = (a); (a) = (b); (b) = __tmp; } while (0)
+#endif
 /* Reorder the surround channels
  * ALSA sequence is front/surr/clfe/side
@@ -97 +110 @@
 static void reorder_outputs(unsigned int nums, hda_nid_t *pins)
 {
-        hda_nid_t nid;
-
         switch (nums) {
         case 3:
         case 4:
-                nid = pins[1];
-                pins[1] = pins[2];
-                pins[2] = nid;
+                swap(pins[1], pins[2]);
                 break;
         }
@@ -409 +418 @@
 
         /* sort inputs in the order of AUTO_PIN_* type */
+        for (i = 0; i < cfg->num_inputs; i++)
+                cfg->inputs[i].order = i;
         sort(cfg->inputs, cfg->num_inputs, sizeof(cfg->inputs[0]),
              compare_input_type, NULL);
@@ -965 +976 @@
 EXPORT_SYMBOL_GPL(snd_hda_pick_pin_fixup);
 
+/* check whether the given quirk entry matches with vendor/device pair */
+static bool hda_quirk_match(u16 vendor, u16 device, const struct hda_quirk *q)
+{
+        if (q->subvendor != vendor)
+                return false;
+        return !q->subdevice ||
+                (device & q->subdevice_mask) == q->subdevice;
+}
+
+/* look through the quirk list and return the matching entry */
+static const struct hda_quirk *
+hda_quirk_lookup_id(u16 vendor, u16 device, const struct hda_quirk *list)
+{
+        const struct hda_quirk *q;
+
+        for (q = list; q->subvendor || q->subdevice; q++) {
+                if (hda_quirk_match(vendor, device, q))
+                        return q;
+        }
+        return NULL;
+}
+
 /**
  * snd_hda_pick_fixup - Pick up a fixup matching with PCI/codec SSID or model string
@@ -984 +1017 @@
 void snd_hda_pick_fixup(struct hda_codec *codec,
                         const struct hda_model_fixup *models,
-                        const struct snd_pci_quirk *quirk,
+                        const struct hda_quirk *quirk,
                         const struct hda_fixup *fixlist)
 {
-        const struct snd_pci_quirk *q;
+        const struct hda_quirk *q;
         int id = HDA_FIXUP_ID_NOT_SET;
         const char *name = NULL;
         const char *type = NULL;
         unsigned int vendor, device;
+        u16 pci_vendor, pci_device;
+        u16 codec_vendor, codec_device;
 
         if (codec->fixup_id != HDA_FIXUP_ID_NOT_SET)
@@ -1022 +1057 @@
                 return;
 
+        if (codec->bus->pci) {
+                pci_vendor = codec->bus->pci->subsystem_vendor;
+                pci_device = codec->bus->pci->subsystem_device;
+        }
+
+        codec_vendor = codec->core.subsystem_id >> 16;
+        codec_device = codec->core.subsystem_id & 0xffff;
+
         /* match with the SSID alias given by the model string "XXXX:YYYY" */
         if (codec->modelname &&
             sscanf(codec->modelname, "%04x:%04x", &vendor, &device) == 2) {
-                q = snd_pci_quirk_lookup_id(vendor, device, quirk);
+                q = hda_quirk_lookup_id(vendor, device, quirk);
                 if (q) {
                         type = "alias SSID";
@@ -1032 +1075 @@
         }
 
-        /* match with the PCI SSID */
-        q = snd_pci_quirk_lookup(codec->bus->pci, quirk);
-        if (q) {
-                type = "PCI SSID";
-                goto found_device;
+        /* match primarily with the PCI SSID */
+        for (q = quirk; q->subvendor || q->subdevice; q++) {
+                /* if the entry is specific to codec SSID, check with it */
+                if (!codec->bus->pci || q->match_codec_ssid) {
+                        if (hda_quirk_match(codec_vendor, codec_device, q)) {
+                                type = "codec SSID";
+                                goto found_device;
+                        }
+                } else {
+                        if (hda_quirk_match(pci_vendor, pci_device, q)) {
+                                type = "PCI SSID";
+                                goto found_device;
+                        }
+                }
         }
 
         /* match with the codec SSID */
-        q = snd_pci_quirk_lookup_id(codec->core.subsystem_id >> 16,
-                                    codec->core.subsystem_id & 0xffff,
-                                    quirk);
+        q = hda_quirk_lookup_id(codec_vendor, codec_device, quirk);
         if (q) {
                 type = "codec SSID";

GPL/trunk/alsa-kernel/pci/hda/hda_auto_parser.h

@@ -8 +8 @@
 #ifndef __SOUND_HDA_AUTO_PARSER_H
 #define __SOUND_HDA_AUTO_PARSER_H
+
+#include "hda_local.h"
 
 /*
@@ -36 +38 @@
         unsigned int is_headphone_mic:1; /* Mic-only in headphone jack */
         unsigned int has_boost_on_pin:1;
+        int order;
 };
 

GPL/trunk/alsa-kernel/pci/hda/hda_beep.h

@@ -26 +26 @@
         unsigned int linear_tone:1;     /* linear tone for IDT/STAC codec */
         unsigned int playing:1;
+        unsigned int keep_power_at_enable:1;    /* set by driver */
         struct work_struct beep_work; /* scheduled task for beep event */
         struct mutex mutex;

GPL/trunk/alsa-kernel/pci/hda/hda_bind.c

@@ -11 +11 @@
 #include <linux/export.h>
 #include <linux/pm.h>
-#include <linux/pm_runtime.h>
 #include <sound/core.h>
 #include <sound/hda_codec.h>
 #include "hda_local.h"
+#include "hda_jack.h"
 
 #pragma disable_message (201)
@@ -146 +146 @@
  error:
         snd_hda_codec_cleanup_for_unbind(codec);
+        codec->preset = NULL;
         return err;
 }
@@ -159 +160 @@
         }
 
-        refcount_dec(&codec->pcm_ref);
         snd_hda_codec_disconnect_pcms(codec);
-        wait_event(codec->remove_sleep, !refcount_read(&codec->pcm_ref));
+        snd_hda_jack_tbl_disconnect(codec);
+        if (!refcount_dec_and_test(&codec->pcm_ref))
+                wait_event(codec->remove_sleep, !refcount_read(&codec->pcm_ref));
         snd_power_sync_ref(codec->bus->card);
 
@@ -167 +169 @@
                 codec->patch_ops.free(codec);
         snd_hda_codec_cleanup_for_unbind(codec);
+        codec->preset = NULL;
         module_put(dev->driver->owner);
         return 0;
@@ -238 +241 @@
 static void codec_bind_module(struct hda_codec *codec)
 {
-#ifdef MODULE
+//#ifdef MODULE
         request_codec_module(codec);
         if (codec_probed(codec))
                 return;
-#endif
-}
-
-#if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI)
+//#endif
+}
+
+#if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI) || defined(CONFIG_SND_HDA_CODEC_HDMI)
 /* if all audio out widgets are digital, let's assume the codec as a HDMI/DP */
 static bool is_likely_hdmi_codec(struct hda_codec *codec)
 {
         hda_nid_t nid;
+
+        /*
+         * For ASoC users, if snd_hda_hdmi_codec module is denylisted and any
+         * event causes i915 enumeration to fail, ->wcaps remains uninitialized.
+         */
+        if (!codec->wcaps)
+                return true;
 
         for_each_hda_codec_node(nid, codec) {
@@ -327 +337 @@
                 err = codec_bind_generic(codec);
                 if (err < 0) {
-                        codec_dbg(codec, "Unable to bind the codec\n");
+                        codec_dbg(codec, "Unable to bind the codec - err = %d\n",err);
                         return err;
                 }

GPL/trunk/alsa-kernel/pci/hda/hda_codec.c

@@ -779 +779 @@
 }
 
+/**
+ * snd_hda_codec_cleanup_for_unbind - Prepare codec for removal
+ * @codec: codec device to cleanup
+ */
 void snd_hda_codec_cleanup_for_unbind(struct hda_codec *codec)
 {
-        if (codec->registered) {
+        if (codec->core.registered) {
                 /* pm_runtime_put() is called in snd_hdac_device_exit() */
                 pm_runtime_get_noresume(hda_codec_dev(codec));
                 pm_runtime_disable(hda_codec_dev(codec));
-                codec->registered = 0;
+                codec->core.registered = 0;
         }
 
@@ -804 +808 @@
         snd_array_free(&codec->spdif_out);
         snd_array_free(&codec->verbs);
-        codec->preset = NULL;
         codec->follower_dig_outs = NULL;
         codec->spdif_status_reset = 0;
@@ -826 +829 @@
 }
 
-/* also called from hda_bind.c */
+/**
+ * snd_hda_codec_register - Finalize codec initialization
+ * @codec: codec device to register
+ *
+ * Also called from hda_bind.c
+ */
 void snd_hda_codec_register(struct hda_codec *codec)
 {
-        if (codec->registered)
+        if (codec->core.registered)
                 return;
         if (device_is_registered(hda_codec_dev(codec))) {
@@ -836 +844 @@
                 /* it was powered up in snd_hda_codec_new(), now all done */
                 snd_hda_power_down(codec);
-                codec->registered = 1;
-        }
-}
+                codec->core.registered = 1;
+        }
+}
+EXPORT_SYMBOL_GPL(snd_hda_codec_register);
 
 static int snd_hda_codec_dev_register(struct snd_device *device)
@@ -846 +855 @@
 }
 
-static int snd_hda_codec_dev_free(struct snd_device *device)
-{
-        struct hda_codec *codec = device->device_data;
-
+/**
+ * snd_hda_codec_unregister - Unregister specified codec device
+ * @codec: codec device to unregister
+ */
+void snd_hda_codec_unregister(struct hda_codec *codec)
+{
         codec->in_freeing = 1;
         /*
@@ -866 +877 @@
         if (codec->core.type == HDA_DEV_LEGACY)
                 put_device(hda_codec_dev(codec));
-
+}
+EXPORT_SYMBOL_GPL(snd_hda_codec_unregister);
+
+static int snd_hda_codec_dev_free(struct snd_device *device)
+{
+        snd_hda_codec_unregister(device->device_data);
         return 0;
 }
@@ -879 +895 @@
         kfree(codec->modelname);
         kfree(codec->wcaps);
-
-        /*
-         * In the case of ASoC HD-audio, hda_codec is device managed.
-         * It will be freed when the ASoC device is removed.
-         */
-        if (codec->core.type == HDA_DEV_LEGACY)
-                kfree(codec);
+        kfree(codec);
 }
 
 #define DEV_NAME_LEN 31
 
-static int snd_hda_codec_device_init(struct hda_bus *bus, struct snd_card *card,
-                        unsigned int codec_addr, struct hda_codec **codecp)
-{
+/**
+ * snd_hda_codec_device_init - allocate HDA codec device
+ * @bus: codec's parent bus
+ * @codec_addr: the codec address on the parent bus
+ * @fmt: format string for the device's name
+ *
+ * Returns newly allocated codec device or ERR_PTR() on failure.
+ */
+struct hda_codec *
+snd_hda_codec_device_init(struct hda_bus *bus, unsigned int codec_addr,
+                          const char *fmt, ...)
+{
+        va_list vargs;
         char name[DEV_NAME_LEN];
         struct hda_codec *codec;
         int err;
 
-        dev_dbg(card->dev, "%s: entry\n", __func__);
-
         if (snd_BUG_ON(!bus))
-                return -EINVAL;
+                return ERR_PTR(-EINVAL);
         if (snd_BUG_ON(codec_addr > HDA_MAX_CODEC_ADDRESS))
-                return -EINVAL;
+                return ERR_PTR(-EINVAL);
 
         codec = kzalloc(sizeof(*codec), GFP_KERNEL);
         if (!codec)
-                return -ENOMEM;
-
-        sprintf(name, "hdaudioC%dD%d", card->number, codec_addr);
+                return ERR_PTR(-ENOMEM);
+
+        va_start(vargs, fmt);
+        vsprintf(name, fmt, vargs);
+        va_end(vargs);
+
         err = snd_hdac_device_init(&codec->core, &bus->core, name, codec_addr);
         if (err < 0) {
                 kfree(codec);
-                return err;
-        }
-
+                return ERR_PTR(err);
+        }
+
+        codec->bus = bus;
+        codec->depop_delay = -1;
+        codec->fixup_id = HDA_FIXUP_ID_NOT_SET;
+        codec->core.dev.release = snd_hda_codec_dev_release;
         codec->core.type = HDA_DEV_LEGACY;
-        *codecp = codec;
-
-        return err;
-}
-
-/**
- * snd_hda_codec_new - create a HDA codec
- * @bus: the bus to assign
- * @card: card for this codec
- * @codec_addr: the codec address
- * @codecp: the pointer to store the generated codec
- *
- * Returns 0 if successful, or a negative error code.
- */
-int snd_hda_codec_new(struct hda_bus *bus, struct snd_card *card,
-                      unsigned int codec_addr, struct hda_codec **codecp)
-{
-        int ret;
-
-        ret = snd_hda_codec_device_init(bus, card, codec_addr, codecp);
-        if (ret < 0)
-                return ret;
-
-        return snd_hda_codec_device_new(bus, card, codec_addr, *codecp);
-}
-EXPORT_SYMBOL_GPL(snd_hda_codec_new);
-
-int snd_hda_codec_device_new(struct hda_bus *bus, struct snd_card *card,
-                        unsigned int codec_addr, struct hda_codec *codec)
-{
-        char component[31];
-        hda_nid_t fg;
-        int err;
-        static const struct snd_device_ops dev_ops = {
-                .dev_register = snd_hda_codec_dev_register,
-                .dev_free = snd_hda_codec_dev_free,
-        };
-
-        dev_dbg(card->dev, "%s: entry\n", __func__);
-
-        if (snd_BUG_ON(!bus))
-                return -EINVAL;
-        if (snd_BUG_ON(codec_addr > HDA_MAX_CODEC_ADDRESS))
-                return -EINVAL;
-
-        codec->core.dev.release = snd_hda_codec_dev_release;
-        codec->core.exec_verb = codec_exec_verb;
-
-        codec->bus = bus;
-        codec->card = card;
-        codec->addr = codec_addr;
+
         mutex_init(&codec->spdif_mutex);
         mutex_init(&codec->control_mutex);
@@ -979 +954 @@
         INIT_LIST_HEAD(&codec->conn_list);
         INIT_LIST_HEAD(&codec->pcm_list_head);
+        INIT_DELAYED_WORK(&codec->jackpoll_work, hda_jackpoll_work);
         refcount_set(&codec->pcm_ref, 1);
         init_waitqueue_head(&codec->remove_sleep);
 
-        INIT_DELAYED_WORK(&codec->jackpoll_work, hda_jackpoll_work);
-        codec->depop_delay = -1;
-        codec->fixup_id = HDA_FIXUP_ID_NOT_SET;
+        return codec;
+}
+EXPORT_SYMBOL_GPL(snd_hda_codec_device_init);
+
+/**
+ * snd_hda_codec_new - create a HDA codec
+ * @bus: the bus to assign
+ * @card: card for this codec
+ * @codec_addr: the codec address
+ * @codecp: the pointer to store the generated codec
+ *
+ * Returns 0 if successful, or a negative error code.
+ */
+int snd_hda_codec_new(struct hda_bus *bus, struct snd_card *card,
+                      unsigned int codec_addr, struct hda_codec **codecp)
+{
+        struct hda_codec *codec;
+        int ret;
+
+        codec = snd_hda_codec_device_init(bus, codec_addr, "hdaudioC%dD%d",
+                                          card->number, codec_addr);
+        if (IS_ERR(codec))
+                return PTR_ERR(codec);
+        *codecp = codec;
+
+        ret = snd_hda_codec_device_new(bus, card, codec_addr, *codecp, true);
+        if (ret)
+                put_device(hda_codec_dev(*codecp));
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(snd_hda_codec_new);
+
+int snd_hda_codec_device_new(struct hda_bus *bus, struct snd_card *card,
+                        unsigned int codec_addr, struct hda_codec *codec,
+                        bool snddev_managed)
+{
+        char component[31];
+        hda_nid_t fg;
+        int err;
+        static const struct snd_device_ops dev_ops = {
+                .dev_register = snd_hda_codec_dev_register,
+                .dev_free = snd_hda_codec_dev_free,
+        };
+
+        dev_dbg(card->dev, "%s: entry\n", __func__);
+
+        if (snd_BUG_ON(!bus))
+                return -EINVAL;
+        if (snd_BUG_ON(codec_addr > HDA_MAX_CODEC_ADDRESS))
+                return -EINVAL;
+
+        codec->core.exec_verb = codec_exec_verb;
+        codec->card = card;
+        codec->addr = codec_addr;
 
 #ifdef CONFIG_PM
@@ -994 +1022 @@
         if (codec->bus->modelname) {
                 codec->modelname = kstrdup(codec->bus->modelname, GFP_KERNEL);
-                if (!codec->modelname) {
-                        err = -ENOMEM;
-                        goto error;
-                }
+                if (!codec->modelname)
+                        return -ENOMEM;
         }
 
@@ -1003 +1029 @@
         err = read_widget_caps(codec, fg);
         if (err < 0)
-                goto error;
+                return err;
         err = read_pin_defaults(codec);
         if (err < 0)
-                goto error;
+                return err;
 
         /* power-up all before initialization */
@@ -1020 +1046 @@
         snd_component_add(card, component);
 
-        err = snd_device_new(card, SNDRV_DEV_CODEC, codec, &dev_ops);
-        if (err < 0)
-                goto error;
-
+        if (snddev_managed) {
+                /* ASoC features component management instead */
+                err = snd_device_new(card, SNDRV_DEV_CODEC, codec, &dev_ops);
+                if (err < 0)
+                        return err;
+        }
+
+#ifdef CONFIG_PM
         /* PM runtime needs to be enabled later after binding codec */
-        pm_runtime_forbid(&codec->core.dev);
-
-        return 0;
-
- error:
-        put_device(hda_codec_dev(codec));
-        return err;
+        if (codec->core.dev.power.runtime_auto)
+                pm_runtime_forbid(&codec->core.dev);
+        else
+                /* Keep the usage_count consistent across subsequent probing */
+                pm_runtime_get_noresume(&codec->core.dev);
+#endif
+
+        return 0;
 }
 EXPORT_SYMBOL_GPL(snd_hda_codec_device_new);
@@ -1751 +1782 @@
         struct hda_nid_item *items = codec->mixers.list;
 
-        down_write(&codec->card->controls_rwsem);
         for (i = 0; i < codec->mixers.used; i++)
                 snd_ctl_remove(codec->card, items[i].kctl);
-        up_write(&codec->card->controls_rwsem);
         snd_array_free(&codec->mixers);
         snd_array_free(&codec->nids);
@@ -2445 +2474 @@
                 /* suppose a single SPDIF device */
                 for (dig_mix = dig_mixes; dig_mix->name; dig_mix++) {
+                        struct snd_ctl_elem_id id;
+
                         kctl = find_mixer_ctl(codec, dig_mix->name, 0, 0);
                         if (!kctl)
                                 break;
-                        kctl->id.index = spdif_index;
+                        id = kctl->id;
+                        id.index = spdif_index;
+                        err = snd_ctl_rename_id(codec->card, &kctl->id, &id);
+                        if (err < 0)
+                                return err;
                 }
                 bus->primary_dig_out_type = HDA_PCM_TYPE_HDMI;
@@ -2872 +2907 @@
         if (codec->patch_ops.suspend)
                 codec->patch_ops.suspend(codec);
-        hda_cleanup_all_streams(codec);
+        if (!codec->no_stream_clean_at_suspend)
+                hda_cleanup_all_streams(codec);
         state = hda_set_power_state(codec, AC_PWRST_D3);
         update_power_acct(codec, true);
@@ -2920 +2956 @@
 
         cancel_delayed_work_sync(&codec->jackpoll_work);
+
         state = hda_call_codec_suspend(codec);
         if (codec->link_down_at_suspend ||
@@ -2926 +2963 @@
                 snd_hdac_codec_link_down(&codec->core);
         snd_hda_codec_display_power(codec, false);
+
+        if (codec->bus->jackpoll_in_suspend /*&&
+                (dev->power.power_state.event != PM_EVENT_SUSPEND)*/)
+                schedule_delayed_work(&codec->jackpoll_work,
+                                        codec->jackpoll_interval);
         return 0;
 }
@@ -2949 +2991 @@
 static int hda_codec_pm_prepare(struct device *dev)
 {
+        struct hda_codec *codec = dev_to_hda_codec(dev);
+
+        cancel_delayed_work_sync(&codec->jackpoll_work);
         dev->power.power_state = PMSG_SUSPEND;
         return pm_runtime_suspended(dev);
@@ -2982 +3027 @@
 static int hda_codec_pm_freeze(struct device *dev)
 {
+        struct hda_codec *codec = dev_to_hda_codec(dev);
+
+        cancel_delayed_work_sync(&codec->jackpoll_work);
         dev->power.power_state = PMSG_FREEZE;
         return pm_runtime_force_suspend(dev);
@@ -3021 +3069 @@
 
         /* Skip the shutdown if codec is not registered */
-        if (!codec->registered)
+        if (!codec->core.registered)
                 return;
 
+        cancel_delayed_work_sync(&codec->jackpoll_work);
         list_for_each_entry(cpcm, &codec->pcm_list_head, list, struct hda_pcm)
                 snd_pcm_suspend_all(cpcm->pcm);
@@ -3137 +3186 @@
                                 info->formats ? NULL : &info->formats,
                                 info->maxbps ? NULL : &info->maxbps);
-                if (err < 0)
-                        return err;
+                if (err < 0){
+                                codec_warn(codec,"exiting here\n");
+                        return err;}
         }
         if (info->ops.open == NULL)
@@ -3364 +3414 @@
                         if (!kctl)
                                 return -ENOMEM;
-                        if (addr > 0)
+                        /* Do not use the id.device field for MIXER elements.
+                         * This field is for real device numbers (like PCM) but codecs
+                         * are hidden components from the user space view (unrelated
+                         * to the mixer element identification).
+                         */
+                        if (addr > 0 && codec->ctl_dev_id)
                                 kctl->id.device = addr;
                         if (idx > 0)
@@ -3375 +3430 @@
                          * primary codec), then try another control index
                          */
-                        if (!addr && codec->core.addr)
+                        if (!addr && codec->core.addr) {
                                 addr = codec->core.addr;
-                        else if (!idx && !knew->index) {
+                                if (!codec->ctl_dev_id)
+                                        idx += 10 * addr;
+                        } else if (!idx && !knew->index) {
                                 idx = find_empty_mixer_ctl_idx(codec,
                                                                knew->name, 0);
@@ -3391 +3448 @@
 
 #ifdef CONFIG_PM
-static void codec_set_power_save(struct hda_codec *codec, int delay)
+/**
+ * snd_hda_codec_set_power_save - Configure codec's runtime PM
+ * @codec: codec device to configure
+ * @delay: autosuspend delay
+ */
+void snd_hda_codec_set_power_save(struct hda_codec *codec, int delay)
 {
         struct device *dev = hda_codec_dev(codec);
@@ -3409 +3471 @@
         }
 }
+EXPORT_SYMBOL_GPL(snd_hda_codec_set_power_save);
 
 /**
@@ -3422 +3485 @@
 
         list_for_each_codec(c, bus)
-                codec_set_power_save(c, delay);
+                snd_hda_codec_set_power_save(c, delay);
 }
 EXPORT_SYMBOL_GPL(snd_hda_set_power_save);

GPL/trunk/alsa-kernel/pci/hda/hda_controller.c

@@ -268 +268 @@
                 if (start) {
                         azx_dev->insufficient = 1;
-                        snd_hdac_stream_start(azx_stream(azx_dev), true);
+                        snd_hdac_stream_start(azx_stream(azx_dev));
                 } else {
                         snd_hdac_stream_stop(azx_stream(azx_dev));
@@ -1058 +1058 @@
 {
         struct hdac_bus *bus = azx_bus(chip);
-        struct hdac_stream *s;
-
-        list_for_each_entry(s, &bus->stream_list, list, struct hdac_stream)
-                snd_hdac_stream_stop(s);
+
+        snd_hdac_stop_streams(bus);
 }
 EXPORT_SYMBOL_GPL(azx_stop_all_streams);
@@ -1263 +1261 @@
                         codec->jackpoll_interval = chip->jackpoll_interval;
                         codec->beep_mode = chip->beep_mode;
+                        codec->ctl_dev_id = chip->ctl_dev_id;
                         codecs++;
                 }

GPL/trunk/alsa-kernel/pci/hda/hda_controller.h

@@ -125 +125 @@
         int  codec_probe_mask; /* copied from probe_mask option */
         unsigned int beep_mode;
+        bool ctl_dev_id;
 
 #ifdef CONFIG_SND_HDA_PATCH_LOADER

GPL/trunk/alsa-kernel/pci/hda/hda_eld.c

@@ -252 +252 @@
 #ifndef TARGET_OS2 //FIXME Error! E1029: Expression must be 'pointer to ...'
         e->aud_synch_delay = GRAB_BITS(buf, 6, 0, 8) * 2;
+#else
+        int delay = GRAB_BITS(buf, 6, 0, 8);
+        e->aud_synch_delay = delay *2;
 #endif
         e->spk_alloc    = GRAB_BITS(buf, 7, 0, 7);
@@ -448 +451 @@
 
 void snd_hdmi_print_eld_info(struct hdmi_eld *eld,
-                             struct snd_info_buffer *buffer)
+                             struct snd_info_buffer *buffer,
+                             hda_nid_t pin_nid, int dev_id, hda_nid_t cvt_nid)
 {
         struct parsed_hdmi_eld *e = &eld->info;
@@ -507 +511 @@
         snd_iprintf(buffer, "monitor_present\t\t%d\n", eld->monitor_present);
         snd_iprintf(buffer, "eld_valid\t\t%d\n", eld->eld_valid);
+        snd_iprintf(buffer, "codec_pin_nid\t\t0x%x\n", pin_nid);
+        snd_iprintf(buffer, "codec_dev_id\t\t0x%x\n", dev_id);
+        snd_iprintf(buffer, "codec_cvt_nid\t\t0x%x\n", cvt_nid);
         if (!eld->eld_valid)
                 return;

GPL/trunk/alsa-kernel/pci/hda/hda_generic.c

@@ -1002 +1002 @@
 {
         char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
-        snprintf(name, sizeof(name), "%s %s %s", pfx, dir, sfx);
+        int len;
+
+        len = snprintf(name, sizeof(name), "%s %s %s", pfx, dir, sfx);
+        if (snd_BUG_ON(len >= sizeof(name)))
+                return -EINVAL;
         if (!add_control(spec, type, name, cidx, val))
                 return -ENOMEM;
@@ -1159 +1163 @@
 }
 
-static const char * const channel_name[4] = {
-        "Front", "Surround", "CLFE", "Side"
+static const char * const channel_name[] = {
+        "Front", "Surround", "CLFE", "Side", "Back",
 };
 
@@ -1186 +1190 @@
         /* multi-io channels */
         if (ch >= cfg->line_outs)
-                return channel_name[ch];
+                goto fixed_name;
 
         switch (cfg->line_out_type) {
@@ -1238 +1242 @@
                 return "Line Out";
 
+ fixed_name:
         if (ch >= ARRAY_SIZE(channel_name)) {
                 snd_BUG();
@@ -1382 +1387 @@
                 hda_nid_t pin = pins[i];
 
-                if (!spec->obey_preferred_dacs) {
+                if (!spec->preferred_dacs) {
                         path = snd_hda_get_path_from_idx(codec, path_idx[i]);
                         if (path) {
@@ -1394 +1399 @@
                         if (is_dac_already_used(codec, dacs[i]))
                                 badness += bad->shared_primary;
-                } else if (spec->obey_preferred_dacs) {
+                } else if (spec->preferred_dacs) {
                         badness += BAD_NO_PRIMARY_DAC;
                 }
@@ -4963 +4968 @@
 EXPORT_SYMBOL_GPL(snd_hda_gen_stream_pm);
 
+/* forcibly mute the speaker output without caching; return true if updated */
+static bool force_mute_output_path(struct hda_codec *codec, hda_nid_t nid)
+{
+        if (!nid)
+                return false;
+        if (!nid_has_mute(codec, nid, HDA_OUTPUT))
+                return false; /* no mute, skip */
+        if (snd_hda_codec_amp_read(codec, nid, 0, HDA_OUTPUT, 0) &
+            snd_hda_codec_amp_read(codec, nid, 1, HDA_OUTPUT, 0) &
+            HDA_AMP_MUTE)
+                return false; /* both channels already muted, skip */
+
+        /* direct amp update without caching */
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                            AC_AMP_SET_OUTPUT | AC_AMP_SET_LEFT |
+                            AC_AMP_SET_RIGHT | HDA_AMP_MUTE);
+        return true;
+}
+
+/**
+ * snd_hda_gen_shutup_speakers - Forcibly mute the speaker outputs
+ * @codec: the HDA codec
+ *
+ * Forcibly mute the speaker outputs, to be called at suspend or shutdown.
+ *
+ * The mute state done by this function isn't cached, hence the original state
+ * will be restored at resume.
+ *
+ * Return true if the mute state has been changed.
+ */
+bool snd_hda_gen_shutup_speakers(struct hda_codec *codec)
+{
+        struct hda_gen_spec *spec = codec->spec;
+        const int *paths;
+        const struct nid_path *path;
+        int i, p, num_paths;
+        bool updated = false;
+
+        /* if already powered off, do nothing */
+        if (!snd_hdac_is_power_on(&codec->core))
+                return false;
+
+        if (spec->autocfg.line_out_type == AUTO_PIN_SPEAKER_OUT) {
+                paths = spec->out_paths;
+                num_paths = spec->autocfg.line_outs;
+        } else {
+                paths = spec->speaker_paths;
+                num_paths = spec->autocfg.speaker_outs;
+        }
+
+        for (i = 0; i < num_paths; i++) {
+                path = snd_hda_get_path_from_idx(codec, paths[i]);
+                if (!path)
+                        continue;
+                for (p = 0; p < path->depth; p++)
+                        if (force_mute_output_path(codec, path->path[p]))
+                                updated = true;
+        }
+
+        return updated;
+}
+EXPORT_SYMBOL_GPL(snd_hda_gen_shutup_speakers);
+
 /**
  * snd_hda_gen_parse_auto_config - Parse the given BIOS configuration and

GPL/trunk/alsa-kernel/pci/hda/hda_generic.h

@@ -10 +10 @@
 
 #include <linux/leds.h>
+#include "hda_auto_parser.h"
+
+struct hda_jack_callback;
 
 /* table entry for multi-io paths */
@@ -184 +187 @@
 
         /* for pin sensing */
-        /* current status; set in hda_geneic.c */
+        /* current status; set in hda_generic.c */
         unsigned int hp_jack_present:1;
         unsigned int line_jack_present:1;
@@ -353 +356 @@
                                      int (*callback)(struct led_classdev *,
                                                      enum led_brightness));
+bool snd_hda_gen_shutup_speakers(struct hda_codec *codec);
 
 #endif /* __SOUND_HDA_GENERIC_H */

GPL/trunk/alsa-kernel/pci/hda/hda_hwdep.c

@@ -115 +115 @@
 
         /* for sysfs */
-        hwdep->dev.groups = snd_hda_dev_attr_groups;
-        dev_set_drvdata(&hwdep->dev, codec);
+        hwdep->dev->groups = snd_hda_dev_attr_groups;
+        dev_set_drvdata(hwdep->dev, codec);
 
         return 0;

GPL/trunk/alsa-kernel/pci/hda/hda_intel.c

@@ -56 +56 @@
 #include <linux/vgaarb.h>
 #include <linux/vga_switcheroo.h>
+#include <linux/apple-gmux.h>
 #include <linux/firmware.h>
 #include <sound/hda_codec.h>
@@ -97 +98 @@
 #define INTEL_SCH_HDA_DEVC_NOSNOOP       (0x1<<11)
 
-/* Define VIA HD Audio Device ID*/
-#define VIA_HDAC_DEVICE_ID              0x3288
-
 /* max number of SDs */
 /* ICH, ATI and VIA have 4 playback and 4 capture */
@@ -112 +110 @@
 #define ATIHDMI_NUM_CAPTURE     0
 #define ATIHDMI_NUM_PLAYBACK    8
-
-/* TERA has 4 playback and 3 capture */
-#define TERA_NUM_CAPTURE        3
-#define TERA_NUM_PLAYBACK       4
 
 
@@ -143 +137 @@
 #endif
 static bool dmic_detect = 1;
+#ifndef TARGET_OS2
+static bool ctl_dev_id = IS_ENABLED(CONFIG_SND_HDA_CTL_DEV_ID) ? 1 : 0;
+#else
+static bool ctl_dev_id = 0;
+#endif
 
 module_param_array(index, int, NULL, 0444);
@@ -181 +180 @@
                              "(0=off, 1=on) (default=1); "
                  "deprecated, use snd-intel-dspcfg.dsp_driver option instead");
+module_param(ctl_dev_id, bool, 0444);
+MODULE_PARM_DESC(ctl_dev_id, "Use control device identifier (based on codec address).");
 
 #ifdef CONFIG_PM
@@ -249 +250 @@
         AZX_DRIVER_ATIHDMI,
         AZX_DRIVER_ATIHDMI_NS,
+        AZX_DRIVER_GFHDMI,
         AZX_DRIVER_VIA,
         AZX_DRIVER_SIS,
@@ -258 +260 @@
         AZX_DRIVER_CMEDIA,
         AZX_DRIVER_ZHAOXIN,
+        AZX_DRIVER_LOONGSON,
         AZX_DRIVER_GENERIC,
         AZX_NUM_DRIVERS, /* keep this as last entry */
@@ -350 +353 @@
 #endif
 
-#define CONTROLLER_IN_GPU(pci) (((pci)->device == 0x0a0c) || \
-                                        ((pci)->device == 0x0c0c) || \
-                                        ((pci)->device == 0x0d0c) || \
-                                        ((pci)->device == 0x160c) || \
-                                        ((pci)->device == 0x490d) || \
-                                        ((pci)->device == 0x4f90) || \
-                                        ((pci)->device == 0x4f91) || \
-                                        ((pci)->device == 0x4f92))
-
-#define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)
-
 static const char * const driver_short_names[] = {
         [AZX_DRIVER_ICH] = "HDA Intel",
@@ -370 +362 @@
         [AZX_DRIVER_ATIHDMI] = "HDA ATI HDMI",
         [AZX_DRIVER_ATIHDMI_NS] = "HDA ATI HDMI",
+        [AZX_DRIVER_GFHDMI] = "HDA GF HDMI",
         [AZX_DRIVER_VIA] = "HDA VIA VT82xx",
         [AZX_DRIVER_SIS] = "HDA SIS966",
@@ -379 +372 @@
         [AZX_DRIVER_CMEDIA] = "HDA C-Media",
         [AZX_DRIVER_ZHAOXIN] = "HDA Zhaoxin",
+        [AZX_DRIVER_LOONGSON] = "HDA Loongson",
         [AZX_DRIVER_GENERIC] = "HD-Audio Generic",
 };
@@ -460 +454 @@
 }
 
+#ifndef TARGET_OS2
 /*
  * In BXT-P A0, HD-Audio DMA requests is later than expected,
@@ -475 +470 @@
         azx_writel(chip, VS_EM4L, val);
 }
+#endif
 
 /*
@@ -511 +507 @@
 
         /*
-         * the codecs are sharing the first link setting by default
-         * If other links are enabled for stream, they need similar fix
+         * Changes to LCTL.SCF are only needed for the first multi-link dealing
+         * with external codecs
          */
         val = readl(bus->mlcap + AZX_ML_BASE + AZX_REG_ML_LCTL);
-        val &= ~AZX_MLCTL_SPA;
-        val |= state << AZX_MLCTL_SPA_SHIFT;
+        val &= ~AZX_ML_LCTL_SPA;
+        val |= state << AZX_ML_LCTL_SPA_SHIFT;
         writel(val, bus->mlcap + AZX_ML_BASE + AZX_REG_ML_LCTL);
         /* wait for CPA */
@@ -522 +518 @@
         while (timeout) {
                 if (((readl(bus->mlcap + AZX_ML_BASE + AZX_REG_ML_LCTL)) &
-                    AZX_MLCTL_CPA) == (state << AZX_MLCTL_CPA_SHIFT))
+                    AZX_ML_LCTL_CPA) == (state << AZX_ML_LCTL_CPA_SHIFT))
                         return 0;
                 timeout--;
@@ -539 +535 @@
         /* 0. check lctl register value is correct or not */
         val = readl(bus->mlcap + AZX_ML_BASE + AZX_REG_ML_LCTL);
-        /* if SCF is already set, let's use it */
-        if ((val & ML_LCTL_SCF_MASK) != 0)
+        /* only perform additional configurations if the SCF is initially based on 6MHz */
+        if ((val & AZX_ML_LCTL_SCF) != 0)
                 return;
 
@@ -547 +543 @@
          * Any deviation may result in undefined behavior.
          */
-        if (((val & AZX_MLCTL_SPA) >> AZX_MLCTL_SPA_SHIFT) !=
-                ((val & AZX_MLCTL_CPA) >> AZX_MLCTL_CPA_SHIFT))
+        if (((val & AZX_ML_LCTL_SPA) >> AZX_ML_LCTL_SPA_SHIFT) !=
+                ((val & AZX_ML_LCTL_CPA) >> AZX_ML_LCTL_CPA_SHIFT))
                 return;
 
@@ -557 +553 @@
                 goto set_spa;
 
-        /* 2. update SCF to select a properly audio clock*/
-        val &= ~ML_LCTL_SCF_MASK;
+        /* 2. update SCF to select an audio clock different from 6MHz */
+        val &= ~AZX_ML_LCTL_SCF;
         val |= intel_get_lctl_scf(chip);
         writel(val, bus->mlcap + AZX_ML_BASE + AZX_REG_ML_LCTL);
@@ -589 +585 @@
         snd_hdac_set_codec_wakeup(bus, false);
 
+#ifndef TARGET_OS2
         /* reduce dma latency to avoid noise */
-        if (IS_BXT(pci))
+        if (HDA_CONTROLLER_IS_APL(pci))
                 bxt_reduce_dma_latency(chip);
-
+#endif
         if (bus->mlcap != NULL)
                 intel_init_lctl(chip);
@@ -671 +668 @@
         unsigned int pos;
         snd_pcm_uframes_t hwptr, target;
+
+        /*
+         * The value of the WALLCLK register is always 0
+         * on the Loongson controller, so we return directly.
+         */
+        if (chip->driver_type == AZX_DRIVER_LOONGSON)
+                return 1;
 
         wallclk = azx_readl(chip, WALLCLK) - azx_dev->core.start_wallclk;
@@ -1382 +1386 @@
                 return;
 
-        if (azx_has_pm_runtime(chip) && chip->running)
+        if (azx_has_pm_runtime(chip) && chip->running) {
                 pm_runtime_get_noresume(&pci->dev);
+                pm_runtime_forbid(&pci->dev);
+                pm_runtime_dont_use_autosuspend(&pci->dev);
+        }
+
         chip->running = 0;
 
@@ -1500 +1508 @@
                                  */
                                 if (((p->class >> 16) == PCI_BASE_CLASS_DISPLAY) &&
-                                    atpx_present())
+                                    (atpx_present() || apple_gmux_detect(NULL, NULL)))
                                         return p;
                                 pci_dev_put(p);
@@ -1768 +1776 @@
         if (chip->pci->vendor == PCI_VENDOR_ID_INTEL) {
                 switch (chip->pci->device) {
-                case 0x0f04: /* Baytrail */
-                case 0x2284: /* Braswell */
+                case PCI_DEVICE_ID_INTEL_HDA_BYT:
+                case PCI_DEVICE_ID_INTEL_HDA_BSW:
                         return 32;
+                case PCI_DEVICE_ID_INTEL_HDA_APL:
+                        return 64;
                 }
         }
 
         switch (chip->driver_type) {
+        /*
+         * increase the bdl size for Glenfly Gpus for hardware
+         * limitation on hdac interrupt interval
+         */
+        case AZX_DRIVER_GFHDMI:
+                return 128;
         case AZX_DRIVER_ICH:
         case AZX_DRIVER_PCH:
@@ -1802 +1818 @@
         *rchip = NULL;
 
-        err = pci_enable_device(pci);
+        err = pcim_enable_device(pci);
         if (err < 0)
                 return err;
 
-#ifndef TARGET_OS2
         hda = devm_kzalloc(&pci->dev, sizeof(*hda), GFP_KERNEL);
-#else
-        hda = kzalloc(sizeof(*hda), GFP_KERNEL);
-#endif
         if (!hda)
                 return -ENOMEM;
@@ -1851 +1863 @@
         /* use the non-cached pages in non-snoop mode */
         if (!azx_snoop(chip))
-                azx_bus(chip)->dma_type = SNDRV_DMA_TYPE_DEV_WC;
+                azx_bus(chip)->dma_type = SNDRV_DMA_TYPE_DEV_WC_SG;
 
         if (chip->driver_type == AZX_DRIVER_NVIDIA) {
@@ -1894 +1906 @@
         }
 #endif
-
-#ifndef TARGET_OS2
+        /*
+         * Fix response write request not synced to memory when handle
+         * hdac interrupt on Glenfly Gpus
+         */
+        if (chip->driver_type == AZX_DRIVER_GFHDMI)
+                bus->polling_mode = 1;
+
+        if (chip->driver_type == AZX_DRIVER_LOONGSON) {
+                bus->polling_mode = 1;
+                bus->not_use_interrupts = 1;
+                bus->access_sdnctl_in_dword = 1;
+        }
+
         err = pcim_iomap_regions(pci, 1 << 0, "ICH HD audio");
-#else
-        err = pci_request_regions(pci, "ICH HD audio");
-#endif
         if (err < 0)
                 return err;
 
         bus->addr = pci_resource_start(pci, 0);
-#ifndef TARGET_OS2
         bus->remap_addr = pcim_iomap_table(pci)[0];
-#else
-        bus->remap_addr = pci_ioremap_bar(pci, 0);
-#endif
         if (chip->driver_type == AZX_DRIVER_SKL)
                 snd_hdac_bus_parse_capabilities(bus);
@@ -1982 +1998 @@
         if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(dma_bits)))
                 dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(32));
+        dma_set_max_seg_size(&pci->dev, UINT_MAX);
 
         /* read number of streams from GCAP register instead of using
@@ -2001 +2018 @@
                         chip->capture_streams = ATIHDMI_NUM_CAPTURE;
                         break;
+                case AZX_DRIVER_GFHDMI:
                 case AZX_DRIVER_GENERIC:
                 default:
@@ -2106 +2124 @@
 };
 
+static DECLARE_BITMAP(probed_devs, SNDRV_CARDS);
+
 static int azx_probe(struct pci_dev *pci,
                      const struct pci_device_id *pci_id)
 {
+#ifdef TARGET_OS2
         static int dev;
+#endif
         struct snd_card *card;
         struct hda_intel *hda;
         struct azx *chip;
         bool schedule_probe;
+#ifndef TARGET_OS2
+        int dev;
+#endif
         int err;
 
@@ -2121 +2146 @@
         }
 
-        if (dev >= SNDRV_CARDS)
-                return -ENODEV;
+#ifndef TARGET_OS2
+        dev = find_first_zero_bit(probed_devs, SNDRV_CARDS);
+#endif
+        if (dev >= SNDRV_CARDS){
+                return -ENODEV;}
         if (!enable[dev]) {
+#ifdef TARGET_OS2
                 dev++;
+#else
+                set_bit(dev, probed_devs);
+#endif
                 return -ENOENT;
         }
@@ -2183 +2215 @@
 #endif /* CONFIG_SND_HDA_PATCH_LOADER */
 
-#ifndef CONFIG_SND_HDA_I915
-        if (CONTROLLER_IN_GPU(pci))
+#if !defined(CONFIG_SND_HDA_I915) && !defined(TARGET_OS2)
+        if (HDA_CONTROLLER_IN_GPU(pci))
                 dev_err(card->dev, "Haswell/Broadwell HDMI/DP must build in CONFIG_SND_HDA_I915\n");
 #endif
@@ -2199 +2231 @@
 #endif
 
-        dev++;
+        set_bit(dev, probed_devs);
         if (chip->disabled)
                 complete_all(&hda->probe_wait);
@@ -2240 +2272 @@
         /* https://bugzilla.kernel.org/show_bug.cgi?id=198611 */
         SND_PCI_QUIRK(0x17aa, 0x2227, "Lenovo X1 Carbon 3rd Gen", 0),
+        SND_PCI_QUIRK(0x17aa, 0x316e, "Lenovo ThinkCentre M70q", 0),
         /* https://bugzilla.redhat.com/show_bug.cgi?id=1689623 */
         SND_PCI_QUIRK(0x17aa, 0x367b, "Lenovo IdeaCentre B550", 0),
@@ -2246 +2279 @@
         /* https://bugs.launchpad.net/bugs/1821663 */
         SND_PCI_QUIRK(0x1631, 0xe017, "Packard Bell NEC IMEDIA 5204", 0),
+        /* KONTRON SinglePC may cause a stall at runtime resume */
+        SND_PCI_QUIRK(0x1734, 0x1232, "KONTRON SinglePC", 0),
+        /* Dell ALC3271 */
+        SND_PCI_QUIRK(0x1028, 0x0962, "Dell ALC3271", 0),
         {0}
 };
@@ -2300 +2337 @@
                          * codecs can be on the same link.
                          */
-                        if (CONTROLLER_IN_GPU(pci)) {
+                        if (HDA_CONTROLLER_IN_GPU(pci)) {
                                 dev_err(chip->card->dev,
                                         "HSW/BDW HD-audio HDMI/DP requires binding with gfx driver\n");
@@ -2311 +2348 @@
 
                 /* HSW/BDW controllers need this power */
-                if (CONTROLLER_IN_GPU(pci))
+                if (HDA_CONTROLLER_IN_GPU(pci))
                         hda->need_i915_power = true;
         }
@@ -2329 +2366 @@
         chip->beep_mode = beep_mode[dev];
 #endif
+
+        chip->ctl_dev_id = ctl_dev_id;
 
         /* create codec instances */
@@ -2422 +2461 @@
                 device_lock(&pci->dev);
 
+                clear_bit(chip->dev_index, probed_devs);
+                pci_set_drvdata(pci, NULL);
                 snd_card_free(card);
         }
@@ -2441 +2482 @@
 static const struct pci_device_id azx_ids[] = {
         /* CPT */
-        { PCI_DEVICE(0x8086, 0x1c20),
-          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
+        { PCI_DEVICE_DATA(INTEL, HDA_CPT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM) },
         /* PBG */
-        { PCI_DEVICE(0x8086, 0x1d20),
-          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
+        { PCI_DEVICE_DATA(INTEL, HDA_PBG, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM) },
         /* Panther Point */
-        { PCI_DEVICE(0x8086, 0x1e20),
-          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
+        { PCI_DEVICE_DATA(INTEL, HDA_PPT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM) },
         /* Lynx Point */
-        { PCI_DEVICE(0x8086, 0x8c20),
-          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
+        { PCI_DEVICE_DATA(INTEL, HDA_LPT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
         /* 9 Series */
-        { PCI_DEVICE(0x8086, 0x8ca0),
-          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
+        { PCI_DEVICE_DATA(INTEL, HDA_9_SERIES, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
         /* Wellsburg */
-        { PCI_DEVICE(0x8086, 0x8d20),
-          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
-        { PCI_DEVICE(0x8086, 0x8d21),
-          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
+        { PCI_DEVICE_DATA(INTEL, HDA_WBG_0, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
+        { PCI_DEVICE_DATA(INTEL, HDA_WBG_1, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
         /* Lewisburg */
-        { PCI_DEVICE(0x8086, 0xa1f0),
-          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
-        { PCI_DEVICE(0x8086, 0xa270),
-          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
+        { PCI_DEVICE_DATA(INTEL, HDA_LBG_0, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE) },
+        { PCI_DEVICE_DATA(INTEL, HDA_LBG_1, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE) },
         /* Lynx Point-LP */
-        { PCI_DEVICE(0x8086, 0x9c20),
-          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
+        { PCI_DEVICE_DATA(INTEL, HDA_LPT_LP_0, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
         /* Lynx Point-LP */
-        { PCI_DEVICE(0x8086, 0x9c21),
-          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
+        { PCI_DEVICE_DATA(INTEL, HDA_LPT_LP_1, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
         /* Wildcat Point-LP */
-        { PCI_DEVICE(0x8086, 0x9ca0),
-          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
-        /* Sunrise Point */
-        { PCI_DEVICE(0x8086, 0xa170),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
-        /* Sunrise Point-LP */
-        { PCI_DEVICE(0x8086, 0x9d70),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
+        { PCI_DEVICE_DATA(INTEL, HDA_WPT_LP, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
+        /* Skylake (Sunrise Point) */
+        { PCI_DEVICE_DATA(INTEL, HDA_SKL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+        /* Skylake-LP (Sunrise Point-LP) */
+        { PCI_DEVICE_DATA(INTEL, HDA_SKL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
         /* Kabylake */
-        { PCI_DEVICE(0x8086, 0xa171),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
+        { PCI_DEVICE_DATA(INTEL, HDA_KBL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
         /* Kabylake-LP */
-        { PCI_DEVICE(0x8086, 0x9d71),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
+        { PCI_DEVICE_DATA(INTEL, HDA_KBL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
         /* Kabylake-H */
-        { PCI_DEVICE(0x8086, 0xa2f0),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
+        { PCI_DEVICE_DATA(INTEL, HDA_KBL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
         /* Coffelake */
-        { PCI_DEVICE(0x8086, 0xa348),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+        { PCI_DEVICE_DATA(INTEL, HDA_CNL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
         /* Cannonlake */
-        { PCI_DEVICE(0x8086, 0x9dc8),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+        { PCI_DEVICE_DATA(INTEL, HDA_CNL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
         /* CometLake-LP */
-        { PCI_DEVICE(0x8086, 0x02C8),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+        { PCI_DEVICE_DATA(INTEL, HDA_CML_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
         /* CometLake-H */
-        { PCI_DEVICE(0x8086, 0x06C8),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
-        { PCI_DEVICE(0x8086, 0xf1c8),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+        { PCI_DEVICE_DATA(INTEL, HDA_CML_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+        { PCI_DEVICE_DATA(INTEL, HDA_RKL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
         /* CometLake-S */
-        { PCI_DEVICE(0x8086, 0xa3f0),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+        { PCI_DEVICE_DATA(INTEL, HDA_CML_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
         /* CometLake-R */
-        { PCI_DEVICE(0x8086, 0xf0c8),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+        { PCI_DEVICE_DATA(INTEL, HDA_CML_R, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
         /* Icelake */
-        { PCI_DEVICE(0x8086, 0x34c8),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+        { PCI_DEVICE_DATA(INTEL, HDA_ICL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
         /* Icelake-H */
-        { PCI_DEVICE(0x8086, 0x3dc8),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+        { PCI_DEVICE_DATA(INTEL, HDA_ICL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
         /* Jasperlake */
-        { PCI_DEVICE(0x8086, 0x38c8),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
-        { PCI_DEVICE(0x8086, 0x4dc8),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+        { PCI_DEVICE_DATA(INTEL, HDA_ICL_N, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+        { PCI_DEVICE_DATA(INTEL, HDA_JSL_N, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
         /* Tigerlake */
-        { PCI_DEVICE(0x8086, 0xa0c8),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+        { PCI_DEVICE_DATA(INTEL, HDA_TGL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
         /* Tigerlake-H */
-        { PCI_DEVICE(0x8086, 0x43c8),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+        { PCI_DEVICE_DATA(INTEL, HDA_TGL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
         /* DG1 */
-        { PCI_DEVICE(0x8086, 0x490d),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+        { PCI_DEVICE_DATA(INTEL, HDA_DG1, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
         /* DG2 */
-        { PCI_DEVICE(0x8086, 0x4f90),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
-        { PCI_DEVICE(0x8086, 0x4f91),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
-        { PCI_DEVICE(0x8086, 0x4f92),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+        { PCI_DEVICE_DATA(INTEL, HDA_DG2_0, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+        { PCI_DEVICE_DATA(INTEL, HDA_DG2_1, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+        { PCI_DEVICE_DATA(INTEL, HDA_DG2_2, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
         /* Alderlake-S */
-        { PCI_DEVICE(0x8086, 0x7ad0),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+        { PCI_DEVICE_DATA(INTEL, HDA_ADL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
         /* Alderlake-P */
-        { PCI_DEVICE(0x8086, 0x51c8),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+        { PCI_DEVICE_DATA(INTEL, HDA_ADL_P, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+        { PCI_DEVICE_DATA(INTEL, HDA_ADL_PS, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+        { PCI_DEVICE_DATA(INTEL, HDA_ADL_PX, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
         /* Alderlake-M */
-        { PCI_DEVICE(0x8086, 0x51cc),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+        { PCI_DEVICE_DATA(INTEL, HDA_ADL_M, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+        /* Alderlake-N */
+        { PCI_DEVICE_DATA(INTEL, HDA_ADL_N, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
         /* Elkhart Lake */
-        { PCI_DEVICE(0x8086, 0x4b55),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
-        { PCI_DEVICE(0x8086, 0x4b58),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
-        /* Broxton-P(Apollolake) */
-        { PCI_DEVICE(0x8086, 0x5a98),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
-        /* Broxton-T */
-        { PCI_DEVICE(0x8086, 0x1a98),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
+        { PCI_DEVICE_DATA(INTEL, HDA_EHL_0, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+        { PCI_DEVICE_DATA(INTEL, HDA_EHL_3, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+        /* Raptor Lake */
+        { PCI_DEVICE_DATA(INTEL, HDA_RPL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+        { PCI_DEVICE_DATA(INTEL, HDA_RPL_P_0, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+        { PCI_DEVICE_DATA(INTEL, HDA_RPL_P_1, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+        { PCI_DEVICE_DATA(INTEL, HDA_RPL_M, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+        { PCI_DEVICE_DATA(INTEL, HDA_RPL_PX, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+        { PCI_DEVICE_DATA(INTEL, HDA_MTL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+        /* Lunarlake-P */
+        { PCI_DEVICE_DATA(INTEL, HDA_LNL_P, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+        /* Arrow Lake-S */
+        { PCI_DEVICE_DATA(INTEL, HDA_ARL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+        /* Arrow Lake */
+        { PCI_DEVICE_DATA(INTEL, HDA_ARL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+        /* Apollolake (Broxton-P) */
+        { PCI_DEVICE_DATA(INTEL, HDA_APL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },
         /* Gemini-Lake */
-        { PCI_DEVICE(0x8086, 0x3198),
-          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
+        { PCI_DEVICE_DATA(INTEL, HDA_GML, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },
         /* Haswell */
-        { PCI_DEVICE(0x8086, 0x0a0c),
-          .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },
-        { PCI_DEVICE(0x8086, 0x0c0c),
-          .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },
-        { PCI_DEVICE(0x8086, 0x0d0c),
-          .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },
+        { PCI_DEVICE_DATA(INTEL, HDA_HSW_0, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },
+        { PCI_DEVICE_DATA(INTEL, HDA_HSW_2, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },
+        { PCI_DEVICE_DATA(INTEL, HDA_HSW_3, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },
         /* Broadwell */
-        { PCI_DEVICE(0x8086, 0x160c),
-          .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_BROADWELL },
+        { PCI_DEVICE_DATA(INTEL, HDA_BDW, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_BROADWELL) },
         /* 5 Series/3400 */
-        { PCI_DEVICE(0x8086, 0x3b56),
-          .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },
+        { PCI_DEVICE_DATA(INTEL, HDA_5_3400_SERIES_0, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM) },
+        { PCI_DEVICE_DATA(INTEL, HDA_5_3400_SERIES_1, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM) },
         /* Poulsbo */
-        { PCI_DEVICE(0x8086, 0x811b),
-          .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE },
+        { PCI_DEVICE_DATA(INTEL, HDA_POULSBO, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE |
+          AZX_DCAPS_POSFIX_LPIB) },
         /* Oaktrail */
-        { PCI_DEVICE(0x8086, 0x080a),
-          .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE },
+        { PCI_DEVICE_DATA(INTEL, HDA_OAKTRAIL, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE) },
         /* BayTrail */
-        { PCI_DEVICE(0x8086, 0x0f04),
-          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BAYTRAIL },
+        { PCI_DEVICE_DATA(INTEL, HDA_BYT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BAYTRAIL) },
         /* Braswell */
-        { PCI_DEVICE(0x8086, 0x2284),
-          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BRASWELL },
+        { PCI_DEVICE_DATA(INTEL, HDA_BSW, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BRASWELL) },
         /* ICH6 */
-        { PCI_DEVICE(0x8086, 0x2668),
-          .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
+        { PCI_DEVICE_DATA(INTEL, HDA_ICH6, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
         /* ICH7 */
-        { PCI_DEVICE(0x8086, 0x27d8),
-          .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
+        { PCI_DEVICE_DATA(INTEL, HDA_ICH7, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
         /* ESB2 */
-        { PCI_DEVICE(0x8086, 0x269a),
-          .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
+        { PCI_DEVICE_DATA(INTEL, HDA_ESB2, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
         /* ICH8 */
-        { PCI_DEVICE(0x8086, 0x284b),
-          .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
+        { PCI_DEVICE_DATA(INTEL, HDA_ICH8, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
         /* ICH9 */
-        { PCI_DEVICE(0x8086, 0x293e),
-          .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
+        { PCI_DEVICE_DATA(INTEL, HDA_ICH9_0, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
         /* ICH9 */
-        { PCI_DEVICE(0x8086, 0x293f),
-          .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
+        { PCI_DEVICE_DATA(INTEL, HDA_ICH9_1, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
         /* ICH10 */
-        { PCI_DEVICE(0x8086, 0x3a3e),
-          .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
+        { PCI_DEVICE_DATA(INTEL, HDA_ICH10_0, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
         /* ICH10 */
-        { PCI_DEVICE(0x8086, 0x3a6e),
-          .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
+        { PCI_DEVICE_DATA(INTEL, HDA_ICH10_1, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
         /* Generic Intel */
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_ANY_ID),
@@ -2614 +2613 @@
           .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_NO_ALIGN_BUFSIZE },
         /* ATI SB 450/600/700/800/900 */
-        { PCI_DEVICE(0x1002, 0x437b),
+        { PCI_VDEVICE(ATI, 0x437b),
           .driver_data = AZX_DRIVER_ATI | AZX_DCAPS_PRESET_ATI_SB },
-        { PCI_DEVICE(0x1002, 0x4383),
+        { PCI_VDEVICE(ATI, 0x4383),
           .driver_data = AZX_DRIVER_ATI | AZX_DCAPS_PRESET_ATI_SB },
         /* AMD Hudson */
-        { PCI_DEVICE(0x1022, 0x780d),
+        { PCI_VDEVICE(AMD, 0x780d),
           .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB },
         /* AMD, X370 & co */
-        { PCI_DEVICE(0x1022, 0x1457),
+        { PCI_VDEVICE(AMD, 0x1457),
           .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },
         /* AMD, X570 & co */
-        { PCI_DEVICE(0x1022, 0x1487),
+        { PCI_VDEVICE(AMD, 0x1487),
           .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },
         /* AMD Stoney */
-        { PCI_DEVICE(0x1022, 0x157a),
+        { PCI_VDEVICE(AMD, 0x157a),
           .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB |
                          AZX_DCAPS_PM_RUNTIME },
         /* AMD Raven */
-        { PCI_DEVICE(0x1022, 0x15e3),
+        { PCI_VDEVICE(AMD, 0x15e3),
           .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },
         /* ATI HDMI */
-        { PCI_DEVICE(0x1002, 0x0002),
+        { PCI_VDEVICE(ATI, 0x0002),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
           AZX_DCAPS_PM_RUNTIME },
-        { PCI_DEVICE(0x1002, 0x1308),
+        { PCI_VDEVICE(ATI, 0x1308),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
-        { PCI_DEVICE(0x1002, 0x157a),
+        { PCI_VDEVICE(ATI, 0x157a),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
-        { PCI_DEVICE(0x1002, 0x15b3),
+        { PCI_VDEVICE(ATI, 0x15b3),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
-        { PCI_DEVICE(0x1002, 0x793b),
+        { PCI_VDEVICE(ATI, 0x793b),
           .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-        { PCI_DEVICE(0x1002, 0x7919),
+        { PCI_VDEVICE(ATI, 0x7919),
           .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-        { PCI_DEVICE(0x1002, 0x960f),
+        { PCI_VDEVICE(ATI, 0x960f),
           .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-        { PCI_DEVICE(0x1002, 0x970f),
+        { PCI_VDEVICE(ATI, 0x970f),
           .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-        { PCI_DEVICE(0x1002, 0x9840),
+        { PCI_VDEVICE(ATI, 0x9840),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
-        { PCI_DEVICE(0x1002, 0xaa00),
+        { PCI_VDEVICE(ATI, 0xaa00),
           .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-        { PCI_DEVICE(0x1002, 0xaa08),
+        { PCI_VDEVICE(ATI, 0xaa08),
           .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-        { PCI_DEVICE(0x1002, 0xaa10),
+        { PCI_VDEVICE(ATI, 0xaa10),
           .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-        { PCI_DEVICE(0x1002, 0xaa18),
+        { PCI_VDEVICE(ATI, 0xaa18),
           .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-        { PCI_DEVICE(0x1002, 0xaa20),
+        { PCI_VDEVICE(ATI, 0xaa20),
           .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-        { PCI_DEVICE(0x1002, 0xaa28),
+        { PCI_VDEVICE(ATI, 0xaa28),
           .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-        { PCI_DEVICE(0x1002, 0xaa30),
+        { PCI_VDEVICE(ATI, 0xaa30),
           .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-        { PCI_DEVICE(0x1002, 0xaa38),
+        { PCI_VDEVICE(ATI, 0xaa38),
           .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-        { PCI_DEVICE(0x1002, 0xaa40),
+        { PCI_VDEVICE(ATI, 0xaa40),
           .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-        { PCI_DEVICE(0x1002, 0xaa48),
+        { PCI_VDEVICE(ATI, 0xaa48),
           .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-        { PCI_DEVICE(0x1002, 0xaa50),
+        { PCI_VDEVICE(ATI, 0xaa50),
           .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-        { PCI_DEVICE(0x1002, 0xaa58),
+        { PCI_VDEVICE(ATI, 0xaa58),
           .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-        { PCI_DEVICE(0x1002, 0xaa60),
+        { PCI_VDEVICE(ATI, 0xaa60),
           .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-        { PCI_DEVICE(0x1002, 0xaa68),
+        { PCI_VDEVICE(ATI, 0xaa68),
           .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-        { PCI_DEVICE(0x1002, 0xaa80),
+        { PCI_VDEVICE(ATI, 0xaa80),
           .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-        { PCI_DEVICE(0x1002, 0xaa88),
+        { PCI_VDEVICE(ATI, 0xaa88),
           .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-        { PCI_DEVICE(0x1002, 0xaa90),
+        { PCI_VDEVICE(ATI, 0xaa90),
           .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-        { PCI_DEVICE(0x1002, 0xaa98),
+        { PCI_VDEVICE(ATI, 0xaa98),
           .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-        { PCI_DEVICE(0x1002, 0x9902),
+        { PCI_VDEVICE(ATI, 0x9902),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
-        { PCI_DEVICE(0x1002, 0xaaa0),
+        { PCI_VDEVICE(ATI, 0xaaa0),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
-        { PCI_DEVICE(0x1002, 0xaaa8),
+        { PCI_VDEVICE(ATI, 0xaaa8),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
-        { PCI_DEVICE(0x1002, 0xaab0),
+        { PCI_VDEVICE(ATI, 0xaab0),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
-        { PCI_DEVICE(0x1002, 0xaac0),
+        { PCI_VDEVICE(ATI, 0xaac0),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
           AZX_DCAPS_PM_RUNTIME },
-        { PCI_DEVICE(0x1002, 0xaac8),
+        { PCI_VDEVICE(ATI, 0xaac8),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
           AZX_DCAPS_PM_RUNTIME },
-        { PCI_DEVICE(0x1002, 0xaad8),
+        { PCI_VDEVICE(ATI, 0xaad8),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
           AZX_DCAPS_PM_RUNTIME },
-        { PCI_DEVICE(0x1002, 0xaae0),
+        { PCI_VDEVICE(ATI, 0xaae0),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
           AZX_DCAPS_PM_RUNTIME },
-        { PCI_DEVICE(0x1002, 0xaae8),
+        { PCI_VDEVICE(ATI, 0xaae8),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
           AZX_DCAPS_PM_RUNTIME },
-        { PCI_DEVICE(0x1002, 0xaaf0),
+        { PCI_VDEVICE(ATI, 0xaaf0),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
           AZX_DCAPS_PM_RUNTIME },
-        { PCI_DEVICE(0x1002, 0xaaf8),
+        { PCI_VDEVICE(ATI, 0xaaf8),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
           AZX_DCAPS_PM_RUNTIME },
-        { PCI_DEVICE(0x1002, 0xab00),
+        { PCI_VDEVICE(ATI, 0xab00),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
           AZX_DCAPS_PM_RUNTIME },
-        { PCI_DEVICE(0x1002, 0xab08),
+        { PCI_VDEVICE(ATI, 0xab08),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
           AZX_DCAPS_PM_RUNTIME },
-        { PCI_DEVICE(0x1002, 0xab10),
+        { PCI_VDEVICE(ATI, 0xab10),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
           AZX_DCAPS_PM_RUNTIME },
-        { PCI_DEVICE(0x1002, 0xab18),
+        { PCI_VDEVICE(ATI, 0xab18),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
           AZX_DCAPS_PM_RUNTIME },
-        { PCI_DEVICE(0x1002, 0xab20),
+        { PCI_VDEVICE(ATI, 0xab20),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
           AZX_DCAPS_PM_RUNTIME },
-        { PCI_DEVICE(0x1002, 0xab28),
+        { PCI_VDEVICE(ATI, 0xab28),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
           AZX_DCAPS_PM_RUNTIME },
-        { PCI_DEVICE(0x1002, 0xab38),
+        { PCI_VDEVICE(ATI, 0xab30),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
           AZX_DCAPS_PM_RUNTIME },
+        { PCI_VDEVICE(ATI, 0xab38),
+          .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
+          AZX_DCAPS_PM_RUNTIME },
+        /* GLENFLY */
+        { PCI_DEVICE(PCI_VENDOR_ID_GLENFLY, PCI_ANY_ID),
+          .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
+          .class_mask = 0xffffff,
+          .driver_data = AZX_DRIVER_GFHDMI | AZX_DCAPS_POSFIX_LPIB |
+          AZX_DCAPS_NO_MSI | AZX_DCAPS_NO_64BIT },
         /* VIA VT8251/VT8237A */
-        { PCI_DEVICE(0x1106, 0x3288), .driver_data = AZX_DRIVER_VIA },
+        { PCI_VDEVICE(VIA, 0x3288), .driver_data = AZX_DRIVER_VIA },
         /* VIA GFX VT7122/VX900 */
-        { PCI_DEVICE(0x1106, 0x9170), .driver_data = AZX_DRIVER_GENERIC },
+        { PCI_VDEVICE(VIA, 0x9170), .driver_data = AZX_DRIVER_GENERIC },
         /* VIA GFX VT6122/VX11 */
-        { PCI_DEVICE(0x1106, 0x9140), .driver_data = AZX_DRIVER_GENERIC },
+        { PCI_VDEVICE(VIA, 0x9140), .driver_data = AZX_DRIVER_GENERIC },
         /* SIS966 */
-        { PCI_DEVICE(0x1039, 0x7502), .driver_data = AZX_DRIVER_SIS },
+        { PCI_VDEVICE(SI, 0x7502), .driver_data = AZX_DRIVER_SIS },
         /* ULI M5461 */
-        { PCI_DEVICE(0x10b9, 0x5461), .driver_data = AZX_DRIVER_ULI },
+        { PCI_VDEVICE(AL, 0x5461), .driver_data = AZX_DRIVER_ULI },
         /* NVIDIA MCP */
         { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID),
@@ -2762 +2770 @@
         /* Creative X-Fi (CA0110-IBG) */
         /* CTHDA chips */
-        { PCI_DEVICE(0x1102, 0x0010),
+        { PCI_VDEVICE(CREATIVE, 0x0010),
           .driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA },
-        { PCI_DEVICE(0x1102, 0x0012),
+        { PCI_VDEVICE(CREATIVE, 0x0012),
           .driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA },
 #if !IS_ENABLED(CONFIG_SND_CTXFI)
@@ -2778 +2786 @@
 #else
         /* this entry seems still valid -- i.e. without emu20kx chip */
-        { PCI_DEVICE(0x1102, 0x0009),
+        { PCI_VDEVICE(CREATIVE, 0x0009),
           .driver_data = AZX_DRIVER_CTX | AZX_DCAPS_CTX_WORKAROUND |
           AZX_DCAPS_NO_64BIT | AZX_DCAPS_POSFIX_LPIB },
 #endif
         /* CM8888 */
-        { PCI_DEVICE(0x13f6, 0x5011),
+        { PCI_VDEVICE(CMEDIA, 0x5011),
           .driver_data = AZX_DRIVER_CMEDIA |
           AZX_DCAPS_NO_MSI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_SNOOP_OFF },
         /* Vortex86MX */
-        { PCI_DEVICE(0x17f3, 0x3010), .driver_data = AZX_DRIVER_GENERIC },
+        { PCI_VDEVICE(RDC, 0x3010), .driver_data = AZX_DRIVER_GENERIC },
         /* VMware HDAudio */
-        { PCI_DEVICE(0x15ad, 0x1977), .driver_data = AZX_DRIVER_GENERIC },
+        { PCI_VDEVICE(VMWARE, 0x1977), .driver_data = AZX_DRIVER_GENERIC },
         /* AMD/ATI Generic, PCI class code and Vendor ID for HD Audio */
         { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_ANY_ID),
@@ -2800 +2808 @@
           .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_HDMI },
         /* Zhaoxin */
-        { PCI_DEVICE(0x1d17, 0x3288), .driver_data = AZX_DRIVER_ZHAOXIN },
+        { PCI_VDEVICE(ZHAOXIN, 0x3288), .driver_data = AZX_DRIVER_ZHAOXIN },
+        /* Loongson HDAudio*/
+        { PCI_VDEVICE(LOONGSON, PCI_DEVICE_ID_LOONGSON_HDA),
+          .driver_data = AZX_DRIVER_LOONGSON },
+        { PCI_VDEVICE(LOONGSON, PCI_DEVICE_ID_LOONGSON_HDMI),
+          .driver_data = AZX_DRIVER_LOONGSON },
         { 0, }
 };

GPL/trunk/alsa-kernel/pci/hda/hda_jack.c

@@ -157 +157 @@
 
         return jack;
+}
+
+void snd_hda_jack_tbl_disconnect(struct hda_codec *codec)
+{
+        struct hda_jack_tbl *jack = codec->jacktbl.list;
+        int i;
+
+        for (i = 0; i < codec->jacktbl.used; i++, jack++) {
+                if (!codec->bus->shutdown && jack->jack)
+                        snd_device_disconnect(codec->card, jack->jack);
+        }
 }
 

GPL/trunk/alsa-kernel/pci/hda/hda_jack.h

@@ -70 +70 @@
                               unsigned char tag, int dev_id);
 
+void snd_hda_jack_tbl_disconnect(struct hda_codec *codec);
 void snd_hda_jack_tbl_clear(struct hda_codec *codec);
 

GPL/trunk/alsa-kernel/pci/hda/hda_local.h

@@ -136 +136 @@
         __snd_hda_add_vmaster(codec, name, tlv, followers, suffix, true, access, NULL)
 int snd_hda_codec_reset(struct hda_codec *codec);
-void snd_hda_codec_register(struct hda_codec *codec);
-void snd_hda_codec_cleanup_for_unbind(struct hda_codec *codec);
 void snd_hda_codec_disconnect_pcms(struct hda_codec *codec);
 
@@ -299 +297 @@
 };
 
+/*
+ * extended form of snd_pci_quirk:
+ * for PCI SSID matching, use SND_PCI_QUIRK() like before;
+ * for codec SSID matching, use the new HDA_CODEC_QUIRK() instead
+ */
+struct hda_quirk {
+        unsigned short subvendor;       /* PCI subvendor ID */
+        unsigned short subdevice;       /* PCI subdevice ID */
+        unsigned short subdevice_mask;  /* bitmask to match */
+        bool match_codec_ssid;          /* match only with codec SSID */
+        int value;                      /* value */
+#ifdef CONFIG_SND_DEBUG_VERBOSE
+        const char *name;               /* name of the device (optional) */
+#endif
+};
+
+#ifdef CONFIG_SND_DEBUG_VERBOSE
+#define HDA_CODEC_QUIRK(vend, dev, xname, val) \
+        { _SND_PCI_QUIRK_ID(vend, dev), .value = (val), .name = (xname),\
+                        .match_codec_ssid = true }
+#else
+#define HDA_CODEC_QUIRK(vend, dev, xname, val) \
+        { _SND_PCI_QUIRK_ID(vend, dev), .value = (val), \
+                        .match_codec_ssid = true }
+#endif
+
 struct snd_hda_pin_quirk {
         unsigned int codec;             /* Codec vendor/device ID */
@@ -368 +392 @@
 void snd_hda_pick_fixup(struct hda_codec *codec,
                         const struct hda_model_fixup *models,
-                        const struct snd_pci_quirk *quirk,
+                        const struct hda_quirk *quirk,
                         const struct hda_fixup *fixlist);
 void snd_hda_pick_pin_fixup(struct hda_codec *codec,
@@ -729 +753 @@
 #ifdef CONFIG_SND_PROC_FS
 void snd_hdmi_print_eld_info(struct hdmi_eld *eld,
-                             struct snd_info_buffer *buffer);
+                             struct snd_info_buffer *buffer,
+                             hda_nid_t pin_nid, int dev_id, hda_nid_t cvt_nid);
 void snd_hdmi_write_eld_info(struct hdmi_eld *eld,
                              struct snd_info_buffer *buffer);

GPL/trunk/alsa-kernel/pci/hda/hda_sysfs.c

@@ -21 +21 @@
 #include <sound/minors.h>
 
+extern int sysfs_emit(char *buf, const char *fmt, ...);
+extern int sysfs_emit_at(char *buf, int at, const char *fmt, ...);
+
 /* hint string pair */
 struct hda_hint {
@@ -34 +37 @@
         struct hda_codec *codec = dev_get_drvdata(dev);
         snd_hda_update_power_acct(codec);
-        return sprintf(buf, "%u\n", jiffies_to_msecs(codec->power_on_acct));
+        return sysfs_emit(buf, "%u\n", jiffies_to_msecs(codec->power_on_acct));
 }
 
@@ -43 +46 @@
         struct hda_codec *codec = dev_get_drvdata(dev);
         snd_hda_update_power_acct(codec);
-        return sprintf(buf, "%u\n", jiffies_to_msecs(codec->power_off_acct));
+        return sysfs_emit(buf, "%u\n", jiffies_to_msecs(codec->power_off_acct));
 }
 
@@ -56 +59 @@
 {                                                               \
         struct hda_codec *codec = dev_get_drvdata(dev);         \
-        return sprintf(buf, "0x%x\n", codec->field);            \
+        return sysfs_emit(buf, "0x%x\n", codec->field);         \
 }
 
@@ -65 +68 @@
 {                                                               \
         struct hda_codec *codec = dev_get_drvdata(dev);         \
-        return sprintf(buf, "%s\n",                             \
-                       codec->field ? codec->field : "");       \
+        return sysfs_emit(buf, "%s\n",                          \
+                          codec->field ? codec->field : "");    \
 }
 
@@ -86 +89 @@
         mutex_lock(&codec->user_mutex);
         snd_array_for_each(list, i, pin) {
-                len += sprintf(buf + len, "0x%02x 0x%08x\n",
-                               pin->nid, pin->cfg);
+                len += sysfs_emit_at(buf, len, "0x%02x 0x%08x\n",
+                                     pin->nid, pin->cfg);
         }
         mutex_unlock(&codec->user_mutex);
@@ -223 +226 @@
         mutex_lock(&codec->user_mutex);
         snd_array_for_each(&codec->init_verbs, i, v) {
-                len += scnprintf(buf + len, PAGE_SIZE - len,
-                                "0x%02x 0x%03x 0x%04x\n",
-                                v->nid, v->verb, v->param);
+                len += sysfs_emit_at(buf, len, "0x%02x 0x%03x 0x%04x\n",
+                                     v->nid, v->verb, v->param);
         }
         mutex_unlock(&codec->user_mutex);
@@ -273 +275 @@
         mutex_lock(&codec->user_mutex);
         snd_array_for_each(&codec->hints, i, hint) {
-                len += scnprintf(buf + len, PAGE_SIZE - len,
-                                "%s = %s\n", hint->key, hint->val);
+                len += sysfs_emit_at(buf, len, "%s = %s\n",
+                                     hint->key, hint->val);
         }
         mutex_unlock(&codec->user_mutex);
@@ -376 +378 @@
         return pin_configs_show(codec, &codec->user_pins, buf);
 }
-
-#define MAX_PIN_CONFIGS         32
 
 static int parse_user_pin_configs(struct hda_codec *codec, const char *buf)

GPL/trunk/alsa-kernel/pci/hda/patch_analog.c

@@ -436 +436 @@
 };
 
-static const struct snd_pci_quirk ad1986a_fixup_tbl[] = {
+static const struct hda_quirk ad1986a_fixup_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x30af, "HP B2800", AD1986A_FIXUP_LAPTOP_IMIC),
         SND_PCI_QUIRK(0x1043, 0x1153, "ASUS M9V", AD1986A_FIXUP_LAPTOP_IMIC),
@@ -679 +679 @@
 };
 
-static const struct snd_pci_quirk ad1981_fixup_tbl[] = {
+static const struct hda_quirk ad1981_fixup_tbl[] = {
         SND_PCI_QUIRK_VENDOR(0x1014, "Lenovo", AD1981_FIXUP_AMP_OVERRIDE),
         SND_PCI_QUIRK_VENDOR(0x103c, "HP", AD1981_FIXUP_HP_EAPD),
@@ -1172 +1172 @@
 };
 
-static const struct snd_pci_quirk ad1884_fixup_tbl[] = {
+static const struct hda_quirk ad1884_fixup_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x2a82, "HP Touchsmart", AD1884_FIXUP_HP_TOUCHSMART),
         SND_PCI_QUIRK_VENDOR(0x103c, "HP", AD1884_FIXUP_HP_EAPD),

GPL/trunk/alsa-kernel/pci/hda/patch_ca0132.c

@@ -1140 +1140 @@
         struct hda_codec *codec;
         struct delayed_work unsol_hp_work;
-        int quirk;
 
 #ifdef ENABLE_TUNING_CONTROLS
@@ -1172 +1171 @@
  */
 enum {
-        QUIRK_NONE,
         QUIRK_ALIENWARE,
         QUIRK_ALIENWARE_M17XR4,
@@ -1182 +1180 @@
         QUIRK_AE5,
         QUIRK_AE7,
+        QUIRK_NONE = HDA_FIXUP_ID_NOT_SET,
 };
 
 #ifdef CONFIG_PCI
-#define ca0132_quirk(spec)              ((spec)->quirk)
+#define ca0132_quirk(spec)              ((spec)->codec->fixup_id)
 #define ca0132_use_pci_mmio(spec)       ((spec)->use_pci_mmio)
 #define ca0132_use_alt_functions(spec)  ((spec)->use_alt_functions)
@@ -1299 +1298 @@
 };
 
-static const struct snd_pci_quirk ca0132_quirks[] = {
+static const struct hda_quirk ca0132_quirks[] = {
         SND_PCI_QUIRK(0x1028, 0x057b, "Alienware M17x R4", QUIRK_ALIENWARE_M17XR4),
         SND_PCI_QUIRK(0x1028, 0x0685, "Alienware 15 2015", QUIRK_ALIENWARE),
@@ -1312 +1311 @@
         SND_PCI_QUIRK(0x1458, 0xA036, "Gigabyte GA-Z170X-Gaming 7", QUIRK_R3DI),
         SND_PCI_QUIRK(0x3842, 0x1038, "EVGA X99 Classified", QUIRK_R3DI),
+        SND_PCI_QUIRK(0x3842, 0x104b, "EVGA X299 Dark", QUIRK_R3DI),
+        SND_PCI_QUIRK(0x3842, 0x1055, "EVGA Z390 DARK", QUIRK_R3DI),
         SND_PCI_QUIRK(0x1102, 0x0013, "Recon3D", QUIRK_R3D),
         SND_PCI_QUIRK(0x1102, 0x0018, "Recon3D", QUIRK_R3D),
@@ -1317 +1318 @@
         SND_PCI_QUIRK(0x1102, 0x0191, "Sound Blaster AE-5 Plus", QUIRK_AE5),
         SND_PCI_QUIRK(0x1102, 0x0081, "Sound Blaster AE-7", QUIRK_AE7),
+        {0}
+};
+
+static const struct hda_model_fixup ca0132_quirk_models[] = {
+        { .id = QUIRK_ALIENWARE, .name = "alienware" },
+        { .id = QUIRK_ALIENWARE_M17XR4, .name = "alienware-m17xr4" },
+        { .id = QUIRK_SBZ, .name = "sbz" },
+        { .id = QUIRK_ZXR, .name = "zxr" },
+        { .id = QUIRK_ZXR_DBPRO, .name = "zxr-dbpro" },
+        { .id = QUIRK_R3DI, .name = "r3di" },
+        { .id = QUIRK_R3D, .name = "r3d" },
+        { .id = QUIRK_AE5, .name = "ae5" },
+        { .id = QUIRK_AE7, .name = "ae7" },
         {0}
 };
@@ -2460 +2474 @@
 {
         int status = 0;
-        unsigned int size = sizeof(dma_chan);
+        unsigned int size = sizeof(*dma_chan);
 
         codec_dbg(codec, "     dspio_alloc_dma_chan() -- begin\n");
@@ -2968 +2982 @@
                         unsigned int *port_map)
 {
-        int status;
         unsigned int num_chans;
 
@@ -2982 +2995 @@
         num_chans = get_hdafmt_chs(fmt) + 1;
 
-        status = dsp_allocate_ports(codec, num_chans, rate_multi, port_map);
-
-        return status;
+        return dsp_allocate_ports(codec, num_chans, rate_multi, port_map);
 }
 
@@ -4242 +4253 @@
         for (i = 0; i < TUNING_CTLS_COUNT; i++)
                 if (nid == ca0132_tuning_ctls[i].nid)
-                        break;
-
+                        goto found;
+
+        return -EINVAL;
+found:
         snd_hda_power_up(codec);
         dspio_set_param(codec, ca0132_tuning_ctls[i].mid, 0x20,
@@ -6674 +6687 @@
         };
         knew.name = namestr;
-        knew.private_value = ((nid) | ((1)<<16) | ((type)<<18) | ((0)<<19) | ((0)<<23)) | 0;
+        knew.private_value = HDA_COMPOSE_AMP_VAL(nid, 1, 0, type) | 0;
 #endif
         sprintf(namestr, "FX: %s %s Volume", pfx, dirstr[dir]);
@@ -10061 +10074 @@
 static void sbz_detect_quirk(struct hda_codec *codec)
 {
-        struct ca0132_spec *spec = codec->spec;
-
         switch (codec->core.subsystem_id) {
         case 0x11020033:
-                spec->quirk = QUIRK_ZXR;
+                codec->fixup_id = QUIRK_ZXR;
                 break;
         case 0x1102003f:
-                spec->quirk = QUIRK_ZXR_DBPRO;
+                codec->fixup_id = QUIRK_ZXR_DBPRO;
                 break;
         default:
-                spec->quirk = QUIRK_SBZ;
+                codec->fixup_id = QUIRK_SBZ;
                 break;
         }
@@ -10080 +10091 @@
         struct ca0132_spec *spec;
         int err;
-        const struct snd_pci_quirk *quirk;
 
         codec_dbg(codec, "patch_ca0132\n");
@@ -10091 +10101 @@
 
         /* Detect codec quirk */
-        quirk = snd_pci_quirk_lookup(codec->bus->pci, ca0132_quirks);
-        if (quirk)
-                spec->quirk = quirk->value;
-        else
-                spec->quirk = QUIRK_NONE;
+        snd_hda_pick_fixup(codec, ca0132_quirk_models, ca0132_quirks, NULL);
         if (ca0132_quirk(spec) == QUIRK_SBZ)
                 sbz_detect_quirk(codec);
@@ -10172 +10178 @@
                 if (spec->mem_base == NULL) {
                         codec_warn(codec, "pci_iomap failed! Setting quirk to QUIRK_NONE.");
-                        spec->quirk = QUIRK_NONE;
+                        codec->fixup_id = QUIRK_NONE;
                 }
         }

GPL/trunk/alsa-kernel/pci/hda/patch_cirrus.c

@@ -390 +390 @@
 };
 
-static const struct snd_pci_quirk cs420x_fixup_tbl[] = {
+static const struct hda_quirk cs420x_fixup_tbl[] = {
         SND_PCI_QUIRK(0x10de, 0x0ac0, "MacBookPro 5,3", CS420X_MBP53),
         SND_PCI_QUIRK(0x10de, 0x0d94, "MacBookAir 3,1(2)", CS420X_MBP55),
@@ -400 +400 @@
         /* codec SSID */
         SND_PCI_QUIRK(0x106b, 0x0600, "iMac 14,1", CS420X_IMAC27_122),
+        SND_PCI_QUIRK(0x106b, 0x0900, "iMac 12,1", CS420X_IMAC27_122),
         SND_PCI_QUIRK(0x106b, 0x1c00, "MacBookPro 8,1", CS420X_MBP81),
         SND_PCI_QUIRK(0x106b, 0x2000, "iMac 12,2", CS420X_IMAC27_122),
@@ -640 +641 @@
 };
 
-static const struct snd_pci_quirk cs4208_fixup_tbl[] = {
+static const struct hda_quirk cs4208_fixup_tbl[] = {
         SND_PCI_QUIRK_VENDOR(0x106b, "Apple", CS4208_MAC_AUTO),
         {0} /* terminator */
@@ -646 +647 @@
 
 /* codec SSID matching */
-static const struct snd_pci_quirk cs4208_mac_fixup_tbl[] = {
+static const struct hda_quirk cs4208_mac_fixup_tbl[] = {
         SND_PCI_QUIRK(0x106b, 0x5e00, "MacBookPro 11,2", CS4208_MBP11),
         SND_PCI_QUIRK(0x106b, 0x6c00, "MacMini 7,1", CS4208_MACMINI),
@@ -824 +825 @@
 };
 
-static const struct snd_pci_quirk cs421x_fixup_tbl[] = {
+static const struct hda_quirk cs421x_fixup_tbl[] = {
         /* Test Intel board + CDB2410  */
         SND_PCI_QUIRK(0x8086, 0x5001, "DP45SG/CDB4210", CS421X_CDB4210),

GPL/trunk/alsa-kernel/pci/hda/patch_conexant.c

@@ -47 +47 @@
         unsigned int gpio_mute_led_mask;
         unsigned int gpio_mic_led_mask;
-
+        bool is_cx8070_sn6140;
 };
 
@@ -171 +171 @@
 }
 
+static void cx_fixup_headset_recog(struct hda_codec *codec)
+{
+        unsigned int mic_persent;
+
+        /* fix some headset type recognize fail issue, such as EDIFIER headset */
+        /* set micbiasd output current comparator threshold from 66% to 55%. */
+        snd_hda_codec_write(codec, 0x1c, 0, 0x320, 0x010);
+        /* set OFF voltage for DFET from -1.2V to -0.8V, set headset micbias registor
+         * value adjustment trim from 2.2K ohms to 2.0K ohms.
+         */
+        snd_hda_codec_write(codec, 0x1c, 0, 0x3b0, 0xe10);
+        /* fix reboot headset type recognize fail issue */
+        mic_persent = snd_hda_codec_read(codec, 0x19, 0, AC_VERB_GET_PIN_SENSE, 0x0);
+        if (mic_persent & AC_PINSENSE_PRESENCE)
+                /* enable headset mic VREF */
+                snd_hda_codec_write(codec, 0x19, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24);
+        else
+                /* disable headset mic VREF */
+                snd_hda_codec_write(codec, 0x19, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20);
+}
+
 static int cx_auto_init(struct hda_codec *codec)
 {
@@ -181 +202 @@
         snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_INIT);
 
+        if (spec->is_cx8070_sn6140)
+                cx_fixup_headset_recog(codec);
+
         return 0;
 }
@@ -197 +221 @@
         cx_auto_shutdown(codec);
         snd_hda_gen_free(codec);
+}
+
+static void cx_process_headset_plugin(struct hda_codec *codec)
+{
+        unsigned int val;
+        unsigned int count = 0;
+
+        /* Wait headset detect done. */
+        do {
+                val = snd_hda_codec_read(codec, 0x1c, 0, 0xca0, 0x0);
+                if (val & 0x080) {
+                        codec_dbg(codec, "headset type detect done!\n");
+                        break;
+                }
+                msleep(20);
+                count++;
+        } while (count < 3);
+        val = snd_hda_codec_read(codec, 0x1c, 0, 0xcb0, 0x0);
+        if (val & 0x800) {
+                codec_dbg(codec, "headset plugin, type is CTIA\n");
+                snd_hda_codec_write(codec, 0x19, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24);
+        } else if (val & 0x400) {
+                codec_dbg(codec, "headset plugin, type is OMTP\n");
+                snd_hda_codec_write(codec, 0x19, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24);
+        } else {
+                codec_dbg(codec, "headphone plugin\n");
+        }
+}
+
+static void cx_update_headset_mic_vref(struct hda_codec *codec, struct hda_jack_callback *event)
+{
+        unsigned int mic_present;
+
+        /* In cx8070 and sn6140, the node 16 can only be config to headphone or disabled,
+         * the node 19 can only be config to microphone or disabled.
+         * Check hp&mic tag to process headset pulgin&plugout.
+         */
+        mic_present = snd_hda_codec_read(codec, 0x19, 0, AC_VERB_GET_PIN_SENSE, 0x0);
+        if (!(mic_present & AC_PINSENSE_PRESENCE)) /* mic plugout */
+                snd_hda_codec_write(codec, 0x19, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20);
+        else
+                cx_process_headset_plugin(codec);
 }
 
@@ -229 +295 @@
         CXT_PINCFG_COMPAQ_CQ60,
         CXT_FIXUP_STEREO_DMIC,
+        CXT_PINCFG_LENOVO_NOTEBOOK,
         CXT_FIXUP_INC_MIC_BOOST,
         CXT_FIXUP_HEADPHONE_MIC_PIN,
@@ -245 +312 @@
         CXT_FIXUP_HP_GATE_MIC,
         CXT_FIXUP_MUTE_LED_GPIO,
+        CXT_FIXUP_HP_ELITEONE_OUT_DIS,
         CXT_FIXUP_HP_ZBOOK_MUTE_LED,
         CXT_FIXUP_HEADSET_MIC,
         CXT_FIXUP_HP_MIC_NO_PRESENCE,
+        CXT_PINCFG_SWS_JS201D,
+        CXT_PINCFG_TOP_SPEAKER,
+        CXT_FIXUP_HP_A_U,
 };
 
@@ -258 +329 @@
         struct conexant_spec *spec = codec->spec;
         spec->gen.inv_dmic_split = 1;
+}
+
+/* fix widget control pin settings */
+static void cxt_fixup_update_pinctl(struct hda_codec *codec,
+                                   const struct hda_fixup *fix, int action)
+{
+        if (action == HDA_FIXUP_ACT_PROBE) {
+                /* Unset OUT_EN for this Node pin, leaving only HP_EN.
+                 * This is the value stored in the codec register after
+                 * the correct initialization of the previous windows boot.
+                 */
+                snd_hda_set_pin_ctl_cache(codec, 0x1d, AC_PINCTL_HP_EN);
+        }
 }
 
@@ -708 +792 @@
 }
 
+#ifndef TARGET_OS2
+static void cxt_setup_gpio_unmute(struct hda_codec *codec,
+                                  unsigned int gpio_mute_mask)
+{
+        if (gpio_mute_mask) {
+                // set gpio data to 0.
+                snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA, 0);
+                snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_MASK, gpio_mute_mask);
+                snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DIRECTION, gpio_mute_mask);
+                snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_STICKY_MASK, 0);
+        }
+}
+#endif
+
 static void cxt_fixup_mute_led_gpio(struct hda_codec *codec,
                                 const struct hda_fixup *fix, int action)
@@ -721 +819 @@
                 cxt_setup_mute_led(codec, 0x10, 0x20);
 }
+
+#ifndef TARGET_OS2
+static void cxt_fixup_hp_a_u(struct hda_codec *codec,
+                             const struct hda_fixup *fix, int action)
+{
+        // Init vers in BIOS mute the spk/hp by set gpio high to avoid pop noise,
+        // so need to unmute once by clearing the gpio data when runs into the system.
+        if (action == HDA_FIXUP_ACT_INIT)
+                cxt_setup_gpio_unmute(codec, 0x2);
+}
+#endif
 
 /* ThinkPad X200 & co with cxt5051 */
@@ -775 +884 @@
                         {0}
 };
+#endif /* TARGET_OS2 */
+
+#ifndef TARGET_OS2
+/* SuoWoSi/South-holding JS201D with sn6140 */
+static const struct hda_pintbl cxt_pincfg_sws_js201d[] = {
+        { 0x16, 0x03211040 }, /* hp out */
+        { 0x17, 0x91170110 }, /* SPK/Class_D */
+        { 0x18, 0x95a70130 }, /* Internal mic */
+        { 0x19, 0x03a11020 }, /* Headset Mic */
+        { 0x1a, 0x40f001f0 }, /* Not used */
+        { 0x21, 0x40f001f0 }, /* Not used */
+        {0}
+};
 #endif
 
@@ -798 +920 @@
                 .v.pins = cxt_pincfg_lemote,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [CXT_PINCFG_COMPAQ_CQ60] = {
                 .type = HDA_FIXUP_PINS,
@@ -813 +935 @@
                 .v.func = cxt_fixup_stereo_dmic,
         },
+#ifdef NOT_USED
+        [CXT_PINCFG_LENOVO_NOTEBOOK] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x1a, 0x05d71030 },
+                        { }
+                },
+                .chain_id = CXT_FIXUP_STEREO_DMIC,
+        },
+#endif
         [CXT_FIXUP_INC_MIC_BOOST] = {
                 .type = HDA_FIXUP_FUNC,
@@ -899 +1031 @@
                 .v.func = cxt_fixup_mute_led_eapd,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [CXT_FIXUP_HP_DOCK] = {
                 .type = HDA_FIXUP_PINS,
@@ -927 +1059 @@
                 .v.func = cxt_fixup_mute_led_gpio,
         },
+        [CXT_FIXUP_HP_ELITEONE_OUT_DIS] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = cxt_fixup_update_pinctl,
+        },
         [CXT_FIXUP_HP_ZBOOK_MUTE_LED] = {
                 .type = HDA_FIXUP_FUNC,
@@ -935 +1071 @@
                 .v.func = cxt_fixup_headset_mic,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [CXT_FIXUP_HP_MIC_NO_PRESENCE] = {
                 .type = HDA_FIXUP_PINS,
@@ -945 +1081 @@
                 .chain_id = CXT_FIXUP_HEADSET_MIC,
         },
-#endif
-};
-
-static const struct snd_pci_quirk cxt5045_fixups[] = {
+        [CXT_PINCFG_SWS_JS201D] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = cxt_pincfg_sws_js201d,
+        },
+        [CXT_PINCFG_TOP_SPEAKER] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x1d, 0x82170111 },
+                        { }
+                },
+        },
+        [CXT_FIXUP_HP_A_U] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = cxt_fixup_hp_a_u,
+        },
+#endif
+};
+
+static const struct hda_quirk cxt5045_fixups[] = {
         SND_PCI_QUIRK(0x103c, 0x30d5, "HP 530", CXT_FIXUP_HP_530),
         SND_PCI_QUIRK(0x1179, 0xff31, "Toshiba P105", CXT_FIXUP_TOSHIBA_P105),
@@ -968 +1119 @@
 };
 
-static const struct snd_pci_quirk cxt5047_fixups[] = {
+static const struct hda_quirk cxt5047_fixups[] = {
         /* HP laptops have really bad sound over 0 dB on NID 0x10.
          */
@@ -980 +1131 @@
 };
 
-static const struct snd_pci_quirk cxt5051_fixups[] = {
+static const struct hda_quirk cxt5051_fixups[] = {
         SND_PCI_QUIRK(0x103c, 0x360b, "Compaq CQ60", CXT_PINCFG_COMPAQ_CQ60),
         SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo X200", CXT_PINCFG_LENOVO_X200),
@@ -991 +1142 @@
 };
 
-static const struct snd_pci_quirk cxt5066_fixups[] = {
+static const struct hda_quirk cxt5066_fixups[] = {
         SND_PCI_QUIRK(0x1025, 0x0543, "Acer Aspire One 522", CXT_FIXUP_STEREO_DMIC),
         SND_PCI_QUIRK(0x1025, 0x054c, "Acer Aspire 3830TG", CXT_FIXUP_ASPIRE_DMIC),
@@ -1002 +1153 @@
         SND_PCI_QUIRK(0x103c, 0x8174, "HP Spectre x360", CXT_FIXUP_HP_SPECTRE),
         SND_PCI_QUIRK(0x103c, 0x822e, "HP ProBook 440 G4", CXT_FIXUP_MUTE_LED_GPIO),
+        SND_PCI_QUIRK(0x103c, 0x8231, "HP ProBook 450 G4", CXT_FIXUP_MUTE_LED_GPIO),
         SND_PCI_QUIRK(0x103c, 0x828c, "HP EliteBook 840 G4", CXT_FIXUP_HP_DOCK),
         SND_PCI_QUIRK(0x103c, 0x8299, "HP 800 G3 SFF", CXT_FIXUP_HP_MIC_NO_PRESENCE),
@@ -1011 +1163 @@
         SND_PCI_QUIRK(0x103c, 0x83b3, "HP EliteBook 830 G5", CXT_FIXUP_HP_DOCK),
         SND_PCI_QUIRK(0x103c, 0x83d3, "HP ProBook 640 G4", CXT_FIXUP_HP_DOCK),
+        SND_PCI_QUIRK(0x103c, 0x83e5, "HP EliteOne 1000 G2", CXT_FIXUP_HP_ELITEONE_OUT_DIS),
         SND_PCI_QUIRK(0x103c, 0x8402, "HP ProBook 645 G4", CXT_FIXUP_MUTE_LED_GPIO),
         SND_PCI_QUIRK(0x103c, 0x8427, "HP ZBook Studio G5", CXT_FIXUP_HP_ZBOOK_MUTE_LED),
@@ -1019 +1172 @@
         SND_PCI_QUIRK(0x103c, 0x8458, "HP Z2 G4 mini premium", CXT_FIXUP_HP_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1043, 0x138d, "Asus", CXT_FIXUP_HEADPHONE_MIC_PIN),
+        SND_PCI_QUIRK(0x14f1, 0x0252, "MBX-Z60MR100", CXT_FIXUP_HP_A_U),
+        SND_PCI_QUIRK(0x14f1, 0x0265, "SWS JS201D", CXT_PINCFG_SWS_JS201D),
         SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT_FIXUP_OLPC_XO),
         SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400", CXT_PINCFG_LENOVO_TP410),
@@ -1032 +1187 @@
         SND_PCI_QUIRK(0x17aa, 0x390b, "Lenovo G50-80", CXT_FIXUP_STEREO_DMIC),
         SND_PCI_QUIRK(0x17aa, 0x3975, "Lenovo U300s", CXT_FIXUP_STEREO_DMIC),
+        /* NOTE: we'd need to extend the quirk for 17aa:3977 as the same
+         * PCI SSID is used on multiple Lenovo models
+         */
         SND_PCI_QUIRK(0x17aa, 0x3977, "Lenovo IdeaPad U310", CXT_FIXUP_STEREO_DMIC),
         SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo G50-70", CXT_FIXUP_STEREO_DMIC),
@@ -1038 +1196 @@
         SND_PCI_QUIRK(0x1c06, 0x2011, "Lemote A1004", CXT_PINCFG_LEMOTE_A1004),
         SND_PCI_QUIRK(0x1c06, 0x2012, "Lemote A1205", CXT_PINCFG_LEMOTE_A1205),
+        HDA_CODEC_QUIRK(0x2782, 0x12c3, "Sirius Gen1", CXT_PINCFG_TOP_SPEAKER),
+        HDA_CODEC_QUIRK(0x2782, 0x12c5, "Sirius Gen2", CXT_PINCFG_TOP_SPEAKER),
         {0}
 };
@@ -1055 +1215 @@
         { .id = CXT_FIXUP_HP_ZBOOK_MUTE_LED, .name = "hp-zbook-mute-led" },
         { .id = CXT_FIXUP_HP_MIC_NO_PRESENCE, .name = "hp-mic-fix" },
+        { .id = CXT_PINCFG_LENOVO_NOTEBOOK, .name = "lenovo-20149" },
+        { .id = CXT_PINCFG_SWS_JS201D, .name = "sws-js201d" },
+        { .id = CXT_PINCFG_TOP_SPEAKER, .name = "sirius-top-speaker" },
+        { .id = CXT_FIXUP_HP_A_U, .name = "HP-U-support" },
         {0}
 };
@@ -1089 +1253 @@
         codec->spec = spec;
         codec->patch_ops = cx_auto_patch_ops;
+
+        /* init cx8070/sn6140 flag and reset headset_present_flag */
+        switch (codec->core.vendor_id) {
+        case 0x14f11f86:
+        case 0x14f11f87:
+                spec->is_cx8070_sn6140 = true;
+                snd_hda_jack_detect_enable_callback(codec, 0x19, cx_update_headset_mic_vref);
+                break;
+        }
 
         cx_auto_parse_eapd(codec);
@@ -1174 +1347 @@
 static const struct hda_device_id snd_hda_id_conexant[] = {
         HDA_CODEC_ENTRY(0x14f11f86, "CX8070", patch_conexant_auto),
+        HDA_CODEC_ENTRY(0x14f11f87, "SN6140", patch_conexant_auto),
         HDA_CODEC_ENTRY(0x14f12008, "CX8200", patch_conexant_auto),
         HDA_CODEC_ENTRY(0x14f120d0, "CX11970", patch_conexant_auto),
+        HDA_CODEC_ENTRY(0x14f120d1, "SN6180", patch_conexant_auto),
         HDA_CODEC_ENTRY(0x14f15045, "CX20549 (Venice)", patch_conexant_auto),
         HDA_CODEC_ENTRY(0x14f15047, "CX20551 (Waikiki)", patch_conexant_auto),

GPL/trunk/alsa-kernel/pci/hda/patch_hdmi.c

@@ -66 +66 @@
 struct hdmi_spec_per_cvt {
         hda_nid_t cvt_nid;
-        int assigned;
+        bool assigned;          /* the stream has been assigned */
+        bool silent_stream;     /* silent stream activated */
         unsigned int channels_min;
         unsigned int channels_max;
@@ -93 +94 @@
         struct hdmi_pcm *pcm; /* pointer to spec->pcm_rec[n] dynamically*/
         int pcm_idx; /* which pcm is attached. -1 means no pcm is attached */
+        int prev_pcm_idx; /* previously assigned pcm index */
         int repoll_count;
         bool setup; /* the stream has been set up by prepare callback */
@@ -131 +133 @@
         struct snd_jack *jack;
         struct snd_kcontrol *eld_ctl;
+};
+
+enum {
+        SILENT_STREAM_OFF = 0,
+        SILENT_STREAM_KAE,      /* use standard HDA Keep-Alive */
+        SILENT_STREAM_I915,     /* Intel i915 extension */
 };
 
@@ -157 +165 @@
         int dev_num;
         struct snd_array pins; /* struct hdmi_spec_per_pin */
-        struct hdmi_pcm pcm_rec[16];
+        struct hdmi_pcm pcm_rec[8];
         struct mutex pcm_lock;
         struct mutex bind_lock; /* for audio component binding */
@@ -173 +181 @@
 
         bool dyn_pin_out;
-        bool dyn_pcm_assign;
-        bool dyn_pcm_no_legacy;
+        bool static_pcm_mapping;
+        /* hdmi interrupt trigger control flag for Nvidia codec */
+        bool hdmi_intr_trig_ctrl;
+        bool nv_dp_workaround; /* workaround DP audio infoframe for Nvidia */
+
         bool intel_hsw_fixup;   /* apply Intel platform-specific fixups */
         /*
@@ -192 +203 @@
         const int *port_map;
         int port_num;
-        bool send_silent_stream; /* Flag to enable silent stream feature */
+        int silent_stream_type;
 };
 
@@ -234 +245 @@
         struct hdmi_audio_infoframe hdmi;
         struct dp_audio_infoframe dp;
+#ifndef TARGET_OS2
+        DECLARE_FLEX_ARRAY(u8, bytes);
+#else
         u8 bytes[1];
+#endif
 };
 
@@ -498 +513 @@
 
         mutex_lock(&per_pin->lock);
-        snd_hdmi_print_eld_info(&per_pin->sink_eld, buffer);
+        snd_hdmi_print_eld_info(&per_pin->sink_eld, buffer, per_pin->pin_nid,
+                                per_pin->dev_id, per_pin->cvt_nid);
         mutex_unlock(&per_pin->lock);
 }
@@ -684 +700 @@
                                      int conn_type)
 {
+        struct hdmi_spec *spec = codec->spec;
         union audio_infoframe ai;
 
         memset(&ai, 0, sizeof(ai));
-        if (conn_type == 0) { /* HDMI */
+        if ((conn_type == 0) || /* HDMI */
+                /* Nvidia DisplayPort: Nvidia HW expects same layout as HDMI */
+                (conn_type == 1 && spec->nv_dp_workaround)) {
                 struct hdmi_audio_infoframe *hdmi_ai = &ai.hdmi;
 
-                hdmi_ai->type           = 0x84;
-                hdmi_ai->ver            = 0x01;
-                hdmi_ai->len            = 0x0a;
+                if (conn_type == 0) { /* HDMI */
+                        hdmi_ai->type           = 0x84;
+                        hdmi_ai->ver            = 0x01;
+                        hdmi_ai->len            = 0x0a;
+                } else {/* Nvidia DP */
+                        hdmi_ai->type           = 0x84;
+                        hdmi_ai->ver            = 0x1b;
+                        hdmi_ai->len            = 0x11 << 2;
+                }
                 hdmi_ai->CC02_CT47      = active_channels - 1;
                 hdmi_ai->CA             = ca;
@@ -982 +1007 @@
  */
 static int hdmi_choose_cvt(struct hda_codec *codec,
-                           int pin_idx, int *cvt_id)
+                           int pin_idx, int *cvt_id,
+                           bool silent)
 {
         struct hdmi_spec *spec = codec->spec;
@@ -997 +1023 @@
         if (per_pin && per_pin->silent_stream) {
                 cvt_idx = cvt_nid_to_cvt_index(codec, per_pin->cvt_nid);
+                per_cvt = get_cvt(spec, cvt_idx);
+                if (per_cvt->assigned && !silent)
+                        return -EBUSY;
                 if (cvt_id)
                         *cvt_id = cvt_idx;
@@ -1007 +1036 @@
 
                 /* Must not already be assigned */
-                if (per_cvt->assigned)
+                if (per_cvt->assigned || per_cvt->silent_stream)
                         continue;
                 if (per_pin == NULL)
@@ -1176 +1205 @@
 }
 
-/* called in hdmi_pcm_open when no pin is assigned to the PCM
- * in dyn_pcm_assign mode.
- */
+/* called in hdmi_pcm_open when no pin is assigned to the PCM */
 static int hdmi_pcm_open_no_pin(struct hda_pcm_stream *hinfo,
                          struct hda_codec *codec,
@@ -1193 +1220 @@
                 return -EINVAL;
 
-        err = hdmi_choose_cvt(codec, -1, &cvt_idx);
+        err = hdmi_choose_cvt(codec, -1, &cvt_idx, false);
         if (err)
                 return err;
 
         per_cvt = get_cvt(spec, cvt_idx);
-        per_cvt->assigned = 1;
+        per_cvt->assigned = true;
         hinfo->nid = per_cvt->cvt_nid;
 
@@ -1246 +1273 @@
         mutex_lock(&spec->pcm_lock);
         pin_idx = hinfo_to_pin_index(codec, hinfo);
-        if (!spec->dyn_pcm_assign) {
-                if (snd_BUG_ON(pin_idx < 0)) {
-                        err = -EINVAL;
-                        goto unlock;
-                }
-        } else {
-                /* no pin is assigned to the PCM
-                 * PA need pcm open successfully when probe
-                 */
-                if (pin_idx < 0) {
-                        err = hdmi_pcm_open_no_pin(hinfo, codec, substream);
-                        goto unlock;
-                }
-        }
-
-        err = hdmi_choose_cvt(codec, pin_idx, &cvt_idx);
+        /* no pin is assigned to the PCM
+         * PA need pcm open successfully when probe
+         */
+        if (pin_idx < 0) {
+                err = hdmi_pcm_open_no_pin(hinfo, codec, substream);
+                goto unlock;
+        }
+
+        err = hdmi_choose_cvt(codec, pin_idx, &cvt_idx, false);
         if (err < 0)
                 goto unlock;
@@ -1267 +1287 @@
         per_cvt = get_cvt(spec, cvt_idx);
         /* Claim converter */
-        per_cvt->assigned = 1;
+        per_cvt->assigned = true;
 
         set_bit(pcm_idx, &spec->pcm_in_use);
@@ -1301 +1321 @@
                 if (hinfo->channels_min > hinfo->channels_max ||
                     !hinfo->rates || !hinfo->formats) {
-                        per_cvt->assigned = 0;
+                        per_cvt->assigned = false;
                         hinfo->nid = 0;
                         snd_hda_spdif_ctls_unassign(codec, pcm_idx);
@@ -1363 +1383 @@
         int i;
 
-        /* on the new machines, try to assign the pcm slot dynamically,
-         * not use the preferred fixed map (legacy way) anymore.
-         */
-        if (spec->dyn_pcm_no_legacy)
-                goto last_try;
-
-        /*
-         * generic_hdmi_build_pcms() may allocate extra PCMs on some
-         * platforms (with maximum of 'num_nids + dev_num - 1')
-         *
-         * The per_pin of pin_nid_idx=n and dev_id=m prefers to get pcm-n
-         * if m==0. This guarantees that dynamic pcm assignments are compatible
-         * with the legacy static per_pin-pcm assignment that existed in the
-         * days before DP-MST.
-         *
-         * Intel DP-MST prefers this legacy behavior for compatibility, too.
-         *
-         * per_pin of m!=0 prefers to get pcm=(num_nids + (m - 1)).
-         */
-
-        if (per_pin->dev_id == 0 || spec->intel_hsw_fixup) {
-                if (!test_bit(per_pin->pin_nid_idx, &spec->pcm_bitmap))
-                        return per_pin->pin_nid_idx;
-        } else {
-                i = spec->num_nids + (per_pin->dev_id - 1);
-                if (i < spec->pcm_used && !(test_bit(i, &spec->pcm_bitmap)))
-                        return i;
-        }
-
-        /* have a second try; check the area over num_nids */
-        for (i = spec->num_nids; i < spec->pcm_used; i++) {
-                if (!test_bit(i, &spec->pcm_bitmap))
-                        return i;
-        }
-
- last_try:
-        /* the last try; check the empty slots in pins */
         for (i = 0; i < spec->pcm_used; i++) {
                 if (!test_bit(i, &spec->pcm_bitmap))
@@ -1415 +1398 @@
         if (per_pin->pcm)
                 return;
+        /* try the previously used slot at first */
+        idx = per_pin->prev_pcm_idx;
+        if (idx >= 0) {
+                if (!test_bit(idx, &spec->pcm_bitmap))
+                        goto found;
+                per_pin->prev_pcm_idx = -1; /* no longer valid, clear it */
+        }
         idx = hdmi_find_pcm_slot(spec, per_pin);
         if (idx == -EBUSY)
                 return;
+ found:
         per_pin->pcm_idx = idx;
         per_pin->pcm = get_hdmi_pcm(spec, idx);
@@ -1433 +1424 @@
         idx = per_pin->pcm_idx;
         per_pin->pcm_idx = -1;
+        per_pin->prev_pcm_idx = idx; /* remember the previous index */
         per_pin->pcm = NULL;
         if (idx >= 0 && idx < spec->pcm_used)
@@ -1461 +1453 @@
         bool non_pcm;
 
-        if (per_pin->pcm_idx >= 0 && per_pin->pcm_idx < spec->pcm_used)
-                pcm = get_pcm_rec(spec, per_pin->pcm_idx);
-        else
+        if (per_pin->pcm_idx < 0 || per_pin->pcm_idx >= spec->pcm_used)
                 return;
+        pcm = get_pcm_rec(spec, per_pin->pcm_idx);
         if (!pcm->pcm)
                 return;
@@ -1548 +1539 @@
         }
 
-        if (!eld->eld_valid || eld->eld_size <= 0) {
+        if (!eld->eld_valid || eld->eld_size <= 0 || eld->info.sad_count <= 0) {
                 eld->eld_valid = false;
                 eld->eld_size = 0;
@@ -1562 +1553 @@
         pcm_jack = pin_idx_to_pcm_jack(codec, per_pin);
 
-        if (spec->dyn_pcm_assign) {
+        if (!spec->static_pcm_mapping) {
                 if (eld->eld_valid) {
                         hdmi_attach_hda_pcm(spec, per_pin);
@@ -1571 +1562 @@
                 }
         }
+
         /* if pcm_idx == -1, it means this is in monitor connection event
          * we can get the correct pcm_idx now.
@@ -1684 +1676 @@
 #define I915_SILENT_FMT_MASK            0xf
 
-static void silent_stream_enable(struct hda_codec *codec,
-                                 struct hdmi_spec_per_pin *per_pin)
-{
-        struct hdmi_spec *spec = codec->spec;
-        struct hdmi_spec_per_cvt *per_cvt;
-        int cvt_idx, pin_idx, err;
+static void silent_stream_enable_i915(struct hda_codec *codec,
+                                      struct hdmi_spec_per_pin *per_pin)
+{
         unsigned int format;
-
-        mutex_lock(&per_pin->lock);
-
-        if (per_pin->setup) {
-                codec_dbg(codec, "hdmi: PCM already open, no silent stream\n");
-                goto unlock_out;
-        }
-
-        pin_idx = pin_id_to_pin_index(codec, per_pin->pin_nid, per_pin->dev_id);
-        err = hdmi_choose_cvt(codec, pin_idx, &cvt_idx);
-        if (err) {
-                codec_err(codec, "hdmi: no free converter to enable silent mode\n");
-                goto unlock_out;
-        }
-
-        per_cvt = get_cvt(spec, cvt_idx);
-        per_cvt->assigned = 1;
-        per_pin->cvt_nid = per_cvt->cvt_nid;
-        per_pin->silent_stream = true;
-
-        codec_dbg(codec, "hdmi: enabling silent stream pin-NID=0x%x cvt-NID=0x%x\n",
-                  per_pin->pin_nid, per_cvt->cvt_nid);
-
-        snd_hda_set_dev_select(codec, per_pin->pin_nid, per_pin->dev_id);
-        snd_hda_codec_write_cache(codec, per_pin->pin_nid, 0,
-                                  AC_VERB_SET_CONNECT_SEL,
-                                  per_pin->mux_idx);
-
-        /* configure unused pins to choose other converters */
-        pin_cvt_fixup(codec, per_pin, 0);
 
         snd_hdac_sync_audio_rate(&codec->core, per_pin->pin_nid,
@@ -1735 +1694 @@
         per_pin->channels = I915_SILENT_CHANNELS;
         hdmi_setup_audio_infoframe(codec, per_pin, per_pin->non_pcm);
+}
+
+static void silent_stream_set_kae(struct hda_codec *codec,
+                                  struct hdmi_spec_per_pin *per_pin,
+                                  bool enable)
+{
+        unsigned int param;
+
+        codec_dbg(codec, "HDMI: KAE %d cvt-NID=0x%x\n", enable, per_pin->cvt_nid);
+
+        param = snd_hda_codec_read(codec, per_pin->cvt_nid, 0, AC_VERB_GET_DIGI_CONVERT_1, 0);
+        param = (param >> 16) & 0xff;
+
+        if (enable)
+                param |= AC_DIG3_KAE;
+        else
+                param &= ~AC_DIG3_KAE;
+
+        snd_hda_codec_write(codec, per_pin->cvt_nid, 0, AC_VERB_SET_DIGI_CONVERT_3, param);
+}
+
+static void silent_stream_enable(struct hda_codec *codec,
+                                 struct hdmi_spec_per_pin *per_pin)
+{
+        struct hdmi_spec *spec = codec->spec;
+        struct hdmi_spec_per_cvt *per_cvt;
+        int cvt_idx, pin_idx, err;
+        int keep_power = 0;
+
+        /*
+         * Power-up will call hdmi_present_sense, so the PM calls
+         * have to be done without mutex held.
+         */
+
+        err = snd_hda_power_up_pm(codec);
+        if (err < 0 && err != -EACCES) {
+                codec_err(codec,
+                          "Failed to power up codec for silent stream enable ret=[%d]\n", err);
+                snd_hda_power_down_pm(codec);
+                return;
+        }
+
+        mutex_lock(&per_pin->lock);
+
+        if (per_pin->setup) {
+                codec_dbg(codec, "hdmi: PCM already open, no silent stream\n");
+                err = -EBUSY;
+                goto unlock_out;
+        }
+
+        pin_idx = pin_id_to_pin_index(codec, per_pin->pin_nid, per_pin->dev_id);
+        err = hdmi_choose_cvt(codec, pin_idx, &cvt_idx, true);
+        if (err) {
+                codec_err(codec, "hdmi: no free converter to enable silent mode\n");
+                goto unlock_out;
+        }
+
+        per_cvt = get_cvt(spec, cvt_idx);
+        per_cvt->silent_stream = true;
+        per_pin->cvt_nid = per_cvt->cvt_nid;
+        per_pin->silent_stream = true;
+
+        codec_dbg(codec, "hdmi: enabling silent stream pin-NID=0x%x cvt-NID=0x%x\n",
+                  per_pin->pin_nid, per_cvt->cvt_nid);
+
+        snd_hda_set_dev_select(codec, per_pin->pin_nid, per_pin->dev_id);
+        snd_hda_codec_write_cache(codec, per_pin->pin_nid, 0,
+                                  AC_VERB_SET_CONNECT_SEL,
+                                  per_pin->mux_idx);
+
+        /* configure unused pins to choose other converters */
+        pin_cvt_fixup(codec, per_pin, 0);
+
+        switch (spec->silent_stream_type) {
+        case SILENT_STREAM_KAE:
+                silent_stream_enable_i915(codec, per_pin);
+                silent_stream_set_kae(codec, per_pin, true);
+                break;
+        case SILENT_STREAM_I915:
+                silent_stream_enable_i915(codec, per_pin);
+                keep_power = 1;
+                break;
+        default:
+                break;
+        }
 
  unlock_out:
         mutex_unlock(&per_pin->lock);
+
+        if (err || !keep_power)
+                snd_hda_power_down_pm(codec);
 }
 
@@ -1745 +1792 @@
         struct hdmi_spec *spec = codec->spec;
         struct hdmi_spec_per_cvt *per_cvt;
-        int cvt_idx;
+        int cvt_idx, err;
+
+        err = snd_hda_power_up_pm(codec);
+        if (err < 0 && err != -EACCES) {
+                codec_err(codec,
+                          "Failed to power up codec for silent stream disable ret=[%d]\n",
+                          err);
+                snd_hda_power_down_pm(codec);
+                return;
+        }
 
         mutex_lock(&per_pin->lock);
@@ -1757 +1813 @@
         if (cvt_idx >= 0 && cvt_idx < spec->num_cvts) {
                 per_cvt = get_cvt(spec, cvt_idx);
-                per_cvt->assigned = 0;
+                per_cvt->silent_stream = false;
+        }
+
+        if (spec->silent_stream_type == SILENT_STREAM_I915) {
+                /* release ref taken in silent_stream_enable() */
+                snd_hda_power_down_pm(codec);
+        } else if (spec->silent_stream_type == SILENT_STREAM_KAE) {
+                silent_stream_set_kae(codec, per_pin, false);
         }
 
@@ -1765 +1828 @@
  unlock_out:
         mutex_unlock(&per_pin->lock);
+
+        snd_hda_power_down_pm(codec);
 }
 
@@ -1786 +1851 @@
         mutex_unlock(&per_pin->lock);
 
-        /*
-         * Power-up will call hdmi_present_sense, so the PM calls
-         * have to be done without mutex held.
-         */
-
-        if (spec->send_silent_stream) {
-                int pm_ret;
-
-                if (!monitor_prev && monitor_next) {
-                        pm_ret = snd_hda_power_up_pm(codec);
-                        if (pm_ret < 0)
-                                codec_err(codec,
-                                "Monitor plugged-in, Failed to power up codec ret=[%d]\n",
-                                pm_ret);
+        if (spec->silent_stream_type) {
+                if (!monitor_prev && monitor_next)
                         silent_stream_enable(codec, per_pin);
-                } else if (monitor_prev && !monitor_next) {
+                else if (monitor_prev && !monitor_next)
                         silent_stream_disable(codec, per_pin);
-                        pm_ret = snd_hda_power_down_pm(codec);
-                        if (pm_ret < 0)
-                                codec_err(codec,
-                                "Monitor plugged-out, Failed to power down codec ret=[%d]\n",
-                                pm_ret);
-                }
         }
 }
@@ -1877 +1924 @@
                  */
                 dev_num = spec->dev_num;
-        } else if (spec->dyn_pcm_assign && codec->dp_mst) {
+        } else if (codec->dp_mst) {
                 dev_num = snd_hda_get_num_devices(codec, pin_nid) + 1;
                 /*
@@ -1902 +1949 @@
                         return -ENOMEM;
 
-                if (spec->dyn_pcm_assign) {
-                        per_pin->pcm = NULL;
-                        per_pin->pcm_idx = -1;
-                } else {
-                        per_pin->pcm = get_hdmi_pcm(spec, pin_idx);
-                        per_pin->pcm_idx = pin_idx;
-                }
+                per_pin->pcm = NULL;
+                per_pin->pcm_idx = -1;
+                per_pin->prev_pcm_idx = -1;
                 per_pin->pin_nid = pin_nid;
                 per_pin->pin_nid_idx = spec->num_nids;
@@ -1917 +1960 @@
                 if (err < 0)
                         return err;
+                if (!is_jack_detectable(codec, pin_nid))
+                        codec_warn(codec, "HDMI: pin NID 0x%x - jack not detectable\n", pin_nid);
                 spec->num_pins++;
         }
@@ -1961 +2006 @@
 
 static const struct snd_pci_quirk force_connect_list[] = {
+        SND_PCI_QUIRK(0x103c, 0x83e2, "HP EliteDesk 800 G4", 1),
+        SND_PCI_QUIRK(0x103c, 0x83ef, "HP MP9 G4 Retail System AMS", 1),
         SND_PCI_QUIRK(0x103c, 0x870f, "HP", 1),
         SND_PCI_QUIRK(0x103c, 0x871a, "HP", 1),
+        SND_PCI_QUIRK(0x103c, 0x8711, "HP", 1),
+        SND_PCI_QUIRK(0x103c, 0x8715, "HP", 1),
+        SND_PCI_QUIRK(0x1043, 0x86ae, "ASUS", 1),  /* Z170 PRO */
+        SND_PCI_QUIRK(0x1043, 0x86c7, "ASUS", 1),  /* Z170M PLUS */
         SND_PCI_QUIRK(0x1462, 0xec94, "MS-7C94", 1),
+        SND_PCI_QUIRK(0x8086, 0x2060, "Intel NUC5CPYB", 1),
         SND_PCI_QUIRK(0x8086, 0x2081, "Intel NUC 10", 1),
         {0}
@@ -2068 +2120 @@
         mutex_lock(&spec->pcm_lock);
         pin_idx = hinfo_to_pin_index(codec, hinfo);
-        if (spec->dyn_pcm_assign && pin_idx < 0) {
-                /* when dyn_pcm_assign and pcm is not bound to a pin
-                 * skip pin setup and return 0 to make audio playback
-                 * be ongoing
+        if (pin_idx < 0) {
+                /* when pcm is not bound to a pin skip pin setup and return 0
+                 * to make audio playback be ongoing
                  */
                 pin_cvt_fixup(codec, NULL, cvt_nid);
@@ -2079 +2130 @@
         }
 
-        if (snd_BUG_ON(pin_idx < 0)) {
-                err = -EINVAL;
-                goto unlock;
-        }
         per_pin = get_pin(spec, pin_idx);
 
@@ -2168 +2215 @@
                 }
                 per_cvt = get_cvt(spec, cvt_idx);
-                per_cvt->assigned = 0;
+                per_cvt->assigned = false;
                 hinfo->nid = 0;
 
@@ -2176 +2223 @@
                 clear_bit(pcm_idx, &spec->pcm_in_use);
                 pin_idx = hinfo_to_pin_index(codec, hinfo);
-                if (spec->dyn_pcm_assign && pin_idx < 0)
+                /*
+                 * In such a case, return 0 to match the behavior in
+                 * hdmi_pcm_open()
+                 */
+                if (pin_idx < 0)
                         goto unlock;
 
-                if (snd_BUG_ON(pin_idx < 0)) {
-                        err = -EINVAL;
-                        goto unlock;
-                }
                 per_pin = get_pin(spec, pin_idx);
 
@@ -2274 +2321 @@
         int idx, pcm_num;
 
-        /*
-         * for non-mst mode, pcm number is the same as before
-         * for DP MST mode without extra PCM, pcm number is same
-         * for DP MST mode with extra PCMs, pcm number is
-         *  (nid number + dev_num - 1)
-         * dev_num is the device entry number in a pin
-         */
-
-        if (spec->dyn_pcm_no_legacy && codec->mst_no_extra_pcms)
-                pcm_num = spec->num_cvts;
-        else if (codec->mst_no_extra_pcms)
-                pcm_num = spec->num_nids;
-        else
-                pcm_num = spec->num_nids + spec->dev_num - 1;
-
+        /* limit the PCM devices to the codec converters or available PINs */
+        pcm_num = min(spec->num_cvts, spec->num_pins);
         codec_dbg(codec, "hdmi: pcm_num set to %d\n", pcm_num);
 
         for (idx = 0; idx < pcm_num; idx++) {
+                struct hdmi_spec_per_cvt *per_cvt;
                 struct hda_pcm *info;
                 struct hda_pcm_stream *pstr;
@@ -2307 +2342 @@
                 pstr->substreams = 1;
                 pstr->ops = generic_ops;
-                /* pcm number is less than 16 */
-                if (spec->pcm_used >= 16)
+
+                per_cvt = get_cvt(spec, 0);
+                pstr->channels_min = per_cvt->channels_min;
+                pstr->channels_max = per_cvt->channels_max;
+
+                /* pcm number is less than pcm_rec array size */
+                if (spec->pcm_used >= ARRAY_SIZE(spec->pcm_rec))
                         break;
                 /* other pstr fields are set in open */
@@ -2327 +2367 @@
         char hdmi_str[32] = "HDMI/DP";
         struct hdmi_spec *spec = codec->spec;
-        struct hdmi_spec_per_pin *per_pin = get_pin(spec, pcm_idx);
         struct snd_jack *jack;
         int pcmdev = get_pcm_rec(spec, pcm_idx)->device;
@@ -2334 +2373 @@
         if (pcmdev > 0)
                 sprintf(hdmi_str + strlen(hdmi_str), ",pcm=%d", pcmdev);
-        if (!spec->dyn_pcm_assign &&
-            !is_jack_detectable(codec, per_pin->pin_nid))
-                strncat(hdmi_str, " Phantom",
-                        sizeof(hdmi_str) - strlen(hdmi_str) - 1);
 
         err = snd_jack_new(codec->card, hdmi_str, SND_JACK_AVOUT, &jack,
@@ -2370 +2405 @@
                  * pin will be bound when monitor is connected
                  */
-                if (spec->dyn_pcm_assign)
-                        err = snd_hda_create_dig_out_ctls(codec,
+                err = snd_hda_create_dig_out_ctls(codec,
                                           0, spec->cvt_nids[0],
                                           HDA_PCM_TYPE_HDMI);
-                else {
-                        struct hdmi_spec_per_pin *per_pin =
-                                get_pin(spec, pcm_idx);
-                        err = snd_hda_create_dig_out_ctls(codec,
-                                                  per_pin->pin_nid,
-                                                  per_pin->mux_nids[0],
-                                                  HDA_PCM_TYPE_HDMI);
-                }
                 if (err < 0)
                         return err;
@@ -2399 +2425 @@
                 struct hdmi_eld *pin_eld = &per_pin->sink_eld;
 
+                if (spec->static_pcm_mapping) {
+                        hdmi_attach_hda_pcm(spec, per_pin);
+                        hdmi_pcm_setup_pin(spec, per_pin);
+                }
+
                 pin_eld->eld_valid = false;
                 hdmi_present_sense(per_pin, 0);
@@ -2503 +2534 @@
                 if (spec->pcm_rec[pcm_idx].jack == NULL)
                         continue;
-                if (spec->dyn_pcm_assign)
-                        snd_device_free(codec->card,
-                                        spec->pcm_rec[pcm_idx].jack);
-                else
-                        spec->pcm_rec[pcm_idx].jack = NULL;
+                snd_device_free(codec->card, spec->pcm_rec[pcm_idx].jack);
         }
 
@@ -2696 +2723 @@
                 return;
 #endif
-        /* ditto during suspend/resume process itself */
-        if (snd_hdac_is_in_pm(&codec->core))
-                return;
 
         check_presence_and_report(codec, pin_nid, dev_id);
@@ -2884 +2908 @@
                 return;
 #endif
-        /* ditto during suspend/resume process itself */
-        if (snd_hdac_is_in_pm(&codec->core))
-                return;
 
         snd_hdac_i915_set_bclk(&codec->bus->core);
@@ -2916 +2937 @@
                                  int format)
 {
+        struct hdmi_spec *spec = codec->spec;
+        int pin_idx = pin_id_to_pin_index(codec, pin_nid, dev_id);
+        struct hdmi_spec_per_pin *per_pin;
+        int res;
+
+        if (pin_idx < 0)
+                per_pin = NULL;
+        else
+                per_pin = get_pin(spec, pin_idx);
+
         haswell_verify_D0(codec, cvt_nid, pin_nid);
-        return hdmi_setup_stream(codec, cvt_nid, pin_nid, dev_id,
-                                 stream_tag, format);
+
+        if (spec->silent_stream_type == SILENT_STREAM_KAE && per_pin && per_pin->silent_stream) {
+                silent_stream_set_kae(codec, per_pin, false);
+                /* wait for pending transfers in codec to clear */
+                usleep_range(100, 200);
+        }
+
+        res = hdmi_setup_stream(codec, cvt_nid, pin_nid, dev_id,
+                                stream_tag, format);
+
+        if (spec->silent_stream_type == SILENT_STREAM_KAE && per_pin && per_pin->silent_stream) {
+                usleep_range(100, 200);
+                silent_stream_set_kae(codec, per_pin, true);
+        }
+
+        return res;
 }
 
@@ -2938 +2983 @@
 }
 
+#ifdef CONFIG_PM
+static int i915_adlp_hdmi_suspend(struct hda_codec *codec)
+{
+        struct hdmi_spec *spec = codec->spec;
+        bool silent_streams = false;
+        int pin_idx, res;
+
+        res = generic_hdmi_suspend(codec);
+
+        for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) {
+                struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);
+
+                if (per_pin->silent_stream) {
+                        silent_streams = true;
+                        break;
+                }
+        }
+
+        if (silent_streams && spec->silent_stream_type == SILENT_STREAM_KAE) {
+                /*
+                 * stream-id should remain programmed when codec goes
+                 * to runtime suspend
+                 */
+                codec->no_stream_clean_at_suspend = 1;
+
+                /*
+                 * the system might go to S3, in which case keep-alive
+                 * must be reprogrammed upon resume
+                 */
+                codec->forced_resume = 1;
+
+                codec_dbg(codec, "HDMI: KAE active at suspend\n");
+        } else {
+                codec->no_stream_clean_at_suspend = 0;
+                codec->forced_resume = 0;
+        }
+
+        return res;
+}
+
+static int i915_adlp_hdmi_resume(struct hda_codec *codec)
+{
+        struct hdmi_spec *spec = codec->spec;
+        int pin_idx, res;
+
+        res = generic_hdmi_resume(codec);
+
+        /* KAE not programmed at suspend, nothing to do here */
+        if (!codec->no_stream_clean_at_suspend)
+                return res;
+
+        for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) {
+                struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);
+
+                /*
+                 * If system was in suspend with monitor connected,
+                 * the codec setting may have been lost. Re-enable
+                 * keep-alive.
+                 */
+                if (per_pin->silent_stream) {
+                        unsigned int param;
+
+                        param = snd_hda_codec_read(codec, per_pin->cvt_nid, 0,
+                                                   AC_VERB_GET_CONV, 0);
+                        if (!param) {
+                                codec_dbg(codec, "HDMI: KAE: restore stream id\n");
+                                silent_stream_enable_i915(codec, per_pin);
+                        }
+
+                        param = snd_hda_codec_read(codec, per_pin->cvt_nid, 0,
+                                                   AC_VERB_GET_DIGI_CONVERT_1, 0);
+                        if (!(param & (AC_DIG3_KAE << 16))) {
+                                codec_dbg(codec, "HDMI: KAE: restore DIG3_KAE\n");
+                                silent_stream_set_kae(codec, per_pin, true);
+                        }
+                }
+        }
+
+        return res;
+}
+#endif
+
 /* precondition and allocation for Intel codecs */
 static int alloc_intel_hdmi(struct hda_codec *codec)
@@ -2991 +3118 @@
         spec = codec->spec;
         codec->dp_mst = true;
-        spec->dyn_pcm_assign = true;
         spec->vendor_nid = vendor_nid;
         spec->port_map = port_map;
@@ -3015 +3141 @@
          */
         if (send_silent_stream)
-                spec->send_silent_stream = true;
+                spec->silent_stream_type = SILENT_STREAM_I915;
 
         return parse_intel_hdmi(codec);
@@ -3055 +3181 @@
          */
         static const int map[] = {0x4, 0x6, 0x8, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf};
-        int ret;
-
-        ret = intel_hsw_common_init(codec, 0x02, map, ARRAY_SIZE(map), 4,
-                                    enable_silent_stream);
-        if (!ret) {
-                struct hdmi_spec *spec = codec->spec;
-
-                spec->dyn_pcm_no_legacy = true;
-        }
-
-        return ret;
+
+        return intel_hsw_common_init(codec, 0x02, map, ARRAY_SIZE(map), 4,
+                                     enable_silent_stream);
+}
+
+static int patch_i915_adlp_hdmi(struct hda_codec *codec)
+{
+        struct hdmi_spec *spec;
+        int res;
+
+        res = patch_i915_tgl_hdmi(codec);
+        if (!res) {
+                spec = codec->spec;
+
+                if (spec->silent_stream_type) {
+                        spec->silent_stream_type = SILENT_STREAM_KAE;
+
+#ifdef CONFIG_PM
+                        codec->patch_ops.resume = i915_adlp_hdmi_resume;
+                        codec->patch_ops.suspend = i915_adlp_hdmi_suspend;
+#endif
+                }
+        }
+
+        return res;
 }
 
@@ -3564 +3704 @@
         spec->pcm_playback.maxbps = SUPPORTED_MAXBPS;
         spec->pcm_playback.formats = SUPPORTED_FORMATS;
+        spec->nv_dp_workaround = true;
         return 0;
 }
@@ -3688 +3829 @@
 
         spec = codec->spec;
-        spec->dyn_pcm_assign = true;
 
         err = hdmi_parse_codec(codec);
@@ -3703 +3843 @@
                 nvhdmi_chmap_cea_alloc_validate_get_type;
         spec->chmap.ops.chmap_validate = nvhdmi_chmap_validate;
+        spec->nv_dp_workaround = true;
 
         codec->link_down_at_suspend = 1;
@@ -3726 +3867 @@
                 nvhdmi_chmap_cea_alloc_validate_get_type;
         spec->chmap.ops.chmap_validate = nvhdmi_chmap_validate;
+        spec->nv_dp_workaround = true;
 
         codec->link_down_at_suspend = 1;
@@ -3754 +3896 @@
  *
  * Note that for the trigger bit to take effect it needs to change value
- * (i.e. it needs to be toggled).
+ * (i.e. it needs to be toggled). The trigger bit is not applicable from
+ * TEGRA234 chip onwards, as new verb id 0xf80 will be used for interrupt
+ * trigger to hdmi.
  */
+#define NVIDIA_SET_HOST_INTR            0xf80
 #define NVIDIA_GET_SCRATCH0             0xfa6
 #define NVIDIA_SET_SCRATCH0_BYTE0       0xfa7
@@ -3774 +3919 @@
  * the format is invalidated so that the HDMI codec can be disabled.
  */
-static void tegra_hdmi_set_format(struct hda_codec *codec, unsigned int format)
+static void tegra_hdmi_set_format(struct hda_codec *codec,
+                                  hda_nid_t cvt_nid,
+                                  unsigned int format)
 {
         unsigned int value;
+        unsigned int nid = NVIDIA_AFG_NID;
+        struct hdmi_spec *spec = codec->spec;
+
+        /*
+         * Tegra HDA codec design from TEGRA234 chip onwards support DP MST.
+         * This resulted in moving scratch registers from audio function
+         * group to converter widget context. So CVT NID should be used for
+         * scratch register read/write for DP MST supported Tegra HDA codec.
+         */
+        if (codec->dp_mst)
+                nid = cvt_nid;
 
         /* bits [31:30] contain the trigger and valid bits */
-        value = snd_hda_codec_read(codec, NVIDIA_AFG_NID, 0,
+        value = snd_hda_codec_read(codec, nid, 0,
                                    NVIDIA_GET_SCRATCH0, 0);
         value = (value >> 24) & 0xff;
 
         /* bits [15:0] are used to store the HDA format */
-        snd_hda_codec_write(codec, NVIDIA_AFG_NID, 0,
+        snd_hda_codec_write(codec, nid, 0,
                             NVIDIA_SET_SCRATCH0_BYTE0,
                             (format >> 0) & 0xff);
-        snd_hda_codec_write(codec, NVIDIA_AFG_NID, 0,
+        snd_hda_codec_write(codec, nid, 0,
                             NVIDIA_SET_SCRATCH0_BYTE1,
                             (format >> 8) & 0xff);
 
         /* bits [16:24] are unused */
-        snd_hda_codec_write(codec, NVIDIA_AFG_NID, 0,
+        snd_hda_codec_write(codec, nid, 0,
                             NVIDIA_SET_SCRATCH0_BYTE2, 0);
 
@@ -3804 +3962 @@
                 value |= NVIDIA_SCRATCH_VALID;
 
-        /*
-         * Whenever the trigger bit is toggled, an interrupt is raised in the
-         * HDMI codec. The HDMI driver will use that as trigger to update its
-         * configuration.
-         */
-        value ^= NVIDIA_SCRATCH_TRIGGER;
-
-        snd_hda_codec_write(codec, NVIDIA_AFG_NID, 0,
-                            NVIDIA_SET_SCRATCH0_BYTE3, value);
+        if (spec->hdmi_intr_trig_ctrl) {
+                /*
+                 * For Tegra HDA Codec design from TEGRA234 onwards, the
+                 * Interrupt to hdmi driver is triggered by writing
+                 * non-zero values to verb 0xF80 instead of 31st bit of
+                 * scratch register.
+                 */
+                snd_hda_codec_write(codec, nid, 0,
+                                NVIDIA_SET_SCRATCH0_BYTE3, value);
+                snd_hda_codec_write(codec, nid, 0,
+                                NVIDIA_SET_HOST_INTR, 0x1);
+        } else {
+                /*
+                 * Whenever the 31st trigger bit is toggled, an interrupt is raised
+                 * in the HDMI codec. The HDMI driver will use that as trigger
+                 * to update its configuration.
+                 */
+                value ^= NVIDIA_SCRATCH_TRIGGER;
+
+                snd_hda_codec_write(codec, nid, 0,
+                                NVIDIA_SET_SCRATCH0_BYTE3, value);
+        }
 }
 
@@ -3829 +4000 @@
 
         /* notify the HDMI codec of the format change */
-        tegra_hdmi_set_format(codec, format);
+        tegra_hdmi_set_format(codec, hinfo->nid, format);
 
         return 0;
@@ -3839 +4010 @@
 {
         /* invalidate the format in the HDMI codec */
-        tegra_hdmi_set_format(codec, 0);
+        tegra_hdmi_set_format(codec, hinfo->nid, 0);
 
         return generic_hdmi_playback_pcm_cleanup(hinfo, codec, substream);
@@ -3884 +4055 @@
 }
 
-static int patch_tegra_hdmi(struct hda_codec *codec)
-{
-        struct hdmi_spec *spec;
-        int err;
-
-        err = patch_generic_hdmi(codec);
-        if (err)
+static int tegra_hdmi_init(struct hda_codec *codec)
+{
+        struct hdmi_spec *spec = codec->spec;
+        int i, err;
+
+        err = hdmi_parse_codec(codec);
+        if (err < 0) {
+                generic_spec_free(codec);
                 return err;
-
+        }
+
+        for (i = 0; i < spec->num_cvts; i++)
+                snd_hda_codec_write(codec, spec->cvt_nids[i], 0,
+                                        AC_VERB_SET_DIGI_CONVERT_1,
+                                        AC_DIG1_ENABLE);
+
+        generic_hdmi_init_per_pins(codec);
+
+        codec->depop_delay = 10;
         codec->patch_ops.build_pcms = tegra_hdmi_build_pcms;
-        spec = codec->spec;
         spec->chmap.ops.chmap_cea_alloc_validate_get_type =
                 nvhdmi_chmap_cea_alloc_validate_get_type;
         spec->chmap.ops.chmap_validate = nvhdmi_chmap_validate;
 
+        spec->chmap.ops.chmap_cea_alloc_validate_get_type =
+                nvhdmi_chmap_cea_alloc_validate_get_type;
+        spec->chmap.ops.chmap_validate = nvhdmi_chmap_validate;
+        spec->nv_dp_workaround = true;
+
         return 0;
+}
+
+static int patch_tegra_hdmi(struct hda_codec *codec)
+{
+        int err;
+
+        err = alloc_generic_hdmi(codec);
+        if (err < 0)
+                return err;
+
+        return tegra_hdmi_init(codec);
+}
+
+static int patch_tegra234_hdmi(struct hda_codec *codec)
+{
+        struct hdmi_spec *spec;
+        int err;
+
+        err = alloc_generic_hdmi(codec);
+        if (err < 0)
+                return err;
+
+        codec->dp_mst = true;
+        spec = codec->spec;
+        spec->dyn_pin_out = true;
+        spec->hdmi_intr_trig_ctrl = true;
+
+        return tegra_hdmi_init(codec);
 }
 
@@ -4263 +4476 @@
         spec = codec->spec;
 
+        spec->static_pcm_mapping = true;
+
         spec->ops.pin_get_eld = atihdmi_pin_get_eld;
         spec->ops.pin_setup_infoframe = atihdmi_pin_setup_infoframe;
@@ -4310 +4525 @@
 }
 
+static int patch_gf_hdmi(struct hda_codec *codec)
+{
+        int err;
+
+        err = patch_generic_hdmi(codec);
+        if (err)
+                return err;
+
+        /*
+         * Glenfly GPUs have two codecs, stream switches from one codec to
+         * another, need to do actual clean-ups in codec_cleanup_stream
+         */
+        codec->no_sticky_stream = 1;
+        return 0;
+}
+
 /*
  * patch entries
  */
 static const struct hda_device_id snd_hda_id_hdmi[] = {
+HDA_CODEC_ENTRY(0x00147a47, "Loongson HDMI",    patch_generic_hdmi),
 HDA_CODEC_ENTRY(0x1002793c, "RS600 HDMI",       patch_atihdmi),
 HDA_CODEC_ENTRY(0x10027919, "RS600 HDMI",       patch_atihdmi),
@@ -4355 +4587 @@
 HDA_CODEC_ENTRY(0x10de002f, "Tegra194 HDMI/DP2", patch_tegra_hdmi),
 HDA_CODEC_ENTRY(0x10de0030, "Tegra194 HDMI/DP3", patch_tegra_hdmi),
+HDA_CODEC_ENTRY(0x10de0031, "Tegra234 HDMI/DP", patch_tegra234_hdmi),
 HDA_CODEC_ENTRY(0x10de0040, "GPU 40 HDMI/DP",   patch_nvhdmi),
 HDA_CODEC_ENTRY(0x10de0041, "GPU 41 HDMI/DP",   patch_nvhdmi),
@@ -4397 +4630 @@
 HDA_CODEC_ENTRY(0x10de009f, "GPU 9f HDMI/DP",   patch_nvhdmi),
 HDA_CODEC_ENTRY(0x10de00a0, "GPU a0 HDMI/DP",   patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00a3, "GPU a3 HDMI/DP",   patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00a4, "GPU a4 HDMI/DP",   patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00a5, "GPU a5 HDMI/DP",   patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00a6, "GPU a6 HDMI/DP",   patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00a7, "GPU a7 HDMI/DP",   patch_nvhdmi),
 HDA_CODEC_ENTRY(0x10de8001, "MCP73 HDMI",       patch_nvhdmi_2ch),
 HDA_CODEC_ENTRY(0x10de8067, "MCP67/68 HDMI",    patch_nvhdmi_2ch),
+HDA_CODEC_ENTRY(0x67663d82, "Arise 82 HDMI/DP", patch_gf_hdmi),
+HDA_CODEC_ENTRY(0x67663d83, "Arise 83 HDMI/DP", patch_gf_hdmi),
+HDA_CODEC_ENTRY(0x67663d84, "Arise 84 HDMI/DP", patch_gf_hdmi),
+HDA_CODEC_ENTRY(0x67663d85, "Arise 85 HDMI/DP", patch_gf_hdmi),
+HDA_CODEC_ENTRY(0x67663d86, "Arise 86 HDMI/DP", patch_gf_hdmi),
+HDA_CODEC_ENTRY(0x67663d87, "Arise 87 HDMI/DP", patch_gf_hdmi),
 HDA_CODEC_ENTRY(0x11069f80, "VX900 HDMI/DP",    patch_via_hdmi),
 HDA_CODEC_ENTRY(0x11069f81, "VX900 HDMI/DP",    patch_via_hdmi),
@@ -4423 +4667 @@
 HDA_CODEC_ENTRY(0x80862815, "Alderlake HDMI",   patch_i915_tgl_hdmi),
 HDA_CODEC_ENTRY(0x80862816, "Rocketlake HDMI",  patch_i915_tgl_hdmi),
+HDA_CODEC_ENTRY(0x80862818, "Raptorlake HDMI",  patch_i915_tgl_hdmi),
 HDA_CODEC_ENTRY(0x80862819, "DG2 HDMI", patch_i915_tgl_hdmi),
 HDA_CODEC_ENTRY(0x8086281a, "Jasperlake HDMI",  patch_i915_icl_hdmi),
 HDA_CODEC_ENTRY(0x8086281b, "Elkhartlake HDMI", patch_i915_icl_hdmi),
-HDA_CODEC_ENTRY(0x8086281c, "Alderlake-P HDMI", patch_i915_tgl_hdmi),
+HDA_CODEC_ENTRY(0x8086281c, "Alderlake-P HDMI", patch_i915_adlp_hdmi),
+HDA_CODEC_ENTRY(0x8086281d, "Meteor Lake HDMI", patch_i915_adlp_hdmi),
+HDA_CODEC_ENTRY(0x8086281f, "Raptor Lake P HDMI",       patch_i915_adlp_hdmi),
+HDA_CODEC_ENTRY(0x80862820, "Lunar Lake HDMI",  patch_i915_adlp_hdmi),
+HDA_CODEC_ENTRY(0x80862822, "Panther Lake HDMI",        patch_i915_adlp_hdmi),
 HDA_CODEC_ENTRY(0x80862880, "CedarTrail HDMI",  patch_generic_hdmi),
 HDA_CODEC_ENTRY(0x80862882, "Valleyview2 HDMI", patch_i915_byt_hdmi),

GPL/trunk/alsa-kernel/pci/hda/patch_realtek.c

@@ -19 +19 @@
 #include <linux/input.h>
 #include <linux/leds.h>
+#include <linux/ctype.h>
 #include <sound/core.h>
 #include <sound/jack.h>
@@ -26 +27 @@
 #include "hda_jack.h"
 #include "hda_generic.h"
+#ifndef TARGET_OS2
+#include "hda_component.h"
+#else
+#include "hda_component2.h"
+#endif
 
 #ifdef TARGET_OS2
@@ -126 +132 @@
         unsigned int has_hs_key:1;
         unsigned int no_internal_mic_pin:1;
+        unsigned int en_3kpull_low:1;
 
         /* for PLL fix */
@@ -133 +140 @@
         struct input_dev *kb_dev;
         u8 alc_mute_keycode_map[1];
+
+        /* component binding */
+        struct component_match *match;
+        struct hda_component comps[HDA_MAX_COMPONENTS];
 };
 
@@ -439 +450 @@
                 fallthrough;
         case 0x10ec0215:
+        case 0x10ec0285:
+        case 0x10ec0289:
+                alc_update_coef_idx(codec, 0x36, 1<<13, 0);
+                fallthrough;
         case 0x10ec0230:
         case 0x10ec0233:
@@ -452 +467 @@
         case 0x10ec0286:
         case 0x10ec0288:
-        case 0x10ec0285:
         case 0x10ec0298:
-        case 0x10ec0289:
         case 0x10ec0300:
                 alc_update_coef_idx(codec, 0x10, 1<<9, 0);
@@ -470 +483 @@
         case 0x10ec0234:
         case 0x10ec0274:
+                alc_write_coef_idx(codec, 0x6e, 0x0c25);
+                fallthrough;
         case 0x10ec0294:
         case 0x10ec0700:
@@ -584 +599 @@
         case 0x10ec0236:
         case 0x10ec0256:
+        case 0x10ec0257:
         case 0x19e58326:
         case 0x10ec0283:
+        case 0x10ec0285:
         case 0x10ec0286:
+        case 0x10ec0287:
         case 0x10ec0288:
+        case 0x10ec0295:
         case 0x10ec0298:
                 alc_headset_mic_no_shutup(codec);
@@ -834 +853 @@
                         break;
                 case 7:
-                        alc_setup_gpio(codec, 0x03);
+                        alc_setup_gpio(codec, 0x04);
                         break;
                 case 5:
@@ -1842 +1861 @@
 };
 
-static const struct snd_pci_quirk alc880_fixup_tbl[] = {
+static const struct hda_quirk alc880_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1019, 0x0f69, "Coeus G610P", ALC880_FIXUP_W810),
         SND_PCI_QUIRK(0x1043, 0x10c3, "ASUS W5A", ALC880_FIXUP_ASUS_W5A),
@@ -2211 +2230 @@
 };
 
-static const struct snd_pci_quirk alc260_fixup_tbl[] = {
+static const struct hda_quirk alc260_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1025, 0x007b, "Acer C20x", ALC260_FIXUP_GPIO1),
         SND_PCI_QUIRK(0x1025, 0x007f, "Acer Aspire 9500", ALC260_FIXUP_COEF),
@@ -2340 +2359 @@
         ALC887_FIXUP_ASUS_HMIC,
         ALCS1200A_FIXUP_MIC_VREF,
+        ALC888VD_FIXUP_MIC_100VREF,
 };
 
@@ -2497 +2517 @@
         kctl = snd_hda_find_mixer_ctl(codec, oldname);
         if (kctl)
-                strcpy(kctl->id.name, newname);
+                snd_ctl_rename(codec->card, kctl, newname);
 }
 
@@ -3048 +3068 @@
                 .v.func = alc1220_fixup_clevo_pb51ed,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC1220_FIXUP_CLEVO_PB51ED_PINS] = {
                 .type = HDA_FIXUP_PINS,
@@ -3073 +3093 @@
                 .chain_id = ALC887_FIXUP_ASUS_AUDIO,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALCS1200A_FIXUP_MIC_VREF] = {
                 .type = HDA_FIXUP_PINCTLS,
@@ -3085 +3105 @@
 };
 
-static const struct snd_pci_quirk alc882_fixup_tbl[] = {
+static const struct hda_quirk alc882_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1025, 0x006c, "Acer Aspire 9810", ALC883_FIXUP_ACER_EAPD),
         SND_PCI_QUIRK(0x1025, 0x0090, "Acer Aspire", ALC883_FIXUP_ACER_EAPD),
@@ -3152 +3172 @@
 
         SND_PCI_QUIRK(0x1071, 0x8258, "Evesham Voyaeger", ALC882_FIXUP_EAPD),
+        SND_PCI_QUIRK(0x10ec, 0x12d8, "iBase Elo Touch", ALC888VD_FIXUP_MIC_100VREF),
         SND_PCI_QUIRK(0x13fe, 0x1009, "Advantech MIT-W101", ALC886_FIXUP_EAPD),
         SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte EP45-DS3/Z87X-UD3H", ALC889_FIXUP_FRONT_HP_NO_PRESENCE),
@@ -3169 +3190 @@
         SND_PCI_QUIRK_VENDOR(0x1462, "MSI", ALC882_FIXUP_GPIO3),
         SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", ALC882_FIXUP_ABIT_AW9D_MAX),
+        SND_PCI_QUIRK(0x1558, 0x3702, "Clevo X370SN[VW]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
         SND_PCI_QUIRK(0x1558, 0x50d3, "Clevo PC50[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
         SND_PCI_QUIRK(0x1558, 0x65d1, "Clevo PB51[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
@@ -3176 +3198 @@
         SND_PCI_QUIRK(0x1558, 0x65f1, "Clevo PC50HS", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
         SND_PCI_QUIRK(0x1558, 0x65f5, "Clevo PD50PN[NRT]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
+        SND_PCI_QUIRK(0x1558, 0x66a2, "Clevo PE60RNE", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
+        SND_PCI_QUIRK(0x1558, 0x66a6, "Clevo PE60SN[CDE]-[GS]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
         SND_PCI_QUIRK(0x1558, 0x67d1, "Clevo PB71[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
         SND_PCI_QUIRK(0x1558, 0x67e1, "Clevo PB71[DE][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
@@ -3196 +3220 @@
         SND_PCI_QUIRK(0x1558, 0x97e1, "Clevo P970[ER][CDFN]", ALC1220_FIXUP_CLEVO_P950),
         SND_PCI_QUIRK(0x1558, 0x97e2, "Clevo P970RC-M", ALC1220_FIXUP_CLEVO_P950),
+        SND_PCI_QUIRK(0x1558, 0xd502, "Clevo PD50SNE", 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),
@@ -3494 +3519 @@
                 .v.func = alc_fixup_no_depop_delay,
         },
+#ifdef NOT_USED
+        [ALC888VD_FIXUP_MIC_100VREF] = {
+                .type = HDA_FIXUP_PINCTLS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x18, PIN_VREF100 }, /* headset mic */
+                        {}
+                }
+        },
+#endif
 };
 
-static const struct snd_pci_quirk alc262_fixup_tbl[] = {
+static const struct hda_quirk alc262_fixup_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x170b, "HP Z200", ALC262_FIXUP_HP_Z200),
         SND_PCI_QUIRK(0x10cf, 0x1397, "Fujitsu Lifebook S7110", ALC262_FIXUP_FSC_S7110),
@@ -3678 +3712 @@
 };
 
-static const struct snd_pci_quirk alc268_fixup_tbl[] = {
+static const struct hda_quirk alc268_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1025, 0x0139, "Acer TravelMate 6293", ALC268_FIXUP_SPDIF),
         SND_PCI_QUIRK(0x1025, 0x015b, "Acer AOA 150 (ZG5)", ALC268_FIXUP_INV_DMIC),
@@ -3891 +3925 @@
         case 0x10ec0236:
         case 0x10ec0256:
+        case 0x10ec0257:
         case 0x19e58326:
                 alc_write_coef_idx(codec, 0x48, 0x0);
@@ -3920 +3955 @@
         case 0x10ec0236:
         case 0x10ec0256:
+        case 0x10ec0257:
         case 0x19e58326:
                 alc_write_coef_idx(codec, 0x48, 0xd011);
@@ -4204 +4240 @@
         bool hp_pin_sense;
 
-        if (!hp_pin)
-                hp_pin = 0x21;
-
-        msleep(30);
-
-        hp_pin_sense = snd_hda_jack_detect(codec, hp_pin);
-
-        if (hp_pin_sense)
-                msleep(2);
-
-        alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x1); /* Low power */
         if (spec->ultra_low_power) {
                 alc_update_coef_idx(codec, 0x03, 1<<1, 1<<1);
@@ -4224 +4249 @@
         }
 
-        snd_hda_codec_write(codec, hp_pin, 0,
-                            AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
-
-        if (hp_pin_sense || spec->ultra_low_power)
-                msleep(85);
-
-        snd_hda_codec_write(codec, hp_pin, 0,
+        if (!hp_pin)
+                hp_pin = 0x21;
+
+        msleep(30);
+
+        hp_pin_sense = snd_hda_jack_detect(codec, hp_pin);
+
+        if (hp_pin_sense) {
+                msleep(2);
+                alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x1); /* Low power */
+
+                snd_hda_codec_write(codec, hp_pin, 0,
                             AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
 
-        if (hp_pin_sense || spec->ultra_low_power)
-                msleep(100);
-
+                msleep(75);
+
+                snd_hda_codec_write(codec, hp_pin, 0,
+                            AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
+
+                msleep(75);
+                alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x4); /* Hight power */
+        }
         alc_update_coef_idx(codec, 0x46, 3 << 12, 0);
-        alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x4); /* Hight power */
         alc_update_coefex_idx(codec, 0x53, 0x02, 0x8000, 1 << 15); /* Clear bit */
         alc_update_coefex_idx(codec, 0x53, 0x02, 0x8000, 0 << 15);
@@ -4258 +4292 @@
                 hp_pin = 0x21;
 
+        alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x1); /* Low power */
         hp_pin_sense = snd_hda_jack_detect(codec, hp_pin);
 
-        if (hp_pin_sense)
+        if (hp_pin_sense) {
                 msleep(2);
 
-        snd_hda_codec_write(codec, hp_pin, 0,
+                snd_hda_codec_write(codec, hp_pin, 0,
                             AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
 
-        if (hp_pin_sense || spec->ultra_low_power)
-                msleep(85);
+                msleep(75);
 
         /* 3k pull low control for Headset jack. */
@@ -4274 +4308 @@
          * when booting with headset plugged. So skip setting it for the codec alc257
          */
-        if (codec->core.vendor_id != 0x10ec0236 &&
-            codec->core.vendor_id != 0x10ec0257)
-                alc_update_coef_idx(codec, 0x46, 0, 3 << 12);
-
-        if (!spec->no_shutup_pins)
-                snd_hda_codec_write(codec, hp_pin, 0,
+                if (spec->en_3kpull_low)
+                        alc_update_coef_idx(codec, 0x46, 0, 3 << 12);
+
+                if (!spec->no_shutup_pins)
+                        snd_hda_codec_write(codec, hp_pin, 0,
                                     AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
 
-        if (hp_pin_sense || spec->ultra_low_power)
-                msleep(100);
+                msleep(75);
+        }
 
         alc_auto_setup_eapd(codec, false);
@@ -4305 +4338 @@
         int coef38, coef0d, coef36;
 
+        alc_write_coefex_idx(codec, 0x58, 0x00, 0x1888); /* write default value */
         alc_update_coef_idx(codec, 0x4a, 1<<15, 1<<15); /* Reset HP JD */
         coef38 = alc_read_coef_idx(codec, 0x38); /* Amp control */
@@ -4352 +4386 @@
         hda_nid_t hp_pin = alc_get_hp_pin(spec);
         bool hp1_pin_sense, hp2_pin_sense;
+
+        if (spec->ultra_low_power) {
+                alc_update_coef_idx(codec, 0x08, 0x0f << 2, 3<<2);
+                alc_update_coef_idx(codec, 0x0e, 7<<6, 7<<6);
+                alc_update_coef_idx(codec, 0x33, 1<<11, 0);
+                msleep(30);
+        }
 
         if (spec->codec_variant != ALC269_TYPE_ALC287 &&
@@ -4375 +4416 @@
         hp2_pin_sense = snd_hda_jack_detect(codec, 0x16);
 
-        if (hp1_pin_sense || hp2_pin_sense)
+        if (hp1_pin_sense || hp2_pin_sense) {
                 msleep(2);
-
-        alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x1); /* Low power */
-        if (spec->ultra_low_power) {
-                alc_update_coef_idx(codec, 0x08, 0x0f << 2, 3<<2);
-                alc_update_coef_idx(codec, 0x0e, 7<<6, 7<<6);
-                alc_update_coef_idx(codec, 0x33, 1<<11, 0);
-                msleep(30);
-        }
-
-        if (hp1_pin_sense || spec->ultra_low_power)
-                snd_hda_codec_write(codec, hp_pin, 0,
-                            AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
-        if (hp2_pin_sense)
-                snd_hda_codec_write(codec, 0x16, 0,
-                            AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
-
-        if (hp1_pin_sense || hp2_pin_sense || spec->ultra_low_power)
-                msleep(85);
-
-        if (hp1_pin_sense || spec->ultra_low_power)
-                snd_hda_codec_write(codec, hp_pin, 0,
-                            AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
-        if (hp2_pin_sense)
-                snd_hda_codec_write(codec, 0x16, 0,
-                            AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
-
-        if (hp1_pin_sense || hp2_pin_sense || spec->ultra_low_power)
-                msleep(100);
-
-        alc_update_coef_idx(codec, 0x4a, 3 << 10, 0);
-        alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x4); /* Hight power */
+                alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x1); /* Low power */
+
+                if (hp1_pin_sense)
+                        snd_hda_codec_write(codec, hp_pin, 0,
+                                    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
+                if (hp2_pin_sense)
+                        snd_hda_codec_write(codec, 0x16, 0,
+                                    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
+                msleep(75);
+
+                if (hp1_pin_sense)
+                        snd_hda_codec_write(codec, hp_pin, 0,
+                                    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
+                if (hp2_pin_sense)
+                        snd_hda_codec_write(codec, 0x16, 0,
+                                    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
+
+                msleep(75);
+                alc_update_coef_idx(codec, 0x4a, 3 << 10, 0);
+                alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x4); /* Hight power */
+        }
 }
 
@@ -4419 +4450 @@
                 hp_pin = 0x21;
 
-        alc_disable_headset_jack_key(codec);
-        /* 3k pull low control for Headset jack. */
-        alc_update_coef_idx(codec, 0x4a, 0, 3 << 10);
-
         hp1_pin_sense = snd_hda_jack_detect(codec, hp_pin);
         hp2_pin_sense = snd_hda_jack_detect(codec, 0x16);
 
-        if (hp1_pin_sense || hp2_pin_sense)
+        if (hp1_pin_sense || hp2_pin_sense) {
+                alc_disable_headset_jack_key(codec);
+                /* 3k pull low control for Headset jack. */
+                alc_update_coef_idx(codec, 0x4a, 0, 3 << 10);
                 msleep(2);
 
-        if (hp1_pin_sense || spec->ultra_low_power)
-                snd_hda_codec_write(codec, hp_pin, 0,
-                            AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
-        if (hp2_pin_sense)
-                snd_hda_codec_write(codec, 0x16, 0,
-                            AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
-
-        if (hp1_pin_sense || hp2_pin_sense || spec->ultra_low_power)
-                msleep(85);
-
-        if (hp1_pin_sense || spec->ultra_low_power)
-                snd_hda_codec_write(codec, hp_pin, 0,
-                            AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
-        if (hp2_pin_sense)
-                snd_hda_codec_write(codec, 0x16, 0,
-                            AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
-
-        if (hp1_pin_sense || hp2_pin_sense || spec->ultra_low_power)
-                msleep(100);
-
+                if (hp1_pin_sense)
+                        snd_hda_codec_write(codec, hp_pin, 0,
+                                    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
+                if (hp2_pin_sense)
+                        snd_hda_codec_write(codec, 0x16, 0,
+                                    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
+
+                msleep(75);
+
+                if (hp1_pin_sense)
+                        snd_hda_codec_write(codec, hp_pin, 0,
+                                    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
+                if (hp2_pin_sense)
+                        snd_hda_codec_write(codec, 0x16, 0,
+                                    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
+
+                msleep(75);
+                alc_update_coef_idx(codec, 0x4a, 3 << 10, 0);
+                alc_enable_headset_jack_key(codec);
+        }
         alc_auto_setup_eapd(codec, false);
         alc_shutup_pins(codec);
@@ -4459 +4489 @@
                 msleep(30);
         }
-
-        alc_update_coef_idx(codec, 0x4a, 3 << 10, 0);
-        alc_enable_headset_jack_key(codec);
+}
+
+static void alc222_init(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        hda_nid_t hp_pin = alc_get_hp_pin(spec);
+        bool hp1_pin_sense, hp2_pin_sense;
+
+        if (!hp_pin)
+                return;
+
+        msleep(30);
+
+        hp1_pin_sense = snd_hda_jack_detect(codec, hp_pin);
+        hp2_pin_sense = snd_hda_jack_detect(codec, 0x14);
+
+        if (hp1_pin_sense || hp2_pin_sense) {
+                msleep(2);
+
+                if (hp1_pin_sense)
+                        snd_hda_codec_write(codec, hp_pin, 0,
+                                    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
+                if (hp2_pin_sense)
+                        snd_hda_codec_write(codec, 0x14, 0,
+                                    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
+                msleep(75);
+
+                if (hp1_pin_sense)
+                        snd_hda_codec_write(codec, hp_pin, 0,
+                                    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
+                if (hp2_pin_sense)
+                        snd_hda_codec_write(codec, 0x14, 0,
+                                    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
+
+                msleep(75);
+        }
+}
+
+static void alc222_shutup(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        hda_nid_t hp_pin = alc_get_hp_pin(spec);
+        bool hp1_pin_sense, hp2_pin_sense;
+
+        if (!hp_pin)
+                hp_pin = 0x21;
+
+        hp1_pin_sense = snd_hda_jack_detect(codec, hp_pin);
+        hp2_pin_sense = snd_hda_jack_detect(codec, 0x14);
+
+        if (hp1_pin_sense || hp2_pin_sense) {
+                msleep(2);
+
+                if (hp1_pin_sense)
+                        snd_hda_codec_write(codec, hp_pin, 0,
+                                    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
+                if (hp2_pin_sense)
+                        snd_hda_codec_write(codec, 0x14, 0,
+                                    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
+
+                msleep(75);
+
+                if (hp1_pin_sense)
+                        snd_hda_codec_write(codec, hp_pin, 0,
+                                    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
+                if (hp2_pin_sense)
+                        snd_hda_codec_write(codec, 0x14, 0,
+                                    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
+
+                msleep(75);
+        }
+        alc_auto_setup_eapd(codec, false);
+        alc_shutup_pins(codec);
 }
 
@@ -4477 +4577 @@
         hp_pin_sense = snd_hda_jack_detect(codec, hp_pin);
 
-        if (hp_pin_sense)
+        if (hp_pin_sense) {
                 msleep(2);
 
-        snd_hda_codec_write(codec, hp_pin, 0,
-                            AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
-
-        if (hp_pin_sense)
-                msleep(85);
-
-        snd_hda_codec_write(codec, hp_pin, 0,
-                            AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
-
-        if (hp_pin_sense)
-                msleep(100);
+                snd_hda_codec_write(codec, hp_pin, 0,
+                                    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
+
+                msleep(75);
+
+                snd_hda_codec_write(codec, hp_pin, 0,
+                                    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
+                msleep(75);
+        }
 }
 
@@ -4506 +4604 @@
         hp_pin_sense = snd_hda_jack_detect(codec, hp_pin);
 
-        if (hp_pin_sense)
+        if (hp_pin_sense) {
                 msleep(2);
 
-        snd_hda_codec_write(codec, hp_pin, 0,
-                            AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
-
-        if (hp_pin_sense)
-                msleep(85);
-
-        if (!spec->no_shutup_pins)
                 snd_hda_codec_write(codec, hp_pin, 0,
-                                    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
-
-        if (hp_pin_sense)
-                msleep(100);
-
+                                    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
+
+                msleep(75);
+
+                if (!spec->no_shutup_pins)
+                        snd_hda_codec_write(codec, hp_pin, 0,
+                                            AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
+
+                msleep(75);
+        }
         alc_auto_setup_eapd(codec, false);
         alc_shutup_pins(codec);
@@ -4671 +4767 @@
         if (spec->has_alc5505_dsp)
                 alc5505_dsp_suspend(codec);
+
 #endif
         return alc_suspend(codec);
@@ -5199 +5296 @@
 }
 
-#ifdef NOT_USED
+#ifndef TARGET_OS2
 /* toggle GPIO2 at each time stream is started; we use PREPARE state instead */
 static void alc274_hp_envy_pcm_hook(struct hda_pcm_stream *hinfo,
@@ -5289 +5386 @@
 }
 
+static void alc236_fixup_hp_mute_led_coefbit2(struct hda_codec *codec,
+                                          const struct hda_fixup *fix, int action)
+{
+        struct alc_spec *spec = codec->spec;
+
+        if (action == HDA_FIXUP_ACT_PRE_PROBE) {
+                spec->mute_led_polarity = 0;
+                spec->mute_led_coef.idx = 0x07;
+                spec->mute_led_coef.mask = 1;
+                spec->mute_led_coef.on = 1;
+                spec->mute_led_coef.off = 0;
+#ifdef CONFIG_SND_HDA_GENERIC_LEDS
+                snd_hda_gen_add_mute_led_cdev(codec, coef_mute_led_set);
+#endif
+        }
+}
+
+static void alc245_fixup_hp_mute_led_coefbit(struct hda_codec *codec,
+                                          const struct hda_fixup *fix,
+                                          int action)
+{
+        struct alc_spec *spec = codec->spec;
+
+        if (action == HDA_FIXUP_ACT_PRE_PROBE) {
+                spec->mute_led_polarity = 0;
+                spec->mute_led_coef.idx = 0x0b;
+                spec->mute_led_coef.mask = 3 << 2;
+                spec->mute_led_coef.on = 2 << 2;
+                spec->mute_led_coef.off = 1 << 2;
+#ifdef CONFIG_SND_HDA_GENERIC_LEDS
+                snd_hda_gen_add_mute_led_cdev(codec, coef_mute_led_set);
+#endif
+        }
+}
+
 #ifdef NOT_USED
 /* turn on/off mic-mute LED per capture hook by coef bit */
@@ -5319 +5451 @@
 }
 
+static void alc285_fixup_hp_gpio_micmute_led(struct hda_codec *codec,
+                                const struct hda_fixup *fix, int action)
+{
+        struct alc_spec *spec = codec->spec;
+
+        if (action == HDA_FIXUP_ACT_PRE_PROBE)
+                spec->micmute_led_polarity = 1;
+        alc_fixup_hp_gpio_led(codec, action, 0, 0x04);
+}
+
 static void alc236_fixup_hp_coef_micmute_led(struct hda_codec *codec,
                                 const struct hda_fixup *fix, int action)
@@ -5342 +5484 @@
 }
 
+static void alc285_fixup_hp_spectre_x360_mute_led(struct hda_codec *codec,
+                                const struct hda_fixup *fix, int action)
+{
+        alc285_fixup_hp_mute_led_coefbit(codec, fix, action);
+        alc285_fixup_hp_gpio_micmute_led(codec, fix, action);
+}
+
 static void alc236_fixup_hp_mute_led(struct hda_codec *codec,
                                 const struct hda_fixup *fix, int action)
@@ -5370 +5519 @@
 }
 
-#if IS_REACHABLE(CONFIG_INPUT)
+static inline void alc298_samsung_write_coef_pack(struct hda_codec *codec,
+                                                  const unsigned short coefs[2])
+{
+        alc_write_coef_idx(codec, 0x23, coefs[0]);
+        alc_write_coef_idx(codec, 0x25, coefs[1]);
+        alc_write_coef_idx(codec, 0x26, 0xb011);
+}
+
+struct alc298_samsung_amp_desc {
+        unsigned char nid;
+        unsigned short init_seq[2][2];
+};
+
+static void alc298_fixup_samsung_amp(struct hda_codec *codec,
+                                     const struct hda_fixup *fix, int action)
+{
+        int i, j;
+        static const unsigned short init_seq[][2] = {
+                { 0x19, 0x00 }, { 0x20, 0xc0 }, { 0x22, 0x44 }, { 0x23, 0x08 },
+                { 0x24, 0x85 }, { 0x25, 0x41 }, { 0x35, 0x40 }, { 0x36, 0x01 },
+                { 0x38, 0x81 }, { 0x3a, 0x03 }, { 0x3b, 0x81 }, { 0x40, 0x3e },
+                { 0x41, 0x07 }, { 0x400, 0x1 }
+        };
+        static const struct alc298_samsung_amp_desc amps[] = {
+                { 0x3a, { { 0x18, 0x1 }, { 0x26, 0x0 } } },
+                { 0x39, { { 0x18, 0x2 }, { 0x26, 0x1 } } }
+        };
+
+        if (action != HDA_FIXUP_ACT_INIT)
+                return;
+
+        for (i = 0; i < ARRAY_SIZE(amps); i++) {
+                alc_write_coef_idx(codec, 0x22, amps[i].nid);
+
+                for (j = 0; j < ARRAY_SIZE(amps[i].init_seq); j++)
+                        alc298_samsung_write_coef_pack(codec, amps[i].init_seq[j]);
+
+                for (j = 0; j < ARRAY_SIZE(init_seq); j++)
+                        alc298_samsung_write_coef_pack(codec, init_seq[j]);
+        }
+}
+
+#ifndef TARGET_OS2
 static void gpio2_mic_hotkey_event(struct hda_codec *codec,
                                    struct hda_jack_callback *event)
@@ -5417 +5608 @@
         return 0;
 }
+#endif /* TARGET_OS2 */
 
 /* GPIO1 = set according to SKU external amp
@@ -5426 +5618 @@
                                              const struct hda_fixup *fix, int action)
 {
-#if IS_ENABLED(CONFIG_INPUT)
+#if IS_ENABLED(CONFIG_INPUT) && !defined(TARGET_OS2)
         struct alc_spec *spec = codec->spec;
 
@@ -5462 +5654 @@
                                              const struct hda_fixup *fix, int action)
 {
+#if IS_ENABLED(CONFIG_INPUT)
         struct alc_spec *spec = codec->spec;
 
@@ -5483 +5676 @@
                 spec->kb_dev = NULL;
         }
-}
-#else /* INPUT */
-#define alc280_fixup_hp_gpio2_mic_hotkey        NULL
-#define alc233_fixup_lenovo_line2_mic_hotkey    NULL
-#endif /* INPUT */
+#endif
+}
 
 static void alc269_fixup_hp_line1_mic1_led(struct hda_codec *codec,
@@ -5501 +5691 @@
 #endif
         }
+}
+
+static void alc233_fixup_lenovo_low_en_micmute_led(struct hda_codec *codec,
+                                const struct hda_fixup *fix, int action)
+{
+        struct alc_spec *spec = codec->spec;
+
+        if (action == HDA_FIXUP_ACT_PRE_PROBE)
+                spec->micmute_led_polarity = 1;
+        alc233_fixup_lenovo_line2_mic_hotkey(codec, fix, action);
+}
+
+static void alc_hp_mute_disable(struct hda_codec *codec, unsigned int delay)
+{
+        if (delay == 0)
+                delay = 75;
+        snd_hda_codec_write(codec, 0x21, 0,
+                    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
+        msleep(delay);
+        snd_hda_codec_write(codec, 0x21, 0,
+                    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
+        msleep(delay);
+}
+
+static void alc_hp_enable_unmute(struct hda_codec *codec, unsigned int delay)
+{
+        if (delay == 0)
+                delay = 75;
+        snd_hda_codec_write(codec, 0x21, 0,
+                    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
+        msleep(delay);
+        snd_hda_codec_write(codec, 0x21, 0,
+                    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
+        msleep(delay);
 }
 
@@ -5604 +5828 @@
         case 0x10ec0256:
         case 0x19e58326:
+                alc_hp_mute_disable(codec, 75);
                 alc_process_coef_fw(codec, coef0256);
                 break;
@@ -5638 +5863 @@
         case 0x10ec0289:
         case 0x10ec0299:
+                alc_hp_mute_disable(codec, 75);
                 alc_process_coef_fw(codec, alc225_pre_hsmode);
                 alc_process_coef_fw(codec, coef0225);
@@ -5863 +6089 @@
                 alc_process_coef_fw(codec, alc225_pre_hsmode);
                 alc_process_coef_fw(codec, coef0225);
+                alc_hp_enable_unmute(codec, 75);
                 break;
         case 0x10ec0255:
@@ -5875 +6102 @@
                 msleep(50);
                 alc_process_coef_fw(codec, coef0256);
+                alc_hp_enable_unmute(codec, 75);
                 break;
         case 0x10ec0234:
@@ -5972 +6200 @@
         case 0x19e58326:
                 alc_process_coef_fw(codec, coef0256);
+                alc_hp_enable_unmute(codec, 75);
                 break;
         case 0x10ec0234:
@@ -6020 +6249 @@
                 else
                         alc_process_coef_fw(codec, coef0225_1);
+                alc_hp_enable_unmute(codec, 75);
                 break;
         case 0x10ec0867:
@@ -6087 +6317 @@
         case 0x19e58326:
                 alc_process_coef_fw(codec, coef0256);
+                alc_hp_enable_unmute(codec, 75);
                 break;
         case 0x10ec0234:
@@ -6124 +6355 @@
         case 0x10ec0299:
                 alc_process_coef_fw(codec, coef0225);
+                alc_hp_enable_unmute(codec, 75);
                 break;
         }
@@ -6192 +6424 @@
                 alc_write_coefex_idx(codec, 0x57, 0x3, 0x09a3);
 
-                snd_hda_codec_write(codec, 0x21, 0,
-                            AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
-                msleep(80);
-                snd_hda_codec_write(codec, 0x21, 0,
-                            AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
-
                 alc_process_coef_fw(codec, coef0255);
                 msleep(300);
                 val = alc_read_coef_idx(codec, 0x46);
                 is_ctia = (val & 0x0070) == 0x0070;
-
+                if (!is_ctia) {
+                        alc_write_coef_idx(codec, 0x45, 0xe089);
+                        msleep(100);
+                        val = alc_read_coef_idx(codec, 0x46);
+                        if ((val & 0x0070) == 0x0070)
+                                is_ctia = false;
+                        else
+                                is_ctia = true;
+                }
                 alc_write_coefex_idx(codec, 0x57, 0x3, 0x0da3);
                 alc_update_coefex_idx(codec, 0x57, 0x5, 1<<14, 0);
-
-                snd_hda_codec_write(codec, 0x21, 0,
-                            AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
-                msleep(80);
-                snd_hda_codec_write(codec, 0x21, 0,
-                            AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
                 break;
         case 0x10ec0234:
@@ -6287 +6515 @@
         case 0x10ec0289:
         case 0x10ec0299:
-                snd_hda_codec_write(codec, 0x21, 0,
-                            AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
-                msleep(80);
-                snd_hda_codec_write(codec, 0x21, 0,
-                            AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
-
                 alc_process_coef_fw(codec, alc225_pre_hsmode);
                 alc_update_coef_idx(codec, 0x67, 0xf000, 0x1000);
@@ -6309 +6531 @@
                         is_ctia = (val & 0x00f0) == 0x00f0;
                 }
+                if (!is_ctia) {
+                        alc_update_coef_idx(codec, 0x45, 0x3f<<10, 0x38<<10);
+                        alc_update_coef_idx(codec, 0x49, 3<<8, 1<<8);
+                        msleep(100);
+                        val = alc_read_coef_idx(codec, 0x46);
+                        if ((val & 0x00f0) == 0x00f0)
+                                is_ctia = false;
+                        else
+                                is_ctia = true;
+                }
                 alc_update_coef_idx(codec, 0x4a, 7<<6, 7<<6);
                 alc_update_coef_idx(codec, 0x4a, 3<<4, 3<<4);
                 alc_update_coef_idx(codec, 0x67, 0xf000, 0x3000);
-
-                snd_hda_codec_write(codec, 0x21, 0,
-                            AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
-                msleep(80);
-                snd_hda_codec_write(codec, 0x21, 0,
-                            AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
                 break;
         case 0x10ec0867:
@@ -7088 +7314 @@
         case 0x10ec0255:
         case 0x10ec0256:
+        case 0x10ec0257:
         case 0x19e58326:
                 alc_update_coef_idx(codec, 0x1b, 0x8000, 1 << 15); /* Reset HP JD */
@@ -7275 +7502 @@
 }
 
+static void alc285_fixup_hp_envy_x360(struct hda_codec *codec,
+                                      const struct hda_fixup *fix,
+                                      int action)
+{
+        static const struct coef_fw coefs[] = {
+                WRITE_COEF(0x08, 0x6a0c), WRITE_COEF(0x0d, 0xa023),
+                WRITE_COEF(0x10, 0x0320), WRITE_COEF(0x1a, 0x8c03),
+                WRITE_COEF(0x25, 0x1800), WRITE_COEF(0x26, 0x003a),
+                WRITE_COEF(0x28, 0x1dfe), WRITE_COEF(0x29, 0xb014),
+                WRITE_COEF(0x2b, 0x1dfe), WRITE_COEF(0x37, 0xfe15),
+                WRITE_COEF(0x38, 0x7909), WRITE_COEF(0x45, 0xd489),
+                WRITE_COEF(0x46, 0x00f4), WRITE_COEF(0x4a, 0x21e0),
+                WRITE_COEF(0x66, 0x03f0), WRITE_COEF(0x67, 0x1000),
+                WRITE_COEF(0x6e, 0x1005), {0}
+        };
+
+        static const struct hda_pintbl pincfgs[] = {
+                { 0x12, 0xb7a60130 },  /* Internal microphone*/
+                { 0x14, 0x90170150 },  /* B&O soundbar speakers */
+                { 0x17, 0x90170153 },  /* Side speakers */
+                { 0x19, 0x03a11040 },  /* Headset microphone */
+                {0}
+        };
+
+        switch (action) {
+        case HDA_FIXUP_ACT_PRE_PROBE:
+                snd_hda_apply_pincfgs(codec, pincfgs);
+
+                /* Fixes volume control problem for side speakers */
+                alc295_fixup_disable_dac3(codec, fix, action);
+
+                /* Fixes no sound from headset speaker */
+                snd_hda_codec_amp_stereo(codec, 0x21, HDA_OUTPUT, 0, -1, 0);
+
+                /* Auto-enable headset mic when plugged */
+                snd_hda_jack_set_gating_jack(codec, 0x19, 0x21);
+
+                /* Headset mic volume enhancement */
+                snd_hda_codec_set_pin_target(codec, 0x19, PIN_VREF50);
+                break;
+        case HDA_FIXUP_ACT_INIT:
+                alc_process_coef_fw(codec, coefs);
+                break;
+        case HDA_FIXUP_ACT_BUILD:
+                rename_ctl(codec, "Bass Speaker Playback Volume",
+                           "B&O-Tuned Playback Volume");
+                rename_ctl(codec, "Front Playback Switch",
+                           "B&O Soundbar Playback Switch");
+                rename_ctl(codec, "Bass Speaker Playback Switch",
+                           "Side Speaker Playback Switch");
+                break;
+        }
+}
+
 /* for hda_fixup_thinkpad_acpi() */
 #include "thinkpad_helper.c"
@@ -7297 +7578 @@
                 break;
         }
+}
+
+static int comp_bind(struct device *dev)
+{
+        struct hda_codec *cdc = dev_to_hda_codec(dev);
+        struct alc_spec *spec = cdc->spec;
+
+        return component_bind_all(dev, spec->comps);
+}
+
+static void comp_unbind(struct device *dev)
+{
+        struct hda_codec *cdc = dev_to_hda_codec(dev);
+        struct alc_spec *spec = cdc->spec;
+
+        component_unbind_all(dev, spec->comps);
+}
+
+static const struct component_master_ops comp_master_ops = {
+        .bind = comp_bind,
+        .unbind = comp_unbind,
+};
+
+static void comp_generic_playback_hook(struct hda_pcm_stream *hinfo, struct hda_codec *cdc,
+                                       struct snd_pcm_substream *sub, int action)
+{
+        struct alc_spec *spec = cdc->spec;
+        int i;
+
+        for (i = 0; i < HDA_MAX_COMPONENTS; i++) {
+                if (spec->comps[i].dev && spec->comps[i].pre_playback_hook)
+                        spec->comps[i].pre_playback_hook(spec->comps[i].dev, action);
+        }
+        for (i = 0; i < HDA_MAX_COMPONENTS; i++) {
+                if (spec->comps[i].dev && spec->comps[i].playback_hook)
+                        spec->comps[i].playback_hook(spec->comps[i].dev, action);
+        }
+        for (i = 0; i < HDA_MAX_COMPONENTS; i++) {
+                if (spec->comps[i].dev && spec->comps[i].post_playback_hook)
+                        spec->comps[i].post_playback_hook(spec->comps[i].dev, action);
+        }
+}
+
+struct scodec_dev_name {
+        const char *bus;
+        const char *hid;
+        int index;
+};
+
+/* match the device name in a slightly relaxed manner */
+static int comp_match_cs35l41_dev_name(struct device *dev, void *data)
+{
+        struct scodec_dev_name *p = data;
+        const char *d = dev_name(dev);
+        int n = strlen(p->bus);
+        char tmp[32];
+
+        /* check the bus name */
+        if (strncmp(d, p->bus, n))
+                return 0;
+        /* skip the bus number */
+        if (isdigit(d[n]))
+                n++;
+        /* the rest must be exact matching */
+        snprintf(tmp, sizeof(tmp), "-%s:00-cs35l41-hda.%d", p->hid, p->index);
+        return !strcmp(d + n, tmp);
+}
+
+static int comp_match_tas2781_dev_name(struct device *dev,
+        void *data)
+{
+        struct scodec_dev_name *p = data;
+        const char *d = dev_name(dev);
+        int n = strlen(p->bus);
+        char tmp[32];
+
+        /* check the bus name */
+        if (strncmp(d, p->bus, n))
+                return 0;
+        /* skip the bus number */
+        if (isdigit(d[n]))
+                n++;
+        /* the rest must be exact matching */
+        snprintf(tmp, sizeof(tmp), "-%s:00", p->hid);
+
+        return !strcmp(d + n, tmp);
+}
+
+static void cs35l41_generic_fixup(struct hda_codec *cdc, int action, const char *bus,
+                                  const char *hid, int count)
+{
+        struct device *dev = hda_codec_dev(cdc);
+        struct alc_spec *spec = cdc->spec;
+        struct scodec_dev_name *rec;
+        int ret, i;
+
+        switch (action) {
+        case HDA_FIXUP_ACT_PRE_PROBE:
+                for (i = 0; i < count; i++) {
+                        rec = devm_kmalloc(dev, sizeof(*rec), GFP_KERNEL);
+                        if (!rec)
+                                return;
+                        rec->bus = bus;
+                        rec->hid = hid;
+                        rec->index = i;
+                        spec->comps[i].codec = cdc;
+                        component_match_add(dev, &spec->match,
+                                            comp_match_cs35l41_dev_name, rec);
+                }
+                ret = component_master_add_with_match(dev, &comp_master_ops, spec->match);
+                if (ret)
+                        codec_err(cdc, "Fail to register component aggregator %d\n", ret);
+                else
+                        spec->gen.pcm_playback_hook = comp_generic_playback_hook;
+                break;
+        case HDA_FIXUP_ACT_FREE:
+                component_master_del(dev, &comp_master_ops);
+                break;
+        }
+}
+
+static void tas2781_generic_fixup(struct hda_codec *cdc, int action,
+        const char *bus, const char *hid)
+{
+        struct device *dev = hda_codec_dev(cdc);
+        struct alc_spec *spec = cdc->spec;
+        struct scodec_dev_name *rec;
+        int ret;
+
+        switch (action) {
+        case HDA_FIXUP_ACT_PRE_PROBE:
+                rec = devm_kmalloc(dev, sizeof(*rec), GFP_KERNEL);
+                if (!rec)
+                        return;
+                rec->bus = bus;
+                rec->hid = hid;
+                rec->index = 0;
+                spec->comps[0].codec = cdc;
+                component_match_add(dev, &spec->match,
+                        comp_match_tas2781_dev_name, rec);
+                ret = component_master_add_with_match(dev, &comp_master_ops,
+                        spec->match);
+                if (ret)
+                        codec_err(cdc,
+                                "Fail to register component aggregator %d\n",
+                                ret);
+                else
+                        spec->gen.pcm_playback_hook =
+                                comp_generic_playback_hook;
+                break;
+        case HDA_FIXUP_ACT_FREE:
+                component_master_del(dev, &comp_master_ops);
+                break;
+        }
+}
+
+static void cs35l41_fixup_i2c_two(struct hda_codec *cdc, const struct hda_fixup *fix, int action)
+{
+        cs35l41_generic_fixup(cdc, action, "i2c", "CSC3551", 2);
+}
+
+static void cs35l41_fixup_spi_two(struct hda_codec *codec, const struct hda_fixup *fix, int action)
+{
+        cs35l41_generic_fixup(codec, action, "spi", "CSC3551", 2);
+}
+
+static void cs35l41_fixup_spi_four(struct hda_codec *codec, const struct hda_fixup *fix, int action)
+{
+        cs35l41_generic_fixup(codec, action, "spi", "CSC3551", 4);
+}
+
+static void alc287_fixup_legion_16achg6_speakers(struct hda_codec *cdc, const struct hda_fixup *fix,
+                                                 int action)
+{
+        cs35l41_generic_fixup(cdc, action, "i2c", "CLSA0100", 2);
+}
+
+#ifndef TARGET_OS2
+static void alc287_fixup_legion_16ithg6_speakers(struct hda_codec *cdc, const struct hda_fixup *fix,
+                                                 int action)
+{
+        cs35l41_generic_fixup(cdc, action, "i2c", "CLSA0101", 2);
+}
+#endif /* TARGET_OS2 */
+
+static void tas2781_fixup_i2c(struct hda_codec *cdc,
+        const struct hda_fixup *fix, int action)
+{
+         tas2781_generic_fixup(cdc, action, "i2c", "TIAS2781");
 }
 
@@ -7365 +7835 @@
 }
 
+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;
+        }
+}
+
+static void alc287_fixup_yoga9_14iap7_bass_spk_pin(struct hda_codec *codec,
+                                          const struct hda_fixup *fix, int action)
+{
+        /*
+         * The Pin Complex 0x17 for the bass speakers is wrongly reported as
+         * unconnected.
+         */
+        static const struct hda_pintbl pincfgs[] = {
+                { 0x17, 0x90170121 },
+                {0}
+        };
+        /*
+         * Avoid DAC 0x06 and 0x08, as they have no volume controls.
+         * DAC 0x02 and 0x03 would be fine.
+         */
+        static const hda_nid_t conn[] = { 0x02, 0x03 };
+        /*
+         * Prefer both speakerbar (0x14) and bass speakers (0x17) connected to DAC 0x02.
+         * Headphones (0x21) are connected to DAC 0x03.
+         */
+        static const hda_nid_t preferred_pairs[] = {
+                0x14, 0x02,
+                0x17, 0x02,
+                0x21, 0x03,
+                0
+        };
+        struct alc_spec *spec = codec->spec;
+
+        switch (action) {
+        case HDA_FIXUP_ACT_PRE_PROBE:
+                snd_hda_apply_pincfgs(codec, pincfgs);
+                snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);
+                spec->gen.preferred_dacs = preferred_pairs;
+                break;
+        }
+}
+
+static void alc295_fixup_dell_inspiron_top_speakers(struct hda_codec *codec,
+                                          const struct hda_fixup *fix, int action)
+{
+        static const struct hda_pintbl pincfgs[] = {
+                { 0x14, 0x90170151 },
+                { 0x17, 0x90170150 },
+                {0}
+        };
+        static const hda_nid_t conn[] = { 0x02, 0x03 };
+        static const hda_nid_t preferred_pairs[] = {
+                0x14, 0x02,
+                0x17, 0x03,
+                0x21, 0x02,
+                0
+        };
+        struct alc_spec *spec = codec->spec;
+
+        alc_fixup_no_shutup(codec, fix, action);
+
+        switch (action) {
+        case HDA_FIXUP_ACT_PRE_PROBE:
+                snd_hda_apply_pincfgs(codec, pincfgs);
+                snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);
+                spec->gen.preferred_dacs = preferred_pairs;
+                break;
+        }
+}
+
+/* Forcibly assign NID 0x03 to HP while NID 0x02 to SPK */
+static void alc287_fixup_bind_dacs(struct hda_codec *codec,
+                                    const struct hda_fixup *fix, int action)
+{
+        struct alc_spec *spec = codec->spec;
+        static const hda_nid_t conn[] = { 0x02, 0x03 }; /* exclude 0x06 */
+        static const hda_nid_t preferred_pairs[] = {
+                0x17, 0x02, 0x21, 0x03, 0
+        };
+
+        if (action != HDA_FIXUP_ACT_PRE_PROBE)
+                return;
+
+        snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);
+        spec->gen.preferred_dacs = preferred_pairs;
+        spec->gen.auto_mute_via_amp = 1;
+        if (spec->gen.autocfg.speaker_pins[0] != 0x14) {
+                snd_hda_codec_write_cache(codec, 0x14, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                        0x0); /* Make sure 0x14 was disable */
+        }
+}
+/* Fix none verb table of Headset Mic pin */
+static void alc_fixup_headset_mic(struct hda_codec *codec,
+                                   const struct hda_fixup *fix, int action)
+{
+        struct alc_spec *spec = codec->spec;
+        static const struct hda_pintbl pincfgs[] = {
+                { 0x19, 0x03a1103c },
+                {0}
+        };
+
+        switch (action) {
+        case HDA_FIXUP_ACT_PRE_PROBE:
+                snd_hda_apply_pincfgs(codec, pincfgs);
+                alc_update_coef_idx(codec, 0x45, 0xf<<12 | 1<<10, 5<<12);
+                spec->parse_flags |= HDA_PINCFG_HEADSET_MIC;
+                break;
+        }
+}
+
+
 enum {
         ALC269_FIXUP_GPIO2,
@@ -7372 +7983 @@
         ALC269_FIXUP_SKU_IGNORE,
         ALC269_FIXUP_ASUS_G73JW,
+        ALC269_FIXUP_ASUS_N7601ZM_PINS,
+        ALC269_FIXUP_ASUS_N7601ZM,
         ALC269_FIXUP_LENOVO_EAPD,
         ALC275_FIXUP_SONY_HWEQ,
@@ -7403 +8016 @@
         ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT,
         ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
+        ALC269_FIXUP_DELL1_LIMIT_INT_MIC_BOOST,
         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,
@@ -7419 +8034 @@
         ALC269VB_FIXUP_ASUS_ZENBOOK,
         ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A,
+        ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE,
         ALC269_FIXUP_LIMIT_INT_MIC_BOOST_MUTE_LED,
         ALC269VB_FIXUP_ORDISSIMO_EVE2,
@@ -7431 +8047 @@
         ALC269_FIXUP_THINKPAD_ACPI,
         ALC269_FIXUP_DMIC_THINKPAD_ACPI,
+        ALC269VB_FIXUP_INFINIX_ZERO_BOOK_13,
+        ALC269VC_FIXUP_INFINIX_Y4_MAX,
+        ALC269VB_FIXUP_CHUWI_COREBOOK_XPRO,
         ALC255_FIXUP_ACER_MIC_NO_PRESENCE,
         ALC255_FIXUP_ASUS_MIC_NO_PRESENCE,
         ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
+        ALC255_FIXUP_DELL1_LIMIT_INT_MIC_BOOST,
         ALC255_FIXUP_DELL2_MIC_NO_PRESENCE,
         ALC255_FIXUP_HEADSET_MODE,
@@ -7452 +8072 @@
         ALC245_FIXUP_HP_X360_AMP,
         ALC285_FIXUP_HP_SPECTRE_X360_EB1,
+        ALC285_FIXUP_HP_ENVY_X360,
         ALC288_FIXUP_DELL_HEADSET_MODE,
         ALC288_FIXUP_DELL1_MIC_NO_PRESENCE,
@@ -7466 +8087 @@
         ALC293_FIXUP_LENOVO_SPK_NOISE,
         ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY,
+        ALC233_FIXUP_LENOVO_L2MH_LOW_ENLED,
         ALC255_FIXUP_DELL_SPK_NOISE,
         ALC225_FIXUP_DISABLE_MIC_VREF,
@@ -7471 +8093 @@
         ALC295_FIXUP_DISABLE_DAC3,
         ALC285_FIXUP_SPEAKER2_TO_DAC1,
+        ALC285_FIXUP_ASUS_SPEAKER2_TO_DAC1,
+        ALC285_FIXUP_ASUS_HEADSET_MIC,
+        ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS,
+        ALC285_FIXUP_ASUS_I2C_SPEAKER2_TO_DAC1,
+        ALC285_FIXUP_ASUS_I2C_HEADSET_MIC,
         ALC280_FIXUP_HP_HEADSET_MIC,
         ALC221_FIXUP_HP_FRONT_MIC,
@@ -7518 +8145 @@
         ALC256_FIXUP_ASUS_HEADSET_MIC,
         ALC256_FIXUP_ASUS_MIC_NO_PRESENCE,
+        ALC255_FIXUP_PREDATOR_SUBWOOFER,
         ALC299_FIXUP_PREDATOR_SPK,
         ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE,
+        ALC289_FIXUP_DELL_SPK1,
         ALC289_FIXUP_DELL_SPK2,
         ALC289_FIXUP_DUAL_SPK,
+        ALC289_FIXUP_RTK_AMP_DUAL_SPK,
         ALC294_FIXUP_SPK2_TO_DAC1,
         ALC294_FIXUP_ASUS_DUAL_SPK,
         ALC285_FIXUP_THINKPAD_X1_GEN7,
         ALC285_FIXUP_THINKPAD_HEADSET_JACK,
+        ALC294_FIXUP_ASUS_ALLY,
+        ALC294_FIXUP_ASUS_ALLY_PINS,
+        ALC294_FIXUP_ASUS_ALLY_VERBS,
+        ALC294_FIXUP_ASUS_ALLY_SPEAKER,
         ALC294_FIXUP_ASUS_HPE,
         ALC294_FIXUP_ASUS_COEF_1B,
@@ -7534 +8168 @@
         ALC294_FIXUP_ASUS_GU502_PINS,
         ALC294_FIXUP_ASUS_GU502_VERBS,
+        ALC294_FIXUP_ASUS_G513_PINS,
+        ALC285_FIXUP_ASUS_G533Z_PINS,
         ALC285_FIXUP_HP_GPIO_LED,
         ALC285_FIXUP_HP_MUTE_LED,
+        ALC285_FIXUP_HP_SPECTRE_X360_MUTE_LED,
+        ALC236_FIXUP_HP_MUTE_LED_COEFBIT2,
         ALC236_FIXUP_HP_GPIO_LED,
         ALC236_FIXUP_HP_MUTE_LED,
         ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF,
+        ALC236_FIXUP_LENOVO_INV_DMIC,
+        ALC298_FIXUP_SAMSUNG_AMP,
         ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET,
         ALC256_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET,
@@ -7584 +8224 @@
         ALC287_FIXUP_YOGA7_14ITL_SPEAKERS,
         ALC298_FIXUP_LENOVO_C940_DUET7,
+        ALC287_FIXUP_LENOVO_14IRP8_DUETITL,
         ALC287_FIXUP_13S_GEN2_SPEAKERS,
         ALC256_FIXUP_SET_COEF_DEFAULTS,
@@ -7591 +8232 @@
         ALC285_FIXUP_LEGION_Y9000X_SPEAKERS,
         ALC285_FIXUP_LEGION_Y9000X_AUTOMUTE,
+        ALC287_FIXUP_LEGION_16ACHG6,
+        ALC287_FIXUP_CS35L41_I2C_2,
+        ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED,
+        ALC245_FIXUP_CS35L41_SPI_2,
+        ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED,
+        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,
+        ALC287_FIXUP_LEGION_16ITHG6,
+        ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK,
+        ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN,
+        ALC287_FIXUP_YOGA9_14IMH9_BASS_SPK_PIN,
+        ALC295_FIXUP_DELL_INSPIRON_TOP_SPEAKERS,
+        ALC236_FIXUP_DELL_DUAL_CODECS,
+        ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI,
+        ALC287_FIXUP_TAS2781_I2C,
+        ALC245_FIXUP_HP_MUTE_LED_COEFBIT,
+        ALC245_FIXUP_HP_X360_MUTE_LEDS,
+        ALC287_FIXUP_THINKPAD_I2S_SPK,
+        ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD,
+        ALC2XX_FIXUP_HEADSET_MIC,
+        ALC289_FIXUP_DELL_CS35L41_SPI_2,
+        ALC294_FIXUP_CS35L41_I2C_2,
 };
 
@@ -7780 +8445 @@
 #endif
 
+#ifndef TARGET_OS2
+/* A special fixup for Lenovo Slim/Yoga Pro 9 14IRP8 and Yoga DuetITL 2021;
+ * 14IRP8 PCI SSID will mistakenly be matched with the DuetITL codec SSID,
+ * so we need to apply a different fixup in this case. The only DuetITL codec
+ * SSID reported so far is the 17aa:3802 while the 14IRP8 has the 17aa:38be
+ * and 17aa:38bf. If it weren't for the PCI SSID, the 14IRP8 models would
+ * have matched correctly by their codecs.
+ */
+static void alc287_fixup_lenovo_14irp8_duetitl(struct hda_codec *codec,
+                                              const struct hda_fixup *fix,
+                                              int action)
+{
+        int id;
+
+        if (codec->core.subsystem_id == 0x17aa3802)
+                id = ALC287_FIXUP_YOGA7_14ITL_SPEAKERS; /* DuetITL */
+        else
+                id = ALC287_FIXUP_TAS2781_I2C; /* 14IRP8 */
+        __snd_hda_apply_fixup(codec, id, action, 0);
+}
+#endif /* TARGET_OS2 */
+
 static const struct hda_fixup alc269_fixups[] = {
         [ALC269_FIXUP_GPIO2] = {
@@ -7830 +8517 @@
 #endif
         },
+#ifdef NOT_USED
+        [ALC269_FIXUP_ASUS_N7601ZM_PINS] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x19, 0x03A11050 },
+                        { 0x1a, 0x03A11C30 },
+                        { 0x21, 0x03211420 },
+                        { }
+                }
+        },
+        [ALC269_FIXUP_ASUS_N7601ZM] = {
+                .type = HDA_FIXUP_VERBS,
+                .v.verbs = (const struct hda_verb[]) {
+                        {0x20, AC_VERB_SET_COEF_INDEX, 0x62},
+                        {0x20, AC_VERB_SET_PROC_COEF, 0xa007},
+                        {0x20, AC_VERB_SET_COEF_INDEX, 0x10},
+                        {0x20, AC_VERB_SET_PROC_COEF, 0x8420},
+                        {0x20, AC_VERB_SET_COEF_INDEX, 0x0f},
+                        {0x20, AC_VERB_SET_PROC_COEF, 0x7774},
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC269_FIXUP_ASUS_N7601ZM_PINS,
+        },
+#endif
         [ALC269_FIXUP_LENOVO_EAPD] = {
                 .type = HDA_FIXUP_VERBS,
@@ -7919 +8631 @@
                 .v.func = alc269_fixup_pincfg_U7x7_headset_mic,
         },
+#ifdef NOT_USED
+        [ALC269VB_FIXUP_INFINIX_ZERO_BOOK_13] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x14, 0x90170151 }, /* use as internal speaker (LFE) */
+                        { 0x1b, 0x90170152 }, /* use as internal speaker (back) */
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST
+        },
+        [ALC269VC_FIXUP_INFINIX_Y4_MAX] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x1b, 0x90170150 }, /* use as internal speaker */
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST
+        },
+        [ALC269VB_FIXUP_CHUWI_COREBOOK_XPRO] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x18, 0x03a19020 }, /* headset mic */
+                        { 0x1b, 0x90170150 }, /* speaker */
+                        { }
+                },
+        },
+#endif
         [ALC269_FIXUP_AMIC] = {
                 .type = HDA_FIXUP_PINS,
@@ -8053 +8794 @@
                 .chain_id = ALC269_FIXUP_HEADSET_MODE
         },
+        [ALC269_FIXUP_DELL1_LIMIT_INT_MIC_BOOST] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc269_fixup_limit_int_mic_boost,
+                .chained = true,
+                .chain_id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE
+        },
         [ALC269_FIXUP_DELL2_MIC_NO_PRESENCE] = {
                 .type = HDA_FIXUP_PINS,
@@ -8081 +8828 @@
                 .chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC269_FIXUP_DELL4_MIC_NO_PRESENCE] = {
                 .type = HDA_FIXUP_PINS,
@@ -8103 +8850 @@
                 .v.func = alc_fixup_headset_mode_no_hp_mic,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC269_FIXUP_ASPIRE_HEADSET_MIC] = {
                 .type = HDA_FIXUP_PINS,
@@ -8250 +8997 @@
                 .chain_id = ALC269VB_FIXUP_ASUS_ZENBOOK,
         },
+#ifdef NOT_USED
+        [ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x18, 0x01a110f0 },  /* use as headset mic */
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC269_FIXUP_HEADSET_MIC
+        },
+#endif
         [ALC269_FIXUP_LIMIT_INT_MIC_BOOST_MUTE_LED] = {
                 .type = HDA_FIXUP_FUNC,
@@ -8345 +9103 @@
                 .chain_id = ALC269_FIXUP_THINKPAD_ACPI,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC255_FIXUP_ACER_MIC_NO_PRESENCE] = {
                 .type = HDA_FIXUP_PINS,
@@ -8379 +9137 @@
                 .chain_id = ALC255_FIXUP_HEADSET_MODE
         },
+        [ALC255_FIXUP_DELL1_LIMIT_INT_MIC_BOOST] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc269_fixup_limit_int_mic_boost,
+                .chained = true,
+                .chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE
+        },
         [ALC255_FIXUP_DELL2_MIC_NO_PRESENCE] = {
                 .type = HDA_FIXUP_PINS,
@@ -8402 +9166 @@
                 .v.func = alc_fixup_headset_mode_alc255_no_hp_mic,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC293_FIXUP_DELL1_MIC_NO_PRESENCE] = {
                 .type = HDA_FIXUP_PINS,
@@ -8426 +9190 @@
                 .chain_id = ALC292_FIXUP_TPT440_DOCK,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC283_FIXUP_HEADSET_MIC] = {
                 .type = HDA_FIXUP_PINS,
@@ -8439 +9203 @@
                 .v.func = alc_fixup_micmute_led,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC282_FIXUP_ASPIRE_V5_PINS] = {
                 .type = HDA_FIXUP_PINS,
@@ -8473 +9237 @@
                 .v.func = alc280_fixup_hp_gpio2_mic_hotkey,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC280_FIXUP_HP_DOCK_PINS] = {
                 .type = HDA_FIXUP_PINS,
@@ -8512 +9276 @@
                 .chain_id = ALC255_FIXUP_MIC_MUTE_LED
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC288_FIXUP_DELL1_MIC_NO_PRESENCE] = {
                 .type = HDA_FIXUP_PINS,
@@ -8561 +9325 @@
                 .chain_id = ALC292_FIXUP_DELL_E7X_AAMIX,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC298_FIXUP_ALIENWARE_MIC_NO_PRESENCE] = {
                 .type = HDA_FIXUP_PINS,
@@ -8612 +9376 @@
                 .v.func = alc233_fixup_lenovo_line2_mic_hotkey,
         },
+        [ALC233_FIXUP_LENOVO_L2MH_LOW_ENLED] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc233_fixup_lenovo_low_en_micmute_led,
+        },
         [ALC233_FIXUP_INTEL_NUC8_DMIC] = {
                 .type = HDA_FIXUP_FUNC,
@@ -8634 +9402 @@
                 .chain_id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC225_FIXUP_DELL1_MIC_NO_PRESENCE] = {
                 .type = HDA_FIXUP_VERBS,
@@ -8653 +9421 @@
                 .chain_id = ALC269_FIXUP_HEADSET_MIC,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC221_FIXUP_HP_FRONT_MIC] = {
                 .type = HDA_FIXUP_PINS,
@@ -8688 +9456 @@
                 .chain_id = ALC269_FIXUP_THINKPAD_ACPI
         },
-#ifdef TARGET_OS2xxx
+        [ALC285_FIXUP_ASUS_SPEAKER2_TO_DAC1] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc285_fixup_speaker2_to_dac1,
+                .chained = true,
+                .chain_id = ALC245_FIXUP_CS35L41_SPI_2
+        },
+#ifdef NOT_USED
+        [ALC285_FIXUP_ASUS_HEADSET_MIC] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x19, 0x03a11050 },
+                        { 0x1b, 0x03a11c30 },
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC285_FIXUP_ASUS_SPEAKER2_TO_DAC1
+        },
+        [ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x14, 0x90170120 },
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC285_FIXUP_ASUS_HEADSET_MIC
+        },
+#endif
+        [ALC285_FIXUP_ASUS_I2C_SPEAKER2_TO_DAC1] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc285_fixup_speaker2_to_dac1,
+                .chained = true,
+                .chain_id = ALC287_FIXUP_CS35L41_I2C_2
+        },
+#ifdef NOT_USED
+        [ALC285_FIXUP_ASUS_I2C_HEADSET_MIC] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x19, 0x03a11050 },
+                        { 0x1b, 0x03a11c30 },
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC285_FIXUP_ASUS_I2C_SPEAKER2_TO_DAC1
+        },
         [ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER] = {
                 .type = HDA_FIXUP_PINS,
@@ -8705 +9516 @@
                 .chain_id = ALC269_FIXUP_NO_SHUTUP
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC221_FIXUP_HP_288PRO_MIC_NO_PRESENCE] = {
                 .type = HDA_FIXUP_PINS,
@@ -8731 +9542 @@
                 .v.func = alc_fixup_headset_mode,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC256_FIXUP_ASUS_MIC] = {
                 .type = HDA_FIXUP_PINS,
@@ -8748 +9559 @@
                 .v.func = alc_fixup_gpio4,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC233_FIXUP_ASUS_MIC_NO_PRESENCE] = {
                 .type = HDA_FIXUP_PINS,
@@ -8776 +9587 @@
                 .chain_id = ALC269_FIXUP_GPIO2
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC233_FIXUP_ACER_HEADSET_MIC] = {
                 .type = HDA_FIXUP_VERBS,
@@ -8818 +9629 @@
                 .chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC700_FIXUP_INTEL_REFERENCE] = {
                 .type = HDA_FIXUP_VERBS,
@@ -8841 +9652 @@
                 .chain_id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC274_FIXUP_DELL_AIO_LINEOUT_VERB] = {
                 .type = HDA_FIXUP_PINS,
@@ -8864 +9675 @@
                 .chain_id = ALC298_FIXUP_TPT470_DOCK_FIX
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC255_FIXUP_DUMMY_LINEOUT_VERB] = {
                 .type = HDA_FIXUP_PINS,
@@ -8890 +9701 @@
                 .chain_id = ALC269_FIXUP_HP_MUTE_LED_MIC3
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC221_FIXUP_HP_HEADSET_MIC] = {
                 .type = HDA_FIXUP_PINS,
@@ -8911 +9722 @@
                 .v.func = alc_fixup_auto_mute_via_amp,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE] = {
                 .type = HDA_FIXUP_PINS,
@@ -8964 +9775 @@
                 .v.func = alc_fixup_headset_jack,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE] = {
                 .type = HDA_FIXUP_PINS,
@@ -9018 +9829 @@
                 .chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC286_FIXUP_ACER_AIO_HEADSET_MIC] = {
                 .type = HDA_FIXUP_VERBS,
@@ -9047 +9858 @@
                 .chain_id = ALC256_FIXUP_ASUS_HEADSET_MODE
         },
+        [ALC255_FIXUP_PREDATOR_SUBWOOFER] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x17, 0x90170151 }, /* use as internal speaker (LFE) */
+                        { 0x1b, 0x90170152 } /* use as internal speaker (back) */
+                }
+        },
         [ALC299_FIXUP_PREDATOR_SPK] = {
                 .type = HDA_FIXUP_PINS,
@@ -9064 +9882 @@
                 .chain_id = ALC256_FIXUP_ASUS_HEADSET_MODE
         },
+        [ALC289_FIXUP_DELL_SPK1] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x14, 0x90170140 },
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC269_FIXUP_DELL4_MIC_NO_PRESENCE
+        },
         [ALC289_FIXUP_DELL_SPK2] = {
                 .type = HDA_FIXUP_PINS,
@@ -9079 +9906 @@
                 .chained = true,
                 .chain_id = ALC289_FIXUP_DELL_SPK2
+        },
+        [ALC289_FIXUP_RTK_AMP_DUAL_SPK] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc285_fixup_speaker2_to_dac1,
+                .chained = true,
+                .chain_id = ALC289_FIXUP_DELL_SPK1
         },
         [ALC294_FIXUP_SPK2_TO_DAC1] = {
@@ -9093 +9926 @@
                 .chain_id = ALC294_FIXUP_SPK2_TO_DAC1
         },
+        [ALC294_FIXUP_ASUS_ALLY] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = cs35l41_fixup_i2c_two,
+                .chained = true,
+                .chain_id = ALC294_FIXUP_ASUS_ALLY_PINS
+        },
+#ifdef NOT_USED
+        [ALC294_FIXUP_ASUS_ALLY_PINS] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x19, 0x03a11050 },
+                        { 0x1a, 0x03a11c30 },
+                        { 0x21, 0x03211420 },
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC294_FIXUP_ASUS_ALLY_VERBS
+        },
+        [ALC294_FIXUP_ASUS_ALLY_VERBS] = {
+                .type = HDA_FIXUP_VERBS,
+                .v.verbs = (const struct hda_verb[]) {
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x45 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x5089 },
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x46 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x0004 },
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x47 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0xa47a },
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x49 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x0049},
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x4a },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x201b },
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x6b },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x4278},
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC294_FIXUP_ASUS_ALLY_SPEAKER
+        },
+#endif
+        [ALC294_FIXUP_ASUS_ALLY_SPEAKER] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc285_fixup_speaker2_to_dac1,
+        },
         [ALC285_FIXUP_THINKPAD_X1_GEN7] = {
                 .type = HDA_FIXUP_FUNC,
@@ -9105 +9981 @@
                 .chain_id = ALC285_FIXUP_THINKPAD_X1_GEN7
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC294_FIXUP_ASUS_HPE] = {
                 .type = HDA_FIXUP_VERBS,
@@ -9173 +10049 @@
                 .v.func = alc294_fixup_gu502_hp,
         },
+         [ALC294_FIXUP_ASUS_G513_PINS] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                                { 0x19, 0x03a11050 }, /* front HP mic */
+                                { 0x1a, 0x03a11c30 }, /* rear external mic */
+                                { 0x21, 0x03211420 }, /* front HP out */
+                                { }
+                },
+        },
+        [ALC285_FIXUP_ASUS_G533Z_PINS] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x14, 0x90170152 }, /* Speaker Surround Playback Switch */
+                        { 0x19, 0x03a19020 }, /* Mic Boost Volume */
+                        { 0x1a, 0x03a11c30 }, /* Mic Boost Volume */
+                        { 0x1e, 0x90170151 }, /* Rear jack, IN OUT EAPD Detect */
+                        { 0x21, 0x03211420 },
+                        { }
+                },
+        },
         [ALC294_FIXUP_ASUS_COEF_1B] = {
                 .type = HDA_FIXUP_VERBS,
@@ -9195 +10091 @@
                 .v.func = alc285_fixup_hp_mute_led,
         },
+        [ALC285_FIXUP_HP_SPECTRE_X360_MUTE_LED] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc285_fixup_hp_spectre_x360_mute_led,
+        },
+        [ALC236_FIXUP_HP_MUTE_LED_COEFBIT2] = {
+            .type = HDA_FIXUP_FUNC,
+            .v.func = alc236_fixup_hp_mute_led_coefbit2,
+        },
         [ALC236_FIXUP_HP_GPIO_LED] = {
                 .type = HDA_FIXUP_FUNC,
@@ -9207 +10111 @@
                 .v.func = alc236_fixup_hp_mute_led_micmute_vref,
         },
-#ifdef TARGET_OS2xxx
+        [ALC236_FIXUP_LENOVO_INV_DMIC] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc_fixup_inv_dmic,
+                .chained = true,
+                .chain_id = ALC283_FIXUP_INT_MIC,
+        },
+        [ALC298_FIXUP_SAMSUNG_AMP] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc298_fixup_samsung_amp,
+                .chained = true,
+                .chain_id = ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET
+        },
+#ifdef NOT_USED
         [ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET] = {
                 .type = HDA_FIXUP_VERBS,
@@ -9476 +10392 @@
                 .v.func = alc295_fixup_asus_dacs,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC295_FIXUP_HP_OMEN] = {
                 .type = HDA_FIXUP_PINS,
@@ -9506 +10422 @@
                 .v.func = alc285_fixup_hp_spectre_x360_eb1
         },
+        [ALC285_FIXUP_HP_ENVY_X360] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc285_fixup_hp_envy_x360,
+                .chained = true,
+                .chain_id = ALC285_FIXUP_HP_GPIO_AMP_INIT,
+        },
         [ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP] = {
                 .type = HDA_FIXUP_FUNC,
@@ -9518 +10440 @@
                 .chain_id = ALC283_FIXUP_HEADSET_MIC,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC255_FIXUP_ACER_HEADPHONE_AND_MIC] = {
                 .type = HDA_FIXUP_PINS,
@@ -9547 +10469 @@
                 .chain_id = ALC269_FIXUP_THINKPAD_ACPI,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC287_FIXUP_LEGION_15IMHG05_SPEAKERS] = {
                 .type = HDA_FIXUP_VERBS,
@@ -9595 +10517 @@
                 .chain_id = ALC269_FIXUP_HEADSET_MODE,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC287_FIXUP_YOGA7_14ITL_SPEAKERS] = {
                 .type = HDA_FIXUP_VERBS,
@@ -9638 +10560 @@
                 .type = HDA_FIXUP_FUNC,
                 .v.func = alc298_fixup_lenovo_c940_duet7,
+        },
+        [ALC287_FIXUP_LENOVO_14IRP8_DUETITL] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc287_fixup_lenovo_14irp8_duetitl,
         },
         [ALC287_FIXUP_13S_GEN2_SPEAKERS] = {
@@ -9666 +10592 @@
                 .v.func = alc256_fixup_set_coef_defaults,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC245_FIXUP_HP_GPIO_LED] = {
                 .type = HDA_FIXUP_FUNC,
@@ -9691 +10617 @@
                 .chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC
         },
+        [ALC287_FIXUP_LEGION_16ACHG6] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc287_fixup_legion_16achg6_speakers,
+        },
+        [ALC287_FIXUP_CS35L41_I2C_2] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = cs35l41_fixup_i2c_two,
+        },
+        [ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = cs35l41_fixup_i2c_two,
+                .chained = true,
+                .chain_id = ALC285_FIXUP_HP_MUTE_LED,
+        },
+        [ALC245_FIXUP_CS35L41_SPI_2] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = cs35l41_fixup_spi_two,
+        },
+        [ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = cs35l41_fixup_spi_two,
+                .chained = true,
+                .chain_id = ALC285_FIXUP_HP_GPIO_LED,
+        },
+        [ALC245_FIXUP_CS35L41_SPI_4] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = cs35l41_fixup_spi_four,
+        },
+        [ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = cs35l41_fixup_spi_four,
+                .chained = true,
+                .chain_id = ALC285_FIXUP_HP_GPIO_LED,
+        },
+#ifdef NOT_USED
+        [ALC285_FIXUP_HP_SPEAKERS_MICMUTE_LED] = {
+                .type = HDA_FIXUP_VERBS,
+                .v.verbs = (const struct hda_verb[]) {
+                         { 0x20, AC_VERB_SET_COEF_INDEX, 0x19 },
+                         { 0x20, AC_VERB_SET_PROC_COEF, 0x8e11 },
+                         { }
+                },
+                .chained = true,
+                .chain_id = ALC285_FIXUP_HP_MUTE_LED,
+        },
+#endif
+        [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,
+        },
+#ifdef NOT_USED
+        [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
+        },
+        [ALC287_FIXUP_LEGION_16ITHG6] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc287_fixup_legion_16ithg6_speakers,
+        },
+        [ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK] = {
+                .type = HDA_FIXUP_VERBS,
+                .v.verbs = (const struct hda_verb[]) {
+                        // enable left speaker
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x24 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x41 },
+
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0xc },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x1a },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },
+
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0xf },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x42 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },
+
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x10 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x40 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },
+
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x2 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },
+
+                        // enable right speaker
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x24 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x46 },
+
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0xc },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x2a },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },
+
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0xf },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x46 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },
+
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x10 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x44 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },
+
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x2 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },
+
+                        { },
+                },
+        },
+#endif
+        [ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc287_fixup_yoga9_14iap7_bass_spk_pin,
+                .chained = true,
+                .chain_id = ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK,
+        },
+        [ALC287_FIXUP_YOGA9_14IMH9_BASS_SPK_PIN] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc287_fixup_yoga9_14iap7_bass_spk_pin,
+                .chained = true,
+                .chain_id = ALC287_FIXUP_CS35L41_I2C_2,
+        },
+        [ALC295_FIXUP_DELL_INSPIRON_TOP_SPEAKERS] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc295_fixup_dell_inspiron_top_speakers,
+                .chained = true,
+                .chain_id = ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,
+        },
+        [ALC236_FIXUP_DELL_DUAL_CODECS] = {
+                .type = HDA_FIXUP_PINS,
+                .v.func = alc1220_fixup_gb_dual_codecs,
+                .chained = true,
+                .chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
+        },
+        [ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = cs35l41_fixup_i2c_two,
+                .chained = true,
+                .chain_id = ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK,
+        },
+        [ALC287_FIXUP_TAS2781_I2C] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = tas2781_fixup_i2c,
+                .chained = true,
+                .chain_id = ALC285_FIXUP_THINKPAD_HEADSET_JACK,
+        },
+        [ALC245_FIXUP_HP_MUTE_LED_COEFBIT] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc245_fixup_hp_mute_led_coefbit,
+        },
+        [ALC245_FIXUP_HP_X360_MUTE_LEDS] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc245_fixup_hp_mute_led_coefbit,
+                .chained = true,
+                .chain_id = ALC245_FIXUP_HP_GPIO_LED
+        },
+        [ALC287_FIXUP_THINKPAD_I2S_SPK] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc287_fixup_bind_dacs,
+                .chained = true,
+                .chain_id = ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK,
+        },
+        [ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc287_fixup_bind_dacs,
+                .chained = true,
+                .chain_id = ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI,
+        },
+        [ALC2XX_FIXUP_HEADSET_MIC] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc_fixup_headset_mic,
+        },
+        [ALC289_FIXUP_DELL_CS35L41_SPI_2] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = cs35l41_fixup_spi_two,
+                .chained = true,
+                .chain_id = ALC289_FIXUP_DUAL_SPK
+        },
+        [ALC294_FIXUP_CS35L41_I2C_2] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = cs35l41_fixup_i2c_two,
+        },
 };
 
-static const struct snd_pci_quirk alc269_fixup_tbl[] = {
+static const struct hda_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1025, 0x0283, "Acer TravelMate 8371", ALC269_FIXUP_INV_DMIC),
         SND_PCI_QUIRK(0x1025, 0x029b, "Acer 1810TZ", ALC269_FIXUP_INV_DMIC),
@@ -9706 +10833 @@
         SND_PCI_QUIRK(0x1025, 0x080d, "Acer Aspire V5-122P", ALC269_FIXUP_ASPIRE_HEADSET_MIC),
         SND_PCI_QUIRK(0x1025, 0x0840, "Acer Aspire E1", ALC269VB_FIXUP_ASPIRE_E1_COEF),
+        SND_PCI_QUIRK(0x1025, 0x100c, "Acer Aspire E5-574G", ALC255_FIXUP_ACER_LIMIT_INT_MIC_BOOST),
         SND_PCI_QUIRK(0x1025, 0x101c, "Acer Veriton N2510G", ALC269_FIXUP_LIFEBOOK),
         SND_PCI_QUIRK(0x1025, 0x102b, "Acer Aspire C24-860", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE),
@@ -9715 +10843 @@
         SND_PCI_QUIRK(0x1025, 0x1166, "Acer Veriton N4640G", ALC269_FIXUP_LIFEBOOK),
         SND_PCI_QUIRK(0x1025, 0x1167, "Acer Veriton N6640G", ALC269_FIXUP_LIFEBOOK),
+        SND_PCI_QUIRK(0x1025, 0x1177, "Acer Predator G9-593", ALC255_FIXUP_PREDATOR_SUBWOOFER),
+        SND_PCI_QUIRK(0x1025, 0x1178, "Acer Predator G9-593", ALC255_FIXUP_PREDATOR_SUBWOOFER),
         SND_PCI_QUIRK(0x1025, 0x1246, "Acer Predator Helios 500", ALC299_FIXUP_PREDATOR_SPK),
         SND_PCI_QUIRK(0x1025, 0x1247, "Acer vCopperbox", ALC269VC_FIXUP_ACER_VCOPPERBOX_PINS),
         SND_PCI_QUIRK(0x1025, 0x1248, "Acer Veriton N4660G", ALC269VC_FIXUP_ACER_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1025, 0x1269, "Acer SWIFT SF314-54", ALC256_FIXUP_ACER_HEADSET_MIC),
+        SND_PCI_QUIRK(0x1025, 0x126a, "Acer Swift SF114-32", ALC256_FIXUP_ACER_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1025, 0x128f, "Acer Veriton Z6860G", ALC286_FIXUP_ACER_AIO_HEADSET_MIC),
         SND_PCI_QUIRK(0x1025, 0x1290, "Acer Veriton Z4860G", ALC286_FIXUP_ACER_AIO_HEADSET_MIC),
@@ -9728 +10859 @@
         SND_PCI_QUIRK(0x1025, 0x132a, "Acer TravelMate B114-21", ALC233_FIXUP_ACER_HEADSET_MIC),
         SND_PCI_QUIRK(0x1025, 0x1330, "Acer TravelMate X514-51T", ALC255_FIXUP_ACER_HEADSET_MIC),
+        SND_PCI_QUIRK(0x1025, 0x1360, "Acer Aspire A115", ALC255_FIXUP_ACER_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1025, 0x141f, "Acer Spin SP513-54N", ALC255_FIXUP_ACER_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1025, 0x142b, "Acer Swift SF314-42", ALC255_FIXUP_ACER_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1025, 0x1430, "Acer TravelMate B311R-31", ALC256_FIXUP_ACER_MIC_NO_PRESENCE),
         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(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),
         SND_PCI_QUIRK(0x1028, 0x053c, "Dell Latitude E5430", ALC292_FIXUP_DELL_E7X),
@@ -9783 +10916 @@
         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),
@@ -9789 +10923 @@
         SND_PCI_QUIRK(0x1028, 0x0a9e, "Dell Latitude 5430", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1028, 0x0b19, "Dell XPS 15 9520", ALC289_FIXUP_DUAL_SPK),
+        SND_PCI_QUIRK(0x1028, 0x0b1a, "Dell Precision 5570", ALC289_FIXUP_DUAL_SPK),
+        SND_PCI_QUIRK(0x1028, 0x0b37, "Dell Inspiron 16 Plus 7620 2-in-1", ALC295_FIXUP_DELL_INSPIRON_TOP_SPEAKERS),
+        SND_PCI_QUIRK(0x1028, 0x0b71, "Dell Inspiron 16 Plus 7620", ALC295_FIXUP_DELL_INSPIRON_TOP_SPEAKERS),
+        SND_PCI_QUIRK(0x1028, 0x0beb, "Dell XPS 15 9530 (2023)", ALC289_FIXUP_DELL_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1028, 0x0c03, "Dell Precision 5340", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x0c0b, "Dell Oasis 14 RPL-P", ALC289_FIXUP_RTK_AMP_DUAL_SPK),
+        SND_PCI_QUIRK(0x1028, 0x0c0d, "Dell Oasis", ALC289_FIXUP_RTK_AMP_DUAL_SPK),
+        SND_PCI_QUIRK(0x1028, 0x0c0e, "Dell Oasis 16", ALC289_FIXUP_RTK_AMP_DUAL_SPK),
+        SND_PCI_QUIRK(0x1028, 0x0c19, "Dell Precision 3340", ALC236_FIXUP_DELL_DUAL_CODECS),
+        SND_PCI_QUIRK(0x1028, 0x0c1a, "Dell Precision 3340", ALC236_FIXUP_DELL_DUAL_CODECS),
+        SND_PCI_QUIRK(0x1028, 0x0c1b, "Dell Precision 3440", ALC236_FIXUP_DELL_DUAL_CODECS),
+        SND_PCI_QUIRK(0x1028, 0x0c1c, "Dell Precision 3540", ALC236_FIXUP_DELL_DUAL_CODECS),
+        SND_PCI_QUIRK(0x1028, 0x0c1d, "Dell Precision 3440", ALC236_FIXUP_DELL_DUAL_CODECS),
+        SND_PCI_QUIRK(0x1028, 0x0c1e, "Dell Precision 3540", ALC236_FIXUP_DELL_DUAL_CODECS),
+        SND_PCI_QUIRK(0x1028, 0x0cbd, "Dell Oasis 13 CS MTL-U", ALC289_FIXUP_DELL_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1028, 0x0cbe, "Dell Oasis 13 2-IN-1 MTL-U", ALC289_FIXUP_DELL_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1028, 0x0cbf, "Dell Oasis 13 Low Weight MTU-L", ALC289_FIXUP_DELL_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1028, 0x0cc0, "Dell Oasis 13", ALC289_FIXUP_RTK_AMP_DUAL_SPK),
+        SND_PCI_QUIRK(0x1028, 0x0cc1, "Dell Oasis 14 MTL-H/U", ALC289_FIXUP_DELL_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1028, 0x0cc2, "Dell Oasis 14 2-in-1 MTL-H/U", ALC289_FIXUP_DELL_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1028, 0x0cc3, "Dell Oasis 14 Low Weight MTL-U", ALC289_FIXUP_DELL_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1028, 0x0cc4, "Dell Oasis 16 MTL-H/U", ALC289_FIXUP_DELL_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1028, 0x0cc5, "Dell Oasis 14", ALC289_FIXUP_RTK_AMP_DUAL_SPK),
         SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
@@ -9853 +11010 @@
         SND_PCI_QUIRK(0x103c, 0x8077, "HP", ALC256_FIXUP_HP_HEADSET_MIC),
         SND_PCI_QUIRK(0x103c, 0x8158, "HP", ALC256_FIXUP_HP_HEADSET_MIC),
-        SND_PCI_QUIRK(0x103c, 0x820d, "HP Pavilion 15", ALC269_FIXUP_HP_MUTE_LED_MIC3),
+        SND_PCI_QUIRK(0x103c, 0x820d, "HP Pavilion 15", ALC295_FIXUP_HP_X360),
         SND_PCI_QUIRK(0x103c, 0x8256, "HP", ALC221_FIXUP_HP_FRONT_MIC),
         SND_PCI_QUIRK(0x103c, 0x827e, "HP x360", ALC295_FIXUP_HP_X360),
@@ -9862 +11019 @@
         SND_PCI_QUIRK(0x103c, 0x841c, "HP Pavilion 15-CK0xx", ALC269_FIXUP_HP_MUTE_LED_MIC3),
         SND_PCI_QUIRK(0x103c, 0x8497, "HP Envy x360", ALC269_FIXUP_HP_MUTE_LED_MIC3),
+        SND_PCI_QUIRK(0x103c, 0x84a6, "HP 250 G7 Notebook PC", ALC269_FIXUP_HP_LINE1_MIC1_LED),
+        SND_PCI_QUIRK(0x103c, 0x84ae, "HP 15-db0403ng", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
         SND_PCI_QUIRK(0x103c, 0x84da, "HP OMEN dc0019-ur", ALC295_FIXUP_HP_OMEN),
         SND_PCI_QUIRK(0x103c, 0x84e7, "HP Pavilion 15", ALC269_FIXUP_HP_MUTE_LED_MIC3),
         SND_PCI_QUIRK(0x103c, 0x8519, "HP Spectre x360 15-df0xxx", ALC285_FIXUP_HP_SPECTRE_X360),
+        SND_PCI_QUIRK(0x103c, 0x8537, "HP ProBook 440 G6", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
+        SND_PCI_QUIRK(0x103c, 0x85de, "HP Envy x360 13-ar0xxx", ALC285_FIXUP_HP_ENVY_X360),
         SND_PCI_QUIRK(0x103c, 0x860f, "HP ZBook 15 G6", ALC285_FIXUP_HP_GPIO_AMP_INIT),
         SND_PCI_QUIRK(0x103c, 0x861f, "HP Elite Dragonfly G1", ALC285_FIXUP_HP_GPIO_AMP_INIT),
         SND_PCI_QUIRK(0x103c, 0x869d, "HP", ALC236_FIXUP_HP_MUTE_LED),
+        SND_PCI_QUIRK(0x103c, 0x86c1, "HP Laptop 15-da3001TU", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
         SND_PCI_QUIRK(0x103c, 0x86c7, "HP Envy AiO 32", ALC274_FIXUP_HP_ENVY_GPIO),
+        SND_PCI_QUIRK(0x103c, 0x86e7, "HP Spectre x360 15-eb0xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1),
+        SND_PCI_QUIRK(0x103c, 0x86e8, "HP Spectre x360 15-eb0xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1),
+        SND_PCI_QUIRK(0x103c, 0x86f9, "HP Spectre x360 13-aw0xxx", ALC285_FIXUP_HP_SPECTRE_X360_MUTE_LED),
         SND_PCI_QUIRK(0x103c, 0x8716, "HP Elite Dragonfly G2 Notebook PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),
         SND_PCI_QUIRK(0x103c, 0x8720, "HP EliteBook x360 1040 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),
@@ -9878 +11043 @@
         SND_PCI_QUIRK(0x103c, 0x8736, "HP", ALC285_FIXUP_HP_GPIO_AMP_INIT),
         SND_PCI_QUIRK(0x103c, 0x8760, "HP", ALC285_FIXUP_HP_MUTE_LED),
+        SND_PCI_QUIRK(0x103c, 0x876e, "HP ENVY x360 Convertible 13-ay0xxx", ALC245_FIXUP_HP_X360_MUTE_LEDS),
         SND_PCI_QUIRK(0x103c, 0x877a, "HP", ALC285_FIXUP_HP_MUTE_LED),
         SND_PCI_QUIRK(0x103c, 0x877d, "HP", ALC236_FIXUP_HP_MUTE_LED),
@@ -9884 +11050 @@
         SND_PCI_QUIRK(0x103c, 0x8783, "HP ZBook Fury 15 G7 Mobile Workstation",
                       ALC285_FIXUP_HP_GPIO_AMP_INIT),
+        SND_PCI_QUIRK(0x103c, 0x8786, "HP OMEN 15", ALC285_FIXUP_HP_MUTE_LED),
         SND_PCI_QUIRK(0x103c, 0x8787, "HP OMEN 15", ALC285_FIXUP_HP_MUTE_LED),
         SND_PCI_QUIRK(0x103c, 0x8788, "HP OMEN 15", ALC285_FIXUP_HP_MUTE_LED),
+        SND_PCI_QUIRK(0x103c, 0x87b7, "HP Laptop 14-fq0xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
         SND_PCI_QUIRK(0x103c, 0x87c8, "HP", ALC287_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x87d3, "HP Laptop 15-gw0xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
+        SND_PCI_QUIRK(0x103c, 0x87df, "HP ProBook 430 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x87e5, "HP ProBook 440 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x87e7, "HP ProBook 450 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
@@ -9895 +11065 @@
         SND_PCI_QUIRK(0x103c, 0x87f6, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP),
         SND_PCI_QUIRK(0x103c, 0x87f7, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP),
+        SND_PCI_QUIRK(0x103c, 0x87fd, "HP Laptop 14-dq2xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
+        SND_PCI_QUIRK(0x103c, 0x87fe, "HP Laptop 15s-fq2xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
         SND_PCI_QUIRK(0x103c, 0x8805, "HP ProBook 650 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x880d, "HP EliteBook 830 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x8811, "HP Spectre x360 15-eb1xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1),
         SND_PCI_QUIRK(0x103c, 0x8812, "HP Spectre x360 15-eb1xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1),
+        SND_PCI_QUIRK(0x103c, 0x881d, "HP 250 G8 Notebook PC", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
         SND_PCI_QUIRK(0x103c, 0x8846, "HP EliteBook 850 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x8847, "HP EliteBook x360 830 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
@@ -9908 +11081 @@
         SND_PCI_QUIRK(0x103c, 0x8870, "HP ZBook Fury 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),
         SND_PCI_QUIRK(0x103c, 0x8873, "HP ZBook Studio 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),
+        SND_PCI_QUIRK(0x103c, 0x887a, "HP Laptop 15s-eq2xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
+        SND_PCI_QUIRK(0x103c, 0x887c, "HP Laptop 14s-fq1xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
+        SND_PCI_QUIRK(0x103c, 0x888a, "HP ENVY x360 Convertible 15-eu0xxx", ALC245_FIXUP_HP_X360_MUTE_LEDS),
         SND_PCI_QUIRK(0x103c, 0x888d, "HP ZBook Power 15.6 inch G8 Mobile Workstation PC", ALC236_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8895, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_SPEAKERS_MICMUTE_LED),
         SND_PCI_QUIRK(0x103c, 0x8896, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_MUTE_LED),
         SND_PCI_QUIRK(0x103c, 0x8898, "HP EliteBook 845 G8 Notebook PC", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST),
         SND_PCI_QUIRK(0x103c, 0x88d0, "HP Pavilion 15-eh1xxx (mainboard 88D0)", ALC287_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x88dd, "HP Pavilion 15z-ec200", ALC285_FIXUP_HP_MUTE_LED),
+        SND_PCI_QUIRK(0x103c, 0x8902, "HP OMEN 16", ALC285_FIXUP_HP_MUTE_LED),
+        SND_PCI_QUIRK(0x103c, 0x890e, "HP 255 G8 Notebook PC", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
+        SND_PCI_QUIRK(0x103c, 0x8919, "HP Pavilion Aero Laptop 13-be0xxx", ALC287_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x896d, "HP ZBook Firefly 16 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x896e, "HP EliteBook x360 830 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8971, "HP EliteBook 830 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8972, "HP EliteBook 840 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8973, "HP EliteBook 860 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8974, "HP EliteBook 840 Aero G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8975, "HP EliteBook x360 840 Aero G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x897d, "HP mt440 Mobile Thin Client U74", ALC236_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8981, "HP Elite Dragonfly G3", ALC245_FIXUP_CS35L41_SPI_4),
+        SND_PCI_QUIRK(0x103c, 0x898e, "HP EliteBook 835 G9", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x898f, "HP EliteBook 835 G9", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8991, "HP EliteBook 845 G9", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8992, "HP EliteBook 845 G9", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8994, "HP EliteBook 855 G9", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),
+        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, 0x89c3, "HP", ALC285_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, 0x89c0, "HP ZBook Power 15.6 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x89c3, "Zbook Studio G9", ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x89c6, "Zbook Fury 17 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x89ca, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
+        SND_PCI_QUIRK(0x103c, 0x89d3, "HP EliteBook 645 G9 (MB 89D2)", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
+        SND_PCI_QUIRK(0x103c, 0x8a0f, "HP Pavilion 14-ec1xxx", ALC287_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8a20, "HP Laptop 15s-fq5xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
+        SND_PCI_QUIRK(0x103c, 0x8a25, "HP Victus 16-d1xxx (MB 8A25)", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),
         SND_PCI_QUIRK(0x103c, 0x8a78, "HP Dev One", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST),
         SND_PCI_QUIRK(0x103c, 0x8aa0, "HP ProBook 440 G9 (MB 8A9E)", ALC236_FIXUP_HP_GPIO_LED),
@@ -9920 +11126 @@
         SND_PCI_QUIRK(0x103c, 0x8aa8, "HP EliteBook 640 G9 (MB 8AA6)", ALC236_FIXUP_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x8aab, "HP EliteBook 650 G9 (MB 8AA9)", ALC236_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8ab9, "HP EliteBook 840 G8 (MB 8AB8)", ALC285_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8abb, "HP ZBook Firefly 14 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8ad1, "HP EliteBook 840 14 inch G9 Notebook PC", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8ad2, "HP EliteBook 860 16 inch G9 Notebook PC", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8b0f, "HP Elite mt645 G7 Mobile Thin Client U81", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
+        SND_PCI_QUIRK(0x103c, 0x8b2f, "HP 255 15.6 inch G10 Notebook PC", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
+        SND_PCI_QUIRK(0x103c, 0x8b3f, "HP mt440 Mobile Thin Client U91", ALC236_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8b42, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8b43, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8b44, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8b45, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8b46, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8b47, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        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),
+        SND_PCI_QUIRK(0x103c, 0x8b70, "HP EliteBook 835 G10", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8b72, "HP EliteBook 845 G10", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8b74, "HP EliteBook 845W G10", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8b77, "HP ElieBook 865 G10", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8b7a, "HP", ALC236_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8b7d, "HP", ALC236_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8b87, "HP", ALC236_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8b8a, "HP", ALC236_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8b8b, "HP", ALC236_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8b8d, "HP", ALC236_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8b8f, "HP", ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8b92, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8b96, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
+        SND_PCI_QUIRK(0x103c, 0x8b97, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
+        SND_PCI_QUIRK(0x103c, 0x8bf0, "HP", ALC236_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c46, "HP EliteBook 830 G11", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c47, "HP EliteBook 840 G11", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c48, "HP EliteBook 860 G11", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c49, "HP Elite x360 830 2-in-1 G11", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c70, "HP EliteBook 835 G11", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c71, "HP EliteBook 845 G11", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c72, "HP EliteBook 865 G11", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c7b, "HP ProBook 445 G11", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
+        SND_PCI_QUIRK(0x103c, 0x8c7c, "HP ProBook 445 G11", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
+        SND_PCI_QUIRK(0x103c, 0x8c7d, "HP ProBook 465 G11", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
+        SND_PCI_QUIRK(0x103c, 0x8c7e, "HP ProBook 465 G11", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
+        SND_PCI_QUIRK(0x103c, 0x8c7f, "HP EliteBook 645 G11", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
+        SND_PCI_QUIRK(0x103c, 0x8c80, "HP EliteBook 645 G11", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
+        SND_PCI_QUIRK(0x103c, 0x8c81, "HP EliteBook 665 G11", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
+        SND_PCI_QUIRK(0x103c, 0x8c89, "HP ProBook 460 G11", ALC236_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c8a, "HP EliteBook 630", ALC236_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c8c, "HP EliteBook 660", ALC236_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c8d, "HP ProBook 440 G11", ALC236_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c8e, "HP ProBook 460 G11", ALC236_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c90, "HP EliteBook 640", ALC236_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c91, "HP EliteBook 660", ALC236_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c96, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
+        SND_PCI_QUIRK(0x103c, 0x8c97, "HP ZBook", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
+        SND_PCI_QUIRK(0x103c, 0x8ca1, "HP ZBook Power", ALC236_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8ca2, "HP ZBook Power", ALC236_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8ca4, "HP ZBook Fury", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8ca7, "HP ZBook Fury", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8cf5, "HP ZBook Studio 16", ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8d01, "HP ZBook Power 14 G12", ALC285_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8d84, "HP EliteBook X G1i", ALC285_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8d91, "HP ZBook Firefly 14 G12", ALC285_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8d92, "HP ZBook Firefly 16 G12", ALC285_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8e18, "HP ZBook Firefly 14 G12A", ALC285_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8e19, "HP ZBook Firefly 14 G12A", ALC285_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8e1a, "HP ZBook Firefly 14 G12A", ALC285_FIXUP_HP_GPIO_LED),
         SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),
         SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300),
@@ -9926 +11202 @@
         SND_PCI_QUIRK(0x1043, 0x10c0, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),
         SND_PCI_QUIRK(0x1043, 0x10d0, "ASUS X540LA/X540LJ", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1043, 0x10d3, "ASUS K6500ZC", ALC294_FIXUP_ASUS_SPK),
         SND_PCI_QUIRK(0x1043, 0x115d, "Asus 1015E", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
         SND_PCI_QUIRK(0x1043, 0x11c0, "ASUS X556UR", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),
@@ -9932 +11209 @@
         SND_PCI_QUIRK(0x1043, 0x1290, "ASUS X441SA", ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1043, 0x12a0, "ASUS X441UV", ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1043, 0x12a3, "Asus N7691ZM", ALC269_FIXUP_ASUS_N7601ZM),
+        SND_PCI_QUIRK(0x1043, 0x12af, "ASUS UX582ZS", ALC245_FIXUP_CS35L41_SPI_2),
         SND_PCI_QUIRK(0x1043, 0x12e0, "ASUS X541SA", ALC256_FIXUP_ASUS_MIC),
         SND_PCI_QUIRK(0x1043, 0x12f0, "ASUS X541UV", ALC256_FIXUP_ASUS_MIC),
+        SND_PCI_QUIRK(0x1043, 0x1313, "Asus K42JZ", ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1043, 0x13b0, "ASUS Z550SA", ALC256_FIXUP_ASUS_MIC),
         SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_ASUS_ZENBOOK),
+        SND_PCI_QUIRK(0x1043, 0x1433, "ASUS GX650PY/PZ/PV/PU/PYV/PZV/PIV/PVV", ALC285_FIXUP_ASUS_I2C_HEADSET_MIC),
+        SND_PCI_QUIRK(0x1043, 0x1460, "Asus VivoBook 15", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1043, 0x1463, "Asus GA402X/GA402N", ALC285_FIXUP_ASUS_I2C_HEADSET_MIC),
+        SND_PCI_QUIRK(0x1043, 0x1473, "ASUS GU604VI/VC/VE/VG/VJ/VQ/VU/VV/VY/VZ", ALC285_FIXUP_ASUS_HEADSET_MIC),
+        SND_PCI_QUIRK(0x1043, 0x1483, "ASUS GU603VQ/VU/VV/VJ/VI", ALC285_FIXUP_ASUS_HEADSET_MIC),
+        SND_PCI_QUIRK(0x1043, 0x1493, "ASUS GV601VV/VU/VJ/VQ/VI", ALC285_FIXUP_ASUS_HEADSET_MIC),
+        SND_PCI_QUIRK(0x1043, 0x14d3, "ASUS G614JY/JZ/JG", ALC245_FIXUP_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1043, 0x14e3, "ASUS G513PI/PU/PV", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x1043, 0x1503, "ASUS G733PY/PZ/PZV/PYV", ALC287_FIXUP_CS35L41_I2C_2),
         SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A),
+        SND_PCI_QUIRK(0x1043, 0x1533, "ASUS GV302XA/XJ/XQ/XU/XV/XI", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x1043, 0x1573, "ASUS GZ301VV/VQ/VU/VJ/VA/VC/VE/VVC/VQC/VUC/VJC/VEC/VCC", ALC285_FIXUP_ASUS_HEADSET_MIC),
+        SND_PCI_QUIRK(0x1043, 0x1662, "ASUS GV301QH", ALC294_FIXUP_ASUS_DUAL_SPK),
+        SND_PCI_QUIRK(0x1043, 0x1663, "ASUS GU603ZI/ZJ/ZQ/ZU/ZV", ALC285_FIXUP_ASUS_HEADSET_MIC),
+        SND_PCI_QUIRK(0x1043, 0x1683, "ASUS UM3402YAR", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x1043, 0x16a3, "ASUS UX3402VA", ALC245_FIXUP_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1043, 0x16b2, "ASUS GU603", ALC289_FIXUP_ASUS_GA401),
         SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC),
         SND_PCI_QUIRK(0x1043, 0x1740, "ASUS UX430UA", ALC295_FIXUP_ASUS_DACS),
         SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_DUAL_SPK),
-        SND_PCI_QUIRK(0x1043, 0x1662, "ASUS GV301QH", ALC294_FIXUP_ASUS_DUAL_SPK),
+        SND_PCI_QUIRK(0x1043, 0x17f3, "ROG Ally NR2301L/X", ALC294_FIXUP_ASUS_ALLY),
         SND_PCI_QUIRK(0x1043, 0x1881, "ASUS Zephyrus S/M", ALC294_FIXUP_ASUS_GX502_PINS),
         SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC),
+        SND_PCI_QUIRK(0x1043, 0x18d3, "ASUS UM3504DA", ALC294_FIXUP_CS35L41_I2C_2),
         SND_PCI_QUIRK(0x1043, 0x18f1, "Asus FX505DT", ALC256_FIXUP_ASUS_HEADSET_MIC),
         SND_PCI_QUIRK(0x1043, 0x194e, "ASUS UX563FD", ALC294_FIXUP_ASUS_HPE),
@@ -9950 +11247 @@
         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, 0x1a63, "ASUS UX3405MA", ALC245_FIXUP_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1043, 0x1a83, "ASUS UM5302LA", ALC294_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x1043, 0x1a8f, "ASUS UX582ZS", ALC245_FIXUP_CS35L41_SPI_2),
         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, 0x1b93, "ASUS G614JVR/JIR", ALC245_FIXUP_CS35L41_SPI_2),
         SND_PCI_QUIRK(0x1043, 0x1bbd, "ASUS Z550MA", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1043, 0x1c03, "ASUS UM3406HA", ALC287_FIXUP_CS35L41_I2C_2),
         SND_PCI_QUIRK(0x1043, 0x1c23, "Asus X55U", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
+        SND_PCI_QUIRK(0x1043, 0x1c33, "ASUS UX5304MA", ALC245_FIXUP_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1043, 0x1c43, "ASUS UX8406MA", ALC245_FIXUP_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1043, 0x1c62, "ASUS GU603", ALC289_FIXUP_ASUS_GA401),
+        SND_PCI_QUIRK(0x1043, 0x1c92, "ASUS ROG Strix G15", ALC285_FIXUP_ASUS_G533Z_PINS),
+        SND_PCI_QUIRK(0x1043, 0x1c9f, "ASUS G614JU/JV/JI", ALC285_FIXUP_ASUS_HEADSET_MIC),
+        SND_PCI_QUIRK(0x1043, 0x1caf, "ASUS G634JY/JZ/JI/JG", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),
         SND_PCI_QUIRK(0x1043, 0x1ccd, "ASUS X555UB", ALC256_FIXUP_ASUS_MIC),
+        SND_PCI_QUIRK(0x1043, 0x1ccf, "ASUS G814JU/JV/JI", ALC245_FIXUP_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1043, 0x1cdf, "ASUS G814JY/JZ/JG", ALC245_FIXUP_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1043, 0x1cef, "ASUS G834JY/JZ/JI/JG", ALC285_FIXUP_ASUS_HEADSET_MIC),
+        SND_PCI_QUIRK(0x1043, 0x1d1f, "ASUS G713PI/PU/PV/PVN", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x1043, 0x1d42, "ASUS Zephyrus G14 2022", ALC289_FIXUP_ASUS_GA401),
         SND_PCI_QUIRK(0x1043, 0x1d4e, "ASUS TM420", ALC256_FIXUP_ASUS_HPE),
+        SND_PCI_QUIRK(0x1043, 0x1da2, "ASUS UP6502ZA/ZD", ALC245_FIXUP_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1043, 0x1e02, "ASUS UX3402ZA", ALC245_FIXUP_CS35L41_SPI_2),
         SND_PCI_QUIRK(0x1043, 0x1e11, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA502),
+        SND_PCI_QUIRK(0x1043, 0x1e12, "ASUS UM3402", ALC287_FIXUP_CS35L41_I2C_2),
         SND_PCI_QUIRK(0x1043, 0x1e51, "ASUS Zephyrus M15", ALC294_FIXUP_ASUS_GU502_PINS),
+        SND_PCI_QUIRK(0x1043, 0x1e5e, "ASUS ROG Strix G513", ALC294_FIXUP_ASUS_G513_PINS),
         SND_PCI_QUIRK(0x1043, 0x1e8e, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA401),
+        SND_PCI_QUIRK(0x1043, 0x1ee2, "ASUS UM6702RA/RC", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x1043, 0x1c52, "ASUS Zephyrus G15 2022", ALC289_FIXUP_ASUS_GA401),
         SND_PCI_QUIRK(0x1043, 0x1f11, "ASUS Zephyrus G14", ALC289_FIXUP_ASUS_GA401),
-        SND_PCI_QUIRK(0x1043, 0x1d42, "ASUS Zephyrus G14 2022", ALC289_FIXUP_ASUS_GA401),
-        SND_PCI_QUIRK(0x1043, 0x16b2, "ASUS GU603", ALC289_FIXUP_ASUS_GA401),
+        SND_PCI_QUIRK(0x1043, 0x1f12, "ASUS UM5302", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x1043, 0x1f62, "ASUS UX7602ZM", ALC245_FIXUP_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1043, 0x1f92, "ASUS ROG Flow X16", ALC289_FIXUP_ASUS_GA401),
         SND_PCI_QUIRK(0x1043, 0x3030, "ASUS ZN270IE", ALC256_FIXUP_ASUS_AIO_GPIO2),
+        SND_PCI_QUIRK(0x1043, 0x3a20, "ASUS G614JZR", ALC245_FIXUP_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1043, 0x3a30, "ASUS G814JVR/JIR", ALC245_FIXUP_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1043, 0x3a40, "ASUS G814JZR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),
+        SND_PCI_QUIRK(0x1043, 0x3a50, "ASUS G834JYR/JZR", ALC245_FIXUP_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1043, 0x3a60, "ASUS G634JYR/JZR", ALC245_FIXUP_CS35L41_SPI_2),
         SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC),
         SND_PCI_QUIRK(0x1043, 0x834a, "ASUS S101", ALC269_FIXUP_STEREO_DMIC),
@@ -9983 +11307 @@
         SND_PCI_QUIRK(0x10ec, 0x10f2, "Intel Reference board", ALC700_FIXUP_INTEL_REFERENCE),
         SND_PCI_QUIRK(0x10ec, 0x118c, "Medion EE4254 MD62100", ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE),
+        SND_PCI_QUIRK(0x10ec, 0x119e, "Positivo SU C1400", ALC269_FIXUP_ASPIRE_HEADSET_MIC),
+        SND_PCI_QUIRK(0x10ec, 0x11bc, "VAIO VJFE-IL", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
         SND_PCI_QUIRK(0x10ec, 0x1230, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),
+        SND_PCI_QUIRK(0x10ec, 0x124c, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),
         SND_PCI_QUIRK(0x10ec, 0x1252, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),
         SND_PCI_QUIRK(0x10ec, 0x1254, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),
-        SND_PCI_QUIRK(0x10f7, 0x8338, "Panasonic CF-SZ6", ALC269_FIXUP_HEADSET_MODE),
+        SND_PCI_QUIRK(0x10ec, 0x12cc, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),
+        SND_PCI_QUIRK(0x10f7, 0x8338, "Panasonic CF-SZ6", ALC269_FIXUP_ASPIRE_HEADSET_MIC),
         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, 0xc189, "Samsung Galaxy Flex Book (NT950QCG-X716)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
-        SND_PCI_QUIRK(0x144d, 0xc18a, "Samsung Galaxy Book Ion (NP930XCJ-K01US)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
+        SND_PCI_QUIRK(0x144d, 0xc169, "Samsung Notebook 9 Pen (NP930SBE-K01US)", ALC298_FIXUP_SAMSUNG_AMP),
+        SND_PCI_QUIRK(0x144d, 0xc176, "Samsung Notebook 9 Pro (NP930MBE-K04US)", ALC298_FIXUP_SAMSUNG_AMP),
+        SND_PCI_QUIRK(0x144d, 0xc189, "Samsung Galaxy Flex Book (NT950QCG-X716)", ALC298_FIXUP_SAMSUNG_AMP),
+        SND_PCI_QUIRK(0x144d, 0xc18a, "Samsung Galaxy Book Ion (NP930XCJ-K01US)", ALC298_FIXUP_SAMSUNG_AMP),
+        SND_PCI_QUIRK(0x144d, 0xc1a3, "Samsung Galaxy Book Pro (NP935XDB-KC1SE)", ALC298_FIXUP_SAMSUNG_AMP),
+        SND_PCI_QUIRK(0x144d, 0xc1a4, "Samsung Galaxy Book Pro 360 (NT935QBD)", ALC298_FIXUP_SAMSUNG_AMP),
+        SND_PCI_QUIRK(0x144d, 0xc1a6, "Samsung Galaxy Book Pro 360 (NP930QBD)", ALC298_FIXUP_SAMSUNG_AMP),
         SND_PCI_QUIRK(0x144d, 0xc740, "Samsung Ativ book 8 (NP870Z5G)", ALC269_FIXUP_ATIV_BOOK_8),
-        SND_PCI_QUIRK(0x144d, 0xc812, "Samsung Notebook Pen S (NT950SBE-X58)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
-        SND_PCI_QUIRK(0x144d, 0xc830, "Samsung Galaxy Book Ion (NT950XCJ-X716A)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
+        SND_PCI_QUIRK(0x144d, 0xc812, "Samsung Notebook Pen S (NT950SBE-X58)", ALC298_FIXUP_SAMSUNG_AMP),
+        SND_PCI_QUIRK(0x144d, 0xc830, "Samsung Galaxy Book Ion (NT950XCJ-X716A)", ALC298_FIXUP_SAMSUNG_AMP),
         SND_PCI_QUIRK(0x144d, 0xc832, "Samsung Galaxy Book Flex Alpha (NP730QCJ)", ALC256_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
+        SND_PCI_QUIRK(0x144d, 0xca03, "Samsung Galaxy Book2 Pro 360 (NP930QED)", ALC298_FIXUP_SAMSUNG_AMP),
+        SND_PCI_QUIRK(0x144d, 0xca06, "Samsung Galaxy Book3 360 (NP730QFG)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
+        SND_PCI_QUIRK(0x144d, 0xc868, "Samsung Galaxy Book2 Pro (NP930XED)", ALC298_FIXUP_SAMSUNG_AMP),
         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),
         SND_PCI_QUIRK(0x1462, 0xb171, "Cubi N 8GL (MS-B171)", ALC283_FIXUP_HEADSET_MIC),
         SND_PCI_QUIRK(0x152d, 0x1082, "Quanta NL3", ALC269_FIXUP_LIFEBOOK),
+        SND_PCI_QUIRK(0x152d, 0x1262, "Huawei NBLB-WAX9N", ALC2XX_FIXUP_HEADSET_MIC),
+        SND_PCI_QUIRK(0x1558, 0x0353, "Clevo V35[05]SN[CDE]Q", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0x1323, "Clevo N130ZU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0x1325, "Clevo N15[01][CW]U", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
@@ -10006 +11342 @@
         SND_PCI_QUIRK(0x1558, 0x1404, "Clevo N150CU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0x14a1, "Clevo L141MU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1558, 0x2624, "Clevo L240TU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1558, 0x28c1, "Clevo V370VND", ALC2XX_FIXUP_HEADSET_MIC),
         SND_PCI_QUIRK(0x1558, 0x4018, "Clevo NV40M[BE]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0x4019, "Clevo NV40MZ", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0x4020, "Clevo NV40MB", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1558, 0x4041, "Clevo NV4[15]PZ", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0x40a1, "Clevo NL40GU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0x40c1, "Clevo NL40[CZ]U", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
@@ -10029 +11368 @@
         SND_PCI_QUIRK(0x1558, 0x5157, "Clevo W517GU1", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0x51a1, "Clevo NS50MU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1558, 0x51b1, "Clevo NS50AU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1558, 0x51b3, "Clevo NS70AU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1558, 0x5630, "Clevo NP50RNJS", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0x70a1, "Clevo NB70T[HJK]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0x70b3, "Clevo NK70SB", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
@@ -10036 +11378 @@
         SND_PCI_QUIRK(0x1558, 0x70f6, "Clevo NH77DPQ-Y", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0x7716, "Clevo NS50PU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1558, 0x7717, "Clevo NS70PU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0x7718, "Clevo L140PU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1558, 0x7724, "Clevo L140AU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0x8228, "Clevo NR40BU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0x8520, "Clevo NH50D[CD]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
@@ -10062 +11406 @@
         SND_PCI_QUIRK(0x1558, 0xa500, "Clevo NL5[03]RU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0xa600, "Clevo NL50NU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1558, 0xa650, "Clevo NP[567]0SN[CD]", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1558, 0xa671, "Clevo NP70SN[CDE]", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1558, 0xa763, "Clevo V54x_6x_TU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0xb018, "Clevo NP50D[BE]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0xb019, "Clevo NH77D[BE]Q", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
@@ -10095 +11442 @@
         SND_PCI_QUIRK(0x17aa, 0x2231, "Thinkpad T560", ALC292_FIXUP_TPT460),
         SND_PCI_QUIRK(0x17aa, 0x2233, "Thinkpad", ALC292_FIXUP_TPT460),
+        SND_PCI_QUIRK(0x17aa, 0x2234, "Thinkpad ICE-1", ALC287_FIXUP_TAS2781_I2C),
         SND_PCI_QUIRK(0x17aa, 0x2245, "Thinkpad T470", ALC298_FIXUP_TPT470_DOCK),
         SND_PCI_QUIRK(0x17aa, 0x2246, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),
@@ -10107 +11455 @@
         SND_PCI_QUIRK(0x17aa, 0x22c1, "Thinkpad P1 Gen 3", ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK),
         SND_PCI_QUIRK(0x17aa, 0x22c2, "Thinkpad X1 Extreme Gen 3", ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK),
+        SND_PCI_QUIRK(0x17aa, 0x22f1, "Thinkpad", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),
+        SND_PCI_QUIRK(0x17aa, 0x22f2, "Thinkpad", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),
+        SND_PCI_QUIRK(0x17aa, 0x22f3, "Thinkpad", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),
+        SND_PCI_QUIRK(0x17aa, 0x2316, "Thinkpad P1 Gen 6", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),
+        SND_PCI_QUIRK(0x17aa, 0x2317, "Thinkpad P1 Gen 6", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),
+        SND_PCI_QUIRK(0x17aa, 0x2318, "Thinkpad Z13 Gen2", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),
+        SND_PCI_QUIRK(0x17aa, 0x2319, "Thinkpad Z16 Gen2", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),
+        SND_PCI_QUIRK(0x17aa, 0x231a, "Thinkpad Z16 Gen2", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),
         SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
         SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
@@ -10118 +11474 @@
         SND_PCI_QUIRK(0x17aa, 0x3178, "ThinkCentre Station", ALC283_FIXUP_HEADSET_MIC),
         SND_PCI_QUIRK(0x17aa, 0x31af, "ThinkCentre Station", ALC623_FIXUP_LENOVO_THINKSTATION_P340),
-        SND_PCI_QUIRK(0x17aa, 0x3802, "Lenovo Yoga DuetITL 2021", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS),
+        SND_PCI_QUIRK(0x17aa, 0x334b, "Lenovo ThinkCentre M70 Gen5", ALC283_FIXUP_HEADSET_MIC),
+        SND_PCI_QUIRK(0x17aa, 0x3384, "ThinkCentre M90a PRO", ALC233_FIXUP_LENOVO_L2MH_LOW_ENLED),
+        SND_PCI_QUIRK(0x17aa, 0x3386, "ThinkCentre M90a Gen6", ALC233_FIXUP_LENOVO_L2MH_LOW_ENLED),
+        SND_PCI_QUIRK(0x17aa, 0x3387, "ThinkCentre M70a Gen6", ALC233_FIXUP_LENOVO_L2MH_LOW_ENLED),
+        SND_PCI_QUIRK(0x17aa, 0x3801, "Lenovo Yoga9 14IAP7", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),
+        SND_PCI_QUIRK(0x17aa, 0x3802, "Lenovo Yoga Pro 9 14IRP8 / DuetITL 2021", ALC287_FIXUP_LENOVO_14IRP8_DUETITL),
         SND_PCI_QUIRK(0x17aa, 0x3813, "Legion 7i 15IMHG05", ALC287_FIXUP_LEGION_15IMHG05_SPEAKERS),
         SND_PCI_QUIRK(0x17aa, 0x3818, "Lenovo C940 / Yoga Duet 7", ALC298_FIXUP_LENOVO_C940_DUET7),
         SND_PCI_QUIRK(0x17aa, 0x3819, "Lenovo 13s Gen2 ITL", ALC287_FIXUP_13S_GEN2_SPEAKERS),
-        SND_PCI_QUIRK(0x17aa, 0x3820, "Yoga Duet 7 13ITL6", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS),
+        SND_PCI_QUIRK(0x17aa, 0x3820, "IdeaPad 330-17IKB 81DM", ALC269_FIXUP_ASPIRE_HEADSET_MIC),
         SND_PCI_QUIRK(0x17aa, 0x3824, "Legion Y9000X 2020", ALC285_FIXUP_LEGION_Y9000X_SPEAKERS),
         SND_PCI_QUIRK(0x17aa, 0x3827, "Ideapad S740", ALC285_FIXUP_IDEAPAD_S740_COEF),
@@ -10128 +11489 @@
         SND_PCI_QUIRK(0x17aa, 0x383d, "Legion Y9000X 2019", ALC285_FIXUP_LEGION_Y9000X_SPEAKERS),
         SND_PCI_QUIRK(0x17aa, 0x3843, "Yoga 9i", ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP),
+        SND_PCI_QUIRK(0x17aa, 0x3847, "Legion 7 16ACHG6", ALC287_FIXUP_LEGION_16ACHG6),
         SND_PCI_QUIRK(0x17aa, 0x384a, "Lenovo Yoga 7 15ITL5", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS),
         SND_PCI_QUIRK(0x17aa, 0x3852, "Lenovo Yoga 7 14ITL5", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS),
         SND_PCI_QUIRK(0x17aa, 0x3853, "Lenovo Yoga 7 15ITL5", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS),
+        SND_PCI_QUIRK(0x17aa, 0x3855, "Legion 7 16ITHG6", ALC287_FIXUP_LEGION_16ITHG6),
+        SND_PCI_QUIRK(0x17aa, 0x3865, "Lenovo 13X", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x17aa, 0x3866, "Lenovo 13X", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x17aa, 0x3869, "Lenovo Yoga7 14IAL7", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),
+        SND_PCI_QUIRK(0x17aa, 0x387d, "Yoga S780-16 pro Quad AAC", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x17aa, 0x387e, "Yoga S780-16 pro Quad YC", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x17aa, 0x3881, "YB9 dual power mode2 YC", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x17aa, 0x3882, "Lenovo Yoga Pro 7 14APH8", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),
+        SND_PCI_QUIRK(0x17aa, 0x3884, "Y780 YG DUAL", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x17aa, 0x3886, "Y780 VECO DUAL", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x17aa, 0x3891, "Lenovo Yoga Pro 7 14AHP9", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),
+        SND_PCI_QUIRK(0x17aa, 0x38a7, "Y780P AMD YG dual", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x17aa, 0x38a8, "Y780P AMD VECO dual", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x17aa, 0x38ba, "Yoga S780-14.5 Air AMD quad YC", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x17aa, 0x38bb, "Yoga S780-14.5 Air AMD quad AAC", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x17aa, 0x38be, "Yoga S980-14.5 proX YC Dual", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x17aa, 0x38bf, "Yoga S980-14.5 proX LX Dual", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x17aa, 0x38c3, "Y980 DUAL", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x17aa, 0x38cb, "Y790 YG DUAL", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x17aa, 0x38cd, "Y790 VECO DUAL", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x17aa, 0x38d2, "Lenovo Yoga 9 14IMH9", ALC287_FIXUP_YOGA9_14IMH9_BASS_SPK_PIN),
+        SND_PCI_QUIRK(0x17aa, 0x38d7, "Lenovo Yoga 9 14IMH9", ALC287_FIXUP_YOGA9_14IMH9_BASS_SPK_PIN),
+        SND_PCI_QUIRK(0x17aa, 0x38df, "Y990 YG DUAL", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x17aa, 0x38f9, "Thinkbook 16P Gen5", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x17aa, 0x38fa, "Thinkbook 16P Gen5", ALC287_FIXUP_CS35L41_I2C_2),
         SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI),
+        SND_PCI_QUIRK(0x17aa, 0x3913, "Lenovo 145", ALC236_FIXUP_LENOVO_INV_DMIC),
         SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC),
         SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo B50-70", ALC269_FIXUP_DMIC_THINKPAD_ACPI),
@@ -10155 +11543 @@
         SND_PCI_QUIRK(0x17aa, 0x511f, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),
         SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),
+        SND_PCI_QUIRK(0x17aa, 0x9e56, "Lenovo ZhaoYang CF4620Z", ALC286_FIXUP_SONY_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1849, 0x0269, "Positivo Master C6400", ALC269VB_FIXUP_ASUS_ZENBOOK),
         SND_PCI_QUIRK(0x1849, 0x1233, "ASRock NUC Box 1100", ALC233_FIXUP_NO_AUDIO_JACK),
+        SND_PCI_QUIRK(0x1849, 0xa233, "Positivo Master C6300", ALC269_FIXUP_HEADSET_MIC),
         SND_PCI_QUIRK(0x19e5, 0x3204, "Huawei MACH-WX9", ALC256_FIXUP_HUAWEI_MACH_WX9_PINS),
+        SND_PCI_QUIRK(0x19e5, 0x320f, "Huawei WRT-WX9 ", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x19e5, 0x3212, "Huawei KLV-WX9 ", ALC256_FIXUP_ACER_HEADSET_MIC),
         SND_PCI_QUIRK(0x1b35, 0x1235, "CZC B20", ALC269_FIXUP_CZC_B20),
         SND_PCI_QUIRK(0x1b35, 0x1236, "CZC TMI", ALC269_FIXUP_CZC_TMI),
@@ -10163 +11556 @@
         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(0x1c6c, 0x122a, "Positivo N14AP7", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
+        SND_PCI_QUIRK(0x1c6c, 0x1251, "Positivo N14KP6-TG", ALC288_FIXUP_DELL1_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1d05, 0x1132, "TongFang PHxTxX1", ALC256_FIXUP_SET_COEF_DEFAULTS),
         SND_PCI_QUIRK(0x1d05, 0x1096, "TongFang GMxMRxx", ALC269_FIXUP_NO_SHUTUP),
@@ -10172 +11567 @@
         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(0x1d05, 0x1387, "TongFang GMxIXxx", ALC2XX_FIXUP_HEADSET_MIC),
+        SND_PCI_QUIRK(0x1d05, 0x1409, "TongFang GMxIXxx", ALC2XX_FIXUP_HEADSET_MIC),
+        SND_PCI_QUIRK(0x1d17, 0x3288, "Haier Boyue G42", ALC269VC_FIXUP_ACER_VCOPPERBOX_PINS),
         SND_PCI_QUIRK(0x1d72, 0x1602, "RedmiBook", ALC255_FIXUP_XIAOMI_HEADSET_MIC),
         SND_PCI_QUIRK(0x1d72, 0x1701, "XiaomiNotebook Pro", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE),
@@ -10177 +11575 @@
         SND_PCI_QUIRK(0x1d72, 0x1945, "Redmi G", ALC256_FIXUP_ASUS_HEADSET_MIC),
         SND_PCI_QUIRK(0x1d72, 0x1947, "RedmiBook Air", ALC255_FIXUP_XIAOMI_HEADSET_MIC),
+        SND_PCI_QUIRK(0x1f66, 0x0105, "Ayaneo Portable Game Player", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x2014, 0x800a, "Positivo ARN50", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
+        SND_PCI_QUIRK(0x2782, 0x0214, "VAIO VJFE-CL", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
+        SND_PCI_QUIRK(0x2782, 0x0228, "Infinix ZERO BOOK 13", ALC269VB_FIXUP_INFINIX_ZERO_BOOK_13),
+        SND_PCI_QUIRK(0x2782, 0x0232, "CHUWI CoreBook XPro", ALC269VB_FIXUP_CHUWI_COREBOOK_XPRO),
+        SND_PCI_QUIRK(0x2782, 0x1701, "Infinix Y4 Max", ALC269VC_FIXUP_INFINIX_Y4_MAX),
+        SND_PCI_QUIRK(0x2782, 0x1705, "MEDION E15433", ALC269VC_FIXUP_INFINIX_Y4_MAX),
+        SND_PCI_QUIRK(0x2782, 0x1707, "Vaio VJFE-ADL", ALC298_FIXUP_SPK_VOLUME),
         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(0x8086, 0x3038, "Intel NUC 13", ALC295_FIXUP_CHROME_BOOK),
+        SND_PCI_QUIRK(0xf111, 0x0001, "Framework Laptop", ALC295_FIXUP_FRAMEWORK_LAPTOP_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0xf111, 0x0006, "Framework Laptop", ALC295_FIXUP_FRAMEWORK_LAPTOP_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0xf111, 0x0009, "Framework Laptop", ALC295_FIXUP_FRAMEWORK_LAPTOP_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0xf111, 0x000c, "Framework Laptop", ALC295_FIXUP_FRAMEWORK_LAPTOP_MIC_NO_PRESENCE),
 
 #if 0
@@ -10232 +11643 @@
 };
 
-static const struct snd_pci_quirk alc269_fixup_vendor_tbl[] = {
+static const struct hda_quirk alc269_fixup_vendor_tbl[] = {
         SND_PCI_QUIRK_VENDOR(0x1025, "Acer Aspire", ALC271_FIXUP_DMIC),
         SND_PCI_QUIRK_VENDOR(0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED),
@@ -10258 +11669 @@
         {.id = ALC269_FIXUP_DELL3_MIC_NO_PRESENCE, .name = "dell-headset3"},
         {.id = ALC269_FIXUP_DELL4_MIC_NO_PRESENCE, .name = "dell-headset4"},
+        {.id = ALC269_FIXUP_DELL4_MIC_NO_PRESENCE_QUIET, .name = "dell-headset4-quiet"},
         {.id = ALC283_FIXUP_CHROME_BOOK, .name = "alc283-dac-wcaps"},
         {.id = ALC283_FIXUP_SENSE_COMBO_JACK, .name = "alc283-sense-combo"},
@@ -10352 +11764 @@
         {.id = ALC298_FIXUP_HUAWEI_MBX_STEREO, .name = "huawei-mbx-stereo"},
         {.id = ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE, .name = "alc256-medion-headset"},
-        {.id = ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET, .name = "alc298-samsung-headphone"},
+        {.id = ALC298_FIXUP_SAMSUNG_AMP, .name = "alc298-samsung-amp"},
         {.id = ALC256_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET, .name = "alc256-samsung-headphone"},
         {.id = ALC255_FIXUP_XIAOMI_HEADSET_MIC, .name = "alc255-xiaomi-headset"},
@@ -10360 +11772 @@
         {.id = ALC285_FIXUP_HP_SPECTRE_X360, .name = "alc285-hp-spectre-x360"},
         {.id = ALC285_FIXUP_HP_SPECTRE_X360_EB1, .name = "alc285-hp-spectre-x360-eb1"},
+        {.id = ALC285_FIXUP_HP_ENVY_X360, .name = "alc285-hp-envy-x360"},
         {.id = ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP, .name = "alc287-ideapad-bass-spk-amp"},
+        {.id = ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN, .name = "alc287-yoga9-bass-spk-pin"},
         {.id = ALC623_FIXUP_LENOVO_THINKSTATION_P340, .name = "alc623-lenovo-thinkstation-p340"},
         {.id = ALC255_FIXUP_ACER_HEADPHONE_AND_MIC, .name = "alc255-acer-headphone-and-mic"},
         {.id = ALC285_FIXUP_HP_GPIO_AMP_INIT, .name = "alc285-hp-amp-init"},
+        {.id = ALC236_FIXUP_LENOVO_INV_DMIC, .name = "alc236-fixup-lenovo-inv-mic"},
+        {.id = ALC2XX_FIXUP_HEADSET_MIC, .name = "alc2xx-fixup-headset-mic"},
         {0}
 };
@@ -10394 +11810 @@
 
 static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         SND_HDA_PIN_QUIRK(0x10ec0221, 0x103c, "HP Workstation", ALC221_FIXUP_HP_HEADSET_MIC,
                 {0x14, 0x01014020},
@@ -10660 +12076 @@
                 {0x19, 0x03a11030},
                 {0x21, 0x03211020}),
+        SND_HDA_PIN_QUIRK(0x10ec0287, 0x17aa, "Lenovo", ALC287_FIXUP_THINKPAD_I2S_SPK,
+                {0x17, 0x90170110},
+                {0x19, 0x03a11030},
+                {0x21, 0x03211020}),
+        SND_HDA_PIN_QUIRK(0x10ec0287, 0x17aa, "Lenovo", ALC287_FIXUP_THINKPAD_I2S_SPK,
+                {0x17, 0x90170110}, /* 0x231f with RTK I2S AMP */
+                {0x19, 0x04a11040},
+                {0x21, 0x04211020}),
         SND_HDA_PIN_QUIRK(0x10ec0286, 0x1025, "Acer", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE,
                 {0x12, 0x90a60130},
@@ -10754 +12178 @@
                 {0x17, 0x90170110},
                 {0x21, 0x03211020}),
-        SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,
-                {0x14, 0x90170110},
-                {0x21, 0x04211020}),
-        SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,
-                {0x14, 0x90170110},
-                {0x21, 0x04211030}),
-        SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
-                ALC295_STANDARD_PINS,
-                {0x17, 0x21014020},
-                {0x18, 0x21a19030}),
-        SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
-                ALC295_STANDARD_PINS,
-                {0x17, 0x21014040},
-                {0x18, 0x21a19050}),
-        SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
-                ALC295_STANDARD_PINS),
         SND_HDA_PIN_QUIRK(0x10ec0298, 0x1028, "Dell", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE,
                 ALC298_STANDARD_PINS,
@@ -10811 +12219 @@
  */
 static const struct snd_hda_pin_quirk alc269_fallback_pin_fixup_tbl[] = {
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
+        SND_HDA_PIN_QUIRK(0x10ec0256, 0x1025, "Acer", ALC2XX_FIXUP_HEADSET_MIC,
+                {0x19, 0x40000000}),
         SND_HDA_PIN_QUIRK(0x10ec0289, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,
+                {0x19, 0x40000000},
+                {0x1b, 0x40000000}),
+        SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE_QUIET,
                 {0x19, 0x40000000},
                 {0x1b, 0x40000000}),
@@ -10818 +12231 @@
                 {0x19, 0x40000000},
                 {0x1a, 0x40000000}),
-        SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
+        SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_LIMIT_INT_MIC_BOOST,
                 {0x19, 0x40000000},
                 {0x1a, 0x40000000}),
-        SND_HDA_PIN_QUIRK(0x10ec0274, 0x1028, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB,
+        SND_HDA_PIN_QUIRK(0x10ec0274, 0x1028, "Dell", ALC269_FIXUP_DELL1_LIMIT_INT_MIC_BOOST,
                 {0x19, 0x40000000},
                 {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}),
 #endif
         {0}
@@ -10882 +12299 @@
         spec->gen.shared_mic_vref_pin = 0x18;
         codec->power_save_node = 0;
+        spec->en_3kpull_low = true;
 
 #ifdef CONFIG_PM
@@ -10964 +12382 @@
                 spec->init_hook = alc256_init;
                 spec->gen.mixer_nid = 0; /* ALC256 does not have any loopback mixer path */
+                if (codec->core.vendor_id == 0x10ec0236 &&
+                    codec->bus->pci->vendor != PCI_VENDOR_ID_AMD)
+                        spec->en_3kpull_low = false;
                 break;
         case 0x10ec0257:
@@ -10970 +12391 @@
                 spec->init_hook = alc256_init;
                 spec->gen.mixer_nid = 0;
+                spec->en_3kpull_low = false;
                 break;
         case 0x10ec0215:
@@ -11009 +12431 @@
                 spec->gen.mixer_nid = 0; /* no loopback on ALC300 */
                 break;
+        case 0x10ec0222:
         case 0x10ec0623:
                 spec->codec_variant = ALC269_TYPE_ALC623;
+                spec->shutup = alc222_shutup;
+                spec->init_hook = alc222_init;
                 break;
         case 0x10ec0700:
@@ -11175 +12600 @@
 };
 
-static const struct snd_pci_quirk alc861_fixup_tbl[] = {
+static const struct hda_quirk alc861_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1043, 0x1253, "ASUS W7J", ALC660_FIXUP_ASUS_W7J),
         SND_PCI_QUIRK(0x1043, 0x1263, "ASUS Z35HL", ALC660_FIXUP_ASUS_W7J),
@@ -11285 +12710 @@
                 .chain_id = ALC255_FIXUP_ACER_MIC_NO_PRESENCE,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC256_FIXUP_ACER_HEADSET_MIC] = {
                 .type = HDA_FIXUP_PINS,
@@ -11299 +12724 @@
 };
 
-static const struct snd_pci_quirk alc861vd_fixup_tbl[] = {
+static const struct hda_quirk alc861vd_fixup_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x30bf, "HP TX1000", ALC861VD_FIX_DALLAS),
         SND_PCI_QUIRK(0x1043, 0x1339, "ASUS A7-K", ALC660VD_FIX_ASUS_GPIO1),
@@ -11531 +12956 @@
         snd_hda_gen_hp_automute(codec, jack);
         vref = spec->gen.hp_jack_present ? (PIN_HP | AC_PINCTL_VREF_100) : PIN_HP;
-        snd_hda_codec_write(codec, 0x1b, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
-                            vref);
+        snd_hda_set_pin_ctl(codec, 0x1b, vref);
 }
 
@@ -11540 +12964 @@
         struct alc_spec *spec = codec->spec;
         if (action == HDA_FIXUP_ACT_PRE_PROBE) {
+                spec->gen.hp_automute_hook = alc897_hp_automute_hook;
+                spec->no_shutup_pins = 1;
+        }
+        if (action == HDA_FIXUP_ACT_PROBE) {
+                snd_hda_set_pin_ctl_cache(codec, 0x1a, PIN_IN | AC_PINCTL_VREF_100);
+        }
+}
+
+static void alc897_fixup_lenovo_headset_mode(struct hda_codec *codec,
+                                     const struct hda_fixup *fix, int action)
+{
+        struct alc_spec *spec = codec->spec;
+
+        if (action == HDA_FIXUP_ACT_PRE_PROBE) {
+                spec->parse_flags |= HDA_PINCFG_HEADSET_MIC;
                 spec->gen.hp_automute_hook = alc897_hp_automute_hook;
         }
@@ -11627 +13066 @@
         ALC897_FIXUP_HEADSET_MIC_PIN,
         ALC897_FIXUP_HP_HSMIC_VERB,
+        ALC897_FIXUP_LENOVO_HEADSET_MODE,
+        ALC897_FIXUP_HEADSET_MIC_PIN2,
+        ALC897_FIXUP_UNIS_H3C_X500S,
+        ALC897_FIXUP_HEADSET_MIC_PIN3,
 };
 
@@ -11771 +13214 @@
                 .v.func = alc272_fixup_mario,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC662_FIXUP_CZC_ET26] = {
                 .type = HDA_FIXUP_PINS,
@@ -11993 +13436 @@
                 .chain_id = ALC668_FIXUP_DELL_MIC_NO_PRESENCE
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC662_FIXUP_DELL_MIC_NO_PRESENCE] = {
                 .type = HDA_FIXUP_PINS,
@@ -12009 +13452 @@
                 .v.func = alc_fixup_headset_mode_alc662,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC668_FIXUP_DELL_MIC_NO_PRESENCE] = {
                 .type = HDA_FIXUP_PINS,
@@ -12072 +13515 @@
                 .chain_id = ALC662_FIXUP_BASS_CHMAP
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC668_FIXUP_ASUS_Nx51] = {
                 .type = HDA_FIXUP_PINS,
@@ -12106 +13549 @@
                 .v.func = alc_fixup_headset_mode,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC891_FIXUP_DELL_MIC_NO_PRESENCE] = {
                 .type = HDA_FIXUP_PINS,
@@ -12137 +13580 @@
                 .v.func = alc662_fixup_usi_headset_mic,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC662_FIXUP_USI_HEADSET_MODE] = {
                 .type = HDA_FIXUP_PINS,
@@ -12157 +13600 @@
                 .v.func = alc662_fixup_aspire_ethos_hp,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC669_FIXUP_ACER_ASPIRE_ETHOS] = {
                 .type = HDA_FIXUP_PINS,
@@ -12174 +13617 @@
                 .v.func = alc671_fixup_hp_headset_mic2,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC662_FIXUP_ACER_X2660G_HEADSET_MODE] = {
                 .type = HDA_FIXUP_PINS,
@@ -12210 +13653 @@
                 .chain_id = ALC668_FIXUP_MIC_DET_COEF
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC668_FIXUP_MIC_DET_COEF] = {
                 .type = HDA_FIXUP_VERBS,
@@ -12224 +13667 @@
                 .v.func = alc897_fixup_lenovo_headset_mic,
         },
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         [ALC897_FIXUP_HEADSET_MIC_PIN] = {
                 .type = HDA_FIXUP_PINS,
@@ -12242 +13685 @@
         },
 #endif
+        [ALC897_FIXUP_LENOVO_HEADSET_MODE] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc897_fixup_lenovo_headset_mode,
+        },
+#ifdef NOT_USED
+        [ALC897_FIXUP_HEADSET_MIC_PIN2] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x1a, 0x01a11140 }, /* use as headset mic, without its own jack detect */
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC897_FIXUP_LENOVO_HEADSET_MODE
+        },
+        [ALC897_FIXUP_UNIS_H3C_X500S] = {
+                .type = HDA_FIXUP_VERBS,
+                .v.verbs = (const struct hda_verb[]) {
+                        { 0x14, AC_VERB_SET_EAPD_BTLENABLE, 0 },
+                        {}
+                },
+        },
+        [ALC897_FIXUP_HEADSET_MIC_PIN3] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x19, 0x03a11050 }, /* use as headset mic */
+                        { }
+                },
+        },
+#endif
 };
 
-static const struct snd_pci_quirk alc662_fixup_tbl[] = {
+static const struct hda_quirk alc662_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1019, 0x9087, "ECS", ALC662_FIXUP_ASUS_MODE2),
+        SND_PCI_QUIRK(0x1019, 0x9859, "JP-IK LEAP W502", ALC897_FIXUP_HEADSET_MIC_PIN3),
         SND_PCI_QUIRK(0x1025, 0x022f, "Acer Aspire One", ALC662_FIXUP_INV_DMIC),
         SND_PCI_QUIRK(0x1025, 0x0241, "Packard Bell DOTS", ALC662_FIXUP_INV_DMIC),
@@ -12267 +13740 @@
         SND_PCI_QUIRK(0x1028, 0x069f, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800),
+        SND_PCI_QUIRK(0x103c, 0x870c, "HP", ALC897_FIXUP_HP_HSMIC_VERB),
         SND_PCI_QUIRK(0x103c, 0x8719, "HP", ALC897_FIXUP_HP_HSMIC_VERB),
+        SND_PCI_QUIRK(0x103c, 0x872b, "HP", ALC897_FIXUP_HP_HSMIC_VERB),
         SND_PCI_QUIRK(0x103c, 0x873e, "HP", ALC671_FIXUP_HP_HEADSET_MIC2),
+        SND_PCI_QUIRK(0x103c, 0x8768, "HP Slim Desktop S01", ALC671_FIXUP_HP_HEADSET_MIC2),
         SND_PCI_QUIRK(0x103c, 0x877e, "HP 288 Pro G6", ALC671_FIXUP_HP_HEADSET_MIC2),
         SND_PCI_QUIRK(0x103c, 0x885f, "HP 288 Pro G8", ALC671_FIXUP_HP_HEADSET_MIC2),
@@ -12290 +13766 @@
         SND_PCI_QUIRK(0x17aa, 0x1036, "Lenovo P520", ALC662_FIXUP_LENOVO_MULTI_CODECS),
         SND_PCI_QUIRK(0x17aa, 0x1057, "Lenovo P360", ALC897_FIXUP_HEADSET_MIC_PIN),
+        SND_PCI_QUIRK(0x17aa, 0x1064, "Lenovo P3 Tower", ALC897_FIXUP_HEADSET_MIC_PIN),
         SND_PCI_QUIRK(0x17aa, 0x32ca, "Lenovo ThinkCentre M80", ALC897_FIXUP_HEADSET_MIC_PIN),
         SND_PCI_QUIRK(0x17aa, 0x32cb, "Lenovo ThinkCentre M70", ALC897_FIXUP_HEADSET_MIC_PIN),
         SND_PCI_QUIRK(0x17aa, 0x32cf, "Lenovo ThinkCentre M950", ALC897_FIXUP_HEADSET_MIC_PIN),
         SND_PCI_QUIRK(0x17aa, 0x32f7, "Lenovo ThinkCentre M90", ALC897_FIXUP_HEADSET_MIC_PIN),
+        SND_PCI_QUIRK(0x17aa, 0x3321, "Lenovo ThinkCentre M70 Gen4", ALC897_FIXUP_HEADSET_MIC_PIN),
+        SND_PCI_QUIRK(0x17aa, 0x331b, "Lenovo ThinkCentre M90 Gen4", ALC897_FIXUP_HEADSET_MIC_PIN),
+        SND_PCI_QUIRK(0x17aa, 0x3364, "Lenovo ThinkCentre M90 Gen5", ALC897_FIXUP_HEADSET_MIC_PIN),
+        SND_PCI_QUIRK(0x17aa, 0x3742, "Lenovo TianYi510Pro-14IOB", ALC897_FIXUP_HEADSET_MIC_PIN2),
         SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo Ideapad Y550P", ALC662_FIXUP_IDEAPAD),
         SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD),
@@ -12301 +13782 @@
         SND_PCI_QUIRK(0x1b35, 0x1234, "CZC ET26", ALC662_FIXUP_CZC_ET26),
         SND_PCI_QUIRK(0x1b35, 0x2206, "CZC P10T", ALC662_FIXUP_CZC_P10T),
+        SND_PCI_QUIRK(0x1c6c, 0x1239, "Compaq N14JP6-V2", ALC897_FIXUP_HP_HSMIC_VERB),
 
 #if 0
@@ -12395 +13877 @@
         {.id = ALC662_FIXUP_LENOVO_MULTI_CODECS, .name = "dual-codecs"},
         {.id = ALC669_FIXUP_ACER_ASPIRE_ETHOS, .name = "aspire-ethos"},
+        {.id = ALC897_FIXUP_UNIS_H3C_X500S, .name = "unis-h3c-x500s"},
         {0}
 };
 
 static const struct snd_hda_pin_quirk alc662_pin_fixup_tbl[] = {
-#ifdef TARGET_OS2xxx
+#ifdef NOT_USED
         SND_HDA_PIN_QUIRK(0x10ec0867, 0x1028, "Dell", ALC891_FIXUP_DELL_MIC_NO_PRESENCE,
                 {0x17, 0x02211010},
@@ -12510 +13993 @@
                 goto error;
 
-#ifndef TARGET_OS2
         if (!spec->gen.no_analog && spec->gen.beep_nid) {
                 switch (codec->core.vendor_id) {
@@ -12529 +14011 @@
                         goto error;
         }
-#endif
+
         snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);
 

GPL/trunk/alsa-kernel/pci/hda/patch_sigmatel.c

@@ -214 +214 @@
         /* beep widgets */
         hda_nid_t anabeep_nid;
+        bool beep_power_on;
 
         /* SPDIF-out mux */
@@ -1482 +1483 @@
 };
 
-static const struct snd_pci_quirk stac9200_fixup_tbl[] = {
+static const struct hda_quirk stac9200_fixup_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
@@ -1703 +1704 @@
 };
 
-static const struct snd_pci_quirk stac925x_fixup_tbl[] = {
+static const struct hda_quirk stac925x_fixup_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668, "DFI LanParty", STAC_REF),
@@ -1727 +1728 @@
 
 static const struct hda_pintbl ref92hd73xx_pin_configs[] = {
+        // Port A-H
         { 0x0a, 0x02214030 },
         { 0x0b, 0x02a19040 },
@@ -1735 +1737 @@
         { 0x10, 0x01014020 },
         { 0x11, 0x01014030 },
+        // CD in
         { 0x12, 0x02319040 },
+        // Digial Mic ins
         { 0x13, 0x90a000f0 },
         { 0x14, 0x90a000f0 },
+        // Digital outs
         { 0x22, 0x01452050 },
         { 0x23, 0x01452050 },
@@ -1778 +1783 @@
 
 static const struct hda_pintbl intel_dg45id_pin_configs[] = {
+        // Analog outputs
         { 0x0a, 0x02214230 },
         { 0x0b, 0x02A19240 },
@@ -1785 +1791 @@
         { 0x0f, 0x01011212 },
         { 0x10, 0x01016211 },
+        // Digital output
+        { 0x22, 0x01451380 },
+        { 0x23, 0x40f000f0 },
         {0}
 };
@@ -1984 +1993 @@
 };
 
-static const struct snd_pci_quirk stac92hd73xx_fixup_tbl[] = {
+static const struct hda_quirk stac92hd73xx_fixup_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
@@ -1990 +1999 @@
         SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,
                                 "DFI LanParty", STAC_92HD73XX_REF),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5001,
+                                "Intel DP45SG", STAC_92HD73XX_INTEL),
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5002,
                                 "Intel DG45ID", STAC_92HD73XX_INTEL),
@@ -2800 +2811 @@
 };
 
-static const struct snd_pci_quirk stac92hd83xxx_fixup_tbl[] = {
+static const struct hda_quirk stac92hd83xxx_fixup_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
@@ -3283 +3294 @@
 };
 
-static const struct snd_pci_quirk stac92hd71bxx_fixup_tbl[] = {
+static const struct hda_quirk stac92hd71bxx_fixup_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
@@ -3543 +3554 @@
 
 /* codec SSIDs for Intel Mac sharing the same PCI SSID 8384:7680 */
-static const struct snd_pci_quirk stac922x_intel_mac_fixup_tbl[] = {
+static const struct hda_quirk stac922x_intel_mac_fixup_tbl[] = {
         SND_PCI_QUIRK(0x0000, 0x0100, "Mac Mini", STAC_INTEL_MAC_V3),
         SND_PCI_QUIRK(0x106b, 0x0800, "Mac", STAC_INTEL_MAC_V1),
@@ -3687 +3698 @@
 };
 
-static const struct snd_pci_quirk stac922x_fixup_tbl[] = {
+static const struct hda_quirk stac922x_fixup_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
@@ -4050 +4061 @@
 };
 
-static const struct snd_pci_quirk stac927x_fixup_tbl[] = {
+static const struct hda_quirk stac927x_fixup_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
@@ -4260 +4271 @@
 };
 
-static const struct snd_pci_quirk stac9205_fixup_tbl[] = {
+static const struct hda_quirk stac9205_fixup_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
@@ -4348 +4359 @@
 };
 
-static const struct snd_pci_quirk stac92hd95_fixup_tbl[] = {
+static const struct hda_quirk stac92hd95_fixup_tbl[] = {
         SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1911, "HP Spectre 13", STAC_92HD95_HP_BASS),
         {0} /* terminator */
@@ -4413 +4424 @@
                         /* IDT/STAC codecs have linear beep tone parameter */
                         codec->beep->linear_tone = spec->linear_tone_beep;
+                        /* keep power up while beep is enabled */
+                        codec->beep->keep_power_at_enable = 1;
                         /* if no beep switch is available, make its own one */
                         caps = query_amp_caps(codec, nid, HDA_OUTPUT);
@@ -4545 +4558 @@
         return 0;
 }
+
+static int stac_check_power_status(struct hda_codec *codec, hda_nid_t nid)
+{
+#ifdef CONFIG_SND_HDA_INPUT_BEEP
+        struct sigmatel_spec *spec = codec->spec;
+#endif
+        int ret = snd_hda_gen_check_power_status(codec, nid);
+
+#ifdef CONFIG_SND_HDA_INPUT_BEEP
+        if (nid == spec->gen.beep_nid && codec->beep) {
+                if (codec->beep->enabled != spec->beep_power_on) {
+                        spec->beep_power_on = codec->beep->enabled;
+                        if (spec->beep_power_on)
+                                snd_hda_power_up_pm(codec);
+                        else
+                                snd_hda_power_down_pm(codec);
+                }
+                ret |= spec->beep_power_on;
+        }
+#endif
+        return ret;
+}
 #else
 #define stac_suspend            NULL
@@ -4557 +4592 @@
 #ifdef CONFIG_PM
         .suspend = stac_suspend,
+        .check_power_status = stac_check_power_status,
 #endif
 };
@@ -5101 +5137 @@
 };
 
-static const struct snd_pci_quirk stac9872_fixup_tbl[] = {
+static const struct hda_quirk stac9872_fixup_tbl[] = {
         SND_PCI_QUIRK_MASK(0x104d, 0xfff0, 0x81e0,
                            "Sony VAIO F/S", STAC_9872_VAIO),

GPL/trunk/alsa-kernel/pci/hda/patch_via.c

@@ -458 +458 @@
                 snd_hda_codec_set_pincfg(codec, nid, def_conf);
         }
-
-        return;
 }
 
@@ -830 +828 @@
         nums = snd_hda_get_connections(codec, spec->gen.mixer_nid, conn,
                                        ARRAY_SIZE(conn) - 1);
+        if (nums < 0)
+                return nums;
+
         for (i = 0; i < nums; i++) {
                 if (get_wcaps_type(get_wcaps(codec, conn[i])) == AC_WID_AUD_OUT)
@@ -1062 +1063 @@
 };
 
-static const struct snd_pci_quirk vt2002p_fixups[] = {
+static const struct hda_quirk vt2002p_fixups[] = {
         SND_PCI_QUIRK(0x1043, 0x13f7, "Asus B23E", VIA_FIXUP_POWER_SAVE),
         SND_PCI_QUIRK(0x1043, 0x1487, "Asus G75", VIA_FIXUP_ASUS_G75),