Changeset 759

Timestamp:

Nov 10, 2023, 8:42:28 AM (21 months ago)

Author:

Paul Smedley

Message:

Update linux code to 6.1.62

Location:

GPL/branches/uniaud32-exp/alsa-kernel

Files:

• core/jack.c (modified) (4 diffs)
• core/oss/pcm_plugin.h (modified) (2 diffs)
• core/pcm_lib.c (modified) (1 diff)
• core/pcm_memory.c (modified) (4 diffs)
• core/seq/oss/seq_oss_midi.c (modified) (8 diffs)
• hda/hdac_device.c (modified) (1 diff)
• hda/hdac_regmap.c (modified) (1 diff)
• include/sound/soc-acpi.h (modified) (1 diff)
• include/sound/soc-dpcm.h (modified) (1 diff)
• include/sound/version.h (modified) (1 diff)
• pci/ac97/ac97_codec.c (modified) (1 diff)
• pci/cmipci.c (modified) (1 diff)
• pci/emu10k1/emufx.c (modified) (2 diffs)
• pci/emu10k1/emupcm.c (modified) (4 diffs)
• pci/hda/hda_codec.c (modified) (1 diff)
• pci/hda/hda_generic.c (modified) (3 diffs)
• pci/hda/hda_intel.c (modified) (10 diffs)
• pci/hda/patch_ca0132.c (modified) (2 diffs)
• pci/hda/patch_conexant.c (modified) (2 diffs)
• pci/hda/patch_hdmi.c (modified) (7 diffs)
• pci/hda/patch_realtek.c (modified) (50 diffs)
• pci/hda/patch_sigmatel.c (modified) (5 diffs)
• pci/ymfpci/ymfpci.c (modified) (3 diffs)
• pci/ymfpci/ymfpci_main.c (modified) (2 diffs)

GPL/branches/uniaud32-exp/alsa-kernel/core/jack.c

@@ -655 +655 @@
         unsigned int mask_bits = 0;
 #ifdef CONFIG_SND_JACK_INPUT_DEV
+        struct input_dev *idev;
         int i;
 #endif
@@ -671 +672 @@
 
 #ifdef CONFIG_SND_JACK_INPUT_DEV
-        mutex_lock(&jack->input_dev_lock);
-        if (!jack->input_dev) {
-                mutex_unlock(&jack->input_dev_lock);
+        idev = input_get_device(jack->input_dev);
+        if (!idev)
                 return;
-        }
 
         for (i = 0; i < ARRAY_SIZE(jack->key); i++) {
@@ -681 +680 @@
 
                 if (jack->type & testbit)
-                        input_report_key(jack->input_dev, jack->key[i],
+                        input_report_key(idev, jack->key[i],
                                          status & testbit);
         }
@@ -689 +688 @@
 
                 if (jack->type & testbit)
-                        input_report_switch(jack->input_dev,
+                        input_report_switch(idev,
                                             jack_switch_types[i],
                                             status & testbit);
         }
 
-        input_sync(jack->input_dev);
-        mutex_unlock(&jack->input_dev_lock);
+        input_sync(idev);
+        input_put_device(idev);
 #endif /* CONFIG_SND_JACK_INPUT_DEV */
 }

GPL/branches/uniaud32-exp/alsa-kernel/core/oss/pcm_plugin.h

@@ -142 +142 @@
 void *snd_pcm_plug_buf_alloc(struct snd_pcm_substream *plug, snd_pcm_uframes_t size);
 void snd_pcm_plug_buf_unlock(struct snd_pcm_substream *plug, void *ptr);
+#else
+
+static inline snd_pcm_sframes_t snd_pcm_plug_client_size(struct snd_pcm_substream *handle, snd_pcm_uframes_t drv_size) { return drv_size; }
+static inline snd_pcm_sframes_t snd_pcm_plug_slave_size(struct snd_pcm_substream *handle, snd_pcm_uframes_t clt_size) { return clt_size; }
+static inline int snd_pcm_plug_slave_format(int format, const struct snd_mask *format_mask) { return format; }
+
+#endif
+
 snd_pcm_sframes_t snd_pcm_oss_write3(struct snd_pcm_substream *substream,
                                      const char *ptr, snd_pcm_uframes_t size,
@@ -151 +159 @@
 snd_pcm_sframes_t snd_pcm_oss_readv3(struct snd_pcm_substream *substream,
                                      void **bufs, snd_pcm_uframes_t frames);
-
-#else
-
-static inline snd_pcm_sframes_t snd_pcm_plug_client_size(struct snd_pcm_substream *handle, snd_pcm_uframes_t drv_size) { return drv_size; }
-static inline snd_pcm_sframes_t snd_pcm_plug_slave_size(struct snd_pcm_substream *handle, snd_pcm_uframes_t clt_size) { return clt_size; }
-static inline int snd_pcm_plug_slave_format(int format, const struct snd_mask *format_mask) { return format; }
-
-#endif
 
 #ifdef PLUGIN_DEBUG

GPL/branches/uniaud32-exp/alsa-kernel/core/pcm_lib.c

@@ -2192 +2192 @@
                 if (ret < 0) {
                         runtime->control->appl_ptr = old_appl_ptr;
+                        if (ret == -EPIPE)
+                                __snd_pcm_xrun(substream);
                         return ret;
                 }

GPL/branches/uniaud32-exp/alsa-kernel/core/pcm_memory.c

@@ -32 +32 @@
 MODULE_PARM_DESC(max_alloc_per_card, "Max total allocation bytes per card.");
 
+static void __update_allocated_size(struct snd_card *card, ssize_t bytes)
+{
+        card->total_pcm_alloc_bytes += bytes;
+}
+
+static void update_allocated_size(struct snd_card *card, ssize_t bytes)
+{
+        mutex_lock(&card->memory_mutex);
+        __update_allocated_size(card, bytes);
+        mutex_unlock(&card->memory_mutex);
+}
+
+static void decrease_allocated_size(struct snd_card *card, size_t bytes)
+{
+        mutex_lock(&card->memory_mutex);
+        WARN_ON(card->total_pcm_alloc_bytes < bytes);
+        __update_allocated_size(card, -(ssize_t)bytes);
+        mutex_unlock(&card->memory_mutex);
+}
+
 static int do_alloc_pages(struct snd_card *card, int type, struct device *dev,
                           int str, size_t size, struct snd_dma_buffer *dmab)
@@ -38 +58 @@
         int err;
 
+        /* check and reserve the requested size */
+        mutex_lock(&card->memory_mutex);
         if (max_alloc_per_card &&
-            card->total_pcm_alloc_bytes + size > max_alloc_per_card)
+            card->total_pcm_alloc_bytes + size > max_alloc_per_card) {
+                mutex_unlock(&card->memory_mutex);
                 return -ENOMEM;
+        }
+        __update_allocated_size(card, size);
+        mutex_unlock(&card->memory_mutex);
 
         if (str == SNDRV_PCM_STREAM_PLAYBACK)
@@ -48 +74 @@
         err = snd_dma_alloc_dir_pages(type, dev, dir, size, dmab);
         if (!err) {
-                mutex_lock(&card->memory_mutex);
-                card->total_pcm_alloc_bytes += dmab->bytes;
-                mutex_unlock(&card->memory_mutex);
+                /* the actual allocation size might be bigger than requested,
+                 * and we need to correct the account
+                 */
+                if (dmab->bytes != size)
+                        update_allocated_size(card, dmab->bytes - size);
+        } else {
+                /* take back on allocation failure */
+                decrease_allocated_size(card, size);
         }
         return err;
@@ -59 +90 @@
         if (!dmab->area)
                 return;
-        mutex_lock(&card->memory_mutex);
-        WARN_ON(card->total_pcm_alloc_bytes < dmab->bytes);
-        card->total_pcm_alloc_bytes -= dmab->bytes;
-        mutex_unlock(&card->memory_mutex);
+        decrease_allocated_size(card, dmab->bytes);
         snd_dma_free_pages(dmab);
         dmab->area = NULL;

GPL/branches/uniaud32-exp/alsa-kernel/core/seq/oss/seq_oss_midi.c

@@ -38 +38 @@
         struct seq_oss_devinfo *devinfo;        /* assigned OSSseq device */
         snd_use_lock_t use_lock;
+        struct mutex open_mutex;
 };
 
@@ -173 +174 @@
         mdev->opened = 0;
         snd_use_lock_init(&mdev->use_lock);
+        mutex_init(&mdev->open_mutex);
 
         /* copy and truncate the name of synth device */
@@ -323 +325 @@
         struct seq_oss_midi *mdev;
         struct snd_seq_port_subscribe subs;
+        int err;
 
         mdev = get_mididev(dp, dev);
@@ -328 +331 @@
                 return -ENODEV;
 
+        mutex_lock(&mdev->open_mutex);
         /* already used? */
         if (mdev->opened && mdev->devinfo != dp) {
-                snd_use_lock_free(&mdev->use_lock);
-                return -EBUSY;
+                err = -EBUSY;
+                goto unlock;
         }
 
@@ -341 +345 @@
         perm &= mdev->flags;
         if (perm == 0) {
-                snd_use_lock_free(&mdev->use_lock);
-                return -ENXIO;
+                err = -ENXIO;
+                goto unlock;
         }
 
         /* already opened? */
         if ((mdev->opened & perm) == perm) {
-                snd_use_lock_free(&mdev->use_lock);
-                return 0;
+                err = 0;
+                goto unlock;
         }
 
