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

Timestamp:

Apr 21, 2025, 7:17:25 PM (7 months ago)

Author:

David Azarewicz

Message:

Merge from uniaud32-exp branch

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/hda/Makefile (modified) (1 diff)
• alsa-kernel/pci/hda/hda_beep.h (modified) (1 diff)
• alsa-kernel/pci/hda/hda_codec.c (modified) (20 diffs)
• alsa-kernel/pci/hda/hda_component.c (copied) (copied from GPL/branches/uniaud32-exp/alsa-kernel/pci/hda/hda_component.c ) (1 diff)
• alsa-kernel/pci/hda/hda_component2.h (modified) (2 diffs)
• alsa-kernel/pci/hda/hda_controller.c (modified) (14 diffs)
• alsa-kernel/pci/hda/hda_controller.h (modified) (1 diff)
• alsa-kernel/pci/hda/hda_eld.c (modified) (1 diff)
• alsa-kernel/pci/hda/hda_generic.c (modified) (4 diffs)
• alsa-kernel/pci/hda/hda_generic.h (modified) (2 diffs)
• alsa-kernel/pci/hda/hda_intel.c (modified) (26 diffs)
• alsa-kernel/pci/hda/hda_intel.h (modified) (1 diff)
• alsa-kernel/pci/hda/hda_intel_trace.h (modified) (2 diffs)
• alsa-kernel/pci/hda/hda_sysfs.c (modified) (3 diffs)
• alsa-kernel/pci/hda/patch_analog.c (modified) (3 diffs)
• alsa-kernel/pci/hda/patch_ca0132.c (modified) (11 diffs)
• alsa-kernel/pci/hda/patch_cirrus.c (modified) (3 diffs)
• alsa-kernel/pci/hda/patch_cmedia.c (modified) (3 diffs)
• alsa-kernel/pci/hda/patch_conexant.c (modified) (13 diffs)
• alsa-kernel/pci/hda/patch_hdmi.c (modified) (13 diffs)
• alsa-kernel/pci/hda/patch_realtek.c (modified) (72 diffs)
• alsa-kernel/pci/hda/patch_sigmatel.c (modified) (4 diffs)
• alsa-kernel/pci/hda/patch_via.c (modified) (4 diffs)

GPL/trunk/alsa-kernel/pci/hda/Makefile

@@ -12 +12 @@
 #
 #===================================================================
-FILES = hda_intel.obj hda_codec.obj hda_controller.obj hda_auto_parser.obj hda_jack.obj &
-  hda_proc.obj hda_generic.obj hda_hwdep.obj hda_sysfs.obj hda_bind.obj hda_eld.obj &
-  patch_analog.obj patch_cmedia.obj patch_conexant.obj patch_ca0110.obj patch_ca0132.obj patch_cirrus.obj &
-  patch_hdmi.obj patch_realtek.obj patch_si3054.obj patch_sigmatel.obj patch_via.obj
+FILES = hda_intel.obj hda_codec.obj hda_controller.obj hda_auto_parser.obj &
+  hda_jack.obj hda_proc.obj hda_generic.obj hda_hwdep.obj hda_sysfs.obj  &
+  hda_bind.obj hda_eld.obj hda_component.obj patch_analog.obj &
+  patch_cmedia.obj patch_conexant.obj patch_ca0110.obj patch_ca0132.obj &
+  patch_cirrus.obj patch_hdmi.obj patch_realtek.obj patch_si3054.obj &
+  patch_sigmatel.obj patch_via.obj
 
 TARGET = hda

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

@@ -28 +28 @@
         unsigned int keep_power_at_enable:1;    /* set by driver */
         struct work_struct beep_work; /* scheduled task for beep event */
-        struct mutex mutex;
         void (*power_hook)(struct hda_beep *beep, bool on);
 };

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

@@ -89 +89 @@
         int len;
         hda_nid_t nid;
-        hda_nid_t conns[];
+        hda_nid_t conns[] __counted_by(len);
 };
 
@@ -625 +625 @@
 EXPORT_SYMBOL_GPL(snd_hda_shutup_pins);
 
-#ifdef CONFIG_PM
 /* Restore the pin controls cleared previously via snd_hda_shutup_pins() */
 static void restore_shutup_pins(struct hda_codec *codec)
@@ -643 +642 @@
         codec->pins_shutup = 0;
 }
-#endif
 
 static void hda_jackpoll_work(struct work_struct *work)
@@ -1014 +1012 @@
         codec->addr = codec_addr;
 
-#ifdef CONFIG_PM
         codec->power_jiffies = jiffies;
-#endif
 
         snd_hda_sysfs_init(codec);
@@ -1251 +1247 @@
 }
 
-#ifdef CONFIG_PM
 /* clean up all streams; called from suspend */
 static void hda_cleanup_all_streams(struct hda_codec *codec)
@@ -1263 +1258 @@
         }
 }
-#endif
 
 /*
@@ -1515 +1509 @@
         maxval = get_amp_max_value(codec, nid, dir, 0);
         if (val > maxval)
-                val = maxval;
+                return -EINVAL;
         return snd_hda_codec_amp_update(codec, nid, ch, dir, idx,
                                         HDA_AMP_VOLMASK, val);
@@ -1566 +1560 @@
         long *valp = ucontrol->value.integer.value;
         int change = 0;
+        int err;
 
         if (chs & 1) {
-                change = update_amp_value(codec, nid, 0, dir, idx, ofs, *valp);
+                err = update_amp_value(codec, nid, 0, dir, idx, ofs, *valp);
+                if (err < 0)
+                        return err;
+                change |= err;
                 valp++;
         }
-        if (chs & 2)
-                change |= update_amp_value(codec, nid, 1, dir, idx, ofs, *valp);
+        if (chs & 2) {
+                err = update_amp_value(codec, nid, 1, dir, idx, ofs, *valp);
+                if (err < 0)
+                        return err;
+                change |= err;
+        }
         return change;
 }
@@ -1745 +1747 @@
  * snd_hda_add_nid - Assign a NID to a control element
  * @codec: HD-audio codec
- * @nid: corresponding NID (optional)
  * @kctl: the control element to assign
  * @index: index to kctl
+ * @nid: corresponding NID (optional)
  *
  * Add the given control element to an array inside the codec instance.
@@ -2174 +2176 @@
 
         if (chs & 1) {
+                if (*valp < 0 || *valp > 1)
+                        return -EINVAL;
                 change = snd_hda_codec_amp_update(codec, nid, 0, dir, idx,
                                                   HDA_AMP_MUTE,
@@ -2179 +2183 @@
                 valp++;
         }
-        if (chs & 2)
+        if (chs & 2) {
+                if (*valp < 0 || *valp > 1)
+                        return -EINVAL;
                 change |= snd_hda_codec_amp_update(codec, nid, 1, dir, idx,
                                                    HDA_AMP_MUTE,
                                                    *valp ? 0 : HDA_AMP_MUTE);
+        }
         hda_call_check_power_status(codec, nid);
         return change;
@@ -2878 +2885 @@
 #endif
 
-#ifdef CONFIG_PM
 /* update the power on/off account with the current jiffies */
 static void update_power_acct(struct hda_codec *codec, bool on)
@@ -2986 +2992 @@
 }
 
-#endif /* CONFIG_PM */
-
-#ifdef CONFIG_PM_SLEEP
 static int hda_codec_pm_prepare(struct device *dev)
 {
@@ -3045 +3048 @@
         return pm_runtime_force_resume(dev);
 }
-#endif /* CONFIG_PM_SLEEP */
 
 /* referred in hda_bind.c */
 const struct dev_pm_ops hda_codec_driver_pm = {
-#ifdef CONFIG_PM_SLEEP
-        .prepare = hda_codec_pm_prepare,
-        .complete = hda_codec_pm_complete,
-        .suspend = hda_codec_pm_suspend,
-        .resume = hda_codec_pm_resume,
-        .freeze = hda_codec_pm_freeze,
-        .thaw = hda_codec_pm_thaw,
-        .poweroff = hda_codec_pm_suspend,
-        .restore = hda_codec_pm_restore,
-#endif /* CONFIG_PM_SLEEP */
-        SET_RUNTIME_PM_OPS(hda_codec_runtime_suspend, hda_codec_runtime_resume,
-                           NULL)
+        .prepare = pm_sleep_ptr(hda_codec_pm_prepare),
+        .complete = pm_sleep_ptr(hda_codec_pm_complete),
+        .suspend = pm_sleep_ptr(hda_codec_pm_suspend),
+        .resume = pm_sleep_ptr(hda_codec_pm_resume),
+        .freeze = pm_sleep_ptr(hda_codec_pm_freeze),
+        .thaw = pm_sleep_ptr(hda_codec_pm_thaw),
+        .poweroff = pm_sleep_ptr(hda_codec_pm_suspend),
+        .restore = pm_sleep_ptr(hda_codec_pm_restore),
+        .runtime_suspend = pm_ptr(hda_codec_runtime_suspend),
+        .runtime_resume = pm_ptr(hda_codec_runtime_resume),
 };
 
@@ -3185 +3185 @@
                                 info->rates ? NULL : &info->rates,
                                 info->formats ? NULL : &info->formats,
