Changeset 417

Timestamp:

Mar 23, 2009, 12:06:21 AM (16 years ago)

Author:

Paul Smedley

Message:

Revert alsa-kernel/hda/* to 1.0.18a level to fix traps

Location:

GPL/branches/uniaud32-2.0/alsa-kernel/pci/hda

Files:

• hda_beep.h (modified) (1 diff)
• hda_codec.c (modified) (96 diffs)
• hda_codec.h (modified) (11 diffs)
• hda_generic.c (modified) (6 diffs)
• hda_hwdep.c (modified) (5 diffs)
• hda_intel.c (modified) (22 diffs)
• hda_local.h (modified) (4 diffs)
• hda_proc.c (modified) (5 diffs)
• patch_analog.c (modified) (11 diffs)
• patch_atihdmi.c (modified) (2 diffs)
• patch_cmedia.c (modified) (2 diffs)
• patch_conexant.c (modified) (11 diffs)
• patch_realtek.c (modified) (38 diffs)
• patch_si3054.c (modified) (3 diffs)
• patch_sigmatel.c (modified) (135 diffs)
• patch_via.c (modified) (3 diffs)

GPL/branches/uniaud32-2.0/alsa-kernel/pci/hda/hda_beep.h

@@ -32 +32 @@
         int tone;
         int nid;
-        int enabled;
         struct work_struct beep_work; /* scheduled task for beep event */
 };

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

@@ -32 +32 @@
 #include "hda_local.h"
 #include <sound/hda_hwdep.h>
+#include "hda_patch.h"  /* codec presets */
+
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+/* define this option here to hide as static */
+static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT;
+module_param(power_save, int, 0644);
+MODULE_PARM_DESC(power_save, "Automatic power-saving timeout "
+                 "(in second, 0 = disable).");
+#endif
 
 /*
@@ -47 +56 @@
         { 0x1057, "Motorola" },
         { 0x1095, "Silicon Image" },
-        { 0x10de, "Nvidia" },
         { 0x10ec, "Realtek" },
         { 0x1106, "VIA" },
@@ -59 +67 @@
         { 0x1aec, "Wolfson Microelectronics" },
         { 0x434d, "C-Media" },
-        { 0x8086, "Intel" },
         { 0x8384, "SigmaTel" },
         {0} /* terminator */
 };
 
-static DEFINE_MUTEX(preset_mutex);
-static LIST_HEAD(hda_preset_tables);
-
-int snd_hda_add_codec_preset(struct hda_codec_preset_list *preset)
-{
-        mutex_lock(&preset_mutex);
-        list_add_tail(&preset->list, &hda_preset_tables);
-        mutex_unlock(&preset_mutex);
-        return 0;
-}
-EXPORT_SYMBOL_HDA(snd_hda_add_codec_preset);
-
-int snd_hda_delete_codec_preset(struct hda_codec_preset_list *preset)
-{
-        mutex_lock(&preset_mutex);
-        list_del(&preset->list);
-        mutex_unlock(&preset_mutex);
-        return 0;
-}
-EXPORT_SYMBOL_HDA(snd_hda_delete_codec_preset);
+static const struct hda_codec_preset *hda_preset_tables[] = {
+#ifdef CONFIG_SND_HDA_CODEC_REALTEK
+        snd_hda_preset_realtek,
+#endif
+#ifdef CONFIG_SND_HDA_CODEC_CMEDIA
+        snd_hda_preset_cmedia,
+#endif
+#ifdef CONFIG_SND_HDA_CODEC_ANALOG
+        snd_hda_preset_analog,
+#endif
+#ifdef CONFIG_SND_HDA_CODEC_SIGMATEL
+        snd_hda_preset_sigmatel,
+#endif
+#ifdef CONFIG_SND_HDA_CODEC_SI3054
+        snd_hda_preset_si3054,
+#endif
+#ifdef CONFIG_SND_HDA_CODEC_ATIHDMI
+        snd_hda_preset_atihdmi,
+#endif
+#ifdef CONFIG_SND_HDA_CODEC_CONEXANT
+        snd_hda_preset_conexant,
+#endif
+#ifdef CONFIG_SND_HDA_CODEC_VIA
+        snd_hda_preset_via,
+#endif
+#ifdef CONFIG_SND_HDA_CODEC_NVHDMI
+        snd_hda_preset_nvhdmi,
+#endif
+#ifdef CONFIG_SND_HDA_CODEC_INTELHDMI
+        snd_hda_preset_intelhdmi,
+#endif
+        NULL
+};
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
@@ -117 +137 @@
         return "UNKNOWN";
 }
-EXPORT_SYMBOL_HDA(snd_hda_get_jack_location);
 
 const char *snd_hda_get_jack_connectivity(u32 cfg)
@@ -125 +144 @@
         return jack_locations[(cfg >> (AC_DEFCFG_LOCATION_SHIFT + 4)) & 3];
 }
-EXPORT_SYMBOL_HDA(snd_hda_get_jack_connectivity);
 
 const char *snd_hda_get_jack_type(u32 cfg)
@@ -139 +157 @@
                                 >> AC_DEFCFG_DEVICE_SHIFT];
 }
-EXPORT_SYMBOL_HDA(snd_hda_get_jack_type);
 
 /*
@@ -188 +205 @@
         return res;
 }
-EXPORT_SYMBOL_HDA(snd_hda_codec_read);
 
 /**
@@ -217 +233 @@
         return err;
 }
-EXPORT_SYMBOL_HDA(snd_hda_codec_write);
 
 /**
@@ -232 +247 @@
                 snd_hda_codec_write(codec, seq->nid, 0, seq->verb, seq->param);
 }
-EXPORT_SYMBOL_HDA(snd_hda_sequence_write);
 
 /**
@@ -254 +268 @@
         return (int)(parm & 0x7fff);
 }
-EXPORT_SYMBOL_HDA(snd_hda_get_sub_nodes);
 
 /**
@@ -343 +356 @@
         return conns;
 }
-EXPORT_SYMBOL_HDA(snd_hda_get_connections);
 
 
@@ -374 +386 @@
         unsol->queue[wp + 1] = res_ex;
 
-        queue_work(bus->workq, &unsol->work);
-
-        return 0;
-}
-EXPORT_SYMBOL_HDA(snd_hda_queue_unsol_event);
+/* 2.4 kernels seem to have a problem with workq wrapper... */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+        schedule_work(&unsol->work);
+#endif
+        return 0;
+}
 
 /*
@@ -440 +453 @@
         if (!bus)
                 return 0;
-        if (bus->workq)
-                flush_workqueue(bus->workq);
-        if (bus->unsol)
+        if (bus->unsol) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+                flush_scheduled_work();
+#endif
                 kfree(bus->unsol);
+        }
         list_for_each_entry_safe(codec, n, &bus->codec_list, list, struct hda_codec) {
                 snd_hda_codec_free(codec);
@@ -449 +464 @@
         if (bus->ops.private_free)
                 bus->ops.private_free(bus);
-        if (bus->workq)
-                destroy_workqueue(bus->workq);
         kfree(bus);
         return 0;
@@ -458 +471 @@
 {
         struct hda_bus *bus = device->device_data;
-        bus->shutdown = 1;
         return snd_hda_bus_free(bus);
 }
@@ -484 +496 @@
  * Returns 0 if successful, or a negative error code.
  */
-int /*__devinit*/ snd_hda_bus_new(struct snd_card *card,
+int __devinit snd_hda_bus_new(struct snd_card *card,
                               const struct hda_bus_template *temp,
                               struct hda_bus **busp)
@@ -490 +502 @@
         struct hda_bus *bus;
         int err;
-        char qname[8];
         static struct snd_device_ops dev_ops = {
                 .dev_register = snd_hda_bus_dev_register,
@@ -514 +525 @@
         bus->pci = temp->pci;
         bus->modelname = temp->modelname;
-        bus->power_save = temp->power_save;
         bus->ops = temp->ops;
 
         mutex_init(&bus->cmd_mutex);
         INIT_LIST_HEAD(&bus->codec_list);
-
-        snprintf(qname, sizeof(qname), "hda%d", card->number);
-        bus->workq = create_workqueue(qname);
-        if (!bus->workq) {
-                snd_printk(KERN_ERR "cannot create workqueue %s\n", qname);
-                kfree(bus);
-                return -ENOMEM;
-        }
 
         err = snd_device_new(card, SNDRV_DEV_BUS, bus, &dev_ops);
@@ -537 +539 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_bus_new);
 
 #ifdef CONFIG_SND_HDA_GENERIC
@@ -546 +547 @@
 #endif
 
-#ifdef MODULE
-#define HDA_MODREQ_MAX_COUNT    2       /* two request_modules()'s */
-#else
-#define HDA_MODREQ_MAX_COUNT    0       /* all presets are statically linked */
-#endif
-
 /*
  * find a matching codec preset
@@ -558 +553 @@
 find_codec_preset(struct hda_codec *codec)
 {
-        struct hda_codec_preset_list *tbl;
-        const struct hda_codec_preset *preset;
-        int mod_requested = 0;
+        const struct hda_codec_preset **tbl, *preset;
 
         if (is_generic_config(codec))
                 return NULL; /* use the generic parser */
 
- again:
-        mutex_lock(&preset_mutex);
-        list_for_each_entry(tbl, &hda_preset_tables, list, struct hda_codec_preset_list) {
-                if (!try_module_get(tbl->owner)) {
-                        snd_printk(KERN_ERR "hda_codec: cannot module_get\n");
-                        continue;
-                }
-                for (preset = tbl->preset; preset->id; preset++) {
+        for (tbl = hda_preset_tables; *tbl; tbl++) {
+                for (preset = *tbl; preset->id; preset++) {
                         u32 mask = preset->mask;
                         if (preset->afg && preset->afg != codec->afg)
@@ -582 +569 @@
                         if (preset->id == (codec->vendor_id & mask) &&
                             (!preset->rev ||
-                             preset->rev == codec->revision_id)) {
-                                mutex_unlock(&preset_mutex);
-                                codec->owner = tbl->owner;
+                             preset->rev == codec->revision_id))
                                 return preset;
-                        }
                 }
-                module_put(tbl->owner);
-        }
-        mutex_unlock(&preset_mutex);
-
-#ifndef TARGET_OS2
-        if (mod_requested < HDA_MODREQ_MAX_COUNT) {
-                char name[32];
-                if (!mod_requested)
-                        snprintf(name, sizeof(name), "snd-hda-codec-id:%08x",
-                                 codec->vendor_id);
-                else
-                        snprintf(name, sizeof(name), "snd-hda-codec-id:%04x*",
-                                 (codec->vendor_id >> 16) & 0xffff);
-                request_module(name);
-                mod_requested++;
-                goto again;
-        }
-#endif
+        }
         return NULL;
 }
@@ -644 +611 @@
  * look for an AFG and MFG nodes
  */
-static void /*__devinit*/ setup_fg_nodes(struct hda_codec *codec)
+static void __devinit setup_fg_nodes(struct hda_codec *codec)
 {
         int i, total_nodes;
@@ -700 +667 @@
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         cancel_delayed_work(&codec->power_work);
-        flush_workqueue(codec->bus->workq);
+        flush_scheduled_work();
 #endif
         list_del(&codec->list);
@@ -707 +674 @@
         if (codec->patch_ops.free)
                 codec->patch_ops.free(codec);
-        module_put(codec->owner);
         free_hda_cache(&codec->amp_cache);
         free_hda_cache(&codec->cmd_cache);
@@ -724 +690 @@
  * Returns 0 if successful, or a negative error code.
  */
-int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
-                                    int do_init, struct hda_codec **codecp)
+int __devinit snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
+                                struct hda_codec **codecp)
 {
         struct hda_codec *codec;
@@ -751 +717 @@
         codec->addr = codec_addr;
         mutex_init(&codec->spdif_mutex);
-        mutex_init(&codec->control_mutex);
         init_hda_cache(&codec->amp_cache, sizeof(struct hda_amp_info));
         init_hda_cache(&codec->cmd_cache, sizeof(struct hda_cache_head));
@@ -810 +775 @@
                 codec->modelname = kstrdup(bus->modelname, GFP_KERNEL);
 
-        if (do_init) {
-                err = snd_hda_codec_configure(codec);
-                if (err < 0) {
-                        snd_hda_codec_free(codec);
-                        return err;
-                }
+        err = snd_hda_codec_configure(codec);
+        if (err < 0) {
+                snd_hda_codec_free(codec);
+                return err;
         }
         snd_hda_codec_proc_new(codec);
@@ -829 +792 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_codec_new);
 
 int snd_hda_codec_configure(struct hda_codec *codec)
@@ -889 +851 @@
         snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_STREAM_FORMAT, format);
 }
-EXPORT_SYMBOL_HDA(snd_hda_codec_setup_stream);
 
 void snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid)
@@ -903 +864 @@
 #endif
 }
-EXPORT_SYMBOL_HDA(snd_hda_codec_cleanup_stream);
 
 /*
@@ -915 +875 @@
 
 /* initialize the hash table */
-static void /*__devinit*/ init_hda_cache(struct hda_cache_rec *cache,
+static void __devinit init_hda_cache(struct hda_cache_rec *cache,
                                      unsigned int record_size)
 {
@@ -985 +945 @@
         return info->amp_caps;
 }
-EXPORT_SYMBOL_HDA(query_amp_caps);
 
 int snd_hda_override_amp_caps(struct hda_codec *codec, hda_nid_t nid, int dir,
@@ -999 +958 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_override_amp_caps);
 
 /*
@@ -1053 +1011 @@
         return get_vol_mute(codec, info, nid, ch, direction, index);
 }
-EXPORT_SYMBOL_HDA(snd_hda_codec_amp_read);
 
 /*
@@ -1073 +1030 @@
         return 1;
 }
-EXPORT_SYMBOL_HDA(snd_hda_codec_amp_update);
 
 /*
@@ -1087 +1043 @@
         return ret;
 }
-EXPORT_SYMBOL_HDA(snd_hda_codec_amp_stereo);
 
 #ifdef SND_HDA_NEEDS_RESUME
@@ -1113 +1068 @@
         }
 }
-EXPORT_SYMBOL_HDA(snd_hda_codec_resume_amp);
 #endif /* SND_HDA_NEEDS_RESUME */
 
@@ -1141 +1095 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_volume_info);
 
 int snd_hda_mixer_amp_volume_get(struct snd_kcontrol *kcontrol,
@@ -1161 +1114 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_volume_get);
 
 int snd_hda_mixer_amp_volume_put(struct snd_kcontrol *kcontrol,
@@ -1186 +1138 @@
         return change;
 }
-EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_volume_put);
 
 int snd_hda_mixer_amp_tlv(struct snd_kcontrol *kcontrol, int op_flag,
@@ -1213 +1164 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_tlv);
 
 /*
@@ -1233 +1183 @@
         tlv[3] = step;
 }
-EXPORT_SYMBOL_HDA(snd_hda_set_vmaster_tlv);
 
 /* find a mixer control element with the given name */
@@ -1253 +1202 @@
         return _snd_hda_find_mixer_ctl(codec, name, 0);
 }
-EXPORT_SYMBOL_HDA(snd_hda_find_mixer_ctl);
 
 /* Add a control element and assign to the codec */
@@ -1270 +1218 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_ctl_add);
-
-#ifdef CONFIG_SND_HDA_RECONFIG
+
 /* Clear all controls assigned to the given codec */
 void snd_hda_ctls_clear(struct hda_codec *codec)
@@ -1289 +1235 @@
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         cancel_delayed_work(&codec->power_work);
-        flush_workqueue(codec->bus->workq);
+        flush_scheduled_work();
 #endif
         snd_hda_ctls_clear(codec);
         /* relase PCMs */
         for (i = 0; i < codec->num_pcms; i++) {
-                if (codec->pcm_info[i].pcm) {
+                if (codec->pcm_info[i].pcm)
                         snd_device_free(codec->bus->card,
                                         codec->pcm_info[i].pcm);
-                        clear_bit(codec->pcm_info[i].device,
-                                  codec->bus->pcm_dev_bits);
-                }
         }
         if (codec->patch_ops.free)
                 codec->patch_ops.free(codec);
-        codec->proc_widget_hook = NULL;
         codec->spec = NULL;
         free_hda_cache(&codec->amp_cache);
         free_hda_cache(&codec->cmd_cache);
-        init_hda_cache(&codec->amp_cache, sizeof(struct hda_amp_info));
-        init_hda_cache(&codec->cmd_cache, sizeof(struct hda_cache_head));
         codec->num_pcms = 0;
         codec->pcm_info = NULL;
         codec->preset = NULL;
-        module_put(codec->owner);
-        codec->owner = NULL;
-}
-#endif /* CONFIG_SND_HDA_RECONFIG */
+}
 
 /* create a virtual master control and add slaves */
@@ -1352 +1289 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_add_vmaster);
 
 /* switch */
@@ -1366 +1302 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_info);
 
 int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol,
@@ -1386 +1321 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_get);
 
 int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol,
@@ -1417 +1351 @@
         return change;
 }
-EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_put);
 
 /*
@@ -1435 +1368 @@
         int err;
 
-        mutex_lock(&codec->control_mutex);
+        mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
         pval = kcontrol->private_value;
         kcontrol->private_value = pval & ~AMP_VAL_IDX_MASK; /* index 0 */
         err = snd_hda_mixer_amp_switch_get(kcontrol, ucontrol);
         kcontrol->private_value = pval;
-        mutex_unlock(&codec->control_mutex);
+        mutex_unlock(&codec->spdif_mutex);
         return err;
 }
-EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_switch_get);
 
 int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol,
@@ -1452 +1384 @@
         int i, indices, err = 0, change = 0;
 
-        mutex_lock(&codec->control_mutex);
+        mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
         pval = kcontrol->private_value;
         indices = (pval & AMP_VAL_IDX_MASK) >> AMP_VAL_IDX_SHIFT;
@@ -1464 +1396 @@
         }
         kcontrol->private_value = pval;
-        mutex_unlock(&codec->control_mutex);
+        mutex_unlock(&codec->spdif_mutex);
         return err < 0 ? err : change;
 }
-EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_switch_put);
 
 /*
@@ -1479 +1410 @@
         int err;
 
-        mutex_lock(&codec->control_mutex);
+        mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
         c = (struct hda_bind_ctls *)kcontrol->private_value;
         kcontrol->private_value = *c->values;
         err = c->ops->info(kcontrol, uinfo);
         kcontrol->private_value = (long)c;
-        mutex_unlock(&codec->control_mutex);
+        mutex_unlock(&codec->spdif_mutex);
         return err;
 }
-EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_ctls_info);
 
 int snd_hda_mixer_bind_ctls_get(struct snd_kcontrol *kcontrol,
@@ -1496 +1426 @@
         int err;
 
-        mutex_lock(&codec->control_mutex);
+        mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
         c = (struct hda_bind_ctls *)kcontrol->private_value;
         kcontrol->private_value = *c->values;
         err = c->ops->get(kcontrol, ucontrol);
         kcontrol->private_value = (long)c;
-        mutex_unlock(&codec->control_mutex);
+        mutex_unlock(&codec->spdif_mutex);
         return err;
 }
-EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_ctls_get);
 
 int snd_hda_mixer_bind_ctls_put(struct snd_kcontrol *kcontrol,
@@ -1514 +1443 @@
         int err = 0, change = 0;
 
-        mutex_lock(&codec->control_mutex);
+        mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
         c = (struct hda_bind_ctls *)kcontrol->private_value;
         for (vals = c->values; *vals; vals++) {
@@ -1524 +1453 @@
         }
         kcontrol->private_value = (long)c;
-        mutex_unlock(&codec->control_mutex);
+        mutex_unlock(&codec->spdif_mutex);
         return err < 0 ? err : change;
 }
-EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_ctls_put);
 
 int snd_hda_mixer_bind_tlv(struct snd_kcontrol *kcontrol, int op_flag,
@@ -1536 +1464 @@
         int err;
 
-        mutex_lock(&codec->control_mutex);
+        mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
         c = (struct hda_bind_ctls *)kcontrol->private_value;
         kcontrol->private_value = *c->values;
         err = c->ops->tlv(kcontrol, op_flag, size, tlv);
         kcontrol->private_value = (long)c;
-        mutex_unlock(&codec->control_mutex);
+        mutex_unlock(&codec->spdif_mutex);
         return err;
 }
-EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_tlv);
 
 struct hda_ctl_ops snd_hda_bind_vol = {
@@ -1552 +1479 @@
         .tlv = snd_hda_mixer_amp_tlv
 };
-EXPORT_SYMBOL_HDA(snd_hda_bind_vol);
 
 struct hda_ctl_ops snd_hda_bind_sw = {
@@ -1560 +1486 @@
         .tlv = snd_hda_mixer_amp_tlv
 };
-EXPORT_SYMBOL_HDA(snd_hda_bind_sw);
 
 /*
@@ -1667 +1592 @@
         hda_nid_t *d;
 
-        snd_hda_codec_write_cache(codec, nid, 0, verb, val);
+        snd_hda_codec_write(codec, nid, 0, verb, val);
         d = codec->slave_dig_outs;
         if (!d)
                 return;
         for (; *d; d++)
-                snd_hda_codec_write_cache(codec, *d, 0, verb, val);
+                snd_hda_codec_write(codec, *d, 0, verb, val);
 }
 
@@ -1822 +1747 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_create_spdif_out_ctls);
 
 /*
@@ -1860 +1784 @@
                            snd_ctl_new1(&spdif_share_sw, mout));
 }
-EXPORT_SYMBOL_HDA(snd_hda_create_spdif_share_sw);
 
 /*
@@ -1970 +1893 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_create_spdif_in_ctls);
 
 #ifdef SND_HDA_NEEDS_RESUME
@@ -2016 +1938 @@
         return err;
 }
-EXPORT_SYMBOL_HDA(snd_hda_codec_write_cache);
 
 /* resume the all commands from the cache */
@@ -2032 +1953 @@
         }
 }
-EXPORT_SYMBOL_HDA(snd_hda_codec_resume_cache);
 
 /**
@@ -2050 +1970 @@
                                           seq->param);
 }
-EXPORT_SYMBOL_HDA(snd_hda_sequence_write_cache);
 #endif /* SND_HDA_NEEDS_RESUME */
 
@@ -2169 +2088 @@
  * Returns 0 if successful, otherwise a negative error code.
  */
-int /*__devinit*/ snd_hda_build_controls(struct hda_bus *bus)
+int __devinit snd_hda_build_controls(struct hda_bus *bus)
 {
         struct hda_codec *codec;
@@ -2181 +2100 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_build_controls);
 
 int snd_hda_codec_build_controls(struct hda_codec *codec)
@@ -2293 +2211 @@
         return val;
 }
-EXPORT_SYMBOL_HDA(snd_hda_calc_stream_format);
 
 /**
@@ -2308 +2225 @@
  * Returns 0 if successful, otherwise a negative error code.
  */
-static int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid,
+int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid,
                                 u32 *ratesp, u64 *formatsp, unsigned int *bpsp)
 {
@@ -2473 +2390 @@
         return 1;
 }