@@ -373 +377 @@
 
         if (! mdev->opened) {
-                snd_use_lock_free(&mdev->use_lock);
-                return -ENXIO;
+                err = -ENXIO;
+                goto unlock;
         }
 
         mdev->devinfo = dp;
+        err = 0;
+
+ unlock:
+        mutex_unlock(&mdev->open_mutex);
         snd_use_lock_free(&mdev->use_lock);
-        return 0;
+        return err;
 }
 
@@ -394 +402 @@
         if (!mdev)
                 return -ENODEV;
-        if (! mdev->opened || mdev->devinfo != dp) {
-                snd_use_lock_free(&mdev->use_lock);
-                return 0;
-        }
+        mutex_lock(&mdev->open_mutex);
+        if (!mdev->opened || mdev->devinfo != dp)
+                goto unlock;
 
         memset(&subs, 0, sizeof(subs));
@@ -416 +423 @@
         mdev->devinfo = NULL;
 
+ unlock:
+        mutex_unlock(&mdev->open_mutex);
         snd_use_lock_free(&mdev->use_lock);
         return 0;

GPL/branches/uniaud32-exp/alsa-kernel/hda/hdac_device.c

@@ -623 +623 @@
 #if 0 //fixme
         if (!atomic_inc_not_zero(&codec->in_pm)) {
-                int ret = pm_runtime_get_if_in_use(&codec->dev);
+                int ret = pm_runtime_get_if_active(&codec->dev, true);
                 if (!ret)
                         return -1;

GPL/branches/uniaud32-exp/alsa-kernel/hda/hdac_regmap.c

@@ -614 +614 @@
 void snd_hdac_regmap_sync(struct hdac_device *codec)
 {
-        if (codec->regmap) {
-                mutex_lock(&codec->regmap_lock);
+        mutex_lock(&codec->regmap_lock);
+        if (codec->regmap)
                 regcache_sync(codec->regmap);
-                mutex_unlock(&codec->regmap_lock);
-        }
+        mutex_unlock(&codec->regmap_lock);
 }
 EXPORT_SYMBOL_GPL(snd_hdac_regmap_sync);

GPL/branches/uniaud32-exp/alsa-kernel/include/sound/soc-acpi.h

@@ -171 +171 @@
 struct snd_soc_acpi_mach {
         u8 id[ACPI_ID_LEN];
+        const char *uid;
         const struct snd_soc_acpi_codecs *comp_ids;
         const u32 link_mask;

GPL/branches/uniaud32-exp/alsa-kernel/include/sound/soc-dpcm.h

@@ -126 +126 @@
                 struct snd_soc_pcm_runtime *be, int stream);
 
+/* can this BE perform prepare */
+int snd_soc_dpcm_can_be_prepared(struct snd_soc_pcm_runtime *fe,
+                                 struct snd_soc_pcm_runtime *be, int stream);
+
 /* is the current PCM operation for this FE ? */
 int snd_soc_dpcm_fe_can_update(struct snd_soc_pcm_runtime *fe, int stream);

GPL/branches/uniaud32-exp/alsa-kernel/include/sound/version.h

@@ -1 +1 @@
 /* include/version.h */
-#define CONFIG_SND_VERSION "6.1.18"
+#define CONFIG_SND_VERSION "6.1.62"
 #define CONFIG_SND_DATE ""

GPL/branches/uniaud32-exp/alsa-kernel/pci/ac97/ac97_codec.c

@@ -2122 +2122 @@
         };
 
-        if (rac97)
-                *rac97 = NULL;
-        if (snd_BUG_ON(!bus || !template))
+        if (snd_BUG_ON(!bus || !template || !rac97))
                 return -EINVAL;
+        *rac97 = NULL;
         if (snd_BUG_ON(template->num >= 4))
                 return -EINVAL;

GPL/branches/uniaud32-exp/alsa-kernel/pci/cmipci.c

@@ -2709 +2709 @@
                 if (cm->can_ac3_hw) {
                         kctl = snd_ctl_new1(&snd_cmipci_spdif_default, cm);
+                        kctl->id.device = pcm_spdif_device;
                         err = snd_ctl_add(card, kctl);
                         if (err < 0)
                                 return err;
+                        kctl = snd_ctl_new1(&snd_cmipci_spdif_mask, cm);
                         kctl->id.device = pcm_spdif_device;
-                        kctl = snd_ctl_new1(&snd_cmipci_spdif_mask, cm);
                         err = snd_ctl_add(card, kctl);
                         if (err < 0)
                                 return err;
+                        kctl = snd_ctl_new1(&snd_cmipci_spdif_stream, cm);
                         kctl->id.device = pcm_spdif_device;
-                        kctl = snd_ctl_new1(&snd_cmipci_spdif_stream, cm);
                         err = snd_ctl_add(card, kctl);
                         if (err < 0)
                                 return err;
-                        kctl->id.device = pcm_spdif_device;
                 }
                 if (cm->chip_version <= 37) {

GPL/branches/uniaud32-exp/alsa-kernel/pci/emu10k1/emufx.c

@@ -1565 +1565 @@
 
         /* Master volume (will be renamed later) */
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+0+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+0+SND_EMU10K1_PLAYBACK_CHANNELS));
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+1+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+1+SND_EMU10K1_PLAYBACK_CHANNELS));
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+2+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+2+SND_EMU10K1_PLAYBACK_CHANNELS));
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+3+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+3+SND_EMU10K1_PLAYBACK_CHANNELS));
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+4+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+4+SND_EMU10K1_PLAYBACK_CHANNELS));
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+5+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+5+SND_EMU10K1_PLAYBACK_CHANNELS));
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+6+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+6+SND_EMU10K1_PLAYBACK_CHANNELS));
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+7+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+7+SND_EMU10K1_PLAYBACK_CHANNELS));
+        for (z = 0; z < 8; z++)
+                A_OP(icode, &ptr, iMAC0, A_GPR(playback+z+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+z+SND_EMU10K1_PLAYBACK_CHANNELS));
         snd_emu10k1_init_mono_control(&controls[nctl++], "Wave Master Playback Volume", gpr, 0);
         gpr += 2;
@@ -1656 +1650 @@
                                gpr, tmp);
                         */
-                        /* For the EMU1010: How to get 32bit values from the DSP. High 16bits into L, low 16bits into R. */
-                        /* A_P16VIN(0) is delayed by one sample,
-                         * so all other A_P16VIN channels will need to also be delayed
-                         */
-                        /* Left ADC in. 1 of 2 */
                         snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_P16VIN(0x0), A_FXBUS2(0) );
-                        /* Right ADC in 1 of 2 */
-                        gpr_map[gpr++] = 0x00000000;
-                        /* Delaying by one sample: instead of copying the input
-                         * value A_P16VIN to output A_FXBUS2 as in the first channel,
-                         * we use an auxiliary register, delaying the value by one
-                         * sample
-                         */
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(2) );
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x1), A_C_00000000, A_C_00000000);
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(4) );
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x2), A_C_00000000, A_C_00000000);
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(6) );
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x3), A_C_00000000, A_C_00000000);
-                        /* For 96kHz mode */
-                        /* Left ADC in. 2 of 2 */
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(0x8) );
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x4), A_C_00000000, A_C_00000000);
-                        /* Right ADC in 2 of 2 */
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(0xa) );
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x5), A_C_00000000, A_C_00000000);
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(0xc) );
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x6), A_C_00000000, A_C_00000000);
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(0xe) );
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x7), A_C_00000000, A_C_00000000);
-                        /* Pavel Hofman - we still have voices, A_FXBUS2s, and
-                         * A_P16VINs available -
-                         * let's add 8 more capture channels - total of 16
-                         */
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
-                                                                  bit_shifter16,
-                                                                  A_GPR(gpr - 1),
-                                                                  A_FXBUS2(0x10));
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x8),
-                             A_C_00000000, A_C_00000000);
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
-                                                                  bit_shifter16,
-                                                                  A_GPR(gpr - 1),
-                                                                  A_FXBUS2(0x12));
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x9),
-                             A_C_00000000, A_C_00000000);
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
-                                                                  bit_shifter16,
-                                                                  A_GPR(gpr - 1),
-                                                                  A_FXBUS2(0x14));
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xa),
-                             A_C_00000000, A_C_00000000);
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
-                                                                  bit_shifter16,
-                                                                  A_GPR(gpr - 1),
-                                                                  A_FXBUS2(0x16));
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xb),
-                             A_C_00000000, A_C_00000000);
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
-                                                                  bit_shifter16,
-                                                                  A_GPR(gpr - 1),
-                                                                  A_FXBUS2(0x18));
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xc),
-                             A_C_00000000, A_C_00000000);
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
-                                                                  bit_shifter16,
-                                                                  A_GPR(gpr - 1),
-                                                                  A_FXBUS2(0x1a));
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xd),
-                             A_C_00000000, A_C_00000000);
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
-                                                                  bit_shifter16,
-                                                                  A_GPR(gpr - 1),
-                                                                  A_FXBUS2(0x1c));
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xe),
-                             A_C_00000000, A_C_00000000);
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
-                                                                  bit_shifter16,
-                                                                  A_GPR(gpr - 1),
-                                                                  A_FXBUS2(0x1e));
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xf),
-                             A_C_00000000, A_C_00000000);
+                        /* A_P16VIN(0) is delayed by one sample, so all other A_P16VIN channels
+                         * will need to also be delayed; we use an auxiliary register for that. */
+                        for (z = 1; z < 0x10; z++) {
+                                snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr), A_FXBUS2(z * 2) );
+                                A_OP(icode, &ptr, iACC3, A_GPR(gpr), A_P16VIN(z), A_C_00000000, A_C_00000000);
+                                gpr_map[gpr++] = 0x00000000;
+                        }
                 }
 