+                                info->subformats ? NULL : &info->subformats,
                                 info->maxbps ? NULL : &info->maxbps);
                 if (err < 0){
@@ -3335 +3336 @@
                 int stream;
 
-                for (stream = 0; stream < 2; stream++) {
+                for_each_pcm_streams(stream) {
                         struct hda_pcm_stream *info = &cpcm->stream[stream];
 
@@ -3447 +3448 @@
 EXPORT_SYMBOL_GPL(snd_hda_add_new_ctls);
 
-#ifdef CONFIG_PM
 /**
  * snd_hda_codec_set_power_save - Configure codec's runtime PM
@@ -3538 +3538 @@
 }
 EXPORT_SYMBOL_GPL(snd_hda_check_amp_list_power);
-#endif
 
 /*
@@ -3780 +3779 @@
                                                     &mout->spdif_rates,
                                                     &mout->spdif_formats,
+                                                    NULL,
                                                     &mout->spdif_maxbps);
                 }
@@ -4083 +4083 @@
                         cancel_delayed_work_sync(&codec->jackpoll_work);
 #endif
-#ifdef CONFIG_PM
                 if (hda_codec_is_power_on(codec)) {
                         hda_call_codec_suspend(codec);
                         hda_call_codec_resume(codec);
                 }
-#endif
         }
 }

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

@@ -14 +14 @@
 #include "hda_component2.h"
 #include "hda_local.h"
+#include <ctype.h>
 
 #ifdef CONFIG_ACPI

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

@@ -7 +7 @@
  */
 
+#ifndef __HDA_COMPONENT_H__
+#define __HDA_COMPONENT_H__
+
+#include <linux/acpi.h>
 #include <linux/component.h>
+#include <linux/mutex.h>
+#include <sound/hda_codec.h>
 
 #define HDA_MAX_COMPONENTS      4
@@ -15 +21 @@
         struct device *dev;
         char name[HDA_MAX_NAME_SIZE];
-        struct hda_codec *codec;
+        struct acpi_device *adev;
+        bool acpi_notifications_supported;
+//      void (*acpi_notify)(acpi_handle handle, u32 event, struct device *dev);
         void (*pre_playback_hook)(struct device *dev, int action);
         void (*playback_hook)(struct device *dev, int action);
         void (*post_playback_hook)(struct device *dev, int action);
 };
+
+struct hda_component_parent {
+        struct mutex mutex;
+        struct hda_codec *codec;
+        struct hda_component comps[HDA_MAX_COMPONENTS];
+};
+
+#ifdef CONFIG_ACPI
+void hda_component_acpi_device_notify(struct hda_component_parent *parent,
+                                      acpi_handle handle, u32 event, void *data);
+int hda_component_manager_bind_acpi_notifications(struct hda_codec *cdc,
+                                                  struct hda_component_parent *parent,
+                                                  acpi_notify_handler handler, void *data);
+void hda_component_manager_unbind_acpi_notifications(struct hda_codec *cdc,
+                                                     struct hda_component_parent *parent,
+                                                     acpi_notify_handler handler);
+#else
+static inline void hda_component_acpi_device_notify(struct hda_component_parent *parent,
+                                                    acpi_handle handle,
+                                                    u32 event,
+                                                    void *data)
+{
+}
+
+static inline int hda_component_manager_bind_acpi_notifications(struct hda_codec *cdc,
+                                                                struct hda_component_parent *parent,
+                                                                acpi_notify_handler handler,
+                                                                void *data)
+
+{
+        return 0;
+}
+
+static inline void hda_component_manager_unbind_acpi_notifications(struct hda_codec *cdc,
+                                                                   struct hda_component_parent *parent,
+                                                                   acpi_notify_handler handler)
+{
+}
+#endif /* ifdef CONFIG_ACPI */
+
+void hda_component_manager_playback_hook(struct hda_component_parent *parent, int action);
+
+int hda_component_manager_init(struct hda_codec *cdc,
+                               struct hda_component_parent *parent, int count,
+                               const char *bus, const char *hid,
+                               const char *match_str,
+                               const struct component_master_ops *ops);
+
+void hda_component_manager_free(struct hda_component_parent *parent,
+                                const struct component_master_ops *ops);
+
+int hda_component_manager_bind(struct hda_codec *cdc, struct hda_component_parent *parent);
+
+static inline struct hda_component *hda_component_from_index(struct hda_component_parent *parent,
+                                                             int index)
+{
+        if (!parent)
+                return NULL;
+
+        if (index < 0 || index >= ARRAY_SIZE(parent->comps))
+                return NULL;
+
+        return &parent->comps[index];
+}
+
+static inline void hda_component_manager_unbind(struct hda_codec *cdc,
+                                                struct hda_component_parent *parent)
+{
+        mutex_lock(&parent->mutex);
+        component_unbind_all(hda_codec_dev(cdc), parent);
+        mutex_unlock(&parent->mutex);
+}
+
+#endif /* ifndef __HDA_COMPONENT_H__ */

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

@@ -4 +4 @@
  *  Implementation of primary alsa driver code base for Intel HD Audio.
  *
- *  Copyright(c) 2004 Intel Corporation. All rights reserved.
+ *  Copyright(c) 2004 Intel Corporation
  *
  *  Copyright (c) 2004 Takashi Iwai <tiwai@suse.de>
@@ -25 +25 @@
 #include <sound/core.h>
 #include <sound/initval.h>
+#include <sound/pcm_params.h>
 #include "hda_controller.h"
 #include "hda_local.h"
@@ -117 +118 @@
         //NOT_USED struct azx *chip = apcm->chip;
         struct azx_dev *azx_dev = get_azx_dev(substream);
+        struct hdac_stream *hdas = azx_stream(azx_dev);
         int ret = 0;
 
@@ -126 +128 @@
         }
 
-        azx_dev->core.bufsize = 0;
-        azx_dev->core.period_bytes = 0;
-        azx_dev->core.format_val = 0;
+        /* Set up BDLEs here, return -ENOMEM if too many BDLEs are required */
+        hdas->bufsize = params_buffer_bytes(hw_params);
+        hdas->period_bytes = params_period_bytes(hw_params);
+        hdas->format_val = 0;
+        hdas->no_period_wakeup =
+                (hw_params->info & SNDRV_PCM_INFO_NO_PERIOD_WAKEUP) &&
+                (hw_params->flags & SNDRV_PCM_HW_PARAMS_NO_PERIOD_WAKEUP);
+        if (snd_hdac_stream_setup_periods(hdas) < 0)
+                ret = -ENOMEM;
 
 unlock:
@@ -160 +168 @@
         struct hda_pcm_stream *hinfo = to_hda_pcm_stream(substream);
         struct snd_pcm_runtime *runtime = substream->runtime;
-        unsigned int format_val, stream_tag;
+        unsigned int format_val, stream_tag, bits;
         int err;
         struct hda_spdif_out *spdif =
@@ -174 +182 @@
 
         snd_hdac_stream_reset(azx_stream(azx_dev));
-        format_val = snd_hdac_calc_stream_format(runtime->rate,
-                                                runtime->channels,
-                                                runtime->format,
-                                                hinfo->maxbps,
-                                                ctls);
+        bits = snd_hdac_stream_format_bits(runtime->format, SNDRV_PCM_SUBFORMAT_STD, hinfo->maxbps);
+
+        format_val = snd_hdac_spdif_stream_format(runtime->channels, bits, runtime->rate, ctls);
         if (!format_val) {
                 dev_err(chip->card->dev,
@@ -191 +197 @@
                 goto unlock;
 
-        snd_hdac_stream_setup(azx_stream(azx_dev));
+        snd_hdac_stream_setup(azx_stream(azx_dev), false);
 
         stream_tag = azx_dev->core.stream_tag;
@@ -280 +286 @@
         /* reset SYNC bits */
         snd_hdac_stream_sync_trigger(hstr, false, sbits, sync_reg);
-        if (start)
-                snd_hdac_stream_timecounter_init(hstr, sbits);
+        snd_hdac_stream_timecounter_init(hstr, sbits, start);
         spin_unlock(&bus->reg_lock);
         return 0;
@@ -470 +475 @@
                                ((HDA_MAX_CYCLE_VALUE + 1) * runtime->rate));
 
-        *system = convert_art_to_tsc(tsc_counter);
+        system->cycles = tsc_counter;
+        system->cs_id = CSID_X86_ART;
 
         return 0;
@@ -933 +939 @@
         if (chip->disabled)
                 return 0;
-        if (chip->single_cmd)
+        if (chip->single_cmd || bus->use_pio_for_commands)
                 return azx_single_send_cmd(bus, val);
         else
@@ -947 +953 @@
         if (chip->disabled)
                 return 0;
-        if (chip->single_cmd)
+        if (chip->single_cmd || bus->use_pio_for_commands)
                 return azx_single_get_response(bus, addr, res);
         else
@@ -1094 +1100 @@
         int repeat = 0; /* count for avoiding endless loop */
 
-#ifdef CONFIG_PM
         if (azx_has_pm_runtime(chip))
                 if (!pm_runtime_active(chip->card->dev))
                         return IRQ_NONE;
-#endif
 
         spin_lock(&bus->reg_lock);
@@ -1212 +1216 @@
                 bus->core.align_bdle_4k = true;
 
+        if (chip->driver_caps & AZX_DCAPS_PIO_COMMANDS)
+                bus->core.use_pio_for_commands = true;
+
         /* enable sync_write flag for stable communication as default */
         bus->core.sync_write = 1;
@@ -1239 +1246 @@
                                          "Codec #%d probe error; disabling it...\n", c);
                                 bus->codec_mask &= ~(1 << c);
+                                /* no codecs */
+                                if (bus->codec_mask == 0)
+                                        break;
                                 /* More badly, accessing to a non-existing
                                  * codec often screws up the controller chip,

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

@@ -46 +46 @@
 #define AZX_DCAPS_NO_MSI64      (1 << 29)       /* Stick to 32-bit MSIs */
 #define AZX_DCAPS_SEPARATE_STREAM_TAG   (1 << 30) /* capture and playback use separate stream tag */
+#define AZX_DCAPS_PIO_COMMANDS (1 << 31)        /* Use PIO instead of CORB for commands */
 
 enum {

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

@@ -13 +13 @@
 #include <linux/slab.h>
 #include <sound/core.h>
-#include <asm/unaligned.h>
+#include <linux/unaligned.h>
 #include <sound/hda_chmap.h>
 #include <sound/hda_codec.h>

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

@@ -3958 +3958 @@
         cdev->default_trigger = micmute ? "audio-micmute" : "audio-mute";
         cdev->brightness_set_blocking = callback;
-        cdev->brightness = ledtrig_audio_get(idx);
         cdev->flags = LED_CORE_SUSPENDRESUME;
 
@@ -6097 +6096 @@
 EXPORT_SYMBOL_GPL(snd_hda_gen_free);
 
-#ifdef CONFIG_PM
 /**
  * snd_hda_gen_check_power_status - check the loopback power save state
@@ -6111 +6109 @@
 }
 EXPORT_SYMBOL_GPL(snd_hda_gen_check_power_status);
-#endif
 
 
@@ -6124 +6121 @@
         .free = snd_hda_gen_free,
         .unsol_event = snd_hda_jack_unsol_event,
-#ifdef CONFIG_PM
         .check_power_status = snd_hda_gen_check_power_status,
-#endif
 };
 

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

@@ -233 +233 @@
         unsigned int dac_min_mute:1; /* minimal = mute for DACs */
         unsigned int suppress_vmaster:1; /* don't create vmaster kctls */
-        unsigned int obey_preferred_dacs:1; /* obey preferred_dacs assignment */
 
         /* other internal flags */
@@ -341 +340 @@
 void snd_hda_gen_update_outputs(struct hda_codec *codec);
 
-#ifdef CONFIG_PM
 int snd_hda_gen_check_power_status(struct hda_codec *codec, hda_nid_t nid);
-#endif
 unsigned int snd_hda_gen_path_power_filter(struct hda_codec *codec,
                                            hda_nid_t nid,

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

@@ -5 +5 @@
  *                for Intel HD Audio.
  *
- *  Copyright(c) 2004 Intel Corporation. All rights reserved.
+ *  Copyright(c) 2004 Intel Corporation
  *
  *  Copyright (c) 2004 Takashi Iwai <tiwai@suse.de>
@@ -198 +198 @@
                  "(in second, 0 = disable).");
 
-static bool pm_blacklist = true;
-module_param(pm_blacklist, bool, 0644);
+static int pm_blacklist = -1;
+module_param(pm_blacklist, bint, 0644);
 MODULE_PARM_DESC(pm_blacklist, "Enable power-management denylist");
 
@@ -209 +209 @@
 module_param(power_save_controller, bool, 0644);
 MODULE_PARM_DESC(power_save_controller, "Reset controller in power save mode.");
-#else
+#else /* CONFIG_PM */
 #define power_save      0
+#define pm_blacklist    0
+#define power_save_controller   false
 #endif /* CONFIG_PM */
 
@@ -312 +314 @@
 #define AZX_DCAPS_INTEL_BROXTON         AZX_DCAPS_INTEL_SKYLAKE
 
+#define AZX_DCAPS_INTEL_LNL \
+        (AZX_DCAPS_INTEL_SKYLAKE | AZX_DCAPS_PIO_COMMANDS)
+
 /* quirks for ATI SB / AMD Hudson */
 #define AZX_DCAPS_PRESET_ATI_SB \
@@ -839 +844 @@
         mod_dma_pos %= azx_dev->core.period_bytes;
 
-        fifo_size = azx_stream(azx_dev)->fifo_size - 1;
+        fifo_size = azx_stream(azx_dev)->fifo_size;
 
         if (azx_dev->insufficient) {
@@ -923 +928 @@
 }
 
-#ifdef CONFIG_PM
 static DEFINE_MUTEX(card_list_lock);
 static LIST_HEAD(card_list);
@@ -950 +954 @@
 #ifdef NOT_USED
 /* trigger power-save check at writing parameter */
-static int param_set_xint(const char *val, const struct kernel_param *kp)
+static int __maybe_unused param_set_xint(const char *val, const struct kernel_param *kp)
 {
         struct hda_intel *hda;
@@ -960 +964 @@
                 return ret;
 
+        if (pm_blacklist > 0)
+                return 0;
+
         mutex_lock(&card_list_lock);
         list_for_each_entry(hda, &card_list, list, struct hda_intel) {
                 chip = &hda->chip;
-                if (!hda->probe_continued || chip->disabled)
+                if (!hda->probe_continued || chip->disabled ||
+                    hda->runtime_pm_disabled)
                         continue;
                 snd_hda_set_power_save(&chip->bus, power_save * 1000);
@@ -1022 +1030 @@
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int azx_prepare(struct device *dev)
 {
@@ -1081 +1088 @@
 }
 
-static int azx_resume(struct device *dev)
+static int __maybe_unused azx_resume(struct device *dev)
 {
         struct snd_card *card = dev_get_drvdata(dev);
@@ -1132 +1139 @@
         return 0;
 }
-#endif /* CONFIG_PM_SLEEP */
 
 #ifdef NOT_USED
-static int azx_runtime_suspend(struct device *dev)
+static int __maybe_unused azx_runtime_suspend(struct device *dev)
 {
         struct snd_card *card = dev_get_drvdata(dev);
@@ -1152 +1158 @@
 }
 
-static int azx_runtime_resume(struct device *dev)
+static int __maybe_unused azx_runtime_resume(struct device *dev)
 {
         struct snd_card *card = dev_get_drvdata(dev);
@@ -1169 +1175 @@
 }
 
-static int azx_runtime_idle(struct device *dev)
+static int __maybe_unused azx_runtime_idle(struct device *dev)
 {
         struct snd_card *card = dev_get_drvdata(dev);
@@ -1196 +1202 @@
 
 static const struct dev_pm_ops azx_pm = {
-        SET_SYSTEM_SLEEP_PM_OPS(azx_suspend, azx_resume)
-#ifdef CONFIG_PM_SLEEP
-        .prepare = azx_prepare,
-        .complete = azx_complete,
-        .freeze_noirq = azx_freeze_noirq,
-        .thaw_noirq = azx_thaw_noirq,
-#endif
+        SYSTEM_SLEEP_PM_OPS(azx_suspend, azx_resume)
+        .prepare = pm_sleep_ptr(azx_prepare),
+        .complete = pm_sleep_ptr(azx_complete),
+        .freeze_noirq = pm_sleep_ptr(azx_freeze_noirq),
+        .thaw_noirq = pm_sleep_ptr(azx_thaw_noirq),
 #ifdef CONFIG_PM_RUNTIME
         SET_RUNTIME_PM_OPS(azx_runtime_suspend, azx_runtime_resume, azx_runtime_idle)
 #endif
 };
-
-#define AZX_PM_OPS      &azx_pm
-#else
-#define azx_add_card_list(chip) /* NOP */
-#define azx_del_card_list(chip) /* NOP */
-#define AZX_PM_OPS      NULL
-#endif /* CONFIG_PM */
 
 
@@ -1458 +1455 @@
         acpi_status status;
 
-        while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {
-                dhandle = ACPI_HANDLE(&pdev->dev);
-                if (dhandle) {
-                        status = acpi_get_handle(dhandle, "ATPX", &atpx_handle);
-                        if (ACPI_SUCCESS(status)) {
-                                pci_dev_put(pdev);
-                                return true;
-                        }
-                }
-        }
-        while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_OTHER << 8, pdev)) != NULL) {
+        while ((pdev = pci_get_base_class(PCI_BASE_CLASS_DISPLAY, pdev))) {
+                if ((pdev->class != PCI_CLASS_DISPLAY_VGA << 8) &&
+                    (pdev->class != PCI_CLASS_DISPLAY_OTHER << 8))
+                        continue;
+
                 dhandle = ACPI_HANDLE(&pdev->dev);
                 if (dhandle) {
@@ -1863 +1854 @@
         /* use the non-cached pages in non-snoop mode */
         if (!azx_snoop(chip))
-                azx_bus(chip)->dma_type = SNDRV_DMA_TYPE_DEV_WC_SG;
+                azx_bus(chip)->dma_type = SNDRV_DMA_TYPE_DEV_WC;
 
         if (chip->driver_type == AZX_DRIVER_NVIDIA) {
@@ -2116 +2107 @@
         { PCI_DEVICE_SUB(0x1022, 0x1487, 0x1462, 0xcb59) }, /* MSI TRX40 Creator */
         { PCI_DEVICE_SUB(0x1022, 0x1487, 0x1462, 0xcb60) }, /* MSI TRX40 */
+        { PCI_DEVICE_SUB(0x1022, 0x15e3, 0x1022, 0xd601) }, /* ASRock X670E Taichi */
         {0}
 };
@@ -2188 +2180 @@
         pci_set_drvdata(pci, card);
 
+#ifdef CONFIG_SND_HDA_I915
+        /* bind with i915 if needed */
+        if (chip->driver_caps & AZX_DCAPS_I915_COMPONENT) {
+                err = snd_hdac_i915_init(azx_bus(chip));
+                if (err < 0) {
+                        if (err == -EPROBE_DEFER)
+                                goto out_free;
+
+                        /* if the controller is bound only with HDMI/DP
+                         * (for HSW and BDW), we need to abort the probe;
+                         * for other chips, still continue probing as other
+                         * codecs can be on the same link.
+                         */
+                        if (HDA_CONTROLLER_IN_GPU(pci)) {
+                                dev_err_probe(card->dev, err,
+                                             "HSW/BDW HD-audio HDMI/DP requires binding with gfx driver\n");
+
+                                goto out_free;
+                        } else {
+                                /* don't bother any longer */
+                                chip->driver_caps &= ~AZX_DCAPS_I915_COMPONENT;
+                        }
+                }
+
+                /* HSW/BDW controllers need this power */
+                if (HDA_CONTROLLER_IN_GPU(pci))
+                        hda->need_i915_power = true;
+        }
+#else
+        if (HDA_CONTROLLER_IN_GPU(pci))
+                dev_err(card->dev, "Haswell/Broadwell HDMI/DP must build in CONFIG_SND_HDA_I915\n");
+#endif
+
         err = register_vga_switcheroo(chip);
         if (err < 0) {
@@ -2215 +2240 @@
 #endif /* CONFIG_SND_HDA_PATCH_LOADER */
 
-#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
-
 #ifdef TARGET_OS2 // modified code from 3.13 otherwise we don't detect hardware. Is schedule_work a stub?
         if (schedule_probe) {
@@ -2237 +2257 @@
 
 out_free:
+        pci_set_drvdata(pci, NULL);
         snd_card_free(card);
         return err;
 }
 
-#ifdef CONFIG_PM
 /* On some boards setting power_save to a non 0 value leads to clicking /
  * popping sounds when ever we enter/leave powersaving mode. Ideally we would
@@ -2285 +2305 @@
         {0}
 };
-#endif /* CONFIG_PM */
 
 static void set_default_power_save(struct azx *chip)
 {
+        struct hda_intel *hda = container_of(chip, struct hda_intel, chip);
         int val = power_save;
 
-#ifdef CONFIG_PM
-        if (pm_blacklist) {
+        if (pm_blacklist < 0) {
                 const struct snd_pci_quirk *q;
 
@@ -2300 +2319 @@
                                  q->subvendor, q->subdevice);
                         val = 0;
+                        hda->runtime_pm_disabled = 1;
                 }
-        }
-#endif /* CONFIG_PM */
+        } else if (pm_blacklist > 0) {
+                dev_info(chip->card->dev, "Forcing power_save to 0 via option\n");
+                val = 0;
+        }
         snd_hda_set_power_save(&chip->bus, val * 1000);
 }
@@ -2327 +2349 @@
         to_hda_bus(bus)->bus_probing = 1;
         hda->probe_continued = 1;
-
-        /* bind with i915 if needed */
-        if (chip->driver_caps & AZX_DCAPS_I915_COMPONENT) {
-                err = snd_hdac_i915_init(bus);
-                if (err < 0) {
-                        /* if the controller is bound only with HDMI/DP
-                         * (for HSW and BDW), we need to abort the probe;
-                         * for other chips, still continue probing as other
-                         * codecs can be on the same link.
-                         */
-                        if (HDA_CONTROLLER_IN_GPU(pci)) {
-                                dev_err(chip->card->dev,
-                                        "HSW/BDW HD-audio HDMI/DP requires binding with gfx driver\n");
-                                goto out_free;
-                        } else {
-                                /* don't bother any longer */
-                                chip->driver_caps &= ~AZX_DCAPS_I915_COMPONENT;
-                        }
-                }
-
-                /* HSW/BDW controllers need this power */
-                if (HDA_CONTROLLER_IN_GPU(pci))
-                        hda->need_i915_power = true;
-        }
 
         /* Request display power well for the HDA controller or codec. For
@@ -2382 +2380 @@
                 if (err < 0)
                         goto out_free;
-#ifndef CONFIG_PM
-                release_firmware(chip->fw); /* no longer needed */
-                chip->fw = NULL;
-#endif
         }
 #endif
@@ -2563 +2557 @@
         { 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) },
+        /* Battlemage */
+        { PCI_DEVICE_DATA(INTEL, HDA_BMG, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
         /* Lunarlake-P */
-        { PCI_DEVICE_DATA(INTEL, HDA_LNL_P, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+        { PCI_DEVICE_DATA(INTEL, HDA_LNL_P, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_LNL) },
         /* 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) },
+        /* Panther Lake */
+        { PCI_DEVICE_DATA(INTEL, HDA_PTL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_LNL) },
+        /* Panther Lake-H */
+        { PCI_DEVICE_DATA(INTEL, HDA_PTL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_LNL) },
         /* Apollolake (Broxton-P) */
         { PCI_DEVICE_DATA(INTEL, HDA_APL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },
@@ -2826 +2826 @@
         .shutdown = azx_shutdown,
         .driver = {
-                .pm = AZX_PM_OPS,
+                .pm = &azx_pm,
         },
 };

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

@@ -23 +23 @@
         unsigned int irq_pending_warned:1;
         unsigned int probe_continued:1;
+        unsigned int runtime_pm_disabled:1;
 
         /* vga_switcheroo setup */

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

@@ -35 +35 @@
 );
 
-#ifdef CONFIG_PM
 DEFINE_EVENT(hda_pm, azx_runtime_suspend,
         TP_PROTO(struct azx *chip),
@@ -45 +44 @@
         TP_ARGS(chip)
 );
-#endif
 
 #endif /* _TRACE_HDA_INTEL_H */

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

@@ -30 +30 @@
 };
 
-#ifdef CONFIG_PM
 static ssize_t power_on_acct_show(struct device *dev,
                                   struct device_attribute *attr,
@@ -51 +50 @@
 static DEVICE_ATTR_RO(power_on_acct);
 static DEVICE_ATTR_RO(power_off_acct);
-#endif /* CONFIG_PM */
 
 #define CODEC_INFO_SHOW(type, field)                            \
@@ -749 +747 @@
         &dev_attr_init_pin_configs.attr,
         &dev_attr_driver_pin_configs.attr,
-#ifdef CONFIG_PM
         &dev_attr_power_on_acct.attr,
         &dev_attr_power_off_acct.attr,
-#endif
 #ifdef CONFIG_SND_HDA_RECONFIG
         &dev_attr_init_verbs.attr,

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

@@ -76 +76 @@
 #endif
 
-#ifdef CONFIG_PM
 static void ad198x_power_eapd_write(struct hda_codec *codec, hda_nid_t front,
                                 hda_nid_t hp)
@@ -122 +121 @@
         return 0;
 }
-#endif
 
 /* follow EAPD via vmaster hook */
@@ -162 +160 @@
         .free = snd_hda_gen_free,
         .unsol_event = snd_hda_jack_unsol_event,
-#ifdef CONFIG_PM
         .check_power_status = snd_hda_gen_check_power_status,
         .suspend = ad198x_suspend,
-#endif
 };
 

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

@@ -3040 +3040 @@
         unsigned int format_val;
 
-        format_val = snd_hdac_calc_stream_format(sample_rate,
-                                channels, SNDRV_PCM_FORMAT_S32_LE, 32, 0);
+        format_val = snd_hdac_stream_format(channels, 32, sample_rate);
 
         if (hda_format)
@@ -3634 +3633 @@
 static bool dspload_wait_loaded(struct hda_codec *codec)
 {
+#ifndef TARGET_OS2
         unsigned long timeout = jiffies + msecs_to_jiffies(2000);
 
         do {
-          #ifndef TARGET_OS2
                 if (dspload_is_loaded(codec)) {
                         codec_info(codec, "ca0132 DSP downloaded and running\n");
                         return true;
                 }
-                #endif
                 msleep(20);
         } while (time_before(jiffies, timeout));
-
+#endif
         codec_err(codec, "ca0132 failed to download DSP\n");
         return false;
@@ -6675 +6673 @@
         struct snd_kcontrol_new knew = {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .index = 0,  \
+                .index = 0,
                 .subdevice = HDA_SUBDEV_AMP_FLAG,
-                .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
-                            SNDRV_CTL_ELEM_ACCESS_TLV_READ |
+                .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | 
+                            SNDRV_CTL_ELEM_ACCESS_TLV_READ | 
                             SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK,
-                .info = snd_hda_mixer_amp_volume_info, \
+                .info = snd_hda_mixer_amp_volume_info,
                 .get = snd_hda_mixer_amp_volume_get,
                 .put = snd_hda_mixer_amp_volume_put,
@@ -6755 +6753 @@
 #else
         struct snd_kcontrol_new knew =
-        {
+        { 
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .index = 0,
@@ -6765 +6763 @@
         knew.name = ca0132_voicefx.name;
         knew.private_value = HDA_COMPOSE_AMP_VAL(VOICEFX, 1, 0, HDA_INPUT);
-
 #endif
         knew.info = ca0132_voicefx_info;
@@ -6782 +6779 @@
 #else
         struct snd_kcontrol_new knew =
-        {
+        { 
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .index = 0,
@@ -6891 +6888 @@
 #else
         struct snd_kcontrol_new knew = {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 
                 .index = 0,  \
-                .subdevice = HDA_SUBDEV_AMP_FLAG,
-                .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
-                            SNDRV_CTL_ELEM_ACCESS_TLV_READ |
-                            SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK,
+                .subdevice = HDA_SUBDEV_AMP_FLAG, 
+                .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | 
+                            SNDRV_CTL_ELEM_ACCESS_TLV_READ | 
+                            SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK, 
                 .info = snd_hda_mixer_amp_volume_info, \
                 .get = snd_hda_mixer_amp_volume_get,
-                .put = snd_hda_mixer_amp_volume_put,
+                .put = snd_hda_mixer_amp_volume_put, 
                 .tlv = { .c = snd_hda_mixer_amp_tlv },          
         };
@@ -9170 +9167 @@
 {
         /* put any chip cleanup stuffs here. */
-  #ifndef TARGET_OS2
+
+#ifndef TARGET_OS2
         if (dspload_is_loaded(codec))
                 dsp_reset(codec);
-  #endif
+#endif
 }
 
@@ -9795 +9793 @@
 }
 
-#ifdef CONFIG_PM
 static int ca0132_suspend(struct hda_codec *codec)
 {
@@ -9803 +9800 @@
         return 0;
 }
-#endif
 
 static const struct hda_codec_ops ca0132_patch_ops = {
@@ -9811 +9807 @@
         .free = ca0132_free,
         .unsol_event = snd_hda_jack_unsol_event,
-#ifdef CONFIG_PM
         .suspend = ca0132_suspend,
-#endif
 };
 

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

@@ -1135 +1135 @@
 }
 
-#ifdef CONFIG_PM
 /*
  *      Manage PDREF, when transitioning to D3hot
@@ -1160 +1159 @@
         return 0;
 }
-#endif
 
 static const struct hda_codec_ops cs421x_patch_ops = {
@@ -1168 +1166 @@
         .free = cs_free,
         .unsol_event = snd_hda_jack_unsol_event,
-#ifdef CONFIG_PM
         .suspend = cs421x_suspend,
-#endif
 };
 

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

@@ -22 +22 @@
 #endif
 
+/* CM9825 Offset Definitions */
+
+#define CM9825_VERB_SET_HPF_1 0x781
+#define CM9825_VERB_SET_HPF_2 0x785
+#define CM9825_VERB_SET_PLL 0x7a0
+#define CM9825_VERB_SET_NEG 0x7a1
+#define CM9825_VERB_SET_ADCL 0x7a2
+#define CM9825_VERB_SET_DACL 0x7a3
+#define CM9825_VERB_SET_MBIAS 0x7a4
+#define CM9825_VERB_SET_VNEG 0x7a8
+#define CM9825_VERB_SET_D2S 0x7a9
+#define CM9825_VERB_SET_DACTRL 0x7aa
+#define CM9825_VERB_SET_PDNEG 0x7ac
+#define CM9825_VERB_SET_VDO 0x7ad
+#define CM9825_VERB_SET_CDALR 0x7b0
+#define CM9825_VERB_SET_MTCBA 0x7b1
+#define CM9825_VERB_SET_OTP 0x7b2
+#define CM9825_VERB_SET_OCP 0x7b3
+#define CM9825_VERB_SET_GAD 0x7b4
+#define CM9825_VERB_SET_TMOD 0x7b5
+#define CM9825_VERB_SET_SNR 0x7b6
+
 struct cmi_spec {
         struct hda_gen_spec gen;
-};
+        const struct hda_verb *chip_d0_verbs;
+        const struct hda_verb *chip_d3_verbs;
+        const struct hda_verb *chip_hp_present_verbs;
+        const struct hda_verb *chip_hp_remove_verbs;
+        struct hda_codec *codec;
+        struct delayed_work unsol_hp_work;
+        int quirk;
+};
+
+static const struct hda_verb cm9825_std_d3_verbs[] = {
+        /* chip sleep verbs */
+        {0x43, CM9825_VERB_SET_D2S, 0x62},      /* depop */
+        {0x43, CM9825_VERB_SET_PLL, 0x01},      /* PLL set */
+        {0x43, CM9825_VERB_SET_NEG, 0xc2},      /* NEG set */
+        {0x43, CM9825_VERB_SET_ADCL, 0x00},     /* ADC */
+        {0x43, CM9825_VERB_SET_DACL, 0x02},     /* DACL */
+        {0x43, CM9825_VERB_SET_VNEG, 0x50},     /* VOL NEG */
+        {0x43, CM9825_VERB_SET_MBIAS, 0x00},    /* MBIAS */
+        {0x43, CM9825_VERB_SET_PDNEG, 0x04},    /* SEL OSC */
+        {0x43, CM9825_VERB_SET_CDALR, 0xf6},    /* Class D */
+        {0x43, CM9825_VERB_SET_OTP, 0xcd},      /* OTP set */
+        {0}
+};
+
+static const struct hda_verb cm9825_std_d0_verbs[] = {
+        /* chip init verbs */
+        {0x34, AC_VERB_SET_EAPD_BTLENABLE, 0x02},       /* EAPD set */
+        {0x43, CM9825_VERB_SET_SNR, 0x30},      /* SNR set */
+        {0x43, CM9825_VERB_SET_PLL, 0x00},      /* PLL set */
+        {0x43, CM9825_VERB_SET_ADCL, 0x00},     /* ADC */
+        {0x43, CM9825_VERB_SET_DACL, 0x02},     /* DACL */
+        {0x43, CM9825_VERB_SET_MBIAS, 0x00},    /* MBIAS */
+        {0x43, CM9825_VERB_SET_VNEG, 0x56},     /* VOL NEG */
+        {0x43, CM9825_VERB_SET_D2S, 0x62},      /* depop */
+        {0x43, CM9825_VERB_SET_DACTRL, 0x00},   /* DACTRL set */
+        {0x43, CM9825_VERB_SET_PDNEG, 0x0c},    /* SEL OSC */
+        {0x43, CM9825_VERB_SET_VDO, 0x80},      /* VDO set */
+        {0x43, CM9825_VERB_SET_CDALR, 0xf4},    /* Class D */
+        {0x43, CM9825_VERB_SET_OTP, 0xcd},      /* OTP set */
+        {0x43, CM9825_VERB_SET_MTCBA, 0x61},    /* SR set */
+        {0x43, CM9825_VERB_SET_OCP, 0x33},      /* OTP set */
+        {0x43, CM9825_VERB_SET_GAD, 0x07},      /* ADC -3db */
+        {0x43, CM9825_VERB_SET_TMOD, 0x26},     /* Class D clk */
+        {0x3C, AC_VERB_SET_AMP_GAIN_MUTE |
+                AC_AMP_SET_OUTPUT | AC_AMP_SET_RIGHT, 0x2d},    /* Gain set */
+        {0x3C, AC_VERB_SET_AMP_GAIN_MUTE |
+                AC_AMP_SET_OUTPUT | AC_AMP_SET_LEFT, 0x2d},     /* Gain set */
+        {0x43, CM9825_VERB_SET_HPF_1, 0x40},    /* HPF set */
+        {0x43, CM9825_VERB_SET_HPF_2, 0x40},    /* HPF set */
+        {0}
+};
+
+static const struct hda_verb cm9825_hp_present_verbs[] = {
+        {0x42, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00},   /* PIN off */
+        {0x43, CM9825_VERB_SET_ADCL, 0x88},     /* ADC */
+        {0x43, CM9825_VERB_SET_DACL, 0xaa},     /* DACL */
+        {0x43, CM9825_VERB_SET_MBIAS, 0x10},    /* MBIAS */
+        {0x43, CM9825_VERB_SET_D2S, 0xf2},      /* depop */
+        {0x43, CM9825_VERB_SET_DACTRL, 0x00},   /* DACTRL set */
+        {0x43, CM9825_VERB_SET_VDO, 0xc4},      /* VDO set */
+        {0}
+};
+
+static const struct hda_verb cm9825_hp_remove_verbs[] = {
+        {0x43, CM9825_VERB_SET_ADCL, 0x00},     /* ADC */
+        {0x43, CM9825_VERB_SET_DACL, 0x56},     /* DACL */
+        {0x43, CM9825_VERB_SET_MBIAS, 0x00},    /* MBIAS */
+        {0x43, CM9825_VERB_SET_D2S, 0x62},      /* depop */
+        {0x43, CM9825_VERB_SET_DACTRL, 0xe0},   /* DACTRL set */
+        {0x43, CM9825_VERB_SET_VDO, 0x80},      /* VDO set */
+        {0x42, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},   /* PIN on */
+        {0}
+};
+
+static void cm9825_unsol_hp_delayed(struct work_struct *work)
+{
+        struct cmi_spec *spec =
+            container_of(to_delayed_work(work), struct cmi_spec, unsol_hp_work);
+        struct hda_jack_tbl *jack;
+        hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0];
+        bool hp_jack_plugin = false;
+        int err = 0;
+
+        hp_jack_plugin = snd_hda_jack_detect(spec->codec, hp_pin);
+
+        codec_dbg(spec->codec, "hp_jack_plugin %d, hp_pin 0x%X\n",
+                  (int)hp_jack_plugin, hp_pin);
+
+        if (!hp_jack_plugin) {
+                err =
+                    snd_hda_codec_write(spec->codec, 0x42, 0,
+                                        AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40);
+                if (err)
+                        codec_dbg(spec->codec, "codec_write err %d\n", err);
+
+                snd_hda_sequence_write(spec->codec, spec->chip_hp_remove_verbs);
+        } else {
+                snd_hda_sequence_write(spec->codec,
+                                       spec->chip_hp_present_verbs);
+        }
+
+        jack = snd_hda_jack_tbl_get(spec->codec, hp_pin);
+        if (jack) {
+                jack->block_report = 0;
+                snd_hda_jack_report_sync(spec->codec);
+        }
+}
+
+static void hp_callback(struct hda_codec *codec, struct hda_jack_callback *cb)
+{
+        struct cmi_spec *spec = codec->spec;
+        struct hda_jack_tbl *tbl;
+
+        /* Delay enabling the HP amp, to let the mic-detection
+         * state machine run.
+         */
+
+        codec_dbg(spec->codec, "cb->nid 0x%X\n", cb->nid);
+
+        tbl = snd_hda_jack_tbl_get(codec, cb->nid);
+        if (tbl)
+                tbl->block_report = 1;
+        schedule_delayed_work(&spec->unsol_hp_work, msecs_to_jiffies(200));
+}
+
+static void cm9825_setup_unsol(struct hda_codec *codec)
+{
+        struct cmi_spec *spec = codec->spec;
+
+        hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0];
+
+        snd_hda_jack_detect_enable_callback(codec, hp_pin, hp_callback);
+}
+
+static int cm9825_init(struct hda_codec *codec)
+{
+        snd_hda_gen_init(codec);
+        snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_INIT);
+
+        return 0;
+}
+
+static void cm9825_free(struct hda_codec *codec)
+{
+        struct cmi_spec *spec = codec->spec;
+
+        cancel_delayed_work_sync(&spec->unsol_hp_work);
+        snd_hda_gen_free(codec);
+}
+
+static int cm9825_suspend(struct hda_codec *codec)
+{
+        struct cmi_spec *spec = codec->spec;
+
+        cancel_delayed_work_sync(&spec->unsol_hp_work);
+
+        snd_hda_sequence_write(codec, spec->chip_d3_verbs);
+
+        return 0;
+}
+
+static int cm9825_resume(struct hda_codec *codec)
+{
+        struct cmi_spec *spec = codec->spec;
+        hda_nid_t hp_pin = 0;
+        bool hp_jack_plugin = false;
+        int err;
+
+        err =
+            snd_hda_codec_write(spec->codec, 0x42, 0,
+                                AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00);
+        if (err)
+                codec_dbg(codec, "codec_write err %d\n", err);
+
+        msleep(150);            /* for depop noise */
+
+        codec->patch_ops.init(codec);
+
+        hp_pin = spec->gen.autocfg.hp_pins[0];
+        hp_jack_plugin = snd_hda_jack_detect(spec->codec, hp_pin);
+
+        codec_dbg(spec->codec, "hp_jack_plugin %d, hp_pin 0x%X\n",
+                  (int)hp_jack_plugin, hp_pin);
+
+        if (!hp_jack_plugin) {
+                err =
+                    snd_hda_codec_write(spec->codec, 0x42, 0,
+                                        AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40);
+
+                if (err)
+                        codec_dbg(codec, "codec_write err %d\n", err);
+
+                snd_hda_sequence_write(codec, cm9825_hp_remove_verbs);
+        }
+
+        snd_hda_regmap_sync(codec);
+        hda_call_check_power_status(codec, 0x01);
+
+        return 0;
+}
 
 /*
@@ -36 +257 @@
         .unsol_event = snd_hda_jack_unsol_event,
 };
+
+static int patch_cm9825(struct hda_codec *codec)
+{
+        struct cmi_spec *spec;
+        struct auto_pin_cfg *cfg;
+        int err;
+
+        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+        if (spec == NULL)
+                return -ENOMEM;
+
+        INIT_DELAYED_WORK(&spec->unsol_hp_work, cm9825_unsol_hp_delayed);
+        codec->spec = spec;
+        spec->codec = codec;
+        codec->patch_ops = cmi_auto_patch_ops;
+        codec->patch_ops.init = cm9825_init;
+        codec->patch_ops.suspend = cm9825_suspend;
+        codec->patch_ops.resume = cm9825_resume;
+        codec->patch_ops.free = cm9825_free;
+        codec->patch_ops.check_power_status = snd_hda_gen_check_power_status;
+        cfg = &spec->gen.autocfg;
+        snd_hda_gen_spec_init(&spec->gen);
+        spec->chip_d0_verbs = cm9825_std_d0_verbs;
+        spec->chip_d3_verbs = cm9825_std_d3_verbs;
+        spec->chip_hp_present_verbs = cm9825_hp_present_verbs;
+        spec->chip_hp_remove_verbs = cm9825_hp_remove_verbs;
+
+        snd_hda_sequence_write(codec, spec->chip_d0_verbs);
+
+        err = snd_hda_parse_pin_defcfg(codec, cfg, NULL, 0);
+        if (err < 0)
+                goto error;
+        err = snd_hda_gen_parse_auto_config(codec, cfg);
+        if (err < 0)
+                goto error;
+
+        cm9825_setup_unsol(codec);
+
+        return 0;
+
+ error:
+        cm9825_free(codec);
+
+        codec_info(codec, "Enter err %d\n", err);
+
+        return err;
+}
 
 static int patch_cmi9880(struct hda_codec *codec)
@@ -118 +386 @@
         HDA_CODEC_ENTRY(0x13f69880, "CMI9880", patch_cmi9880),
         HDA_CODEC_ENTRY(0x434d4980, "CMI9880", patch_cmi9880),
+        HDA_CODEC_ENTRY(0x13f69825, "CM9825", patch_cm9825),
         {0} /* terminator */
 };

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

@@ -173 +173 @@
 static void cx_fixup_headset_recog(struct hda_codec *codec)
 {
-        unsigned int mic_persent;
+        unsigned int mic_present;
 
         /* fix some headset type recognize fail issue, such as EDIFIER headset */
-        /* set micbiasd output current comparator threshold from 66% to 55%. */
+        /* set micbias 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
+        /* set OFF voltage for DFET from -1.2V to -0.8V, set headset micbias register
          * 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)
+        mic_present = snd_hda_codec_read(codec, 0x19, 0, AC_VERB_GET_PIN_SENSE, 0x0);
+        if (mic_present & AC_PINSENSE_PRESENCE)
                 /* enable headset mic VREF */
                 snd_hda_codec_write(codec, 0x19, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24);
@@ -254 +254 @@
         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.
+        /* In cx8070 and sn6140, the node 16 can only be configured to headphone or disabled,
+         * the node 19 can only be configured to microphone or disabled.
+         * Check hp&mic tag to process headset plugin & plugout.
          */
         mic_present = snd_hda_codec_read(codec, 0x19, 0, AC_VERB_GET_PIN_SENSE, 0x0);
@@ -265 +265 @@
 }
 
-#ifdef CONFIG_PM
 static int cx_auto_suspend(struct hda_codec *codec)
 {
@@ -271 +270 @@
         return 0;
 }
-#endif
 
 static const struct hda_codec_ops cx_auto_patch_ops = {
@@ -279 +277 @@
         .free = cx_auto_free,
         .unsol_event = snd_hda_jack_unsol_event,
-#ifdef CONFIG_PM
         .suspend = cx_auto_suspend,
         .check_power_status = snd_hda_gen_check_power_status,
-#endif
 };
 
@@ -792 +788 @@
 }
 
-#ifndef TARGET_OS2
 static void cxt_setup_gpio_unmute(struct hda_codec *codec,
                                   unsigned int gpio_mute_mask)
@@ -804 +799 @@
         }
 }