-EXPORT_SYMBOL_HDA(snd_hda_is_supported_format);
 
 /*
@@ -2531 +2447 @@
 
 /*
- * get the empty PCM device number to assign
- */
-static int get_empty_pcm_device(struct hda_bus *bus, int type)
+ * attach a new PCM stream
+ */
+static int __devinit
+snd_hda_attach_pcm(struct hda_codec *codec, struct hda_pcm *pcm)
+{
+        struct hda_bus *bus = codec->bus;
+        struct hda_pcm_stream *info;
+        int stream, err;
+
+        if (snd_BUG_ON(!pcm->name))
+                return -EINVAL;
+        for (stream = 0; stream < 2; stream++) {
+                info = &pcm->stream[stream];
+                if (info->substreams) {
+                        err = set_pcm_default_values(codec, info);
+                        if (err < 0)
+                                return err;
+                }
+        }
+        return bus->ops.attach_pcm(bus, codec, pcm);
+}
+
+/**
+ * snd_hda_build_pcms - build PCM information
+ * @bus: the BUS
+ *
+ * Create PCM information for each codec included in the bus.
+ *
+ * The build_pcms codec patch is requested to set up codec->num_pcms and
+ * codec->pcm_info properly.  The array is referred by the top-level driver
+ * to create its PCM instances.
+ * The allocated codec->pcm_info should be released in codec->patch_ops.free
+ * callback.
+ *
+ * At least, substreams, channels_min and channels_max must be filled for
+ * each stream.  substreams = 0 indicates that the stream doesn't exist.
+ * When rates and/or formats are zero, the supported values are queried
+ * from the given nid.  The nid is used also by the default ops.prepare
+ * and ops.cleanup callbacks.
+ *
+ * The driver needs to call ops.open in its open callback.  Similarly,
+ * ops.close is supposed to be called in the close callback.
+ * ops.prepare should be called in the prepare or hw_params callback
+ * with the proper parameters for set up.
+ * ops.cleanup should be called in hw_free for clean up of streams.
+ *
+ * This function returns 0 if successfull, or a negative error code.
+ */
+int snd_hda_build_pcms(struct hda_bus *bus)
 {
         static const char *dev_name[HDA_PCM_NTYPES] = {
@@ -2547 +2509 @@
         /* normal audio device indices; not linear to keep compatibility */
         static int audio_idx[4] = { 0, 2, 4, 5 };
-        int i, dev;
-
-        switch (type) {
-        case HDA_PCM_TYPE_AUDIO:
-                for (i = 0; i < ARRAY_SIZE(audio_idx); i++) {
-                        dev = audio_idx[i];
-                        if (!test_bit(dev, bus->pcm_dev_bits))
-                                break;
-                }
-                if (i >= ARRAY_SIZE(audio_idx)) {
-                        snd_printk(KERN_WARNING "Too many audio devices\n");
-                        return -EAGAIN;
-                }
-                break;
-        case HDA_PCM_TYPE_SPDIF:
-        case HDA_PCM_TYPE_HDMI:
-        case HDA_PCM_TYPE_MODEM:
-                dev = dev_idx[type];
-                if (test_bit(dev, bus->pcm_dev_bits)) {
-                        snd_printk(KERN_WARNING "%s already defined\n",
-                                   dev_name[type]);
-                        return -EAGAIN;
-                }
-                break;
-        default:
-                snd_printk(KERN_WARNING "Invalid PCM type %d\n", type);
-                return -EINVAL;
-        }
-        set_bit(dev, bus->pcm_dev_bits);
-        return dev;
-}
-
-/*
- * attach a new PCM stream
- */
-static int snd_hda_attach_pcm(struct hda_codec *codec, struct hda_pcm *pcm)
-{
-        struct hda_bus *bus = codec->bus;
-        struct hda_pcm_stream *info;
-        int stream, err;
-
-        if (snd_BUG_ON(!pcm->name))
-                return -EINVAL;
-        for (stream = 0; stream < 2; stream++) {
-                info = &pcm->stream[stream];
-                if (info->substreams) {
-                        err = set_pcm_default_values(codec, info);
+        struct hda_codec *codec;
+        int num_devs[HDA_PCM_NTYPES];
+
+        memset(num_devs, 0, sizeof(num_devs));
+        list_for_each_entry(codec, &bus->codec_list, list, struct hda_codec) {
+                unsigned int pcm;
+                int err;
+                if (!codec->num_pcms) {
+                        if (!codec->patch_ops.build_pcms)
+                                continue;
+                        err = codec->patch_ops.build_pcms(codec);
                         if (err < 0)
                                 return err;
                 }
-        }
-        return bus->ops.attach_pcm(bus, codec, pcm);
-}
-
-/* assign all PCMs of the given codec */
-int snd_hda_codec_build_pcms(struct hda_codec *codec)
-{
-        unsigned int pcm;
-        int err;
-
-        if (!codec->num_pcms) {
-                if (!codec->patch_ops.build_pcms)
-                        return 0;
-                err = codec->patch_ops.build_pcms(codec);
-                if (err < 0)
-                        return err;
-        }
-        for (pcm = 0; pcm < codec->num_pcms; pcm++) {
-                struct hda_pcm *cpcm = &codec->pcm_info[pcm];
-                int dev;
-
-                if (!cpcm->stream[0].substreams && !cpcm->stream[1].substreams)
-                        return 0; /* no substreams assigned */
-
-                if (!cpcm->pcm) {
-                        dev = get_empty_pcm_device(codec->bus, cpcm->pcm_type);
-                        if (dev < 0)
-                                return 0;
-                        cpcm->device = dev;
-                        err = snd_hda_attach_pcm(codec, cpcm);
-                        if (err < 0)
-                                return err;
+                for (pcm = 0; pcm < codec->num_pcms; pcm++) {
+                        struct hda_pcm *cpcm = &codec->pcm_info[pcm];
+                        int type = cpcm->pcm_type;
+                        int dev;
+
+                        if (!cpcm->stream[0].substreams &&
+                            !cpcm->stream[1].substreams)
+                                continue; /* no substreams assigned */
+
+                        switch (type) {
+                        case HDA_PCM_TYPE_AUDIO:
+                                if (num_devs[type] >= ARRAY_SIZE(audio_idx)) {
+                                        snd_printk(KERN_WARNING
+                                                   "Too many audio devices\n");
+                                        continue;
+                                }
+                                dev = audio_idx[num_devs[type]];
+                                break;
+                        case HDA_PCM_TYPE_SPDIF:
+                        case HDA_PCM_TYPE_HDMI:
+                        case HDA_PCM_TYPE_MODEM:
+                                if (num_devs[type]) {
+                                        snd_printk(KERN_WARNING
+                                                   "%s already defined\n",
+                                                   dev_name[type]);
+                                        continue;
+                                }
+                                dev = dev_idx[type];
+                                break;
+                        default:
+                                snd_printk(KERN_WARNING
+                                           "Invalid PCM type %d\n", type);
+                                continue;
+                        }
+                        num_devs[type]++;
+                        if (!cpcm->pcm) {
+                                cpcm->device = dev;
+                                err = snd_hda_attach_pcm(codec, cpcm);
+                                if (err < 0)
+                                        return err;
+                        }
                 }
         }
         return 0;
 }
-
-/**
- * snd_hda_build_pcms - build PCM information
- * @bus: the BUS
- *
- * Create PCM information for each codec included in the bus.
- *
- * The build_pcms codec patch is requested to set up codec->num_pcms and
- * codec->pcm_info properly.  The array is referred by the top-level driver
- * to create its PCM instances.
- * The allocated codec->pcm_info should be released in codec->patch_ops.free
- * callback.
- *
- * At least, substreams, channels_min and channels_max must be filled for
- * each stream.  substreams = 0 indicates that the stream doesn't exist.
- * When rates and/or formats are zero, the supported values are queried
- * from the given nid.  The nid is used also by the default ops.prepare
- * and ops.cleanup callbacks.
- *
- * The driver needs to call ops.open in its open callback.  Similarly,
- * ops.close is supposed to be called in the close callback.
- * ops.prepare should be called in the prepare or hw_params callback
- * with the proper parameters for set up.
- * ops.cleanup should be called in hw_free for clean up of streams.
- *
- * This function returns 0 if successfull, or a negative error code.
- */
-int __devinit snd_hda_build_pcms(struct hda_bus *bus)
-{
-        struct hda_codec *codec;
-
-        list_for_each_entry(codec, &bus->codec_list, list, struct hda_codec) {
-                int err = snd_hda_codec_build_pcms(codec);
-                if (err < 0)
-                        return err;
-        }
-        return 0;
-}
-EXPORT_SYMBOL_HDA(snd_hda_build_pcms);
 
 /**
@@ -2727 +2623 @@
         return -1;
 }
-EXPORT_SYMBOL_HDA(snd_hda_check_board_config);
-
-/**
- * snd_hda_check_board_codec_sid_config - compare the current codec
-                                          subsystem ID with the
-                                          config table
-
-           This is important for Gateway notebooks with SB450 HDA Audio
-           where the vendor ID of the PCI device is:
-                ATI Technologies Inc SB450 HDA Audio [1002:437b]
-           and the vendor/subvendor are found only at the codec.
-
- * @codec: the HDA codec
- * @num_configs: number of config enums
- * @models: array of model name strings
- * @tbl: configuration table, terminated by null entries
- *
- * Compares the modelname or PCI subsystem id of the current codec with the
- * given configuration table.  If a matching entry is found, returns its
- * config value (supposed to be 0 or positive).
- *
- * If no entries are matching, the function returns a negative value.
- */
-int snd_hda_check_board_codec_sid_config(struct hda_codec *codec,
-                               int num_configs, const char **models,
-                               const struct snd_pci_quirk *tbl)
-{
-        const struct snd_pci_quirk *q;
-
-        /* Search for codec ID */
-        for (q = tbl; q->subvendor; q++) {
-                unsigned long vendorid = (q->subdevice) | (q->subvendor << 16);
-
-                if (vendorid == codec->subsystem_id)
-                        break;
-        }
-
-        if (!q->subvendor)
-                return -1;
-
-        tbl = q;
-
-        if (tbl->value >= 0 && tbl->value < num_configs) {
-#ifdef CONFIG_SND_DEBUG_DETECT
-                char tmp[10];
-                const char *model = NULL;
-                if (models)
-                        model = models[tbl->value];
-                if (!model) {
-                        sprintf(tmp, "#%d", tbl->value);
-                        model = tmp;
-                }
-                snd_printdd(KERN_INFO "hda_codec: model '%s' is selected "
-                            "for config %x:%x (%s)\n",
-                            model, tbl->subvendor, tbl->subdevice,
-                            (tbl->name ? tbl->name : "Unknown device"));
-#endif
-                return tbl->value;
-        }
-        return -1;
-}
-EXPORT_SYMBOL_HDA(snd_hda_check_board_codec_sid_config);
 
 /**
@@ -2824 +2658 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_add_new_ctls);
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
@@ -2867 +2700 @@
         codec->power_transition = 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_power_up);
-
-#define power_save(codec)       \
-        ((codec)->bus->power_save ? *(codec)->bus->power_save : 0)
-
-#define power_save(codec)       \
-        ((codec)->bus->power_save ? *(codec)->bus->power_save : 0)
 
 void snd_hda_power_down(struct hda_codec *codec)
@@ -2880 +2706 @@
         if (!codec->power_on || codec->power_count || codec->power_transition)
                 return;
-        if (power_save(codec)) {
+        if (power_save) {
                 codec->power_transition = 1; /* avoid reentrance */
-                queue_delayed_work(codec->bus->workq, &codec->power_work,
-                                msecs_to_jiffies(power_save(codec) * 1000));
-        }
-}
-EXPORT_SYMBOL_HDA(snd_hda_power_down);
+                schedule_delayed_work(&codec->power_work,
+                                      msecs_to_jiffies(power_save * 1000));
+        }
+}
 
 int snd_hda_check_amp_list_power(struct hda_codec *codec,
@@ -2923 +2748 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_check_amp_list_power);
 #endif
 
@@ -2943 +2767 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_ch_mode_info);
 
 int snd_hda_ch_mode_get(struct hda_codec *codec,
@@ -2961 +2784 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_ch_mode_get);
 
 int snd_hda_ch_mode_put(struct hda_codec *codec,
@@ -2982 +2804 @@
         return 1;
 }
-EXPORT_SYMBOL_HDA(snd_hda_ch_mode_put);
 
 /*
@@ -3003 +2824 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_input_mux_info);
 
 int snd_hda_input_mux_put(struct hda_codec *codec,
@@ -3025 +2845 @@
         return 1;
 }
-EXPORT_SYMBOL_HDA(snd_hda_input_mux_put);
 
 
@@ -3078 +2897 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_multi_out_dig_open);
 
 int snd_hda_multi_out_dig_prepare(struct hda_codec *codec,
@@ -3091 +2909 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_multi_out_dig_prepare);
 
 /*
@@ -3104 +2921 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_multi_out_dig_close);
 
 /*
@@ -3144 +2960 @@
                                           SNDRV_PCM_HW_PARAM_CHANNELS, 2);
 }
-EXPORT_SYMBOL_HDA(snd_hda_multi_out_analog_open);
 
 /*
@@ -3203 +3018 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_multi_out_analog_prepare);
 
 /*
@@ -3230 +3044 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_multi_out_analog_cleanup);
 
 /*
@@ -3516 +3329 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_parse_pin_def_config);
 
 /* labels for input pins */
@@ -3522 +3334 @@
         "Mic", "Front Mic", "Line", "Front Line", "CD", "Aux"
 };
-EXPORT_SYMBOL_HDA(auto_pin_cfg_labels);
 
 
@@ -3550 +3361 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_suspend);
 
 /**
  * snd_hda_resume - resume the codecs
  * @bus: the HDA bus
+ * @state: resume state
  *
  * Returns 0 if successful.
@@ -3571 +3382 @@
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_resume);
-#endif /* CONFIG_PM */
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+int snd_hda_codecs_inuse(struct hda_bus *bus)
+{
+        struct hda_codec *codec;
+
+        list_for_each_entry(codec, &bus->codec_list, list, struct hda_codec) {
+                if (snd_hda_codec_needs_resume(codec))
+                        return 1;
+        }
+        return 0;
+}
+#endif
+#endif
 
 /*
@@ -3601 +3423 @@
         return snd_array_elem(array, array->used++);
 }
-EXPORT_SYMBOL_HDA(snd_array_new);
 
 /* free the given array elements */
@@ -3611 +3432 @@
         array->list = NULL;
 }
-EXPORT_SYMBOL_HDA(snd_array_free);
-
-/*
- * used by hda_proc.c and hda_eld.c
- */
-void snd_print_pcm_rates(int pcm, char *buf, int buflen)
-{
-        static unsigned int rates[] = {
-                8000, 11025, 16000, 22050, 32000, 44100, 48000, 88200,
-                96000, 176400, 192000, 384000
-        };
-        int i, j;
-
-        for (i = 0, j = 0; i < ARRAY_SIZE(rates); i++)
-                if (pcm & (1 << i))
-                        j += snprintf(buf + j, buflen - j,  " %d", rates[i]);
-
-        buf[j] = '\0'; /* necessary when j == 0 */
-}
-EXPORT_SYMBOL_HDA(snd_print_pcm_rates);
-
-void snd_print_pcm_bits(int pcm, char *buf, int buflen)
-{
-        static unsigned int bits[] = { 8, 16, 20, 24, 32 };
-        int i, j;
-
-        for (i = 0, j = 0; i < ARRAY_SIZE(bits); i++)
-                if (pcm & (AC_SUPPCM_BITS_8 << i))
-                        j += snprintf(buf + j, buflen - j,  " %d", bits[i]);
-
-        buf[j] = '\0'; /* necessary when j == 0 */
-}
-EXPORT_SYMBOL_HDA(snd_print_pcm_bits);
-
-MODULE_DESCRIPTION("HDA codec core");
-MODULE_LICENSE("GPL");

GPL/branches/uniaud32-2.0/alsa-kernel/pci/hda/hda_codec.h

@@ -586 +586 @@
         struct pci_dev *pci;
         const char *modelname;
-        int *power_save;
         struct hda_bus_ops ops;
 };
@@ -603 +602 @@
         struct pci_dev *pci;
         const char *modelname;
-        int *power_save;
         struct hda_bus_ops ops;
 
@@ -619 +617 @@
         /* unsolicited event queue */
         struct hda_bus_unsolicited *unsol;
-        struct workqueue_struct *workq; /* common workqueue for codecs */
-
-        /* assigned PCMs */
-        DECLARE_BITMAP(pcm_dev_bits, SNDRV_PCM_DEVICES);
+
+        struct snd_info_entry *proc;
 
         /* misc op flags */
         unsigned int needs_damn_long_delay :1;
-        unsigned int shutdown :1;       /* being unloaded */
 };
 
@@ -646 +641 @@
 };
         
-struct hda_codec_preset_list {
-        const struct hda_codec_preset *preset;
-        struct module *owner;
-        struct list_head list;
-};
-
-/* initial hook */
-int snd_hda_add_codec_preset(struct hda_codec_preset_list *preset);
-int snd_hda_delete_codec_preset(struct hda_codec_preset_list *preset);
-
 /* ops set by the preset patch */
 struct hda_codec_ops {
@@ -749 +734 @@
         /* detected preset */
         const struct hda_codec_preset *preset;
-        struct module *owner;
         const char *name;       /* codec name */
         const char *modelname;  /* model name for preset */
@@ -781 +765 @@
         struct semaphore spdif_mutex;
 #endif
-        struct mutex control_mutex;
         unsigned int spdif_status;      /* IEC958 status bits */
         unsigned short spdif_ctls;      /* SPDIF control bits */
@@ -804 +787 @@
         struct delayed_work power_work; /* delayed task for powerdown */
 #endif
-
-        /* codec-specific additional proc output */
-        void (*proc_widget_hook)(struct snd_info_buffer *buffer,
-                                 struct hda_codec *codec, hda_nid_t nid);
 };
 
@@ -822 +801 @@
                     struct hda_bus **busp);
 int snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
-                      int do_init, struct hda_codec **codecp);
+                      struct hda_codec **codecp);
 
 /*
@@ -873 +852 @@
  */
 int snd_hda_build_pcms(struct hda_bus *bus);
-int snd_hda_codec_build_pcms(struct hda_codec *codec);
 void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid,
                                 u32 stream_tag,
@@ -882 +860 @@
                                         unsigned int format,
                                         unsigned int maxbps);
+int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid,
+                                u32 *ratesp, u64 *formatsp, unsigned int *bpsp);
 int snd_hda_is_supported_format(struct hda_codec *codec, hda_nid_t nid,
                                 unsigned int format);
@@ -912 +892 @@
 void snd_hda_power_down(struct hda_codec *codec);
 #define snd_hda_codec_needs_resume(codec) codec->power_count
+int snd_hda_codecs_inuse(struct hda_bus *bus);
 #else
 static inline void snd_hda_power_up(struct hda_codec *codec) {}
 static inline void snd_hda_power_down(struct hda_codec *codec) {}
 #define snd_hda_codec_needs_resume(codec) 1
-#endif
-
-/*
- * Codec modularization
- */
-
-/* Export symbols only for communication with codec drivers;
- * When built in kernel, all HD-audio drivers are supposed to be statically
- * linked to the kernel.  Thus, the symbols don't have to (or shouldn't) be
- * exported unless it's built as a module.
- */
-#if defined(MODULE) && !defined(TARGET_OS2)
-#define EXPORT_SYMBOL_HDA(sym) EXPORT_SYMBOL_GPL(sym)
-#else
-#define EXPORT_SYMBOL_HDA(sym)
+#define snd_hda_codecs_inuse(bus) 1
 #endif
 

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

@@ -732 +732 @@
                 snd_printdd("[%s] NID=0x%x, DIR=IN, IDX=0x%x\n", name, node->nid, index);
                 err = snd_hda_ctl_add(codec, snd_ctl_new1(&knew, codec));
-#ifndef TARGET_OS2
                 if (err < 0)
                         return err;
-#else
-                if (err < 0)
-                        snd_printdd("Failed here\n");
-#endif
                 created = 1;
         } else if ((node->wid_caps & AC_WCAP_OUT_AMP) &&
@@ -744 +739 @@
                 /*knew = (struct snd_kcontrol_new)HDA_CODEC_MUTE(name, node->nid, 0, HDA_OUTPUT);*/
                 knew.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-                knew.index = 0;
+                knew.index = index;
                 knew.name = name;
                 knew.info = snd_hda_mixer_amp_switch_info;
@@ -752 +747 @@
                 if (is_loopback)
                         add_input_loopback(codec, node->nid, HDA_OUTPUT, 0);
-                snd_printdd("[%s] NID=0x%x, DIR=OUT1\n", name, node->nid);
+                snd_printdd("[%s] NID=0x%x, DIR=OUT\n", name, node->nid);
                 err = snd_hda_ctl_add(codec, snd_ctl_new1(&knew, codec));
-#ifndef TARGET_OS2
                 if (err < 0)
                         return err;
-#else
-                if (err < 0)
-                        snd_printdd("Failed here1\n");
-#endif
                 created = 1;
         }
@@ -779 +769 @@
                 snd_printdd("[%s] NID=0x%x, DIR=IN, IDX=0x%x\n", name, node->nid, index);
                 err = snd_hda_ctl_add(codec, snd_ctl_new1(&knew, codec));
-#ifndef TARGET_OS2
                 if (err < 0)
                         return err;
-#else
-                if (err < 0)
-                        snd_printdd("Failed here2\n");
-#endif
                 created = 1;
         } else if ((node->wid_caps & AC_WCAP_OUT_AMP) &&
@@ -798 +783 @@
                 snd_printdd("[%s] NID=0x%x, DIR=OUT\n", name, node->nid);
                 err = snd_hda_ctl_add(codec, snd_ctl_new1(&knew, codec));
-#ifndef TARGET_OS2
                 if (err < 0)
                         return err;
-#else
-                if (err < 0)
-                        snd_printdd("Failed here3\n");
-#endif
                 created = 1;
         }
@@ -1158 +1138 @@
         return err;
 }
-EXPORT_SYMBOL(snd_hda_parse_generic_codec);

GPL/branches/uniaud32-2.0/alsa-kernel/pci/hda/hda_hwdep.c

@@ -117 +117 @@
 }
 
-int /*__devinit*/ snd_hda_create_hwdep(struct hda_codec *codec)
+int __devinit snd_hda_create_hwdep(struct hda_codec *codec)
 {
         char hwname[16];
@@ -146 +146 @@
 }
 
-#ifdef CONFIG_SND_HDA_RECONFIG
-
 /*
  * sysfs interface
@@ -169 +167 @@
                 return err;
         /* rebuild PCMs */
-        err = snd_hda_codec_build_pcms(codec);
+        err = snd_hda_build_pcms(codec->bus);
         if (err < 0)
                 return err;
@@ -316 +314 @@
 }
 
+#ifndef TARGET_OS2
 #define CODEC_ATTR_RW(type) \
         __ATTR(type, 0644, type##_show, type##_store)
@@ -350 +349 @@
         return 0;
 }
-
-#endif /* CONFIG_SND_HDA_RECONFIG */
+#endif /* TARGET_OS2 */

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

@@ -51 +51 @@
 #include "hda_codec.h"
 
-
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
@@ -64 +63 @@
 static int probe_mask[SNDRV_CARDS] = {-1};
 #endif
-static int probe_only[SNDRV_CARDS];
 static int single_cmd;
 static int enable_msi;
@@ -83 +81 @@
 module_param_array(probe_mask, int, NULL, 0444);
 MODULE_PARM_DESC(probe_mask, "Bitmask to probe codecs (default = -1).");
-module_param_array(probe_only, bool, NULL, 0444);
-MODULE_PARM_DESC(probe_only, "Only probing and no codec initialization.");
 module_param(single_cmd, bool, 0444);
 MODULE_PARM_DESC(single_cmd, "Use single command to communicate with codecs "
@@ -92 +88 @@
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
-static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT;
-module_param(power_save, int, 0644);
-MODULE_PARM_DESC(power_save, "Automatic power-saving timeout "
-                 "(in second, 0 = disable).");
+/* power_save option is defined in hda_codec.c */
 
 /* reset the HD-audio controller in power save mode.
@@ -304 +297 @@
 #define VIA_HDAC_DEVICE_ID              0x3288
 
-/* HD Audio class code */
-#define PCI_CLASS_MULTIMEDIA_HD_AUDIO   0x0403
 
 /*
@@ -444 +435 @@
         AZX_DRIVER_NVIDIA,
         AZX_DRIVER_TERA,
-        AZX_DRIVER_GENERIC,
         AZX_NUM_DRIVERS, /* keep this as last entry */
 };
@@ -458 +448 @@
         [AZX_DRIVER_NVIDIA] = "HDA NVidia",
         [AZX_DRIVER_TERA] = "HDA Teradici", 
-        [AZX_DRIVER_GENERIC] = "HD-Audio Generic",
 };
 
@@ -1023 +1012 @@
                                 snd_pcm_period_elapsed(azx_dev->substream);
                                 spin_lock(&chip->reg_lock);
-                        } else if (chip->bus && chip->bus->workq) {
+                        } else {
                                 /* bogus IRQ, process it later */
                                 azx_dev->irq_pending = 1;
-                                queue_work(chip->bus->workq,
-                                           &chip->irq_pending_work);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+                                schedule_work(&chip->irq_pending_work);
+#endif
                         }
                 }
@@ -1100 +1090 @@
                              struct azx_dev *azx_dev)
 {
+#ifdef TARGET_OS2
+        volatile u32 *bdl;
+#else
         u32 *bdl;
-
+#endif
         int i, ofs, periods, period_bytes;
         int pos_adj;
@@ -1262 +1255 @@
 
 static int __devinit azx_codec_create(struct azx *chip, const char *model,
-                                      unsigned int codec_probe_mask,
-                                      int no_init)
+                                      unsigned int codec_probe_mask)
 {
         struct hda_bus_template bus_temp;
@@ -1277 +1269 @@
         bus_temp.ops.attach_pcm = azx_attach_pcm_stream;
 #ifdef CONFIG_SND_HDA_POWER_SAVE
-        bus_temp.power_save = &power_save;
         bus_temp.ops.pm_notify = azx_power_notify;
 #endif
@@ -1321 +1312 @@
                 if ((chip->codec_mask & (1 << c)) & codec_probe_mask) {
                         struct hda_codec *codec;
-                        err = snd_hda_codec_new(chip->bus, c, !no_init, &codec);
+                        err = snd_hda_codec_new(chip->bus, c, &codec);
                         if (err < 0)
                                 continue;
@@ -1776 +1767 @@
                 chip->azx_dev[i].irq_pending = 0;
         spin_unlock_irq(&chip->reg_lock);
+        flush_scheduled_work();
 }
 
@@ -1946 +1938 @@
  * power management
  */
-
-static int snd_hda_codecs_inuse(struct hda_bus *bus)
-{
-        struct hda_codec *codec;
-
-        list_for_each_entry(codec, &bus->codec_list, list, struct hda_codec) {
-                if (snd_hda_codec_needs_resume(codec))
-                        return 1;
-        }
-        return 0;
-}
-
 static int azx_suspend(struct pci_dev *pci, pm_message_t state)
 {
@@ -1983 +1963 @@
 }
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)
-static int azx_resume_early(struct pci_dev *pci)
-{
-        return pci_restore_state(pci);
-}
-#endif
-
 static int azx_resume(struct pci_dev *pci)
 {
@@ -1995 +1968 @@
         struct azx *chip = card->private_data;
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
+        pci_set_power_state(pci, PCI_D0);
         pci_restore_state(pci);
-#endif
-
         if (pci_enable_device(pci) < 0) {
                 printk(KERN_ERR "hda-intel: pci_enable_device failed, "
@@ -2139 +2110 @@
         SND_PCI_QUIRK(0x17aa, 0x2010, "Thinkpad X/T/R60", 0x01),
         SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X/T/R61", 0x01),
-        /* broken BIOS */
-        SND_PCI_QUIRK(0x1028, 0x20ac, "Dell Studio Desktop", 0x01),
-        /* including bogus ALC268 in slot#2 that conflicts with ALC888 */
-        SND_PCI_QUIRK(0x17c0, 0x4085, "Medion MD96630", 0x01),
+        /* broken BIOS */
+        SND_PCI_QUIRK(0x1028, 0x20ac, "Dell Studio Desktop", 0x01),
         {0}
 };
@@ -2277 +2246 @@
                         chip->capture_streams = ATIHDMI_NUM_CAPTURE;
                         break;
-                case AZX_DRIVER_GENERIC:
                 default:
                         chip->playback_streams = ICH6_NUM_PLAYBACK;
@@ -2380 +2348 @@
         }
 
-        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        if (!card) {
+                snd_printk(KERN_ERR SFX "Error creating card!\n");
+                return -ENOMEM;
+        }
+
+        err = azx_create(card, pci, dev, pci_id->driver_data, &chip);
         if (err < 0) {
-                snd_printk(KERN_ERR SFX "Error creating card!\n");
+                snd_card_free(card);
                 return err;
         }
-
-        err = azx_create(card, pci, dev, pci_id->driver_data, &chip);
-        if (err < 0)
-                goto out_free;
         card->private_data = chip;
 
         /* create codec instances */
-        err = azx_codec_create(chip, model[dev], probe_mask[dev],
-                               probe_only[dev]);
-        if (err < 0)
-                goto out_free;
+        err = azx_codec_create(chip, model[dev], probe_mask[dev]);
+        if (err < 0) {
+                snd_card_free(card);
+                return err;
+        }
 
         /* create PCM streams */
         err = snd_hda_build_pcms(chip->bus);
-        if (err < 0)
-                goto out_free;
+        if (err < 0) {
+                snd_card_free(card);
+                return err;
+        }
 
         /* create mixer controls */
         err = azx_mixer_create(chip);
-        if (err < 0)
-                goto out_free;
+        if (err < 0) {
+                snd_card_free(card);
+                return err;
+        }
 
         snd_card_set_dev(card, &pci->dev);
 
         err = snd_card_register(card);
-        if (err < 0)
-                goto out_free;
+        if (err < 0) {
+                snd_card_free(card);
+                return err;
+        }
 
         pci_set_drvdata(pci, card);
@@ -2419 +2396 @@
 
         dev++;
-        return err;
-out_free:
-        snd_card_free(card);
         return err;
 }
@@ -2496 +2470 @@
         /* Teradici */
         { PCI_DEVICE(0x6549, 0x1200), .driver_data = AZX_DRIVER_TERA },
-        /* AMD Generic, PCI class code and Vendor ID for HD Audio */
-        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_ANY_ID),
-          .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
-          .class_mask = 0xffffff,
-          .driver_data = AZX_DRIVER_GENERIC },
         { 0, }
 };
@@ -2513 +2482 @@
 #ifdef CONFIG_PM
         .suspend = azx_suspend,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)
-        .resume_early = azx_resume_early,
-#endif
         .resume = azx_resume,
 #endif

GPL/branches/uniaud32-2.0/alsa-kernel/pci/hda/hda_local.h

@@ -289 +289 @@
 #endif
 