GPL/branches/uniaud32-exp/alsa-kernel/pci/emu10k1/emupcm.c

@@ -1237 +1237 @@
         struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
 
-        emu->capture_interrupt = NULL;
+        emu->capture_mic_interrupt = NULL;
         emu->pcm_capture_mic_substream = NULL;
         return 0;
@@ -1345 +1345 @@
         struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
 
-        emu->capture_interrupt = NULL;
+        emu->capture_efx_interrupt = NULL;
         emu->pcm_capture_efx_substream = NULL;
         return 0;
@@ -1782 +1782 @@
         int err;
 
-        err = snd_pcm_new(emu->card, "emu10k1 efx", device, 8, 1, &pcm);
+        err = snd_pcm_new(emu->card, "emu10k1 efx", device, emu->audigy ? 0 : 8, 1, &pcm);
         if (err < 0)
                 return err;
@@ -1788 +1788 @@
         pcm->private_data = emu;
 
-        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1_fx8010_playback_ops);
+        if (!emu->audigy)
+                snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1_fx8010_playback_ops);
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_emu10k1_capture_efx_ops);
 
         pcm->info_flags = 0;
-        strcpy(pcm->name, "Multichannel Capture/PT Playback");
+        if (emu->audigy)
+                strcpy(pcm->name, "Multichannel Capture");
+        else
+                strcpy(pcm->name, "Multichannel Capture/PT Playback");
         emu->pcm_efx = pcm;
 

GPL/branches/uniaud32-exp/alsa-kernel/pci/hda/hda_codec.c

@@ -2476 +2476 @@
                 /* suppose a single SPDIF device */
                 for (dig_mix = dig_mixes; dig_mix->name; dig_mix++) {
+                        struct snd_ctl_elem_id id;
+
                         kctl = find_mixer_ctl(codec, dig_mix->name, 0, 0);
                         if (!kctl)
                                 break;
-                        kctl->id.index = spdif_index;
+                        id = kctl->id;
+                        id.index = spdif_index;
+                        snd_ctl_rename_id(codec->card, &kctl->id, &id);
                 }
                 bus->primary_dig_out_type = HDA_PCM_TYPE_HDMI;

GPL/branches/uniaud32-exp/alsa-kernel/pci/hda/hda_generic.c

@@ -1159 +1159 @@
 }
 