-#endif
 
 static void cxt_fixup_mute_led_gpio(struct hda_codec *codec,
@@ -820 +814 @@
 }
 
-#ifndef TARGET_OS2
 static void cxt_fixup_hp_a_u(struct hda_codec *codec,
                              const struct hda_fixup *fix, int action)
@@ -829 +822 @@
                 cxt_setup_gpio_unmute(codec, 0x2);
 }
-#endif
 
 /* ThinkPad X200 & co with cxt5051 */
@@ -884 +876 @@
                         {0}
 };
-#endif /* TARGET_OS2 */
-
-#ifndef TARGET_OS2
+#endif
+
 /* SuoWoSi/South-holding JS201D with sn6140 */
 static const struct hda_pintbl cxt_pincfg_sws_js201d[] = {
@@ -897 +888 @@
         {0}
 };
-#endif
 
 static const struct hda_fixup cxt_fixups[] = {
@@ -1081 +1071 @@
                 .chain_id = CXT_FIXUP_HEADSET_MIC,
         },
+#endif
         [CXT_PINCFG_SWS_JS201D] = {
                 .type = HDA_FIXUP_PINS,
                 .v.pins = cxt_pincfg_sws_js201d,
         },
+#ifdef NOT_USED
         [CXT_PINCFG_TOP_SPEAKER] = {
                 .type = HDA_FIXUP_PINS,
@@ -1092 +1084 @@
                 },
         },