-#define SND_PRINT_RATES_ADVISED_BUFSIZE 80
-void snd_print_pcm_rates(int pcm, char *buf, int buflen);
-
-#define SND_PRINT_BITS_ADVISED_BUFSIZE  16
-void snd_print_pcm_bits(int pcm, char *buf, int buflen);
-
 /*
  * Misc
@@ -301 +295 @@
                                const char **modelnames,
                                const struct snd_pci_quirk *pci_list);
-int snd_hda_check_board_codec_sid_config(struct hda_codec *codec,
-                               int num_configs, const char **models,
-                               const struct snd_pci_quirk *tbl);
 int snd_hda_add_new_ctls(struct hda_codec *codec,
                          struct snd_kcontrol_new *knew);
@@ -417 +408 @@
 #ifdef CONFIG_SND_HDA_HWDEP
 int snd_hda_create_hwdep(struct hda_codec *codec);
+int snd_hda_hwdep_add_sysfs(struct hda_codec *codec);
 #else
 static inline int snd_hda_create_hwdep(struct hda_codec *codec) { return 0; }
-#endif
-
-#ifdef CONFIG_SND_HDA_RECONFIG
-int snd_hda_hwdep_add_sysfs(struct hda_codec *codec);
-#else
-static inline int snd_hda_hwdep_add_sysfs(struct hda_codec *codec)
-{
-        return 0;
-}
 #endif
 
@@ -462 +445 @@
 #define get_amp_index(kc)       (((kc)->private_value >> 19) & 0xf)
 
-/*
- * CEA Short Audio Descriptor data
- */
-struct cea_sad {
-        int     channels;
-        int     format;         /* (format == 0) indicates invalid SAD */
-        int     rates;
-        int     sample_bits;    /* for LPCM */
-        int     max_bitrate;    /* for AC3...ATRAC */
-        int     profile;        /* for WMAPRO */
-};
-
-#define ELD_FIXED_BYTES 20
-#define ELD_MAX_MNL     16
-#define ELD_MAX_SAD     16
-
-/*
- * ELD: EDID Like Data
- */
-struct hdmi_eld {
-        int     eld_size;
-        int     baseline_len;
-        int     eld_ver;        /* (eld_ver == 0) indicates invalid ELD */
-        int     cea_edid_ver;
-        char    monitor_name[ELD_MAX_MNL + 1];
-        int     manufacture_id;
-        int     product_id;
-        u64     port_id;
-        int     support_hdcp;
-        int     support_ai;
-        int     conn_type;
-        int     aud_synch_delay;
-        int     spk_alloc;
-        int     sad_count;
-        struct cea_sad sad[ELD_MAX_SAD];
-#ifdef CONFIG_PROC_FS
-        struct snd_info_entry *proc_entry;
-#endif
-};
-
-int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid);
-int snd_hdmi_get_eld(struct hdmi_eld *, struct hda_codec *, hda_nid_t);
-void snd_hdmi_show_eld(struct hdmi_eld *eld);
-
-#ifdef CONFIG_PROC_FS
-int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld);
-void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld);
-#else
-static inline int snd_hda_eld_proc_new(struct hda_codec *codec,
-                                       struct hdmi_eld *eld)
-{
-        return 0;
-}
-static inline void snd_hda_eld_proc_free(struct hda_codec *codec,
-                                         struct hdmi_eld *eld)
-{
-}
-#endif
-
-#define SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE 80
-void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen);
-
 #endif /* __SOUND_HDA_LOCAL_H */

GPL/branches/uniaud32-2.0/alsa-kernel/pci/hda/hda_proc.c

@@ -92 +92 @@
 static void print_pcm_rates(struct snd_info_buffer *buffer, unsigned int pcm)
 {
-        char buf[SND_PRINT_RATES_ADVISED_BUFSIZE];
+        static unsigned int rates[] = {
+                8000, 11025, 16000, 22050, 32000, 44100, 48000, 88200,
+                96000, 176400, 192000, 384000
+        };
+        int i;
 
         pcm &= AC_SUPPCM_RATES;
         snd_iprintf(buffer, "    rates [0x%x]:", pcm);
-        snd_print_pcm_rates(pcm, buf, sizeof(buf));
-        snd_iprintf(buffer, "%s\n", buf);
+        for (i = 0; i < ARRAY_SIZE(rates); i++) 
+                if (pcm & (1 << i))
+                        snd_iprintf(buffer, " %d", rates[i]);
+        snd_iprintf(buffer, "\n");
 }
 
 static void print_pcm_bits(struct snd_info_buffer *buffer, unsigned int pcm)
 {
-        char buf[SND_PRINT_BITS_ADVISED_BUFSIZE];
-
-        snd_iprintf(buffer, "    bits [0x%x]:", (pcm >> 16) & 0xff);
-        snd_print_pcm_bits(pcm, buf, sizeof(buf));
-        snd_iprintf(buffer, "%s\n", buf);
+        static unsigned int bits[] = { 8, 16, 20, 24, 32 };
+        int i;
+
+        pcm = (pcm >> 16) & 0xff;
+        snd_iprintf(buffer, "    bits [0x%x]:", pcm);
+        for (i = 0; i < ARRAY_SIZE(bits); i++)
+                if (pcm & (1 << i))
+                        snd_iprintf(buffer, " %d", bits[i]);
+        snd_iprintf(buffer, "\n");
 }
 
@@ -415 +425 @@
 }
 
+static void print_realtek_coef(struct snd_info_buffer *buffer,
+                               struct hda_codec *codec, hda_nid_t nid)
+{
+        int coeff = snd_hda_codec_read(codec, nid, 0,
+                                       AC_VERB_GET_PROC_COEF, 0);
+        snd_iprintf(buffer, "  Processing Coefficient: 0x%02x\n", coeff);
+        coeff = snd_hda_codec_read(codec, nid, 0,
+                                   AC_VERB_GET_COEF_INDEX, 0);
+        snd_iprintf(buffer, "  Coefficient Index: 0x%02x\n", coeff);
+}
+
 static void print_gpio(struct snd_info_buffer *buffer,
                        struct hda_codec *codec, hda_nid_t nid)
@@ -447 +468 @@
                 snd_iprintf(buffer,
                             "  IO[%d]: enable=%d, dir=%d, wake=%d, "
-                            "sticky=%d, data=%d, unsol=%d\n", i,
+                            "sticky=%d, data=%d\n", i,
                             (enable & (1<<i)) ? 1 : 0,
                             (direction & (1<<i)) ? 1 : 0,
                             (wake & (1<<i)) ? 1 : 0,
                             (sticky & (1<<i)) ? 1 : 0,
-                            (data & (1<<i)) ? 1 : 0,
-                            (unsol & (1<<i)) ? 1 : 0);
+                            (data & (1<<i)) ? 1 : 0);
         /* FIXME: add GPO and GPI pin information */
 }
@@ -494 +514 @@
 
         print_gpio(buffer, codec, codec->afg);
-        if (codec->proc_widget_hook)
-                codec->proc_widget_hook(buffer, codec, codec->afg);
 
         for (i = 0; i < nodes; i++, nid++) {
@@ -598 +616 @@
                         print_proc_caps(buffer, codec, nid);
 
-                if (codec->proc_widget_hook)
-                        codec->proc_widget_hook(buffer, codec, nid);
+                /* NID 0x20 == Realtek Define Registers */
+                if (codec->vendor_id == 0x10ec && nid == 0x20)
+                        print_realtek_coef(buffer, codec, nid);
         }
         snd_hda_power_down(codec);

GPL/branches/uniaud32-2.0/alsa-kernel/pci/hda/patch_analog.c

@@ -28 +28 @@
 #include "hda_codec.h"
 #include "hda_local.h"
+#include "hda_patch.h"
 
 struct ad198x_spec {
@@ -638 +639 @@
 
 static struct snd_kcontrol_new ad1986a_laptop_eapd_mixers[] = {
-        HDA_BIND_VOL("Master Playback Volume", &ad1986a_laptop_master_vol),
-        HDA_BIND_SW("Master Playback Switch", &ad1986a_laptop_master_sw),
-        HDA_CODEC_VOLUME("PCM Playback Volume", 0x03, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("PCM Playback Switch", 0x03, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x17, 0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x17, 0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x0f, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x12, 0x0, HDA_OUTPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Capture Source",
-                .info = ad198x_mux_enum_info,
-                .get = ad198x_mux_enum_get,
-                .put = ad198x_mux_enum_put,
-        },
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "External Amplifier",
-                .info = ad198x_eapd_info,
-                .get = ad198x_eapd_get,
-                .put = ad198x_eapd_put,
-                .private_value = 0x1b | (1 << 8), /* port-D, inversed */
-        },
-        {0} /* end */
-};
-
-static struct snd_kcontrol_new ad1986a_samsung_mixers[] = {
         HDA_BIND_VOL("Master Playback Volume", &ad1986a_laptop_master_vol),
         HDA_BIND_SW("Master Playback Switch", &ad1986a_laptop_master_sw),
@@ -960 +931 @@
         AD1986A_LAPTOP_AUTOMUTE,
         AD1986A_ULTRA,
-        AD1986A_SAMSUNG,
         AD1986A_MODELS
 };
@@ -971 +941 @@
         [AD1986A_LAPTOP_AUTOMUTE] = "laptop-automute",
         [AD1986A_ULTRA]         = "ultra",
-        [AD1986A_SAMSUNG]       = "samsung",
 };
 
@@ -994 +963 @@
         SND_PCI_QUIRK(0x144d, 0xb03c, "Samsung R55", AD1986A_3STACK),
         SND_PCI_QUIRK(0x144d, 0xc01e, "FSC V2060", AD1986A_LAPTOP),
-        SND_PCI_QUIRK(0x144d, 0xc023, "Samsung X60", AD1986A_SAMSUNG),
-        SND_PCI_QUIRK(0x144d, 0xc024, "Samsung R65", AD1986A_SAMSUNG),
-        SND_PCI_QUIRK(0x144d, 0xc026, "Samsung X11", AD1986A_SAMSUNG),
+        SND_PCI_QUIRK(0x144d, 0xc023, "Samsung X60", AD1986A_LAPTOP_EAPD),
+        SND_PCI_QUIRK(0x144d, 0xc024, "Samsung R65", AD1986A_LAPTOP_EAPD),
+        SND_PCI_QUIRK(0x144d, 0xc026, "Samsung X11", AD1986A_LAPTOP_EAPD),
         SND_PCI_QUIRK(0x144d, 0xc027, "Samsung Q1", AD1986A_ULTRA),
         SND_PCI_QUIRK(0x144d, 0xc504, "Samsung Q35", AD1986A_3STACK),
@@ -1078 +1047 @@
         case AD1986A_LAPTOP_EAPD:
                 spec->mixers[0] = ad1986a_laptop_eapd_mixers;
-                spec->num_init_verbs = 2;
-                spec->init_verbs[1] = ad1986a_eapd_init_verbs;
-                spec->multiout.max_channels = 2;
-                spec->multiout.num_dacs = 1;
-                spec->multiout.dac_nids = ad1986a_laptop_dac_nids;
-                if (!is_jack_available(codec, 0x25))
-                        spec->multiout.dig_out_nid = 0;
-                spec->input_mux = &ad1986a_laptop_eapd_capture_source;
-                break;
-        case AD1986A_SAMSUNG:
-                spec->mixers[0] = ad1986a_samsung_mixers;
                 spec->num_init_verbs = 3;
                 spec->init_verbs[1] = ad1986a_eapd_init_verbs;
@@ -3901 +3859 @@
 static struct snd_pci_quirk ad1884a_cfg_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x3030, "HP", AD1884A_MOBILE),
-        SND_PCI_QUIRK(0x103c, 0x3037, "HP 2230s", AD1884A_LAPTOP),
         SND_PCI_QUIRK(0x103c, 0x3056, "HP", AD1884A_MOBILE),
-        SND_PCI_QUIRK(0x103c, 0x30e6, "HP 6730b", AD1884A_LAPTOP),
         SND_PCI_QUIRK(0x103c, 0x30e7, "HP EliteBook 8530p", AD1884A_LAPTOP),
         SND_PCI_QUIRK(0x103c, 0x3614, "HP 6730s", AD1884A_LAPTOP),
@@ -4264 +4220 @@
         spec->adc_nids = ad1882_adc_nids;
         spec->capsrc_nids = ad1882_capsrc_nids;
-        if (codec->vendor_id == 0x11d41882)
+        if (codec->vendor_id == 0x11d1882)
                 spec->input_mux = &ad1882_capture_source;
         else
@@ -4270 +4226 @@
         spec->num_mixers = 2;
         spec->mixers[0] = ad1882_base_mixers;
-        if (codec->vendor_id == 0x11d41882)
+        if (codec->vendor_id == 0x11d1882)
                 spec->mixers[1] = ad1882_loopback_mixers;
         else
@@ -4310 +4266 @@
  * patch entries
  */
-static struct hda_codec_preset snd_hda_preset_analog[] = {
+struct hda_codec_preset snd_hda_preset_analog[] = {
         { .id = 0x11d4184a, .name = "AD1884A", .patch = patch_ad1884a },
         { .id = 0x11d41882, .name = "AD1882", .patch = patch_ad1882 },
@@ -4328 +4284 @@
         {0} /* terminator */
 };
-
-MODULE_ALIAS("snd-hda-codec-id:11d4*");
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Analog Devices HD-audio codec");
-
-static struct hda_codec_preset_list analog_list = {
-        .preset = snd_hda_preset_analog,
-        .owner = THIS_MODULE,
-};
-
-static int __init patch_analog_init(void)
-{
-        return snd_hda_add_codec_preset(&analog_list);
-}
-
-static void __exit patch_analog_exit(void)
-{
-        snd_hda_delete_codec_preset(&analog_list);
-}
-
-module_init(patch_analog_init)
-module_exit(patch_analog_exit)

GPL/branches/uniaud32-2.0/alsa-kernel/pci/hda/patch_atihdmi.c

@@ -28 +28 @@
 #include "hda_codec.h"
 #include "hda_local.h"
+#include "hda_patch.h"
 
 struct atihdmi_spec {
@@ -187 +188 @@
  * patch entries
  */
-static struct hda_codec_preset snd_hda_preset_atihdmi[] = {
-        { .id = 0x1002793c, .name = "RS600 HDMI", .patch = patch_atihdmi },
-        { .id = 0x10027919, .name = "RS600 HDMI", .patch = patch_atihdmi },
-        { .id = 0x1002791a, .name = "RS690/780 HDMI", .patch = patch_atihdmi },
-        { .id = 0x1002aa01, .name = "R6xx HDMI", .patch = patch_atihdmi },
+struct hda_codec_preset snd_hda_preset_atihdmi[] = {
+        { .id = 0x1002793c, .name = "ATI RS600 HDMI", .patch = patch_atihdmi },
+        { .id = 0x10027919, .name = "ATI RS600 HDMI", .patch = patch_atihdmi },
+        { .id = 0x1002791a, .name = "ATI RS690/780 HDMI", .patch = patch_atihdmi },
+        { .id = 0x1002aa01, .name = "ATI R6xx HDMI", .patch = patch_atihdmi },
         { .id = 0x10951390, .name = "SiI1390 HDMI", .patch = patch_atihdmi },
+        { .id = 0x10951392, .name = "SiI1392 HDMI", .patch = patch_atihdmi },
         { .id = 0x17e80047, .name = "Chrontel HDMI",  .patch = patch_atihdmi },
         {0} /* terminator */
 };
-
-MODULE_ALIAS("snd-hda-codec-id:1002793c");
-MODULE_ALIAS("snd-hda-codec-id:10027919");
-MODULE_ALIAS("snd-hda-codec-id:1002791a");
-MODULE_ALIAS("snd-hda-codec-id:1002aa01");
-MODULE_ALIAS("snd-hda-codec-id:10951390");
-MODULE_ALIAS("snd-hda-codec-id:17e80047");
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("ATI HDMI HD-audio codec");
-
-static struct hda_codec_preset_list atihdmi_list = {
-        .preset = snd_hda_preset_atihdmi,
-        .owner = THIS_MODULE,
-};
-
-static int __init patch_atihdmi_init(void)
-{
-        return snd_hda_add_codec_preset(&atihdmi_list);
-}
-
-static void __exit patch_atihdmi_exit(void)
-{
-        snd_hda_delete_codec_preset(&atihdmi_list);
-}
-
-module_init(patch_atihdmi_init)
-module_exit(patch_atihdmi_exit)

GPL/branches/uniaud32-2.0/alsa-kernel/pci/hda/patch_cmedia.c

@@ -29 +29 @@
 #include "hda_codec.h"
 #include "hda_local.h"
+#include "hda_patch.h"
 #define NUM_PINS        11
 
@@ -736 +737 @@
  * patch entries
  */
-static struct hda_codec_preset snd_hda_preset_cmedia[] = {
+struct hda_codec_preset snd_hda_preset_cmedia[] = {
         { .id = 0x13f69880, .name = "CMI9880", .patch = patch_cmi9880 },
         { .id = 0x434d4980, .name = "CMI9880", .patch = patch_cmi9880 },
         {0} /* terminator */
 };
-
-MODULE_ALIAS("snd-hda-codec-id:13f69880");
-MODULE_ALIAS("snd-hda-codec-id:434d4980");
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("C-Media HD-audio codec");
-
-static struct hda_codec_preset_list cmedia_list = {
-        .preset = snd_hda_preset_cmedia,
-        .owner = THIS_MODULE,
-};
-
-static int __init patch_cmedia_init(void)
-{
-        return snd_hda_add_codec_preset(&cmedia_list);
-}
-
-static void __exit patch_cmedia_exit(void)
-{
-        snd_hda_delete_codec_preset(&cmedia_list);
-}
-
-module_init(patch_cmedia_init)
-module_exit(patch_cmedia_exit)

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

@@ -26 +26 @@
 #include <linux/pci.h>
 #include <sound/core.h>
-#include <sound/jack.h>
-
 #include "hda_codec.h"
 #include "hda_local.h"
+#include "hda_patch.h"
 
 #define CXT_PIN_DIR_IN              0x00
@@ -40 +39 @@
 #define CONEXANT_MIC_EVENT      0x38
 
-/* Conexant 5051 specific */
-
-#define CXT5051_SPDIF_OUT       0x1C
-#define CXT5051_PORTB_EVENT     0x38
-#define CXT5051_PORTC_EVENT     0x39
-
-
-struct conexant_jack {
-
-        hda_nid_t nid;
-        int type;
-        struct snd_jack *jack;
-
-};
+
 
 struct conexant_spec {
@@ -98 +84 @@
 
         unsigned int spdif_route;
-
-        /* jack detection */
-        struct snd_array jacks;
 
         /* dynamic controls, init_verbs and input_mux */
@@ -348 +331 @@
 }
 
-static int conexant_add_jack(struct hda_codec *codec,
-                hda_nid_t nid, int type)
-{
-        struct conexant_spec *spec;
-        struct conexant_jack *jack;
-        const char *name;
-
-        spec = codec->spec;
-        snd_array_init(&spec->jacks, sizeof(*jack), 32);
-        jack = snd_array_new(&spec->jacks);
-        name = (type == SND_JACK_HEADPHONE) ? "Headphone" : "Mic" ;
-
-        if (!jack)
-                return -ENOMEM;
-
-        jack->nid = nid;
-        jack->type = type;
-
-        return snd_jack_new(codec->bus->card, name, type, &jack->jack);
-}
-
-static void conexant_report_jack(struct hda_codec *codec, hda_nid_t nid)
-{
-        struct conexant_spec *spec = codec->spec;
-        struct conexant_jack *jacks = spec->jacks.list;
-
-        if (jacks) {
-                int i;
-                for (i = 0; i < spec->jacks.used; i++) {
-                        if (jacks->nid == nid) {
-                                unsigned int present;
-                                present = snd_hda_codec_read(codec, nid, 0,
-                                                AC_VERB_GET_PIN_SENSE, 0) &
-                                        AC_PINSENSE_PRESENCE;
-
-                                present = (present) ? jacks->type : 0 ;
-
-                                snd_jack_report(jacks->jack,
-                                                present);
-                        }
-                        jacks++;
-                }
-        }
-}
-
-static int conexant_init_jacks(struct hda_codec *codec)
-{
-#ifdef CONFIG_SND_JACK
-        struct conexant_spec *spec = codec->spec;
-        int i;
-
-        for (i = 0; i < spec->num_init_verbs; i++) {
-                const struct hda_verb *hv;
-
-                hv = spec->init_verbs[i];
-                while (hv->nid) {
-                        int err = 0;
-                        switch (hv->param ^ AC_USRSP_EN) {
-                        case CONEXANT_HP_EVENT:
-                                err = conexant_add_jack(codec, hv->nid,
-                                                SND_JACK_HEADPHONE);
-                                conexant_report_jack(codec, hv->nid);
-                                break;
-                        case CXT5051_PORTC_EVENT:
-                        case CONEXANT_MIC_EVENT:
-                                err = conexant_add_jack(codec, hv->nid,
-                                                SND_JACK_MICROPHONE);
-                                conexant_report_jack(codec, hv->nid);
-                                break;
-                        }
-                        if (err < 0)
-                                return err;
-                        ++hv;
-                }
-        }
-#endif
-        return 0;
-
-}
-
 static int conexant_init(struct hda_codec *codec)
 {
@@ -440 +343 @@
 static void conexant_free(struct hda_codec *codec)
 {
-#ifdef CONFIG_SND_JACK
-        struct conexant_spec *spec = codec->spec;
-        if (spec->jacks.list) {
-                struct conexant_jack *jacks = spec->jacks.list;
-                int i;
-                for (i = 0; i < spec->jacks.used; i++)
-                        snd_device_free(codec->bus->card, &jacks[i].jack);
-                snd_array_free(&spec->jacks);
-        }
-#endif
         kfree(codec->spec);
 }
@@ -1635 +1528 @@
 static hda_nid_t cxt5051_dac_nids[1] = { 0x10 };
 static hda_nid_t cxt5051_adc_nids[2] = { 0x14, 0x15 };
+#define CXT5051_SPDIF_OUT       0x1C
+#define CXT5051_PORTB_EVENT     0x38
+#define CXT5051_PORTC_EVENT     0x39
 
 static struct hda_channel_mode cxt5051_modes[1] = {
@@ -1714 +1610 @@
                                    unsigned int res)
 {
-        int nid = (res & AC_UNSOL_RES_SUBTAG) >> 20;
         switch (res >> 26) {
         case CONEXANT_HP_EVENT:
@@ -1726 +1621 @@
                 break;
         }
-        conexant_report_jack(codec, nid);
 }
 
@@ -1801 +1695 @@
 {
         conexant_init(codec);
-        conexant_init_jacks(codec);
         if (codec->patch_ops.unsol_event) {
                 cxt5051_hp_automute(codec);
@@ -1879 +1772 @@
  */
 
-static struct hda_codec_preset snd_hda_preset_conexant[] = {
+struct hda_codec_preset snd_hda_preset_conexant[] = {
         { .id = 0x14f15045, .name = "CX20549 (Venice)",
           .patch = patch_cxt5045 },
@@ -1888 +1781 @@
         {0} /* terminator */
 };
-
-MODULE_ALIAS("snd-hda-codec-id:14f15045");
-MODULE_ALIAS("snd-hda-codec-id:14f15047");
-MODULE_ALIAS("snd-hda-codec-id:14f15051");
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Conexant HD-audio codec");
-
-static struct hda_codec_preset_list conexant_list = {
-        .preset = snd_hda_preset_conexant,
-        .owner = THIS_MODULE,
-};
-
-static int __init patch_conexant_init(void)
-{
-        return snd_hda_add_codec_preset(&conexant_list);
-}
-
-static void __exit patch_conexant_exit(void)
-{
-        snd_hda_delete_codec_preset(&conexant_list);
-}
-
-module_init(patch_conexant_init)
-module_exit(patch_conexant_exit)

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

@@ -31 +31 @@
 #include "hda_codec.h"
 #include "hda_local.h"
+#include "hda_patch.h"
 
 #define ALC880_FRONT_EVENT              0x01
@@ -216 +217 @@
         ALC883_ACER,
         ALC883_ACER_ASPIRE,
-        ALC888_ACER_ASPIRE_4930G,
         ALC883_MEDION,
         ALC883_MEDION_MD2,
@@ -230 +230 @@
         ALC883_CLEVO_M720,
         ALC883_FUJITSU_PI2515,
-        ALC888_FUJITSU_XA3530,
         ALC883_3ST_6ch_INTEL,
         ALC888_ASUS_M90V,
         ALC888_ASUS_EEE1601,
-        ALC1200_ASUS_P5Q,
         ALC883_AUTO,
         ALC883_MODEL_LAST,
@@ -384 +382 @@
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         struct alc_spec *spec = codec->spec;
-        const struct hda_input_mux *imux;
+        const struct hda_input_mux *imux = spec->input_mux;
         unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
-        unsigned int mux_idx;
         hda_nid_t nid = spec->capsrc_nids ?
                 spec->capsrc_nids[adc_idx] : spec->adc_nids[adc_idx];
-
-        mux_idx = adc_idx >= spec->num_mux_defs ? 0 : adc_idx;
-        imux = &spec->input_mux[mux_idx];
 
         if (spec->is_mix_capture) {
@@ -413 +407 @@
         } else {
                 /* MUX style (e.g. ALC880) */
-                return snd_hda_input_mux_put(codec, imux, ucontrol, nid,
+                unsigned int mux_idx;
+                mux_idx = adc_idx >= spec->num_mux_defs ? 0 : adc_idx;
+                return snd_hda_input_mux_put(codec, &spec->input_mux[mux_idx],
+                                             ucontrol, nid,
                                              &spec->cur_mux[adc_idx]);
         }
@@ -765 +762 @@
         spec->init_verbs[spec->num_init_verbs++] = verb;
 }
-
-#ifdef CONFIG_PROC_FS
-/*
- * hook for proc
- */
-static void print_realtek_coef(struct snd_info_buffer *buffer,
-                               struct hda_codec *codec, hda_nid_t nid)
-{
-        int coeff;
-
-        if (nid != 0x20)
-                return;
-        coeff = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_PROC_COEF, 0);
-        snd_iprintf(buffer, "  Processing Coefficient: 0x%02x\n", coeff);
-        coeff = snd_hda_codec_read(codec, nid, 0,
-                                   AC_VERB_GET_COEF_INDEX, 0);
-        snd_iprintf(buffer, "  Coefficient Index: 0x%02x\n", coeff);
-}
-#else
-#define print_realtek_coef      NULL
-#endif
 
 /*
@@ -1178 +1154 @@
 
 /*
- * ALC888
- */
-
-/*
- * 2ch mode
- */
-static struct hda_verb alc888_4ST_ch2_intel_init[] = {
-/* Mic-in jack as mic in */
-        { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
-        { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
-/* Line-in jack as Line in */
-        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
-        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
-/* Line-Out as Front */
-        { 0x17, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0} /* end */
-};
-
-/*
- * 4ch mode
- */
-static struct hda_verb alc888_4ST_ch4_intel_init[] = {
-/* Mic-in jack as mic in */
-        { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
-        { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
-/* Line-in jack as Surround */
-        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
-        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
-/* Line-Out as Front */
-        { 0x17, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0} /* end */
-};
-
-/*
- * 6ch mode
- */
-static struct hda_verb alc888_4ST_ch6_intel_init[] = {
-/* Mic-in jack as CLFE */
-        { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
-        { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
-/* Line-in jack as Surround */
-        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
-        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
-/* Line-Out as CLFE (workaround because Mic-in is not loud enough) */
-        { 0x17, AC_VERB_SET_CONNECT_SEL, 0x03},
-        {0} /* end */
-};
-
-/*
- * 8ch mode
- */
-static struct hda_verb alc888_4ST_ch8_intel_init[] = {
-/* Mic-in jack as CLFE */
-        { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
-        { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
-/* Line-in jack as Surround */
-        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
-        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
-/* Line-Out as Side */
-        { 0x17, AC_VERB_SET_CONNECT_SEL, 0x03},
-        {0} /* end */
-};
-
-static struct hda_channel_mode alc888_4ST_8ch_intel_modes[4] = {
-        { 2, alc888_4ST_ch2_intel_init },
-        { 4, alc888_4ST_ch4_intel_init },
-        { 6, alc888_4ST_ch6_intel_init },
-        { 8, alc888_4ST_ch8_intel_init },
-};
-
-/*
- * ALC888 Fujitsu Siemens Amillo xa3530
- */
-
-static struct hda_verb alc888_fujitsu_xa3530_verbs[] = {
-/* Front Mic: set to PIN_IN (empty by default) */
-        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-/* Connect Internal HP to Front */
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
-/* Connect Bass HP to Front */
-        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
-/* Connect Line-Out side jack (SPDIF) to Side */
-        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x17, AC_VERB_SET_CONNECT_SEL, 0x03},
-/* Connect Mic jack to CLFE */
-        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x18, AC_VERB_SET_CONNECT_SEL, 0x02},
-/* Connect Line-in jack to Surround */
-        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x1a, AC_VERB_SET_CONNECT_SEL, 0x01},
-/* Connect HP out jack to Front */
-        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},
-/* Enable unsolicited event for HP jack and Line-out jack */
-        {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
-        {0x17, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
-        {0}
-};
-
-static void alc888_fujitsu_xa3530_automute(struct hda_codec *codec)
-{
-        unsigned int present;
-        unsigned int bits;
-        /* Line out presence */
-        present = snd_hda_codec_read(codec, 0x17, 0,
-                                     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        /* HP out presence */
-        present = present || snd_hda_codec_read(codec, 0x1b, 0,
-                                     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        bits = present ? HDA_AMP_MUTE : 0;
-        /* Toggle internal speakers muting */
-        snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
-                                 HDA_AMP_MUTE, bits);
-        /* Toggle internal bass muting */
-        snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
-                                 HDA_AMP_MUTE, bits);
-}
-
-static void alc888_fujitsu_xa3530_unsol_event(struct hda_codec *codec,
-                unsigned int res)
-{
-        if (res >> 26 == ALC880_HP_EVENT)
-                alc888_fujitsu_xa3530_automute(codec);
-}
-
-
-/*
- * ALC888 Acer Aspire 4930G model
- */
-
-static struct hda_verb alc888_acer_aspire_4930g_verbs[] = {
-/* Front Mic: set to PIN_IN (empty by default) */
-        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-/* Unselect Front Mic by default in input mixer 3 */
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0xb)},
-/* Enable unsolicited event for HP jack */
-        {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
-/* Connect Internal HP to front */
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
-/* Connect HP out to front */
-        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0}
-};
-
-static struct hda_input_mux alc888_2_capture_sources[2] = {
-        /* Front mic only available on one ADC */
-        {
-                .num_items = 4,
-                .items = {
-                        { "Mic", 0x0 },
-                        { "Line", 0x2 },
-                        { "CD", 0x4 },
-                        { "Front Mic", 0xb },
-                },
-        },
-        {
-                .num_items = 3,
-                .items = {
-                        { "Mic", 0x0 },
-                        { "Line", 0x2 },
-                        { "CD", 0x4 },
-                },
-        }
-};
-
-static struct snd_kcontrol_new alc888_base_mixer[] = {
-        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
-        HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
-        HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
-        HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
-        HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0,
-                HDA_OUTPUT),
-        HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
-        HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
-        HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
-        HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
-        HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),
-        HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
-        HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
-        HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
-        HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
-        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
-        {0} /* end */
-};
-
-static void alc888_acer_aspire_4930g_automute(struct hda_codec *codec)
-{
-        unsigned int present;
-        unsigned int bits;
-        present = snd_hda_codec_read(codec, 0x15, 0,
-                                     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        bits = present ? HDA_AMP_MUTE : 0;
-        snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
-                                 HDA_AMP_MUTE, bits);
-}
-
-static void alc888_acer_aspire_4930g_unsol_event(struct hda_codec *codec,
-                unsigned int res)
-{
-        if (res >> 26 == ALC880_HP_EVENT)
-                alc888_acer_aspire_4930g_automute(codec);
-}
-
-/*
  * ALC880 3-stack model
  *
@@ -1502 +1258 @@
         int err;
 
-        mutex_lock(&codec->control_mutex);
+        mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
         kcontrol->private_value = HDA_COMPOSE_AMP_VAL(spec->adc_nids[0], 3, 0,
                                                       HDA_INPUT);
         err = snd_hda_mixer_amp_volume_info(kcontrol, uinfo);
-        mutex_unlock(&codec->control_mutex);
+        mutex_unlock(&codec->spdif_mutex); /* reuse spdif_mutex */
         return err;
 }
@@ -1517 +1273 @@
         int err;
 
-        mutex_lock(&codec->control_mutex);
+        mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
         kcontrol->private_value = HDA_COMPOSE_AMP_VAL(spec->adc_nids[0], 3, 0,
                                                       HDA_INPUT);
         err = snd_hda_mixer_amp_tlv(kcontrol, op_flag, size, tlv);
-        mutex_unlock(&codec->control_mutex);
+        mutex_unlock(&codec->spdif_mutex); /* reuse spdif_mutex */
         return err;
 }
@@ -1537 +1293 @@
         int err;
 
-        mutex_lock(&codec->control_mutex);
+        mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
         kcontrol->private_value = HDA_COMPOSE_AMP_VAL(spec->adc_nids[adc_idx],
                                                       3, 0, HDA_INPUT);
         err = func(kcontrol, ucontrol);
-        mutex_unlock(&codec->control_mutex);
+        mutex_unlock(&codec->spdif_mutex); /* reuse spdif_mutex */
         return err;
 }
@@ -4290 +4046 @@
                 alc_capture_mixer3,
         };
-        if (spec->num_adc_nids > 0 && spec->num_adc_nids <= 3)
+        if (spec->num_adc_nids > 0 && spec->num_adc_nids < 3)
                 spec->cap_mixer = caps[spec->num_adc_nids - 1];
 }
@@ -4365 +4121 @@
                 spec->loopback.amplist = alc880_loopbacks;
 #endif
-        codec->proc_widget_hook = print_realtek_coef;
 
         return 0;
@@ -5891 +5646 @@
                 spec->loopback.amplist = alc260_loopbacks;
 #endif
-        codec->proc_widget_hook = print_realtek_coef;
 
         return 0;
@@ -7097 +6851 @@
                 spec->loopback.amplist = alc882_loopbacks;
 #endif
-        codec->proc_widget_hook = print_realtek_coef;
 
         return 0;
@@ -7116 +6869 @@
 #define ALC883_DIGIN_NID        0x0a
 
-#define ALC1200_DIGOUT_NID      0x10
-
 static hda_nid_t alc883_dac_nids[4] = {
         /* front, rear, clfe, rear_surr */
@@ -7133 +6884 @@
 };
 
-static hda_nid_t alc883_adc_nids_rev[2] = {
-        /* ADC2-1 */
-        0x09, 0x08
-};
-
 static hda_nid_t alc883_capsrc_nids[2] = { 0x23, 0x22 };
-
-static hda_nid_t alc883_capsrc_nids_rev[2] = { 0x22, 0x23 };
 
 /* input MUX */
@@ -8433 +8177 @@
         [ALC883_ACER]           = "acer",
         [ALC883_ACER_ASPIRE]    = "acer-aspire",
-        [ALC888_ACER_ASPIRE_4930G]      = "acer-aspire-4930g",
         [ALC883_MEDION]         = "medion",
         [ALC883_MEDION_MD2]     = "medion-md2",
@@ -8447 +8190 @@
         [ALC883_CLEVO_M720]     = "clevo-m720",
         [ALC883_FUJITSU_PI2515] = "fujitsu-pi2515",
-        [ALC888_FUJITSU_XA3530] = "fujitsu-xa3530",
         [ALC883_3ST_6ch_INTEL]  = "3stack-6ch-intel",
-        [ALC1200_ASUS_P5Q]      = "asus-p5q",
         [ALC883_AUTO]           = "auto",
 };
@@ -8460 +8201 @@
         SND_PCI_QUIRK(0x1025, 0x0112, "Acer Aspire 9303", ALC883_ACER_ASPIRE),
         SND_PCI_QUIRK(0x1025, 0x0121, "Acer Aspire 5920G", ALC883_ACER_ASPIRE),
-        SND_PCI_QUIRK(0x1025, 0x013e, "Acer Aspire 4930G",
-                ALC888_ACER_ASPIRE_4930G),
-        SND_PCI_QUIRK(0x1025, 0x013f, "Acer Aspire 5930G",
-                ALC888_ACER_ASPIRE_4930G),
-        SND_PCI_QUIRK(0x1025, 0x015e, "Acer Aspire 6930G",
-                ALC888_ACER_ASPIRE_4930G),
         SND_PCI_QUIRK(0x1025, 0, "Acer laptop", ALC883_ACER), /* default Acer */
         SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL),
@@ -8472 +8207 @@
         SND_PCI_QUIRK(0x103c, 0x2a60, "HP Lucknow", ALC888_3ST_HP),
         SND_PCI_QUIRK(0x103c, 0x2a61, "HP Nettle", ALC883_6ST_DIG),
-        SND_PCI_QUIRK(0x103c, 0x2a66, "HP Acacia", ALC888_3ST_HP),
         SND_PCI_QUIRK(0x1043, 0x1873, "Asus M90V", ALC888_ASUS_M90V),
         SND_PCI_QUIRK(0x1043, 0x8249, "Asus M2A-VM HDMI", ALC883_3ST_6ch_DIG),
-        SND_PCI_QUIRK(0x1043, 0x82fe, "Asus P5Q-EM HDMI", ALC1200_ASUS_P5Q),
         SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_ASUS_EEE1601),
         SND_PCI_QUIRK(0x105b, 0x0ce8, "Foxconn P35AX-S", ALC883_6ST_DIG),
         SND_PCI_QUIRK(0x105b, 0x6668, "Foxconn", ALC883_6ST_DIG),
-        SND_PCI_QUIRK(0x1071, 0x8227, "Mitac 82801H", ALC883_MITAC),
         SND_PCI_QUIRK(0x1071, 0x8253, "Mitac 8252d", ALC883_MITAC),
         SND_PCI_QUIRK(0x1071, 0x8258, "Evesham Voyaeger", ALC883_LAPTOP_EAPD),
@@ -8503 +8235 @@
         SND_PCI_QUIRK(0x1462, 0x7187, "MSI", ALC883_6ST_DIG),
         SND_PCI_QUIRK(0x1462, 0x7250, "MSI", ALC883_6ST_DIG),
-        SND_PCI_QUIRK(0x1462, 0x7260, "MSI 7260", ALC883_TARGA_DIG),
         SND_PCI_QUIRK(0x1462, 0x7267, "MSI", ALC883_3ST_6ch_DIG),
         SND_PCI_QUIRK(0x1462, 0x7280, "MSI", ALC883_6ST_DIG),
@@ -8515 +8246 @@
         SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_MEDION),
         SND_PCI_QUIRK(0x1734, 0x1108, "Fujitsu AMILO Pi2515", ALC883_FUJITSU_PI2515),