-static const char * const channel_name[4] = {
-        "Front", "Surround", "CLFE", "Side"
+static const char * const channel_name[] = {
+        "Front", "Surround", "CLFE", "Side", "Back",
 };
 
@@ -1186 +1186 @@
         /* multi-io channels */
         if (ch >= cfg->line_outs)
-                return channel_name[ch];
+                goto fixed_name;
 
         switch (cfg->line_out_type) {
@@ -1238 +1238 @@
                 return "Line Out";
 
+ fixed_name:
         if (ch >= ARRAY_SIZE(channel_name)) {
                 snd_BUG();

GPL/branches/uniaud32-exp/alsa-kernel/pci/hda/hda_intel.c

@@ -250 +250 @@
         AZX_DRIVER_ATIHDMI,
         AZX_DRIVER_ATIHDMI_NS,
+        AZX_DRIVER_GFHDMI,
         AZX_DRIVER_VIA,
         AZX_DRIVER_SIS,
@@ -351 +352 @@
 #endif
 
-#define CONTROLLER_IN_GPU(pci) (((pci)->device == 0x0a0c) || \
+#define CONTROLLER_IN_GPU(pci) (((pci)->vendor == 0x8086) &&         \
+                                       (((pci)->device == 0x0a0c) || \
                                         ((pci)->device == 0x0c0c) || \
                                         ((pci)->device == 0x0d0c) || \
@@ -358 +360 @@
                                         ((pci)->device == 0x4f90) || \
                                         ((pci)->device == 0x4f91) || \
-                                        ((pci)->device == 0x4f92))
+                                        ((pci)->device == 0x4f92)))
 
 #define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)
@@ -371 +373 @@
         [AZX_DRIVER_ATIHDMI] = "HDA ATI HDMI",
         [AZX_DRIVER_ATIHDMI_NS] = "HDA ATI HDMI",
+        [AZX_DRIVER_GFHDMI] = "HDA GF HDMI",
         [AZX_DRIVER_VIA] = "HDA VIA VT82xx",
         [AZX_DRIVER_SIS] = "HDA SIS966",
@@ -1780 +1783 @@
 
         switch (chip->driver_type) {
+        /*
+         * increase the bdl size for Glenfly Gpus for hardware
+         * limitation on hdac interrupt interval
+         */
+        case AZX_DRIVER_GFHDMI:
+                return 128;
         case AZX_DRIVER_ICH:
         case AZX_DRIVER_PCH:
@@ -1895 +1904 @@
         }
 #endif
+        /*
+         * Fix response write request not synced to memory when handle
+         * hdac interrupt on Glenfly Gpus
+         */
+        if (chip->driver_type == AZX_DRIVER_GFHDMI)
+                bus->polling_mode = 1;
 
         err = pcim_iomap_regions(pci, 1 << 0, "ICH HD audio");
@@ -1995 +2010 @@
                         chip->capture_streams = ATIHDMI_NUM_CAPTURE;
                         break;
+                case AZX_DRIVER_GFHDMI:
                 case AZX_DRIVER_GENERIC:
                 default:
@@ -2248 +2264 @@
         /* https://bugzilla.kernel.org/show_bug.cgi?id=198611 */
         SND_PCI_QUIRK(0x17aa, 0x2227, "Lenovo X1 Carbon 3rd Gen", 0),
+        SND_PCI_QUIRK(0x17aa, 0x316e, "Lenovo ThinkCentre M70q", 0),
         /* https://bugzilla.redhat.com/show_bug.cgi?id=1689623 */
         SND_PCI_QUIRK(0x17aa, 0x367b, "Lenovo IdeaCentre B550", 0),
@@ -2582 +2599 @@
         /* Meteorlake-P */
         { PCI_DEVICE(0x8086, 0x7e28),
+          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+        /* Lunarlake-P */
+        { PCI_DEVICE(0x8086, 0xa828),
           .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
         /* Broxton-P(Apollolake) */
@@ -2779 +2799 @@
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
           AZX_DCAPS_PM_RUNTIME },
+        /* GLENFLY */
+        { PCI_DEVICE(0x6766, PCI_ANY_ID),
+          .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
+          .class_mask = 0xffffff,
+          .driver_data = AZX_DRIVER_GFHDMI | AZX_DCAPS_POSFIX_LPIB |
+          AZX_DCAPS_NO_MSI | AZX_DCAPS_NO_64BIT },
         /* VIA VT8251/VT8237A */
         { PCI_DEVICE(0x1106, 0x3288), .driver_data = AZX_DRIVER_VIA },

GPL/branches/uniaud32-exp/alsa-kernel/pci/hda/patch_ca0132.c

@@ -1312 +1312 @@
         SND_PCI_QUIRK(0x1458, 0xA036, "Gigabyte GA-Z170X-Gaming 7", QUIRK_R3DI),
         SND_PCI_QUIRK(0x3842, 0x1038, "EVGA X99 Classified", QUIRK_R3DI),
+        SND_PCI_QUIRK(0x3842, 0x104b, "EVGA X299 Dark", QUIRK_R3DI),
         SND_PCI_QUIRK(0x3842, 0x1055, "EVGA Z390 DARK", QUIRK_R3DI),
         SND_PCI_QUIRK(0x1102, 0x0013, "Recon3D", QUIRK_R3D),
@@ -4238 +4239 @@
         for (i = 0; i < TUNING_CTLS_COUNT; i++)
                 if (nid == ca0132_tuning_ctls[i].nid)
-                        break;
-
+                        goto found;
+
+        return -EINVAL;
+found:
         snd_hda_power_up(codec);
         dspio_set_param(codec, ca0132_tuning_ctls[i].mid, 0x20,

GPL/branches/uniaud32-exp/alsa-kernel/pci/hda/patch_conexant.c

@@ -1043 +1043 @@
         SND_PCI_QUIRK(0x17aa, 0x390b, "Lenovo G50-80", CXT_FIXUP_STEREO_DMIC),
         SND_PCI_QUIRK(0x17aa, 0x3975, "Lenovo U300s", CXT_FIXUP_STEREO_DMIC),
-        SND_PCI_QUIRK(0x17aa, 0x3977, "Lenovo IdeaPad U310", CXT_PINCFG_LENOVO_NOTEBOOK),
+        /* NOTE: we'd need to extend the quirk for 17aa:3977 as the same
+         * PCI SSID is used on multiple Lenovo models
+         */
+        SND_PCI_QUIRK(0x17aa, 0x3977, "Lenovo IdeaPad U310", CXT_FIXUP_STEREO_DMIC),
         SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo G50-70", CXT_FIXUP_STEREO_DMIC),
         SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC),
@@ -1066 +1069 @@
         { .id = CXT_FIXUP_HP_ZBOOK_MUTE_LED, .name = "hp-zbook-mute-led" },
         { .id = CXT_FIXUP_HP_MIC_NO_PRESENCE, .name = "hp-mic-fix" },
+        { .id = CXT_PINCFG_LENOVO_NOTEBOOK, .name = "lenovo-20149" },
         {0}
 };

GPL/branches/uniaud32-exp/alsa-kernel/pci/hda/patch_hdmi.c

@@ -94 +94 @@
         struct hdmi_pcm *pcm; /* pointer to spec->pcm_rec[n] dynamically*/
         int pcm_idx; /* which pcm is attached. -1 means no pcm is attached */
+        int prev_pcm_idx; /* previously assigned pcm index */
         int repoll_count;
         bool setup; /* the stream has been set up by prepare callback */
@@ -1397 +1398 @@
         if (per_pin->pcm)
                 return;
+        /* try the previously used slot at first */
+        idx = per_pin->prev_pcm_idx;
+        if (idx >= 0) {
+                if (!test_bit(idx, &spec->pcm_bitmap))
+                        goto found;
+                per_pin->prev_pcm_idx = -1; /* no longer valid, clear it */
+        }
         idx = hdmi_find_pcm_slot(spec, per_pin);
         if (idx == -EBUSY)
                 return;
+ found:
         per_pin->pcm_idx = idx;
         per_pin->pcm = get_hdmi_pcm(spec, idx);
@@ -1415 +1424 @@
         idx = per_pin->pcm_idx;
         per_pin->pcm_idx = -1;
+        per_pin->prev_pcm_idx = idx; /* remember the previous index */
         per_pin->pcm = NULL;
         if (idx >= 0 && idx < spec->pcm_used)
@@ -1941 +1951 @@
                 per_pin->pcm = NULL;
                 per_pin->pcm_idx = -1;
+                per_pin->prev_pcm_idx = -1;
                 per_pin->pin_nid = pin_nid;
                 per_pin->pin_nid_idx = spec->num_nids;
@@ -4497 +4508 @@
 {
         return patch_simple_hdmi(codec, VIAHDMI_CVT_NID, VIAHDMI_PIN_NID);
+}
+
+static int patch_gf_hdmi(struct hda_codec *codec)
+{
+        int err;
+
+        err = patch_generic_hdmi(codec);
+        if (err)
+                return err;
+
+        /*
+         * Glenfly GPUs have two codecs, stream switches from one codec to
+         * another, need to do actual clean-ups in codec_cleanup_stream
+         */
+        codec->no_sticky_stream = 1;
+        return 0;
 }
 
@@ -4587 +4614 @@
 HDA_CODEC_ENTRY(0x10de009f, "GPU 9f HDMI/DP",   patch_nvhdmi),
 HDA_CODEC_ENTRY(0x10de00a0, "GPU a0 HDMI/DP",   patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00a3, "GPU a3 HDMI/DP",   patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00a4, "GPU a4 HDMI/DP",   patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00a5, "GPU a5 HDMI/DP",   patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00a6, "GPU a6 HDMI/DP",   patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00a7, "GPU a7 HDMI/DP",   patch_nvhdmi),
 HDA_CODEC_ENTRY(0x10de8001, "MCP73 HDMI",       patch_nvhdmi_2ch),
 HDA_CODEC_ENTRY(0x10de8067, "MCP67/68 HDMI",    patch_nvhdmi_2ch),
+HDA_CODEC_ENTRY(0x67663d82, "Arise 82 HDMI/DP", patch_gf_hdmi),
+HDA_CODEC_ENTRY(0x67663d83, "Arise 83 HDMI/DP", patch_gf_hdmi),
+HDA_CODEC_ENTRY(0x67663d84, "Arise 84 HDMI/DP", patch_gf_hdmi),
+HDA_CODEC_ENTRY(0x67663d85, "Arise 85 HDMI/DP", patch_gf_hdmi),
+HDA_CODEC_ENTRY(0x67663d86, "Arise 86 HDMI/DP", patch_gf_hdmi),
+HDA_CODEC_ENTRY(0x67663d87, "Arise 87 HDMI/DP", patch_gf_hdmi),
 HDA_CODEC_ENTRY(0x11069f80, "VX900 HDMI/DP",    patch_via_hdmi),
 HDA_CODEC_ENTRY(0x11069f81, "VX900 HDMI/DP",    patch_via_hdmi),
@@ -4614 +4652 @@
 HDA_CODEC_ENTRY(0x80862816, "Rocketlake HDMI",  patch_i915_tgl_hdmi),
 HDA_CODEC_ENTRY(0x80862818, "Raptorlake HDMI",  patch_i915_tgl_hdmi),
-HDA_CODEC_ENTRY(0x80862819, "DG2 HDMI", patch_i915_adlp_hdmi),
+HDA_CODEC_ENTRY(0x80862819, "DG2 HDMI", patch_i915_tgl_hdmi),
 HDA_CODEC_ENTRY(0x8086281a, "Jasperlake HDMI",  patch_i915_icl_hdmi),
 HDA_CODEC_ENTRY(0x8086281b, "Elkhartlake HDMI", patch_i915_icl_hdmi),

GPL/branches/uniaud32-exp/alsa-kernel/pci/hda/patch_realtek.c

@@ -132 +132 @@
         unsigned int has_hs_key:1;
         unsigned int no_internal_mic_pin:1;
+        unsigned int en_3kpull_low:1;
 
         /* for PLL fix */
@@ -3179 +3180 @@
         SND_PCI_QUIRK_VENDOR(0x1462, "MSI", ALC882_FIXUP_GPIO3),
         SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", ALC882_FIXUP_ABIT_AW9D_MAX),
+        SND_PCI_QUIRK(0x1558, 0x3702, "Clevo X370SN[VW]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
         SND_PCI_QUIRK(0x1558, 0x50d3, "Clevo PC50[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
         SND_PCI_QUIRK(0x1558, 0x65d1, "Clevo PB51[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
@@ -3186 +3188 @@
         SND_PCI_QUIRK(0x1558, 0x65f1, "Clevo PC50HS", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
         SND_PCI_QUIRK(0x1558, 0x65f5, "Clevo PD50PN[NRT]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
+        SND_PCI_QUIRK(0x1558, 0x66a2, "Clevo PE60RNE", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
         SND_PCI_QUIRK(0x1558, 0x67d1, "Clevo PB71[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
         SND_PCI_QUIRK(0x1558, 0x67e1, "Clevo PB71[DE][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
@@ -3206 +3209 @@
         SND_PCI_QUIRK(0x1558, 0x97e1, "Clevo P970[ER][CDFN]", ALC1220_FIXUP_CLEVO_P950),
         SND_PCI_QUIRK(0x1558, 0x97e2, "Clevo P970RC-M", ALC1220_FIXUP_CLEVO_P950),
+        SND_PCI_QUIRK(0x1558, 0xd502, "Clevo PD50SNE", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
         SND_PCI_QUIRK_VENDOR(0x1558, "Clevo laptop", ALC882_FIXUP_EAPD),
         SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_FIXUP_EAPD),
@@ -4269 +4273 @@
                 hp_pin = 0x21;
 
+        alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x1); /* Low power */
         hp_pin_sense = snd_hda_jack_detect(codec, hp_pin);
 
@@ -4285 +4290 @@
          * when booting with headset plugged. So skip setting it for the codec alc257
          */
-        if (codec->core.vendor_id != 0x10ec0236 &&
-            codec->core.vendor_id != 0x10ec0257)
+        if (spec->en_3kpull_low)
                 alc_update_coef_idx(codec, 0x46, 0, 3 << 12);
 
@@ -5296 +5300 @@
                 spec->mute_led_coef.on = 0;
                 spec->mute_led_coef.off = 1 << 5;
+#ifdef CONFIG_SND_HDA_GENERIC_LEDS
+                snd_hda_gen_add_mute_led_cdev(codec, coef_mute_led_set);
+#endif
+        }
+}
+
+static void alc236_fixup_hp_mute_led_coefbit2(struct hda_codec *codec,
+                                          const struct hda_fixup *fix, int action)
+{
+        struct alc_spec *spec = codec->spec;
+
+        if (action == HDA_FIXUP_ACT_PRE_PROBE) {
+                spec->mute_led_polarity = 0;
+                spec->mute_led_coef.idx = 0x07;
+                spec->mute_led_coef.mask = 1;
+                spec->mute_led_coef.on = 1;
+                spec->mute_led_coef.off = 0;
+#ifdef CONFIG_SND_HDA_GENERIC_LEDS
+                snd_hda_gen_add_mute_led_cdev(codec, coef_mute_led_set);
+#endif
+        }
+}
+
+static void alc245_fixup_hp_mute_led_coefbit(struct hda_codec *codec,
+                                          const struct hda_fixup *fix,
+                                          int action)
+{
+        struct alc_spec *spec = codec->spec;
+
+        if (action == HDA_FIXUP_ACT_PRE_PROBE) {
+                spec->mute_led_polarity = 0;
+                spec->mute_led_coef.idx = 0x0b;
+                spec->mute_led_coef.mask = 3 << 2;
+                spec->mute_led_coef.on = 2 << 2;
+                spec->mute_led_coef.off = 1 << 2;
 #ifdef CONFIG_SND_HDA_GENERIC_LEDS
                 snd_hda_gen_add_mute_led_cdev(codec, coef_mute_led_set);
@@ -7652 +7691 @@
 }
 
+/* Forcibly assign NID 0x03 to HP while NID 0x02 to SPK */
+static void alc287_fixup_bind_dacs(struct hda_codec *codec,
+                                    const struct hda_fixup *fix, int action)
+{
+        struct alc_spec *spec = codec->spec;
+        static const hda_nid_t conn[] = { 0x02, 0x03 }; /* exclude 0x06 */
+        static const hda_nid_t preferred_pairs[] = {
+                0x17, 0x02, 0x21, 0x03, 0
+        };
+
+        if (action != HDA_FIXUP_ACT_PRE_PROBE)
+                return;
+
+        snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);
+        spec->gen.preferred_dacs = preferred_pairs;
+        spec->gen.auto_mute_via_amp = 1;
+        if (spec->gen.autocfg.speaker_pins[0] != 0x14) {
+                snd_hda_codec_write_cache(codec, 0x14, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                        0x0); /* Make sure 0x14 was disable */
+        }
+}
+/* Fix none verb table of Headset Mic pin */
+static void alc_fixup_headset_mic(struct hda_codec *codec,
+                                   const struct hda_fixup *fix, int action)
+{
+        struct alc_spec *spec = codec->spec;
+        static const struct hda_pintbl pincfgs[] = {
+                { 0x19, 0x03a1103c },
+                {0}
+        };
+
+        switch (action) {
+        case HDA_FIXUP_ACT_PRE_PROBE:
+                snd_hda_apply_pincfgs(codec, pincfgs);
+                alc_update_coef_idx(codec, 0x45, 0xf<<12 | 1<<10, 5<<12);
+                spec->parse_flags |= HDA_PINCFG_HEADSET_MIC;
+                break;
+        }
+}
+
+
 enum {
         ALC269_FIXUP_GPIO2,
@@ -7659 +7739 @@
         ALC269_FIXUP_SKU_IGNORE,
         ALC269_FIXUP_ASUS_G73JW,
+        ALC269_FIXUP_ASUS_N7601ZM_PINS,
+        ALC269_FIXUP_ASUS_N7601ZM,
         ALC269_FIXUP_LENOVO_EAPD,
         ALC275_FIXUP_SONY_HWEQ,
@@ -7760 +7842 @@
         ALC295_FIXUP_DISABLE_DAC3,
         ALC285_FIXUP_SPEAKER2_TO_DAC1,
+        ALC285_FIXUP_ASUS_SPEAKER2_TO_DAC1,
+        ALC285_FIXUP_ASUS_HEADSET_MIC,
+        ALC285_FIXUP_ASUS_I2C_SPEAKER2_TO_DAC1,
+        ALC285_FIXUP_ASUS_I2C_HEADSET_MIC,
         ALC280_FIXUP_HP_HEADSET_MIC,
         ALC221_FIXUP_HP_FRONT_MIC,
@@ -7815 +7901 @@
         ALC285_FIXUP_THINKPAD_X1_GEN7,
         ALC285_FIXUP_THINKPAD_HEADSET_JACK,
+        ALC294_FIXUP_ASUS_ALLY,
+        ALC294_FIXUP_ASUS_ALLY_PINS,
+        ALC294_FIXUP_ASUS_ALLY_VERBS,
+        ALC294_FIXUP_ASUS_ALLY_SPEAKER,
         ALC294_FIXUP_ASUS_HPE,
         ALC294_FIXUP_ASUS_COEF_1B,
@@ -7828 +7918 @@
         ALC285_FIXUP_HP_MUTE_LED,
         ALC285_FIXUP_HP_SPECTRE_X360_MUTE_LED,
+        ALC236_FIXUP_HP_MUTE_LED_COEFBIT2,
         ALC236_FIXUP_HP_GPIO_LED,
         ALC236_FIXUP_HP_MUTE_LED,
@@ -7898 +7989 @@
         ALC295_FIXUP_DELL_INSPIRON_TOP_SPEAKERS,
         ALC236_FIXUP_DELL_DUAL_CODECS,
+        ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI,
+        ALC245_FIXUP_HP_MUTE_LED_COEFBIT,
+        ALC245_FIXUP_HP_X360_MUTE_LEDS,
+        ALC287_FIXUP_THINKPAD_I2S_SPK,
+        ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD,
+        ALC2XX_FIXUP_HEADSET_MIC,
 };
 
@@ -8137 +8234 @@
 #endif
         },
+#ifdef NOT_USED
+        [ALC269_FIXUP_ASUS_N7601ZM_PINS] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x19, 0x03A11050 },
+                        { 0x1a, 0x03A11C30 },
+                        { 0x21, 0x03211420 },
+                        { }
+                }
+        },
+        [ALC269_FIXUP_ASUS_N7601ZM] = {
+                .type = HDA_FIXUP_VERBS,
+                .v.verbs = (const struct hda_verb[]) {
+                        {0x20, AC_VERB_SET_COEF_INDEX, 0x62},
+                        {0x20, AC_VERB_SET_PROC_COEF, 0xa007},
+                        {0x20, AC_VERB_SET_COEF_INDEX, 0x10},
+                        {0x20, AC_VERB_SET_PROC_COEF, 0x8420},
+                        {0x20, AC_VERB_SET_COEF_INDEX, 0x0f},
+                        {0x20, AC_VERB_SET_PROC_COEF, 0x7774},
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC269_FIXUP_ASUS_N7601ZM_PINS,
+        },
+#endif
         [ALC269_FIXUP_LENOVO_EAPD] = {
                 .type = HDA_FIXUP_VERBS,
@@ -9006 +9128 @@
                 .chain_id = ALC269_FIXUP_THINKPAD_ACPI
         },
+        [ALC285_FIXUP_ASUS_SPEAKER2_TO_DAC1] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc285_fixup_speaker2_to_dac1,
+                .chained = true,
+                .chain_id = ALC245_FIXUP_CS35L41_SPI_2
+        },
 #ifdef NOT_USED
+        [ALC285_FIXUP_ASUS_HEADSET_MIC] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x19, 0x03a11050 },
+                        { 0x1b, 0x03a11c30 },
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC285_FIXUP_ASUS_SPEAKER2_TO_DAC1
+        },
+#endif
+        [ALC285_FIXUP_ASUS_I2C_SPEAKER2_TO_DAC1] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc285_fixup_speaker2_to_dac1,
+                .chained = true,
+                .chain_id = ALC287_FIXUP_CS35L41_I2C_2
+        },
+#ifdef NOT_USED
+        [ALC285_FIXUP_ASUS_I2C_HEADSET_MIC] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x19, 0x03a11050 },
+                        { 0x1b, 0x03a11c30 },
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC285_FIXUP_ASUS_I2C_SPEAKER2_TO_DAC1
+        },
         [ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER] = {
                 .type = HDA_FIXUP_PINS,
@@ -9411 +9567 @@
                 .chain_id = ALC294_FIXUP_SPK2_TO_DAC1
         },