+#endif
         [CXT_FIXUP_HP_A_U] = {
                 .type = HDA_FIXUP_FUNC,
                 .v.func = cxt_fixup_hp_a_u,
         },
-#endif
 };
 

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

@@ -4 +4 @@
  *  patch_hdmi.c - routines for HDMI/DisplayPort codecs
  *
- *  Copyright(c) 2008-2010 Intel Corporation. All rights reserved.
+ *  Copyright(c) 2008-2010 Intel Corporation
  *  Copyright (c) 2006 ATI Technologies Inc.
  *  Copyright (c) 2008 NVIDIA Corp.  All rights reserved.
@@ -55 +55 @@
 IS_ENABLED(CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM);
 #else
-1
+1;
 #endif
 module_param(enable_silent_stream, bool, 0644);
@@ -1672 +1672 @@
 #define I915_SILENT_RATE                48000
 #define I915_SILENT_CHANNELS            2
-#define I915_SILENT_FORMAT              SNDRV_PCM_FORMAT_S16_LE
 #define I915_SILENT_FORMAT_BITS 16
 #define I915_SILENT_FMT_MASK            0xf
@@ -1685 +1684 @@
 
         /* trigger silent stream generation in hw */
-        format = snd_hdac_calc_stream_format(I915_SILENT_RATE, I915_SILENT_CHANNELS,
-                                             I915_SILENT_FORMAT, I915_SILENT_FORMAT_BITS, 0);
+        format = snd_hdac_stream_format(I915_SILENT_CHANNELS, I915_SILENT_FORMAT_BITS,
+                                        I915_SILENT_RATE);
         snd_hda_codec_setup_stream(codec, per_pin->cvt_nid,
                                    I915_SILENT_FMT_MASK, I915_SILENT_FMT_MASK, format);
@@ -1994 +1993 @@
                                           &per_cvt->rates,
                                           &per_cvt->formats,