-        SND_PCI_QUIRK(0x1734, 0x113d, "Fujitsu AMILO Xa3530",
-                ALC888_FUJITSU_XA3530),
         SND_PCI_QUIRK(0x17aa, 0x101e, "Lenovo 101e", ALC883_LENOVO_101E_2ch),
         SND_PCI_QUIRK(0x17aa, 0x2085, "Lenovo NB0763", ALC883_LENOVO_NB0763),
@@ -8528 +8257 @@
         SND_PCI_QUIRK(0x8086, 0x0001, "DG33BUC", ALC883_3ST_6ch_INTEL),
         SND_PCI_QUIRK(0x8086, 0x0002, "DG33FBC", ALC883_3ST_6ch_INTEL),
-        SND_PCI_QUIRK(0x8086, 0x2503, "82801H", ALC883_MITAC),
-        SND_PCI_QUIRK(0x8086, 0x0022, "DX58SO", ALC883_3ST_6ch_INTEL),
         SND_PCI_QUIRK(0x8086, 0xd601, "D102GGC", ALC883_3ST_6ch),
         {0}
@@ -8644 +8371 @@
                 .init_hook = alc883_acer_aspire_automute,
         },
-        [ALC888_ACER_ASPIRE_4930G] = {
-                .mixers = { alc888_base_mixer,
-                                alc883_chmode_mixer },
-                .init_verbs = { alc883_init_verbs, alc880_gpio1_init_verbs,
-                                alc888_acer_aspire_4930g_verbs },
-                .num_dacs = ARRAY_SIZE(alc883_dac_nids),
-                .dac_nids = alc883_dac_nids,
-                .num_adc_nids = ARRAY_SIZE(alc883_adc_nids_rev),
-                .adc_nids = alc883_adc_nids_rev,
-                .capsrc_nids = alc883_capsrc_nids_rev,
-                .dig_out_nid = ALC883_DIGOUT_NID,
-                .num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes),
-                .channel_mode = alc883_3ST_6ch_modes,
-                .need_dac_fix = 1,
-                .num_mux_defs =
-                        ARRAY_SIZE(alc888_2_capture_sources),
-                .input_mux = alc888_2_capture_sources,
-                .unsol_event = alc888_acer_aspire_4930g_unsol_event,
-                .init_hook = alc888_acer_aspire_4930g_automute,
-        },
         [ALC883_MEDION] = {
                 .mixers = { alc883_fivestack_mixer,
@@ -8806 +8513 @@
                 .unsol_event = alc883_2ch_fujitsu_pi2515_unsol_event,
                 .init_hook = alc883_2ch_fujitsu_pi2515_automute,
-        },
-        [ALC888_FUJITSU_XA3530] = {
-                .mixers = { alc888_base_mixer, alc883_chmode_mixer },
-                .init_verbs = { alc883_init_verbs,
-                        alc888_fujitsu_xa3530_verbs },
-                .num_dacs = ARRAY_SIZE(alc883_dac_nids),
-                .dac_nids = alc883_dac_nids,
-                .num_adc_nids = ARRAY_SIZE(alc883_adc_nids_rev),
-                .adc_nids = alc883_adc_nids_rev,
-                .capsrc_nids = alc883_capsrc_nids_rev,
-                .dig_out_nid = ALC883_DIGOUT_NID,
-                .num_channel_mode = ARRAY_SIZE(alc888_4ST_8ch_intel_modes),
-                .channel_mode = alc888_4ST_8ch_intel_modes,
-                .num_mux_defs =
-                        ARRAY_SIZE(alc888_2_capture_sources),
-                .input_mux = alc888_2_capture_sources,
-                .unsol_event = alc888_fujitsu_xa3530_unsol_event,
-                .init_hook = alc888_fujitsu_xa3530_automute,
         },
         [ALC888_LENOVO_SKY] = {
@@ -8866 +8555 @@
                 .unsol_event = alc883_eee1601_unsol_event,
                 .init_hook = alc883_eee1601_inithook,
-        },
-        [ALC1200_ASUS_P5Q] = {
-                .mixers = { alc883_base_mixer, alc883_chmode_mixer },
-                .init_verbs = { alc883_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc883_dac_nids),
-                .dac_nids = alc883_dac_nids,
-                .dig_out_nid = ALC1200_DIGOUT_NID,
-                .dig_in_nid = ALC883_DIGIN_NID,
-                .num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes),
-                .channel_mode = alc883_sixstack_modes,
-                .input_mux = &alc883_capture_source,
         },
 };
@@ -9074 +8752 @@
                 spec->loopback.amplist = alc883_loopbacks;
 #endif
-        codec->proc_widget_hook = print_realtek_coef;
 
         return 0;
@@ -10567 +10244 @@
         SND_PCI_QUIRK(0x104d, 0x900e, "Sony ASSAMD", ALC262_SONY_ASSAMD),
         SND_PCI_QUIRK(0x104d, 0x9015, "Sony 0x9015", ALC262_SONY_ASSAMD),
-        SND_PCI_QUIRK(0x104d, 0x9033, "Sony VAIO VGN-SR19XN",
-                      ALC262_SONY_ASSAMD),
         SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba dynabook SS RX1",
                       ALC262_TOSHIBA_RX1),
@@ -10576 +10251 @@
         SND_PCI_QUIRK(0x144d, 0xc032, "Samsung Q1 Ultra", ALC262_ULTRA),
         SND_PCI_QUIRK(0x144d, 0xc039, "Samsung Q1U EL", ALC262_ULTRA),
-        SND_PCI_QUIRK(0x144d, 0xc510, "Samsung Q45", ALC262_HIPPO),
         SND_PCI_QUIRK(0x17aa, 0x384e, "Lenovo 3000 y410", ALC262_LENOVO_3000),
         SND_PCI_QUIRK(0x17ff, 0x0560, "Benq ED8", ALC262_BENQ_ED8),
@@ -10884 +10558 @@
                 spec->loopback.amplist = alc262_loopbacks;
 #endif
-        codec->proc_widget_hook = print_realtek_coef;
 
         return 0;
@@ -11698 +11371 @@
                                                 ALC268_ACER_ASPIRE_ONE),
         SND_PCI_QUIRK(0x1028, 0x0253, "Dell OEM", ALC268_DELL),
-        SND_PCI_QUIRK(0x1028, 0x02b0, "Dell Inspiron Mini9", ALC268_DELL),
         SND_PCI_QUIRK(0x103c, 0x30cc, "TOSHIBA", ALC268_TOSHIBA),
         SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC268_3ST),
@@ -11950 +11622 @@
         if (board_config == ALC268_AUTO)
                 spec->init_hook = alc268_auto_init;
-
-        codec->proc_widget_hook = print_realtek_coef;
 
         return 0;
@@ -12754 +12424 @@
                 spec->loopback.amplist = alc269_loopbacks;
 #endif
-        codec->proc_widget_hook = print_realtek_coef;
 
         return 0;
@@ -13842 +13511 @@
                 spec->loopback.amplist = alc861_loopbacks;
 #endif
-        codec->proc_widget_hook = print_realtek_coef;
 
         return 0;
@@ -14804 +14472 @@
                 spec->loopback.amplist = alc861vd_loopbacks;
 #endif
-        codec->proc_widget_hook = print_realtek_coef;
 
         return 0;
@@ -16614 +16281 @@
                 spec->loopback.amplist = alc662_loopbacks;
 #endif
-        codec->proc_widget_hook = print_realtek_coef;
 
         return 0;
@@ -16622 +16288 @@
  * patch entries
  */