+        [ALC294_FIXUP_ASUS_ALLY] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = cs35l41_fixup_i2c_two,
+                .chained = true,
+                .chain_id = ALC294_FIXUP_ASUS_ALLY_PINS
+        },
+#ifdef NOT_USED
+        [ALC294_FIXUP_ASUS_ALLY_PINS] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x19, 0x03a11050 },
+                        { 0x1a, 0x03a11c30 },
+                        { 0x21, 0x03211420 },
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC294_FIXUP_ASUS_ALLY_VERBS
+        },
+        [ALC294_FIXUP_ASUS_ALLY_VERBS] = {
+                .type = HDA_FIXUP_VERBS,
+                .v.verbs = (const struct hda_verb[]) {
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x45 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x5089 },
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x46 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x0004 },
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x47 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0xa47a },
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x49 },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x0049},
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x4a },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x201b },
+                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x6b },
+                        { 0x20, AC_VERB_SET_PROC_COEF, 0x4278},
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC294_FIXUP_ASUS_ALLY_SPEAKER
+        },
+#endif
+        [ALC294_FIXUP_ASUS_ALLY_SPEAKER] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc285_fixup_speaker2_to_dac1,
+        },
         [ALC285_FIXUP_THINKPAD_X1_GEN7] = {
                 .type = HDA_FIXUP_FUNC,
@@ -9536 +9735 @@
                 .type = HDA_FIXUP_FUNC,
                 .v.func = alc285_fixup_hp_spectre_x360_mute_led,
+        },
+        [ALC236_FIXUP_HP_MUTE_LED_COEFBIT2] = {
+            .type = HDA_FIXUP_FUNC,
+            .v.func = alc236_fixup_hp_mute_led_coefbit2,
         },
         [ALC236_FIXUP_HP_GPIO_LED] = {
@@ -10046 +10249 @@
                 .type = HDA_FIXUP_FUNC,
                 .v.func = cs35l41_fixup_i2c_two,
-                .chained = true,
-                .chain_id = ALC269_FIXUP_THINKPAD_ACPI,
         },
         [ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED] = {
@@ -10187 +10388 @@
                 .chained = true,
                 .chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
+        },
+        [ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = cs35l41_fixup_i2c_two,
+                .chained = true,
+                .chain_id = ALC269_FIXUP_THINKPAD_ACPI,
+        },
+        [ALC245_FIXUP_HP_MUTE_LED_COEFBIT] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc245_fixup_hp_mute_led_coefbit,
+        },
+        [ALC245_FIXUP_HP_X360_MUTE_LEDS] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc245_fixup_hp_mute_led_coefbit,
+                .chained = true,
+                .chain_id = ALC245_FIXUP_HP_GPIO_LED
+        },
+        [ALC287_FIXUP_THINKPAD_I2S_SPK] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc287_fixup_bind_dacs,
+        },
+        [ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc287_fixup_bind_dacs,
+                .chained = true,
+                .chain_id = ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI,
+        },
+        [ALC2XX_FIXUP_HEADSET_MIC] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc_fixup_headset_mic,
         },
 };