+                                          NULL,
                                           &per_cvt->maxbps);
         if (err < 0)
@@ -2083 +2083 @@
         mutex_lock(&codec->spdif_mutex);
         spdif = snd_hda_spdif_out_of_nid(codec, cvt_nid);
+  #ifndef TARGET_OS2
         /* Add sanity check to pass klockwork check.
          * This should never happen.
          */
-        #ifndef TARGET_OS2
         if (WARN_ON(spdif == NULL)) {
                 mutex_unlock(&codec->spdif_mutex);
                 return true;
         }
-        #endif
+  #endif
         non_pcm = !!(spdif->status & IEC958_AES0_NONAUDIO);
         mutex_unlock(&codec->spdif_mutex);
@@ -2540 +2540 @@
 }
 
-#ifdef CONFIG_PM
 static int generic_hdmi_suspend(struct hda_codec *codec)
 {
@@ -2567 +2566 @@
         return 0;
 }
-#endif
 
 static const struct hda_codec_ops generic_hdmi_patch_ops = {
@@ -2575 +2573 @@
         .build_controls         = generic_hdmi_build_controls,
         .unsol_event            = hdmi_unsol_event,
-#ifdef CONFIG_PM
         .suspend                = generic_hdmi_suspend,
         .resume                 = generic_hdmi_resume,
-#endif
 };
 
@@ -2983 +2979 @@
 }
 
-#ifdef CONFIG_PM
 static int i915_adlp_hdmi_suspend(struct hda_codec *codec)
 {
@@ -3063 +3058 @@
         return res;
 }
-#endif
 
 /* precondition and allocation for Intel codecs */
@@ -3198 +3192 @@
                         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
                 }
         }
@@ -4673 +4665 @@
 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(0x8086281e, "Battlemage 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),

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

@@ -11 +11 @@
  */
 
+#include <linux/acpi.h>
+#include <linux/cleanup.h>
 #include <linux/init.h>
 #include <linux/delay.h>
@@ -17 +19 @@
 #include <linux/dmi.h>
 #include <linux/module.h>
+//#include <linux/i2c.h>
 #include <linux/input.h>
 #include <linux/leds.h>
 #include <linux/ctype.h>
+//#include <linux/spi/spi.h>
 #include <sound/core.h>
 #include <sound/jack.h>
@@ -118 +122 @@
         /* hooks */
         void (*init_hook)(struct hda_codec *codec);
-#ifdef CONFIG_PM
         void (*power_hook)(struct hda_codec *codec);
-#endif
         void (*shutup)(struct hda_codec *codec);
 
@@ -133 +135 @@
         unsigned int no_internal_mic_pin:1;
         unsigned int en_3kpull_low:1;
+        int num_speaker_amps;
 
         /* for PLL fix */
@@ -142 +145 @@
 
         /* component binding */
-        struct component_match *match;
-        struct hda_component comps[HDA_MAX_COMPONENTS];
+        struct hda_component_parent comps;
 };
 
@@ -938 +940 @@
 #define is_s4_resume(codec) \
         ((codec)->core.dev.power.power_state.event == PM_EVENT_RESTORE)
+#define is_s4_suspend(codec) \
+        ((codec)->core.dev.power.power_state.event == PM_EVENT_FREEZE)
 
 static int alc_init(struct hda_codec *codec)
@@ -962 +966 @@
 }
 
-#define alc_free        snd_hda_gen_free
-
-#ifdef CONFIG_PM
+/* forward declaration */
+static const struct component_master_ops comp_master_ops;
+
+static void alc_free(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+
+        if (spec)
+                hda_component_manager_free(&spec->comps, &comp_master_ops);
+
+        snd_hda_gen_free(codec);
+}
+
 static inline void alc_shutup(struct hda_codec *codec)
 {
@@ -1003 +1017 @@
         return 0;
 }
-#endif
 
 /*
@@ -1013 +1026 @@
         .free = alc_free,
         .unsol_event = snd_hda_jack_unsol_event,
-#ifdef CONFIG_PM
         .resume = alc_resume,
         .suspend = alc_suspend,
         .check_power_status = snd_hda_gen_check_power_status,
-#endif
 };
 
@@ -3099 +3110 @@
                         { 0x18, PIN_VREF50 }, /* rear mic */
                         { 0x19, PIN_VREF50 }, /* front mic */
-                        {}
+                        {0}
                 }
         },
@@ -3524 +3535 @@
                 .v.pins = (const struct hda_pintbl[]) {
                         { 0x18, PIN_VREF100 }, /* headset mic */
-                        {}
+                        {0}
                 }
         },
@@ -4759 +4770 @@
 #endif
 
-#ifdef CONFIG_PM
 static int alc269_suspend(struct hda_codec *codec)
 {
@@ -4808 +4818 @@
         return 0;
 }
-#endif /* CONFIG_PM */
 
 static void alc269_fixup_pincfg_no_hp_to_lineout(struct hda_codec *codec,
@@ -5561 +5570 @@
 }
 
-#ifndef TARGET_OS2
+struct alc298_samsung_v2_amp_desc {
+        unsigned short nid;
+        int init_seq_size;
+        unsigned short init_seq[18][2];
+};
+
+static const struct alc298_samsung_v2_amp_desc
+alc298_samsung_v2_amp_desc_tbl[] = {
+        { 0x38, 18, {
+                { 0x23e1, 0x0000 }, { 0x2012, 0x006f }, { 0x2014, 0x0000 },
+                { 0x201b, 0x0001 }, { 0x201d, 0x0001 }, { 0x201f, 0x00fe },
+                { 0x2021, 0x0000 }, { 0x2022, 0x0010 }, { 0x203d, 0x0005 },
+                { 0x203f, 0x0003 }, { 0x2050, 0x002c }, { 0x2076, 0x000e },
+                { 0x207c, 0x004a }, { 0x2081, 0x0003 }, { 0x2399, 0x0003 },
+                { 0x23a4, 0x00b5 }, { 0x23a5, 0x0001 }, { 0x23ba, 0x0094 }
+        }},
+        { 0x39, 18, {
+                { 0x23e1, 0x0000 }, { 0x2012, 0x006f }, { 0x2014, 0x0000 },
+                { 0x201b, 0x0002 }, { 0x201d, 0x0002 }, { 0x201f, 0x00fd },
+                { 0x2021, 0x0001 }, { 0x2022, 0x0010 }, { 0x203d, 0x0005 },
+                { 0x203f, 0x0003 }, { 0x2050, 0x002c }, { 0x2076, 0x000e },
+                { 0x207c, 0x004a }, { 0x2081, 0x0003 }, { 0x2399, 0x0003 },
+                { 0x23a4, 0x00b5 }, { 0x23a5, 0x0001 }, { 0x23ba, 0x0094 }
+        }},
+        { 0x3c, 15, {
+                { 0x23e1, 0x0000 }, { 0x2012, 0x006f }, { 0x2014, 0x0000 },
+                { 0x201b, 0x0001 }, { 0x201d, 0x0001 }, { 0x201f, 0x00fe },
+                { 0x2021, 0x0000 }, { 0x2022, 0x0010 }, { 0x203d, 0x0005 },
+                { 0x203f, 0x0003 }, { 0x2050, 0x002c }, { 0x2076, 0x000e },
+                { 0x207c, 0x004a }, { 0x2081, 0x0003 }, { 0x23ba, 0x008d }
+        }},
+        { 0x3d, 15, {
+                { 0x23e1, 0x0000 }, { 0x2012, 0x006f }, { 0x2014, 0x0000 },
+                { 0x201b, 0x0002 }, { 0x201d, 0x0002 }, { 0x201f, 0x00fd },
+                { 0x2021, 0x0001 }, { 0x2022, 0x0010 }, { 0x203d, 0x0005 },
+                { 0x203f, 0x0003 }, { 0x2050, 0x002c }, { 0x2076, 0x000e },
+                { 0x207c, 0x004a }, { 0x2081, 0x0003 }, { 0x23ba, 0x008d }
+        }}
+};
+
+static void alc298_samsung_v2_enable_amps(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        static const unsigned short enable_seq[][2] = {
+                { 0x203a, 0x0081 }, { 0x23ff, 0x0001 },
+        };
+        int i, j;
+
+        for (i = 0; i < spec->num_speaker_amps; i++) {
+                alc_write_coef_idx(codec, 0x22, alc298_samsung_v2_amp_desc_tbl[i].nid);
+                for (j = 0; j < ARRAY_SIZE(enable_seq); j++)
+                        alc298_samsung_write_coef_pack(codec, enable_seq[j]);
+                codec_dbg(codec, "alc298_samsung_v2: Enabled speaker amp 0x%02x\n",
+                                alc298_samsung_v2_amp_desc_tbl[i].nid);
+        }
+}
+
+static void alc298_samsung_v2_disable_amps(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        static const unsigned short disable_seq[][2] = {
+                { 0x23ff, 0x0000 }, { 0x203a, 0x0080 },
+        };
+        int i, j;
+
+        for (i = 0; i < spec->num_speaker_amps; i++) {
+                alc_write_coef_idx(codec, 0x22, alc298_samsung_v2_amp_desc_tbl[i].nid);
+                for (j = 0; j < ARRAY_SIZE(disable_seq); j++)
+                        alc298_samsung_write_coef_pack(codec, disable_seq[j]);
+                codec_dbg(codec, "alc298_samsung_v2: Disabled speaker amp 0x%02x\n",
+                                alc298_samsung_v2_amp_desc_tbl[i].nid);
+        }
+}
+
+static void alc298_samsung_v2_playback_hook(struct hda_pcm_stream *hinfo,
+                                struct hda_codec *codec,
+                                struct snd_pcm_substream *substream,
+                                int action)
+{
+        /* Dynamically enable/disable speaker amps before and after playback */
+        if (action == HDA_GEN_PCM_ACT_OPEN)
+                alc298_samsung_v2_enable_amps(codec);
+        if (action == HDA_GEN_PCM_ACT_CLOSE)
+                alc298_samsung_v2_disable_amps(codec);
+}
+
+static void alc298_samsung_v2_init_amps(struct hda_codec *codec,
+                                int num_speaker_amps)
+{
+        struct alc_spec *spec = codec->spec;
+        int i, j;
+
+        /* Set spec's num_speaker_amps before doing anything else */
+        spec->num_speaker_amps = num_speaker_amps;
+
+        /* Disable speaker amps before init to prevent any physical damage */
+        alc298_samsung_v2_disable_amps(codec);
+
+        /* Initialize the speaker amps */
+        for (i = 0; i < spec->num_speaker_amps; i++) {
+                alc_write_coef_idx(codec, 0x22, alc298_samsung_v2_amp_desc_tbl[i].nid);
+                for (j = 0; j < alc298_samsung_v2_amp_desc_tbl[i].init_seq_size; j++) {
+                        alc298_samsung_write_coef_pack(codec,
+                                        alc298_samsung_v2_amp_desc_tbl[i].init_seq[j]);
+                }
+                alc_write_coef_idx(codec, 0x89, 0x0);
+                codec_dbg(codec, "alc298_samsung_v2: Initialized speaker amp 0x%02x\n",
+                                alc298_samsung_v2_amp_desc_tbl[i].nid);
+        }
+
+        /* register hook to enable speaker amps only when they are needed */
+        spec->gen.pcm_playback_hook = alc298_samsung_v2_playback_hook;
+}
+
+static void alc298_fixup_samsung_amp_v2_2_amps(struct hda_codec *codec,
+                                const struct hda_fixup *fix, int action)
+{
+        if (action == HDA_FIXUP_ACT_PROBE)
+                alc298_samsung_v2_init_amps(codec, 2);
+}
+
+static void alc298_fixup_samsung_amp_v2_4_amps(struct hda_codec *codec,
+                                const struct hda_fixup *fix, int action)
+{
+        if (action == HDA_FIXUP_ACT_PROBE)
+                alc298_samsung_v2_init_amps(codec, 4);
+}
+
+#ifdef NOT_USED
 static void gpio2_mic_hotkey_event(struct hda_codec *codec,
                                    struct hda_jack_callback *event)
@@ -5608 +5745 @@
         return 0;
 }
-#endif /* TARGET_OS2 */
+#endif
 
 /* GPIO1 = set according to SKU external amp
@@ -7281 +7418 @@
         struct alc_spec *spec = codec->spec;
 
-        if (action == HDA_FIXUP_ACT_PRE_PROBE) {
+        if (action == HDA_FIXUP_ACT_PRE_PROBE)
                 spec->gen.preferred_dacs = preferred_pairs;
-                spec->gen.obey_preferred_dacs = 1;
-        }
 }
 #endif /* NOT_USED */
@@ -7333 +7468 @@
         case HDA_FIXUP_ACT_INIT:
                 alc_combo_jack_hp_jd_restart(codec);
+                break;
+        }
+}
+
+static void alc256_fixup_chromebook(struct hda_codec *codec,
+                                    const struct hda_fixup *fix, int action)
+{
+        struct alc_spec *spec = codec->spec;
+
+        switch (action) {
+        case HDA_FIXUP_ACT_PRE_PROBE:
+                spec->gen.suppress_auto_mute = 1;
+                spec->gen.suppress_auto_mic = 1;
+                spec->en_3kpull_low = false;
                 break;
         }
@@ -7580 +7729 @@
 }
 
+static void comp_acpi_device_notify(acpi_handle handle, u32 event, void *data)
+{
+        struct hda_codec *cdc = data;
+        struct alc_spec *spec = cdc->spec;
+
+        codec_info(cdc, "ACPI Notification %d\n", event);
+
+        hda_component_acpi_device_notify(&spec->comps, handle, event, data);
+}
+
 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);
+        int ret;
+
+        ret = hda_component_manager_bind(cdc, &spec->comps);
+        if (ret)
+                return ret;
+
+        return hda_component_manager_bind_acpi_notifications(cdc,
+                                                             &spec->comps,
+                                                             comp_acpi_device_notify, cdc);
 }
 
@@ -7593 +7759 @@
         struct alc_spec *spec = cdc->spec;
 
-        component_unbind_all(dev, spec->comps);
+        hda_component_manager_unbind_acpi_notifications(cdc, &spec->comps, comp_acpi_device_notify);
+        hda_component_manager_unbind(cdc, &spec->comps);
 }
 
@@ -7605 +7772 @@
 {
         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);