-static struct hda_codec_preset snd_hda_preset_realtek[] = {
+struct hda_codec_preset snd_hda_preset_realtek[] = {
         { .id = 0x10ec0260, .name = "ALC260", .patch = patch_alc260 },
         { .id = 0x10ec0262, .name = "ALC262", .patch = patch_alc262 },
@@ -16648 +16314 @@
         { .id = 0x10ec0885, .name = "ALC885", .patch = patch_alc882 },
         { .id = 0x10ec0887, .name = "ALC887", .patch = patch_alc883 },
+        { .id = 0x10ec0888, .name = "ALC888", .patch = patch_alc883 },
         { .id = 0x10ec0888, .rev = 0x100101, .name = "ALC1200",
           .patch = patch_alc883 },
-        { .id = 0x10ec0888, .name = "ALC888", .patch = patch_alc883 },
         { .id = 0x10ec0889, .name = "ALC889", .patch = patch_alc883 },
         {0} /* terminator */
 };
-
-MODULE_ALIAS("snd-hda-codec-id:10ec*");
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Realtek HD-audio codec");
-
-static struct hda_codec_preset_list realtek_list = {
-        .preset = snd_hda_preset_realtek,
-        .owner = THIS_MODULE,
-};
-
-static int __init patch_realtek_init(void)
-{
-        return snd_hda_add_codec_preset(&realtek_list);
-}
-
-static void __exit patch_realtek_exit(void)
-{
-        snd_hda_delete_codec_preset(&realtek_list);
-}
-
-module_init(patch_realtek_init)
-module_exit(patch_realtek_exit)

GPL/branches/uniaud32-2.0/alsa-kernel/pci/hda/patch_si3054.c

@@ -29 +29 @@
 #include "hda_codec.h"
 #include "hda_local.h"
+#include "hda_patch.h"
 
 /* si3054 verbs */
@@ -283 +284 @@
  * patch entries
  */
-static struct hda_codec_preset snd_hda_preset_si3054[] = {
+struct hda_codec_preset snd_hda_preset_si3054[] = {
         { .id = 0x163c3055, .name = "Si3054", .patch = patch_si3054 },
         { .id = 0x163c3155, .name = "Si3054", .patch = patch_si3054 },
@@ -301 +302 @@
 };
 
-MODULE_ALIAS("snd-hda-codec-id:163c3055");
-MODULE_ALIAS("snd-hda-codec-id:163c3155");
-MODULE_ALIAS("snd-hda-codec-id:11c13026");
-MODULE_ALIAS("snd-hda-codec-id:11c13055");
-MODULE_ALIAS("snd-hda-codec-id:11c13155");
-MODULE_ALIAS("snd-hda-codec-id:10573055");
-MODULE_ALIAS("snd-hda-codec-id:10573057");
-MODULE_ALIAS("snd-hda-codec-id:10573155");
-MODULE_ALIAS("snd-hda-codec-id:11063288");
-MODULE_ALIAS("snd-hda-codec-id:15433155");
-MODULE_ALIAS("snd-hda-codec-id:18540018");
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Si3054 HD-audio modem codec");
-
-static struct hda_codec_preset_list si3054_list = {
-        .preset = snd_hda_preset_si3054,
-        .owner = THIS_MODULE,
-};
-
-static int __init patch_si3054_init(void)
-{
-        return snd_hda_add_codec_preset(&si3054_list);
-}
-
-static void __exit patch_si3054_exit(void)
-{
-        snd_hda_delete_codec_preset(&si3054_list);
-}
-
-module_init(patch_si3054_init)
-module_exit(patch_si3054_exit)

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

@@ -34 +34 @@
 #include "hda_codec.h"
 #include "hda_local.h"
+#include "hda_patch.h"
 #include "hda_beep.h"
 
-enum {
-        STAC_VREF_EVENT = 1,
-        STAC_INSERT_EVENT,
-        STAC_PWR_EVENT,
-        STAC_HP_EVENT,
-};
+#define STAC_INSERT_EVENT       0x10
+#define STAC_PWR_EVENT          0x20
+#define STAC_HP_EVENT           0x30
+#define STAC_VREF_EVENT         0x40
 
 enum {
@@ -56 +55 @@
         STAC_9200_DELL_M26,
         STAC_9200_DELL_M27,
-        STAC_9200_M4,
-        STAC_9200_M4_2,
+        STAC_9200_GATEWAY,
         STAC_9200_PANASONIC,
         STAC_9200_MODELS
@@ -71 +69 @@
 
 enum {
-        STAC_92HD73XX_NO_JD, /* no jack-detection */
         STAC_92HD73XX_REF,
-        STAC_DELL_M6_AMIC,
-        STAC_DELL_M6_DMIC,
-        STAC_DELL_M6_BOTH,
+        STAC_DELL_M6,
         STAC_DELL_EQ,
         STAC_92HD73XX_MODELS
@@ -89 +84 @@
         STAC_DELL_M4_1,
         STAC_DELL_M4_2,
-        STAC_DELL_M4_3,
         STAC_HP_M4,
-        STAC_HP_DV5,
         STAC_92HD71BXX_MODELS
 };
@@ -97 +90 @@
 enum {
         STAC_925x_REF,
-        STAC_M1,
-        STAC_M1_2,
-        STAC_M2,
         STAC_M2_2,
-        STAC_M3,
-        STAC_M5,
-        STAC_M6,
+        STAC_MA6,
+        STAC_PA6,
         STAC_925x_MODELS
 };
@@ -135 +124 @@
 
 enum {
-        STAC_D965_REF_NO_JD, /* no jack-detection */
         STAC_D965_REF,
         STAC_D965_3ST,
@@ -146 +134 @@
 struct sigmatel_event {
         hda_nid_t nid;
-        unsigned char type;
-        unsigned char tag;
         int data;
 };
@@ -162 +148 @@
 
         int board_config;
-        unsigned int eapd_switch: 1;
         unsigned int surr_switch: 1;
+        unsigned int line_switch: 1;
+        unsigned int mic_switch: 1;
         unsigned int alt_switch: 1;
         unsigned int hp_detect: 1;
@@ -200 +187 @@
         struct hda_multi_out multiout;
         hda_nid_t dac_nids[5];
-        hda_nid_t hp_dacs[5];
-        hda_nid_t speaker_dacs[5];
 
         /* capture */
@@ -225 +210 @@
         unsigned int num_pins;
         unsigned int *pin_configs;
+        unsigned int *bios_pin_configs;
 
         /* codec specific stuff */
@@ -245 +231 @@
         unsigned int io_switch[2];
         unsigned int clfe_swap;
-        hda_nid_t line_switch;  /* shared line-in for input and output */
-        hda_nid_t mic_switch;   /* shared mic-in for input and output */
-        hda_nid_t hp_switch; /* NID of HP as line-out */
+        unsigned int hp_switch;
         unsigned int aloopback;
 
@@ -298 +282 @@
 
 #define STAC92HD73_DAC_COUNT 5
+static hda_nid_t stac92hd73xx_dac_nids[STAC92HD73_DAC_COUNT] = {
+        0x15, 0x16, 0x17, 0x18, 0x19,
+};
 
 static hda_nid_t stac92hd73xx_mux_nids[4] = {
@@ -316 +303 @@
 };
 
+#define STAC92HD81_DAC_COUNT 2
 #define STAC92HD83_DAC_COUNT 3
+static hda_nid_t stac92hd83xxx_dac_nids[STAC92HD73_DAC_COUNT] = {
+        0x13, 0x14, 0x22,
+};
 
 static hda_nid_t stac92hd83xxx_dmux_nids[2] = {
@@ -335 +326 @@
 
 static unsigned int stac92hd83xxx_pwr_mapping[4] = {
-        0x03, 0x0c, 0x20, 0x80,
-};
-
-static hda_nid_t stac92hd83xxx_amp_nids[1] = {
-        0xc,
+        0x03, 0x0c, 0x10, 0x40,
 };
 
@@ -360 +347 @@
 static hda_nid_t stac92hd71bxx_smux_nids[2] = {
         0x24, 0x25,
+};
+
+static hda_nid_t stac92hd71bxx_dac_nids[1] = {
+        0x10, /*0x11, */
 };
 
@@ -593 +584 @@
                         nid = codec->slave_dig_outs[smux_idx - 1];
                 if (spec->cur_smux[smux_idx] == smux->num_items - 1)
-                        val = HDA_AMP_MUTE;
+                        val = AMP_OUT_MUTE;
                 else
-                        val = 0;
+                        val = AMP_OUT_UNMUTE;
                 /* un/mute SPDIF out */
-                snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,
-                                         HDA_AMP_MUTE, val);
+                snd_hda_codec_write_cache(codec, nid, 0,
+                        AC_VERB_SET_AMP_GAIN_MUTE, val);
         }
         return 0;
@@ -763 +754 @@
         /* set master volume and direct control */
         { 0x1f, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
+        /* setup audio connections */
+        { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00},
+        { 0x10, AC_VERB_SET_CONNECT_SEL, 0x01},
+        { 0x11, AC_VERB_SET_CONNECT_SEL, 0x02},
         /* setup adcs to point to mixer */
         { 0x20, AC_VERB_SET_CONNECT_SEL, 0x0b},
@@ -781 +776 @@
          * and direct control */
         { 0x1f, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xec},
+        /* setup audio connections */
+        { 0x0d, AC_VERB_SET_CONNECT_SEL, 0x00},
+        { 0x0a, AC_VERB_SET_CONNECT_SEL, 0x02},
+        { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x01},
         /* setup adcs to point to mixer */
         { 0x20, AC_VERB_SET_CONNECT_SEL, 0x0b},
@@ -794 +793 @@
 static struct hda_verb dell_m6_core_init[] = {
         { 0x1f, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
+        /* setup audio connections */
+        { 0x0d, AC_VERB_SET_CONNECT_SEL, 0x00},
+        { 0x0a, AC_VERB_SET_CONNECT_SEL, 0x01},
+        { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x02},
         /* setup adcs to point to mixer */
         { 0x20, AC_VERB_SET_CONNECT_SEL, 0x0b},
@@ -808 +811 @@
         /* set master volume and direct control */
         { 0x1f, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
+        /* setup audio connections */
+        { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00},
+        { 0x10, AC_VERB_SET_CONNECT_SEL, 0x01},
+        { 0x11, AC_VERB_SET_CONNECT_SEL, 0x02},
+        /* connect hp ports to dac3 */
+        { 0x0a, AC_VERB_SET_CONNECT_SEL, 0x03},
+        { 0x0d, AC_VERB_SET_CONNECT_SEL, 0x03},
         /* setup adcs to point to mixer */
         { 0x20, AC_VERB_SET_CONNECT_SEL, 0x0b},
@@ -825 +835 @@
         /* set master volume and direct control */
         { 0x1f, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
+        /* setup audio connections */
+        { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00 },
+        { 0x10, AC_VERB_SET_CONNECT_SEL, 0x01 },
+        { 0x11, AC_VERB_SET_CONNECT_SEL, 0x02 },
         /* dac3 is connected to import3 mux */
         { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0xb07f},
+        /* connect hp ports to dac4 */
+        { 0x0a, AC_VERB_SET_CONNECT_SEL, 0x04},
+        { 0x0d, AC_VERB_SET_CONNECT_SEL, 0x04},
         /* setup adcs to point to mixer */
         { 0x20, AC_VERB_SET_CONNECT_SEL, 0x0b},
@@ -852 +869 @@
         /* power state controls amps */
         { 0x01, AC_VERB_SET_EAPD, 1 << 2},
-        {0}
 };
 
@@ -858 +874 @@
         /* set master volume and direct control */
         { 0x28, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
+        /* connect headphone jack to dac1 */
+        { 0x0a, AC_VERB_SET_CONNECT_SEL, 0x01},
         /* unmute right and left channels for nodes 0x0a, 0xd, 0x0f */
         { 0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         { 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         { 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0}
 };
 
@@ -877 +894 @@
         /* set master volume and direct control */
         { 0x28, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
+        /* connect headphone jack to dac1 */
+        { 0x0a, AC_VERB_SET_CONNECT_SEL, 0x01},
         /* unmute right and left channels for nodes 0x0a, 0xd */
         { 0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
@@ -886 +905 @@
         /* set dac0mux for dac converter */
         { 0x06, AC_VERB_SET_CONNECT_SEL, 0x00},
-        /* mute the master volume */
-        { 0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
         {0}
 };
@@ -1078 +1095 @@
         HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x18, 0x0, HDA_OUTPUT),
 
-        HDA_CODEC_VOLUME("DAC0 Capture Volume", 0x1b, 0x3, HDA_INPUT),
-        HDA_CODEC_MUTE("DAC0 Capture Switch", 0x1b, 0x3, HDA_INPUT),
-
-        HDA_CODEC_VOLUME("DAC1 Capture Volume", 0x1b, 0x4, HDA_INPUT),
-        HDA_CODEC_MUTE("DAC1 Capture Switch", 0x1b, 0x4, HDA_INPUT),
-
-        HDA_CODEC_VOLUME("Front Mic Capture Volume", 0x1b, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Front Mic Capture Switch", 0x1b, 0x0, HDA_INPUT),
-
-        HDA_CODEC_VOLUME("Line In Capture Volume", 0x1b, 0x2, HDA_INPUT),
-        HDA_CODEC_MUTE("Line In Capture Switch", 0x1b, 0x2, HDA_INPUT),
+        HDA_CODEC_VOLUME("DAC0 Capture Volume", 0x1b, 0, HDA_INPUT),
+        HDA_CODEC_MUTE("DAC0 Capture Switch", 0x1b, 0, HDA_INPUT),
+
+        HDA_CODEC_VOLUME("DAC1 Capture Volume", 0x1b, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("DAC1 Capture Switch", 0x1b, 0x1, HDA_INPUT),
+
+        HDA_CODEC_VOLUME("Front Mic Capture Volume", 0x1b, 0x2, HDA_INPUT),
+        HDA_CODEC_MUTE("Front Mic Capture Switch", 0x1b, 0x2, HDA_INPUT),
+
+        HDA_CODEC_VOLUME("Line In Capture Volume", 0x1b, 0x3, HDA_INPUT),
+        HDA_CODEC_MUTE("Line In Capture Switch", 0x1b, 0x3, HDA_INPUT),
 
         /*
-        HDA_CODEC_VOLUME("Mic Capture Volume", 0x1b, 0x1, HDA_INPUT),
-        HDA_CODEC_MUTE("Mic Capture Switch", 0x1b 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Capture Volume", 0x1b, 0x4, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Capture Switch", 0x1b 0x4, HDA_INPUT),
         */
         {0} /* end */
@@ -1139 +1156 @@
 
 static struct snd_kcontrol_new stac925x_mixer[] = {
-        HDA_CODEC_VOLUME("Master Playback Volume", 0x0e, 0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Master Playback Switch", 0x0e, 0, HDA_OUTPUT),
         STAC_INPUT_SOURCE(1),
         HDA_CODEC_VOLUME("Capture Volume", 0x09, 0, HDA_OUTPUT),
@@ -1234 +1249 @@
 
 static void stac92xx_free_kctls(struct hda_codec *codec);
-static int stac92xx_add_jack(struct hda_codec *codec, hda_nid_t nid, int type);
 
 static int stac92xx_build_controls(struct hda_codec *codec)
 {
         struct sigmatel_spec *spec = codec->spec;
-        struct auto_pin_cfg *cfg = &spec->autocfg;
-        hda_nid_t nid;
         int err;
         int i;
@@ -1271 +1283 @@
                 }
                 stac_smux_mixer.count = spec->num_smuxes;
-                err = snd_hda_ctl_add(codec,
+                err = snd_ctl_add(codec->bus->card,
                                   snd_ctl_new1(&stac_smux_mixer, codec));
                 if (err < 0)
@@ -1311 +1323 @@
 
         stac92xx_free_kctls(codec); /* no longer needed */
-
-        /* create jack input elements */
-        if (spec->hp_detect) {
-                for (i = 0; i < cfg->hp_outs; i++) {
-                        int type = SND_JACK_HEADPHONE;
-                        nid = cfg->hp_pins[i];
-                        /* jack detection */
-                        if (cfg->hp_outs == i)
-                                type |= SND_JACK_LINEOUT;
-                        err = stac92xx_add_jack(codec, nid, type);
-                        if (err < 0)
-                                return err;
-                }
-        }
-        for (i = 0; i < cfg->line_outs; i++) {
-                err = stac92xx_add_jack(codec, cfg->line_out_pins[i],
-                                        SND_JACK_LINEOUT);
-                if (err < 0)
-                        return err;
-        }
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                nid = cfg->input_pins[i];
-                if (nid) {
-                        err = stac92xx_add_jack(codec, nid,
-                                                SND_JACK_MICROPHONE);
-                        if (err < 0)
-                                return err;
-                }
-        }
-
         return 0;       
 }
@@ -1349 +1331 @@
 };
 
-static unsigned int gateway9200_m4_pin_configs[8] = {
-        0x400000fe, 0x404500f4, 0x400100f0, 0x90110010,
-        0x400100f1, 0x02a1902e, 0x500000f2, 0x500000f3,
-};
-static unsigned int gateway9200_m4_2_pin_configs[8] = {
-        0x400000fe, 0x404500f4, 0x400100f0, 0x90110010,
-        0x400100f1, 0x02a1902e, 0x500000f2, 0x500000f3,
-};
-
-/*
+/* 
     STAC 9200 pin configs for
     102801A8
@@ -1488 +1461 @@
         [STAC_9200_DELL_M26] = dell9200_m26_pin_configs,
         [STAC_9200_DELL_M27] = dell9200_m27_pin_configs,
-        [STAC_9200_M4] = gateway9200_m4_pin_configs,
-        [STAC_9200_M4_2] = gateway9200_m4_2_pin_configs,
         [STAC_9200_PANASONIC] = ref9200_pin_configs,
 };
@@ -1506 +1477 @@
         [STAC_9200_DELL_M26] = "dell-m26",
         [STAC_9200_DELL_M27] = "dell-m27",
-        [STAC_9200_M4] = "gateway-m4",
-        [STAC_9200_M4_2] = "gateway-m4-2",
+        [STAC_9200_GATEWAY] = "gateway",
         [STAC_9200_PANASONIC] = "panasonic",
 };
@@ -1577 +1547 @@
         SND_PCI_QUIRK(0x10f7, 0x8338, "Panasonic CF-74", STAC_9200_PANASONIC),
         /* Gateway machines needs EAPD to be set on resume */
-        SND_PCI_QUIRK(0x107b, 0x0205, "Gateway S-7110M", STAC_9200_M4),
-        SND_PCI_QUIRK(0x107b, 0x0317, "Gateway MT3423, MX341*", STAC_9200_M4_2),
-        SND_PCI_QUIRK(0x107b, 0x0318, "Gateway ML3019, MT3707", STAC_9200_M4_2),
+        SND_PCI_QUIRK(0x107b, 0x0205, "Gateway S-7110M", STAC_9200_GATEWAY),
+        SND_PCI_QUIRK(0x107b, 0x0317, "Gateway MT3423, MX341*",
+                      STAC_9200_GATEWAY),
+        SND_PCI_QUIRK(0x107b, 0x0318, "Gateway ML3019, MT3707",
+                      STAC_9200_GATEWAY),
         /* OQO Mobile */
         SND_PCI_QUIRK(0x1106, 0x3288, "OQO Model 2", STAC_9200_OQO),
@@ -1590 +1562 @@
 };
 
-static unsigned int stac925xM1_pin_configs[8] = {
-        0x40c003f4, 0x424503f2, 0x400000f3, 0x02a19020,
-        0x40a000f0, 0x90100210, 0x400003f1, 0x9033032e,
-};
-
-static unsigned int stac925xM1_2_pin_configs[8] = {
-        0x40c003f4, 0x424503f2, 0x400000f3, 0x02a19020,
-        0x40a000f0, 0x90100210, 0x400003f1, 0x9033032e,
-};
-
-static unsigned int stac925xM2_pin_configs[8] = {
-        0x40c003f4, 0x424503f2, 0x400000f3, 0x02a19020,
-        0x40a000f0, 0x90100210, 0x400003f1, 0x9033032e,
+static unsigned int stac925x_MA6_pin_configs[8] = {
+        0x40c003f0, 0x424503f2, 0x01813022, 0x02a19021,
+        0x90a70320, 0x90100211, 0x400003f1, 0x9033032e,
+};
+
+static unsigned int stac925x_PA6_pin_configs[8] = {
+        0x40c003f0, 0x424503f2, 0x01813022, 0x02a19021,
+        0x50a103f0, 0x90100211, 0x400003f1, 0x9033032e,
 };
 
 static unsigned int stac925xM2_2_pin_configs[8] = {
-        0x40c003f4, 0x424503f2, 0x400000f3, 0x02a19020,
-        0x40a000f0, 0x90100210, 0x400003f1, 0x9033032e,
-};
-
-static unsigned int stac925xM3_pin_configs[8] = {
-        0x40c003f4, 0x424503f2, 0x400000f3, 0x02a19020,
-        0x40a000f0, 0x90100210, 0x400003f1, 0x503303f3,
-};
-
-static unsigned int stac925xM5_pin_configs[8] = {
-        0x40c003f4, 0x424503f2, 0x400000f3, 0x02a19020,
-        0x40a000f0, 0x90100210, 0x400003f1, 0x9033032e,
-};
-
-static unsigned int stac925xM6_pin_configs[8] = {
-        0x40c003f4, 0x424503f2, 0x400000f3, 0x02a19020,
-        0x40a000f0, 0x90100210, 0x400003f1, 0x90330320,
+        0x40c003f3, 0x424503f2, 0x04180011, 0x02a19020,
+        0x50a103f0, 0x90100212, 0x400003f1, 0x9033032e,
 };
 
 static unsigned int *stac925x_brd_tbl[STAC_925x_MODELS] = {
         [STAC_REF] = ref925x_pin_configs,
-        [STAC_M1] = stac925xM1_pin_configs,
-        [STAC_M1_2] = stac925xM1_2_pin_configs,
-        [STAC_M2] = stac925xM2_pin_configs,
         [STAC_M2_2] = stac925xM2_2_pin_configs,
-        [STAC_M3] = stac925xM3_pin_configs,
-        [STAC_M5] = stac925xM5_pin_configs,
-        [STAC_M6] = stac925xM6_pin_configs,
+        [STAC_MA6] = stac925x_MA6_pin_configs,
+        [STAC_PA6] = stac925x_PA6_pin_configs,
 };
 
 static const char *stac925x_models[STAC_925x_MODELS] = {
         [STAC_REF] = "ref",
-        [STAC_M1] = "m1",
-        [STAC_M1_2] = "m1-2",
-        [STAC_M2] = "m2",
         [STAC_M2_2] = "m2-2",
-        [STAC_M3] = "m3",
-        [STAC_M5] = "m5",
-        [STAC_M6] = "m6",
-};
-
-static struct snd_pci_quirk stac925x_codec_id_cfg_tbl[] = {
-        SND_PCI_QUIRK(0x107b, 0x0316, "Gateway M255", STAC_M2),
-        SND_PCI_QUIRK(0x107b, 0x0366, "Gateway MP6954", STAC_M5),
-        SND_PCI_QUIRK(0x107b, 0x0461, "Gateway NX560XL", STAC_M1),
-        SND_PCI_QUIRK(0x107b, 0x0681, "Gateway NX860", STAC_M2),
-        SND_PCI_QUIRK(0x107b, 0x0367, "Gateway MX6453", STAC_M1_2),
-        /* Not sure about the brand name for those */
-        SND_PCI_QUIRK(0x107b, 0x0281, "Gateway mobile", STAC_M1),
-        SND_PCI_QUIRK(0x107b, 0x0507, "Gateway mobile", STAC_M3),
-        SND_PCI_QUIRK(0x107b, 0x0281, "Gateway mobile", STAC_M6),
-        SND_PCI_QUIRK(0x107b, 0x0685, "Gateway mobile", STAC_M2_2),
-        {0} /* terminator */
+        [STAC_MA6] = "m6",
+        [STAC_PA6] = "pa6",
 };
 
@@ -1665 +1595 @@
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668, "DFI LanParty", STAC_REF),
         SND_PCI_QUIRK(0x8384, 0x7632, "Stac9202 Reference Board", STAC_REF),
-
-        /* Default table for unknown ID */
-        SND_PCI_QUIRK(0x1002, 0x437b, "Gateway mobile", STAC_M2_2),
-
+        SND_PCI_QUIRK(0x107b, 0x0316, "Gateway M255", STAC_REF),
+        SND_PCI_QUIRK(0x107b, 0x0366, "Gateway MP6954", STAC_REF),
+        SND_PCI_QUIRK(0x107b, 0x0461, "Gateway NX560XL", STAC_MA6),
+        SND_PCI_QUIRK(0x107b, 0x0681, "Gateway NX860", STAC_PA6),
+        SND_PCI_QUIRK(0x1002, 0x437b, "Gateway MX6453", STAC_M2_2),
         {0} /* terminator */
 };
@@ -1688 +1619 @@
 static unsigned int *stac92hd73xx_brd_tbl[STAC_92HD73XX_MODELS] = {
         [STAC_92HD73XX_REF]     = ref92hd73xx_pin_configs,
-        [STAC_DELL_M6_AMIC]     = dell_m6_pin_configs,
-        [STAC_DELL_M6_DMIC]     = dell_m6_pin_configs,
-        [STAC_DELL_M6_BOTH]     = dell_m6_pin_configs,
+        [STAC_DELL_M6]  = dell_m6_pin_configs,
         [STAC_DELL_EQ]  = dell_m6_pin_configs,
 };
 
 static const char *stac92hd73xx_models[STAC_92HD73XX_MODELS] = {
-        [STAC_92HD73XX_NO_JD] = "no-jd",
         [STAC_92HD73XX_REF] = "ref",
-        [STAC_DELL_M6_AMIC] = "dell-m6-amic",
-        [STAC_DELL_M6_DMIC] = "dell-m6-dmic",
-        [STAC_DELL_M6_BOTH] = "dell-m6",
+        [STAC_DELL_M6] = "dell-m6",
         [STAC_DELL_EQ] = "dell-eq",
 };
@@ -1708 +1634 @@
                                 "DFI LanParty", STAC_92HD73XX_REF),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0254,
-                                "Dell Studio 1535", STAC_DELL_M6_DMIC),
+                                "unknown Dell", STAC_DELL_M6),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0255,
-                                "unknown Dell", STAC_DELL_M6_DMIC),
+                                "unknown Dell", STAC_DELL_M6),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0256,
-                                "unknown Dell", STAC_DELL_M6_BOTH),
+                                "unknown Dell", STAC_DELL_M6),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0257,
-                                "unknown Dell", STAC_DELL_M6_BOTH),
+                                "unknown Dell", STAC_DELL_M6),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x025e,
-                                "unknown Dell", STAC_DELL_M6_AMIC),
+                                "unknown Dell", STAC_DELL_M6),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x025f,
-                                "unknown Dell", STAC_DELL_M6_AMIC),
+                                "unknown Dell", STAC_DELL_M6),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0271,
-                                "unknown Dell", STAC_DELL_M6_DMIC),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0272,
-                                "unknown Dell", STAC_DELL_M6_DMIC),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x029f,
-                                "Dell Studio 1537", STAC_DELL_M6_DMIC),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02a0,
-                                "Dell Studio 17", STAC_DELL_M6_DMIC),
+                                "unknown Dell", STAC_DELL_M6),
         {0} /* terminator */
 };
@@ -1748 +1668 @@
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
-                      "DFI LanParty", STAC_92HD83XXX_REF),
-        {0} /* terminator */
+                      "DFI LanParty", STAC_92HD71BXX_REF),
 };
 
@@ -1770 +1689 @@
 };
 
-static unsigned int dell_m4_3_pin_configs[11] = {
-        0x0421101f, 0x04a11221, 0x90a70330, 0x90170110,
-        0x40f000f0, 0x40f000f0, 0x40f000f0, 0x90a000f0,
-        0x40f000f0, 0x044413b0, 0x044413b0,
-};
-
 static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = {
         [STAC_92HD71BXX_REF] = ref92hd71bxx_pin_configs,
         [STAC_DELL_M4_1]        = dell_m4_1_pin_configs,
         [STAC_DELL_M4_2]        = dell_m4_2_pin_configs,
-        [STAC_DELL_M4_3]        = dell_m4_3_pin_configs,
         [STAC_HP_M4]            = NULL,
-        [STAC_HP_DV5]           = NULL,
 };
 
@@ -1789 +1700 @@
         [STAC_DELL_M4_1] = "dell-m4-1",
         [STAC_DELL_M4_2] = "dell-m4-2",
-        [STAC_DELL_M4_3] = "dell-m4-3",
         [STAC_HP_M4] = "hp-m4",
-        [STAC_HP_DV5] = "hp-dv5",
 };
 
@@ -1798 +1707 @@
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
                       "DFI LanParty", STAC_92HD71BXX_REF),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30f2,
-                      "HP dv5", STAC_HP_M4),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30f4,
-                      "HP dv7", STAC_HP_M4),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30fc,
-                      "HP dv7", STAC_HP_M4),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3603,
-                      "HP dv5", STAC_HP_DV5),
         SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x361a,
                                 "unknown HP", STAC_HP_M4),
@@ -1830 +1731 @@
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0264,
                                 "unknown Dell", STAC_DELL_M4_2),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02aa,
-                                "unknown Dell", STAC_DELL_M4_3),
         {0} /* terminator */
 };
@@ -2121 +2020 @@
 
 static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = {
-        [STAC_D965_REF_NO_JD] = ref927x_pin_configs,
         [STAC_D965_REF]  = ref927x_pin_configs,
         [STAC_D965_3ST]  = d965_3st_pin_configs,
@@ -2130 +2028 @@
 
 static const char *stac927x_models[STAC_927X_MODELS] = {
-        [STAC_D965_REF_NO_JD]   = "ref-no-jd",
         [STAC_D965_REF]         = "ref",
         [STAC_D965_3ST]         = "3stack",
@@ -2289 +2186 @@
         struct sigmatel_spec *spec = codec->spec;
         
-        kfree(spec->pin_configs);
-        spec->pin_configs = kcalloc(spec->num_pins, sizeof(*spec->pin_configs),
-                                    GFP_KERNEL);
-        if (!spec->pin_configs)
-                return -ENOMEM;
+        if (! spec->bios_pin_configs) {
+                spec->bios_pin_configs = kcalloc(spec->num_pins,
+                                                 sizeof(*spec->bios_pin_configs), GFP_KERNEL);
+                if (! spec->bios_pin_configs)
+                        return -ENOMEM;
+        }
         
         for (i = 0; i < spec->num_pins; i++) {
@@ -2303 +2201 @@
                 snd_printdd(KERN_INFO "hda_codec: pin nid %2.2x bios pin config %8.8x\n",
                                         nid, pin_cfg);
-                spec->pin_configs[i] = pin_cfg;
+                spec->bios_pin_configs[i] = pin_cfg;
         }
         
@@ -2345 +2243 @@
 }
 
-static int stac_save_pin_cfgs(struct hda_codec *codec, unsigned int *pins)
-{
-        struct sigmatel_spec *spec = codec->spec;
-
-        if (!pins)
-                return stac92xx_save_bios_config_regs(codec);
-
-        kfree(spec->pin_configs);
-        spec->pin_configs = kmemdup(pins,
-                                    spec->num_pins * sizeof(*pins),
-                                    GFP_KERNEL);
-        if (!spec->pin_configs)
-                return -ENOMEM;
-
-        stac92xx_set_config_regs(codec);
-        return 0;
-}
-
-static void stac_change_pin_config(struct hda_codec *codec, hda_nid_t nid,
-                                   unsigned int cfg)
-{
-        struct sigmatel_spec *spec = codec->spec;
-        int i;
-
-        for (i = 0; i < spec->num_pins; i++) {
-                if (spec->pin_nids[i] == nid) {
-                        spec->pin_configs[i] = cfg;
-                        stac92xx_set_config_reg(codec, nid, cfg);
-                        break;
-                }
-        }
-}
-
 /*
  * Analog playback callbacks
@@ -2455 +2320 @@
         if (spec->powerdown_adcs) {
                 msleep(40);
-                snd_hda_codec_write(codec, nid, 0,
+                snd_hda_codec_write_cache(codec, nid, 0,
                         AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
         }
@@ -2471 +2336 @@
         snd_hda_codec_cleanup_stream(codec, nid);
         if (spec->powerdown_adcs)
-                snd_hda_codec_write(codec, nid, 0,
+                snd_hda_codec_write_cache(codec, nid, 0,
                         AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
         return 0;
@@ -2599 +2464 @@
         struct sigmatel_spec *spec = codec->spec;
 
-        ucontrol->value.integer.value[0] = !!spec->hp_switch;
+        ucontrol->value.integer.value[0] = spec->hp_switch;
         return 0;
 }
-
-static void stac_issue_unsol_event(struct hda_codec *codec, hda_nid_t nid,
-                                   unsigned char type);
 
 static int stac92xx_hp_switch_put(struct snd_kcontrol *kcontrol,
@@ -2611 +2473 @@
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         struct sigmatel_spec *spec = codec->spec;
-        int nid = kcontrol->private_value;
- 
-        spec->hp_switch = ucontrol->value.integer.value[0] ? nid : 0;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
+        int nid = cfg->hp_pins[cfg->hp_outs - 1];
+
+        spec->hp_switch = ucontrol->value.integer.value[0];
 
         /* check to be sure that the ports are upto date with
          * switch changes
          */
-        stac_issue_unsol_event(codec, nid, STAC_HP_EVENT);
+        codec->patch_ops.unsol_event(codec, (STAC_HP_EVENT | nid) << 26);
 
         return 1;
@@ -2658 +2521 @@
          */
         if (spec->hp_detect)
-                stac_issue_unsol_event(codec, nid, STAC_HP_EVENT);
+                codec->patch_ops.unsol_event(codec,
+                        (STAC_HP_EVENT | nid) << 26);
 
         return 1;
@@ -2746 +2610 @@
 
 /* add dynamic controls */
-static int stac92xx_add_control_temp(struct sigmatel_spec *spec,
-                                     struct snd_kcontrol_new *ktemp,
-                                     int idx, const char *name,
-                                     unsigned long val)
+static int stac92xx_add_control_idx(struct sigmatel_spec *spec, int type,
+                int idx, const char *name, unsigned long val)
 {
         struct snd_kcontrol_new *knew;
@@ -2757 +2619 @@
         if (!knew)
                 return -ENOMEM;
-        *knew = *ktemp;
+        *knew = stac92xx_control_templates[type];
         knew->index = idx;
         knew->name = kstrdup(name, GFP_KERNEL);
-        if (!knew->name)
+        if (! knew->name)
                 return -ENOMEM;
         knew->private_value = val;
@@ -2766 +2628 @@
 }
 
-static inline int stac92xx_add_control_idx(struct sigmatel_spec *spec,
-                                           int type, int idx, const char *name,
-                                           unsigned long val)
-{
-        return stac92xx_add_control_temp(spec,
-                                         &stac92xx_control_templates[type],
-                                         idx, name, val);
-}
-
 
 /* add dynamic controls */
-static inline int stac92xx_add_control(struct sigmatel_spec *spec, int type,
-                                       const char *name, unsigned long val)
+static int stac92xx_add_control(struct sigmatel_spec *spec, int type,
+                const char *name, unsigned long val)
 {
         return stac92xx_add_control_idx(spec, type, 0, name, val);
 }
 
-/* check whether the line-input can be used as line-out */
-static hda_nid_t check_line_out_switch(struct hda_codec *codec)
-{
-        struct sigmatel_spec *spec = codec->spec;
-        struct auto_pin_cfg *cfg = &spec->autocfg;
-        hda_nid_t nid;
-        unsigned int pincap;
-
-        if (cfg->line_out_type != AUTO_PIN_LINE_OUT)
-                return 0;
-        nid = cfg->input_pins[AUTO_PIN_LINE];
-        pincap = snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP);
-        if (pincap & AC_PINCAP_OUT)
-                return nid;
+/* flag inputs as additional dynamic lineouts */
+static int stac92xx_add_dyn_out_pins(struct hda_codec *codec, struct auto_pin_cfg *cfg)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        unsigned int wcaps, wtype;
+        int i, num_dacs = 0;
+        
+        /* use the wcaps cache to count all DACs available for line-outs */
+        for (i = 0; i < codec->num_nodes; i++) {
+                wcaps = codec->wcaps[i];
+                wtype = (wcaps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
+
+                if (wtype == AC_WID_AUD_OUT && !(wcaps & AC_WCAP_DIGITAL))
+                        num_dacs++;
+        }
+
+        snd_printdd("%s: total dac count=%d\n", __func__, num_dacs);
+        
+        switch (cfg->line_outs) {
+        case 3:
+                /* add line-in as side */
+                if (cfg->input_pins[AUTO_PIN_LINE] && num_dacs > 3) {
+                        cfg->line_out_pins[cfg->line_outs] =
+                                cfg->input_pins[AUTO_PIN_LINE];
+                        spec->line_switch = 1;
+                        cfg->line_outs++;
+                }
+                break;
+        case 2:
+                /* add line-in as clfe and mic as side */
+                if (cfg->input_pins[AUTO_PIN_LINE] && num_dacs > 2) {
+                        cfg->line_out_pins[cfg->line_outs] =
+                                cfg->input_pins[AUTO_PIN_LINE];
+                        spec->line_switch = 1;
+                        cfg->line_outs++;
+                }
+                if (cfg->input_pins[AUTO_PIN_MIC] && num_dacs > 3) {
+                        cfg->line_out_pins[cfg->line_outs] =
+                                cfg->input_pins[AUTO_PIN_MIC];
+                        spec->mic_switch = 1;
+                        cfg->line_outs++;
+                }
+                break;
+        case 1:
+                /* add line-in as surr and mic as clfe */
+                if (cfg->input_pins[AUTO_PIN_LINE] && num_dacs > 1) {
+                        cfg->line_out_pins[cfg->line_outs] =
+                                cfg->input_pins[AUTO_PIN_LINE];
+                        spec->line_switch = 1;
+                        cfg->line_outs++;
+                }
+                if (cfg->input_pins[AUTO_PIN_MIC] && num_dacs > 2) {
+                        cfg->line_out_pins[cfg->line_outs] =
+                                cfg->input_pins[AUTO_PIN_MIC];
+                        spec->mic_switch = 1;
+                        cfg->line_outs++;
+                }
+                break;
+        }
+
         return 0;
 }
 
-/* check whether the mic-input can be used as line-out */
-static hda_nid_t check_mic_out_switch(struct hda_codec *codec)
-{
-        struct sigmatel_spec *spec = codec->spec;
-        struct auto_pin_cfg *cfg = &spec->autocfg;
-        unsigned int def_conf, pincap;
-        unsigned int mic_pin;
-
-        if (cfg->line_out_type != AUTO_PIN_LINE_OUT)
-                return 0;
-        mic_pin = AUTO_PIN_MIC;
-        for (;;) {
-                hda_nid_t nid = cfg->input_pins[mic_pin];
-                def_conf = snd_hda_codec_read(codec, nid, 0,
-                                              AC_VERB_GET_CONFIG_DEFAULT, 0);
-                /* some laptops have an internal analog microphone
-                 * which can't be used as a output */
-                if (get_defcfg_connect(def_conf) != AC_JACK_PORT_FIXED) {
-                        pincap = snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP);
-                        if (pincap & AC_PINCAP_OUT)
-                                return nid;
-                }
-                if (mic_pin == AUTO_PIN_MIC)
-                        mic_pin = AUTO_PIN_FRONT_MIC;
-                else
-                        break;
-        }
-        return 0;
-}
 
 static int is_in_dac_nids(struct sigmatel_spec *spec, hda_nid_t nid)