@@ -10362 +10593 @@
         SND_PCI_QUIRK(0x103c, 0x8077, "HP", ALC256_FIXUP_HP_HEADSET_MIC),
         SND_PCI_QUIRK(0x103c, 0x8158, "HP", ALC256_FIXUP_HP_HEADSET_MIC),
-        SND_PCI_QUIRK(0x103c, 0x820d, "HP Pavilion 15", ALC269_FIXUP_HP_MUTE_LED_MIC3),
+        SND_PCI_QUIRK(0x103c, 0x820d, "HP Pavilion 15", ALC295_FIXUP_HP_X360),
         SND_PCI_QUIRK(0x103c, 0x8256, "HP", ALC221_FIXUP_HP_FRONT_MIC),
         SND_PCI_QUIRK(0x103c, 0x827e, "HP x360", ALC295_FIXUP_HP_X360),
@@ -10412 +10643 @@
         SND_PCI_QUIRK(0x103c, 0x8811, "HP Spectre x360 15-eb1xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1),
         SND_PCI_QUIRK(0x103c, 0x8812, "HP Spectre x360 15-eb1xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1),
+        SND_PCI_QUIRK(0x103c, 0x881d, "HP 250 G8 Notebook PC", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
         SND_PCI_QUIRK(0x103c, 0x8846, "HP EliteBook 850 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x8847, "HP EliteBook x360 830 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
@@ -10421 +10653 @@
         SND_PCI_QUIRK(0x103c, 0x8870, "HP ZBook Fury 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),
         SND_PCI_QUIRK(0x103c, 0x8873, "HP ZBook Studio 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),
+        SND_PCI_QUIRK(0x103c, 0x887a, "HP Laptop 15s-eq2xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
+        SND_PCI_QUIRK(0x103c, 0x888a, "HP ENVY x360 Convertible 15-eu0xxx", ALC245_FIXUP_HP_X360_MUTE_LEDS),
         SND_PCI_QUIRK(0x103c, 0x888d, "HP ZBook Power 15.6 inch G8 Mobile Workstation PC", ALC236_FIXUP_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x8895, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_SPEAKERS_MICMUTE_LED),
@@ -10427 +10661 @@
         SND_PCI_QUIRK(0x103c, 0x88d0, "HP Pavilion 15-eh1xxx (mainboard 88D0)", ALC287_FIXUP_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x8902, "HP OMEN 16", ALC285_FIXUP_HP_MUTE_LED),
+        SND_PCI_QUIRK(0x103c, 0x8919, "HP Pavilion Aero Laptop 13-be0xxx", ALC287_FIXUP_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x896d, "HP ZBook Firefly 16 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x896e, "HP EliteBook x360 830 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
@@ -10451 +10686 @@
         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, 0x8a20, "HP Laptop 15s-fq5xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
+        SND_PCI_QUIRK(0x103c, 0x8a25, "HP Victus 16-d1xxx (MB 8A25)", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),
         SND_PCI_QUIRK(0x103c, 0x8a78, "HP Dev One", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST),
         SND_PCI_QUIRK(0x103c, 0x8aa0, "HP ProBook 440 G9 (MB 8A9E)", ALC236_FIXUP_HP_GPIO_LED),
@@ -10456 +10693 @@
         SND_PCI_QUIRK(0x103c, 0x8aa8, "HP EliteBook 640 G9 (MB 8AA6)", ALC236_FIXUP_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x8aab, "HP EliteBook 650 G9 (MB 8AA9)", ALC236_FIXUP_HP_GPIO_LED),
-         SND_PCI_QUIRK(0x103c, 0x8abb, "HP ZBook Firefly 14 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8abb, "HP ZBook Firefly 14 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x8ad1, "HP EliteBook 840 14 inch G9 Notebook PC", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x8ad2, "HP EliteBook 860 16 inch G9 Notebook PC", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
@@ -10467 +10704 @@
         SND_PCI_QUIRK(0x103c, 0x8b5d, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
         SND_PCI_QUIRK(0x103c, 0x8b5e, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
+        SND_PCI_QUIRK(0x103c, 0x8b63, "HP Elite Dragonfly 13.5 inch G4", ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8b65, "HP ProBook 455 15.6 inch G10 Notebook PC", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
+        SND_PCI_QUIRK(0x103c, 0x8b66, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
+        SND_PCI_QUIRK(0x103c, 0x8b70, "HP EliteBook 835 G10", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8b72, "HP EliteBook 845 G10", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8b74, "HP EliteBook 845W G10", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8b77, "HP ElieBook 865 G10", ALC287_FIXUP_CS35L41_I2C_2),
         SND_PCI_QUIRK(0x103c, 0x8b7a, "HP", ALC236_FIXUP_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x8b7d, "HP", ALC236_FIXUP_HP_GPIO_LED),
@@ -10473 +10717 @@
         SND_PCI_QUIRK(0x103c, 0x8b8b, "HP", ALC236_FIXUP_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x8b8d, "HP", ALC236_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8b8f, "HP", ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x8b92, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8b96, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
+        SND_PCI_QUIRK(0x103c, 0x8b97, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
         SND_PCI_QUIRK(0x103c, 0x8bf0, "HP", ALC236_FIXUP_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c46, "HP EliteBook 830 G11", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c47, "HP EliteBook 840 G11", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c48, "HP EliteBook 860 G11", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c49, "HP Elite x360 830 2-in-1 G11", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c70, "HP EliteBook 835 G11", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c71, "HP EliteBook 845 G11", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),
+        SND_PCI_QUIRK(0x103c, 0x8c72, "HP EliteBook 865 G11", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),
         SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),
         SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300),
@@ -10487 +10741 @@
         SND_PCI_QUIRK(0x1043, 0x1290, "ASUS X441SA", ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1043, 0x12a0, "ASUS X441UV", ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1043, 0x12a3, "Asus N7691ZM", ALC269_FIXUP_ASUS_N7601ZM),
         SND_PCI_QUIRK(0x1043, 0x12af, "ASUS UX582ZS", ALC245_FIXUP_CS35L41_SPI_2),
         SND_PCI_QUIRK(0x1043, 0x12e0, "ASUS X541SA", ALC256_FIXUP_ASUS_MIC),
@@ -10493 +10748 @@
         SND_PCI_QUIRK(0x1043, 0x13b0, "ASUS Z550SA", ALC256_FIXUP_ASUS_MIC),
         SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_ASUS_ZENBOOK),
+        SND_PCI_QUIRK(0x1043, 0x1433, "ASUS GX650P", ALC285_FIXUP_ASUS_I2C_HEADSET_MIC),
+        SND_PCI_QUIRK(0x1043, 0x1463, "Asus GA402X", ALC285_FIXUP_ASUS_I2C_HEADSET_MIC),
+        SND_PCI_QUIRK(0x1043, 0x1473, "ASUS GU604V", ALC285_FIXUP_ASUS_HEADSET_MIC),
+        SND_PCI_QUIRK(0x1043, 0x1483, "ASUS GU603V", ALC285_FIXUP_ASUS_HEADSET_MIC),
         SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A),
+        SND_PCI_QUIRK(0x1043, 0x1573, "ASUS GZ301V", ALC285_FIXUP_ASUS_HEADSET_MIC),
         SND_PCI_QUIRK(0x1043, 0x1662, "ASUS GV301QH", ALC294_FIXUP_ASUS_DUAL_SPK),
+        SND_PCI_QUIRK(0x1043, 0x1663, "ASUS GU603ZV", ALC285_FIXUP_ASUS_HEADSET_MIC),
+        SND_PCI_QUIRK(0x1043, 0x1683, "ASUS UM3402YAR", ALC287_FIXUP_CS35L41_I2C_2),
         SND_PCI_QUIRK(0x1043, 0x16b2, "ASUS GU603", ALC289_FIXUP_ASUS_GA401),
         SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC),
         SND_PCI_QUIRK(0x1043, 0x1740, "ASUS UX430UA", ALC295_FIXUP_ASUS_DACS),
         SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_DUAL_SPK),
+        SND_PCI_QUIRK(0x1043, 0x17f3, "ROG Ally RC71L_RC71L", ALC294_FIXUP_ASUS_ALLY),
         SND_PCI_QUIRK(0x1043, 0x1881, "ASUS Zephyrus S/M", ALC294_FIXUP_ASUS_GX502_PINS),
         SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC),
@@ -10512 +10775 @@
         SND_PCI_QUIRK(0x1043, 0x1b11, "ASUS UX431DA", ALC294_FIXUP_ASUS_COEF_1B),
         SND_PCI_QUIRK(0x1043, 0x1b13, "Asus U41SV", ALC269_FIXUP_INV_DMIC),
+        SND_PCI_QUIRK(0x1043, 0x1b93, "ASUS G614JVR/JIR", ALC245_FIXUP_CS35L41_SPI_2),
         SND_PCI_QUIRK(0x1043, 0x1bbd, "ASUS Z550MA", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1043, 0x1c23, "Asus X55U", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
+        SND_PCI_QUIRK(0x1043, 0x1c62, "ASUS GU603", ALC289_FIXUP_ASUS_GA401),
         SND_PCI_QUIRK(0x1043, 0x1c92, "ASUS ROG Strix G15", ALC285_FIXUP_ASUS_G533Z_PINS),
         SND_PCI_QUIRK(0x1043, 0x1ccd, "ASUS X555UB", ALC256_FIXUP_ASUS_MIC),
+        SND_PCI_QUIRK(0x1043, 0x1d1f, "ASUS ROG Strix G17 2023 (G713PV)", ALC287_FIXUP_CS35L41_I2C_2),
         SND_PCI_QUIRK(0x1043, 0x1d42, "ASUS Zephyrus G14 2022", ALC289_FIXUP_ASUS_GA401),
         SND_PCI_QUIRK(0x1043, 0x1d4e, "ASUS TM420", ALC256_FIXUP_ASUS_HPE),
-        SND_PCI_QUIRK(0x1043, 0x1e02, "ASUS UX3402", ALC245_FIXUP_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1043, 0x1e02, "ASUS UX3402ZA", ALC245_FIXUP_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1043, 0x16a3, "ASUS UX3402VA", ALC245_FIXUP_CS35L41_SPI_2),
         SND_PCI_QUIRK(0x1043, 0x1e11, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA502),
         SND_PCI_QUIRK(0x1043, 0x1e12, "ASUS UM3402", ALC287_FIXUP_CS35L41_I2C_2),
@@ -10529 +10796 @@
         SND_PCI_QUIRK(0x1043, 0x1f92, "ASUS ROG Flow X16", ALC289_FIXUP_ASUS_GA401),
         SND_PCI_QUIRK(0x1043, 0x3030, "ASUS ZN270IE", ALC256_FIXUP_ASUS_AIO_GPIO2),
+        SND_PCI_QUIRK(0x1043, 0x3a20, "ASUS G614JZR", ALC245_FIXUP_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1043, 0x3a30, "ASUS G814JVR/JIR", ALC245_FIXUP_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1043, 0x3a40, "ASUS G814JZR", ALC245_FIXUP_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1043, 0x3a50, "ASUS G834JYR/JZR", ALC245_FIXUP_CS35L41_SPI_2),
+        SND_PCI_QUIRK(0x1043, 0x3a60, "ASUS G634JYR/JZR", ALC245_FIXUP_CS35L41_SPI_2),
         SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC),
         SND_PCI_QUIRK(0x1043, 0x834a, "ASUS S101", ALC269_FIXUP_STEREO_DMIC),
@@ -10552 +10824 @@
         SND_PCI_QUIRK(0x10ec, 0x1252, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),
         SND_PCI_QUIRK(0x10ec, 0x1254, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),
+        SND_PCI_QUIRK(0x10ec, 0x12cc, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),
         SND_PCI_QUIRK(0x10f7, 0x8338, "Panasonic CF-SZ6", ALC269_FIXUP_HEADSET_MODE),
         SND_PCI_QUIRK(0x144d, 0xc109, "Samsung Ativ book 9 (NP900X3G)", ALC269_FIXUP_INV_DMIC),
@@ -10565 +10838 @@
         SND_PCI_QUIRK(0x144d, 0xc832, "Samsung Galaxy Book Flex Alpha (NP730QCJ)", ALC256_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
         SND_PCI_QUIRK(0x144d, 0xca03, "Samsung Galaxy Book2 Pro 360 (NP930QED)", ALC298_FIXUP_SAMSUNG_AMP),
+        SND_PCI_QUIRK(0x144d, 0xc868, "Samsung Galaxy Book2 Pro (NP930XED)", ALC298_FIXUP_SAMSUNG_AMP),
         SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_HEADSET_MIC),
         SND_PCI_QUIRK(0x1462, 0xb120, "MSI Cubi MS-B120", ALC283_FIXUP_HEADSET_MIC),
@@ -10599 +10873 @@
         SND_PCI_QUIRK(0x1558, 0x5157, "Clevo W517GU1", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0x51a1, "Clevo NS50MU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1558, 0x51b1, "Clevo NS50AU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1558, 0x51b3, "Clevo NS70AU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1558, 0x5630, "Clevo NP50RNJS", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0x70a1, "Clevo NB70T[HJK]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0x70b3, "Clevo NK70SB", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
@@ -10608 +10885 @@
         SND_PCI_QUIRK(0x1558, 0x7717, "Clevo NS70PU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0x7718, "Clevo L140PU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1558, 0x7724, "Clevo L140AU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0x8228, "Clevo NR40BU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0x8520, "Clevo NH50D[CD]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
@@ -10633 +10911 @@
         SND_PCI_QUIRK(0x1558, 0xa500, "Clevo NL5[03]RU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0xa600, "Clevo NL50NU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1558, 0xa650, "Clevo NP[567]0SN[CD]", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1558, 0xa671, "Clevo NP70SN[CDE]", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 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),
@@ -10678 +10958 @@
         SND_PCI_QUIRK(0x17aa, 0x22c1, "Thinkpad P1 Gen 3", ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK),
         SND_PCI_QUIRK(0x17aa, 0x22c2, "Thinkpad X1 Extreme Gen 3", ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK),
-        SND_PCI_QUIRK(0x17aa, 0x22f1, "Thinkpad", ALC287_FIXUP_CS35L41_I2C_2),
-        SND_PCI_QUIRK(0x17aa, 0x22f2, "Thinkpad", ALC287_FIXUP_CS35L41_I2C_2),
-        SND_PCI_QUIRK(0x17aa, 0x22f3, "Thinkpad", ALC287_FIXUP_CS35L41_I2C_2),
+        SND_PCI_QUIRK(0x17aa, 0x22f1, "Thinkpad", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),
+        SND_PCI_QUIRK(0x17aa, 0x22f2, "Thinkpad", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),
+        SND_PCI_QUIRK(0x17aa, 0x22f3, "Thinkpad", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),
+        SND_PCI_QUIRK(0x17aa, 0x2316, "Thinkpad P1 Gen 6", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),
+        SND_PCI_QUIRK(0x17aa, 0x2317, "Thinkpad P1 Gen 6", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),
+        SND_PCI_QUIRK(0x17aa, 0x2318, "Thinkpad Z13 Gen2", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),
+        SND_PCI_QUIRK(0x17aa, 0x2319, "Thinkpad Z16 Gen2", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),
+        SND_PCI_QUIRK(0x17aa, 0x231a, "Thinkpad Z16 Gen2", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),
         SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
         SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
@@ -10733 +11018 @@
         SND_PCI_QUIRK(0x17aa, 0x511f, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),
         SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),
+        SND_PCI_QUIRK(0x17aa, 0x9e56, "Lenovo ZhaoYang CF4620Z", ALC286_FIXUP_SONY_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1849, 0x1233, "ASRock NUC Box 1100", ALC233_FIXUP_NO_AUDIO_JACK),
         SND_PCI_QUIRK(0x1849, 0xa233, "Positivo Master C6300", ALC269_FIXUP_HEADSET_MIC),
@@ -10761 +11047 @@
         SND_PCI_QUIRK(0x8086, 0x2080, "Intel NUC 8 Rugged", ALC256_FIXUP_INTEL_NUC8_RUGGED),
         SND_PCI_QUIRK(0x8086, 0x2081, "Intel NUC 10", ALC256_FIXUP_INTEL_NUC10),
+        SND_PCI_QUIRK(0x8086, 0x3038, "Intel NUC 13", ALC295_FIXUP_CHROME_BOOK),
         SND_PCI_QUIRK(0xf111, 0x0001, "Framework Laptop", ALC295_FIXUP_FRAMEWORK_LAPTOP_MIC_NO_PRESENCE),
 
@@ -11243 +11530 @@
                 {0x19, 0x03a11030},
                 {0x21, 0x03211020}),
+        SND_HDA_PIN_QUIRK(0x10ec0287, 0x17aa, "Lenovo", ALC287_FIXUP_THINKPAD_I2S_SPK,
+                {0x17, 0x90170110},
+                {0x19, 0x03a11030},
+                {0x21, 0x03211020}),
         SND_HDA_PIN_QUIRK(0x10ec0286, 0x1025, "Acer", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE,
                 {0x12, 0x90a60130},
@@ -11407 +11698 @@
                 {0x19, 0x40000000},
                 {0x1a, 0x40000000}),
+        SND_HDA_PIN_QUIRK(0x10ec0256, 0x1043, "ASUS", ALC2XX_FIXUP_HEADSET_MIC,
+                {0x19, 0x40000000}),
 #endif
         {0}
@@ -11465 +11758 @@
         spec->gen.shared_mic_vref_pin = 0x18;
         codec->power_save_node = 0;
+        spec->en_3kpull_low = true;
 
 #ifdef CONFIG_PM
@@ -11547 +11841 @@
                 spec->init_hook = alc256_init;
                 spec->gen.mixer_nid = 0; /* ALC256 does not have any loopback mixer path */
+                if (codec->core.vendor_id == 0x10ec0236 &&
+                    codec->bus->pci->vendor != PCI_VENDOR_ID_AMD)
+                        spec->en_3kpull_low = false;
                 break;
         case 0x10ec0257:
@@ -11553 +11850 @@
                 spec->init_hook = alc256_init;
                 spec->gen.mixer_nid = 0;
+                spec->en_3kpull_low = false;
                 break;
         case 0x10ec0215:
@@ -12223 +12521 @@
         ALC897_FIXUP_LENOVO_HEADSET_MODE,
         ALC897_FIXUP_HEADSET_MIC_PIN2,
+        ALC897_FIXUP_UNIS_H3C_X500S,
 };
 
@@ -12851 +13150 @@
                 .chained = true,
                 .chain_id = ALC897_FIXUP_LENOVO_HEADSET_MODE
+        },
+        [ALC897_FIXUP_UNIS_H3C_X500S] = {
+                .type = HDA_FIXUP_VERBS,
+                .v.verbs = (const struct hda_verb[]) {
+                        { 0x14, AC_VERB_SET_EAPD_BTLENABLE, 0 },
+                        {}
+                },
         },
 #endif
@@ -12880 +13186 @@
         SND_PCI_QUIRK(0x103c, 0x870c, "HP", ALC897_FIXUP_HP_HSMIC_VERB),
         SND_PCI_QUIRK(0x103c, 0x8719, "HP", ALC897_FIXUP_HP_HSMIC_VERB),
+        SND_PCI_QUIRK(0x103c, 0x872b, "HP", ALC897_FIXUP_HP_HSMIC_VERB),
         SND_PCI_QUIRK(0x103c, 0x873e, "HP", ALC671_FIXUP_HP_HEADSET_MIC2),
+        SND_PCI_QUIRK(0x103c, 0x8768, "HP Slim Desktop S01", ALC671_FIXUP_HP_HEADSET_MIC2),
         SND_PCI_QUIRK(0x103c, 0x877e, "HP 288 Pro G6", ALC671_FIXUP_HP_HEADSET_MIC2),
         SND_PCI_QUIRK(0x103c, 0x885f, "HP 288 Pro G8", ALC671_FIXUP_HP_HEADSET_MIC2),
@@ -12902 +13210 @@
         SND_PCI_QUIRK(0x17aa, 0x1036, "Lenovo P520", ALC662_FIXUP_LENOVO_MULTI_CODECS),
         SND_PCI_QUIRK(0x17aa, 0x1057, "Lenovo P360", ALC897_FIXUP_HEADSET_MIC_PIN),
+        SND_PCI_QUIRK(0x17aa, 0x1064, "Lenovo P3 Tower", ALC897_FIXUP_HEADSET_MIC_PIN),
         SND_PCI_QUIRK(0x17aa, 0x32ca, "Lenovo ThinkCentre M80", ALC897_FIXUP_HEADSET_MIC_PIN),
         SND_PCI_QUIRK(0x17aa, 0x32cb, "Lenovo ThinkCentre M70", ALC897_FIXUP_HEADSET_MIC_PIN),
         SND_PCI_QUIRK(0x17aa, 0x32cf, "Lenovo ThinkCentre M950", ALC897_FIXUP_HEADSET_MIC_PIN),
         SND_PCI_QUIRK(0x17aa, 0x32f7, "Lenovo ThinkCentre M90", ALC897_FIXUP_HEADSET_MIC_PIN),
+        SND_PCI_QUIRK(0x17aa, 0x3321, "Lenovo ThinkCentre M70 Gen4", ALC897_FIXUP_HEADSET_MIC_PIN),
+        SND_PCI_QUIRK(0x17aa, 0x331b, "Lenovo ThinkCentre M90 Gen4", ALC897_FIXUP_HEADSET_MIC_PIN),
         SND_PCI_QUIRK(0x17aa, 0x3742, "Lenovo TianYi510Pro-14IOB", ALC897_FIXUP_HEADSET_MIC_PIN2),
         SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo Ideapad Y550P", ALC662_FIXUP_IDEAPAD),
@@ -12914 +13225 @@
         SND_PCI_QUIRK(0x1b35, 0x1234, "CZC ET26", ALC662_FIXUP_CZC_ET26),
         SND_PCI_QUIRK(0x1b35, 0x2206, "CZC P10T", ALC662_FIXUP_CZC_P10T),
+        SND_PCI_QUIRK(0x1c6c, 0x1239, "Compaq N14JP6-V2", ALC897_FIXUP_HP_HSMIC_VERB),
 
 #if 0
@@ -13008 +13320 @@
         {.id = ALC662_FIXUP_LENOVO_MULTI_CODECS, .name = "dual-codecs"},
         {.id = ALC669_FIXUP_ACER_ASPIRE_ETHOS, .name = "aspire-ethos"},
+        {.id = ALC897_FIXUP_UNIS_H3C_X500S, .name = "unis-h3c-x500s"},
         {0}
 };

GPL/branches/uniaud32-exp/alsa-kernel/pci/hda/patch_sigmatel.c

@@ -1728 +1728 @@
 
 static const struct hda_pintbl ref92hd73xx_pin_configs[] = {
+        // Port A-H
         { 0x0a, 0x02214030 },
         { 0x0b, 0x02a19040 },
@@ -1736 +1737 @@
         { 0x10, 0x01014020 },
         { 0x11, 0x01014030 },
+        // CD in
         { 0x12, 0x02319040 },
+        // Digial Mic ins
         { 0x13, 0x90a000f0 },
         { 0x14, 0x90a000f0 },
+        // Digital outs
         { 0x22, 0x01452050 },
         { 0x23, 0x01452050 },
@@ -1779 +1783 @@
 
 static const struct hda_pintbl intel_dg45id_pin_configs[] = {
+        // Analog outputs
         { 0x0a, 0x02214230 },
         { 0x0b, 0x02A19240 },
@@ -1786 +1791 @@
         { 0x0f, 0x01011212 },
         { 0x10, 0x01016211 },
+        // Digital output
+        { 0x22, 0x01451380 },
+        { 0x23, 0x40f000f0 },
         {0}
 };
@@ -1991 +1999 @@
         SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,
                                 "DFI LanParty", STAC_92HD73XX_REF),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5001,
+                                "Intel DP45SG", STAC_92HD73XX_INTEL),
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5002,
                                 "Intel DG45ID", STAC_92HD73XX_INTEL),

GPL/branches/uniaud32-exp/alsa-kernel/pci/ymfpci/ymfpci.c

@@ -155 +155 @@
 #endif /* SUPPORT_JOYSTICK */
 
-static int snd_card_ymfpci_probe(struct pci_dev *pci,
-                                 const struct pci_device_id *pci_id)
+static int __snd_card_ymfpci_probe(struct pci_dev *pci,
+                                   const struct pci_device_id *pci_id)
 {
         static int dev;
@@ -175 +175 @@
         }
 
-        err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
+        err = snd_devm_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
                            sizeof(*chip), &card);
         if (err < 0)
@@ -338 +338 @@
 }
 
+static int snd_card_ymfpci_probe(struct pci_dev *pci,
+                                 const struct pci_device_id *pci_id)
+{
+        return snd_card_free_on_error(&pci->dev, __snd_card_ymfpci_probe(pci, pci_id));
+}
+
 static struct pci_driver ymfpci_driver = {
         .name = KBUILD_MODNAME,

GPL/branches/uniaud32-exp/alsa-kernel/pci/ymfpci/ymfpci_main.c

@@ -1832 +1832 @@
                 return -ENXIO;
         kctl = snd_ctl_new1(&snd_ymfpci_spdif_default, chip);
+        kctl->id.device = chip->pcm_spdif->device;
         err = snd_ctl_add(chip->card, kctl);
         if (err < 0)
                 return err;
+        kctl = snd_ctl_new1(&snd_ymfpci_spdif_mask, chip);
         kctl->id.device = chip->pcm_spdif->device;
-        kctl = snd_ctl_new1(&snd_ymfpci_spdif_mask, chip);
         err = snd_ctl_add(chip->card, kctl);
         if (err < 0)
                 return err;
+        kctl = snd_ctl_new1(&snd_ymfpci_spdif_stream, chip);
         kctl->id.device = chip->pcm_spdif->device;
-        kctl = snd_ctl_new1(&snd_ymfpci_spdif_stream, chip);
         err = snd_ctl_add(chip->card, kctl);
         if (err < 0)
                 return err;
-        kctl->id.device = chip->pcm_spdif->device;
         chip->spdif_pcm_ctl = kctl;
 
@@ -2170 +2170 @@
         chip->work_base_addr = ptr_addr;
         
-        snd_BUG_ON(ptr + chip->work_size !=
+        snd_BUG_ON(ptr + PAGE_ALIGN(chip->work_size) !=
                    chip->work_ptr->area + chip->work_ptr->bytes);