+
+        hda_component_manager_playback_hook(&spec->comps, action);
+}
+
+static void comp_generic_fixup(struct hda_codec *cdc, int action, const char *bus,
+                               const char *hid, const char *match_str, int count)
+{
         struct alc_spec *spec = cdc->spec;
-        struct scodec_dev_name *rec;
-        int ret, i;
+        int ret;
 
         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);
+                ret = hda_component_manager_init(cdc, &spec->comps, count, bus, hid,
+                                                 match_str, &comp_master_ops);
                 if (ret)
-                        codec_err(cdc, "Fail to register component aggregator %d\n", ret);
-                else
+                        return;
+
                         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)
-{
+                hda_component_manager_free(&spec->comps, &comp_master_ops);
+                break;
+        }
+}
+
+static void find_cirrus_companion_amps(struct hda_codec *cdc)
+{
+#ifndef TARGET_OS2
         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;
-        }
+        struct acpi_device *adev;
+        struct fwnode_handle *fwnode __free(fwnode_handle) = NULL;
+        const char *bus = NULL;
+        static const struct {
+                const char *hid;
+                const char *name;
+        } acpi_ids[] = {{ "CSC3554", "cs35l54-hda" },
+                        { "CSC3556", "cs35l56-hda" },
+                        { "CSC3557", "cs35l57-hda" }};
+        char *match;
+        int i, count = 0, count_devindex = 0;
+
+        for (i = 0; i < ARRAY_SIZE(acpi_ids); ++i) {
+                adev = acpi_dev_get_first_match_dev(acpi_ids[i].hid, NULL, -1);
+                if (adev)
+                break;
+        }
+
+        if (!adev) {
+                codec_dbg(cdc, "Did not find ACPI entry for a Cirrus Amp\n");
+                return;
+        }
+
+        count = i2c_acpi_client_count(adev);
+        if (count > 0) {
+                bus = "i2c";
+        } else {
+                count = acpi_spi_count_resources(adev);
+                if (count > 0)
+                        bus = "spi";
+        }
+
+        fwnode = fwnode_handle_get(acpi_fwnode_handle(adev));
+        acpi_dev_put(adev);
+
+        if (!bus) {
+                codec_err(cdc, "Did not find any buses for %s\n", acpi_ids[i].hid);
+                return;
+        }
+
+        if (!fwnode) {
+                codec_err(cdc, "Could not get fwnode for %s\n", acpi_ids[i].hid);
+                return;
+        }
+
+        /*
+         * When available the cirrus,dev-index property is an accurate
+         * count of the amps in a system and is used in preference to
+         * the count of bus devices that can contain additional address
+         * alias entries.
+         */
+        count_devindex = fwnode_property_count_u32(fwnode, "cirrus,dev-index");
+        if (count_devindex > 0)
+                count = count_devindex;
+        match = devm_kasprintf(dev, GFP_KERNEL, "-%%s:00-%s.%%d", acpi_ids[i].name);
+        if (!match)
+                return;
+        codec_info(cdc, "Found %d %s on %s (%s)\n", count, acpi_ids[i].hid, bus, match);
+        comp_generic_fixup(cdc, HDA_FIXUP_ACT_PRE_PROBE, bus, acpi_ids[i].hid, match, count);
+#else
+        codec_dbg(cdc, "Cirrus Amp detection not supported on OS/2\n");
+        return;
+
+#endif
 }
 
 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);
+        comp_generic_fixup(cdc, action, "i2c", "CSC3551", "-%s:00-cs35l41-hda.%d", 2);
+}
+
+static void cs35l41_fixup_i2c_four(struct hda_codec *cdc, const struct hda_fixup *fix, int action)
+{
+        comp_generic_fixup(cdc, action, "i2c", "CSC3551", "-%s:00-cs35l41-hda.%d", 4);
 }
 
 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);
+        comp_generic_fixup(codec, action, "spi", "CSC3551", "-%s:00-cs35l41-hda.%d", 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);
+        comp_generic_fixup(codec, action, "spi", "CSC3551", "-%s:00-cs35l41-hda.%d", 4);
 }
 
@@ -7752 +7890 @@
                                                  int action)
 {
-        cs35l41_generic_fixup(cdc, action, "i2c", "CLSA0100", 2);
-}
-
-#ifndef TARGET_OS2
+        comp_generic_fixup(cdc, action, "i2c", "CLSA0100", "-%s:00-cs35l41-hda.%d", 2);
+}
+
+#ifdef NOT_USED
 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 */
+        comp_generic_fixup(cdc, action, "i2c", "CLSA0101", "-%s:00-cs35l41-hda.%d", 2);
+}
+#endif
+
+static void alc285_fixup_asus_ga403u(struct hda_codec *cdc, const struct hda_fixup *fix, int action)
+{
+        /*
+         * The same SSID has been re-used in different hardware, they have
+         * different codecs and the newer GA403U has a ALC285.
+         */
+        if (cdc->core.vendor_id != 0x10ec0285)
+                alc_fixup_inv_dmic(cdc, fix, action);
+}
 
 static void tas2781_fixup_i2c(struct hda_codec *cdc,
         const struct hda_fixup *fix, int action)
 {
-         tas2781_generic_fixup(cdc, action, "i2c", "TIAS2781");
-}
+        comp_generic_fixup(cdc, action, "i2c", "TIAS2781", "-%s:00", 1);
+}
+
+static void yoga7_14arb7_fixup_i2c(struct hda_codec *cdc,
+        const struct hda_fixup *fix, int action)
+{
+        comp_generic_fixup(cdc, action, "i2c", "INT8866", "-%s:00", 1);
+}
+
+static void alc256_fixup_acer_sfg16_micmute_led(struct hda_codec *codec,
+        const struct hda_fixup *fix, int action)
+{
+        alc_fixup_hp_gpio_led(codec, action, 0, 0x04);
+}
+
 
 /* for alc295_fixup_hp_top_speakers */
@@ -7833 +7994 @@
                 snd_hda_codec_set_pincfg(codec, 0x1a, 0x04a1113c);
         }
+}
+
+static void alc256_decrease_headphone_amp_val(struct hda_codec *codec,
+                                              const struct hda_fixup *fix, int action)
+{
+        u32 caps;
+        u8 nsteps, offs;
+
+        if (action != HDA_FIXUP_ACT_PRE_PROBE)
+                return;
+
+        caps = query_amp_caps(codec, 0x3, HDA_OUTPUT);
+        nsteps = ((caps & AC_AMPCAP_NUM_STEPS) >> AC_AMPCAP_NUM_STEPS_SHIFT) - 10;
+        offs = ((caps & AC_AMPCAP_OFFSET) >> AC_AMPCAP_OFFSET_SHIFT) - 10;
+        caps &= ~AC_AMPCAP_NUM_STEPS & ~AC_AMPCAP_OFFSET;
+        caps |= (nsteps << AC_AMPCAP_NUM_STEPS_SHIFT) | (offs << AC_AMPCAP_OFFSET_SHIFT);
+
+        if (snd_hda_override_amp_caps(codec, 0x3, HDA_OUTPUT, caps))
+                codec_warn(codec, "failed to override amp caps for NID 0x3\n");
 }
 
@@ -7973 +8153 @@
                 break;
         }
+}
+
+static void alc245_fixup_hp_spectre_x360_eu0xxx(struct hda_codec *codec,
+                                          const struct hda_fixup *fix, int action)
+{
+        /*
+         * The Pin Complex 0x14 for the treble speakers is wrongly reported as
+         * unconnected.
+         * The Pin Complex 0x17 for the bass speakers has the lowest association
+         * and sequence values so shift it up a bit to squeeze 0x14 in.
+         */
+        static const struct hda_pintbl pincfgs[] = {
+                { 0x14, 0x90170110 }, // top/treble
+                { 0x17, 0x90170111 }, // bottom/bass
+                {0}
+        };
+
+        /*
+         * Force DAC 0x02 for the bass speakers 0x17.
+         */
+        static const hda_nid_t conn[] = { 0x02 };
+
+        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);
+                break;
+        }
+
+        cs35l41_fixup_i2c_two(codec, fix, action);
+#ifdef NOT_USED
+        alc245_fixup_hp_mute_led_coefbit(codec, fix, action);
+        alc245_fixup_hp_gpio_led(codec, fix, action);
+#endif
+}
+
+/* some changes for Spectre x360 16, 2024 model */
+static void alc245_fixup_hp_spectre_x360_16_aa0xxx(struct hda_codec *codec,
+                                          const struct hda_fixup *fix, int action)
+{
+        /*
+         * The Pin Complex 0x14 for the treble speakers is wrongly reported as
+         * unconnected.
+         * The Pin Complex 0x17 for the bass speakers has the lowest association
+         * and sequence values so shift it up a bit to squeeze 0x14 in.
+         */
+        struct alc_spec *spec = codec->spec;
+        static const struct hda_pintbl pincfgs[] = {
+                { 0x14, 0x90170110 }, // top/treble
+                { 0x17, 0x90170111 }, // bottom/bass
+                {0}
+        };
+
+        /*
+         * Force DAC 0x02 for the bass speakers 0x17.
+         */
+        static const hda_nid_t conn[] = { 0x02 };
+
+        switch (action) {
+        case HDA_FIXUP_ACT_PRE_PROBE:
+                /* needed for amp of back speakers */
+                spec->gpio_mask |= 0x01;
+                spec->gpio_dir |= 0x01;
+                snd_hda_apply_pincfgs(codec, pincfgs);
+                snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);
+                break;
+        case HDA_FIXUP_ACT_INIT:
+                /* need to toggle GPIO to enable the amp of back speakers */
+                alc_update_gpio_data(codec, 0x01, true);
+                msleep(100);
+                alc_update_gpio_data(codec, 0x01, false);
+                break;
+        }
+
+        cs35l41_fixup_i2c_two(codec, fix, action);
+#ifdef NOT_USED
+        alc245_fixup_hp_mute_led_coefbit(codec, fix, action);
+        alc245_fixup_hp_gpio_led(codec, fix, action);
+#endif
+}
+
+/*
+ * ALC287 PCM hooks
+ */
+static void alc287_alc1318_playback_pcm_hook(struct hda_pcm_stream *hinfo,
+                                   struct hda_codec *codec,
+                                   struct snd_pcm_substream *substream,
+                                   int action)
+{
+        switch (action) {
+        case HDA_GEN_PCM_ACT_OPEN:
+                alc_write_coefex_idx(codec, 0x5a, 0x00, 0x954f); /* write gpio3 to high */
+                break;
+        case HDA_GEN_PCM_ACT_CLOSE:
+                alc_write_coefex_idx(codec, 0x5a, 0x00, 0x554f); /* write gpio3 as default value */
+                break;
+        }
+}
+
+static void alc287_s4_power_gpio3_default(struct hda_codec *codec)
+{
+#ifndef TARGET_OS2
+        if (is_s4_suspend(codec)) {
+                alc_write_coefex_idx(codec, 0x5a, 0x00, 0x554f); /* write gpio3 as default value */
+        }
+#endif
+}
+
+static void alc287_fixup_lenovo_thinkpad_with_alc1318(struct hda_codec *codec,
+                               const struct hda_fixup *fix, int action)
+{
+        struct alc_spec *spec = codec->spec;
+        static const struct coef_fw coefs[] = {
+                WRITE_COEF(0x24, 0x0013), WRITE_COEF(0x25, 0x0000), WRITE_COEF(0x26, 0xC300),
+                WRITE_COEF(0x28, 0x0001), WRITE_COEF(0x29, 0xb023),
+                WRITE_COEF(0x24, 0x0013), WRITE_COEF(0x25, 0x0000), WRITE_COEF(0x26, 0xC301),
+                WRITE_COEF(0x28, 0x0001), WRITE_COEF(0x29, 0xb023),
+        };
+
+        if (action != HDA_FIXUP_ACT_PRE_PROBE)
+                return;
+        alc_update_coef_idx(codec, 0x10, 1<<11, 1<<11);
+        alc_process_coef_fw(codec, coefs);
+        spec->power_hook = alc287_s4_power_gpio3_default;
+        spec->gen.pcm_playback_hook = alc287_alc1318_playback_pcm_hook;
 }
 
@@ -8179 +8484 @@
         ALC236_FIXUP_LENOVO_INV_DMIC,
         ALC298_FIXUP_SAMSUNG_AMP,
+        ALC298_FIXUP_SAMSUNG_AMP_V2_2_AMPS,
+        ALC298_FIXUP_SAMSUNG_AMP_V2_4_AMPS,
         ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET,
         ALC256_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET,
@@ -8202 +8509 @@
         ALC274_FIXUP_HP_HEADSET_MIC,
         ALC274_FIXUP_HP_ENVY_GPIO,
+        ALC274_FIXUP_ASUS_ZEN_AIO_27,
         ALC256_FIXUP_ASUS_HPE,
         ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK,
@@ -8224 +8532 @@
         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,
@@ -8235 +8542 @@
         ALC287_FIXUP_CS35L41_I2C_2,
         ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED,
+        ALC287_FIXUP_CS35L41_I2C_4,
         ALC245_FIXUP_CS35L41_SPI_2,
         ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED,
@@ -8249 +8557 @@
         ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI,
         ALC287_FIXUP_TAS2781_I2C,
+        ALC287_FIXUP_YOGA7_14ARB7_I2C,
         ALC245_FIXUP_HP_MUTE_LED_COEFBIT,
         ALC245_FIXUP_HP_X360_MUTE_LEDS,
@@ -8256 +8565 @@
         ALC289_FIXUP_DELL_CS35L41_SPI_2,
         ALC294_FIXUP_CS35L41_I2C_2,
+        ALC256_FIXUP_ACER_SFG16_MICMUTE_LED,
+        ALC256_FIXUP_HEADPHONE_AMP_VOL,
+        ALC245_FIXUP_HP_SPECTRE_X360_EU0XXX,
+        ALC245_FIXUP_HP_SPECTRE_X360_16_AA0XXX,
+        ALC285_FIXUP_ASUS_GA403U,
+        ALC285_FIXUP_ASUS_GA403U_HEADSET_MIC,
+        ALC285_FIXUP_ASUS_GA403U_I2C_SPEAKER2_TO_DAC1,
+        ALC285_FIXUP_ASUS_GU605_SPI_2_HEADSET_MIC,
+        ALC285_FIXUP_ASUS_GU605_SPI_SPEAKER2_TO_DAC1,
+        ALC287_FIXUP_LENOVO_THKPAD_WH_ALC1318,
+        ALC256_FIXUP_CHROME_BOOK,
+        ALC245_FIXUP_CLEVO_NOISY_MIC,
+        ALC269_FIXUP_VAIO_VJFH52_MIC_NO_PRESENCE,
+        ALC233_FIXUP_MEDION_MTL_SPK,
 };
 