@@ -2841 +2711 @@
         return 0;
 }
-
-static int check_all_dac_nids(struct sigmatel_spec *spec, hda_nid_t nid)
-{
-        int i;
-        if (is_in_dac_nids(spec, nid))
-                return 1;
-        for (i = 0; i < spec->autocfg.hp_outs; i++)
-                if (spec->hp_dacs[i] == nid)
-                        return 1;
-        for (i = 0; i < spec->autocfg.speaker_outs; i++)
-                if (spec->speaker_dacs[i] == nid)
-                        return 1;
-        return 0;
-}
-
-static hda_nid_t get_unassigned_dac(struct hda_codec *codec, hda_nid_t nid)
-{
-        struct sigmatel_spec *spec = codec->spec;
-        int j, conn_len;
-        hda_nid_t conn[HDA_MAX_CONNECTIONS];
-        unsigned int wcaps, wtype;
-
-        conn_len = snd_hda_get_connections(codec, nid, conn,
-                                           HDA_MAX_CONNECTIONS);
-        for (j = 0; j < conn_len; j++) {
-                wcaps = snd_hda_param_read(codec, conn[j],
-                                           AC_PAR_AUDIO_WIDGET_CAP);
-                wtype = (wcaps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
-                /* we check only analog outputs */
-                if (wtype != AC_WID_AUD_OUT || (wcaps & AC_WCAP_DIGITAL))
-                        continue;
-                /* if this route has a free DAC, assign it */
-                if (!check_all_dac_nids(spec, conn[j])) {
-                        if (conn_len > 1) {
-                                /* select this DAC in the pin's input mux */
-                                snd_hda_codec_write_cache(codec, nid, 0,
-                                                  AC_VERB_SET_CONNECT_SEL, j);
-                        }
-                        return conn[j];
-                }
-        }
-        return 0;
-}
-
-static int add_spec_dacs(struct sigmatel_spec *spec, hda_nid_t nid);
-static int add_spec_extra_dacs(struct sigmatel_spec *spec, hda_nid_t nid);
 
 /*
@@ -2895 +2719 @@
  * and 9202/925x. For those, dac_nids[] must be hard-coded.
  */
-static int stac92xx_auto_fill_dac_nids(struct hda_codec *codec)
-{
-        struct sigmatel_spec *spec = codec->spec;
-        struct auto_pin_cfg *cfg = &spec->autocfg;
-        int i;
-        hda_nid_t nid, dac;
+static int stac92xx_auto_fill_dac_nids(struct hda_codec *codec,
+                                       struct auto_pin_cfg *cfg)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        int i, j, conn_len = 0; 
+        hda_nid_t nid, conn[HDA_MAX_CONNECTIONS];
+        unsigned int wcaps, wtype;
         
         for (i = 0; i < cfg->line_outs; i++) {
                 nid = cfg->line_out_pins[i];
-                dac = get_unassigned_dac(codec, nid);
-                if (!dac) {
+                conn_len = snd_hda_get_connections(codec, nid, conn,
+                                                   HDA_MAX_CONNECTIONS);
+                for (j = 0; j < conn_len; j++) {
+                        wcaps = snd_hda_param_read(codec, conn[j],
+                                                   AC_PAR_AUDIO_WIDGET_CAP);
+                        wtype = (wcaps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
+                        if (wtype != AC_WID_AUD_OUT ||
+                            (wcaps & AC_WCAP_DIGITAL))
+                                continue;
+                        /* conn[j] is a DAC routed to this line-out */
+                        if (!is_in_dac_nids(spec, conn[j]))
+                                break;
+                }
+
+                if (j == conn_len) {
                         if (spec->multiout.num_dacs > 0) {
                                 /* we have already working output pins,
@@ -2919 +2757 @@
                         return -ENODEV;
                 }
-                add_spec_dacs(spec, dac);
-        }
-
-        /* add line-in as output */
-        nid = check_line_out_switch(codec);
-        if (nid) {
-                dac = get_unassigned_dac(codec, nid);
-                if (dac) {
-                        snd_printdd("STAC: Add line-in 0x%x as output %d\n",
-                                    nid, cfg->line_outs);
-                        cfg->line_out_pins[cfg->line_outs] = nid;
-                        cfg->line_outs++;
-                        spec->line_switch = nid;
-                        add_spec_dacs(spec, dac);
+
+                spec->multiout.dac_nids[i] = conn[j];
+                spec->multiout.num_dacs++;
+                if (conn_len > 1) {
+                        /* select this DAC in the pin's input mux */
+                        snd_hda_codec_write_cache(codec, nid, 0,
+                                                  AC_VERB_SET_CONNECT_SEL, j);
+
                 }
         }
-        /* add mic as output */
-        nid = check_mic_out_switch(codec);
-        if (nid) {
-                dac = get_unassigned_dac(codec, nid);
-                if (dac) {
-                        snd_printdd("STAC: Add mic-in 0x%x as output %d\n",
-                                    nid, cfg->line_outs);
-                        cfg->line_out_pins[cfg->line_outs] = nid;
-                        cfg->line_outs++;
-                        spec->mic_switch = nid;
-                        add_spec_dacs(spec, dac);
-                }
-        }
-
-        for (i = 0; i < cfg->hp_outs; i++) {
-                nid = cfg->hp_pins[i];
-                dac = get_unassigned_dac(codec, nid);
-                if (dac) {
-                        if (!spec->multiout.hp_nid)
-                                spec->multiout.hp_nid = dac;
-                        else
-                                add_spec_extra_dacs(spec, dac);
-                }
-                spec->hp_dacs[i] = dac;
-        }
-
-        for (i = 0; i < cfg->speaker_outs; i++) {
-                nid = cfg->speaker_pins[i];
-                dac = get_unassigned_dac(codec, nid);
-                if (dac)
-                        add_spec_extra_dacs(spec, dac);
-                spec->speaker_dacs[i] = dac;
-        }
-
-        snd_printd("stac92xx: dac_nids=%d (0x%x/0x%x/0x%x/0x%x/0x%x)\n",
+
+        snd_printd("dac_nids=%d (0x%x/0x%x/0x%x/0x%x/0x%x)\n",
                    spec->multiout.num_dacs,
                    spec->multiout.dac_nids[0],
@@ -2976 +2775 @@
                    spec->multiout.dac_nids[3],
                    spec->multiout.dac_nids[4]);
-
         return 0;
 }
@@ -3001 +2799 @@
 static int add_spec_dacs(struct sigmatel_spec *spec, hda_nid_t nid)
 {
-        if (spec->multiout.num_dacs > 4) {
+        if (!spec->multiout.hp_nid)
+                spec->multiout.hp_nid = nid;
+        else if (spec->multiout.num_dacs > 4) {
                 printk(KERN_WARNING "stac92xx: No space for DAC 0x%x\n", nid);
                 return 1;
@@ -3011 +2811 @@
 }
 
-static int add_spec_extra_dacs(struct sigmatel_spec *spec, hda_nid_t nid)
-{
-        int i;
-        for (i = 0; i < ARRAY_SIZE(spec->multiout.extra_out_nid); i++) {
-                if (!spec->multiout.extra_out_nid[i]) {
-                        spec->multiout.extra_out_nid[i] = nid;
-                        return 0;
-                }
-        }
-        printk(KERN_WARNING "stac92xx: No space for extra DAC 0x%x\n", nid);
-        return 1;
-}
-
-static int is_unique_dac(struct sigmatel_spec *spec, hda_nid_t nid)
-{
-        int i;
-
-        if (spec->autocfg.line_outs != 1)
-                return 0;
+static int check_in_dac_nids(struct sigmatel_spec *spec, hda_nid_t nid)
+{
+        if (is_in_dac_nids(spec, nid))
+                return 1;
         if (spec->multiout.hp_nid == nid)
-                return 0;
-        for (i = 0; i < ARRAY_SIZE(spec->multiout.extra_out_nid); i++)
-                if (spec->multiout.extra_out_nid[i] == nid)
-                        return 0;
-        return 1;
+                return 1;
+        return 0;
 }
 
@@ -3042 +2824 @@
                                                const struct auto_pin_cfg *cfg)
 {
-        struct sigmatel_spec *spec = codec->spec;
         static const char *chname[4] = {
                 "Front", "Surround", NULL /*CLFE*/, "Side"
@@ -3048 +2829 @@
         hda_nid_t nid = 0;
         int i, err;
-        unsigned int wid_caps;
-
-        for (i = 0; i < cfg->line_outs && spec->multiout.dac_nids[i]; i++) {
+
+        struct sigmatel_spec *spec = codec->spec;
+        unsigned int wid_caps, pincap;
+
+
+        for (i = 0; i < cfg->line_outs && i < spec->multiout.num_dacs; i++) {
+                if (!spec->multiout.dac_nids[i])
+                        continue;
+
                 nid = spec->multiout.dac_nids[i];
+
                 if (i == 2) {
                         /* Center/LFE */
@@ -3073 +2861 @@
 
                 } else {
-                        const char *name = chname[i];
-                        /* if it's a single DAC, assign a better name */
-                        if (!i && is_unique_dac(spec, nid)) {
-                                switch (cfg->line_out_type) {
-                                case AUTO_PIN_HP_OUT:
-                                        name = "Headphone";
-                                        break;
-                                case AUTO_PIN_SPEAKER_OUT:
-                                        name = "Speaker";
-                                        break;
-                                }
-                        }
-                        err = create_controls(spec, name, nid, 3);
+                        err = create_controls(spec, chname[i], nid, 3);
                         if (err < 0)
                                 return err;
@@ -3091 +2867 @@
         }
 
-        if (cfg->hp_outs > 1 && cfg->line_out_type == AUTO_PIN_LINE_OUT) {
+        if ((spec->multiout.num_dacs - cfg->line_outs) > 0 &&
+                        cfg->hp_outs && !spec->multiout.hp_nid)
+                spec->multiout.hp_nid = nid;
+
+        if (cfg->hp_outs > 1) {
                 err = stac92xx_add_control(spec,
                         STAC_CTL_WIDGET_HP_SWITCH,
-                        "Headphone as Line Out Switch",
-                        cfg->hp_pins[cfg->hp_outs - 1]);
+                        "Headphone as Line Out Switch", 0);
                 if (err < 0)
                         return err;
@@ -3101 +2880 @@
 
         if (spec->line_switch) {
-                err = stac92xx_add_control(spec, STAC_CTL_WIDGET_IO_SWITCH,
-                                           "Line In as Output Switch",
-                                           spec->line_switch << 8);
-                if (err < 0)
-                        return err;
+                nid = cfg->input_pins[AUTO_PIN_LINE];
+                pincap = snd_hda_param_read(codec, nid,
+                                                AC_PAR_PIN_CAP);
+                if (pincap & AC_PINCAP_OUT) {
+                        err = stac92xx_add_control(spec,
+                                STAC_CTL_WIDGET_IO_SWITCH,
+                                "Line In as Output Switch", nid << 8);
+                        if (err < 0)
+                                return err;
+                }
         }
 
         if (spec->mic_switch) {
-                err = stac92xx_add_control(spec, STAC_CTL_WIDGET_IO_SWITCH,
-                                           "Mic as Output Switch",
-                                           (spec->mic_switch << 8) | 1);
-                if (err < 0)
-                        return err;
+                unsigned int def_conf;
+                unsigned int mic_pin = AUTO_PIN_MIC;
+again:
+                nid = cfg->input_pins[mic_pin];
+                def_conf = snd_hda_codec_read(codec, nid, 0,
+                                                AC_VERB_GET_CONFIG_DEFAULT, 0);
+                /* some laptops have an internal analog microphone
+                 * which can't be used as a output */
+                if (get_defcfg_connect(def_conf) != AC_JACK_PORT_FIXED) {
+                        pincap = snd_hda_param_read(codec, nid,
+                                                        AC_PAR_PIN_CAP);
+                        if (pincap & AC_PINCAP_OUT) {
+                                err = stac92xx_add_control(spec,
+                                        STAC_CTL_WIDGET_IO_SWITCH,
+                                        "Mic as Output Switch", (nid << 8) | 1);
+                                nid = snd_hda_codec_read(codec, nid, 0,
+                                         AC_VERB_GET_CONNECT_LIST, 0) & 0xff;
+                                if (!check_in_dac_nids(spec, nid))
+                                        add_spec_dacs(spec, nid);
+                                if (err < 0)
+                                        return err;
+                        }
+                } else if (mic_pin == AUTO_PIN_MIC) {
+                        mic_pin = AUTO_PIN_FRONT_MIC;
+                        goto again;
+                }
         }
 
@@ -3125 +2930 @@
         struct sigmatel_spec *spec = codec->spec;
         hda_nid_t nid;
-        int i, err, nums;
-
-        nums = 0;
+        int i, old_num_dacs, err;
+
+        old_num_dacs = spec->multiout.num_dacs;
         for (i = 0; i < cfg->hp_outs; i++) {
-                static const char *pfxs[] = {
-                        "Headphone", "Headphone2", "Headphone3",
-                };
                 unsigned int wid_caps = get_wcaps(codec, cfg->hp_pins[i]);
                 if (wid_caps & AC_WCAP_UNSOL_CAP)
                         spec->hp_detect = 1;
-                if (nums >= ARRAY_SIZE(pfxs))
+                nid = snd_hda_codec_read(codec, cfg->hp_pins[i], 0,
+                                         AC_VERB_GET_CONNECT_LIST, 0) & 0xff;
+                if (check_in_dac_nids(spec, nid))
+                        nid = 0;
+                if (! nid)
                         continue;
-                nid = spec->hp_dacs[i];
-                if (!nid)
+                add_spec_dacs(spec, nid);
+        }
+        for (i = 0; i < cfg->speaker_outs; i++) {
+                nid = snd_hda_codec_read(codec, cfg->speaker_pins[i], 0,
+                                         AC_VERB_GET_CONNECT_LIST, 0) & 0xff;
+                if (check_in_dac_nids(spec, nid))
+                        nid = 0;
+                if (! nid)
                         continue;
-                err = create_controls(spec, pfxs[nums++], nid, 3);
-                if (err < 0)
-                        return err;
-        }
-        nums = 0;
-        for (i = 0; i < cfg->speaker_outs; i++) {
+                add_spec_dacs(spec, nid);
+        }
+        for (i = 0; i < cfg->line_outs; i++) {
+                nid = snd_hda_codec_read(codec, cfg->line_out_pins[i], 0,
+                                        AC_VERB_GET_CONNECT_LIST, 0) & 0xff;
+                if (check_in_dac_nids(spec, nid))
+                        nid = 0;
+                if (! nid)
+                        continue;
+                add_spec_dacs(spec, nid);
+        }
+        for (i = old_num_dacs; i < spec->multiout.num_dacs; i++) {
                 static const char *pfxs[] = {
                         "Speaker", "External Speaker", "Speaker2",
                 };
-                if (nums >= ARRAY_SIZE(pfxs))
-                        continue;
-                nid = spec->speaker_dacs[i];
-                if (!nid)
-                        continue;
-                err = create_controls(spec, pfxs[nums++], nid, 3);
+                err = create_controls(spec, pfxs[i - old_num_dacs],
+                                      spec->multiout.dac_nids[i], 3);
                 if (err < 0)
                         return err;
         }
+        if (spec->multiout.hp_nid) {
+                err = create_controls(spec, "Headphone",
+                                      spec->multiout.hp_nid, 3);
+                if (err < 0)
+                        return err;
+        }
+
         return 0;
 }
@@ -3250 +3071 @@
         return 0;
 }
-
-#ifdef CONFIG_SND_HDA_INPUT_BEEP
-#define stac92xx_dig_beep_switch_info snd_ctl_boolean_mono_info
-
-static int stac92xx_dig_beep_switch_get(struct snd_kcontrol *kcontrol,
-                                        struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        ucontrol->value.integer.value[0] = codec->beep->enabled;
-        return 0;
-}
-
-static int stac92xx_dig_beep_switch_put(struct snd_kcontrol *kcontrol,
-                                        struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        int enabled = !!ucontrol->value.integer.value[0];
-        if (codec->beep->enabled != enabled) {
-                codec->beep->enabled = enabled;
-                return 1;
-        }
-        return 0;
-}
-
-static struct snd_kcontrol_new stac92xx_dig_beep_ctrl = {
-        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-        .info = stac92xx_dig_beep_switch_info,
-        .get = stac92xx_dig_beep_switch_get,
-        .put = stac92xx_dig_beep_switch_put,
-};
-
-static int stac92xx_beep_switch_ctl(struct hda_codec *codec)
-{
-        return stac92xx_add_control_temp(codec->spec, &stac92xx_dig_beep_ctrl,
-                                         0, "PC Beep Playback Switch", 0);
-}
-#endif
 
 static int stac92xx_auto_create_mux_input_ctls(struct hda_codec *codec)
@@ -3495 +3279 @@
         struct sigmatel_spec *spec = codec->spec;
         int err;
+        int hp_speaker_swap = 0;
 
         if ((err = snd_hda_parse_pin_def_config(codec,
@@ -3512 +3297 @@
                  * HP pins as primary outputs.
                  */
-                snd_printdd("stac92xx: Enabling multi-HPs workaround\n");
                 memcpy(spec->autocfg.speaker_pins, spec->autocfg.line_out_pins,
                        sizeof(spec->autocfg.line_out_pins));
@@ -3519 +3303 @@
                        sizeof(spec->autocfg.hp_pins));
                 spec->autocfg.line_outs = spec->autocfg.hp_outs;
-                spec->autocfg.line_out_type = AUTO_PIN_HP_OUT;
-                spec->autocfg.hp_outs = 0;
+                hp_speaker_swap = 1;
         }
         if (spec->autocfg.mono_out_pin) {
@@ -3572 +3355 @@
         }
 
-        if (!spec->multiout.num_dacs) {
-                err = stac92xx_auto_fill_dac_nids(codec);
-                if (err < 0)
+        if ((err = stac92xx_add_dyn_out_pins(codec, &spec->autocfg)) < 0)
+                return err;
+        if (spec->multiout.num_dacs == 0)
+                if ((err = stac92xx_auto_fill_dac_nids(codec, &spec->autocfg)) < 0)
                         return err;
-                err = stac92xx_auto_create_multi_out_ctls(codec,
-                                                          &spec->autocfg);
-                if (err < 0)
-                        return err;
-        }
+
+        err = stac92xx_auto_create_multi_out_ctls(codec, &spec->autocfg);
+
+        if (err < 0)
+                return err;
 
         /* setup analog beep controls */
@@ -3594 +3378 @@
         if (spec->digbeep_nid > 0) {
                 hda_nid_t nid = spec->digbeep_nid;
-                unsigned int caps;
 
                 err = stac92xx_auto_create_beep_ctls(codec, nid);
@@ -3602 +3385 @@
                 if (err < 0)
                         return err;
-                /* if no beep switch is available, make its own one */
-                caps = query_amp_caps(codec, nid, HDA_OUTPUT);
-                if (codec->beep &&
-                    !((caps & AC_AMPCAP_MUTE) >> AC_AMPCAP_MUTE_SHIFT)) {
-                        err = stac92xx_beep_switch_ctl(codec);
-                        if (err < 0)
-                                return err;
-                }
         }
 #endif
+
+        if (hp_speaker_swap == 1) {
+                /* Restore the hp_outs and line_outs */
+                memcpy(spec->autocfg.hp_pins, spec->autocfg.line_out_pins,
+                       sizeof(spec->autocfg.line_out_pins));
+                spec->autocfg.hp_outs = spec->autocfg.line_outs;
+                memcpy(spec->autocfg.line_out_pins, spec->autocfg.speaker_pins,
+                       sizeof(spec->autocfg.speaker_pins));
+                spec->autocfg.line_outs = spec->autocfg.speaker_outs;
+                memset(spec->autocfg.speaker_pins, 0,
+                       sizeof(spec->autocfg.speaker_pins));
+                spec->autocfg.speaker_outs = 0;
+        }
 
         err = stac92xx_auto_create_hp_ctls(codec, &spec->autocfg);
@@ -3661 +3449 @@
 
         spec->input_mux = &spec->private_imux;
-        if (!spec->dinput_mux)
-                spec->dinput_mux = &spec->private_dimux;
+        spec->dinput_mux = &spec->private_dimux;
         spec->sinput_mux = &spec->private_smux;
         spec->mono_mux = &spec->private_mono_mux;
@@ -3755 +3542 @@
                 return err;
 
-        if (spec->num_muxes > 0) {
-                err = stac92xx_auto_create_mux_input_ctls(codec);
-                if (err < 0)
-                        return err;
-        }
-
         if (spec->autocfg.dig_out_pin)
                 spec->multiout.dig_out_nid = 0x05;
@@ -3814 +3595 @@
                 hda_nid_t nid, int type)
 {
-#ifdef CONFIG_SND_JACK
         struct sigmatel_spec *spec = codec->spec;
         struct sigmatel_jack *jack;
@@ -3838 +3618 @@
 
         return snd_jack_new(codec->bus->card, name, type, &jack->jack);
-#else
-        return 0;
-#endif
-}
-
-static int stac_add_event(struct sigmatel_spec *spec, hda_nid_t nid,
-                          unsigned char type, int data)
+}
+
+static int stac92xx_add_event(struct sigmatel_spec *spec, hda_nid_t nid,
+                             int data)
 {
         struct sigmatel_event *event;
@@ -3853 +3630 @@
                 return -ENOMEM;
         event->nid = nid;
-        event->type = type;
-        event->tag = spec->events.used;
         event->data = data;
 
-        return event->tag;
-}
-
-static struct sigmatel_event *stac_get_event(struct hda_codec *codec,
-                                             hda_nid_t nid, unsigned char type)
-{
-        struct sigmatel_spec *spec = codec->spec;
-        struct sigmatel_event *event = spec->events.list;
-        int i;
-
-        for (i = 0; i < spec->events.used; i++, event++) {
-                if (event->nid == nid && event->type == type)
-                        return event;
-        }
-        return NULL;
-}
-
-static struct sigmatel_event *stac_get_event_from_tag(struct hda_codec *codec,
-                                                      unsigned char tag)
-{
-        struct sigmatel_spec *spec = codec->spec;
-        struct sigmatel_event *event = spec->events.list;
-        int i;
-
-        for (i = 0; i < spec->events.used; i++, event++) {
-                if (event->tag == tag)
-                        return event;
-        }
-        return NULL;
+        return 0;
+}
+
+static int stac92xx_event_data(struct hda_codec *codec, hda_nid_t nid)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        struct sigmatel_event *events = spec->events.list;
+        if (events) {
+                int i;
+                for (i = 0; i < spec->events.used; i++)
+                        if (events[i].nid == nid)
+                                return events[i].data;
+        }
+        return 0;
 }
 
 static void enable_pin_detect(struct hda_codec *codec, hda_nid_t nid,
-                              unsigned int type)
-{
-        struct sigmatel_event *event;
-        int tag;
-
-        if (!(get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP))
-                return;
-        event = stac_get_event(codec, nid, type);
-        if (event)
-                tag = event->tag;
-        else
-                tag = stac_add_event(codec->spec, nid, type, 0);
-        if (tag < 0)
-                return;
-        snd_hda_codec_write_cache(codec, nid, 0,
-                                  AC_VERB_SET_UNSOLICITED_ENABLE,
-                                  AC_USRSP_EN | tag);
+                              unsigned int event)
+{
+        if (get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP) {
+                snd_hda_codec_write_cache(codec, nid, 0,
+                                          AC_VERB_SET_UNSOLICITED_ENABLE,
+                                          (AC_USRSP_EN | event | nid));
+        }
 }
 
@@ -3925 +3675 @@
         hda_nid_t *dac;
         for (dac = spec->dac_list; *dac; dac++)
-                if (!check_all_dac_nids(spec, *dac))
-                        snd_hda_codec_write(codec, *dac, 0,
+                if (!is_in_dac_nids(spec, *dac) &&
+                        spec->multiout.hp_nid != *dac)
+                        snd_hda_codec_write_cache(codec, *dac, 0,
                                         AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
 }
 
-static void stac_toggle_power_map(struct hda_codec *codec, hda_nid_t nid,
-                                  int enable);
-
 static int stac92xx_init(struct hda_codec *codec)
 {
         struct sigmatel_spec *spec = codec->spec;
         struct auto_pin_cfg *cfg = &spec->autocfg;
-        unsigned int gpio;
-        int i;
+        int i, err;
 
         snd_hda_sequence_write(codec, spec->init);
@@ -3945 +3692 @@
         if (spec->powerdown_adcs)
                 for (i = 0; i < spec->num_adcs; i++)
-                        snd_hda_codec_write(codec,
+                        snd_hda_codec_write_cache(codec,
                                 spec->adc_nids[i], 0,
                                 AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
-
-        /* set up GPIO */
-        gpio = spec->gpio_data;
-        /* turn on EAPD statically when spec->eapd_switch isn't set.
-         * otherwise, unsol event will turn it on/off dynamically
-         */
-        if (!spec->eapd_switch)
-                gpio |= spec->eapd_mask;
-        stac_gpio_set(codec, spec->gpio_mask, spec->gpio_dir, gpio);
-
         /* set up pins */
         if (spec->hp_detect) {
                 /* Enable unsolicited responses on the HP widget */
                 for (i = 0; i < cfg->hp_outs; i++) {
+                        int type = SND_JACK_HEADPHONE;
                         hda_nid_t nid = cfg->hp_pins[i];
-                        enable_pin_detect(codec, nid, STAC_HP_EVENT);
+                        enable_pin_detect(codec, nid, STAC_HP_EVENT | nid);
+                        /* jack detection */
+                        if (cfg->hp_outs == i)
+                                type |= SND_JACK_LINEOUT;
+                        err = stac92xx_add_jack(codec, nid, type);
+                        if (err < 0)
+                                return err;
+
                 }
                 /* force to enable the first line-out; the others are set up
@@ -3971 +3716 @@
                                 AC_PINCTL_OUT_EN);
                 /* fake event to set up pins */
-                stac_issue_unsol_event(codec, spec->autocfg.hp_pins[0],
-                                       STAC_HP_EVENT);
+                codec->patch_ops.unsol_event(codec,
+                        (STAC_HP_EVENT | spec->autocfg.hp_pins[0]) << 26);
         } else {
                 stac92xx_auto_init_multi_out(codec);
                 stac92xx_auto_init_hp_out(codec);
-                for (i = 0; i < cfg->hp_outs; i++)
-                        stac_toggle_power_map(codec, cfg->hp_pins[i], 1);
+        }
+        for (i = 0; i < cfg->line_outs; i++) {
+                err = stac92xx_add_jack(codec,
+                                cfg->line_out_pins[i], SND_JACK_LINEOUT);
+                if (err < 0)
+                        return err;
         }
         for (i = 0; i < AUTO_PIN_LAST; i++) {
                 hda_nid_t nid = cfg->input_pins[i];
                 if (nid) {
-                        unsigned int pinctl, conf;
-                        if (i == AUTO_PIN_MIC || i == AUTO_PIN_FRONT_MIC) {
-                                /* for mic pins, force to initialize */
-                                pinctl = stac92xx_get_vref(codec, nid);
-                                pinctl |= AC_PINCTL_IN_EN;
-                                stac92xx_auto_set_pinctl(codec, nid, pinctl);
-                        } else {
-                                pinctl = snd_hda_codec_read(codec, nid, 0,
-                                        AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
-                                /* if PINCTL already set then skip */
-                                if (!(pinctl & AC_PINCTL_IN_EN)) {
-                                        pinctl |= AC_PINCTL_IN_EN;
-                                        stac92xx_auto_set_pinctl(codec, nid,
-                                                                 pinctl);
-                                }
-                        }
-                        conf = snd_hda_codec_read(codec, nid, 0,
-                                              AC_VERB_GET_CONFIG_DEFAULT, 0);
-                        if (get_defcfg_connect(conf) != AC_JACK_PORT_FIXED) {
-                                enable_pin_detect(codec, nid,
-                                                  STAC_INSERT_EVENT);
-                                stac_issue_unsol_event(codec, nid,
-                                                       STAC_INSERT_EVENT);
-                        }
+                        unsigned int pinctl = snd_hda_codec_read(codec, nid,
+                                0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+                        /* if PINCTL already set then skip */
+                        if (pinctl & AC_PINCAP_IN)
+                                continue;
+                        pinctl = AC_PINCTL_IN_EN;
+                        if (i == AUTO_PIN_MIC || i == AUTO_PIN_FRONT_MIC)
+                                pinctl |= stac92xx_get_vref(codec, nid);
+                        stac92xx_auto_set_pinctl(codec, nid, pinctl);
+                        err = stac92xx_add_jack(codec, nid,
+                                SND_JACK_MICROPHONE);
+                        if (err < 0)
+                                return err;
+                        enable_pin_detect(codec, nid, STAC_INSERT_EVENT | nid);
                 }
         }
@@ -4011 +3750 @@
                 stac92xx_auto_set_pinctl(codec, spec->dmic_nids[i],
                                         AC_PINCTL_IN_EN);
+        for (i = 0; i < spec->num_pwrs; i++)  {
+                int event = is_nid_hp_pin(cfg, spec->pwr_nids[i])
+                                        ? STAC_HP_EVENT : STAC_PWR_EVENT;
+                int pinctl = snd_hda_codec_read(codec, spec->pwr_nids[i],
+                                        0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+                int def_conf = snd_hda_codec_read(codec, spec->pwr_nids[i],
+                                        0, AC_VERB_GET_CONFIG_DEFAULT, 0);
+                def_conf = get_defcfg_connect(def_conf);
+                /* outputs are only ports capable of power management
+                 * any attempts on powering down a input port cause the
+                 * referenced VREF to act quirky.
+                 */
+                if (pinctl & AC_PINCTL_IN_EN)
+                        continue;
+                /* skip any ports that don't have jacks since presence
+                 * detection is useless */
+                if (def_conf && def_conf != AC_JACK_PORT_FIXED)
+                        continue;
+                enable_pin_detect(codec, spec->pwr_nids[i], event | i);
+                codec->patch_ops.unsol_event(codec, (event | i) << 26);
+        }
+        if (spec->dac_list)
+                stac92xx_power_down(codec);
         if (cfg->dig_out_pin)
                 stac92xx_auto_set_pinctl(codec, cfg->dig_out_pin,
@@ -4017 +3779 @@
                 stac92xx_auto_set_pinctl(codec, cfg->dig_in_pin,
                                          AC_PINCTL_IN_EN);
-        for (i = 0; i < spec->num_pwrs; i++)  {
-                hda_nid_t nid = spec->pwr_nids[i];
-                int pinctl, def_conf;
-
-                /* power on when no jack detection is available */
-                if (!spec->hp_detect) {
-                        stac_toggle_power_map(codec, nid, 1);
-                        continue;
-                }
-
-                if (is_nid_hp_pin(cfg, nid))
-                        continue; /* already has an unsol event */
-
-                pinctl = snd_hda_codec_read(codec, nid, 0,
-                                            AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
-                /* outputs are only ports capable of power management
-                 * any attempts on powering down a input port cause the
-                 * referenced VREF to act quirky.
-                 */
-                if (pinctl & AC_PINCTL_IN_EN) {
-                        stac_toggle_power_map(codec, nid, 1);
-                        continue;
-                }
-                def_conf = snd_hda_codec_read(codec, nid, 0,
-                                              AC_VERB_GET_CONFIG_DEFAULT, 0);
-                def_conf = get_defcfg_connect(def_conf);
-                /* skip any ports that don't have jacks since presence
-                 * detection is useless */
-                if (def_conf != AC_JACK_PORT_COMPLEX) {
-                        if (def_conf != AC_JACK_PORT_NONE)
-                                stac_toggle_power_map(codec, nid, 1);
-                        continue;
-                }
-                if (!stac_get_event(codec, nid, STAC_INSERT_EVENT)) {
-                        enable_pin_detect(codec, nid, STAC_PWR_EVENT);
-                        stac_issue_unsol_event(codec, nid, STAC_PWR_EVENT);
-                }
-        }
-        if (spec->dac_list)
-                stac92xx_power_down(codec);
+
+        stac_gpio_set(codec, spec->gpio_mask,
+                                        spec->gpio_dir, spec->gpio_data);
+
         return 0;
 }
@@ -4062 +3788 @@
 static void stac92xx_free_jacks(struct hda_codec *codec)
 {
-#ifdef CONFIG_SND_JACK
-        /* free jack instances manually when clearing/reconfiguring */
-        struct sigmatel_spec *spec = codec->spec;
-        if (!codec->bus->shutdown && spec->jacks.list) {
+        struct sigmatel_spec *spec = codec->spec;
+        if (spec->jacks.list) {
                 struct sigmatel_jack *jacks = spec->jacks.list;
                 int i;
@@ -4072 +3796 @@
         }
         snd_array_free(&spec->jacks);
-#endif
 }
 
@@ -4095 +3818 @@
                 return;
 
-        kfree(spec->pin_configs);
+        if (spec->bios_pin_configs)
+                kfree(spec->bios_pin_configs);
         stac92xx_free_jacks(codec);
         snd_array_free(&spec->events);
@@ -4116 +3840 @@
                  */
                 struct sigmatel_spec *spec = codec->spec;
-                if (nid == spec->line_switch || nid == spec->mic_switch)
+                struct auto_pin_cfg *cfg = &spec->autocfg;
+                if ((nid == cfg->input_pins[AUTO_PIN_LINE] &&
+                     spec->line_switch) ||
+                    (nid == cfg->input_pins[AUTO_PIN_MIC] &&
+                     spec->mic_switch))
                         return;
         }
@@ -4140 +3868 @@
 }
 
-static int get_pin_presence(struct hda_codec *codec, hda_nid_t nid)
+static int get_hp_pin_presence(struct hda_codec *codec, hda_nid_t nid)
 {
         if (!nid)
                 return 0;
         if (snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_PIN_SENSE, 0x00)
-            & (1 << 31))
-                return 1;
+            & (1 << 31)) {
+                unsigned int pinctl;
+                pinctl = snd_hda_codec_read(codec, nid, 0,
+                                            AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+                if (pinctl & AC_PINCTL_IN_EN)
+                        return 0; /* mic- or line-input */
+                else
+                        return 1; /* HP-output */
+        }
         return 0;
 }
 
-/* return non-zero if the hp-pin of the given array index isn't
- * a jack-detection target
- */
-static int no_hp_sensing(struct sigmatel_spec *spec, int i)
-{
+static void stac92xx_hp_detect(struct hda_codec *codec, unsigned int res)
+{
+        struct sigmatel_spec *spec = codec->spec;
         struct auto_pin_cfg *cfg = &spec->autocfg;
-
-        /* ignore sensing of shared line and mic jacks */
-        if (cfg->hp_pins[i] == spec->line_switch)
-                return 1;
-        if (cfg->hp_pins[i] == spec->mic_switch)
-                return 1;
-        /* ignore if the pin is set as line-out */
-        if (cfg->hp_pins[i] == spec->hp_switch)
-                return 1;
-        return 0;
-}
-
-static void stac92xx_hp_detect(struct hda_codec *codec)
-{
-        struct sigmatel_spec *spec = codec->spec;
-        struct auto_pin_cfg *cfg = &spec->autocfg;
+        int nid = cfg->hp_pins[cfg->hp_outs - 1];
         int i, presence;
 
@@ -4182 +3900 @@
                 if (presence)
                         break;
-                if (no_hp_sensing(spec, i))
-                        continue;
-                presence = get_pin_presence(codec, cfg->hp_pins[i]);
-                if (presence) {
-                        unsigned int pinctl;
-                        pinctl = snd_hda_codec_read(codec, cfg->hp_pins[i], 0,
-                                            AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
-                        if (pinctl & AC_PINCTL_IN_EN)
-                                presence = 0; /* mic- or line-input */
-                }
+                if (spec->hp_switch && cfg->hp_pins[i] == nid)
+                        break;
+                presence = get_hp_pin_presence(codec, cfg->hp_pins[i]);
         }
 
         if (presence) {
-                /* disable lineouts */
+                /* disable lineouts, enable hp */
                 if (spec->hp_switch)
-                        stac92xx_reset_pinctl(codec, spec->hp_switch,
-                                              AC_PINCTL_OUT_EN);
+                        stac92xx_reset_pinctl(codec, nid, AC_PINCTL_OUT_EN);
                 for (i = 0; i < cfg->line_outs; i++)
                         stac92xx_reset_pinctl(codec, cfg->line_out_pins[i],
@@ -4205 +3915 @@
                         stac92xx_reset_pinctl(codec, cfg->speaker_pins[i],
                                                 AC_PINCTL_OUT_EN);
-                if (spec->eapd_mask && spec->eapd_switch)
+                if (spec->eapd_mask)
                         stac_gpio_set(codec, spec->gpio_mask,
                                 spec->gpio_dir, spec->gpio_data &
                                 ~spec->eapd_mask);
         } else {
-                /* enable lineouts */
+                /* enable lineouts, disable hp */
                 if (spec->hp_switch)
-                        stac92xx_set_pinctl(codec, spec->hp_switch,
-                                            AC_PINCTL_OUT_EN);
+                        stac92xx_set_pinctl(codec, nid, AC_PINCTL_OUT_EN);
                 for (i = 0; i < cfg->line_outs; i++)
                         stac92xx_set_pinctl(codec, cfg->line_out_pins[i],
@@ -4220 +3929 @@
                         stac92xx_set_pinctl(codec, cfg->speaker_pins[i],
                                                 AC_PINCTL_OUT_EN);
-                if (spec->eapd_mask && spec->eapd_switch)
+                if (spec->eapd_mask)
                         stac_gpio_set(codec, spec->gpio_mask,
                                 spec->gpio_dir, spec->gpio_data |
                                 spec->eapd_mask);
         }
-        /* toggle hp outs */
-        for (i = 0; i < cfg->hp_outs; i++) {
-                unsigned int val = AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN;
-                if (no_hp_sensing(spec, i))
-                        continue;
-                if (presence)
-                        stac92xx_set_pinctl(codec, cfg->hp_pins[i], val);
-#if 0 /* FIXME */
-/* Resetting the pinctl like below may lead to (a sort of) regressions
- * on some devices since they use the HP pin actually for line/speaker
- * outs although the default pin config shows a different pin (that is
- * wrong and useless).
- *
- * So, it's basically a problem of default pin configs, likely a BIOS issue.
- * But, disabling the code below just works around it, and I'm too tired of
- * bug reports with such devices... 
- */
-                else
-                        stac92xx_reset_pinctl(codec, cfg->hp_pins[i], val);
-#endif /* FIXME */
-        }
+        if (!spec->hp_switch && cfg->hp_outs > 1 && presence)
+                stac92xx_set_pinctl(codec, nid, AC_PINCTL_OUT_EN);
 } 
 
-static void stac_toggle_power_map(struct hda_codec *codec, hda_nid_t nid,
-                                  int enable)
-{
-        struct sigmatel_spec *spec = codec->spec;
-        unsigned int idx, val;
-
-        for (idx = 0; idx < spec->num_pwrs; idx++) {
-                if (spec->pwr_nids[idx] == nid)
-                        break;
-        }
-        if (idx >= spec->num_pwrs)
-                return;
+static void stac92xx_pin_sense(struct hda_codec *codec, int idx)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        hda_nid_t nid = spec->pwr_nids[idx];
+        int presence, val;
+        val = snd_hda_codec_read(codec, codec->afg, 0, 0x0fec, 0x0)
+                                                        & 0x000000ff;
+        presence = get_hp_pin_presence(codec, nid);
 
         /* several codecs have two power down bits */
@@ -4267 +3953 @@
                 idx = 1 << idx;
 
-        val = snd_hda_codec_read(codec, codec->afg, 0, 0x0fec, 0x0) & 0xff;
-        if (enable)
+        if (presence)
                 val &= ~idx;
         else
@@ -4275 +3960 @@
         /* power down unused output ports */
         snd_hda_codec_write(codec, codec->afg, 0, 0x7ec, val);
-}
-
-static void stac92xx_pin_sense(struct hda_codec *codec, hda_nid_t nid)
-{
-        stac_toggle_power_map(codec, nid, get_pin_presence(codec, nid));
 }
 
@@ -4301 +3981 @@
                                         ? SND_JACK_HEADPHONE : SND_JACK_LINEOUT;
                                 snd_jack_report(jacks->jack,
-                                        get_pin_presence(codec, nid)
+                                        get_hp_pin_presence(codec, nid)
                                         ? type : 0);
                         }
@@ -4309 +3989 @@
 }
 
-static void stac_issue_unsol_event(struct hda_codec *codec, hda_nid_t nid,
-                                   unsigned char type)
-{
-        struct sigmatel_event *event = stac_get_event(codec, nid, type);
-        if (!event)
-                return;
-        codec->patch_ops.unsol_event(codec, (unsigned)event->tag << 26);
-}
-
 static void stac92xx_unsol_event(struct hda_codec *codec, unsigned int res)
 {
         struct sigmatel_spec *spec = codec->spec;
-        struct sigmatel_event *event;
-        int tag, data;
-
-        tag = (res >> 26) & 0x7f;
-        event = stac_get_event_from_tag(codec, tag);
-        if (!event)
-                return;
-
-        switch (event->type) {
+        int event = (res >> 26) & 0x70;
+        int nid = res >> 26 & 0x0f;
+
+        switch (event) {
         case STAC_HP_EVENT:
-                stac92xx_hp_detect(codec);
+                stac92xx_hp_detect(codec, res);
                 /* fallthru */
         case STAC_INSERT_EVENT:
         case STAC_PWR_EVENT:
-                if (spec->num_pwrs > 0)
-                        stac92xx_pin_sense(codec, event->nid);
-                stac92xx_report_jack(codec, event->nid);
+                if (nid) {
+                        if (spec->num_pwrs > 0)
+                                stac92xx_pin_sense(codec, nid);
+                        stac92xx_report_jack(codec, nid);
+                }
                 break;
-        case STAC_VREF_EVENT:
-                data = snd_hda_codec_read(codec, codec->afg, 0,
-                                          AC_VERB_GET_GPIO_DATA, 0);
+        case STAC_VREF_EVENT: {
+                int data = snd_hda_codec_read(codec, codec->afg, 0,
+                        AC_VERB_GET_GPIO_DATA, 0);
+                int idx = stac92xx_event_data(codec, nid);
                 /* toggle VREF state based on GPIOx status */
                 snd_hda_codec_write(codec, codec->afg, 0, 0x7e0,
-                                    !!(data & (1 << event->data)));
+                        !!(data & (1 << idx)));
                 break;
-        }
-}
-
-#ifdef CONFIG_PROC_FS
-static void stac92hd_proc_hook(struct snd_info_buffer *buffer,
-                               struct hda_codec *codec, hda_nid_t nid)
-{
-        if (nid == codec->afg)
-                snd_iprintf(buffer, "Power-Map: 0x%02x\n", 
-                            snd_hda_codec_read(codec, nid, 0, 0x0fec, 0x0));
-}
-
-static void analog_loop_proc_hook(struct snd_info_buffer *buffer,
-                                  struct hda_codec *codec,
-                                  unsigned int verb)
-{
-        snd_iprintf(buffer, "Analog Loopback: 0x%02x\n",
-                    snd_hda_codec_read(codec, codec->afg, 0, verb, 0));
-}
-
-/* stac92hd71bxx, stac92hd73xx */
-static void stac92hd7x_proc_hook(struct snd_info_buffer *buffer,
-                                 struct hda_codec *codec, hda_nid_t nid)
-{
-        stac92hd_proc_hook(buffer, codec, nid);
-        if (nid == codec->afg)
-                analog_loop_proc_hook(buffer, codec, 0xfa0);
-}
-
-static void stac9205_proc_hook(struct snd_info_buffer *buffer,
-                               struct hda_codec *codec, hda_nid_t nid)
-{
-        if (nid == codec->afg)
-                analog_loop_proc_hook(buffer, codec, 0xfe0);
-}
-
-static void stac927x_proc_hook(struct snd_info_buffer *buffer,
-                               struct hda_codec *codec, hda_nid_t nid)
-{
-        if (nid == codec->afg)
-                analog_loop_proc_hook(buffer, codec, 0xfeb);
-}
-#else
-#define stac92hd_proc_hook      NULL
-#define stac92hd7x_proc_hook    NULL
-#define stac9205_proc_hook      NULL
-#define stac927x_proc_hook      NULL
-#endif
+                }
+        }
+}
 
 #ifdef SND_HDA_NEEDS_RESUME
@@ -4401 +4025 @@
 
         stac92xx_set_config_regs(codec);
-        stac92xx_init(codec);
+        snd_hda_sequence_write(codec, spec->init);
+        stac_gpio_set(codec, spec->gpio_mask,
+                spec->gpio_dir, spec->gpio_data);
         snd_hda_codec_resume_amp(codec);
         snd_hda_codec_resume_cache(codec);
-        /* fake event to set up pins again to override cached values */
+        /* power down inactive DACs */
+        if (spec->dac_list)
+                stac92xx_power_down(codec);
+        /* invoke unsolicited event to reset the HP state */
         if (spec->hp_detect)
-                stac_issue_unsol_event(codec, spec->autocfg.hp_pins[0],
-                                       STAC_HP_EVENT);
-        return 0;
-}
-
-static int stac92xx_suspend(struct hda_codec *codec, pm_message_t state)
-{
-        struct sigmatel_spec *spec = codec->spec;
-        if (spec->eapd_mask)
-                stac_gpio_set(codec, spec->gpio_mask,
-                                spec->gpio_dir, spec->gpio_data &
-                                ~spec->eapd_mask);
+                codec->patch_ops.unsol_event(codec, STAC_HP_EVENT << 26);
         return 0;
 }
@@ -4429 +4047 @@
         .unsol_event = stac92xx_unsol_event,
 #ifdef SND_HDA_NEEDS_RESUME
-        .suspend = stac92xx_suspend,
         .resume = stac92xx_resume,
 #endif
@@ -4452 +4069 @@
                 snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC9200, using BIOS defaults\n");
                 err = stac92xx_save_bios_config_regs(codec);
-        } else
-                err = stac_save_pin_cfgs(codec,
-                                         stac9200_brd_tbl[spec->board_config]);
-        if (err < 0) {
-                stac92xx_free(codec);
-                return err;
+                if (err < 0) {
+                        stac92xx_free(codec);
+                        return err;
+                }
+                spec->pin_configs = spec->bios_pin_configs;
+        } else {
+                spec->pin_configs = stac9200_brd_tbl[spec->board_config];
+                stac92xx_set_config_regs(codec);
         }
 
@@ -4470 +4089 @@
         spec->num_pwrs = 0;
 
-        if (spec->board_config == STAC_9200_M4 ||
-            spec->board_config == STAC_9200_M4_2 ||
+        if (spec->board_config == STAC_9200_GATEWAY ||
             spec->board_config == STAC_9200_OQO)
                 spec->init = stac9200_eapd_init;
@@ -4489 +4107 @@
         }
 
-        /* CF-74 has no headphone detection, and the driver should *NOT*
-         * do detection and HP/speaker toggle because the hardware does it.
-         */
-        if (spec->board_config == STAC_9200_PANASONIC)
-                spec->hp_detect = 0;
-
         codec->patch_ops = stac92xx_patch_ops;
 
@@ -4512 +4124 @@
         spec->num_pins = ARRAY_SIZE(stac925x_pin_nids);
         spec->pin_nids = stac925x_pin_nids;
-
-        /* Check first for codec ID */
-        spec->board_config = snd_hda_check_board_codec_sid_config(codec,
-                                                        STAC_925x_MODELS,
-                                                        stac925x_models,
-                                                        stac925x_codec_id_cfg_tbl);
-
-        /* Now checks for PCI ID, if codec ID is not found */
-        if (spec->board_config < 0)
-                spec->board_config = snd_hda_check_board_config(codec,
-                                                        STAC_925x_MODELS,
+        spec->board_config = snd_hda_check_board_config(codec, STAC_925x_MODELS,
                                                         stac925x_models,
                                                         stac925x_cfg_tbl);
  again:
         if (spec->board_config < 0) {
-                snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC925x,"
+                snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC925x," 
                                       "using BIOS defaults\n");
                 err = stac92xx_save_bios_config_regs(codec);
-        } else
-                err = stac_save_pin_cfgs(codec,
-                                         stac925x_brd_tbl[spec->board_config]);
-        if (err < 0) {
-                stac92xx_free(codec);
-                return err;
+                if (err < 0) {
+                        stac92xx_free(codec);
+                        return err;
+                }
+                spec->pin_configs = spec->bios_pin_configs;
+        } else if (stac925x_brd_tbl[spec->board_config] != NULL){
+                spec->pin_configs = stac925x_brd_tbl[spec->board_config];
+                stac92xx_set_config_regs(codec);
         }
 
@@ -4599 +4203 @@
         hda_nid_t conn[STAC92HD73_DAC_COUNT + 2];
         int err = 0;
-        int num_dacs;
 
         spec  = kzalloc(sizeof(*spec), GFP_KERNEL);
@@ -4618 +4221 @@
                         " STAC92HD73XX, using BIOS defaults\n");
                 err = stac92xx_save_bios_config_regs(codec);
-        } else
-                err = stac_save_pin_cfgs(codec,
-                                stac92hd73xx_brd_tbl[spec->board_config]);
-        if (err < 0) {
-                stac92xx_free(codec);
-                return err;
-        }
-
-        num_dacs = snd_hda_get_connections(codec, 0x0a,
+                if (err < 0) {
+                        stac92xx_free(codec);
+                        return err;
+                }
+                spec->pin_configs = spec->bios_pin_configs;
+        } else {
+                spec->pin_configs = stac92hd73xx_brd_tbl[spec->board_config];
+                stac92xx_set_config_regs(codec);
+        }
+
+        spec->multiout.num_dacs = snd_hda_get_connections(codec, 0x0a,
                         conn, STAC92HD73_DAC_COUNT + 2) - 1;
 
-        if (num_dacs < 3 || num_dacs > 5) {
+        if (spec->multiout.num_dacs < 0) {
                 printk(KERN_WARNING "hda_codec: Could not determine "
                        "number of channels defaulting to DAC count\n");
-                num_dacs = STAC92HD73_DAC_COUNT;
-        }
-        switch (num_dacs) {
+                spec->multiout.num_dacs = STAC92HD73_DAC_COUNT;
+        }
+
+        switch (spec->multiout.num_dacs) {
         case 0x3: /* 6 Channel */
                 spec->mixer = stac92hd73xx_6ch_mixer;
@@ -4646 +4252 @@
                 spec->mixer = stac92hd73xx_10ch_mixer;
                 spec->init = stac92hd73xx_10ch_core_init;
-        }
-        spec->multiout.dac_nids = spec->dac_nids;
-
+        };
+
+        spec->multiout.dac_nids = stac92hd73xx_dac_nids;
         spec->aloopback_mask = 0x01;
         spec->aloopback_shift = 8;
@@ -4671 +4277 @@
                 spec->init = dell_eq_core_init;
                 /* fallthru */
-        case STAC_DELL_M6_AMIC:
-        case STAC_DELL_M6_DMIC:
-        case STAC_DELL_M6_BOTH:
+        case STAC_DELL_M6:
                 spec->num_smuxes = 0;
                 spec->mixer = &stac92hd73xx_6ch_mixer[DELL_M6_MIXER];
                 spec->amp_nids = &stac92hd73xx_amp_nids[DELL_M6_AMP];
-                spec->eapd_switch = 0;
                 spec->num_amps = 1;
 
-                if (spec->board_config != STAC_DELL_EQ)
+                if (!spec->init)
                         spec->init = dell_m6_core_init;
-                switch (spec->board_config) {
-                case STAC_DELL_M6_AMIC: /* Analog Mics */
+                switch (codec->subsystem_id) {
+                case 0x1028025e: /* Analog Mics */
+                case 0x1028025f:
                         stac92xx_set_config_reg(codec, 0x0b, 0x90A70170);
                         spec->num_dmics = 0;
                         spec->private_dimux.num_items = 1;
                         break;
-                case STAC_DELL_M6_DMIC: /* Digital Mics */
+                case 0x10280271: /* Digital Mics */
+                case 0x10280272:
+                case 0x10280254:
+                case 0x10280255:
                         stac92xx_set_config_reg(codec, 0x13, 0x90A60160);
                         spec->num_dmics = 1;
                         spec->private_dimux.num_items = 2;
                         break;
-                case STAC_DELL_M6_BOTH: /* Both */
+                case 0x10280256: /* Both */
+                case 0x10280057:
                         stac92xx_set_config_reg(codec, 0x0b, 0x90A70170);
                         stac92xx_set_config_reg(codec, 0x13, 0x90A60160);
@@ -4704 +4312 @@
                 spec->num_dmics = STAC92HD73XX_NUM_DMICS;
                 spec->num_smuxes = ARRAY_SIZE(stac92hd73xx_smux_nids);
-                spec->eapd_switch = 1;
         }
         if (spec->board_config > STAC_92HD73XX_REF) {
@@ -4733 +4340 @@
         }
 
-        if (spec->board_config == STAC_92HD73XX_NO_JD)
-                spec->hp_detect = 0;
-
         codec->patch_ops = stac92xx_patch_ops;
-
-        codec->proc_widget_hook = stac92hd7x_proc_hook;
 
         return 0;
@@ -4769 +4371 @@
         spec->adc_nids = stac92hd83xxx_adc_nids;
         spec->pwr_nids = stac92hd83xxx_pwr_nids;
-        spec->amp_nids = stac92hd83xxx_amp_nids;
         spec->pwr_mapping = stac92hd83xxx_pwr_mapping;
         spec->num_pwrs = ARRAY_SIZE(stac92hd83xxx_pwr_nids);
-        spec->multiout.dac_nids = spec->dac_nids;
+        spec->multiout.dac_nids = stac92hd83xxx_dac_nids;
 
         spec->init = stac92hd83xxx_core_init;
         switch (codec->vendor_id) {
         case 0x111d7605:
+                spec->multiout.num_dacs = STAC92HD81_DAC_COUNT;
                 break;
         default:
                 spec->num_pwrs--;
                 spec->init++; /* switch to config #2 */
+                spec->multiout.num_dacs = STAC92HD83_DAC_COUNT;
         }
 
@@ -4787 +4390 @@
         spec->num_dmuxes = ARRAY_SIZE(stac92hd83xxx_dmux_nids);
         spec->num_adcs = ARRAY_SIZE(stac92hd83xxx_adc_nids);
-        spec->num_amps = ARRAY_SIZE(stac92hd83xxx_amp_nids);
         spec->num_dmics = STAC92HD83XXX_NUM_DMICS;
         spec->dinput_mux = &stac92hd83xxx_dmux;
@@ -4800 +4402 @@
                         " STAC92HD83XXX, using BIOS defaults\n");
                 err = stac92xx_save_bios_config_regs(codec);
-        } else
-                err = stac_save_pin_cfgs(codec,
-                                stac92hd83xxx_brd_tbl[spec->board_config]);
-        if (err < 0) {
-                stac92xx_free(codec);
-                return err;
+                if (err < 0) {
+                        stac92xx_free(codec);
+                        return err;
+                }
+                spec->pin_configs = spec->bios_pin_configs;
+        } else {
+                spec->pin_configs = stac92hd83xxx_brd_tbl[spec->board_config];
+                stac92xx_set_config_regs(codec);
         }
 
@@ -4826 +4430 @@
         codec->patch_ops = stac92xx_patch_ops;
 
-        codec->proc_widget_hook = stac92hd_proc_hook;
-
         return 0;
 }
+
+#ifdef SND_HDA_NEEDS_RESUME
+static void stac92hd71xx_set_power_state(struct hda_codec *codec, int pwr)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        int i;
+        snd_hda_codec_write_cache(codec, codec->afg, 0,
+                AC_VERB_SET_POWER_STATE, pwr);
+
+        msleep(1);
+        for (i = 0; i < spec->num_adcs; i++) {
+                snd_hda_codec_write_cache(codec,
+                        spec->adc_nids[i], 0,
+                        AC_VERB_SET_POWER_STATE, pwr);
+        }
+};
+
+static int stac92hd71xx_resume(struct hda_codec *codec)
+{
+        stac92hd71xx_set_power_state(codec, AC_PWRST_D0);
+        return stac92xx_resume(codec);
+}
+
+static int stac92hd71xx_suspend(struct hda_codec *codec, pm_message_t state)
+{
+        stac92hd71xx_set_power_state(codec, AC_PWRST_D3);
+        return 0;
+};
+
+#endif
+
+static struct hda_codec_ops stac92hd71bxx_patch_ops = {
+        .build_controls = stac92xx_build_controls,
+        .build_pcms = stac92xx_build_pcms,
+        .init = stac92xx_init,
+        .free = stac92xx_free,
+        .unsol_event = stac92xx_unsol_event,
+#ifdef SND_HDA_NEEDS_RESUME
+        .resume = stac92hd71xx_resume,
+        .suspend = stac92hd71xx_suspend,
+#endif
+};
 
 static struct hda_input_mux stac92hd71bxx_dmux = {
@@ -4866 +4510 @@
                         " STAC92HD71BXX, using BIOS defaults\n");
                 err = stac92xx_save_bios_config_regs(codec);
-        } else
-                err = stac_save_pin_cfgs(codec,
-                                stac92hd71bxx_brd_tbl[spec->board_config]);
-        if (err < 0) {
-                stac92xx_free(codec);
-                return err;
-        }
-
-        if (spec->board_config > STAC_92HD71BXX_REF) {
-                /* GPIO0 = EAPD */
-                spec->gpio_mask = 0x01;
-                spec->gpio_dir = 0x01;
-                spec->gpio_data = 0x01;
+                if (err < 0) {
+                        stac92xx_free(codec);
+                        return err;
+                }
+                spec->pin_configs = spec->bios_pin_configs;
+        } else {
+                spec->pin_configs = stac92hd71bxx_brd_tbl[spec->board_config];
+                stac92xx_set_config_regs(codec);
         }
 
@@ -4891 +4530 @@
                 break;
         case 0x111d7608: /* 5 Port with Analog Mixer */
-                switch (spec->board_config) {
-                case STAC_HP_M4:
+                switch (codec->subsystem_id) {
+                case 0x103c361a:
                         /* Enable VREF power saving on GPIO1 detect */
-                        err = stac_add_event(spec, codec->afg,
-                                             STAC_VREF_EVENT, 0x02);
-                        if (err < 0)
-                                return err;
-                        snd_hda_codec_write_cache(codec, codec->afg, 0,
+                        snd_hda_codec_write(codec, codec->afg, 0,
                                 AC_VERB_SET_GPIO_UNSOLICITED_RSP_MASK, 0x02);
                         snd_hda_codec_write_cache(codec, codec->afg, 0,
                                 AC_VERB_SET_UNSOLICITED_ENABLE,
-                                AC_USRSP_EN | err);
+                                (AC_USRSP_EN | STAC_VREF_EVENT | codec->afg));
+                        err = stac92xx_add_event(spec, codec->afg, 0x02);
+                        if (err < 0)
+                                return err;
                         spec->gpio_mask |= 0x02;
                         break;
                 }
                 if ((codec->revision_id & 0xf) == 0 ||
-                    (codec->revision_id & 0xf) == 1)
+                                (codec->revision_id & 0xf) == 1) {
+#ifdef SND_HDA_NEEDS_RESUME
+                        codec->patch_ops = stac92hd71bxx_patch_ops;
+#endif
                         spec->stream_delay = 40; /* 40 milliseconds */
+                }
 
                 /* no output amps */
@@ -4917 +4559 @@
                 /* disable VSW */
                 spec->init = &stac92hd71bxx_analog_core_init[HD_DISABLE_PORTF];
-                stac_change_pin_config(codec, 0xf, 0x40f000f0);
+                stac92xx_set_config_reg(codec, 0xf, 0x40f000f0);
                 break;
         case 0x111d7603: /* 6 Port with Analog Mixer */
-                if ((codec->revision_id & 0xf) == 1)
+                if ((codec->revision_id & 0xf) == 1) {
+#ifdef SND_HDA_NEEDS_RESUME
+                        codec->patch_ops = stac92hd71bxx_patch_ops;
+#endif
                         spec->stream_delay = 40; /* 40 milliseconds */
+                }
 
                 /* no output amps */
@@ -4936 +4582 @@
         spec->aloopback_shift = 0;
 
+        if (spec->board_config > STAC_92HD71BXX_REF) {
+                /* GPIO0 = EAPD */
+                spec->gpio_mask = 0x01;
+                spec->gpio_dir = 0x01;
+                spec->gpio_data = 0x01;
+        }
+
         spec->powerdown_adcs = 1;
         spec->digbeep_nid = 0x26;
@@ -4950 +4603 @@
         switch (spec->board_config) {
         case STAC_HP_M4:
-                /* enable internal microphone */
-                stac_change_pin_config(codec, 0x0e, 0x01813040);
-                stac92xx_auto_set_pinctl(codec, 0x0e,
-                        AC_PINCTL_IN_EN | AC_PINCTL_VREF_80);
-                /* fallthru */
-        case STAC_DELL_M4_2:
                 spec->num_dmics = 0;
                 spec->num_smuxes = 0;
                 spec->num_dmuxes = 0;
-                break;
-        case STAC_DELL_M4_1:
-        case STAC_DELL_M4_3:
-                spec->num_dmics = 1;
-                spec->num_smuxes = 0;
-                spec->num_dmuxes = 0;
+
+                /* enable internal microphone */
+                stac92xx_set_config_reg(codec, 0x0e, 0x01813040);
+                stac92xx_auto_set_pinctl(codec, 0x0e,
+                        AC_PINCTL_IN_EN | AC_PINCTL_VREF_80);
                 break;
         default:
@@ -4972 +4618 @@
         };
 
-        spec->multiout.dac_nids = spec->dac_nids;
+        spec->multiout.num_dacs = 1;
+        spec->multiout.hp_nid = 0x11;
+        spec->multiout.dac_nids = stac92hd71bxx_dac_nids;
         if (spec->dinput_mux)
                 spec->private_dimux.num_items +=
@@ -4993 +4641 @@
                 return err;
         }
-
-        codec->proc_widget_hook = stac92hd7x_proc_hook;
 
         return 0;
@@ -5057 +4703 @@
                         "using BIOS defaults\n");
                 err = stac92xx_save_bios_config_regs(codec);
-        } else
-                err = stac_save_pin_cfgs(codec,
-                                stac922x_brd_tbl[spec->board_config]);
-        if (err < 0) {
-                stac92xx_free(codec);
-                return err;
+                if (err < 0) {
+                        stac92xx_free(codec);
+                        return err;
+                }
+                spec->pin_configs = spec->bios_pin_configs;
+        } else if (stac922x_brd_tbl[spec->board_config] != NULL) {
+                spec->pin_configs = stac922x_brd_tbl[spec->board_config];
+                stac92xx_set_config_regs(codec);
         }
 
@@ -5125 +4773 @@
                                     "STAC927x, using BIOS defaults\n");
                 err = stac92xx_save_bios_config_regs(codec);
-        } else
-                err = stac_save_pin_cfgs(codec,
-                                stac927x_brd_tbl[spec->board_config]);
-        if (err < 0) {
-                stac92xx_free(codec);
-                return err;
+                if (err < 0) {
+                        stac92xx_free(codec);
+                        return err;
+                }
+                spec->pin_configs = spec->bios_pin_configs;
+        } else {
+                spec->pin_configs = stac927x_brd_tbl[spec->board_config];
+                stac92xx_set_config_regs(codec);
         }
 
@@ -5160 +4810 @@
                 case 0x1028022e:
                         /* correct the device field to SPDIF out */
-                        stac_change_pin_config(codec, 0x21, 0x01442070);
+                        stac92xx_set_config_reg(codec, 0x21, 0x01442070);
                         break;
                 };
                 /* configure the analog microphone on some laptops */
-                stac_change_pin_config(codec, 0x0c, 0x90a79130);
+                stac92xx_set_config_reg(codec, 0x0c, 0x90a79130);
                 /* correct the front output jack as a hp out */
-                stac_change_pin_config(codec, 0x0f, 0x0227011f);
+                stac92xx_set_config_reg(codec, 0x0f, 0x0227011f);
                 /* correct the front input jack as a mic */
-                stac_change_pin_config(codec, 0x0e, 0x02a79130);
+                stac92xx_set_config_reg(codec, 0x0e, 0x02a79130);
                 /* fallthru */
         case STAC_DELL_3ST:
@@ -5197 +4847 @@
         spec->aloopback_mask = 0x40;
         spec->aloopback_shift = 0;
-        spec->eapd_switch = 1;
 
         err = stac92xx_parse_auto_config(codec, 0x1e, 0x20);
@@ -5215 +4864 @@
 
         codec->patch_ops = stac92xx_patch_ops;
-
-        codec->proc_widget_hook = stac927x_proc_hook;
 
         /*
@@ -5230 +4877 @@
         codec->bus->needs_damn_long_delay = 1;
 
-        /* no jack detecion for ref-no-jd model */
-        if (spec->board_config == STAC_D965_REF_NO_JD)
-                spec->hp_detect = 0;
-
         return 0;
 }
@@ -5256 +4899 @@
                 snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC9205, using BIOS defaults\n");
                 err = stac92xx_save_bios_config_regs(codec);
-        } else
-                err = stac_save_pin_cfgs(codec,
-                                         stac9205_brd_tbl[spec->board_config]);
-        if (err < 0) {
-                stac92xx_free(codec);
-                return err;
+                if (err < 0) {
+                        stac92xx_free(codec);
+                        return err;
+                }
+                spec->pin_configs = spec->bios_pin_configs;
+        } else {
+                spec->pin_configs = stac9205_brd_tbl[spec->board_config];
+                stac92xx_set_config_regs(codec);
         }
 
@@ -5282 +4927 @@
         spec->aloopback_mask = 0x40;
         spec->aloopback_shift = 0;
-        spec->eapd_switch = 1;
         spec->multiout.dac_nids = spec->dac_nids;
         
@@ -5288 +4932 @@
         case STAC_9205_DELL_M43:
                 /* Enable SPDIF in/out */
-                stac_change_pin_config(codec, 0x1f, 0x01441030);
-                stac_change_pin_config(codec, 0x20, 0x1c410030);
+                stac92xx_set_config_reg(codec, 0x1f, 0x01441030);
+                stac92xx_set_config_reg(codec, 0x20, 0x1c410030);
 
                 /* Enable unsol response for GPIO4/Dock HP connection */
-                err = stac_add_event(spec, codec->afg, STAC_VREF_EVENT, 0x01);
+                snd_hda_codec_write(codec, codec->afg, 0,
+                        AC_VERB_SET_GPIO_UNSOLICITED_RSP_MASK, 0x10);
+                snd_hda_codec_write_cache(codec, codec->afg, 0,
+                        AC_VERB_SET_UNSOLICITED_ENABLE,
+                        (AC_USRSP_EN | STAC_VREF_EVENT | codec->afg));
+                err = stac92xx_add_event(spec, codec->afg, 0x01);
                 if (err < 0)
                         return err;