@@ -8443 +8766 @@
                         {0}
 };
-#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_pintbl ALC285_FIXUP_ASUS_GA403U_HEADSET_MIC_PINS[] = {
+                        { 0x19, 0x03a11050 },
+                        { 0x1b, 0x03a11c30 },
+                        {0}
+};
+
+static const struct hda_pintbl ALC294_FIXUP_LENOVO_MIC_LOCATION_PINS[] = {
+                        /* Change the mic location from front to right, otherwise there are
+                           two front mics with the same name, pulseaudio can't handle them.
+                           This is just a temporary workaround, after applying this fixup,
+                           there will be one "Front Mic" and one "Mic" in this machine.
+                         */
+                        { 0x1a, 0x04a19040 },
+                        {0}
+};
+#endif
 
 static const struct hda_fixup alc269_fixups[] = {
@@ -9598 +9915 @@
                 .chain_id = ALC233_FIXUP_ASUS_MIC_NO_PRESENCE
         },
+#endif
         [ALC294_FIXUP_LENOVO_MIC_LOCATION] = {
                 .type = HDA_FIXUP_PINS,
+#ifndef TARGET_OS2
                 .v.pins = (const struct hda_pintbl[]) {
                         /* Change the mic location from front to right, otherwise there are
@@ -9609 +9928 @@
                         {0}
                 },
-        },
+#else
+                .v.pins = ALC294_FIXUP_LENOVO_MIC_LOCATION_PINS,
+#endif
+        },
+#ifdef NOT_USED
         [ALC225_FIXUP_DELL_WYSE_MIC_NO_PRESENCE] = {
                 .type = HDA_FIXUP_PINS,
@@ -10123 +10446 @@
                 .chain_id = ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET
         },
+        [ALC298_FIXUP_SAMSUNG_AMP_V2_2_AMPS] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc298_fixup_samsung_amp_v2_2_amps
+        },
+        [ALC298_FIXUP_SAMSUNG_AMP_V2_4_AMPS] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc298_fixup_samsung_amp_v2_4_amps
+        },
 #ifdef NOT_USED
         [ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET] = {
@@ -10334 +10665 @@
                 .v.func = alc274_fixup_hp_envy_gpio,
         },
+        [ALC274_FIXUP_ASUS_ZEN_AIO_27] = {
+                .type = HDA_FIXUP_VERBS,
+                .v.verbs = (const struct hda_verb[]) {
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x10 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0xc420 },
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x40 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x8800 },
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x49 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x0249 },
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x4a },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x202b },
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x62 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0xa007 },
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x6b },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x5060 },
+                        {0}
+                },
+                .chained = true,
+                .chain_id = ALC2XX_FIXUP_HEADSET_MIC,
+        },
         [ALC256_FIXUP_ASUS_HPE] = {
                 .type = HDA_FIXUP_VERBS,
@@ -10408 +10759 @@
                         { 0x1e, 0x411111f0 },
                         { 0x21, 0x03211020 },
-                        {}
+                        {0}
                 },
                 .chained = true,
@@ -10505 +10856 @@
                          { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },
                          { 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },
-                         {}
+                         {0}
                 },
                 .chained = true,
@@ -10552 +10903 @@
                          { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },
                          { 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },
-                         {}
+                         {0}
                 },
                 .chained = true,
@@ -10560 +10911 @@
                 .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] = {
@@ -10582 +10929 @@
                         { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },
                         { 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },
-                        {}
+                        {0}
                 },
                 .chained = true,
@@ -10630 +10977 @@
                 .chained = true,
                 .chain_id = ALC285_FIXUP_HP_MUTE_LED,
+        },
+        [ALC287_FIXUP_CS35L41_I2C_4] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = cs35l41_fixup_i2c_four,
         },
         [ALC245_FIXUP_CS35L41_SPI_2] = {
@@ -10782 +11133 @@
                 .chain_id = ALC285_FIXUP_THINKPAD_HEADSET_JACK,
         },
+        [ALC287_FIXUP_YOGA7_14ARB7_I2C] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = yoga7_14arb7_fixup_i2c,
+                .chained = true,
+                .chain_id = ALC285_FIXUP_THINKPAD_HEADSET_JACK,
+        },
         [ALC245_FIXUP_HP_MUTE_LED_COEFBIT] = {
                 .type = HDA_FIXUP_FUNC,
@@ -10818 +11175 @@
                 .v.func = cs35l41_fixup_i2c_two,
         },
+        [ALC256_FIXUP_ACER_SFG16_MICMUTE_LED] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc256_fixup_acer_sfg16_micmute_led,
+        },
+        [ALC256_FIXUP_HEADPHONE_AMP_VOL] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc256_decrease_headphone_amp_val,
+        },
+        [ALC245_FIXUP_HP_SPECTRE_X360_EU0XXX] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc245_fixup_hp_spectre_x360_eu0xxx,
+        },
+        [ALC245_FIXUP_HP_SPECTRE_X360_16_AA0XXX] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc245_fixup_hp_spectre_x360_16_aa0xxx,
+        },
+        [ALC285_FIXUP_ASUS_GA403U] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc285_fixup_asus_ga403u,
+        },
+        [ALC285_FIXUP_ASUS_GA403U_HEADSET_MIC] = {
+                .type = HDA_FIXUP_PINS,
+#ifndef TARGET_OS2
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x19, 0x03a11050 },
+                        { 0x1b, 0x03a11c30 },
+                        { }
+                },
+#else
+                .v.pins = ALC285_FIXUP_ASUS_GA403U_HEADSET_MIC_PINS,
+#endif
+                .chained = true,
+                .chain_id = ALC285_FIXUP_ASUS_GA403U_I2C_SPEAKER2_TO_DAC1
+        },
+        [ALC285_FIXUP_ASUS_GU605_SPI_SPEAKER2_TO_DAC1] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc285_fixup_speaker2_to_dac1,
+                .chained = true,
+                .chain_id = ALC285_FIXUP_ASUS_GU605_SPI_2_HEADSET_MIC,
+        },
+#ifdef NOT_USED
+        [ALC285_FIXUP_ASUS_GU605_SPI_2_HEADSET_MIC] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x19, 0x03a11050 },
+                        { 0x1b, 0x03a11c30 },
+                        { }
+                },
+        },
+#endif
+        [ALC285_FIXUP_ASUS_GA403U_I2C_SPEAKER2_TO_DAC1] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc285_fixup_speaker2_to_dac1,
+                .chained = true,
+                .chain_id = ALC285_FIXUP_ASUS_GA403U,
+        },
+        [ALC287_FIXUP_LENOVO_THKPAD_WH_ALC1318] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc287_fixup_lenovo_thinkpad_with_alc1318,
+                .chained = true,
+                .chain_id = ALC269_FIXUP_THINKPAD_ACPI
+        },
+        [ALC256_FIXUP_CHROME_BOOK] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc256_fixup_chromebook,
+                .chained = true,
+                .chain_id = ALC225_FIXUP_HEADSET_JACK
+        },
+        [ALC245_FIXUP_CLEVO_NOISY_MIC] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc269_fixup_limit_int_mic_boost,
+                .chained = true,
+                .chain_id = ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE,
+        },
+#ifdef NOT_USED
+        [ALC269_FIXUP_VAIO_VJFH52_MIC_NO_PRESENCE] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x19, 0x03a1113c }, /* use as headset mic, without its own jack detect */
+                        { 0x1b, 0x20a11040 }, /* dock mic */
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST
+        },
+        [ALC233_FIXUP_MEDION_MTL_SPK] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x1b, 0x90170110 },
+                        { }
+                },
+        },
+#endif
 };
 
@@ -10865 +11315 @@
         SND_PCI_QUIRK(0x1025, 0x1466, "Acer Aspire A515-56", ALC255_FIXUP_ACER_HEADPHONE_AND_MIC),
         SND_PCI_QUIRK(0x1025, 0x1534, "Acer Predator PH315-54", ALC255_FIXUP_ACER_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1025, 0x159c, "Acer Nitro 5 AN515-58", ALC2XX_FIXUP_HEADSET_MIC),
+        SND_PCI_QUIRK(0x1025, 0x169a, "Acer Swift SFG16", ALC256_FIXUP_ACER_SFG16_MICMUTE_LED),
         SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),
         SND_PCI_QUIRK(0x1028, 0x053c, "Dell Latitude E5430", ALC292_FIXUP_DELL_E7X),
@@ -10924 +11376 @@
         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, 0x0b27, "Dell", ALC245_FIXUP_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1028, 0x0b28, "Dell", ALC245_FIXUP_CS35L41_SPI_2),
         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),
@@ -10937 +11391 @@
         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, 0x0c28, "Dell Inspiron 16 Plus 7630", ALC295_FIXUP_DELL_INSPIRON_TOP_SPEAKERS),
+        SND_PCI_QUIRK(0x1028, 0x0c4d, "Dell", ALC287_FIXUP_CS35L41_I2C_4),
+        SND_PCI_QUIRK(0x1028, 0x0c94, "Dell Polaris 3 metal", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x1028, 0x0c96, "Dell Polaris 2in1", ALC287_FIXUP_TAS2781_I2C),
         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),
@@ -11118 +11576 @@
         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, 0x89e7, "HP Elite x2 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
         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, 0x8a28, "HP Envy 13", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8a29, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8a2a, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8a2b, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8a2c, "HP Envy 16", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8a2d, "HP Envy 16", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8a2e, "HP Envy 16", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8a30, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8a31, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8a6e, "HP EDNA 360", ALC287_FIXUP_CS35L41_I2C_4),
+        SND_PCI_QUIRK(0x103c, 0x8a74, "HP ProBook 440 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
         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),
@@ -11130 +11600 @@
         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, 0x8ad8, "HP 800 G9", 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, 0x8b3a, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),
         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),
@@ -11160 +11632 @@
         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, 0x8bb3, "HP Slim OMEN", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8bb4, "HP Slim OMEN", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8bdd, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8bde, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8bdf, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8be0, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8be1, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8be2, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8be3, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8be5, "HP Envy 16", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8be6, "HP Envy 16", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8be7, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8be8, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8be9, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),
         SND_PCI_QUIRK(0x103c, 0x8bf0, "HP", ALC236_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c15, "HP Spectre x360 2-in-1 Laptop 14-eu0xxx", ALC245_FIXUP_HP_SPECTRE_X360_EU0XXX),
+        SND_PCI_QUIRK(0x103c, 0x8c16, "HP Spectre x360 2-in-1 Laptop 16-aa0xxx", ALC245_FIXUP_HP_SPECTRE_X360_16_AA0XXX),
+        SND_PCI_QUIRK(0x103c, 0x8c17, "HP Spectre 16", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8c21, "HP Pavilion Plus Laptop 14-ey0XXX", ALC245_FIXUP_HP_X360_MUTE_LEDS),
+        SND_PCI_QUIRK(0x103c, 0x8c30, "HP Victus 15-fb1xxx", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),
         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, 0x8c4d, "HP Omen", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8c4e, "HP Omen", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8c4f, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8c50, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8c51, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8c52, "HP EliteBook 1040 G11", ALC285_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c53, "HP Elite x360 1040 2-in-1 G11", ALC285_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c66, "HP Envy 16", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8c67, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8c68, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8c6a, "HP Envy 16", ALC287_FIXUP_CS35L41_I2C_2),
         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),
@@ -11188 +11690 @@
         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, 0x8caf, "HP Elite mt645 G8 Mobile Thin Client", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
+        SND_PCI_QUIRK(0x103c, 0x8cbd, "HP Pavilion Aero Laptop 13-bg0xxx", ALC245_FIXUP_HP_X360_MUTE_LEDS),
+        SND_PCI_QUIRK(0x103c, 0x8cdd, "HP Spectre", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8cde, "HP Spectre", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x103c, 0x8cdf, "HP SnowWhite", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8ce0, "HP SnowWhite", ALC287_FIXUP_CS35L41_I2C_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),
@@ -11200 +11708 @@
         SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
         SND_PCI_QUIRK(0x1043, 0x10a1, "ASUS UX391UA", ALC294_FIXUP_ASUS_SPK),
+        SND_PCI_QUIRK(0x1043, 0x10a4, "ASUS TP3407SA", ALC287_FIXUP_TAS2781_I2C),
         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, 0x1154, "ASUS TP3607SH", ALC287_FIXUP_TAS2781_I2C),
         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),
+        SND_PCI_QUIRK(0x1043, 0x1204, "ASUS Strix G615JHR_JMR_JPR", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x1043, 0x1214, "ASUS Strix G615LH_LM_LP", ALC287_FIXUP_TAS2781_I2C),
         SND_PCI_QUIRK(0x1043, 0x125e, "ASUS Q524UQK", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1043, 0x1271, "ASUS X430UN", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),
@@ -11233 +11745 @@
         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, 0x16d3, "ASUS UX5304VA", ALC245_FIXUP_CS35L41_SPI_2),
         SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC),
+        SND_PCI_QUIRK(0x1043, 0x16f3, "ASUS UX7602VI/BZ", ALC245_FIXUP_CS35L41_SPI_2),
         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, 0x17f3, "ROG Ally NR2301L/X", ALC294_FIXUP_ASUS_ALLY),
+        SND_PCI_QUIRK(0x1043, 0x1863, "ASUS UX6404VI/VV", ALC245_FIXUP_CS35L41_SPI_2),
         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),
@@ -11251 +11766 @@
         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, 0x1b13, "ASUS U41SV/GA403U", ALC285_FIXUP_ASUS_GA403U_HEADSET_MIC),
         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),
@@ -11259 +11774 @@
         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, 0x1c63, "ASUS GU605M", ALC285_FIXUP_ASUS_GU605_SPI_SPEAKER2_TO_DAC1),
         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),
@@ -11273 +11789 @@
         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, 0x1e1f, "ASUS Vivobook 15 X1504VAP", ALC2XX_FIXUP_HEADSET_MIC),
         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, 0x1e63, "ASUS H7606W", ALC285_FIXUP_ASUS_GU605_SPI_SPEAKER2_TO_DAC1),