-                snd_hda_codec_write_cache(codec, codec->afg, 0,
-                        AC_VERB_SET_GPIO_UNSOLICITED_RSP_MASK, 0x10);
-                snd_hda_codec_write_cache(codec, codec->afg, 0,
-                                          AC_VERB_SET_UNSOLICITED_ENABLE,
-                                          AC_USRSP_EN | err);
 
                 spec->gpio_dir = 0x0b;
@@ -5337 +4981 @@
         codec->patch_ops = stac92xx_patch_ops;
 
-        codec->proc_widget_hook = stac9205_proc_hook;
-
         return 0;
 }
@@ -5395 +5037 @@
 };
 
+/* bind volumes of both NID 0x02 and 0x05 */
+static struct hda_bind_ctls vaio_bind_master_vol = {
+        .ops = &snd_hda_bind_vol,
+        .values = {
+                HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
+                HDA_COMPOSE_AMP_VAL(0x05, 3, 0, HDA_OUTPUT),
+                0
+        },
+};
+
+/* bind volumes of both NID 0x02 and 0x05 */
+static struct hda_bind_ctls vaio_bind_master_sw = {
+        .ops = &snd_hda_bind_sw,
+        .values = {
+                HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
+                HDA_COMPOSE_AMP_VAL(0x05, 3, 0, HDA_OUTPUT),
+                0,
+        },
+};
+
 static struct snd_kcontrol_new vaio_mixer[] = {
-        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x02, 0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Headphone Playback Switch", 0x02, 0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Speaker Playback Volume", 0x05, 0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Speaker Playback Switch", 0x05, 0, HDA_OUTPUT),
+        HDA_BIND_VOL("Master Playback Volume", &vaio_bind_master_vol),
+        HDA_BIND_SW("Master Playback Switch", &vaio_bind_master_sw),
         /* HDA_CODEC_VOLUME("CD Capture Volume", 0x07, 0, HDA_INPUT), */
         HDA_CODEC_VOLUME("Capture Volume", 0x09, 0, HDA_INPUT),
@@ -5415 +5075 @@
 
 static struct snd_kcontrol_new vaio_ar_mixer[] = {
-        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x02, 0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Headphone Playback Switch", 0x02, 0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Speaker Playback Volume", 0x05, 0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Speaker Playback Switch", 0x05, 0, HDA_OUTPUT),
+        HDA_BIND_VOL("Master Playback Volume", &vaio_bind_master_vol),
+        HDA_BIND_SW("Master Playback Switch", &vaio_bind_master_sw),
         /* HDA_CODEC_VOLUME("CD Capture Volume", 0x07, 0, HDA_INPUT), */
         HDA_CODEC_VOLUME("Capture Volume", 0x09, 0, HDA_INPUT),
@@ -5459 +5117 @@
 static void stac9872_vaio_hp_detect(struct hda_codec *codec, unsigned int res)
 {
-        if (get_pin_presence(codec, 0x0a)) {
+        if (get_hp_pin_presence(codec, 0x0a)) {
                 stac92xx_reset_pinctl(codec, 0x0f, AC_PINCTL_OUT_EN);
                 stac92xx_set_pinctl(codec, 0x0a, AC_PINCTL_OUT_EN);
@@ -5570 +5228 @@
  * patch entries
  */
-static struct hda_codec_preset snd_hda_preset_sigmatel[] = {
+struct hda_codec_preset snd_hda_preset_sigmatel[] = {
         { .id = 0x83847690, .name = "STAC9200", .patch = patch_stac9200 },
         { .id = 0x83847882, .name = "STAC9220 A1", .patch = patch_stac922x },
@@ -5634 +5292 @@
         {0} /* terminator */
 };
-
-MODULE_ALIAS("snd-hda-codec-id:8384*");
-MODULE_ALIAS("snd-hda-codec-id:111d*");
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("IDT/Sigmatel HD-audio codec");
-
-static struct hda_codec_preset_list sigmatel_list = {
-        .preset = snd_hda_preset_sigmatel,
-        .owner = THIS_MODULE,
-};
-
-static int __init patch_sigmatel_init(void)
-{
-        return snd_hda_add_codec_preset(&sigmatel_list);
-}
-
-static void __exit patch_sigmatel_exit(void)
-{
-        snd_hda_delete_codec_preset(&sigmatel_list);
-}
-
-module_init(patch_sigmatel_init)
-module_exit(patch_sigmatel_exit)

GPL/branches/uniaud32-2.0/alsa-kernel/pci/hda/patch_via.c

@@ -48 +48 @@
 #include "hda_codec.h"
 #include "hda_local.h"
+#include "hda_patch.h"
 
 /* amp values */
@@ -141 +142 @@
         AUTO_SEQ_SIDE
 };
+
+#define get_amp_nid(kc) ((kc)->private_value & 0xffff)
 
 /* Some VT1708S based boards gets the micboost setting wrong, so we have
@@ -3250 +3253 @@
  * patch entries
  */
-static struct hda_codec_preset snd_hda_preset_via[] = {
-        { .id = 0x11061708, .name = "VT1708", .patch = patch_vt1708},
-        { .id = 0x11061709, .name = "VT1708", .patch = patch_vt1708},
-        { .id = 0x1106170a, .name = "VT1708", .patch = patch_vt1708},
-        { .id = 0x1106170b, .name = "VT1708", .patch = patch_vt1708},
-        { .id = 0x1106e710, .name = "VT1709 10-Ch",
+struct hda_codec_preset snd_hda_preset_via[] = {
+        { .id = 0x11061708, .name = "VIA VT1708", .patch = patch_vt1708},
+        { .id = 0x11061709, .name = "VIA VT1708", .patch = patch_vt1708},
+        { .id = 0x1106170A, .name = "VIA VT1708", .patch = patch_vt1708},
+        { .id = 0x1106170B, .name = "VIA VT1708", .patch = patch_vt1708},
+        { .id = 0x1106E710, .name = "VIA VT1709 10-Ch",
           .patch = patch_vt1709_10ch},
-        { .id = 0x1106e711, .name = "VT1709 10-Ch",
+        { .id = 0x1106E711, .name = "VIA VT1709 10-Ch",
           .patch = patch_vt1709_10ch},
-        { .id = 0x1106e712, .name = "VT1709 10-Ch",
+        { .id = 0x1106E712, .name = "VIA VT1709 10-Ch",
           .patch = patch_vt1709_10ch},
-        { .id = 0x1106e713, .name = "VT1709 10-Ch",
+        { .id = 0x1106E713, .name = "VIA VT1709 10-Ch",
           .patch = patch_vt1709_10ch},
-        { .id = 0x1106e714, .name = "VT1709 6-Ch",
+        { .id = 0x1106E714, .name = "VIA VT1709 6-Ch",
           .patch = patch_vt1709_6ch},
-        { .id = 0x1106e715, .name = "VT1709 6-Ch",
+        { .id = 0x1106E715, .name = "VIA VT1709 6-Ch",
           .patch = patch_vt1709_6ch},
-        { .id = 0x1106e716, .name = "VT1709 6-Ch",
+        { .id = 0x1106E716, .name = "VIA VT1709 6-Ch",
           .patch = patch_vt1709_6ch},
-        { .id = 0x1106e717, .name = "VT1709 6-Ch",
+        { .id = 0x1106E717, .name = "VIA VT1709 6-Ch",
           .patch = patch_vt1709_6ch},
-        { .id = 0x1106e720, .name = "VT1708B 8-Ch",
+        { .id = 0x1106E720, .name = "VIA VT1708B 8-Ch",
           .patch = patch_vt1708B_8ch},
-        { .id = 0x1106e721, .name = "VT1708B 8-Ch",
+        { .id = 0x1106E721, .name = "VIA VT1708B 8-Ch",
           .patch = patch_vt1708B_8ch},
-        { .id = 0x1106e722, .name = "VT1708B 8-Ch",
+        { .id = 0x1106E722, .name = "VIA VT1708B 8-Ch",
           .patch = patch_vt1708B_8ch},
-        { .id = 0x1106e723, .name = "VT1708B 8-Ch",
+        { .id = 0x1106E723, .name = "VIA VT1708B 8-Ch",
           .patch = patch_vt1708B_8ch},
-        { .id = 0x1106e724, .name = "VT1708B 4-Ch",
+        { .id = 0x1106E724, .name = "VIA VT1708B 4-Ch",
           .patch = patch_vt1708B_4ch},
-        { .id = 0x1106e725, .name = "VT1708B 4-Ch",
+        { .id = 0x1106E725, .name = "VIA VT1708B 4-Ch",
           .patch = patch_vt1708B_4ch},
-        { .id = 0x1106e726, .name = "VT1708B 4-Ch",
+        { .id = 0x1106E726, .name = "VIA VT1708B 4-Ch",
           .patch = patch_vt1708B_4ch},
-        { .id = 0x1106e727, .name = "VT1708B 4-Ch",
+        { .id = 0x1106E727, .name = "VIA VT1708B 4-Ch",
           .patch = patch_vt1708B_4ch},
-        { .id = 0x11060397, .name = "VT1708S",
+        { .id = 0x11060397, .name = "VIA VT1708S",
           .patch = patch_vt1708S},
-        { .id = 0x11061397, .name = "VT1708S",
+        { .id = 0x11061397, .name = "VIA VT1708S",
           .patch = patch_vt1708S},
-        { .id = 0x11062397, .name = "VT1708S",
+        { .id = 0x11062397, .name = "VIA VT1708S",
           .patch = patch_vt1708S},
-        { .id = 0x11063397, .name = "VT1708S",
+        { .id = 0x11063397, .name = "VIA VT1708S",
           .patch = patch_vt1708S},
-        { .id = 0x11064397, .name = "VT1708S",
+        { .id = 0x11064397, .name = "VIA VT1708S",
           .patch = patch_vt1708S},
-        { .id = 0x11065397, .name = "VT1708S",
+        { .id = 0x11065397, .name = "VIA VT1708S",
           .patch = patch_vt1708S},
-        { .id = 0x11066397, .name = "VT1708S",
+        { .id = 0x11066397, .name = "VIA VT1708S",
           .patch = patch_vt1708S},
-        { .id = 0x11067397, .name = "VT1708S",
+        { .id = 0x11067397, .name = "VIA VT1708S",
           .patch = patch_vt1708S},
-        { .id = 0x11060398, .name = "VT1702",
+        { .id = 0x11060398, .name = "VIA VT1702",
           .patch = patch_vt1702},
-        { .id = 0x11061398, .name = "VT1702",
+        { .id = 0x11061398, .name = "VIA VT1702",
           .patch = patch_vt1702},
-        { .id = 0x11062398, .name = "VT1702",
+        { .id = 0x11062398, .name = "VIA VT1702",
           .patch = patch_vt1702},
-        { .id = 0x11063398, .name = "VT1702",
+        { .id = 0x11063398, .name = "VIA VT1702",
           .patch = patch_vt1702},
-        { .id = 0x11064398, .name = "VT1702",
+        { .id = 0x11064398, .name = "VIA VT1702",
           .patch = patch_vt1702},
-        { .id = 0x11065398, .name = "VT1702",
+        { .id = 0x11065398, .name = "VIA VT1702",
           .patch = patch_vt1702},
-        { .id = 0x11066398, .name = "VT1702",
+        { .id = 0x11066398, .name = "VIA VT1702",
           .patch = patch_vt1702},
-        { .id = 0x11067398, .name = "VT1702",
+        { .id = 0x11067398, .name = "VIA VT1702",
           .patch = patch_vt1702},
         {0} /* terminator */
 };
-
-MODULE_ALIAS("snd-hda-codec-id:1106*");
-
-static struct hda_codec_preset_list via_list = {
-        .preset = snd_hda_preset_via,
-        .owner = THIS_MODULE,
-};
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("VIA HD-audio codec");
-
-static int __init patch_via_init(void)
-{
-        return snd_hda_add_codec_preset(&via_list);
-}
-
-static void __exit patch_via_exit(void)
-{
-        snd_hda_delete_codec_preset(&via_list);
-}
-
-module_init(patch_via_init)
-module_exit(patch_via_exit)