+        SND_PCI_QUIRK(0x1043, 0x1e83, "ASUS GA605W", ALC285_FIXUP_ASUS_GU605_SPI_SPEAKER2_TO_DAC1),
         SND_PCI_QUIRK(0x1043, 0x1e8e, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA401),
+        SND_PCI_QUIRK(0x1043, 0x1eb3, "ASUS Ally RCLA72", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x1043, 0x1ed3, "ASUS HN7306W", ALC287_FIXUP_CS35L41_I2C_2),
         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, 0x1f12, "ASUS UM5302", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x1043, 0x1f1f, "ASUS H7604JI/JV/J3D", ALC245_FIXUP_CS35L41_SPI_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, 0x31d0, "ASUS Zen AIO 27 Z272SD_A272SD", ALC274_FIXUP_ASUS_ZEN_AIO_27),
+        SND_PCI_QUIRK(0x1043, 0x3a20, "ASUS G614JZR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),
+        SND_PCI_QUIRK(0x1043, 0x3a30, "ASUS G814JVR/JIR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),
         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, 0x3a50, "ASUS G834JYR/JZR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),
+        SND_PCI_QUIRK(0x1043, 0x3a60, "ASUS G634JYR/JZR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),
+        SND_PCI_QUIRK(0x1043, 0x3e30, "ASUS TP3607SA", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x1043, 0x3ee0, "ASUS Strix G815_JHR_JMR_JPR", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x1043, 0x3ef0, "ASUS Strix G635LR_LW_LX", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x1043, 0x3f00, "ASUS Strix G815LH_LM_LP", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x1043, 0x3f10, "ASUS Strix G835LR_LW_LX", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x1043, 0x3f20, "ASUS Strix G615LR_LW", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x1043, 0x3f30, "ASUS Strix G815LR_LW", ALC287_FIXUP_TAS2781_I2C),
         SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC),
         SND_PCI_QUIRK(0x1043, 0x834a, "ASUS S101", ALC269_FIXUP_STEREO_DMIC),
@@ -11314 +11844 @@
         SND_PCI_QUIRK(0x10ec, 0x1254, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),
         SND_PCI_QUIRK(0x10ec, 0x12cc, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),
+        SND_PCI_QUIRK(0x10ec, 0x12f6, "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),
@@ -11330 +11861 @@
         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(0x144d, 0xc870, "Samsung Galaxy Book2 Pro (NP950XED)", ALC298_FIXUP_SAMSUNG_AMP_V2_2_AMPS),
+        SND_PCI_QUIRK(0x144d, 0xc872, "Samsung Galaxy Book2 Pro (NP950XEE)", ALC298_FIXUP_SAMSUNG_AMP_V2_2_AMPS),
+        SND_PCI_QUIRK(0x144d, 0xc886, "Samsung Galaxy Book3 Pro (NP964XFG)", ALC298_FIXUP_SAMSUNG_AMP_V2_4_AMPS),
+        SND_PCI_QUIRK(0x144d, 0xc1ca, "Samsung Galaxy Book3 Pro 360 (NP960QFG)", ALC298_FIXUP_SAMSUNG_AMP_V2_4_AMPS),
+        SND_PCI_QUIRK(0x144d, 0xc1cc, "Samsung Galaxy Book3 Ultra (NT960XFH)", ALC298_FIXUP_SAMSUNG_AMP_V2_4_AMPS),
         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),
@@ -11405 +11941 @@
         SND_PCI_QUIRK(0x1558, 0x971d, "Clevo N970T[CDF]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0xa500, "Clevo NL5[03]RU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1558, 0xa554, "VAIO VJFH52", ALC269_FIXUP_VAIO_VJFH52_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, 0xa741, "Clevo V54x_6x_TNE", ALC245_FIXUP_CLEVO_NOISY_MIC),
+        SND_PCI_QUIRK(0x1558, 0xa763, "Clevo V54x_6x_TU", ALC245_FIXUP_CLEVO_NOISY_MIC),
         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),
@@ -11463 +12001 @@
         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, 0x231e, "Thinkpad", ALC287_FIXUP_LENOVO_THKPAD_WH_ALC1318),
+        SND_PCI_QUIRK(0x17aa, 0x231f, "Thinkpad", ALC287_FIXUP_LENOVO_THKPAD_WH_ALC1318),
+        SND_PCI_QUIRK(0x17aa, 0x2326, "Hera2", ALC287_FIXUP_TAS2781_I2C),
         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),
@@ -11479 +12020 @@
         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),
+        HDA_CODEC_QUIRK(0x17aa, 0x3802, "DuetITL 2021", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS),
+        SND_PCI_QUIRK(0x17aa, 0x3802, "Lenovo Yoga Pro 9 14IRP8", ALC287_FIXUP_TAS2781_I2C),
         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, "IdeaPad 330-17IKB 81DM", ALC269_FIXUP_ASPIRE_HEADSET_MIC),
+        HDA_CODEC_QUIRK(0x17aa, 0x3820, "IdeaPad 330-17IKB 81DM", ALC269_FIXUP_ASPIRE_HEADSET_MIC),
+        SND_PCI_QUIRK(0x17aa, 0x3820, "Yoga Duet 7 13ITL6", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS),
         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),
@@ -11497 +12040 @@
         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),
+        HDA_CODEC_QUIRK(0x17aa, 0x386e, "Legion Y9000X 2022 IAH7", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x17aa, 0x386e, "Yoga Pro 7 14ARP8", ALC285_FIXUP_SPEAKER2_TO_DAC1),
+        HDA_CODEC_QUIRK(0x17aa, 0x38a8, "Legion Pro 7 16ARX8H", ALC287_FIXUP_TAS2781_I2C), /* this must match before PCI SSID 17aa:386f below */
+        SND_PCI_QUIRK(0x17aa, 0x386f, "Legion Pro 7i 16IAX7", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x17aa, 0x3870, "Lenovo Yoga 7 14ARB7", ALC287_FIXUP_YOGA7_14ARB7_I2C),
+        SND_PCI_QUIRK(0x17aa, 0x3877, "Lenovo Legion 7 Slim 16ARHA7", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x17aa, 0x3878, "Lenovo Legion 7 Slim 16ARHA7", ALC287_FIXUP_CS35L41_I2C_2),
         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, 0x387f, "Yoga S780-16 pro dual LX", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x17aa, 0x3880, "Yoga S780-16 pro dual 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),
@@ -11504 +12056 @@
         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, 0x38a5, "Y580P AMD dual", ALC287_FIXUP_TAS2781_I2C),
         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, 0x38a9, "Thinkbook 16P", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),
+        SND_PCI_QUIRK(0x17aa, 0x38ab, "Thinkbook 16P", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),
+        SND_PCI_QUIRK(0x17aa, 0x38b4, "Legion Slim 7 16IRH8", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x17aa, 0x38b5, "Legion Slim 7 16IRH8", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x17aa, 0x38b6, "Legion Slim 7 16APH8", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x17aa, 0x38b7, "Legion Slim 7 16APH8", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x17aa, 0x38b8, "Yoga S780-14.5 proX AMD YC Dual", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x17aa, 0x38b9, "Yoga S780-14.5 proX AMD LX 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),
@@ -11511 +12072 @@
         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, 0x38c7, "Thinkbook 13x Gen 4", ALC287_FIXUP_CS35L41_I2C_4),
+        SND_PCI_QUIRK(0x17aa, 0x38c8, "Thinkbook 13x Gen 4", ALC287_FIXUP_CS35L41_I2C_4),
         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, 0x38d3, "Yoga S990-16 Pro IMH YC Dual", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x17aa, 0x38d4, "Yoga S990-16 Pro IMH VECO Dual", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x17aa, 0x38d5, "Yoga S990-16 Pro IMH YC Quad", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x17aa, 0x38d6, "Yoga S990-16 Pro IMH VECO Quad", ALC287_FIXUP_TAS2781_I2C),
         SND_PCI_QUIRK(0x17aa, 0x38d7, "Lenovo Yoga 9 14IMH9", ALC287_FIXUP_YOGA9_14IMH9_BASS_SPK_PIN),
+        SND_PCI_QUIRK(0x17aa, 0x38df, "Yoga Y990 Intel YC Dual", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x17aa, 0x38e0, "Yoga Y990 Intel VECO Dual", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x17aa, 0x38f8, "Yoga Book 9i", ALC287_FIXUP_TAS2781_I2C),
         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, 0x38f9, "Thinkbook 16P Gen5", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),
+        SND_PCI_QUIRK(0x17aa, 0x38fa, "Thinkbook 16P Gen5", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),
+        SND_PCI_QUIRK(0x17aa, 0x38fd, "ThinkBook plus Gen5 Hybrid", ALC287_FIXUP_TAS2781_I2C),
         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, 0x391f, "Yoga S990-16 pro Quad YC Quad", ALC287_FIXUP_TAS2781_I2C),
+        SND_PCI_QUIRK(0x17aa, 0x3920, "Yoga S990-16 pro Quad VECO Quad", ALC287_FIXUP_TAS2781_I2C),
         SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC),
         SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo B50-70", ALC269_FIXUP_DMIC_THINKPAD_ACPI),
@@ -11547 +12120 @@
         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(0x1854, 0x0440, "LG CQ6", ALC256_FIXUP_HEADPHONE_AMP_VOL),
+        SND_PCI_QUIRK(0x1854, 0x0441, "LG CQ6 AIO", ALC256_FIXUP_HEADPHONE_AMP_VOL),
+        SND_PCI_QUIRK(0x1854, 0x0488, "LG gram 16 (16Z90R)", ALC298_FIXUP_SAMSUNG_AMP_V2_4_AMPS),
+        SND_PCI_QUIRK(0x1854, 0x048a, "LG gram 17 (17ZD90R)", ALC298_FIXUP_SAMSUNG_AMP_V2_4_AMPS),
         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),
@@ -11583 +12160 @@
         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(0x2782, 0x4900, "MEDION E15443", ALC233_FIXUP_MEDION_MTL_SPK),
         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),
@@ -11761 +12339 @@
         {.id = ALC225_FIXUP_HEADSET_JACK, .name = "alc-headset-jack"},
         {.id = ALC295_FIXUP_CHROME_BOOK, .name = "alc-chrome-book"},
+        {.id = ALC256_FIXUP_CHROME_BOOK, .name = "alc-2024y-chromebook"},
         {.id = ALC299_FIXUP_PREDATOR_SPK, .name = "predator-spk"},
         {.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_AMP, .name = "alc298-samsung-amp"},
+        {.id = ALC298_FIXUP_SAMSUNG_AMP_V2_2_AMPS, .name = "alc298-samsung-amp-v2-2-amps"},
+        {.id = ALC298_FIXUP_SAMSUNG_AMP_V2_4_AMPS, .name = "alc298-samsung-amp-v2-4-amps"},
         {.id = ALC256_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET, .name = "alc256-samsung-headphone"},
         {.id = ALC255_FIXUP_XIAOMI_HEADSET_MIC, .name = "alc255-xiaomi-headset"},
@@ -12301 +12882 @@
         spec->en_3kpull_low = true;
 
-#ifdef CONFIG_PM
         codec->patch_ops.suspend = alc269_suspend;
         codec->patch_ops.resume = alc269_resume;
-#endif
         spec->shutup = alc_default_shutup;
         spec->init_hook = alc_default_init;
@@ -12472 +13051 @@
         snd_hda_pick_fixup(codec, NULL, alc269_fixup_vendor_tbl,
                            alc269_fixups);
+
+        /*
+         * Check whether ACPI describes companion amplifiers that require
+         * component binding
+         */
+        find_cirrus_companion_amps(codec);
+
         snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
 
@@ -12626 +13212 @@
                 spec->gen.beep_nid = 0x23;
 
-#ifdef CONFIG_PM
         spec->power_hook = alc_power_eapd;
-#endif
 
         alc_pre_init(codec);
@@ -13659 +14243 @@
                         { 0x20, AC_VERB_SET_COEF_INDEX, 0x15 },
                         { 0x20, AC_VERB_SET_PROC_COEF, 0x0d60 },
-                        {}
+                        {0}
                 },
         },
@@ -13681 +14265 @@
                 .v.pins = (const struct hda_pintbl[]) {
                         { 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */
-                        { }
+                        {0}
                 },
         },
@@ -13703 +14287 @@
                 .v.verbs = (const struct hda_verb[]) {
                         { 0x14, AC_VERB_SET_EAPD_BTLENABLE, 0 },
-                        {}
+                        {0}
                 },
         },
@@ -14141 +14725 @@
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Realtek HD-audio codec");
+MODULE_IMPORT_NS(SND_HDA_SCODEC_COMPONENT);
 
 static struct hda_codec_driver realtek_driver = {

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

@@ -2190 +2190 @@
         if (action == HDA_FIXUP_ACT_PRE_PROBE) {
                 spec->mic_mute_led_gpio = 0x08; /* GPIO3 */
-#ifdef CONFIG_PM
                 /* resetting controller clears GPIO, so we need to keep on */
                 codec->core.power_caps &= ~AC_PWRST_CLKSTOP;
-#endif
         }
 }
@@ -4544 +4542 @@
 #endif
 
-#ifdef CONFIG_PM
 static int stac_suspend(struct hda_codec *codec)
 {
@@ -4558 +4555 @@
         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
-#endif /* CONFIG_PM */
 
 static const struct hda_codec_ops stac_patch_ops = {
@@ -4590 +4562 @@
         .free = stac_free,
         .unsol_event = snd_hda_jack_unsol_event,
-#ifdef CONFIG_PM
         .suspend = stac_suspend,
-        .check_power_status = stac_check_power_status,
-#endif
 };
 

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

@@ -388 +388 @@
 }
 
-#ifdef CONFIG_PM
 static int via_suspend(struct hda_codec *codec)
 {
@@ -409 +408 @@
         return 0;
 }
-#endif
-
-#ifdef CONFIG_PM
+
 static int via_check_power_status(struct hda_codec *codec, hda_nid_t nid)
 {
@@ -419 +416 @@
         return snd_hda_check_amp_list_power(codec, &spec->gen.loopback, nid);
 }
-#endif
 
 /*
@@ -432 +428 @@
         .free = via_free,
         .unsol_event = snd_hda_jack_unsol_event,
-#ifdef CONFIG_PM
         .suspend = via_suspend,
         .resume = via_resume,
         .check_power_status = via_check_power_status,
-#endif
 };