Changeset 77

Timestamp:

Jul 23, 2006, 11:54:27 AM (19 years ago)

Author:

vladest

Message:

Provide sources to latest exist binary. See changelog for changes

Location:

GPL/trunk

Files:

• alsa-kernel/core/control.c (modified) (3 diffs)
• alsa-kernel/core/pcm_native.c (modified) (1 diff)
• alsa-kernel/core/seq/seq_ports.c (modified) (2 diffs)
• alsa-kernel/drivers/mpu401/mpu401_uart.c (modified) (11 diffs)
• alsa-kernel/include/sound/ac97_codec.h (modified) (8 diffs)
• alsa-kernel/include/sound/asound.h (modified) (3 diffs)
• alsa-kernel/include/sound/compat_22.h (modified) (1 diff)
• alsa-kernel/include/sound/control.h (modified) (2 diffs)
• alsa-kernel/include/sound/mpu401.h (modified) (3 diffs)
• alsa-kernel/pci/ac97/ac97_codec.c (modified) (21 diffs)
• alsa-kernel/pci/ac97/ac97_patch.c (modified) (7 diffs)
• alsa-kernel/pci/ac97/ac97_patch.h (modified) (1 diff)
• alsa-kernel/pci/ac97/ac97_pcm.c (modified) (4 diffs)
• alsa-kernel/pci/bt87x.c (modified) (1 diff)
• alsa-kernel/pci/ca0106/ca0106_main.c (modified) (2 diffs)
• alsa-kernel/pci/ca0106/ca0106_mixer.c (modified) (2 diffs)
• alsa-kernel/pci/cmipci.c (modified) (2 diffs)
• alsa-kernel/pci/cs4281.c (modified) (2 diffs)
• alsa-kernel/pci/cs46xx/cs46xx_lib.c (modified) (2 diffs)
• alsa-kernel/pci/es1938.c (modified) (1 diff)
• alsa-kernel/pci/es1968.c (modified) (1 diff)
• alsa-kernel/pci/fm801.c (modified) (1 diff)
• alsa-kernel/pci/hda/hda_codec.c (modified) (59 diffs)
• alsa-kernel/pci/hda/hda_intel.c (modified) (7 diffs)
• alsa-kernel/pci/hda/hda_patch.h (modified) (2 diffs)
• alsa-kernel/pci/hda/makefile.os2 (modified) (1 diff)
• alsa-kernel/pci/hda/patch_analog.c (modified) (14 diffs)
• alsa-kernel/pci/hda/patch_realtek.c (modified) (98 diffs)
• alsa-kernel/pci/hda/patch_sigmatel.c (modified) (17 diffs)
• alsa-kernel/pci/intel8x0.c (modified) (6 diffs)
• alsa-kernel/pci/maestro3.c (modified) (1 diff)
• alsa-kernel/pci/sonicvibes.c (modified) (1 diff)
• alsa-kernel/pci/trident/trident.c (modified) (1 diff)
• alsa-kernel/pci/via82xx.c (modified) (7 diffs)
• alsa-kernel/pci/ymfpci/ymfpci.c (modified) (1 diff)
• alsa-kernel/synth/emux/soundfont.c (modified) (1 diff)
• include/version.mak (modified) (1 diff)
• lib32/ioctl.c (modified) (3 diffs)
• lib32/sound.c (modified) (3 diffs)

GPL/trunk/alsa-kernel/core/control.c

@@ -244 +244 @@
     kctl.get = ncontrol->get;
     kctl.put = ncontrol->put;
+    kctl.tlv = ncontrol->tlv;
     kctl.private_value = ncontrol->private_value;
     kctl.private_data = private_data;
@@ -1036 +1037 @@
 #endif
 
+static int snd_ctl_tlv_read(struct snd_card *card,
+                            struct snd_ctl_tlv __user *_tlv)
+{
+    struct snd_ctl_tlv tlv;
+    struct snd_kcontrol *kctl;
+    unsigned int len;
+    int err = 0;
+
+    if (copy_from_user(&tlv, _tlv, sizeof(tlv)))
+        return -EFAULT;
+    if (tlv.length < sizeof(unsigned int) * 3)
+        return -EINVAL;
+    down_read(&card->controls_rwsem);
+    kctl = snd_ctl_find_numid(card, tlv.numid);
+    if (kctl == NULL) {
+        err = -ENOENT;
+        goto __kctl_end;
+    }
+    if (kctl->tlv == NULL) {
+        err = -ENXIO;
+        goto __kctl_end;
+    }
+    len = kctl->tlv[1] + 2 * sizeof(unsigned int);
+    if (tlv.length < len) {
+        err = -ENOMEM;
+        goto __kctl_end;
+    }
+    if (copy_to_user(_tlv->tlv, kctl->tlv, len))
+        err = -EFAULT;
+__kctl_end:
+    up_read(&card->controls_rwsem);
+    return err;
+}
+
 static int snd_ctl_ioctl(struct inode *inode, struct file *file,
                          unsigned int cmd, unsigned long arg)
@@ -1081 +1116 @@
     case SNDRV_CTL_IOCTL_SUBSCRIBE_EVENTS:
         return snd_ctl_subscribe_events(ctl, (int *) arg);
+    case SNDRV_CTL_IOCTL_TLV_READ:
+        return snd_ctl_tlv_read(card, argp);
     case SNDRV_CTL_IOCTL_POWER:
         if (get_user(err, (int *)arg))

GPL/trunk/alsa-kernel/core/pcm_native.c

@@ -1447 +1447 @@
     }
     up_read(&snd_pcm_link_rwsem);
-    if (! num_drecs)
-        goto _error;
 
     snd_pcm_stream_lock_irq(substream);

GPL/trunk/alsa-kernel/core/seq/seq_ports.c

@@ -222 +222 @@
         struct list_head *p, *n;
 
-        down_write(&grp->list_mutex);
         list_for_each_safe(p, n, &grp->list_head) {
                 struct snd_seq_subscribers *subs;
@@ -260 +259 @@
                 }
         }
-        up_write(&grp->list_mutex);
 }
 

GPL/trunk/alsa-kernel/drivers/mpu401/mpu401_uart.c

@@ -91 +91 @@
 }
 
+static void uart_interrupt_tx(struct snd_mpu401 *mpu)
+{
+    if (test_bit(MPU401_MODE_BIT_OUTPUT, &mpu->mode) &&
+        test_bit(MPU401_MODE_BIT_OUTPUT_TRIGGER, &mpu->mode)) {
+        spin_lock(&mpu->output_lock);
+        snd_mpu401_uart_output_write(mpu);
+        spin_unlock(&mpu->output_lock);
+    }
+}
+
 static void _snd_mpu401_uart_interrupt(struct snd_mpu401 *mpu)
 {
-        spin_lock(&mpu->input_lock);
-        if (test_bit(MPU401_MODE_BIT_INPUT, &mpu->mode)) {
-                snd_mpu401_uart_input_read(mpu);
-        } else {
-                snd_mpu401_uart_clear_rx(mpu);
-        }
-        spin_unlock(&mpu->input_lock);
-        /* ok. for better Tx performance try do some output when input is done */
-        if (test_bit(MPU401_MODE_BIT_OUTPUT, &mpu->mode) &&
-            test_bit(MPU401_MODE_BIT_OUTPUT_TRIGGER, &mpu->mode)) {
-                spin_lock(&mpu->output_lock);
-                snd_mpu401_uart_output_write(mpu);
-                spin_unlock(&mpu->output_lock);
-        }
+    if (mpu->info_flags & MPU401_INFO_INPUT) {
+        spin_lock(&mpu->input_lock);
+        if (test_bit(MPU401_MODE_BIT_INPUT, &mpu->mode))
+            snd_mpu401_uart_input_read(mpu);
+        else
+            snd_mpu401_uart_clear_rx(mpu);
+        spin_unlock(&mpu->input_lock);
+    }
+    if (! (mpu->info_flags & MPU401_INFO_TX_IRQ))
+        /* ok. for better Tx performance try do some output
+         when input is done */
+        uart_interrupt_tx(mpu);
 }
 
@@ -126 +134 @@
         return IRQ_HANDLED;
 }
+
+/**
+ * snd_mpu401_uart_interrupt_tx - generic MPU401-UART transmit irq handler
+ * @irq: the irq number
+ * @dev_id: mpu401 instance
+ * @regs: the reigster
+ *
+ * Processes the interrupt for MPU401-UART output.
+ */
+irqreturn_t snd_mpu401_uart_interrupt_tx(int irq, void *dev_id,
+                                         struct pt_regs *regs)
+{
+    struct snd_mpu401 *mpu = dev_id;
+
+    if (mpu == NULL)
+        return IRQ_NONE;
+    uart_interrupt_tx(mpu);
+    return IRQ_HANDLED;
+}
+
+EXPORT_SYMBOL(snd_mpu401_uart_interrupt_tx);
 
 /*
@@ -327 +356 @@
         unsigned char byte;
 
-        while (max-- > 0) {
-                if (snd_mpu401_input_avail(mpu)) {
-                        byte = mpu->read(mpu, MPU401D(mpu));
-                        if (test_bit(MPU401_MODE_BIT_INPUT_TRIGGER, &mpu->mode))
-                                snd_rawmidi_receive(mpu->substream_input, &byte, 1);
-                } else {
-                        break; /* input not available */
-                }
+        while (max-- > 0) {
+            if (! snd_mpu401_input_avail(mpu))
+                break; /* input not available */
+            byte = mpu->read(mpu, MPU401D(mpu));
+            if (test_bit(MPU401_MODE_BIT_INPUT_TRIGGER, &mpu->mode))
+                snd_rawmidi_receive(mpu->substream_input, &byte, 1);
         }
 }
@@ -355 +382 @@
         int max = 256, timeout;
 
-        do {
-                if (snd_rawmidi_transmit_peek(mpu->substream_output, &byte, 1) == 1) {
-                        for (timeout = 100; timeout > 0; timeout--) {
-                                if (snd_mpu401_output_ready(mpu)) {
-                                        mpu->write(mpu, byte, MPU401D(mpu));
-                                        snd_rawmidi_transmit_ack(mpu->substream_output, 1);
-                                        break;
-                                }
-                        }
-                        if (timeout == 0)
-                                break;  /* Tx FIFO full - try again later */
-                } else {
-                        snd_mpu401_uart_remove_timer (mpu, 0);
-                        break;  /* no other data - leave the tx loop */
-                }
+        do {
+            if (snd_rawmidi_transmit_peek(mpu->substream_output,
+                                          &byte, 1) == 1) {
+                for (timeout = 100; timeout > 0; timeout--) {
+                    if (snd_mpu401_output_ready(mpu))
+                        break;
+                }
+                if (timeout == 0)
+                    break;      /* Tx FIFO full - try again later */
+                mpu->write(mpu, byte, MPU401D(mpu));
+                snd_rawmidi_transmit_ack(mpu->substream_output, 1);
+            } else {
+                snd_mpu401_uart_remove_timer (mpu, 0);
+                break;  /* no other data - leave the tx loop */
+            }
         } while (--max > 0);
 }
@@ -388 +415 @@
                  * since the output timer might have been removed in
                  * snd_mpu401_uart_output_write().
-                 */
-                snd_mpu401_uart_add_timer(mpu, 0);
-
+                 */
+                if (! (mpu->info_flags & MPU401_INFO_TX_IRQ))
+                    snd_mpu401_uart_add_timer(mpu, 0);
                 /* output pending data */
                 spin_lock_irqsave(&mpu->output_lock, flags);
                 snd_mpu401_uart_output_write(mpu);
                 spin_unlock_irqrestore(&mpu->output_lock, flags);
-        } else {
-                snd_mpu401_uart_remove_timer(mpu, 0);
-                clear_bit(MPU401_MODE_BIT_OUTPUT_TRIGGER, &mpu->mode);
+        } else {
+            if (! (mpu->info_flags & MPU401_INFO_TX_IRQ))
+                snd_mpu401_uart_remove_timer(mpu, 0);
+            clear_bit(MPU401_MODE_BIT_OUTPUT_TRIGGER, &mpu->mode);
         }
 }
@@ -437 +465 @@
  * @hardware: the hardware type, MPU401_HW_XXXX
  * @port: the base address of MPU401 port
- * @integrated: non-zero if the port was already reserved by the chip
+ * @info_flags: bitflags MPU401_INFO_XXX
  * @irq: the irq number, -1 if no interrupt for mpu
  * @irq_flags: the irq request flags (SA_XXX), 0 if irq was already reserved.
@@ -451 +479 @@
  */
 int snd_mpu401_uart_new(struct snd_card *card, int device,
-                        unsigned short hardware,
-                        unsigned long port, int integrated,
+                        unsigned short hardware,
+                        unsigned long port,
+                        unsigned int info_flags,
                         int irq, int irq_flags,
                         struct snd_rawmidi ** rrawmidi)
 {
         struct snd_mpu401 *mpu;
-        struct snd_rawmidi *rmidi;
+        struct snd_rawmidi *rmidi;
+        int in_enable, out_enable;
         int err;
 
         if (rrawmidi)
-                *rrawmidi = NULL;
-        if ((err = snd_rawmidi_new(card, "MPU-401U", device, 1, 1, &rmidi)) < 0)
-                return err;
+            *rrawmidi = NULL;
+        if (! (info_flags & (MPU401_INFO_INPUT | MPU401_INFO_OUTPUT)))
+                info_flags |= MPU401_INFO_INPUT | MPU401_INFO_OUTPUT;
+        in_enable = (info_flags & MPU401_INFO_INPUT) ? 1 : 0;
+        out_enable = (info_flags & MPU401_INFO_OUTPUT) ? 1 : 0;
+        if ((err = snd_rawmidi_new(card, "MPU-401U", device,
+                                   out_enable, in_enable, &rmidi)) < 0)
+            return err;
         mpu = (struct snd_mpu401 *)kzalloc(sizeof(*mpu), GFP_KERNEL);
         if (mpu == NULL) {
@@ -475 +510 @@
         spin_lock_init(&mpu->output_lock);
         spin_lock_init(&mpu->timer_lock);
-        mpu->hardware = hardware;
-        if (!integrated) {
+        mpu->hardware = hardware;
+        if (! (info_flags & MPU401_INFO_INTEGRATED)) {
                 int res_size = hardware == MPU401_HW_PC98II ? 4 : 2;
                 if ((mpu->res = request_region(port, res_size, "MPU401 UART")) == NULL) {
@@ -483 +518 @@
                         return -EBUSY;
                 }
-        }
-        switch (hardware) {
-        case MPU401_HW_AUREAL:
+        }
+        if (info_flags & MPU401_INFO_MMIO) {
                 mpu->write = mpu401_write_mmio;
-                mpu->read = mpu401_read_mmio;
-                break;
-        default:
+                mpu->read = mpu401_read_mmio;
+        } else {
                 mpu->write = mpu401_write_port;
                 mpu->read = mpu401_read_port;
-                break;
         }
         mpu->port = port;
@@ -505 +537 @@
                         return -EBUSY;
                 }
-        }
+        }
+        mpu->info_flags = info_flags;
         mpu->irq = irq;
         mpu->irq_flags = irq_flags;
@@ -511 +544 @@
                 sprintf(rmidi->name, "%s MIDI", card->shortname);
         else
-                sprintf(rmidi->name, "MPU-401 MIDI %d-%d", card->number, device);
-        snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &snd_mpu401_uart_output);
-        snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, &snd_mpu401_uart_input);
-        rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT |
-                             SNDRV_RAWMIDI_INFO_INPUT |
-                             SNDRV_RAWMIDI_INFO_DUPLEX;
-        mpu->rmidi = rmidi;
+            sprintf(rmidi->name, "MPU-401 MIDI %d-%d", card->number, device);
+        if (out_enable) {
+            snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT,
+                                &snd_mpu401_uart_output);
+            rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT;
+        }
+        if (in_enable) {
+            snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT,
+                                &snd_mpu401_uart_input);
+            rmidi->info_flags |= SNDRV_RAWMIDI_INFO_INPUT;
+            if (out_enable)
+                rmidi->info_flags |= SNDRV_RAWMIDI_INFO_DUPLEX;
+        }
+        mpu->rmidi = rmidi;
         if (rrawmidi)
                 *rrawmidi = rmidi;

GPL/trunk/alsa-kernel/include/sound/ac97_codec.h

@@ -32 +32 @@
 #include "info.h"
 
+#define CONFIG_SND_AC97_POWER_SAVE /* experimental !!! */
 /*
  *  AC'97 codec registers
@@ -141 +142 @@
 #define AC97_GP_DRSS_78         0x0400  /* LR 7+8 */
 
+/* powerdown bits */
+#define AC97_PD_ADC_STATUS      0x0001  /* ADC status (RO) */
+#define AC97_PD_DAC_STATUS      0x0002  /* DAC status (RO) */
+#define AC97_PD_MIXER_STATUS    0x0004  /* Analog mixer status (RO) */
+#define AC97_PD_VREF_STATUS     0x0008  /* Vref status (RO) */
+#define AC97_PD_PR0             0x0100  /* Power down PCM ADCs and input MUX */
+#define AC97_PD_PR1             0x0200  /* Power down PCM front DAC */
+#define AC97_PD_PR2             0x0400  /* Power down Mixer (Vref still on) */
+#define AC97_PD_PR3             0x0800  /* Power down Mixer (Vref off) */
+#define AC97_PD_PR4             0x1000  /* Power down AC-Link */
+#define AC97_PD_PR5             0x2000  /* Disable internal clock usage */
+#define AC97_PD_PR6             0x4000  /* Headphone amplifier */
+#define AC97_PD_EAPD            0x8000  /* External Amplifer Power Down (EAPD) */
+
 /* extended audio ID bit defines */
 #define AC97_EI_VRA             0x0001  /* Variable bit rate supported */
@@ -266 +281 @@
 /* specific - Analog Devices */
 #define AC97_AD_TEST            0x5a    /* test register */
+#define AC97_AD_TEST2           0x5c    /* undocumented test register 2 */
 #define AC97_AD_CODEC_CFG       0x70    /* codec configuration */
 #define AC97_AD_JACK_SPDIF      0x72    /* Jack Sense & S/PDIF */
@@ -359 +375 @@
 #define AC97_SCAP_DETECT_BY_VENDOR (1<<8) /* use vendor registers for read tests */
 #define AC97_SCAP_NO_SPDIF      (1<<9)  /* don't build SPDIF controls */
+#define AC97_SCAP_EAPD_LED      (1<<10) /* EAPD as mute LED */
 
 /* ac97->flags */
@@ -379 +396 @@
 #define AC97_HAS_NO_TONE        (1<<16) /* no Tone volume */
 #define AC97_HAS_NO_STD_PCM     (1<<17) /* no standard AC97 PCM volume and mute */
+#define AC97_HAS_NO_AUX         (1<<18) /* no standard AC97 AUX volume and mute */
 
 /* rates indexes */
@@ -489 +507 @@
         /* jack-sharing info */
         unsigned char indep_surround;
-        unsigned char channel_mode;
+        unsigned char channel_mode;
+
+#ifdef CONFIG_SND_AC97_POWER_SAVE
+        unsigned int power_up;  /* power states */
+        struct workqueue_struct *power_workq;
+        struct work_struct power_work;
+#endif
         struct device dev;
 };
@@ -531 +555 @@
 int snd_ac97_update(struct snd_ac97 *ac97, unsigned short reg, unsigned short value);
 int snd_ac97_update_bits(struct snd_ac97 *ac97, unsigned short reg, unsigned short mask, unsigned short value);
+#ifdef CONFIG_SND_AC97_POWER_SAVE
+int snd_ac97_update_power(struct snd_ac97 *ac97, int reg, int powerup);
+#else
+static inline int snd_ac97_update_power(struct snd_ac97 *ac97, int reg,
+                                        int powerup)
+{
+        return 0;
+}
+#endif
 #ifdef CONFIG_PM
 void snd_ac97_suspend(struct snd_ac97 *ac97);
@@ -588 +621 @@
     unsigned int spdif;            /* spdif pcm */
 #endif
-        unsigned short aslots;             /* active slots */
-        unsigned int rates;                /* available rates */
+    unsigned short aslots;                 /* active slots */
+    unsigned short cur_dbl;                /* current double-rate state */
+    unsigned int rates;            /* available rates */
         struct {
                 unsigned short slots;      /* driver input: requested AC97 slot numbers */

GPL/trunk/alsa-kernel/include/sound/asound.h

@@ -714 +714 @@
  ****************************************************************************/
 
-#define SNDRV_CTL_VERSION               SNDRV_PROTOCOL_VERSION(2, 0, 3)
+#define SNDRV_CTL_VERSION               SNDRV_PROTOCOL_VERSION(2, 0, 4)
 
 struct snd_ctl_card_info {
@@ -844 +844 @@
 };
 
+struct snd_ctl_tlv {
+    unsigned int numid; /* control element numeric identification */
+    unsigned int length;        /* in bytes aligned to 4 */
+    unsigned int tlv[1];        /* first TLV */
+};
+
 enum {
         SNDRV_CTL_IOCTL_PVERSION = _IOR('U', 0x00, int),
@@ -856 +862 @@
         SNDRV_CTL_IOCTL_ELEM_ADD = _IOWR('U', 0x17, struct snd_ctl_elem_info),
         SNDRV_CTL_IOCTL_ELEM_REPLACE = _IOWR('U', 0x18, struct snd_ctl_elem_info),
-        SNDRV_CTL_IOCTL_ELEM_REMOVE = _IOWR('U', 0x19, struct snd_ctl_elem_id),
+        SNDRV_CTL_IOCTL_ELEM_REMOVE = _IOWR('U', 0x19, struct snd_ctl_elem_id),
+        SNDRV_CTL_IOCTL_TLV_READ = _IOWR('U', 0x1a, struct snd_ctl_tlv),
         SNDRV_CTL_IOCTL_HWDEP_NEXT_DEVICE = _IOWR('U', 0x20, int),
         SNDRV_CTL_IOCTL_HWDEP_INFO = _IOR('U', 0x21, struct snd_hwdep_info),

GPL/trunk/alsa-kernel/include/sound/compat_22.h

@@ -122 +122 @@
 #define list_for_each_safe(pos, npos, head) \
         for (pos = (head)->next, npos = pos->next ; pos != (head); pos = npos, npos = pos->next)
+
+/**
+ * list_for_each_entry  -       iterate over list of given type
+ * @pos:        the type * to use as a loop counter.
+ * @head:       the head for your list.
+ * @member:     the name of the list_struct within the struct.
+ */
+#define list_for_each_entry(pos, head, member)                          \
+        for (pos = list_entry((head)->next, typeof(*pos), member);      \
+             pos->member.next, &pos->member != (head);  \
+             pos = list_entry(pos->member.next, typeof(*pos), member))
 
 #ifndef IORESOURCE_IO

GPL/trunk/alsa-kernel/include/sound/control.h

@@ -40 +40 @@
     snd_kcontrol_get_t *get;
     snd_kcontrol_put_t *put;
+    unsigned int *tlv;
     unsigned long private_value;
 };
@@ -55 +56 @@
         snd_kcontrol_info_t *info;
         snd_kcontrol_get_t *get;
-        snd_kcontrol_put_t *put;
+        snd_kcontrol_put_t *put;
+        unsigned int *tlv;
         unsigned long private_value;
 #ifdef TARGET_OS2

GPL/trunk/alsa-kernel/include/sound/mpu401.h

@@ -46 +46 @@
 #define MPU401_HW_AUREAL                19      /* Aureal Vortex */
 
+#define MPU401_INFO_INPUT       (1 << 0)        /* input stream */
+#define MPU401_INFO_OUTPUT      (1 << 1)        /* output stream */
+#define MPU401_INFO_INTEGRATED  (1 << 2)        /* integrated h/w port */
+#define MPU401_INFO_MMIO        (1 << 3)        /* MMIO access */
+#define MPU401_INFO_TX_IRQ      (1 << 4)        /* independent TX irq */
+
 #define MPU401_MODE_BIT_INPUT           0
 #define MPU401_MODE_BIT_OUTPUT          1
@@ -62 +68 @@
         struct snd_rawmidi *rmidi;
 
-        unsigned short hardware;        /* MPU401_HW_XXXX */
+        unsigned short hardware;        /* MPU401_HW_XXXX */
+        unsigned int info_flags;        /* MPU401_INFO_XXX */
         unsigned long port;             /* base port of MPU-401 chip */
         unsigned long cport;            /* port + 1 (usually) */
@@ -100 +107 @@
  */
 
-irqreturn_t snd_mpu401_uart_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+irqreturn_t snd_mpu401_uart_interrupt(int irq, void *dev_id,
+                                      struct pt_regs *regs);
+irqreturn_t snd_mpu401_uart_interrupt_tx(int irq, void *dev_id,
+                                         struct pt_regs *regs);
 
 int snd_mpu401_uart_new(struct snd_card *card,
                         int device,
                         unsigned short hardware,
-                        unsigned long port,
-                        int integrated,
+                        unsigned long port,
+                        unsigned int info_flags,
                         int irq,
                         int irq_flags,

GPL/trunk/alsa-kernel/pci/ac97/ac97_codec.c

@@ -47 +47 @@
 MODULE_PARM_DESC(enable_loopback, "Enable AC97 ADC/DAC Loopback Control");
 
+#ifdef CONFIG_SND_AC97_POWER_SAVE
+static int power_save = 1;
+//module_param(power_save, bool, 0644);
+MODULE_PARM_DESC(power_save, "Enable AC97 power-saving control");
+#endif
 /*
 
@@ -152 +157 @@
 { 0x4e534350, 0xffffffff, "LM4550",             NULL,           NULL },
 { 0x4e534350, 0xffffffff, "LM4550",             patch_lm4550,   NULL }, // volume wrap fix
-{ 0x50534304, 0xffffffff, "UCB1400",            NULL,           NULL },
+{ 0x50534304, 0xffffffff, "UCB1400",            patch_ucb1400,  NULL },
 { 0x53494c20, 0xffffffe0, "Si3036,8",           mpatch_si3036,  mpatch_si3036, AC97_MODEM_PATCH },
 { 0x54524102, 0xffffffff, "TR28022",            NULL,           NULL },
@@ -186 +191 @@
 };
 
+static void update_power_regs(struct snd_ac97 *ac97);
 
 /*
@@ -543 +549 @@
         }
         err = snd_ac97_update_bits(ac97, reg, val_mask, val);
-        snd_ac97_page_restore(ac97, page_save);
+        snd_ac97_page_restore(ac97, page_save);
+#ifdef CONFIG_SND_AC97_POWER_SAVE
+        /* check analog mixer power-down */
+        if ((val_mask & 0x8000) &&
+            (kcontrol->private_value & (1<<30))) {
+                if (val & 0x8000)
+                        ac97->power_up &= ~(1 << (reg>>1));
+                else
+                        ac97->power_up |= 1 << (reg>>1);
+                if (power_save)
+                        update_power_regs(ac97);
+        }
+#endif
         return err;
 }
@@ -951 +969 @@
 static int snd_ac97_free(struct snd_ac97 *ac97)
 {
-        if (ac97) {
-                snd_ac97_proc_done(ac97);
-                if (ac97->bus)
-                        ac97->bus->codec[ac97->num] = NULL;
-                if (ac97->private_free)
-                        ac97->private_free(ac97);
-                kfree(ac97);
-        }
-        return 0;
+    if (ac97) {
+#ifdef CONFIG_SND_AC97_POWER_SAVE
+        if (ac97->power_workq)
+            destroy_workqueue(ac97->power_workq);
+#endif
+        snd_ac97_proc_done(ac97);
+        if (ac97->bus)
+            ac97->bus->codec[ac97->num] = NULL;
+        if (ac97->private_free)
+            ac97->private_free(ac97);
+        kfree(ac97);
+    }
+    return 0;
 }
 
@@ -1107 +1129 @@
  * create mute switch(es) for normal stereo controls
  */
-static int snd_ac97_cmute_new_stereo(struct snd_card *card, char *name, int reg, int check_stereo, struct snd_ac97 *ac97)
+static int snd_ac97_cmute_new_stereo(struct snd_card *card, char *name, int reg,
+                                     int check_stereo, int check_amix,
+                                     struct snd_ac97 *ac97)
 {
         struct snd_kcontrol *kctl;
@@ -1135 +1159 @@
         if (mute_mask == 0x8080) {
             tmp.private_value = reg | (15 << 8) | (7 << 12) | (1 << 16) | (1 << 24);
+            if (check_amix)
+                tmp.private_value |= (1 << 30);
         } else {
             tmp.private_value = reg | (15 << 8) | (1 << 16) | (1 << 24);
+            if (check_amix)
+                tmp.private_value |= (1 << 30);
         }
         kctl = snd_ctl_new1(&tmp, ac97);
@@ -1212 +1240 @@
  * create a mute-switch and a volume for normal stereo/mono controls
  */
-static int snd_ac97_cmix_new_stereo(struct snd_card *card, const char *pfx, int reg, int check_stereo, struct snd_ac97 *ac97)
+static int snd_ac97_cmix_new_stereo(struct snd_card *card, const char *pfx,
+                                    int reg, int check_stereo, int check_amix,
+                                    struct snd_ac97 *ac97)
 {
         int err;
@@ -1222 +1252 @@
 
         if (snd_ac97_try_bit(ac97, reg, 15)) {
-                sprintf(name, "%s Switch", pfx);
-                if ((err = snd_ac97_cmute_new_stereo(card, name, reg, check_stereo, ac97)) < 0)
+            sprintf(name, "%s Switch", pfx);
+            if ((err = snd_ac97_cmute_new_stereo(card, name, reg,
+                                                 check_stereo, check_amix,
+                                                 ac97)) < 0)
                         return err;
         }
@@ -1235 +1267 @@
 }
 
-#define snd_ac97_cmix_new(card, pfx, reg, ac97) snd_ac97_cmix_new_stereo(card, pfx, reg, 0, ac97)
-#define snd_ac97_cmute_new(card, name, reg, ac97)       snd_ac97_cmute_new_stereo(card, name, reg, 0, ac97)
+#define snd_ac97_cmix_new(card, pfx, reg, acheck, ac97) \
+        snd_ac97_cmix_new_stereo(card, pfx, reg, 0, acheck, ac97)
+#define snd_ac97_cmute_new(card, name, reg, acheck, ac97) \
+        snd_ac97_cmute_new_stereo(card, name, reg, 0, acheck, ac97)
 
 static unsigned int snd_ac97_determine_spdif_rates(struct snd_ac97 *ac97);
@@ -1252 +1286 @@
         if (snd_ac97_try_volume_mix(ac97, AC97_MASTER)) {
 #ifndef TARGET_OS2
-                if (ac97->flags & AC97_HAS_NO_MASTER_VOL)
-                        err = snd_ac97_cmute_new(card, "Master Playback Switch", AC97_MASTER, ac97);
-                else
+            if (ac97->flags & AC97_HAS_NO_MASTER_VOL)
+                err = snd_ac97_cmute_new(card, "Master Playback Switch",
+                                         AC97_MASTER, 0, ac97);
+            else
 #endif
-                        err = snd_ac97_cmix_new(card, "Master Playback", AC97_MASTER, ac97);
-                if (err < 0)
-                        return err;
+                err = snd_ac97_cmix_new(card, "Master Playback",
+                                        AC97_MASTER, 0, ac97);
+            if (err < 0)
+                return err;
         }
 
         ac97->regs[AC97_CENTER_LFE_MASTER] = 0x8080;
 
-        /* build center controls */
-        if (snd_ac97_try_volume_mix(ac97, AC97_CENTER_LFE_MASTER)) {
+        /* build center controls */
+        if ((snd_ac97_try_volume_mix(ac97, AC97_CENTER_LFE_MASTER))
+            && !(ac97->flags & AC97_AD_MULTI)) {
                 if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_center[0], ac97))) < 0)
                         return err;
@@ -1275 +1312 @@
         }
 
-        /* build LFE controls */
-        if (snd_ac97_try_volume_mix(ac97, AC97_CENTER_LFE_MASTER+1)) {
+        /* build LFE controls */
+        if ((snd_ac97_try_volume_mix(ac97, AC97_CENTER_LFE_MASTER+1))
+            && !(ac97->flags & AC97_AD_MULTI)) {
                 if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_lfe[0], ac97))) < 0)
                         return err;
@@ -1287 +1325 @@
         }
 
-        /* build surround controls */
-        if (snd_ac97_try_volume_mix(ac97, AC97_SURROUND_MASTER)) {
-                /* Surround Master (0x38) is with stereo mutes */
-                if ((err = snd_ac97_cmix_new_stereo(card, "Surround Playback", AC97_SURROUND_MASTER, 1, ac97)) < 0)
+        /* build surround controls */
+        if ((snd_ac97_try_volume_mix(ac97, AC97_SURROUND_MASTER))
+            && !(ac97->flags & AC97_AD_MULTI)) {
+            /* Surround Master (0x38) is with stereo mutes */
+            if ((err = snd_ac97_cmix_new_stereo(card, "Surround Playback",
+                                                AC97_SURROUND_MASTER, 1, 0,
+                                                ac97)) < 0)
                         return err;
         }
 
         /* build headphone controls */
-        if (snd_ac97_try_volume_mix(ac97, AC97_HEADPHONE)) {
-                if ((err = snd_ac97_cmix_new(card, "Headphone Playback", AC97_HEADPHONE, ac97)) < 0)
-                        return err;
+        if (snd_ac97_try_volume_mix(ac97, AC97_HEADPHONE)) {
+            if ((err = snd_ac97_cmix_new(card, "Headphone Playback",
+                                         AC97_HEADPHONE, 0, ac97)) < 0)
+                return err;
         }
 
         /* build master mono controls */
-        if (snd_ac97_try_volume_mix(ac97, AC97_MASTER_MONO)) {
-                if ((err = snd_ac97_cmix_new(card, "Master Mono Playback", AC97_MASTER_MONO, ac97)) < 0)
-                        return err;
+        if (snd_ac97_try_volume_mix(ac97, AC97_MASTER_MONO)) {
+            if ((err = snd_ac97_cmix_new(card, "Master Mono Playback",
+                                         AC97_MASTER_MONO, 0, ac97)) < 0)
+                return err;
         }
 
@@ -1334 +1377 @@
         /* build Phone controls */
         if (!(ac97->flags & AC97_HAS_NO_PHONE)) {
-                if (snd_ac97_try_volume_mix(ac97, AC97_PHONE)) {
-                        if ((err = snd_ac97_cmix_new(card, "Phone Playback", AC97_PHONE, ac97)) < 0)
-                                return err;
-                }
-        }
+            if (snd_ac97_try_volume_mix(ac97, AC97_PHONE)) {
+                if ((err = snd_ac97_cmix_new(card, "Phone Playback",
+                                             AC97_PHONE, 1, ac97)) < 0)
+                    return err;
+            }
+        }
 
         /* build MIC controls */
         if (!(ac97->flags & AC97_HAS_NO_MIC)) {
-                if (snd_ac97_try_volume_mix(ac97, AC97_MIC)) {
-                        if ((err = snd_ac97_cmix_new(card, "Mic Playback", AC97_MIC, ac97)) < 0)
-                                return err;
-                        if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_mic_boost, ac97))) < 0)
-                                return err;
-                }
-        }
+            if (snd_ac97_try_volume_mix(ac97, AC97_MIC)) {
+                if ((err = snd_ac97_cmix_new(card, "Mic Playback",
+                                             AC97_MIC, 1, ac97)) < 0)
+                    return err;
+                if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_mic_boost, ac97))) < 0)
+                    return err;
+            }
+        }
 
         /* build Line controls */
-        if (snd_ac97_try_volume_mix(ac97, AC97_LINE)) {
-                if ((err = snd_ac97_cmix_new(card, "Line Playback", AC97_LINE, ac97)) < 0)
-                        return err;
+        if (snd_ac97_try_volume_mix(ac97, AC97_LINE)) {
+            if ((err = snd_ac97_cmix_new(card, "Line Playback",
+                                         AC97_LINE, 1, ac97)) < 0)
+                return err;
         }
 
         /* build CD controls */
         if (!(ac97->flags & AC97_HAS_NO_CD)) {
-                if (snd_ac97_try_volume_mix(ac97, AC97_CD)) {
-                        if ((err = snd_ac97_cmix_new(card, "CD Playback", AC97_CD, ac97)) < 0)
-                                return err;
-                }
-        }
+            if (snd_ac97_try_volume_mix(ac97, AC97_CD)) {
+                if ((err = snd_ac97_cmix_new(card, "CD Playback",
+                                             AC97_CD, 1, ac97)) < 0)
+                    return err;
+            }
+        }
 
         /* build Video controls */
         if (!(ac97->flags & AC97_HAS_NO_VIDEO)) {
-                if (snd_ac97_try_volume_mix(ac97, AC97_VIDEO)) {
-                        if ((err = snd_ac97_cmix_new(card, "Video Playback", AC97_VIDEO, ac97)) < 0)
-                                return err;
-                }
-        }
-
-        /* build Aux controls */
-        if (snd_ac97_try_volume_mix(ac97, AC97_AUX)) {
-                if ((err = snd_ac97_cmix_new(card, "Aux Playback", AC97_AUX, ac97)) < 0)
-                        return err;
+            if (snd_ac97_try_volume_mix(ac97, AC97_VIDEO)) {
+                if ((err = snd_ac97_cmix_new(card, "Video Playback",
+                                             AC97_VIDEO, 1, ac97)) < 0)
+                    return err;
+            }
+        }
+
+        /* build Aux controls */
+        if (!(ac97->flags & AC97_HAS_NO_AUX)) {
+            if (snd_ac97_try_volume_mix(ac97, AC97_AUX)) {
+                if ((err = snd_ac97_cmix_new(card, "Aux Playback",
+                                             AC97_AUX, 1, ac97)) < 0)
+                    return err;
+            }
         }
 
@@ -1408 +1459 @@
             if (!(ac97->flags & AC97_HAS_NO_STD_PCM)) {
 #ifndef TARGET_OS2
-                        if (ac97->flags & AC97_HAS_NO_PCM_VOL)
-                                err = snd_ac97_cmute_new(card, "PCM Playback Switch", AC97_PCM, ac97);
-                        else
+                if (ac97->flags & AC97_HAS_NO_PCM_VOL)
+                    err = snd_ac97_cmute_new(card,
+                                             "PCM Playback Switch",
+                                             AC97_PCM, 0, ac97);
+                else
 #endif
-                                err = snd_ac97_cmix_new(card, "PCM Playback", AC97_PCM, ac97);
-                        if (err < 0)
-                                return err;
-                }
+                    err = snd_ac97_cmix_new(card, "PCM Playback",
+                                            AC97_PCM, 0, ac97);
+                if (err < 0)
+                    return err;
+            }
         }
 
@@ -1422 +1476 @@
                 if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_control_capture_src, ac97))) < 0)
                         return err;
-                if (snd_ac97_try_bit(ac97, AC97_REC_GAIN, 15)) {
-                        if ((err = snd_ac97_cmute_new(card, "Capture Switch", AC97_REC_GAIN, ac97)) < 0)
-                                return err;
+                if (snd_ac97_try_bit(ac97, AC97_REC_GAIN, 15)) {
+                    err = snd_ac97_cmute_new(card, "Capture Switch",
+                                             AC97_REC_GAIN, 0, ac97);
+                    if (err < 0)
+                        return err;
                 }
                 if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_control_capture_vol, ac97))) < 0)
@@ -1858 +1914 @@
 static struct snd_ac97_build_ops null_build_ops;
 
+#ifdef CONFIG_SND_AC97_POWER_SAVE
+static void do_update_power(void *data)
+{
+    update_power_regs(data);
+}
+#endif
+
 /**
  * snd_ac97_mixer - create an Codec97 component
@@ -1912 +1975 @@
         init_MUTEX(&ac97->reg_mutex);
         init_MUTEX(&ac97->page_mutex);
-
+#ifdef CONFIG_SND_AC97_POWER_SAVE
+        ac97->power_workq = create_workqueue("ac97");
+        INIT_WORK(&ac97->power_work, do_update_power, ac97);
+#endif
 #ifdef CONFIG_PCI
         if (ac97->pci) {
@@ -2146 +2212 @@
                 }
         }
-        /* make sure the proper powerdown bits are cleared */
-        if (ac97->scaps && ac97_is_audio(ac97)) {
-                reg = snd_ac97_read(ac97, AC97_EXTENDED_STATUS);
-                if (ac97->scaps & AC97_SCAP_SURROUND_DAC)
-                        reg &= ~AC97_EA_PRJ;
-                if (ac97->scaps & AC97_SCAP_CENTER_LFE_DAC)
-                        reg &= ~(AC97_EA_PRI | AC97_EA_PRK);
-                snd_ac97_write_cache(ac97, AC97_EXTENDED_STATUS, reg);
-        }
+        /* make sure the proper powerdown bits are cleared */
+        if (ac97_is_audio(ac97))
+            update_power_regs(ac97);
         snd_ac97_proc_init(ac97);
         if ((err = snd_device_new(card, SNDRV_DEV_CODEC, ac97, &ops)) < 0) {
@@ -2181 +2241 @@
         }
 
-        power = ac97->regs[AC97_POWERDOWN] | 0x8000;    /* EAPD */
-        power |= 0x4000;        /* Headphone amplifier powerdown */
-        power |= 0x0300;        /* ADC & DAC powerdown */
+/* surround, CLFE, mic powerdown */
+        power = ac97->regs[AC97_EXTENDED_STATUS];
+        if (ac97->scaps & AC97_SCAP_SURROUND_DAC)
+                power |= AC97_EA_PRJ;
+        if (ac97->scaps & AC97_SCAP_CENTER_LFE_DAC)
+                power |= AC97_EA_PRI | AC97_EA_PRK;
+        power |= AC97_EA_PRL;
+        snd_ac97_write(ac97, AC97_EXTENDED_STATUS, power);
+
+        /* powerdown external amplifier */
+        if (ac97->scaps & AC97_SCAP_INV_EAPD)
+                power = ac97->regs[AC97_POWERDOWN] & ~AC97_PD_EAPD;
+        else if (! (ac97->scaps & AC97_SCAP_EAPD_LED))
+                power = ac97->regs[AC97_POWERDOWN] | AC97_PD_EAPD;
+        power |= AC97_PD_PR6;   /* Headphone amplifier powerdown */
+        power |= AC97_PD_PR0 | AC97_PD_PR1;     /* ADC & DAC powerdown */
         snd_ac97_write(ac97, AC97_POWERDOWN, power);
         udelay(100);
-        power |= 0x0400;        /* Analog Mixer powerdown (Vref on) */
-        snd_ac97_write(ac97, AC97_POWERDOWN, power);
-        udelay(100);
-#if 0
-        /* FIXME: this causes click noises on some boards at resume */
-        power |= 0x3800;        /* AC-link powerdown, internal Clk disable */
-        snd_ac97_write(ac97, AC97_POWERDOWN, power);
+        power |= AC97_PD_PR2 | AC97_PD_PR3;     /* Analog Mixer powerdown */
+        snd_ac97_write(ac97, AC97_POWERDOWN, power);
+#ifdef CONFIG_SND_AC97_POWER_SAVE
+        if (power_save) {
+            udelay(100);
+            /* AC-link powerdown, internal Clk disable */
+            /* FIXME: this may cause click noises on some boards */
+            power |= AC97_PD_PR4 | AC97_PD_PR5;
+            snd_ac97_write(ac97, AC97_POWERDOWN, power);
+        }
 #endif
 }
 
+
+struct ac97_power_reg {
+    unsigned short reg;
+    unsigned short power_reg;
+    unsigned short mask;
+};
+
+enum { PWIDX_ADC, PWIDX_FRONT, PWIDX_CLFE, PWIDX_SURR, PWIDX_MIC, PWIDX_SIZE };
+
+static struct ac97_power_reg power_regs[PWIDX_SIZE] = {
+    [PWIDX_ADC] = { AC97_PCM_LR_ADC_RATE, AC97_POWERDOWN, AC97_PD_PR0},
+    [PWIDX_FRONT] = { AC97_PCM_FRONT_DAC_RATE, AC97_POWERDOWN, AC97_PD_PR1},
+    [PWIDX_CLFE] = { AC97_PCM_LFE_DAC_RATE, AC97_EXTENDED_STATUS,
+    AC97_EA_PRI | AC97_EA_PRK},
+    [PWIDX_SURR] = { AC97_PCM_SURR_DAC_RATE, AC97_EXTENDED_STATUS,
+    AC97_EA_PRJ},
+    [PWIDX_MIC] = { AC97_PCM_MIC_ADC_RATE, AC97_EXTENDED_STATUS,
+    AC97_EA_PRL},
+};
+
+#ifdef CONFIG_SND_AC97_POWER_SAVE
+/**
+ * snd_ac97_update_power - update the powerdown register
+ * @ac97: the codec instance
+ * @reg: the rate register, e.g. AC97_PCM_FRONT_DAC_RATE
+ * @powerup: non-zero when power up the part
+ *
+ * Update the AC97 powerdown register bits of the given part.
+ */
+int snd_ac97_update_power(struct snd_ac97 *ac97, int reg, int powerup)
+{
+    int i;
+
+    if (! ac97)
+        return 0;
+
+    if (reg) {
+        /* SPDIF requires DAC power, too */
+        if (reg == AC97_SPDIF)
+            reg = AC97_PCM_FRONT_DAC_RATE;
+        for (i = 0; i < PWIDX_SIZE; i++) {
+            if (power_regs[i].reg == reg) {
+                if (powerup)
+                    ac97->power_up |= (1 << i);
+                else
+                    ac97->power_up &= ~(1 << i);
+                break;
+            }
+        }
+    }
+
+    if (! power_save)
+        return 0;
+
+    if (! powerup && ac97->power_workq)
+        /* adjust power-down bits after two seconds delay
+         * (for avoiding loud click noises for many (OSS) apps
+         *  that open/close frequently)
+         */
+        queue_delayed_work(ac97->power_workq, &ac97->power_work, HZ*2);
+    else
+        update_power_regs(ac97);
+
+    return 0;
+}
+
+EXPORT_SYMBOL(snd_ac97_update_power);
+#endif /* CONFIG_SND_AC97_POWER_SAVE */
+
+static void update_power_regs(struct snd_ac97 *ac97)
+{
+    unsigned int power_up, bits;
+    int i;
+
+#ifdef CONFIG_SND_AC97_POWER_SAVE
+    if (power_save)
+        power_up = ac97->power_up;
+    else {
+#endif
+        power_up = (1 << PWIDX_FRONT) | (1 << PWIDX_ADC);
+        power_up |= (1 << PWIDX_MIC);
+        if (ac97->scaps & AC97_SCAP_SURROUND_DAC)
+            power_up |= (1 << PWIDX_SURR);
+        if (ac97->scaps & AC97_SCAP_CENTER_LFE_DAC)
+            power_up |= (1 << PWIDX_CLFE);
+#ifdef CONFIG_SND_AC97_POWER_SAVE
+    }
+#endif
+    if (power_up) {
+        if (ac97->regs[AC97_POWERDOWN] & AC97_PD_PR2) {
+            /* needs power-up analog mix and vref */
+            snd_ac97_update_bits(ac97, AC97_POWERDOWN,
+                                 AC97_PD_PR3, 0);
+            msleep(1);
+            snd_ac97_update_bits(ac97, AC97_POWERDOWN,
+                                 AC97_PD_PR2, 0);
+        }
+    }
+    for (i = 0; i < PWIDX_SIZE; i++) {
+        if (power_up & (1 << i))
+            bits = 0;
+        else
+            bits = power_regs[i].mask;
+        snd_ac97_update_bits(ac97, power_regs[i].power_reg,
+                             power_regs[i].mask, bits);
+    }
+    if (! power_up) {
+        if (! (ac97->regs[AC97_POWERDOWN] & AC97_PD_PR2)) {
+            /* power down analog mix and vref */
+            snd_ac97_update_bits(ac97, AC97_POWERDOWN,
+                                 AC97_PD_PR2, AC97_PD_PR2);
+            snd_ac97_update_bits(ac97, AC97_POWERDOWN,
+                                 AC97_PD_PR3, AC97_PD_PR3);
+        }
+    }
+}
 
 #ifdef CONFIG_PM
@@ -2507 +2699 @@
         msw->put = master_mute_sw_put;
         snd_ac97_remove_ctl(ac97, "External Amplifier", NULL);
-        snd_ac97_update_bits(ac97, AC97_POWERDOWN, 0x8000, 0x8000); /* mute LED on */
+        snd_ac97_update_bits(ac97, AC97_POWERDOWN, 0x8000, 0x8000); /* mute LED on */
+        ac97->scaps |= AC97_SCAP_EAPD_LED;
         return 0;
 }

GPL/trunk/alsa-kernel/pci/ac97/ac97_patch.c

@@ -461 +461 @@
 int patch_wolfson05(struct snd_ac97 * ac97)
 {
-        /* WM9705, WM9710 */
-        ac97->build_ops = &patch_wolfson_wm9705_ops;
-        return 0;
+    /* WM9705, WM9710 */
+    ac97->build_ops = &patch_wolfson_wm9705_ops;
+#ifdef CONFIG_TOUCHSCREEN_WM9705
+    /* WM9705 touchscreen uses AUX and VIDEO for touch */
+    ac97->flags |= AC97_HAS_NO_VIDEO | AC97_HAS_NO_AUX;
+#endif
+    return 0;
 }
 
@@ -1366 +1370 @@
         snd_ac97_restore_iec958(ac97);
 }
+
+static void ad1888_resume(struct snd_ac97 *ac97)
+{
+    ad18xx_resume(ac97);
+    snd_ac97_write_cache(ac97, AC97_CODEC_CLASS_REV, 0x8080);
+}
+
 #endif
 
@@ -1626 +1637 @@
  */
 static unsigned int ad1981_jacks_blacklist[] = {
-        0x10140554, /* Thinkpad T42p/R50p */
-        0 /* end */
+    0x10140537, /* Thinkpad T41p */
+    0x10140554, /* Thinkpad T42p/R50p */
+    0 /* end */
 };
 
@@ -1810 +1822 @@
                 .get = snd_ac97_ad1888_lohpsel_get,
                 .put = snd_ac97_ad1888_lohpsel_put
-        },
+        },
+        AC97_SINGLE("V_REFOUT Enable", AC97_AD_MISC, 2, 1, 1),
+        AC97_SINGLE("High Pass Filter Enable", AC97_AD_TEST2, 12, 1, 1),
         AC97_SINGLE("Spread Front to Surround and Center/LFE", AC97_AD_MISC, 7, 1, 0),
         {
@@ -1838 +1852 @@
         .build_specific = patch_ad1888_specific,
 #ifdef CONFIG_PM
-        .resume = ad18xx_resume,
+        .resume = ad1888_resume,
 #endif
         .update_jacks = ad1888_update_jacks,
@@ -2046 +2060 @@
         /* Enable SPDIF-IN only on Rev.E and above */
         val = snd_ac97_read(ac97, AC97_ALC650_CLOCK);
-        /* SPDIF IN with pin 47 */
-        if (ac97->spec.dev_flags)
-                val |= 0x03; /* enable */
-        else
-                val &= ~0x03; /* disable */
+        /* SPDIF IN with pin 47 */
+        if (ac97->spec.dev_flags &&
+            /* ASUS A6KM requires EAPD */
+            ! (ac97->subsystem_vendor == 0x1043 &&
+               ac97->subsystem_device == 0x1103))
+            val |= 0x03; /* enable */
+        else
+            val &= ~0x03; /* disable */
         snd_ac97_write_cache(ac97, AC97_ALC650_CLOCK, val);
 
@@ -2855 +2872 @@
 }
 
+/*
+ *  UCB1400 codec (http://www.semiconductors.philips.com/acrobat_download/datasheets/UCB1400-02.pdf)
+ */
+static const struct snd_kcontrol_new snd_ac97_controls_ucb1400[] = {
+    /* enable/disable headphone driver which allows direct connection to
+     stereo headphone without the use of external DC blocking
+     capacitors */
+    AC97_SINGLE("Headphone Driver", 0x6a, 6, 1, 0),
+    /* Filter used to compensate the DC offset is added in the ADC to remove idle
+     tones from the audio band. */
+    AC97_SINGLE("DC Filter", 0x6a, 4, 1, 0),
+    /* Control smart-low-power mode feature. Allows automatic power down
+     of unused blocks in the ADC analog front end and the PLL. */
+    AC97_SINGLE("Smart Low Power Mode", 0x6c, 4, 3, 0),
+};
+
+static int patch_ucb1400_specific(struct snd_ac97 * ac97)
+{
+    int idx, err;
+    for (idx = 0; idx < ARRAY_SIZE(snd_ac97_controls_ucb1400); idx++)
+        if ((err = snd_ctl_add(ac97->bus->card, snd_ctl_new1(&snd_ac97_controls_ucb1400[idx], ac97))) < 0)
+            return err;
+    return 0;
+}
+
+static struct snd_ac97_build_ops patch_ucb1400_ops = {
+    .build_specific     = patch_ucb1400_specific,
+};
+
+int patch_ucb1400(struct snd_ac97 * ac97)
+{
+    ac97->build_ops = &patch_ucb1400_ops;
+    /* enable headphone driver and smart low power mode by default */
+    snd_ac97_write(ac97, 0x6a, 0x0050);
+    snd_ac97_write(ac97, 0x6c, 0x0030);
+    return 0;
+}

GPL/trunk/alsa-kernel/pci/ac97/ac97_patch.h

@@ -59 +59 @@
 int patch_vt1617a(struct snd_ac97 * ac97);
 int patch_it2646(struct snd_ac97 * ac97);
+int patch_ucb1400(struct snd_ac97 * ac97);
 int mpatch_si3036(struct snd_ac97 * ac97);
 int patch_lm4550(struct snd_ac97 * ac97);

GPL/trunk/alsa-kernel/pci/ac97/ac97_pcm.c

@@ -259 +259 @@
         int dbl;
         unsigned int tmp;
-        
+
         dbl = rate > 48000;
         if (dbl) {
@@ -268 +268 @@
         }
 
+        snd_ac97_update_power(ac97, reg, 1);
         switch (reg) {
         case AC97_PCM_MIC_ADC_RATE:
@@ -600 +601 @@
                         goto error;
                 }
-        }
+        }
+        pcm->cur_dbl = r;
         spin_unlock_irq(&pcm->bus->bus_lock);
         for (i = 3; i < 12; i++) {
@@ -640 +642 @@
 int snd_ac97_pcm_close(struct ac97_pcm *pcm)
 {
-        struct snd_ac97_bus *bus;
-        unsigned short slots = pcm->aslots;
-        int i, cidx;
-
-        bus = pcm->bus;
-        spin_lock_irq(&pcm->bus->bus_lock);
-        for (i = 3; i < 12; i++) {
-                if (!(slots & (1 << i)))
-                        continue;
-                for (cidx = 0; cidx < 4; cidx++)
-                        bus->used_slots[pcm->stream][cidx] &= ~(1 << i);
-        }
-        pcm->aslots = 0;
-        spin_unlock_irq(&pcm->bus->bus_lock);
-        return 0;
+    struct snd_ac97_bus *bus;
+    unsigned short slots = pcm->aslots;
+    int i, cidx;
+
+#ifdef CONFIG_SND_AC97_POWER_SAVE
+    int r = pcm->cur_dbl;
+    for (i = 3; i < 12; i++) {
+        if (!(slots & (1 << i)))
+            continue;
+        for (cidx = 0; cidx < 4; cidx++) {
+            if (pcm->r[r].rslots[cidx] & (1 << i)) {
+                int reg = get_slot_reg(pcm, cidx, i, r);
+                snd_ac97_update_power(pcm->r[r].codec[cidx],
+                                      reg, 0);
+            }
+        }
+    }
+#endif
+
+    bus = pcm->bus;
+    spin_lock_irq(&pcm->bus->bus_lock);
+    for (i = 3; i < 12; i++) {
+        if (!(slots & (1 << i)))
+            continue;
+        for (cidx = 0; cidx < 4; cidx++)
+            bus->used_slots[pcm->stream][cidx] &= ~(1 << i);
+    }
+    pcm->aslots = 0;
+    pcm->cur_dbl = 0;
+    spin_unlock_irq(&pcm->bus->bus_lock);
+    return 0;
 }
 

GPL/trunk/alsa-kernel/pci/bt87x.c

@@ -792 +792 @@
     BT_DEVICE(879, 0x0070, 0x13eb, 32000), /* Hauppauge WinTV series */
     BT_DEVICE(878, 0x0070, 0xff01, 44100), /* Viewcast Osprey 200 */
+    /* Leadtek Winfast tv 2000xp delux */
+    BT_DEVICE(878, 0x107d, 0x6606, 32000),
+    /* Voodoo TV 200 */
+    BT_DEVICE(878, 0x121a, 0x3000, 32000),
     /* AVerMedia Studio No. 103, 203, ...? */
     BT_DEVICE(878, 0x1461, 0x0003, 48000),
-    /* Leadtek Winfast tv 2000xp delux */
-    BT_DEVICE(878, 0x107d, 0x6606, 32000),
     {0}
 };

GPL/trunk/alsa-kernel/pci/ca0106/ca0106_main.c

@@ -186 +186 @@
          /* New Audigy SE. Has a different DAC. */
          /* SB0570:
-          * CTRL:CA0106-DAT
-          * ADC: WM8768GEDS
-          * DAC: WM8775EDS
+          * CTRL:CA0106-DAT
+          * ADC: WM8775EDS
+          * DAC: WM8768GEDS
           */
          { .serial = 0x100a1102,
@@ -1181 +1181 @@
         0x02ff,
         0x0400,
-        0x0520,
-        0x0600,
+        0x0520,
+        0x0620, /* Set 24 bit. Was 0x0600 */
         0x08ff,
         0x0aff,

GPL/trunk/alsa-kernel/pci/ca0106/ca0106_mixer.c

@@ -71 +71 @@
 #include <sound/ac97_codec.h>
 #include <sound/info.h>
+#include <sound/tlv.h>
 
 #include "ca0106.h"
+
+static DECLARE_TLV_DB_SCALE(snd_ca0106_db_scale, -5150, 75, 1);
 
 static int snd_ca0106_shared_spdif_info(struct snd_kcontrol *kcontrol,
@@ -335 +338 @@
         .info = snd_ca0106_volume_info,                         \
         .get =          snd_ca0106_volume_get,                  \
-        .put =          snd_ca0106_volume_put,                  \
+    .put =          snd_ca0106_volume_put, \
+    .tlv =       snd_ca0106_db_scale,                           \
         .private_value = ((chid) << 8) | (reg)                  \
 }

GPL/trunk/alsa-kernel/pci/cmipci.c

@@ -2151 +2151 @@
     CMIPCI_SB_VOL_MONO("Phone Playback Volume", CM_REG_EXTENT_IND, 5, 7),
     CMIPCI_DOUBLE("Phone Playback Switch", CM_REG_EXTENT_IND, CM_REG_EXTENT_IND, 4, 4, 1, 0, 0),
-    CMIPCI_DOUBLE("PC Speaker Playnack Switch", CM_REG_EXTENT_IND, CM_REG_EXTENT_IND, 3, 3, 1, 0, 0),
+    CMIPCI_DOUBLE("PC Speaker Playback Switch", CM_REG_EXTENT_IND, CM_REG_EXTENT_IND, 3, 3, 1, 0, 0),
     CMIPCI_DOUBLE("Mic Boost Capture Switch", CM_REG_EXTENT_IND, CM_REG_EXTENT_IND, 0, 0, 1, 0, 0),
 };
@@ -2941 +2941 @@
     if (iomidi > 0) {
         if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_CMIPCI,
-                                       iomidi, integrated_midi,
+                                       iomidi,
+                                       (integrated_midi ?
+                                        MPU401_INFO_INTEGRATED : 0),
                                        cm->irq, 0, &cm->rmidi)) < 0) {
             printk(KERN_ERR "cmipci: no UART401 device at 0x%lx\n", iomidi);

GPL/trunk/alsa-kernel/pci/cs4281.c

@@ -1426 +1426 @@
     chip->ba0_addr = pci_resource_start(pci, 0);
     chip->ba1_addr = pci_resource_start(pci, 1);
-    if (request_irq(pci->irq, snd_cs4281_interrupt, SA_INTERRUPT|SA_SHIRQ, "CS4281", (void *)chip)) {
-        snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
-        snd_cs4281_free(chip);
-        return -ENOMEM;
-    }
-    chip->irq = pci->irq;
-
     chip->ba0 = (unsigned long) ioremap_nocache(chip->ba0_addr, pci_resource_len(pci, 0));
     chip->ba1 = (unsigned long) ioremap_nocache(chip->ba1_addr, pci_resource_len(pci, 1));
@@ -1439 +1432 @@
         return -ENOMEM;
     }
+
+    if (request_irq(pci->irq, snd_cs4281_interrupt, SA_INTERRUPT|SA_SHIRQ, "CS4281", (void *)chip)) {
+        snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
+        snd_cs4281_free(chip);
+        return -ENOMEM;
+    }
+    chip->irq = pci->irq;
 
     tmp = snd_cs4281_chip_init(chip);

GPL/trunk/alsa-kernel/pci/cs46xx/cs46xx_lib.c

@@ -2878 +2878 @@
                 snd_cs46xx_hw_stop(chip);
 
+        if (chip->irq >= 0)
+            free_irq(chip->irq, chip);
+
         for (idx = 0; idx < 5; idx++) {
                 struct snd_cs46xx_region *region = &chip->region.idx[idx];
@@ -2884 +2887 @@
                 release_and_free_resource(region->resource);
         }
-        if (chip->irq >= 0)
-                free_irq(chip->irq, chip);
 
         if (chip->active_ctrl)

GPL/trunk/alsa-kernel/pci/es1938.c

@@ -1750 +1750 @@
                 }
         }
-        if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
-                                chip->mpu_port, 1, chip->irq, 0, &chip->rmidi) < 0) {
+        if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
+                                chip->mpu_port, MPU401_INFO_INTEGRATED,
+                                chip->irq, 0, &chip->rmidi) < 0) {
                 printk(KERN_ERR "es1938: unable to initialize MPU-401\n");
         } else {

GPL/trunk/alsa-kernel/pci/es1968.c

@@ -2776 +2776 @@
     if (enable_mpu[dev]) {
         if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
-                                       chip->io_port + ESM_MPU401_PORT, 1,
+                                       chip->io_port + ESM_MPU401_PORT,
+                                       MPU401_INFO_INTEGRATED,
                                        chip->irq, 0, &chip->rmidi)) < 0) {
             printk(KERN_WARNING "es1968: skipping MPU-401 MIDI support..\n");

GPL/trunk/alsa-kernel/pci/fm801.c

@@ -1434 +1434 @@
                 return err;
         }
-        if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_FM801,
-                                       FM801_REG(chip, MPU401_DATA), 1,
+        if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_FM801,
+                                       FM801_REG(chip, MPU401_DATA),
+                                       MPU401_INFO_INTEGRATED,
                                        chip->irq, 0, &chip->rmidi)) < 0) {
                 snd_card_free(card);

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

@@ -43 +43 @@
 
 struct hda_vendor_id {
-        unsigned int id;
-        const char *name;
+    unsigned int id;
+    const char *name;
 };
 
 /* codec vendor labels */
 static struct hda_vendor_id hda_vendor_ids[] = {
-        { 0x10ec, "Realtek" },
-        { 0x11d4, "Analog Devices" },
-        { 0x13f6, "C-Media" },
-        { 0x434d, "C-Media" },
-        { 0x8384, "SigmaTel" },
-        {0} /* terminator */
+    { 0x10ec, "Realtek" },
+    { 0x11d4, "Analog Devices" },
+    { 0x13f6, "C-Media" },
+    { 0x434d, "C-Media" },
+    { 0x8384, "SigmaTel" },
+    {0} /* terminator */
 };
 
@@ -74 +74 @@
  */
 unsigned int snd_hda_codec_read(struct hda_codec *codec, hda_nid_t nid, int direct,
-                                unsigned int verb, unsigned int parm)
-{
-        unsigned int res;
-        down(&codec->bus->cmd_mutex);
-        if (! codec->bus->ops.command(codec, nid, direct, verb, parm))
-                res = codec->bus->ops.get_response(codec);
-        else
-                res = (unsigned int)-1;
-        up(&codec->bus->cmd_mutex);
-        return res;
+                                unsigned int verb, unsigned int parm)
+{
+    unsigned int res;
+    down(&codec->bus->cmd_mutex);
+    if (! codec->bus->ops.command(codec, nid, direct, verb, parm))
+        res = codec->bus->ops.get_response(codec);
+    else
+        res = (unsigned int)-1;
+    up(&codec->bus->cmd_mutex);
+    return res;
 }
 
@@ -99 +99 @@
  */
 int snd_hda_codec_write(struct hda_codec *codec, hda_nid_t nid, int direct,
-                         unsigned int verb, unsigned int parm)
-{
-        int err;
-        down(&codec->bus->cmd_mutex);
-        err = codec->bus->ops.command(codec, nid, direct, verb, parm);
-        up(&codec->bus->cmd_mutex);
-        return err;
+                        unsigned int verb, unsigned int parm)
+{
+    int err;
+    down(&codec->bus->cmd_mutex);
+    err = codec->bus->ops.command(codec, nid, direct, verb, parm);
+    up(&codec->bus->cmd_mutex);
+    return err;
 }
 
@@ -118 +118 @@
 void snd_hda_sequence_write(struct hda_codec *codec, const struct hda_verb *seq)
 {
-        for (; seq->nid; seq++)
-                snd_hda_codec_write(codec, seq->nid, 0, seq->verb, seq->param);
+    for (; seq->nid; seq++)
+        snd_hda_codec_write(codec, seq->nid, 0, seq->verb, seq->param);
 }
 
@@ -133 +133 @@
 int snd_hda_get_sub_nodes(struct hda_codec *codec, hda_nid_t nid, hda_nid_t *start_id)
 {
-        unsigned int parm;
-
-        parm = snd_hda_param_read(codec, nid, AC_PAR_NODE_COUNT);
-        *start_id = (parm >> 16) & 0x7fff;
-        return (int)(parm & 0x7fff);
+    unsigned int parm;
+
+    parm = snd_hda_param_read(codec, nid, AC_PAR_NODE_COUNT);
+    *start_id = (parm >> 16) & 0x7fff;
+    return (int)(parm & 0x7fff);
 }
 
@@ -153 +153 @@
  */
 int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid,
-                            hda_nid_t *conn_list, int max_conns)
-{
-        unsigned int parm;
-        int i, conn_len, conns;
-        unsigned int shift, num_elems, mask;
-        hda_nid_t prev_nid;
-
-        snd_assert(conn_list && max_conns > 0, return -EINVAL);
-
-        parm = snd_hda_param_read(codec, nid, AC_PAR_CONNLIST_LEN);
-        if (parm & AC_CLIST_LONG) {
-                /* long form */
-                shift = 16;
-                num_elems = 2;
-        } else {
-                /* short form */
-                shift = 8;
-                num_elems = 4;
-        }
-        conn_len = parm & AC_CLIST_LENGTH;
-        mask = (1 << (shift-1)) - 1;
-
-        if (! conn_len)
-                return 0; /* no connection */
-
-        if (conn_len == 1) {
-                /* single connection */
-                parm = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_LIST, 0);
-                conn_list[0] = parm & mask;
-                return 1;
-        }
-
-        /* multi connection */
-        conns = 0;
-        prev_nid = 0;
-        for (i = 0; i < conn_len; i++) {
-                int range_val;
-                hda_nid_t val, n;
-
-                if (i % num_elems == 0)
-                        parm = snd_hda_codec_read(codec, nid, 0,
-                                                  AC_VERB_GET_CONNECT_LIST, i);
-                range_val = !! (parm & (1 << (shift-1))); /* ranges */
-                val = parm & mask;
-                parm >>= shift;
-                if (range_val) {
-                        /* ranges between the previous and this one */
-                        if (! prev_nid || prev_nid >= val) {
-                                snd_printk(KERN_WARNING "hda_codec: invalid dep_range_val %x:%x\n", prev_nid, val);
-                                continue;
-                        }
-                        for (n = prev_nid + 1; n <= val; n++) {
-                                if (conns >= max_conns) {
-                                        snd_printk(KERN_ERR "Too many connections\n");
-                                        return -EINVAL;
-                                }
-                                conn_list[conns++] = n;
-                        }
-                } else {
-                        if (conns >= max_conns) {
-                                snd_printk(KERN_ERR "Too many connections\n");
-                                return -EINVAL;
-                        }
-                        conn_list[conns++] = val;
-                }
-                prev_nid = val;
-        }
-        return conns;
+                            hda_nid_t *conn_list, int max_conns)
+{
+    unsigned int parm;
+    int i, conn_len, conns;
+    unsigned int shift, num_elems, mask;
+    hda_nid_t prev_nid;
+
+    snd_assert(conn_list && max_conns > 0, return -EINVAL);
+
+    parm = snd_hda_param_read(codec, nid, AC_PAR_CONNLIST_LEN);
+    if (parm & AC_CLIST_LONG) {
+        /* long form */
+        shift = 16;
+        num_elems = 2;
+    } else {
+        /* short form */
+        shift = 8;
+        num_elems = 4;
+    }
+    conn_len = parm & AC_CLIST_LENGTH;
+    mask = (1 << (shift-1)) - 1;
+
+    if (! conn_len)
+        return 0; /* no connection */
+
+    if (conn_len == 1) {
+        /* single connection */
+        parm = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_LIST, 0);
+        conn_list[0] = parm & mask;
+        return 1;
+    }
+
+    /* multi connection */
+    conns = 0;
+    prev_nid = 0;
+    for (i = 0; i < conn_len; i++) {
+        int range_val;
+        hda_nid_t val, n;
+
+        if (i % num_elems == 0)
+            parm = snd_hda_codec_read(codec, nid, 0,
+                                      AC_VERB_GET_CONNECT_LIST, i);
+        range_val = !! (parm & (1 << (shift-1))); /* ranges */
+        val = parm & mask;
+        parm >>= shift;
+        if (range_val) {
+            /* ranges between the previous and this one */
+            if (! prev_nid || prev_nid >= val) {
+                snd_printk(KERN_WARNING "hda_codec: invalid dep_range_val %x:%x\n", prev_nid, val);
+                continue;
+            }
+            for (n = prev_nid + 1; n <= val; n++) {
+                if (conns >= max_conns) {
+                    snd_printk(KERN_ERR "Too many connections\n");
+                    return -EINVAL;
+                }
+                conn_list[conns++] = n;
+            }
+        } else {
+            if (conns >= max_conns) {
+                snd_printk(KERN_ERR "Too many connections\n");
+                return -EINVAL;
+            }
+            conn_list[conns++] = val;
+        }
+        prev_nid = val;
+    }
+    return conns;
 }
 
@@ -238 +238 @@
 int snd_hda_queue_unsol_event(struct hda_bus *bus, u32 res, u32 res_ex)
 {
-        struct hda_bus_unsolicited *unsol;
-        unsigned int wp;
-
-        if ((unsol = bus->unsol) == NULL)
-                return 0;
-
-        wp = (unsol->wp + 1) % HDA_UNSOL_QUEUE_SIZE;
-        unsol->wp = wp;
-
-        wp <<= 1;
-        unsol->queue[wp] = res;
-        unsol->queue[wp + 1] = res_ex;
-
-        queue_work(unsol->workq, &unsol->work);
-
-        return 0;
+    struct hda_bus_unsolicited *unsol;
+    unsigned int wp;
+
+    if ((unsol = bus->unsol) == NULL)
+        return 0;
+
+    wp = (unsol->wp + 1) % HDA_UNSOL_QUEUE_SIZE;
+    unsol->wp = wp;
+
+    wp <<= 1;
+    unsol->queue[wp] = res;
+    unsol->queue[wp + 1] = res_ex;
+
+    queue_work(unsol->workq, &unsol->work);
+
+    return 0;
 }
 
@@ -261 +261 @@
 static void process_unsol_events(void *data)
 {
-        struct hda_bus *bus = data;
-        struct hda_bus_unsolicited *unsol = bus->unsol;
-        struct hda_codec *codec;
-        unsigned int rp, caddr, res;
-
-        while (unsol->rp != unsol->wp) {
-                rp = (unsol->rp + 1) % HDA_UNSOL_QUEUE_SIZE;
-                unsol->rp = rp;
-                rp <<= 1;
-                res = unsol->queue[rp];
-                caddr = unsol->queue[rp + 1];
-                if (! (caddr & (1 << 4))) /* no unsolicited event? */
-                        continue;
-                codec = bus->caddr_tbl[caddr & 0x0f];
-                if (codec && codec->patch_ops.unsol_event)
-                        codec->patch_ops.unsol_event(codec, res);
-        }
+    struct hda_bus *bus = data;
+    struct hda_bus_unsolicited *unsol = bus->unsol;
+    struct hda_codec *codec;
+    unsigned int rp, caddr, res;
+
+    while (unsol->rp != unsol->wp) {
+        rp = (unsol->rp + 1) % HDA_UNSOL_QUEUE_SIZE;
+        unsol->rp = rp;
+        rp <<= 1;
+        res = unsol->queue[rp];
+        caddr = unsol->queue[rp + 1];
+        if (! (caddr & (1 << 4))) /* no unsolicited event? */
+            continue;
+        codec = bus->caddr_tbl[caddr & 0x0f];
+        if (codec && codec->patch_ops.unsol_event)
+            codec->patch_ops.unsol_event(codec, res);
+    }
 }
 
@@ -285 +285 @@
 static int init_unsol_queue(struct hda_bus *bus)
 {
-        struct hda_bus_unsolicited *unsol;
-
-        if (bus->unsol) /* already initialized */
-                return 0;
-
-        unsol = kzalloc(sizeof(*unsol), GFP_KERNEL);
-        if (! unsol) {
-                snd_printk(KERN_ERR "hda_codec: can't allocate unsolicited queue\n");
-                return -ENOMEM;
-        }
-        unsol->workq = create_workqueue("hda_codec");
-        if (! unsol->workq) {
-                snd_printk(KERN_ERR "hda_codec: can't create workqueue\n");
-                kfree(unsol);
-                return -ENOMEM;
-        }
-        INIT_WORK(&unsol->work, process_unsol_events, bus);
-        bus->unsol = unsol;
-        return 0;
+    struct hda_bus_unsolicited *unsol;
+
+    if (bus->unsol) /* already initialized */
+        return 0;
+
+    unsol = kzalloc(sizeof(*unsol), GFP_KERNEL);
+    if (! unsol) {
+        snd_printk(KERN_ERR "hda_codec: can't allocate unsolicited queue\n");
+        return -ENOMEM;
+    }
+    unsol->workq = create_workqueue("hda_codec");
+    if (! unsol->workq) {
+        snd_printk(KERN_ERR "hda_codec: can't create workqueue\n");
+        kfree(unsol);
+        return -ENOMEM;
+    }
+    INIT_WORK(&unsol->work, process_unsol_events, bus);
+    bus->unsol = unsol;
+    return 0;
 }
 
@@ -313 +313 @@
 static int snd_hda_bus_free(struct hda_bus *bus)
 {
-        struct list_head *p, *n;
-
-        if (! bus)
-                return 0;
-        if (bus->unsol) {
-                destroy_workqueue(bus->unsol->workq);
-                kfree(bus->unsol);
-        }
-        list_for_each_safe(p, n, &bus->codec_list) {
-                struct hda_codec *codec = list_entry(p, struct hda_codec, list);
-                snd_hda_codec_free(codec);
-        }
-        if (bus->ops.private_free)
-                bus->ops.private_free(bus);
-        kfree(bus);
-        return 0;
+    struct list_head *p, *n;
+
+    if (! bus)
+        return 0;
+    if (bus->unsol) {
+        destroy_workqueue(bus->unsol->workq);
+        kfree(bus->unsol);
+    }
+    list_for_each_safe(p, n, &bus->codec_list) {
+        struct hda_codec *codec = list_entry(p, struct hda_codec, list);
+        snd_hda_codec_free(codec);
+    }
+    if (bus->ops.private_free)
+        bus->ops.private_free(bus);
+    kfree(bus);
+    return 0;
 }
 
 static int snd_hda_bus_dev_free(struct snd_device *device)
 {
-        struct hda_bus *bus = device->device_data;
-        return snd_hda_bus_free(bus);
+    struct hda_bus *bus = device->device_data;
+    return snd_hda_bus_free(bus);
 }
 
@@ -346 +346 @@
  */
 int snd_hda_bus_new(struct snd_card *card, const struct hda_bus_template *temp,
-                    struct hda_bus **busp)
-{
-        struct hda_bus *bus;
-        int err;
-        static struct snd_device_ops dev_ops = {
-                .dev_free = snd_hda_bus_dev_free,
-        };
-
-        snd_assert(temp, return -EINVAL);
-        snd_assert(temp->ops.command && temp->ops.get_response, return -EINVAL);
-
-        if (busp)
-                *busp = NULL;
-
-        bus = kzalloc(sizeof(*bus), GFP_KERNEL);
-        if (bus == NULL) {
-                snd_printk(KERN_ERR "can't allocate struct hda_bus\n");
-                return -ENOMEM;
-        }
-
-        bus->card = card;
-        bus->private_data = temp->private_data;
-        bus->pci = temp->pci;
-        bus->modelname = temp->modelname;
-        bus->ops = temp->ops;
-
-        init_MUTEX(&bus->cmd_mutex);
-        INIT_LIST_HEAD(&bus->codec_list);
-
-        if ((err = snd_device_new(card, SNDRV_DEV_BUS, bus, &dev_ops)) < 0) {
-                snd_hda_bus_free(bus);
-                return err;
-        }
-        if (busp)
-                *busp = bus;
-        return 0;
+                    struct hda_bus **busp)
+{
+    struct hda_bus *bus;
+    int err;
+    static struct snd_device_ops dev_ops = {
+        .dev_free = snd_hda_bus_dev_free,
+    };
+
+    snd_assert(temp, return -EINVAL);
+    snd_assert(temp->ops.command && temp->ops.get_response, return -EINVAL);
+
+    if (busp)
+        *busp = NULL;
+
+    bus = kzalloc(sizeof(*bus), GFP_KERNEL);
+    if (bus == NULL) {
+        snd_printk(KERN_ERR "can't allocate struct hda_bus\n");
+        return -ENOMEM;
+    }
+
+    bus->card = card;
+    bus->private_data = temp->private_data;
+    bus->pci = temp->pci;
+    bus->modelname = temp->modelname;
+    bus->ops = temp->ops;
+
+    init_MUTEX(&bus->cmd_mutex);
+    INIT_LIST_HEAD(&bus->codec_list);
+
+    if ((err = snd_device_new(card, SNDRV_DEV_BUS, bus, &dev_ops)) < 0) {
+        snd_hda_bus_free(bus);
+        return err;
+    }
+    if (busp)
+        *busp = bus;
+    return 0;
 }
 
@@ -390 +390 @@
 static const struct hda_codec_preset *find_codec_preset(struct hda_codec *codec)
 {
-        const struct hda_codec_preset **tbl, *preset;
-
-        for (tbl = hda_preset_tables; *tbl; tbl++) {
-                for (preset = *tbl; preset->id; preset++) {
-                        u32 mask = preset->mask;
-                        if (! mask)
-                                mask = ~0;
-                        if (preset->id == (codec->vendor_id & mask))
-                                return preset;
-                }
-        }
-        return NULL;
+    const struct hda_codec_preset **tbl, *preset;
+
+    for (tbl = hda_preset_tables; *tbl; tbl++) {
+        for (preset = *tbl; preset->id; preset++) {
+            u32 mask = preset->mask;
+            if (! mask)
+                mask = ~0;
+            if (preset->id == (codec->vendor_id & mask))
+                if (preset->id == (codec->vendor_id & mask) &&
+                    (! preset->rev ||
+                     preset->rev == codec->revision_id))
+                    return preset;
+        }
+    }
+    return NULL;
 }
 
@@ -408 +411 @@
  */
 void snd_hda_get_codec_name(struct hda_codec *codec,
-                            char *name, int namelen)
-{
-        const struct hda_vendor_id *c;
-        const char *vendor = NULL;
-        u16 vendor_id = codec->vendor_id >> 16;
-        char tmp[16];
-
-        for (c = hda_vendor_ids; c->id; c++) {
-                if (c->id == vendor_id) {
-                        vendor = c->name;
-                        break;
-                }
-        }
-        if (! vendor) {
-                sprintf(tmp, "Generic %04x", vendor_id);
-                vendor = tmp;
-        }
-        if (codec->preset && codec->preset->name)
-                sprintf(name, "%s %s", vendor, codec->preset->name);
-        else
-                sprintf(name, "%s ID %x", vendor, codec->vendor_id & 0xffff);
+                            char *name, int namelen)
+{
+    const struct hda_vendor_id *c;
+    const char *vendor = NULL;
+    u16 vendor_id = codec->vendor_id >> 16;
+    char tmp[16];
+
+    for (c = hda_vendor_ids; c->id; c++) {
+        if (c->id == vendor_id) {
+            vendor = c->name;
+            break;
+        }
+    }
+    if (! vendor) {
+        sprintf(tmp, "Generic %04x", vendor_id);
+        vendor = tmp;
+    }
+    if (codec->preset && codec->preset->name)
+        sprintf(name, "%s %s", vendor, codec->preset->name);
+    else
+        sprintf(name, "%s ID %x", vendor, codec->vendor_id & 0xffff);
 }
 
@@ -436 +439 @@
 static void setup_fg_nodes(struct hda_codec *codec)
 {
-        int i, total_nodes;
-        hda_nid_t nid;
-
-        total_nodes = snd_hda_get_sub_nodes(codec, AC_NODE_ROOT, &nid);
-        for (i = 0; i < total_nodes; i++, nid++) {
-                switch((snd_hda_param_read(codec, nid, AC_PAR_FUNCTION_TYPE) & 0xff)) {
-                case AC_GRP_AUDIO_FUNCTION:
-                        codec->afg = nid;
-                        break;
-                case AC_GRP_MODEM_FUNCTION:
-                        codec->mfg = nid;
-                        break;
-                default:
-                        break;
-                }
-        }
+    int i, total_nodes;
+    hda_nid_t nid;
+
+    total_nodes = snd_hda_get_sub_nodes(codec, AC_NODE_ROOT, &nid);
+    for (i = 0; i < total_nodes; i++, nid++) {
+        switch((snd_hda_param_read(codec, nid, AC_PAR_FUNCTION_TYPE) & 0xff)) {
+        case AC_GRP_AUDIO_FUNCTION:
+            codec->afg = nid;
+            break;
+        case AC_GRP_MODEM_FUNCTION:
+            codec->mfg = nid;
+            break;
+        default:
+            break;
+        }
+    }
 }
 
@@ -459 +462 @@
 static int read_widget_caps(struct hda_codec *codec, hda_nid_t fg_node)
 {
-        int i;
-        hda_nid_t nid;
-
-        codec->num_nodes = snd_hda_get_sub_nodes(codec, fg_node,
-                                                 &codec->start_nid);
-        codec->wcaps = kmalloc(codec->num_nodes * 4, GFP_KERNEL);
-        if (! codec->wcaps)
-                return -ENOMEM;
-        nid = codec->start_nid;
-        for (i = 0; i < codec->num_nodes; i++, nid++)
-                codec->wcaps[i] = snd_hda_param_read(codec, nid,
-                                                     AC_PAR_AUDIO_WIDGET_CAP);
-        return 0;
+    int i;
+    hda_nid_t nid;
+
+    codec->num_nodes = snd_hda_get_sub_nodes(codec, fg_node,
+                                             &codec->start_nid);
+    codec->wcaps = kmalloc(codec->num_nodes * 4, GFP_KERNEL);
+    if (! codec->wcaps)
+        return -ENOMEM;
+    nid = codec->start_nid;
+    for (i = 0; i < codec->num_nodes; i++, nid++)
+        codec->wcaps[i] = snd_hda_param_read(codec, nid,
+                                             AC_PAR_AUDIO_WIDGET_CAP);
+    return 0;
 }
 
@@ -480 +483 @@
 static void snd_hda_codec_free(struct hda_codec *codec)
 {
-        if (! codec)
-                return;
-        list_del(&codec->list);
-        codec->bus->caddr_tbl[codec->addr] = NULL;
-        if (codec->patch_ops.free)
-                codec->patch_ops.free(codec);
-        kfree(codec->amp_info);
-        kfree(codec->wcaps);
-        kfree(codec);
+    if (! codec)
+        return;
+    list_del(&codec->list);
+    codec->bus->caddr_tbl[codec->addr] = NULL;
+    if (codec->patch_ops.free)
+        codec->patch_ops.free(codec);
+    kfree(codec->amp_info);
+    kfree(codec->wcaps);
+    kfree(codec);
 }
 
@@ -502 +505 @@
  */
 int snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
-                      struct hda_codec **codecp)
-{
-        struct hda_codec *codec;
-        char component[13];
-        int err;
-
-        snd_assert(bus, return -EINVAL);
-        snd_assert(codec_addr <= HDA_MAX_CODEC_ADDRESS, return -EINVAL);
-
-        if (bus->caddr_tbl[codec_addr]) {
-                snd_printk(KERN_ERR "hda_codec: address 0x%x is already occupied\n", codec_addr);
-                return -EBUSY;
-        }
-
-        codec = kzalloc(sizeof(*codec), GFP_KERNEL);
-        if (codec == NULL) {
-                snd_printk(KERN_ERR "can't allocate struct hda_codec\n");
-                return -ENOMEM;
-        }
-
-        codec->bus = bus;
-        codec->addr = codec_addr;
-        init_MUTEX(&codec->spdif_mutex);
-        init_amp_hash(codec);
-
-        list_add_tail(&codec->list, &bus->codec_list);
-        bus->caddr_tbl[codec_addr] = codec;
-
-        codec->vendor_id = snd_hda_param_read(codec, AC_NODE_ROOT, AC_PAR_VENDOR_ID);
-        if (codec->vendor_id == -1)
-            /* read again, hopefully the access method was corrected
-             * in the last read...
-             */
-            codec->vendor_id = snd_hda_param_read(codec, AC_NODE_ROOT,
-                                                  AC_PAR_VENDOR_ID);
-        codec->subsystem_id = snd_hda_param_read(codec, AC_NODE_ROOT, AC_PAR_SUBSYSTEM_ID);
-        codec->revision_id = snd_hda_param_read(codec, AC_NODE_ROOT, AC_PAR_REV_ID);
-
-        setup_fg_nodes(codec);
-        if (! codec->afg && ! codec->mfg) {
-                snd_printdd("hda_codec: no AFG or MFG node found\n");
-                snd_hda_codec_free(codec);
-                return -ENODEV;
-        }
-
-        if (read_widget_caps(codec, codec->afg ? codec->afg : codec->mfg) < 0) {
-                snd_printk(KERN_ERR "hda_codec: cannot malloc\n");
-                snd_hda_codec_free(codec);
-                return -ENOMEM;
-        }
-
-        if (! codec->subsystem_id) {
-                hda_nid_t nid = codec->afg ? codec->afg : codec->mfg;
-                codec->subsystem_id = snd_hda_codec_read(codec, nid, 0,
-                                                         AC_VERB_GET_SUBSYSTEM_ID,
-                                                         0);
-        }
-
-        codec->preset = find_codec_preset(codec);
-        if (! *bus->card->mixername)
-                snd_hda_get_codec_name(codec, bus->card->mixername,
-                                       sizeof(bus->card->mixername));
-
-        if (codec->preset && codec->preset->patch)
-                err = codec->preset->patch(codec);
-        else
-                err = snd_hda_parse_generic_codec(codec);
-        if (err < 0) {
-                snd_hda_codec_free(codec);
-                return err;
-        }
-
-        if (codec->patch_ops.unsol_event)
-                init_unsol_queue(bus);
-
-        snd_hda_codec_proc_new(codec);
-
-        sprintf(component, "HDA:%08x", codec->vendor_id);
-        snd_component_add(codec->bus->card, component);
-
-        if (codecp)
-                *codecp = codec;
-        return 0;
+                      struct hda_codec **codecp)
+{
+    struct hda_codec *codec;
+    char component[13];
+    int err;
+
+    snd_assert(bus, return -EINVAL);
+    snd_assert(codec_addr <= HDA_MAX_CODEC_ADDRESS, return -EINVAL);
+
+    if (bus->caddr_tbl[codec_addr]) {
+        snd_printk(KERN_ERR "hda_codec: address 0x%x is already occupied\n", codec_addr);
+        return -EBUSY;
+    }
+
+    codec = kzalloc(sizeof(*codec), GFP_KERNEL);
+    if (codec == NULL) {
+        snd_printk(KERN_ERR "can't allocate struct hda_codec\n");
+        return -ENOMEM;
+    }
+
+    codec->bus = bus;
+    codec->addr = codec_addr;
+    init_MUTEX(&codec->spdif_mutex);
+    init_amp_hash(codec);
+
+    list_add_tail(&codec->list, &bus->codec_list);
+    bus->caddr_tbl[codec_addr] = codec;
+
+    codec->vendor_id = snd_hda_param_read(codec, AC_NODE_ROOT, AC_PAR_VENDOR_ID);
+    if (codec->vendor_id == -1)
+        /* read again, hopefully the access method was corrected
+         * in the last read...
+         */
+        codec->vendor_id = snd_hda_param_read(codec, AC_NODE_ROOT,
+                                              AC_PAR_VENDOR_ID);
+    codec->subsystem_id = snd_hda_param_read(codec, AC_NODE_ROOT, AC_PAR_SUBSYSTEM_ID);
+    codec->revision_id = snd_hda_param_read(codec, AC_NODE_ROOT, AC_PAR_REV_ID);
+
+    setup_fg_nodes(codec);
+    if (! codec->afg && ! codec->mfg) {
+        snd_printdd("hda_codec: no AFG or MFG node found\n");
+        snd_hda_codec_free(codec);
+        return -ENODEV;
+    }
+
+    if (read_widget_caps(codec, codec->afg ? codec->afg : codec->mfg) < 0) {
+        snd_printk(KERN_ERR "hda_codec: cannot malloc\n");
+        snd_hda_codec_free(codec);
+        return -ENOMEM;
+    }
+
+    if (! codec->subsystem_id) {
+        hda_nid_t nid = codec->afg ? codec->afg : codec->mfg;
+        codec->subsystem_id = snd_hda_codec_read(codec, nid, 0,
+                                                 AC_VERB_GET_SUBSYSTEM_ID,
+                                                 0);
+    }
+
+    codec->preset = find_codec_preset(codec);
+    if (! *bus->card->mixername)
+        snd_hda_get_codec_name(codec, bus->card->mixername,
+                               sizeof(bus->card->mixername));
+
+    if (codec->preset && codec->preset->patch)
+        err = codec->preset->patch(codec);
+    else
+        err = snd_hda_parse_generic_codec(codec);
+    if (err < 0) {
+        snd_hda_codec_free(codec);
+        return err;
+    }
+
+    if (codec->patch_ops.unsol_event)
+        init_unsol_queue(bus);
+
+    snd_hda_codec_proc_new(codec);
+
+    sprintf(component, "HDA:%08x", codec->vendor_id);
+    snd_component_add(codec->bus->card, component);
+
+    if (codecp)
+        *codecp = codec;
+    return 0;
 }
 
@@ -596 +599 @@
  */
 void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid, u32 stream_tag,
-                                int channel_id, int format)
-{
-        if (! nid)
-                return;
-
-        snd_printdd("hda_codec_setup_stream: NID=0x%x, stream=0x%x, channel=%d, format=0x%x\n",
-                    nid, stream_tag, channel_id, format);
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CHANNEL_STREAMID,
-                            (stream_tag << 4) | channel_id);
-        msleep(1);
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_STREAM_FORMAT, format);
+                                int channel_id, int format)
+{
+    if (! nid)
+        return;
+
+    snd_printdd("hda_codec_setup_stream: NID=0x%x, stream=0x%x, channel=%d, format=0x%x\n",
+                nid, stream_tag, channel_id, format);
+    snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CHANNEL_STREAMID,
+                        (stream_tag << 4) | channel_id);
+    msleep(1);
+    snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_STREAM_FORMAT, format);
 }
 
@@ -622 +625 @@
 static void init_amp_hash(struct hda_codec *codec)
 {
-        memset(codec->amp_hash, 0xff, sizeof(codec->amp_hash));
-        codec->num_amp_entries = 0;
-        codec->amp_info_size = 0;
-        codec->amp_info = NULL;
+    memset(codec->amp_hash, 0xff, sizeof(codec->amp_hash));
+    codec->num_amp_entries = 0;
+    codec->amp_info_size = 0;
+    codec->amp_info = NULL;
 }
 
@@ -631 +634 @@
 static struct hda_amp_info *get_alloc_amp_hash(struct hda_codec *codec, u32 key)
 {
-        u16 idx = key % (u16)ARRAY_SIZE(codec->amp_hash);
-        u16 cur = codec->amp_hash[idx];
-        struct hda_amp_info *info;
-
-        while (cur != 0xffff) {
-                info = &codec->amp_info[cur];
-                if (info->key == key)
-                        return info;
-                cur = info->next;
-        }
-
-        /* add a new hash entry */
-        if (codec->num_amp_entries >= codec->amp_info_size) {
-                /* reallocate the array */
-                int new_size = codec->amp_info_size + 64;
-                struct hda_amp_info *new_info = kcalloc(new_size, sizeof(struct hda_amp_info),
-                                                        GFP_KERNEL);
-                if (! new_info) {
-                        snd_printk(KERN_ERR "hda_codec: can't malloc amp_info\n");
-                        return NULL;
-                }
-                if (codec->amp_info) {
-                        memcpy(new_info, codec->amp_info,
-                               codec->amp_info_size * sizeof(struct hda_amp_info));
-                        kfree(codec->amp_info);
-                }
-                codec->amp_info_size = new_size;
-                codec->amp_info = new_info;
-        }
-        cur = codec->num_amp_entries++;
-        info = &codec->amp_info[cur];
-        info->key = key;
-        info->status = 0; /* not initialized yet */
-        info->next = codec->amp_hash[idx];
-        codec->amp_hash[idx] = cur;
-
-        return info;
+    u16 idx = key % (u16)ARRAY_SIZE(codec->amp_hash);
+    u16 cur = codec->amp_hash[idx];
+    struct hda_amp_info *info;
+
+    while (cur != 0xffff) {
+        info = &codec->amp_info[cur];
+        if (info->key == key)
+            return info;
+        cur = info->next;
+    }
+
+    /* add a new hash entry */
+    if (codec->num_amp_entries >= codec->amp_info_size) {
+        /* reallocate the array */
+        int new_size = codec->amp_info_size + 64;
+        struct hda_amp_info *new_info = kcalloc(new_size, sizeof(struct hda_amp_info),
+                                                GFP_KERNEL);
+        if (! new_info) {
+            snd_printk(KERN_ERR "hda_codec: can't malloc amp_info\n");
+            return NULL;
+        }
+        if (codec->amp_info) {
+            memcpy(new_info, codec->amp_info,
+                   codec->amp_info_size * sizeof(struct hda_amp_info));
+            kfree(codec->amp_info);
+        }
+        codec->amp_info_size = new_size;
+        codec->amp_info = new_info;
+    }
+    cur = codec->num_amp_entries++;
+    info = &codec->amp_info[cur];
+    info->key = key;
+    info->status = 0; /* not initialized yet */
+    info->next = codec->amp_hash[idx];
+    codec->amp_hash[idx] = cur;
+
+    return info;
 }
 
@@ -675 +678 @@
 static u32 query_amp_caps(struct hda_codec *codec, hda_nid_t nid, int direction)
 {
-        struct hda_amp_info *info = get_alloc_amp_hash(codec, HDA_HASH_KEY(nid, direction, 0));
-
-        if (! info)
-                return 0;
-        if (! (info->status & INFO_AMP_CAPS)) {
-                if (! (get_wcaps(codec, nid) & AC_WCAP_AMP_OVRD))
-                        nid = codec->afg;
-                info->amp_caps = snd_hda_param_read(codec, nid, direction == HDA_OUTPUT ?
-                                                    AC_PAR_AMP_OUT_CAP : AC_PAR_AMP_IN_CAP);
-                info->status |= INFO_AMP_CAPS;
-        }
-        return info->amp_caps;
+    struct hda_amp_info *info = get_alloc_amp_hash(codec, HDA_HASH_KEY(nid, direction, 0));
+
+    if (! info)
+        return 0;
+    if (! (info->status & INFO_AMP_CAPS)) {
+        if (! (get_wcaps(codec, nid) & AC_WCAP_AMP_OVRD))
+            nid = codec->afg;
+        info->amp_caps = snd_hda_param_read(codec, nid, direction == HDA_OUTPUT ?
+                                            AC_PAR_AMP_OUT_CAP : AC_PAR_AMP_IN_CAP);
+        info->status |= INFO_AMP_CAPS;
+    }
+    return info->amp_caps;
 }
 
@@ -694 +697 @@
  */
 static unsigned int get_vol_mute(struct hda_codec *codec, struct hda_amp_info *info,
-                         hda_nid_t nid, int ch, int direction, int index)
-{
-        u32 val, parm;
-
-        if (info->status & INFO_AMP_VOL(ch))
-                return info->vol[ch];
-
-        parm = ch ? AC_AMP_GET_RIGHT : AC_AMP_GET_LEFT;
-        parm |= direction == HDA_OUTPUT ? AC_AMP_GET_OUTPUT : AC_AMP_GET_INPUT;
-        parm |= index;
-        val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_AMP_GAIN_MUTE, parm);
-        info->vol[ch] = val & 0xff;
-        info->status |= INFO_AMP_VOL(ch);
-        return info->vol[ch];
+                                 hda_nid_t nid, int ch, int direction, int index)
+{
+    u32 val, parm;
+
+    if (info->status & INFO_AMP_VOL(ch))
+        return info->vol[ch];
+
+    parm = ch ? AC_AMP_GET_RIGHT : AC_AMP_GET_LEFT;
+    parm |= direction == HDA_OUTPUT ? AC_AMP_GET_OUTPUT : AC_AMP_GET_INPUT;
+    parm |= index;
+    val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_AMP_GAIN_MUTE, parm);
+    info->vol[ch] = val & 0xff;
+    info->status |= INFO_AMP_VOL(ch);
+    return info->vol[ch];
 }
 
@@ -714 +717 @@
  */
 static void put_vol_mute(struct hda_codec *codec, struct hda_amp_info *info,
-                         hda_nid_t nid, int ch, int direction, int index, int val)
-{
-        u32 parm;
-
-        parm = ch ? AC_AMP_SET_RIGHT : AC_AMP_SET_LEFT;
-        parm |= direction == HDA_OUTPUT ? AC_AMP_SET_OUTPUT : AC_AMP_SET_INPUT;
-        parm |= index << AC_AMP_SET_INDEX_SHIFT;
-        parm |= val;
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, parm);
-        info->vol[ch] = val;
+                         hda_nid_t nid, int ch, int direction, int index, int val)
+{
+    u32 parm;
+
+    parm = ch ? AC_AMP_SET_RIGHT : AC_AMP_SET_LEFT;
+    parm |= direction == HDA_OUTPUT ? AC_AMP_SET_OUTPUT : AC_AMP_SET_INPUT;
+    parm |= index << AC_AMP_SET_INDEX_SHIFT;
+    parm |= val;
+    snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, parm);
+    info->vol[ch] = val;
 }
 
@@ -732 +735 @@
                            int direction, int index)
 {
-        struct hda_amp_info *info = get_alloc_amp_hash(codec, HDA_HASH_KEY(nid, direction, index));
-        if (! info)
-                return 0;
-        return get_vol_mute(codec, info, nid, ch, direction, index);
+    struct hda_amp_info *info = get_alloc_amp_hash(codec, HDA_HASH_KEY(nid, direction, index));
+    if (! info)
+        return 0;
+    return get_vol_mute(codec, info, nid, ch, direction, index);
 }
 
@@ -744 +747 @@
                              int direction, int idx, int mask, int val)
 {
-        struct hda_amp_info *info = get_alloc_amp_hash(codec, HDA_HASH_KEY(nid, direction, idx));
-
-        if (! info)
-                return 0;
-        val &= mask;
-        val |= get_vol_mute(codec, info, nid, ch, direction, idx) & ~mask;
-        if (info->vol[ch] == val && ! codec->in_resume)
-                return 0;
-        put_vol_mute(codec, info, nid, ch, direction, idx, val);
-        return 1;
+    struct hda_amp_info *info = get_alloc_amp_hash(codec, HDA_HASH_KEY(nid, direction, idx));
+
+    if (! info)
+        return 0;
+    val &= mask;
+    val |= get_vol_mute(codec, info, nid, ch, direction, idx) & ~mask;
+    if (info->vol[ch] == val && ! codec->in_resume)
+        return 0;
+    put_vol_mute(codec, info, nid, ch, direction, idx, val);
+    return 1;
 }
 
@@ -769 +772 @@
 int snd_hda_mixer_amp_volume_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        u16 nid = get_amp_nid(kcontrol);
-        u8 chs = get_amp_channels(kcontrol);
-        int dir = get_amp_direction(kcontrol);
-        u32 caps;
-
-        caps = query_amp_caps(codec, nid, dir);
-        caps = (caps & AC_AMPCAP_NUM_STEPS) >> AC_AMPCAP_NUM_STEPS_SHIFT; /* num steps */
-        if (! caps) {
-                printk(KERN_WARNING "hda_codec: num_steps = 0 for NID=0x%x\n", nid);
-                return -EINVAL;
-        }
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-        uinfo->count = chs == 3 ? 2 : 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = caps;
-        return 0;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    u16 nid = get_amp_nid(kcontrol);
+    u8 chs = get_amp_channels(kcontrol);
+    int dir = get_amp_direction(kcontrol);
+    u32 caps;
+
+    caps = query_amp_caps(codec, nid, dir);
+    caps = (caps & AC_AMPCAP_NUM_STEPS) >> AC_AMPCAP_NUM_STEPS_SHIFT; /* num steps */
+    if (! caps) {
+        printk(KERN_WARNING "hda_codec: num_steps = 0 for NID=0x%x\n", nid);
+        return -EINVAL;
+    }
+    uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+    uinfo->count = chs == 3 ? 2 : 1;
+    uinfo->value.integer.min = 0;
+    uinfo->value.integer.max = caps;
+    return 0;
 }
 
 int snd_hda_mixer_amp_volume_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        hda_nid_t nid = get_amp_nid(kcontrol);
-        int chs = get_amp_channels(kcontrol);
-        int dir = get_amp_direction(kcontrol);
-        int idx = get_amp_index(kcontrol);
-        long *valp = ucontrol->value.integer.value;
-
-        if (chs & 1)
-                *valp++ = snd_hda_codec_amp_read(codec, nid, 0, dir, idx) & 0x7f;
-        if (chs & 2)
-                *valp = snd_hda_codec_amp_read(codec, nid, 1, dir, idx) & 0x7f;
-        return 0;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    hda_nid_t nid = get_amp_nid(kcontrol);
+    int chs = get_amp_channels(kcontrol);
+    int dir = get_amp_direction(kcontrol);
+    int idx = get_amp_index(kcontrol);
+    long *valp = ucontrol->value.integer.value;
+
+    if (chs & 1)
+        *valp++ = snd_hda_codec_amp_read(codec, nid, 0, dir, idx) & 0x7f;
+    if (chs & 2)
+        *valp = snd_hda_codec_amp_read(codec, nid, 1, dir, idx) & 0x7f;
+    return 0;
 }
 
 int snd_hda_mixer_amp_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        hda_nid_t nid = get_amp_nid(kcontrol);
-        int chs = get_amp_channels(kcontrol);
-        int dir = get_amp_direction(kcontrol);
-        int idx = get_amp_index(kcontrol);
-        long *valp = ucontrol->value.integer.value;
-        int change = 0;
-
-        if (chs & 1) {
-                change = snd_hda_codec_amp_update(codec, nid, 0, dir, idx,
-                                                  0x7f, *valp);
-                valp++;
-        }
-        if (chs & 2)
-                change |= snd_hda_codec_amp_update(codec, nid, 1, dir, idx,
-                                                   0x7f, *valp);
-        return change;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    hda_nid_t nid = get_amp_nid(kcontrol);
+    int chs = get_amp_channels(kcontrol);
+    int dir = get_amp_direction(kcontrol);
+    int idx = get_amp_index(kcontrol);
+    long *valp = ucontrol->value.integer.value;
+    int change = 0;
+
+    if (chs & 1) {
+        change = snd_hda_codec_amp_update(codec, nid, 0, dir, idx,
+                                          0x7f, *valp);
+        valp++;
+    }
+    if (chs & 2)
+        change |= snd_hda_codec_amp_update(codec, nid, 1, dir, idx,
+                                           0x7f, *valp);
+    return change;
 }
 
@@ -828 +831 @@
 int snd_hda_mixer_amp_switch_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-        int chs = get_amp_channels(kcontrol);
-
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = chs == 3 ? 2 : 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
+    int chs = get_amp_channels(kcontrol);
+
+    uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+    uinfo->count = chs == 3 ? 2 : 1;
+    uinfo->value.integer.min = 0;
+    uinfo->value.integer.max = 1;
+    return 0;
 }
 
 int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        hda_nid_t nid = get_amp_nid(kcontrol);
-        int chs = get_amp_channels(kcontrol);
-        int dir = get_amp_direction(kcontrol);
-        int idx = get_amp_index(kcontrol);
-        long *valp = ucontrol->value.integer.value;
-
-        if (chs & 1)
-                *valp++ = (snd_hda_codec_amp_read(codec, nid, 0, dir, idx) & 0x80) ? 0 : 1;
-        if (chs & 2)
-                *valp = (snd_hda_codec_amp_read(codec, nid, 1, dir, idx) & 0x80) ? 0 : 1;
-        return 0;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    hda_nid_t nid = get_amp_nid(kcontrol);
+    int chs = get_amp_channels(kcontrol);
+    int dir = get_amp_direction(kcontrol);
+    int idx = get_amp_index(kcontrol);
+    long *valp = ucontrol->value.integer.value;
+
+    if (chs & 1)
+        *valp++ = (snd_hda_codec_amp_read(codec, nid, 0, dir, idx) & 0x80) ? 0 : 1;
+    if (chs & 2)
+        *valp = (snd_hda_codec_amp_read(codec, nid, 1, dir, idx) & 0x80) ? 0 : 1;
+    return 0;
 }
 
 int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        hda_nid_t nid = get_amp_nid(kcontrol);
-        int chs = get_amp_channels(kcontrol);
-        int dir = get_amp_direction(kcontrol);
-        int idx = get_amp_index(kcontrol);
-        long *valp = ucontrol->value.integer.value;
-        int change = 0;
-
-        if (chs & 1) {
-                change = snd_hda_codec_amp_update(codec, nid, 0, dir, idx,
-                                                  0x80, *valp ? 0 : 0x80);
-                valp++;
-        }
-        if (chs & 2)
-                change |= snd_hda_codec_amp_update(codec, nid, 1, dir, idx,
-                                                   0x80, *valp ? 0 : 0x80);
-
-        return change;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    hda_nid_t nid = get_amp_nid(kcontrol);
+    int chs = get_amp_channels(kcontrol);
+    int dir = get_amp_direction(kcontrol);
+    int idx = get_amp_index(kcontrol);
+    long *valp = ucontrol->value.integer.value;
+    int change = 0;
+
+    if (chs & 1) {
+        change = snd_hda_codec_amp_update(codec, nid, 0, dir, idx,
+                                          0x80, *valp ? 0 : 0x80);
+        valp++;
+    }
+    if (chs & 2)
+        change |= snd_hda_codec_amp_update(codec, nid, 1, dir, idx,
+                                           0x80, *valp ? 0 : 0x80);
+
+    return change;
 }
 
@@ -886 +889 @@
 int snd_hda_mixer_bind_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        unsigned long pval;
-        int err;
-
-        down(&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;
-        up(&codec->spdif_mutex);
-        return err;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    unsigned long pval;
+    int err;
+
+    down(&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;
+    up(&codec->spdif_mutex);
+    return err;
 }
 
 int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        unsigned long pval;
-        int i, indices, err = 0, change = 0;
-
-        down(&codec->spdif_mutex); /* reuse spdif_mutex */
-        pval = kcontrol->private_value;
-        indices = (pval & AMP_VAL_IDX_MASK) >> AMP_VAL_IDX_SHIFT;
-        for (i = 0; i < indices; i++) {
-                kcontrol->private_value = (pval & ~AMP_VAL_IDX_MASK) | (i << AMP_VAL_IDX_SHIFT);
-                err = snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);
-                if (err < 0)
-                        break;
-                change |= err;
-        }
-        kcontrol->private_value = pval;
-        up(&codec->spdif_mutex);
-        return err < 0 ? err : change;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    unsigned long pval;
+    int i, indices, err = 0, change = 0;
+
+    down(&codec->spdif_mutex); /* reuse spdif_mutex */
+    pval = kcontrol->private_value;
+    indices = (pval & AMP_VAL_IDX_MASK) >> AMP_VAL_IDX_SHIFT;
+    for (i = 0; i < indices; i++) {
+        kcontrol->private_value = (pval & ~AMP_VAL_IDX_MASK) | (i << AMP_VAL_IDX_SHIFT);
+        err = snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);
+        if (err < 0)
+            break;
+        change |= err;
+    }
+    kcontrol->private_value = pval;
+    up(&codec->spdif_mutex);
+    return err < 0 ? err : change;
 }
 
@@ -926 +929 @@
 static int snd_hda_spdif_mask_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
-        uinfo->count = 1;
-        return 0;
+    uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
+    uinfo->count = 1;
+    return 0;
 }
 
 static int snd_hda_spdif_cmask_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        ucontrol->value.iec958.status[0] = IEC958_AES0_PROFESSIONAL |
-                                           IEC958_AES0_NONAUDIO |
-                                           IEC958_AES0_CON_EMPHASIS_5015 |
-                                           IEC958_AES0_CON_NOT_COPYRIGHT;
-        ucontrol->value.iec958.status[1] = IEC958_AES1_CON_CATEGORY |
-                                           IEC958_AES1_CON_ORIGINAL;
-        return 0;
+    ucontrol->value.iec958.status[0] = IEC958_AES0_PROFESSIONAL |
+        IEC958_AES0_NONAUDIO |
+        IEC958_AES0_CON_EMPHASIS_5015 |
+        IEC958_AES0_CON_NOT_COPYRIGHT;
+    ucontrol->value.iec958.status[1] = IEC958_AES1_CON_CATEGORY |
+        IEC958_AES1_CON_ORIGINAL;
+    return 0;
 }
 
 static int snd_hda_spdif_pmask_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        ucontrol->value.iec958.status[0] = IEC958_AES0_PROFESSIONAL |
-                                           IEC958_AES0_NONAUDIO |
-                                           IEC958_AES0_PRO_EMPHASIS_5015;
-        return 0;
+    ucontrol->value.iec958.status[0] = IEC958_AES0_PROFESSIONAL |
+        IEC958_AES0_NONAUDIO |
+        IEC958_AES0_PRO_EMPHASIS_5015;
+    return 0;
 }
 
 static int snd_hda_spdif_default_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-
-        ucontrol->value.iec958.status[0] = codec->spdif_status & 0xff;
-        ucontrol->value.iec958.status[1] = (codec->spdif_status >> 8) & 0xff;
-        ucontrol->value.iec958.status[2] = (codec->spdif_status >> 16) & 0xff;
-        ucontrol->value.iec958.status[3] = (codec->spdif_status >> 24) & 0xff;
-
-        return 0;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+
+    ucontrol->value.iec958.status[0] = codec->spdif_status & 0xff;
+    ucontrol->value.iec958.status[1] = (codec->spdif_status >> 8) & 0xff;
+    ucontrol->value.iec958.status[2] = (codec->spdif_status >> 16) & 0xff;
+    ucontrol->value.iec958.status[3] = (codec->spdif_status >> 24) & 0xff;
+
+    return 0;
 }
 
@@ -967 +970 @@
 static unsigned short convert_from_spdif_status(unsigned int sbits)
 {
-        unsigned short val = 0;
-
-        if (sbits & IEC958_AES0_PROFESSIONAL)
-                val |= 1 << 6;
-        if (sbits & IEC958_AES0_NONAUDIO)
-                val |= 1 << 5;
-        if (sbits & IEC958_AES0_PROFESSIONAL) {
-                if ((sbits & IEC958_AES0_PRO_EMPHASIS) == IEC958_AES0_PRO_EMPHASIS_5015)
-                        val |= 1 << 3;
-        } else {
-                if ((sbits & IEC958_AES0_CON_EMPHASIS) == IEC958_AES0_CON_EMPHASIS_5015)
-                        val |= 1 << 3;
-                if (! (sbits & IEC958_AES0_CON_NOT_COPYRIGHT))
-                        val |= 1 << 4;
-                if (sbits & (IEC958_AES1_CON_ORIGINAL << 8))
-                        val |= 1 << 7;
-                val |= sbits & (IEC958_AES1_CON_CATEGORY << 8);
-        }
-        return val;
+    unsigned short val = 0;
+
+    if (sbits & IEC958_AES0_PROFESSIONAL)
+        val |= 1 << 6;
+    if (sbits & IEC958_AES0_NONAUDIO)
+        val |= 1 << 5;
+    if (sbits & IEC958_AES0_PROFESSIONAL) {
+        if ((sbits & IEC958_AES0_PRO_EMPHASIS) == IEC958_AES0_PRO_EMPHASIS_5015)
+            val |= 1 << 3;
+    } else {
+        if ((sbits & IEC958_AES0_CON_EMPHASIS) == IEC958_AES0_CON_EMPHASIS_5015)
+            val |= 1 << 3;
+        if (! (sbits & IEC958_AES0_CON_NOT_COPYRIGHT))
+            val |= 1 << 4;
+        if (sbits & (IEC958_AES1_CON_ORIGINAL << 8))
+            val |= 1 << 7;
+        val |= sbits & (IEC958_AES1_CON_CATEGORY << 8);
+    }
+    return val;
 }
 
@@ -992 +995 @@
 static unsigned int convert_to_spdif_status(unsigned short val)
 {
-        unsigned int sbits = 0;
-
-        if (val & (1 << 5))
-                sbits |= IEC958_AES0_NONAUDIO;
-        if (val & (1 << 6))
-                sbits |= IEC958_AES0_PROFESSIONAL;
-        if (sbits & IEC958_AES0_PROFESSIONAL) {
-                if (sbits & (1 << 3))
-                        sbits |= IEC958_AES0_PRO_EMPHASIS_5015;
-        } else {
-                if (val & (1 << 3))
-                        sbits |= IEC958_AES0_CON_EMPHASIS_5015;
-                if (! (val & (1 << 4)))
-                        sbits |= IEC958_AES0_CON_NOT_COPYRIGHT;
-                if (val & (1 << 7))
-                        sbits |= (IEC958_AES1_CON_ORIGINAL << 8);
-                sbits |= val & (0x7f << 8);
-        }
-        return sbits;
+    unsigned int sbits = 0;
+
+    if (val & (1 << 5))
+        sbits |= IEC958_AES0_NONAUDIO;
+    if (val & (1 << 6))
+        sbits |= IEC958_AES0_PROFESSIONAL;
+    if (sbits & IEC958_AES0_PROFESSIONAL) {
+        if (sbits & (1 << 3))
+            sbits |= IEC958_AES0_PRO_EMPHASIS_5015;
+    } else {
+        if (val & (1 << 3))
+            sbits |= IEC958_AES0_CON_EMPHASIS_5015;
+        if (! (val & (1 << 4)))
+            sbits |= IEC958_AES0_CON_NOT_COPYRIGHT;
+        if (val & (1 << 7))
+            sbits |= (IEC958_AES1_CON_ORIGINAL << 8);
+        sbits |= val & (0x7f << 8);
+    }
+    return sbits;
 }
 
 static int snd_hda_spdif_default_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        hda_nid_t nid = kcontrol->private_value;
-        unsigned short val;
-        int change;
-
-        down(&codec->spdif_mutex);
-        codec->spdif_status = ucontrol->value.iec958.status[0] |
-                ((unsigned int)ucontrol->value.iec958.status[1] << 8) |
-                ((unsigned int)ucontrol->value.iec958.status[2] << 16) |
-                ((unsigned int)ucontrol->value.iec958.status[3] << 24);
-        val = convert_from_spdif_status(codec->spdif_status);
-        val |= codec->spdif_ctls & 1;
-        change = codec->spdif_ctls != val;
-        codec->spdif_ctls = val;
-
-        if (change || codec->in_resume) {
-                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1, val & 0xff);
-                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_2, val >> 8);
-        }
-
-        up(&codec->spdif_mutex);
-        return change;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    hda_nid_t nid = kcontrol->private_value;
+    unsigned short val;
+    int change;
+
+    down(&codec->spdif_mutex);
+    codec->spdif_status = ucontrol->value.iec958.status[0] |
+        ((unsigned int)ucontrol->value.iec958.status[1] << 8) |
+        ((unsigned int)ucontrol->value.iec958.status[2] << 16) |
+        ((unsigned int)ucontrol->value.iec958.status[3] << 24);
+    val = convert_from_spdif_status(codec->spdif_status);
+    val |= codec->spdif_ctls & 1;
+    change = codec->spdif_ctls != val;
+    codec->spdif_ctls = val;
+
+    if (change || codec->in_resume) {
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1, val & 0xff);
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_2, val >> 8);
+    }
+
+    up(&codec->spdif_mutex);
+    return change;
 }
 
 static int snd_hda_spdif_out_switch_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
+    uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+    uinfo->count = 1;
+    uinfo->value.integer.min = 0;
+    uinfo->value.integer.max = 1;
+    return 0;
 }
 
 static int snd_hda_spdif_out_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->spdif_ctls & 1;
-        return 0;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+
+    ucontrol->value.integer.value[0] = codec->spdif_ctls & 1;
+    return 0;
 }
 
 static int snd_hda_spdif_out_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        hda_nid_t nid = kcontrol->private_value;
-        unsigned short val;
-        int change;
-
-        down(&codec->spdif_mutex);
-        val = codec->spdif_ctls & ~1;
-        if (ucontrol->value.integer.value[0])
-                val |= 1;
-        change = codec->spdif_ctls != val;
-        if (change || codec->in_resume) {
-                codec->spdif_ctls = val;
-                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1, val & 0xff);
-                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
-                                    AC_AMP_SET_RIGHT | AC_AMP_SET_LEFT |
-                                    AC_AMP_SET_OUTPUT | ((val & 1) ? 0 : 0x80));
-        }
-        up(&codec->spdif_mutex);
-        return change;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    hda_nid_t nid = kcontrol->private_value;
+    unsigned short val;
+    int change;
+
+    down(&codec->spdif_mutex);
+    val = codec->spdif_ctls & ~1;
+    if (ucontrol->value.integer.value[0])
+        val |= 1;
+    change = codec->spdif_ctls != val;
+    if (change || codec->in_resume) {
+        codec->spdif_ctls = val;
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1, val & 0xff);
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                            AC_AMP_SET_RIGHT | AC_AMP_SET_LEFT |
+                            AC_AMP_SET_OUTPUT | ((val & 1) ? 0 : 0x80));
+    }
+    up(&codec->spdif_mutex);
+    return change;
 }
 
 static struct snd_kcontrol_new dig_mixes[] = {
-        {
-                .access = SNDRV_CTL_ELEM_ACCESS_READ,
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
-                .info = snd_hda_spdif_mask_info,
-                .get = snd_hda_spdif_cmask_get,
-        },
-        {
-                .access = SNDRV_CTL_ELEM_ACCESS_READ,
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK),
-                .info = snd_hda_spdif_mask_info,
-                .get = snd_hda_spdif_pmask_get,
-        },
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
-                .info = snd_hda_spdif_mask_info,
-                .get = snd_hda_spdif_default_get,
-                .put = snd_hda_spdif_default_put,
-        },
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH),
-                .info = snd_hda_spdif_out_switch_info,
-                .get = snd_hda_spdif_out_switch_get,
-                .put = snd_hda_spdif_out_switch_put,
-        },
-        {0} /* end */
+    {
+        .access = SNDRV_CTL_ELEM_ACCESS_READ,
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
+        .info = snd_hda_spdif_mask_info,
+        .get = snd_hda_spdif_cmask_get,
+    },
+    {
+        .access = SNDRV_CTL_ELEM_ACCESS_READ,
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK),
+        .info = snd_hda_spdif_mask_info,
+        .get = snd_hda_spdif_pmask_get,
+    },
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
+        .info = snd_hda_spdif_mask_info,
+        .get = snd_hda_spdif_default_get,
+        .put = snd_hda_spdif_default_put,
+    },
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH),
+        .info = snd_hda_spdif_out_switch_info,
+        .get = snd_hda_spdif_out_switch_get,
+        .put = snd_hda_spdif_out_switch_put,
+    },
+    {0} /* end */
 };
 
@@ -1123 +1126 @@
 int snd_hda_create_spdif_out_ctls(struct hda_codec *codec, hda_nid_t nid)
 {
-        int err;
-        struct snd_kcontrol *kctl;
-        struct snd_kcontrol_new *dig_mix;
-
-        for (dig_mix = dig_mixes; dig_mix->name; dig_mix++) {
-                kctl = snd_ctl_new1(dig_mix, codec);
-                kctl->private_value = nid;
-                if ((err = snd_ctl_add(codec->bus->card, kctl)) < 0)
-                        return err;
-        }
-        codec->spdif_ctls = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_DIGI_CONVERT, 0);
-        codec->spdif_status = convert_to_spdif_status(codec->spdif_ctls);
-        return 0;
+    int err;
+    struct snd_kcontrol *kctl;
+    struct snd_kcontrol_new *dig_mix;
+
+    for (dig_mix = dig_mixes; dig_mix->name; dig_mix++) {
+        kctl = snd_ctl_new1(dig_mix, codec);
+        kctl->private_value = nid;
+        if ((err = snd_ctl_add(codec->bus->card, kctl)) < 0)
+            return err;
+    }
+    codec->spdif_ctls = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_DIGI_CONVERT, 0);
+    codec->spdif_status = convert_to_spdif_status(codec->spdif_ctls);
+    return 0;
 }
 
@@ -1146 +1149 @@
 static int snd_hda_spdif_in_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->spdif_in_enable;
-        return 0;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+
+    ucontrol->value.integer.value[0] = codec->spdif_in_enable;
+    return 0;
 }
 
 static int snd_hda_spdif_in_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        hda_nid_t nid = kcontrol->private_value;
-        unsigned int val = !!ucontrol->value.integer.value[0];
-        int change;
-
-        down(&codec->spdif_mutex);
-        change = codec->spdif_in_enable != val;
-        if (change || codec->in_resume) {
-                codec->spdif_in_enable = val;
-                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1, val);
-        }
-        up(&codec->spdif_mutex);
-        return change;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    hda_nid_t nid = kcontrol->private_value;
+    unsigned int val = !!ucontrol->value.integer.value[0];
+    int change;
+
+    down(&codec->spdif_mutex);
+    change = codec->spdif_in_enable != val;
+    if (change || codec->in_resume) {
+        codec->spdif_in_enable = val;
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1, val);
+    }
+    up(&codec->spdif_mutex);
+    return change;
 }
 
 static int snd_hda_spdif_in_status_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        hda_nid_t nid = kcontrol->private_value;
-        unsigned short val;
-        unsigned int sbits;
-
-        val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_DIGI_CONVERT, 0);
-        sbits = convert_to_spdif_status(val);
-        ucontrol->value.iec958.status[0] = sbits;
-        ucontrol->value.iec958.status[1] = sbits >> 8;
-        ucontrol->value.iec958.status[2] = sbits >> 16;
-        ucontrol->value.iec958.status[3] = sbits >> 24;
-        return 0;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    hda_nid_t nid = kcontrol->private_value;
+    unsigned short val;
+    unsigned int sbits;
+
+    val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_DIGI_CONVERT, 0);
+    sbits = convert_to_spdif_status(val);
+    ucontrol->value.iec958.status[0] = sbits;
+    ucontrol->value.iec958.status[1] = sbits >> 8;
+    ucontrol->value.iec958.status[2] = sbits >> 16;
+    ucontrol->value.iec958.status[3] = sbits >> 24;
+    return 0;
 }
 
 static struct snd_kcontrol_new dig_in_ctls[] = {
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH),
-                .info = snd_hda_spdif_in_switch_info,
-                .get = snd_hda_spdif_in_switch_get,
-                .put = snd_hda_spdif_in_switch_put,
-        },
-        {
-                .access = SNDRV_CTL_ELEM_ACCESS_READ,
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = SNDRV_CTL_NAME_IEC958("",CAPTURE,DEFAULT),
-                .info = snd_hda_spdif_mask_info,
-                .get = snd_hda_spdif_in_status_get,
-        },
-        {0} /* end */
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH),
+        .info = snd_hda_spdif_in_switch_info,
+        .get = snd_hda_spdif_in_switch_get,
+        .put = snd_hda_spdif_in_switch_put,
+    },
+    {
+        .access = SNDRV_CTL_ELEM_ACCESS_READ,
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = SNDRV_CTL_NAME_IEC958("",CAPTURE,DEFAULT),
+        .info = snd_hda_spdif_mask_info,
+        .get = snd_hda_spdif_in_status_get,
+    },
+    {0} /* end */
 };
 
@@ -1215 +1218 @@
 int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid)
 {
-        int err;
-        struct snd_kcontrol *kctl;
-        struct snd_kcontrol_new *dig_mix;
-
-        for (dig_mix = dig_in_ctls; dig_mix->name; dig_mix++) {
-                kctl = snd_ctl_new1(dig_mix, codec);
-                kctl->private_value = nid;
-                if ((err = snd_ctl_add(codec->bus->card, kctl)) < 0)
-                        return err;
-        }
-        codec->spdif_in_enable = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_DIGI_CONVERT, 0) & 1;
-        return 0;
+    int err;
+    struct snd_kcontrol *kctl;
+    struct snd_kcontrol_new *dig_mix;
+
+    for (dig_mix = dig_in_ctls; dig_mix->name; dig_mix++) {
+        kctl = snd_ctl_new1(dig_mix, codec);
+        kctl->private_value = nid;
+        if ((err = snd_ctl_add(codec->bus->card, kctl)) < 0)
+            return err;
+    }
+    codec->spdif_in_enable = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_DIGI_CONVERT, 0) & 1;
+    return 0;
 }
 
@@ -1234 +1237 @@
  */
 static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg,
-                                unsigned int power_state)
-{
-        hda_nid_t nid, nid_start;
-        int nodes;
-
-        snd_hda_codec_write(codec, fg, 0, AC_VERB_SET_POWER_STATE,
-                            power_state);
-
-        nodes = snd_hda_get_sub_nodes(codec, fg, &nid_start);
-        for (nid = nid_start; nid < nodes + nid_start; nid++) {
-                if (get_wcaps(codec, nid) & AC_WCAP_POWER)
-                        snd_hda_codec_write(codec, nid, 0,
-                                            AC_VERB_SET_POWER_STATE,
-                                            power_state);
-        }
-
-        if (power_state == AC_PWRST_D0)
-                msleep(10);
+                                unsigned int power_state)
+{
+    hda_nid_t nid, nid_start;
+    int nodes;
+
+    snd_hda_codec_write(codec, fg, 0, AC_VERB_SET_POWER_STATE,
+                        power_state);
+
+    nodes = snd_hda_get_sub_nodes(codec, fg, &nid_start);
+    for (nid = nid_start; nid < nodes + nid_start; nid++) {
+        if (get_wcaps(codec, nid) & AC_WCAP_POWER)
+            snd_hda_codec_write(codec, nid, 0,
+                                AC_VERB_SET_POWER_STATE,
+                                power_state);
+    }
+
+    if (power_state == AC_PWRST_D0)
+        msleep(10);
 }
 
@@ -1265 +1268 @@
 int snd_hda_build_controls(struct hda_bus *bus)
 {
-        struct list_head *p;
-
-        /* build controls */
-        list_for_each(p, &bus->codec_list) {
-                struct hda_codec *codec = list_entry(p, struct hda_codec, list);
-                int err;
-                if (! codec->patch_ops.build_controls)
-                        continue;
-                err = codec->patch_ops.build_controls(codec);
-                if (err < 0)
-                        return err;
-        }
-
-        /* initialize */
-        list_for_each(p, &bus->codec_list) {
-                struct hda_codec *codec = list_entry(p, struct hda_codec, list);
-                int err;
-                hda_set_power_state(codec,
-                                    codec->afg ? codec->afg : codec->mfg,
-                                    AC_PWRST_D0);
-                if (! codec->patch_ops.init)
-                        continue;
-                err = codec->patch_ops.init(codec);
-                if (err < 0)
-                        return err;
-        }
-        return 0;
+    struct list_head *p;
+
+    /* build controls */
+    list_for_each(p, &bus->codec_list) {
+        struct hda_codec *codec = list_entry(p, struct hda_codec, list);
+        int err;
+        if (! codec->patch_ops.build_controls)
+            continue;
+        err = codec->patch_ops.build_controls(codec);
+        if (err < 0)
+            return err;
+    }
+
+    /* initialize */
+    list_for_each(p, &bus->codec_list) {
+        struct hda_codec *codec = list_entry(p, struct hda_codec, list);
+        int err;
+        hda_set_power_state(codec,
+                            codec->afg ? codec->afg : codec->mfg,
+                            AC_PWRST_D0);
+        if (! codec->patch_ops.init)
+            continue;
+        err = codec->patch_ops.init(codec);
+        if (err < 0)
+            return err;
+    }
+    return 0;
 }
 
@@ -1299 +1302 @@
  */
 struct hda_rate_tbl {
-        unsigned int hz;
-        unsigned int alsa_bits;
-        unsigned int hda_fmt;
+    unsigned int hz;
+    unsigned int alsa_bits;
+    unsigned int hda_fmt;
 };
 
 static struct hda_rate_tbl rate_bits[] = {
-        /* rate in Hz, ALSA rate bitmask, HDA format value */
-
-        /* autodetected value used in snd_hda_query_supported_pcm */
-        { 8000, SNDRV_PCM_RATE_8000, 0x0500 }, /* 1/6 x 48 */
-        { 11025, SNDRV_PCM_RATE_11025, 0x4300 }, /* 1/4 x 44 */
-        { 16000, SNDRV_PCM_RATE_16000, 0x0200 }, /* 1/3 x 48 */
-        { 22050, SNDRV_PCM_RATE_22050, 0x4100 }, /* 1/2 x 44 */
-        { 32000, SNDRV_PCM_RATE_32000, 0x0a00 }, /* 2/3 x 48 */
-        { 44100, SNDRV_PCM_RATE_44100, 0x4000 }, /* 44 */
-        { 48000, SNDRV_PCM_RATE_48000, 0x0000 }, /* 48 */
-        { 88200, SNDRV_PCM_RATE_88200, 0x4800 }, /* 2 x 44 */
-        { 96000, SNDRV_PCM_RATE_96000, 0x0800 }, /* 2 x 48 */
-        { 176400, SNDRV_PCM_RATE_176400, 0x5800 },/* 4 x 44 */
-        { 192000, SNDRV_PCM_RATE_192000, 0x1800 }, /* 4 x 48 */
-
-        /* not autodetected value */
-        { 9600, SNDRV_PCM_RATE_KNOT, 0x0400 }, /* 1/5 x 48 */
-
-        { 0 } /* terminator */
+    /* rate in Hz, ALSA rate bitmask, HDA format value */
+
+    /* autodetected value used in snd_hda_query_supported_pcm */
+    { 8000, SNDRV_PCM_RATE_8000, 0x0500 }, /* 1/6 x 48 */
+    { 11025, SNDRV_PCM_RATE_11025, 0x4300 }, /* 1/4 x 44 */
+    { 16000, SNDRV_PCM_RATE_16000, 0x0200 }, /* 1/3 x 48 */
+    { 22050, SNDRV_PCM_RATE_22050, 0x4100 }, /* 1/2 x 44 */
+    { 32000, SNDRV_PCM_RATE_32000, 0x0a00 }, /* 2/3 x 48 */
+    { 44100, SNDRV_PCM_RATE_44100, 0x4000 }, /* 44 */
+    { 48000, SNDRV_PCM_RATE_48000, 0x0000 }, /* 48 */
+    { 88200, SNDRV_PCM_RATE_88200, 0x4800 }, /* 2 x 44 */
+    { 96000, SNDRV_PCM_RATE_96000, 0x0800 }, /* 2 x 48 */
+    { 176400, SNDRV_PCM_RATE_176400, 0x5800 },/* 4 x 44 */
+    { 192000, SNDRV_PCM_RATE_192000, 0x1800 }, /* 4 x 48 */
+
+    /* not autodetected value */
+    { 9600, SNDRV_PCM_RATE_KNOT, 0x0400 }, /* 1/5 x 48 */
+
+    { 0 } /* terminator */
 };
 
@@ -1338 +1341 @@
  */
 unsigned int snd_hda_calc_stream_format(unsigned int rate,
-                                        unsigned int channels,
-                                        unsigned int format,
-                                        unsigned int maxbps)
-{
-        int i;
-        unsigned int val = 0;
-
-        for (i = 0; rate_bits[i].hz; i++)
-                if (rate_bits[i].hz == rate) {
-                        val = rate_bits[i].hda_fmt;
-                        break;
-                }
-        if (! rate_bits[i].hz) {
-                snd_printdd("invalid rate %d\n", rate);
-                return 0;
-        }
-
-        if (channels == 0 || channels > 8) {
-                snd_printdd("invalid channels %d\n", channels);
-                return 0;
-        }
-        val |= channels - 1;
-
-        switch (snd_pcm_format_width(format)) {
-        case 8:  val |= 0x00; break;
-        case 16: val |= 0x10; break;
-        case 20:
-        case 24:
-        case 32:
-                if (maxbps >= 32)
-                        val |= 0x40;
-                else if (maxbps >= 24)
-                        val |= 0x30;
-                else
-                        val |= 0x20;
-                break;
-        default:
-                snd_printdd("invalid format width %d\n", snd_pcm_format_width(format));
-                return 0;
-        }
-
-        return val;
+                                        unsigned int channels,
+                                        unsigned int format,
+                                        unsigned int maxbps)
+{
+    int i;
+    unsigned int val = 0;
+
+    for (i = 0; rate_bits[i].hz; i++)
+        if (rate_bits[i].hz == rate) {
+            val = rate_bits[i].hda_fmt;
+            break;
+        }
+    if (! rate_bits[i].hz) {
+        snd_printdd("invalid rate %d\n", rate);
+        return 0;
+    }
+
+    if (channels == 0 || channels > 8) {
+        snd_printdd("invalid channels %d\n", channels);
+        return 0;
+    }
+    val |= channels - 1;
+
+    switch (snd_pcm_format_width(format)) {
+    case 8:  val |= 0x00; break;
+    case 16: val |= 0x10; break;
+    case 20:
+    case 24:
+    case 32:
+        if (maxbps >= 32)
+            val |= 0x40;
+        else if (maxbps >= 24)
+            val |= 0x30;
+        else
+            val |= 0x20;
+        break;
+    default:
+        snd_printdd("invalid format width %d\n", snd_pcm_format_width(format));
+        return 0;
+    }
+
+    return val;
 }
 
@@ -1396 +1399 @@
  */
 int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid,
-                                u32 *ratesp, u64 *formatsp, unsigned int *bpsp)
-{
-        int i;
-        unsigned int val, streams;
-
-        val = 0;
-        if (nid != codec->afg &&
-            (get_wcaps(codec, nid) & AC_WCAP_FORMAT_OVRD)) {
-                val = snd_hda_param_read(codec, nid, AC_PAR_PCM);
-                if (val == -1)
-                        return -EIO;
-        }
-        if (! val)
-                val = snd_hda_param_read(codec, codec->afg, AC_PAR_PCM);
-
-        if (ratesp) {
-                u32 rates = 0;
-                for (i = 0; rate_bits[i].hz; i++) {
-                        if (val & (1 << i))
-                                rates |= rate_bits[i].alsa_bits;
-                }
-                *ratesp = rates;
-        }
-
-        if (formatsp || bpsp) {
-                u64 formats = 0;
-                unsigned int bps;
-                unsigned int wcaps;
-
-                wcaps = get_wcaps(codec, nid);
-                streams = snd_hda_param_read(codec, nid, AC_PAR_STREAM);
-                if (streams == -1)
-                        return -EIO;
-                if (! streams) {
-                        streams = snd_hda_param_read(codec, codec->afg, AC_PAR_STREAM);
-                        if (streams == -1)
-                                return -EIO;
-                }
-
-                bps = 0;
-                if (streams & AC_SUPFMT_PCM) {
-                        if (val & AC_SUPPCM_BITS_8) {
-                                formats |= SNDRV_PCM_FMTBIT_U8;
-                                bps = 8;
-                        }
-                        if (val & AC_SUPPCM_BITS_16) {
-                                formats |= SNDRV_PCM_FMTBIT_S16_LE;
-                                bps = 16;
-                        }
-                        if (wcaps & AC_WCAP_DIGITAL) {
-                                if (val & AC_SUPPCM_BITS_32)
-                                        formats |= SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE;
-                                if (val & (AC_SUPPCM_BITS_20|AC_SUPPCM_BITS_24))
-                                        formats |= SNDRV_PCM_FMTBIT_S32_LE;
-                                if (val & AC_SUPPCM_BITS_24)
-                                        bps = 24;
-                                else if (val & AC_SUPPCM_BITS_20)
-                                        bps = 20;
-                        } else if (val & (AC_SUPPCM_BITS_20|AC_SUPPCM_BITS_24|AC_SUPPCM_BITS_32)) {
-                                formats |= SNDRV_PCM_FMTBIT_S32_LE;
-                                if (val & AC_SUPPCM_BITS_32)
-                                        bps = 32;
-                                else if (val & AC_SUPPCM_BITS_20)
-                                        bps = 20;
-                                else if (val & AC_SUPPCM_BITS_24)
-                                        bps = 24;
-                        }
-                }
-                else if (streams == AC_SUPFMT_FLOAT32) { /* should be exclusive */
-                        formats |= SNDRV_PCM_FMTBIT_FLOAT_LE;
-                        bps = 32;
-                } else if (streams == AC_SUPFMT_AC3) { /* should be exclusive */
-                        /* temporary hack: we have still no proper support
-                         * for the direct AC3 stream...
-                         */
-                        formats |= SNDRV_PCM_FMTBIT_U8;
-                        bps = 8;
-                }
-                if (formatsp)
-                        *formatsp = formats;
-                if (bpsp)
-                        *bpsp = bps;
-        }
-
-        return 0;
+                                u32 *ratesp, u64 *formatsp, unsigned int *bpsp)
+{
+    int i;
+    unsigned int val, streams;
+
+    val = 0;
+    if (nid != codec->afg &&
+        (get_wcaps(codec, nid) & AC_WCAP_FORMAT_OVRD)) {
+        val = snd_hda_param_read(codec, nid, AC_PAR_PCM);
+        if (val == -1)
+            return -EIO;
+    }
+    if (! val)
+        val = snd_hda_param_read(codec, codec->afg, AC_PAR_PCM);
+
+    if (ratesp) {
+        u32 rates = 0;
+        for (i = 0; rate_bits[i].hz; i++) {
+            if (val & (1 << i))
+                rates |= rate_bits[i].alsa_bits;
+        }
+        *ratesp = rates;
+    }
+
+    if (formatsp || bpsp) {
+        u64 formats = 0;
+        unsigned int bps;
+        unsigned int wcaps;
+
+        wcaps = get_wcaps(codec, nid);
+        streams = snd_hda_param_read(codec, nid, AC_PAR_STREAM);
+        if (streams == -1)
+            return -EIO;
+        if (! streams) {
+            streams = snd_hda_param_read(codec, codec->afg, AC_PAR_STREAM);
+            if (streams == -1)
+                return -EIO;
+        }
+
+        bps = 0;
+        if (streams & AC_SUPFMT_PCM) {
+            if (val & AC_SUPPCM_BITS_8) {
+                formats |= SNDRV_PCM_FMTBIT_U8;
+                bps = 8;
+            }
+            if (val & AC_SUPPCM_BITS_16) {
+                formats |= SNDRV_PCM_FMTBIT_S16_LE;
+                bps = 16;
+            }
+            if (wcaps & AC_WCAP_DIGITAL) {
+                if (val & AC_SUPPCM_BITS_32)
+                    formats |= SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE;
+                if (val & (AC_SUPPCM_BITS_20|AC_SUPPCM_BITS_24))
+                    formats |= SNDRV_PCM_FMTBIT_S32_LE;
+                if (val & AC_SUPPCM_BITS_24)
+                    bps = 24;
+                else if (val & AC_SUPPCM_BITS_20)
+                    bps = 20;
+            } else if (val & (AC_SUPPCM_BITS_20|AC_SUPPCM_BITS_24|AC_SUPPCM_BITS_32)) {
+                formats |= SNDRV_PCM_FMTBIT_S32_LE;
+                if (val & AC_SUPPCM_BITS_32)
+                    bps = 32;
+                else if (val & AC_SUPPCM_BITS_20)
+                    bps = 20;
+                else if (val & AC_SUPPCM_BITS_24)
+                    bps = 24;
+            }
+        }
+        else if (streams == AC_SUPFMT_FLOAT32) { /* should be exclusive */
+            formats |= SNDRV_PCM_FMTBIT_FLOAT_LE;
+            bps = 32;
+        } else if (streams == AC_SUPFMT_AC3) { /* should be exclusive */
+            /* temporary hack: we have still no proper support
+             * for the direct AC3 stream...
+             */
+            formats |= SNDRV_PCM_FMTBIT_U8;
+            bps = 8;
+        }
+        if (formatsp)
+            *formatsp = formats;
+        if (bpsp)
+            *bpsp = bps;
+    }
+
+    return 0;
 }
 
@@ -1489 +1492 @@
  */
 int snd_hda_is_supported_format(struct hda_codec *codec, hda_nid_t nid,
-                                unsigned int format)
-{
-        int i;
-        unsigned int val = 0, rate, stream;
-
-        if (nid != codec->afg &&
-            (get_wcaps(codec, nid) & AC_WCAP_FORMAT_OVRD)) {
-                val = snd_hda_param_read(codec, nid, AC_PAR_PCM);
-                if (val == -1)
-                        return 0;
-        }
-        if (! val) {
-                val = snd_hda_param_read(codec, codec->afg, AC_PAR_PCM);
-                if (val == -1)
-                        return 0;
-        }
-
-        rate = format & 0xff00;
-        for (i = 0; rate_bits[i].hz; i++)
-                if (rate_bits[i].hda_fmt == rate) {
-                        if (val & (1 << i))
-                                break;
-                        return 0;
-                }
-        if (! rate_bits[i].hz)
-                return 0;
-
-        stream = snd_hda_param_read(codec, nid, AC_PAR_STREAM);
-        if (stream == -1)
-                return 0;
-        if (! stream && nid != codec->afg)
-                stream = snd_hda_param_read(codec, codec->afg, AC_PAR_STREAM);
-        if (! stream || stream == -1)
-                return 0;
-
-        if (stream & AC_SUPFMT_PCM) {
-                switch (format & 0xf0) {
-                case 0x00:
-                        if (! (val & AC_SUPPCM_BITS_8))
-                                return 0;
-                        break;
-                case 0x10:
-                        if (! (val & AC_SUPPCM_BITS_16))
-                                return 0;
-                        break;
-                case 0x20:
-                        if (! (val & AC_SUPPCM_BITS_20))
-                                return 0;
-                        break;
-                case 0x30:
-                        if (! (val & AC_SUPPCM_BITS_24))
-                                return 0;
-                        break;
-                case 0x40:
-                        if (! (val & AC_SUPPCM_BITS_32))
-                                return 0;
-                        break;
-                default:
-                        return 0;
-                }
-        } else {
-                /* FIXME: check for float32 and AC3? */
-        }
-
-        return 1;
+                                unsigned int format)
+{
+    int i;
+    unsigned int val = 0, rate, stream;
+
+    if (nid != codec->afg &&
+        (get_wcaps(codec, nid) & AC_WCAP_FORMAT_OVRD)) {
+        val = snd_hda_param_read(codec, nid, AC_PAR_PCM);
+        if (val == -1)
+            return 0;
+    }
+    if (! val) {
+        val = snd_hda_param_read(codec, codec->afg, AC_PAR_PCM);
+        if (val == -1)
+            return 0;
+    }
+
+    rate = format & 0xff00;
+    for (i = 0; rate_bits[i].hz; i++)
+        if (rate_bits[i].hda_fmt == rate) {
+            if (val & (1 << i))
+                break;
+            return 0;
+        }
+    if (! rate_bits[i].hz)
+        return 0;
+
+    stream = snd_hda_param_read(codec, nid, AC_PAR_STREAM);
+    if (stream == -1)
+        return 0;
+    if (! stream && nid != codec->afg)
+        stream = snd_hda_param_read(codec, codec->afg, AC_PAR_STREAM);
+    if (! stream || stream == -1)
+        return 0;
+
+    if (stream & AC_SUPFMT_PCM) {
+        switch (format & 0xf0) {
+        case 0x00:
+            if (! (val & AC_SUPPCM_BITS_8))
+                return 0;
+            break;
+        case 0x10:
+            if (! (val & AC_SUPPCM_BITS_16))
+                return 0;
+            break;
+        case 0x20:
+            if (! (val & AC_SUPPCM_BITS_20))
+                return 0;
+            break;
+        case 0x30:
+            if (! (val & AC_SUPPCM_BITS_24))
+                return 0;
+            break;
+        case 0x40:
+            if (! (val & AC_SUPPCM_BITS_32))
+                return 0;
+            break;
+        default:
+            return 0;
+        }
+    } else {
+        /* FIXME: check for float32 and AC3? */
+    }
+
+    return 1;
 }
 
@@ -1560 +1563 @@
  */
 static int hda_pcm_default_open_close(struct hda_pcm_stream *hinfo,
-                                      struct hda_codec *codec,
-                                      struct snd_pcm_substream *substream)
-{
-        return 0;
+                                      struct hda_codec *codec,
+                                      struct snd_pcm_substream *substream)
+{
+    return 0;
 }
 
 static int hda_pcm_default_prepare(struct hda_pcm_stream *hinfo,
-                                   struct hda_codec *codec,
-                                   unsigned int stream_tag,
-                                   unsigned int format,
-                                   struct snd_pcm_substream *substream)
-{
-        snd_hda_codec_setup_stream(codec, hinfo->nid, stream_tag, 0, format);
-        return 0;
+                                   struct hda_codec *codec,
+                                   unsigned int stream_tag,
+                                   unsigned int format,
+                                   struct snd_pcm_substream *substream)
+{
+    snd_hda_codec_setup_stream(codec, hinfo->nid, stream_tag, 0, format);
+    return 0;
 }
 
 static int hda_pcm_default_cleanup(struct hda_pcm_stream *hinfo,
-                                   struct hda_codec *codec,
-                                   struct snd_pcm_substream *substream)
-{
-        snd_hda_codec_setup_stream(codec, hinfo->nid, 0, 0, 0);
-        return 0;
+                                   struct hda_codec *codec,
+                                   struct snd_pcm_substream *substream)
+{
+    snd_hda_codec_setup_stream(codec, hinfo->nid, 0, 0, 0);
+    return 0;
 }
 
 static int set_pcm_default_values(struct hda_codec *codec, struct hda_pcm_stream *info)
 {
-        if (info->nid) {
-                /* query support PCM information from the given NID */
-                if (! info->rates || ! info->formats)
-                        snd_hda_query_supported_pcm(codec, info->nid,
-                                                    info->rates ? NULL : &info->rates,
-                                                    info->formats ? NULL : &info->formats,
-                                                    info->maxbps ? NULL : &info->maxbps);
-        }
-        if (info->ops.open == NULL)
-                info->ops.open = hda_pcm_default_open_close;
-        if (info->ops.close == NULL)
-                info->ops.close = hda_pcm_default_open_close;
-        if (info->ops.prepare == NULL) {
-                snd_assert(info->nid, return -EINVAL);
-                info->ops.prepare = hda_pcm_default_prepare;
-        }
-        if (info->ops.cleanup == NULL) {
-                snd_assert(info->nid, return -EINVAL);
-                info->ops.cleanup = hda_pcm_default_cleanup;
-        }
-        return 0;
+    if (info->nid) {
+        /* query support PCM information from the given NID */
+        if (! info->rates || ! info->formats)
+            snd_hda_query_supported_pcm(codec, info->nid,
+                                        info->rates ? NULL : &info->rates,
+                                        info->formats ? NULL : &info->formats,
+                                        info->maxbps ? NULL : &info->maxbps);
+    }
+    if (info->ops.open == NULL)
+        info->ops.open = hda_pcm_default_open_close;
+    if (info->ops.close == NULL)
+        info->ops.close = hda_pcm_default_open_close;
+    if (info->ops.prepare == NULL) {
+        snd_assert(info->nid, return -EINVAL);
+        info->ops.prepare = hda_pcm_default_prepare;
+    }
+    if (info->ops.cleanup == NULL) {
+        snd_assert(info->nid, return -EINVAL);
+        info->ops.cleanup = hda_pcm_default_cleanup;
+    }
+    return 0;
 }
 
@@ -1637 +1640 @@
 int snd_hda_build_pcms(struct hda_bus *bus)
 {
-        struct list_head *p;
-
-        list_for_each(p, &bus->codec_list) {
-                struct hda_codec *codec = list_entry(p, struct hda_codec, list);
-                unsigned int pcm, s;
-                int err;
-                if (! codec->patch_ops.build_pcms)
-                        continue;
-                err = codec->patch_ops.build_pcms(codec);
-                if (err < 0)
-                        return err;
-                for (pcm = 0; pcm < codec->num_pcms; pcm++) {
-                        for (s = 0; s < 2; s++) {
-                                struct hda_pcm_stream *info;
-                                info = &codec->pcm_info[pcm].stream[s];
-                                if (! info->substreams)
-                                        continue;
-                                err = set_pcm_default_values(codec, info);
-                                if (err < 0)
-                                        return err;
-                        }
-                }
-        }
-        return 0;
+    struct list_head *p;
+
+    list_for_each(p, &bus->codec_list) {
+        struct hda_codec *codec = list_entry(p, struct hda_codec, list);
+        unsigned int pcm, s;
+        int err;
+        if (! codec->patch_ops.build_pcms)
+            continue;
+        err = codec->patch_ops.build_pcms(codec);
+        if (err < 0)
+            return err;
+        for (pcm = 0; pcm < codec->num_pcms; pcm++) {
+            for (s = 0; s < 2; s++) {
+                struct hda_pcm_stream *info;
+                info = &codec->pcm_info[pcm].stream[s];
+                if (! info->substreams)
+                    continue;
+                err = set_pcm_default_values(codec, info);
+                if (err < 0)
+                    return err;
+            }
+        }
+    }
+    return 0;
 }
 
@@ -1677 +1680 @@
 int snd_hda_check_board_config(struct hda_codec *codec, const struct hda_board_config *tbl)
 {
-        const struct hda_board_config *c;
-
-        if (codec->bus->modelname) {
-                for (c = tbl; c->modelname || c->pci_subvendor; c++) {
-                        if (c->modelname &&
-                            ! strcmp(codec->bus->modelname, c->modelname)) {
-                                snd_printd(KERN_INFO "hda_codec: model '%s' is selected\n", c->modelname);
-                                return c->config;
-                        }
-                }
-        }
-
-        if (codec->bus->pci) {
-                u16 subsystem_vendor, subsystem_device;
-                pci_read_config_word(codec->bus->pci, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vendor);
-                pci_read_config_word(codec->bus->pci, PCI_SUBSYSTEM_ID, &subsystem_device);
-                for (c = tbl; c->modelname || c->pci_subvendor; c++) {
-                        if (c->pci_subvendor == subsystem_vendor &&
-                            (! c->pci_subdevice /* all match */||
-                             (c->pci_subdevice == subsystem_device))) {
-                                snd_printdd(KERN_INFO "hda_codec: PCI %x:%x, codec config %d is selected\n",
-                                            subsystem_vendor, subsystem_device, c->config);
-                                return c->config;
-                        }
-                }
-        }
-        return -1;
+    const struct hda_board_config *c;
+
+    if (codec->bus->modelname) {
+        for (c = tbl; c->modelname || c->pci_subvendor; c++) {
+            if (c->modelname &&
+                ! strcmp(codec->bus->modelname, c->modelname)) {
+                snd_printd(KERN_INFO "hda_codec: model '%s' is selected\n", c->modelname);
+                return c->config;
+            }
+        }
+    }
+
+    if (codec->bus->pci) {
+        u16 subsystem_vendor, subsystem_device;
+        pci_read_config_word(codec->bus->pci, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vendor);
+        pci_read_config_word(codec->bus->pci, PCI_SUBSYSTEM_ID, &subsystem_device);
+        for (c = tbl; c->modelname || c->pci_subvendor; c++) {
+            if (c->pci_subvendor == subsystem_vendor &&
+                (! c->pci_subdevice /* all match */||
+                 (c->pci_subdevice == subsystem_device))) {
+                snd_printdd(KERN_INFO "hda_codec: PCI %x:%x, codec config %d is selected\n",
+                            subsystem_vendor, subsystem_device, c->config);
+                return c->config;
+            }
+        }
+    }
+    return -1;
 }
 
@@ -1718 +1721 @@
 int snd_hda_add_new_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew)
 {
-        int err;
-
-        for (; knew->name; knew++) {
-                struct snd_kcontrol *kctl;
-                kctl = snd_ctl_new1(knew, codec);
-                if (! kctl)
-                        return -ENOMEM;
-                err = snd_ctl_add(codec->bus->card, kctl);
-                if (err < 0) {
-                        if (! codec->addr)
-                                return err;
-                        kctl = snd_ctl_new1(knew, codec);
-                        if (! kctl)
-                                return -ENOMEM;
-                        kctl->id.device = codec->addr;
-                        if ((err = snd_ctl_add(codec->bus->card, kctl)) < 0)
-                                return err;
-                }
-        }
-        return 0;
+    int err;
+
+    for (; knew->name; knew++) {
+        struct snd_kcontrol *kctl;
+        kctl = snd_ctl_new1(knew, codec);
+        if (! kctl)
+            return -ENOMEM;
+        err = snd_ctl_add(codec->bus->card, kctl);
+        if (err < 0) {
+            if (! codec->addr)
+                return err;
+            kctl = snd_ctl_new1(knew, codec);
+            if (! kctl)
+                return -ENOMEM;
+            kctl->id.device = codec->addr;
+            if ((err = snd_ctl_add(codec->bus->card, kctl)) < 0)
+                return err;
+        }
+    }
+    return 0;
 }
 
@@ -1745 +1748 @@
  */
 int snd_hda_ch_mode_info(struct hda_codec *codec, struct snd_ctl_elem_info *uinfo,
-                         const struct hda_channel_mode *chmode, int num_chmodes)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = num_chmodes;
-        if (uinfo->value.enumerated.item >= num_chmodes)
-                uinfo->value.enumerated.item = num_chmodes - 1;
-        sprintf(uinfo->value.enumerated.name, "%dch",
-                chmode[uinfo->value.enumerated.item].channels);
-        return 0;
+                         const struct hda_channel_mode *chmode, int num_chmodes)
+{
+    uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+    uinfo->count = 1;
+    uinfo->value.enumerated.items = num_chmodes;
+    if (uinfo->value.enumerated.item >= num_chmodes)
+        uinfo->value.enumerated.item = num_chmodes - 1;
+    sprintf(uinfo->value.enumerated.name, "%dch",
+            chmode[uinfo->value.enumerated.item].channels);
+    return 0;
 }
 
 int snd_hda_ch_mode_get(struct hda_codec *codec, struct snd_ctl_elem_value *ucontrol,
-                        const struct hda_channel_mode *chmode, int num_chmodes,
-                        int max_channels)
-{
-        int i;
-
-        for (i = 0; i < num_chmodes; i++) {
-                if (max_channels == chmode[i].channels) {
-                        ucontrol->value.enumerated.item[0] = i;
-                        break;
-                }
-        }
-        return 0;
+                        const struct hda_channel_mode *chmode, int num_chmodes,
+                        int max_channels)
+{
+    int i;
+
+    for (i = 0; i < num_chmodes; i++) {
+        if (max_channels == chmode[i].channels) {
+            ucontrol->value.enumerated.item[0] = i;
+            break;
+        }
+    }
+    return 0;
 }
 
 int snd_hda_ch_mode_put(struct hda_codec *codec, struct snd_ctl_elem_value *ucontrol,
-                        const struct hda_channel_mode *chmode, int num_chmodes,
-                        int *max_channelsp)
-{
-        unsigned int mode;
-
-        mode = ucontrol->value.enumerated.item[0];
-        snd_assert(mode < num_chmodes, return -EINVAL);
-        if (*max_channelsp == chmode[mode].channels && ! codec->in_resume)
-                return 0;
-        /* change the current channel setting */
-        *max_channelsp = chmode[mode].channels;
-        if (chmode[mode].sequence)
-                snd_hda_sequence_write(codec, chmode[mode].sequence);
-        return 1;
+                        const struct hda_channel_mode *chmode, int num_chmodes,
+                        int *max_channelsp)
+{
+    unsigned int mode;
+
+    mode = ucontrol->value.enumerated.item[0];
+    snd_assert(mode < num_chmodes, return -EINVAL);
+    if (*max_channelsp == chmode[mode].channels && ! codec->in_resume)
+        return 0;
+    /* change the current channel setting */
+    *max_channelsp = chmode[mode].channels;
+    if (chmode[mode].sequence)
+        snd_hda_sequence_write(codec, chmode[mode].sequence);
+    return 1;
 }
 
@@ -1794 +1797 @@
 int snd_hda_input_mux_info(const struct hda_input_mux *imux, struct snd_ctl_elem_info *uinfo)
 {
-        unsigned int index;
-
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = imux->num_items;
-        index = uinfo->value.enumerated.item;
-        if (index >= imux->num_items)
-                index = imux->num_items - 1;
-        strcpy(uinfo->value.enumerated.name, imux->items[index].label);
-        return 0;
+    unsigned int index;
+
+    uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+    uinfo->count = 1;
+    uinfo->value.enumerated.items = imux->num_items;
+    index = uinfo->value.enumerated.item;
+    if (index >= imux->num_items)
+        index = imux->num_items - 1;
+    strcpy(uinfo->value.enumerated.name, imux->items[index].label);
+    return 0;
 }
 
 int snd_hda_input_mux_put(struct hda_codec *codec, const struct hda_input_mux *imux,
-                          struct snd_ctl_elem_value *ucontrol, hda_nid_t nid,
-                          unsigned int *cur_val)
-{
-        unsigned int idx;
-
-        idx = ucontrol->value.enumerated.item[0];
-        if (idx >= imux->num_items)
-                idx = imux->num_items - 1;
-        if (*cur_val == idx && ! codec->in_resume)
-                return 0;
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL,
-                            imux->items[idx].index);
-        *cur_val = idx;
-        return 1;
+                          struct snd_ctl_elem_value *ucontrol, hda_nid_t nid,
+                          unsigned int *cur_val)
+{
+    unsigned int idx;
+
+    idx = ucontrol->value.enumerated.item[0];
+    if (idx >= imux->num_items)
+        idx = imux->num_items - 1;
+    if (*cur_val == idx && ! codec->in_resume)
+        return 0;
+    snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL,
+                        imux->items[idx].index);
+    *cur_val = idx;
+    return 1;
 }
 
@@ -1833 +1836 @@
 int snd_hda_multi_out_dig_open(struct hda_codec *codec, struct hda_multi_out *mout)
 {
-        down(&codec->spdif_mutex);
-        if (mout->dig_out_used) {
-                up(&codec->spdif_mutex);
-                return -EBUSY; /* already being used */
-        }
-        mout->dig_out_used = HDA_DIG_EXCLUSIVE;
-        up(&codec->spdif_mutex);
-        return 0;
+    down(&codec->spdif_mutex);
+    if (mout->dig_out_used) {
+        up(&codec->spdif_mutex);
+        return -EBUSY; /* already being used */
+    }
+    mout->dig_out_used = HDA_DIG_EXCLUSIVE;
+    up(&codec->spdif_mutex);
+    return 0;
 }
 
@@ -1848 +1851 @@
 int snd_hda_multi_out_dig_close(struct hda_codec *codec, struct hda_multi_out *mout)
 {
-        down(&codec->spdif_mutex);
-        mout->dig_out_used = 0;
-        up(&codec->spdif_mutex);
-        return 0;
+    down(&codec->spdif_mutex);
+    mout->dig_out_used = 0;
+    up(&codec->spdif_mutex);
+    return 0;
 }
 
@@ -1858 +1861 @@
  */
 int snd_hda_multi_out_analog_open(struct hda_codec *codec, struct hda_multi_out *mout,
-                                  struct snd_pcm_substream *substream)
-{
-        substream->runtime->hw.channels_max = mout->max_channels;
-        return snd_pcm_hw_constraint_step(substream->runtime, 0,
-                                          SNDRV_PCM_HW_PARAM_CHANNELS, 2);
+                                  struct snd_pcm_substream *substream)
+{
+    substream->runtime->hw.channels_max = mout->max_channels;
+    return snd_pcm_hw_constraint_step(substream->runtime, 0,
+                                      SNDRV_PCM_HW_PARAM_CHANNELS, 2);
 }
 
@@ -1870 +1873 @@
  */
 int snd_hda_multi_out_analog_prepare(struct hda_codec *codec, struct hda_multi_out *mout,
-                                     unsigned int stream_tag,
-                                     unsigned int format,
-                                     struct snd_pcm_substream *substream)
-{
-        hda_nid_t *nids = mout->dac_nids;
-        int chs = substream->runtime->channels;
-        int i;
-
-        down(&codec->spdif_mutex);
-        if (mout->dig_out_nid && mout->dig_out_used != HDA_DIG_EXCLUSIVE) {
-                if (chs == 2 &&
-                    snd_hda_is_supported_format(codec, mout->dig_out_nid, format) &&
-                    ! (codec->spdif_status & IEC958_AES0_NONAUDIO)) {
-                        mout->dig_out_used = HDA_DIG_ANALOG_DUP;
-                        /* setup digital receiver */
-                        snd_hda_codec_setup_stream(codec, mout->dig_out_nid,
-                                                   stream_tag, 0, format);
-                } else {
-                        mout->dig_out_used = 0;
-                        snd_hda_codec_setup_stream(codec, mout->dig_out_nid, 0, 0, 0);
-                }
-        }
-        up(&codec->spdif_mutex);
-
-        /* front */
-        snd_hda_codec_setup_stream(codec, nids[HDA_FRONT], stream_tag, 0, format);
-        if (mout->hp_nid)
-                /* headphone out will just decode front left/right (stereo) */
-            snd_hda_codec_setup_stream(codec, mout->hp_nid, stream_tag, 0, format);
-        /* extra outputs copied from front */
-        for (i = 0; i < ARRAY_SIZE(mout->extra_out_nid); i++)
-            if (mout->extra_out_nid[i])
-                snd_hda_codec_setup_stream(codec,
-                                           mout->extra_out_nid[i],
-                                           stream_tag, 0, format);
-
-        /* surrounds */
-        for (i = 1; i < mout->num_dacs; i++) {
-                if (chs >= (i + 1) * 2) /* independent out */
-                        snd_hda_codec_setup_stream(codec, nids[i], stream_tag, i * 2,
-                                                   format);
-                else /* copy front */
-                        snd_hda_codec_setup_stream(codec, nids[i], stream_tag, 0,
-                                                   format);
-        }
-        return 0;
+                                     unsigned int stream_tag,
+                                     unsigned int format,
+                                     struct snd_pcm_substream *substream)
+{
+    hda_nid_t *nids = mout->dac_nids;
+    int chs = substream->runtime->channels;
+    int i;
+
+    down(&codec->spdif_mutex);
+    if (mout->dig_out_nid && mout->dig_out_used != HDA_DIG_EXCLUSIVE) {
+        if (chs == 2 &&
+            snd_hda_is_supported_format(codec, mout->dig_out_nid, format) &&
+            ! (codec->spdif_status & IEC958_AES0_NONAUDIO)) {
+            mout->dig_out_used = HDA_DIG_ANALOG_DUP;
+            /* setup digital receiver */
+            snd_hda_codec_setup_stream(codec, mout->dig_out_nid,
+                                       stream_tag, 0, format);
+        } else {
+            mout->dig_out_used = 0;
+            snd_hda_codec_setup_stream(codec, mout->dig_out_nid, 0, 0, 0);
+        }
+    }
+    up(&codec->spdif_mutex);
+
+    /* front */
+    snd_hda_codec_setup_stream(codec, nids[HDA_FRONT], stream_tag, 0, format);
+    if (mout->hp_nid)
+        /* headphone out will just decode front left/right (stereo) */
+        snd_hda_codec_setup_stream(codec, mout->hp_nid, stream_tag, 0, format);
+    /* extra outputs copied from front */
+    for (i = 0; i < ARRAY_SIZE(mout->extra_out_nid); i++)
+        if (mout->extra_out_nid[i])
+            snd_hda_codec_setup_stream(codec,
+                                       mout->extra_out_nid[i],
+                                       stream_tag, 0, format);
+
+    /* surrounds */
+    for (i = 1; i < mout->num_dacs; i++) {
+        if (chs >= (i + 1) * 2) /* independent out */
+            snd_hda_codec_setup_stream(codec, nids[i], stream_tag, i * 2,
+                                       format);
+        else /* copy front */
+            snd_hda_codec_setup_stream(codec, nids[i], stream_tag, 0,
+                                       format);
+    }
+    return 0;
 }
 
@@ -1923 +1926 @@
 int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec, struct hda_multi_out *mout)
 {
-        hda_nid_t *nids = mout->dac_nids;
-        int i;
-
-        for (i = 0; i < mout->num_dacs; i++)
-                snd_hda_codec_setup_stream(codec, nids[i], 0, 0, 0);
-        if (mout->hp_nid)
-            snd_hda_codec_setup_stream(codec, mout->hp_nid, 0, 0, 0);
-        for (i = 0; i < ARRAY_SIZE(mout->extra_out_nid); i++)
-            if (mout->extra_out_nid[i])
-                snd_hda_codec_setup_stream(codec,
-                                           mout->extra_out_nid[i],
-                                           0, 0, 0);
-        down(&codec->spdif_mutex);
-        if (mout->dig_out_nid && mout->dig_out_used == HDA_DIG_ANALOG_DUP) {
-                snd_hda_codec_setup_stream(codec, mout->dig_out_nid, 0, 0, 0);
-                mout->dig_out_used = 0;
-        }
-        up(&codec->spdif_mutex);
-        return 0;
+    hda_nid_t *nids = mout->dac_nids;
+    int i;
+
+    for (i = 0; i < mout->num_dacs; i++)
+        snd_hda_codec_setup_stream(codec, nids[i], 0, 0, 0);
+    if (mout->hp_nid)
+        snd_hda_codec_setup_stream(codec, mout->hp_nid, 0, 0, 0);
+    for (i = 0; i < ARRAY_SIZE(mout->extra_out_nid); i++)
+        if (mout->extra_out_nid[i])
+            snd_hda_codec_setup_stream(codec,
+                                       mout->extra_out_nid[i],
+                                       0, 0, 0);
+    down(&codec->spdif_mutex);
+    if (mout->dig_out_nid && mout->dig_out_used == HDA_DIG_ANALOG_DUP) {
+        snd_hda_codec_setup_stream(codec, mout->dig_out_nid, 0, 0, 0);
+        mout->dig_out_used = 0;
+    }
+    up(&codec->spdif_mutex);
+    return 0;
 }
 
@@ -1950 +1953 @@
 static int is_in_nid_list(hda_nid_t nid, hda_nid_t *list)
 {
-        for (; *list; list++)
-                if (*list == nid)
-                        return 1;
-        return 0;
+    for (; *list; list++)
+        if (*list == nid)
+            return 1;
+    return 0;
 }
 
@@ -1974 +1977 @@
  */
 int snd_hda_parse_pin_def_config(struct hda_codec *codec, struct auto_pin_cfg *cfg,
-                                 hda_nid_t *ignore_nids)
-{
-        hda_nid_t nid, nid_start;
-        int i, j, nodes;
-        short seq, assoc_line_out, sequences[ARRAY_SIZE(cfg->line_out_pins)];
-
-        memset(cfg, 0, sizeof(*cfg));
-
-        memset(sequences, 0, sizeof(sequences));
-        assoc_line_out = 0;
-
-        nodes = snd_hda_get_sub_nodes(codec, codec->afg, &nid_start);
-        for (nid = nid_start; nid < nodes + nid_start; nid++) {
-                unsigned int wid_caps = get_wcaps(codec, nid);
-                unsigned int wid_type = (wid_caps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
-                unsigned int def_conf;
-                short assoc, loc;
-
-                /* read all default configuration for pin complex */
-                if (wid_type != AC_WID_PIN)
-                        continue;
-                /* ignore the given nids (e.g. pc-beep returns error) */
-                if (ignore_nids && is_in_nid_list(nid, ignore_nids))
-                        continue;
-
-                def_conf = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
-                if (get_defcfg_connect(def_conf) == AC_JACK_PORT_NONE)
-                        continue;
-                loc = get_defcfg_location(def_conf);
-                switch (get_defcfg_device(def_conf)) {
-                case AC_JACK_LINE_OUT:
-                        seq = get_defcfg_sequence(def_conf);
-                        assoc = get_defcfg_association(def_conf);
-                        if (! assoc)
-                                continue;
-                        if (! assoc_line_out)
-                                assoc_line_out = assoc;
-                        else if (assoc_line_out != assoc)
-                                continue;
-                        if (cfg->line_outs >= ARRAY_SIZE(cfg->line_out_pins))
-                                continue;
-                        cfg->line_out_pins[cfg->line_outs] = nid;
-                        sequences[cfg->line_outs] = seq;
-                        cfg->line_outs++;
-                        break;
-                case AC_JACK_SPEAKER:
-                    if (cfg->speaker_outs >= ARRAY_SIZE(cfg->speaker_pins))
-                        continue;
-                    cfg->speaker_pins[cfg->speaker_outs] = nid;
-                    cfg->speaker_outs++;
-                    break;
-                case AC_JACK_HP_OUT:
-                        cfg->hp_pin = nid;
-                        break;
-                case AC_JACK_MIC_IN:
-                        if (loc == AC_JACK_LOC_FRONT)
-                                cfg->input_pins[AUTO_PIN_FRONT_MIC] = nid;
-                        else
-                                cfg->input_pins[AUTO_PIN_MIC] = nid;
-                        break;
-                case AC_JACK_LINE_IN:
-                        if (loc == AC_JACK_LOC_FRONT)
-                                cfg->input_pins[AUTO_PIN_FRONT_LINE] = nid;
-                        else
-                                cfg->input_pins[AUTO_PIN_LINE] = nid;
-                        break;
-                case AC_JACK_CD:
-                        cfg->input_pins[AUTO_PIN_CD] = nid;
-                        break;
-                case AC_JACK_AUX:
-                        cfg->input_pins[AUTO_PIN_AUX] = nid;
-                        break;
-                case AC_JACK_SPDIF_OUT:
-                        cfg->dig_out_pin = nid;
-                        break;
-                case AC_JACK_SPDIF_IN:
-                        cfg->dig_in_pin = nid;
-                        break;
-                }
-        }
-
-        /* sort by sequence */
-        for (i = 0; i < cfg->line_outs; i++)
-                for (j = i + 1; j < cfg->line_outs; j++)
-                        if (sequences[i] > sequences[j]) {
-                                seq = sequences[i];
-                                sequences[i] = sequences[j];
-                                sequences[j] = seq;
-                                nid = cfg->line_out_pins[i];
-                                cfg->line_out_pins[i] = cfg->line_out_pins[j];
-                                cfg->line_out_pins[j] = nid;
-                        }
-
-        /* Reorder the surround channels
-         * ALSA sequence is front/surr/clfe/side
-         * HDA sequence is:
-         *    4-ch: front/surr  =>  OK as it is
-         *    6-ch: front/clfe/surr
-         *    8-ch: front/clfe/side/surr
-         */
-        switch (cfg->line_outs) {
-        case 3:
-                nid = cfg->line_out_pins[1];
-                cfg->line_out_pins[1] = cfg->line_out_pins[2];
-                cfg->line_out_pins[2] = nid;
-                break;
-        case 4:
-                nid = cfg->line_out_pins[1];
-                cfg->line_out_pins[1] = cfg->line_out_pins[3];
-                cfg->line_out_pins[3] = cfg->line_out_pins[2];
-                cfg->line_out_pins[2] = nid;
-                break;
-        }
-        /*
-         * debug prints of the parsed results
-         */
-        snd_printd("autoconfig: line_outs=%d (0x%x/0x%x/0x%x/0x%x/0x%x)\n",
-                   cfg->line_outs, cfg->line_out_pins[0], cfg->line_out_pins[1],
-                   cfg->line_out_pins[2], cfg->line_out_pins[3],
-                   cfg->line_out_pins[4]);
-        snd_printd("   speaker_outs=%d (0x%x/0x%x/0x%x/0x%x/0x%x)\n",
-                   cfg->speaker_outs, cfg->speaker_pins[0],
-                   cfg->speaker_pins[1], cfg->speaker_pins[2],
-                   cfg->speaker_pins[3], cfg->speaker_pins[4]);
-        snd_printd("   hp=0x%x, dig_out=0x%x, din_in=0x%x\n",
-                   cfg->hp_pin, cfg->dig_out_pin, cfg->dig_in_pin);
-        snd_printd("   inputs: mic=0x%x, fmic=0x%x, line=0x%x, fline=0x%x,"
-                   " cd=0x%x, aux=0x%x\n",
-                   cfg->input_pins[AUTO_PIN_MIC],
-                   cfg->input_pins[AUTO_PIN_FRONT_MIC],
-                   cfg->input_pins[AUTO_PIN_LINE],
-                   cfg->input_pins[AUTO_PIN_FRONT_LINE],
-                   cfg->input_pins[AUTO_PIN_CD],
-                   cfg->input_pins[AUTO_PIN_AUX]);
-
-        /*
-         * FIX-UP: if no line-outs are detected, try to use speaker or HP pin
-         * as a primary output
-         */
-        if (! cfg->line_outs) {
-            if (cfg->speaker_outs) {
-                cfg->line_outs = cfg->speaker_outs;
-                memcpy(cfg->line_out_pins, cfg->speaker_pins,
-                       sizeof(cfg->speaker_pins));
-                cfg->speaker_outs = 0;
-                memset(cfg->speaker_pins, 0, sizeof(cfg->speaker_pins));
-            } else if (cfg->hp_pin) {
-                cfg->line_outs = 1;
-                cfg->line_out_pins[0] = cfg->hp_pin;
-                cfg->hp_pin = 0;
+                                 hda_nid_t *ignore_nids)
+{
+    hda_nid_t nid, nid_start;
+    int i, j, nodes;
+    short seq, assoc_line_out, sequences[ARRAY_SIZE(cfg->line_out_pins)];
+
+    memset(cfg, 0, sizeof(*cfg));
+
+    memset(sequences, 0, sizeof(sequences));
+    assoc_line_out = 0;
+
+    nodes = snd_hda_get_sub_nodes(codec, codec->afg, &nid_start);
+    for (nid = nid_start; nid < nodes + nid_start; nid++) {
+        unsigned int wid_caps = get_wcaps(codec, nid);
+        unsigned int wid_type = (wid_caps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
+        unsigned int def_conf;
+        short assoc, loc;
+
+        /* read all default configuration for pin complex */
+        if (wid_type != AC_WID_PIN)
+            continue;
+        /* ignore the given nids (e.g. pc-beep returns error) */
+        if (ignore_nids && is_in_nid_list(nid, ignore_nids))
+            continue;
+
+        def_conf = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
+        if (get_defcfg_connect(def_conf) == AC_JACK_PORT_NONE)
+            continue;
+        loc = get_defcfg_location(def_conf);
+        switch (get_defcfg_device(def_conf)) {
+        case AC_JACK_LINE_OUT:
+            seq = get_defcfg_sequence(def_conf);
+            assoc = get_defcfg_association(def_conf);
+            if (! assoc)
+                continue;
+            if (! assoc_line_out)
+                assoc_line_out = assoc;
+            else if (assoc_line_out != assoc)
+                continue;
+            if (cfg->line_outs >= ARRAY_SIZE(cfg->line_out_pins))
+                continue;
+            cfg->line_out_pins[cfg->line_outs] = nid;
+            sequences[cfg->line_outs] = seq;
+            cfg->line_outs++;
+            break;
+        case AC_JACK_SPEAKER:
+            if (cfg->speaker_outs >= ARRAY_SIZE(cfg->speaker_pins))
+                continue;
+            cfg->speaker_pins[cfg->speaker_outs] = nid;
+            cfg->speaker_outs++;
+            break;
+        case AC_JACK_HP_OUT:
+            cfg->hp_pin = nid;
+            break;
+        case AC_JACK_MIC_IN:
+            if (loc == AC_JACK_LOC_FRONT)
+                cfg->input_pins[AUTO_PIN_FRONT_MIC] = nid;
+            else
+                cfg->input_pins[AUTO_PIN_MIC] = nid;
+            break;
+        case AC_JACK_LINE_IN:
+            if (loc == AC_JACK_LOC_FRONT)
+                cfg->input_pins[AUTO_PIN_FRONT_LINE] = nid;
+            else
+                cfg->input_pins[AUTO_PIN_LINE] = nid;
+            break;
+        case AC_JACK_CD:
+            cfg->input_pins[AUTO_PIN_CD] = nid;
+            break;
+        case AC_JACK_AUX:
+            cfg->input_pins[AUTO_PIN_AUX] = nid;
+            break;
+        case AC_JACK_SPDIF_OUT:
+            cfg->dig_out_pin = nid;
+            break;
+        case AC_JACK_SPDIF_IN:
+            cfg->dig_in_pin = nid;
+            break;
+        }
+    }
+
+    /* sort by sequence */
+    for (i = 0; i < cfg->line_outs; i++)
+        for (j = i + 1; j < cfg->line_outs; j++)
+            if (sequences[i] > sequences[j]) {
+                seq = sequences[i];
+                sequences[i] = sequences[j];
+                sequences[j] = seq;
+                nid = cfg->line_out_pins[i];
+                cfg->line_out_pins[i] = cfg->line_out_pins[j];
+                cfg->line_out_pins[j] = nid;
             }
+
+    /* Reorder the surround channels
+     * ALSA sequence is front/surr/clfe/side
+     * HDA sequence is:
+     *    4-ch: front/surr  =>  OK as it is
+     *    6-ch: front/clfe/surr
+     *    8-ch: front/clfe/side/surr
+     */
+    switch (cfg->line_outs) {
+    case 3:
+        nid = cfg->line_out_pins[1];
+        cfg->line_out_pins[1] = cfg->line_out_pins[2];
+        cfg->line_out_pins[2] = nid;
+        break;
+    case 4:
+        nid = cfg->line_out_pins[1];
+        cfg->line_out_pins[1] = cfg->line_out_pins[3];
+        cfg->line_out_pins[3] = cfg->line_out_pins[2];
+        cfg->line_out_pins[2] = nid;
+        break;
+    }
+    /*
+     * debug prints of the parsed results
+     */
+    snd_printd("autoconfig: line_outs=%d (0x%x/0x%x/0x%x/0x%x/0x%x)\n",
+               cfg->line_outs, cfg->line_out_pins[0], cfg->line_out_pins[1],
+               cfg->line_out_pins[2], cfg->line_out_pins[3],
+               cfg->line_out_pins[4]);
+    snd_printd("   speaker_outs=%d (0x%x/0x%x/0x%x/0x%x/0x%x)\n",
+               cfg->speaker_outs, cfg->speaker_pins[0],
+               cfg->speaker_pins[1], cfg->speaker_pins[2],
+               cfg->speaker_pins[3], cfg->speaker_pins[4]);
+    snd_printd("   hp=0x%x, dig_out=0x%x, din_in=0x%x\n",
+               cfg->hp_pin, cfg->dig_out_pin, cfg->dig_in_pin);
+    snd_printd("   inputs: mic=0x%x, fmic=0x%x, line=0x%x, fline=0x%x,"
+               " cd=0x%x, aux=0x%x\n",
+               cfg->input_pins[AUTO_PIN_MIC],
+               cfg->input_pins[AUTO_PIN_FRONT_MIC],
+               cfg->input_pins[AUTO_PIN_LINE],
+               cfg->input_pins[AUTO_PIN_FRONT_LINE],
+               cfg->input_pins[AUTO_PIN_CD],
+               cfg->input_pins[AUTO_PIN_AUX]);
+
+    /*
+     * FIX-UP: if no line-outs are detected, try to use speaker or HP pin
+     * as a primary output
+     */
+    if (! cfg->line_outs) {
+        if (cfg->speaker_outs) {
+            cfg->line_outs = cfg->speaker_outs;
+            memcpy(cfg->line_out_pins, cfg->speaker_pins,
+                   sizeof(cfg->speaker_pins));
+            cfg->speaker_outs = 0;
+            memset(cfg->speaker_pins, 0, sizeof(cfg->speaker_pins));
+        } else if (cfg->hp_pin) {
+            cfg->line_outs = 1;
+            cfg->line_out_pins[0] = cfg->hp_pin;
+            cfg->hp_pin = 0;
         }
-
-        return 0;
+    }
+
+    return 0;
 }
 
 /* labels for input pins */
 const char *auto_pin_cfg_labels[AUTO_PIN_LAST] = {
-        "Mic", "Front Mic", "Line", "Front Line", "CD", "Aux"
+    "Mic", "Front Mic", "Line", "Front Line", "CD", "Aux"
 };
 
@@ -2150 +2153 @@
 int snd_hda_suspend(struct hda_bus *bus, pm_message_t state)
 {
-        struct list_head *p;
-
-        /* FIXME: should handle power widget capabilities */
-        list_for_each(p, &bus->codec_list) {
-                struct hda_codec *codec = list_entry(p, struct hda_codec, list);
-                if (codec->patch_ops.suspend)
-                        codec->patch_ops.suspend(codec, state);
-                hda_set_power_state(codec,
-                                    codec->afg ? codec->afg : codec->mfg,
-                                    AC_PWRST_D3);
-        }
-        return 0;
+    struct list_head *p;
+
+    /* FIXME: should handle power widget capabilities */
+    list_for_each(p, &bus->codec_list) {
+        struct hda_codec *codec = list_entry(p, struct hda_codec, list);
+        if (codec->patch_ops.suspend)
+            codec->patch_ops.suspend(codec, state);
+        hda_set_power_state(codec,
+                            codec->afg ? codec->afg : codec->mfg,
+                            AC_PWRST_D3);
+    }
+    return 0;
 }
 
@@ -2173 +2176 @@
 int snd_hda_resume(struct hda_bus *bus)
 {
-        struct list_head *p;
-
-        list_for_each(p, &bus->codec_list) {
-                struct hda_codec *codec = list_entry(p, struct hda_codec, list);
-                hda_set_power_state(codec,
-                                    codec->afg ? codec->afg : codec->mfg,
-                                    AC_PWRST_D0);
-                if (codec->patch_ops.resume)
-                        codec->patch_ops.resume(codec);
-        }
-        return 0;
+    struct list_head *p;
+
+    list_for_each(p, &bus->codec_list) {
+        struct hda_codec *codec = list_entry(p, struct hda_codec, list);
+        hda_set_power_state(codec,
+                            codec->afg ? codec->afg : codec->mfg,
+                            AC_PWRST_D0);
+        if (codec->patch_ops.resume)
+            codec->patch_ops.resume(codec);
+    }
+    return 0;
 }
 
@@ -2197 +2200 @@
 int snd_hda_resume_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew)
 {
-        struct snd_ctl_elem_value *val;
-
-        val = kmalloc(sizeof(*val), GFP_KERNEL);
-        if (! val)
-                return -ENOMEM;
-        codec->in_resume = 1;
-        for (; knew->name; knew++) {
-                int i, count;
-                count = knew->count ? knew->count : 1;
-                for (i = 0; i < count; i++) {
-                        memset(val, 0, sizeof(*val));
-                        val->id.iface = knew->iface;
-                        val->id.device = knew->device;
-                        val->id.subdevice = knew->subdevice;
-                        strcpy(val->id.name, knew->name);
-                        val->id.index = knew->index ? knew->index : i;
-                        /* Assume that get callback reads only from cache,
-                         * not accessing to the real hardware
-                         */
-                        if (snd_ctl_elem_read(codec->bus->card, val) < 0)
-                                continue;
-                        snd_ctl_elem_write(codec->bus->card, NULL, val);
-                }
-        }
-        codec->in_resume = 0;
-        kfree(val);
-        return 0;
+    struct snd_ctl_elem_value *val;
+
+    val = kmalloc(sizeof(*val), GFP_KERNEL);
+    if (! val)
+        return -ENOMEM;
+    codec->in_resume = 1;
+    for (; knew->name; knew++) {
+        int i, count;
+        count = knew->count ? knew->count : 1;
+        for (i = 0; i < count; i++) {
+            memset(val, 0, sizeof(*val));
+            val->id.iface = knew->iface;
+            val->id.device = knew->device;
+            val->id.subdevice = knew->subdevice;
+            strcpy(val->id.name, knew->name);
+            val->id.index = knew->index ? knew->index : i;
+            /* Assume that get callback reads only from cache,
+             * not accessing to the real hardware
+             */
+            if (snd_ctl_elem_read(codec->bus->card, val) < 0)
+                continue;
+            snd_ctl_elem_write(codec->bus->card, NULL, val);
+        }
+    }
+    codec->in_resume = 0;
+    kfree(val);
+    return 0;
 }
 
@@ -2232 +2235 @@
 int snd_hda_resume_spdif_out(struct hda_codec *codec)
 {
-        return snd_hda_resume_ctls(codec, dig_mixes);
+    return snd_hda_resume_ctls(codec, dig_mixes);
 }
 
@@ -2241 +2244 @@
 int snd_hda_resume_spdif_in(struct hda_codec *codec)
 {
-        return snd_hda_resume_ctls(codec, dig_in_ctls);
+    return snd_hda_resume_ctls(codec, dig_in_ctls);
 }
 #endif
@@ -2270 +2273 @@
 static int __init alsa_hda_init(void)
 {
-        return 0;
+    return 0;
 }
 

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

@@ -80 +80 @@
                          "{Intel, ESB2},"
                          "{Intel, ICH8},"
-                         "{ATI, SB450},"
+                        "{ATI, SB450},"
+                        "{ATI, RS600},"
                          "{VIA, VT8251},"
                          "{VIA, VT8237A},"
@@ -166 +167 @@
 #define ULI_NUM_PLAYBACK        6
 
+/* ATI HDMI has 1 playback and 0 capture */
+#define ATIHDMI_CAPTURE_INDEX   0
+#define ATIHDMI_NUM_CAPTURE     0
+#define ATIHDMI_PLAYBACK_INDEX  0
+#define ATIHDMI_NUM_PLAYBACK    1
+
 /* this number is statically defined for simplicity */
 #define MAX_AZX_DEV             16
@@ -329 +336 @@
 enum {
         AZX_DRIVER_ICH,
-        AZX_DRIVER_ATI,
+        AZX_DRIVER_ATI,
+        AZX_DRIVER_ATIHDMI,
         AZX_DRIVER_VIA,
         AZX_DRIVER_SIS,
@@ -338 +346 @@
 static char *driver_short_names[] __devinitdata = {
         [AZX_DRIVER_ICH] = "HDA Intel",
-        [AZX_DRIVER_ATI] = "HDA ATI SB",
+        [AZX_DRIVER_ATI] = "HDA ATI SB",
+        [AZX_DRIVER_ATIHDMI] = "HDA ATI HDMI",
         [AZX_DRIVER_VIA] = "HDA VIA VT82xx",
         [AZX_DRIVER_SIS] = "HDA SIS966",
@@ -1392 +1401 @@
         }
 
+        if (chip->irq >= 0)
+                free_irq(chip->irq, (void*)chip);
         if (chip->remap_addr)
                 iounmap(chip->remap_addr);
-        if (chip->irq >= 0)
-                free_irq(chip->irq, (void*)chip);
 
         if (chip->bdl.area)
@@ -1493 +1502 @@
                 chip->playback_index_offset = ULI_PLAYBACK_INDEX;
                 chip->capture_index_offset = ULI_CAPTURE_INDEX;
+                break;
+        case AZX_DRIVER_ATIHDMI:
+                chip->playback_streams = ATIHDMI_NUM_PLAYBACK;
+                chip->capture_streams = ATIHDMI_NUM_CAPTURE;
+                chip->playback_index_offset = ATIHDMI_PLAYBACK_INDEX;
+                chip->capture_index_offset = ATIHDMI_CAPTURE_INDEX;
                 break;
         default:
@@ -1618 +1633 @@
         { 0x8086, 0x269a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ESB2 */
         { 0x8086, 0x284b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH8 */
-        { 0x1002, 0x437b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATI }, /* ATI SB450 */
+        { 0x1002, 0x437b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATI }, /* ATI SB450 */
+        { 0x1002, 0x793b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATIHDMI }, /* ATI RS600 HDMI */
         { 0x1106, 0x3288, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_VIA }, /* VIA VT8251/VT8237A */
         { 0x1039, 0x7502, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_SIS }, /* SIS966 */

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

@@ -13 +13 @@
 /* SiLabs 3054/3055 modem codecs */
 extern struct hda_codec_preset snd_hda_preset_si3054[];
+/* ATI HDMI codecs */
+extern struct hda_codec_preset snd_hda_preset_atihdmi[];
 
 static const struct hda_codec_preset *hda_preset_tables[] = {
@@ -19 +21 @@
         snd_hda_preset_analog,
         snd_hda_preset_sigmatel,
-        snd_hda_preset_si3054,
+        snd_hda_preset_si3054,
+        snd_hda_preset_atihdmi,
         NULL
 };

GPL/trunk/alsa-kernel/pci/hda/makefile.os2

@@ -15 +15 @@
 FILE1    = hda_intel.obj hda_codec.obj hda_generic.obj patch_realtek.obj 
 FILE2    = patch_cmedia.obj hda_proc.obj patch_analog.obj patch_sigmatel.obj
-FILE3    = patch_si3054.obj
+FILE3    = patch_si3054.obj patch_atihdmi.obj
 FILE4    = 
 FILE5    = 

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

@@ -786 +786 @@
     { .pci_subvendor = 0x10de, .pci_subdevice = 0xcb84,
     .config = AD1986A_3STACK }, /* ASUS A8N-VM CSM */
+    { .pci_subvendor = 0x1043, .pci_subdevice = 0x81b3,
+    .config = AD1986A_3STACK }, /* ASUS P5RD2-VM / P5GPL-X SE */
     { .modelname = "laptop",        .config = AD1986A_LAPTOP },
     { .pci_subvendor = 0x144d, .pci_subdevice = 0xc01e,
@@ -793 +795 @@
     { .pci_subvendor = 0x1043, .pci_subdevice = 0x818f,
     .config = AD1986A_LAPTOP }, /* ASUS P5GV-MX */
+    { .pci_subvendor = 0x144d, .pci_subdevice = 0xc023,
+    .config = AD1986A_LAPTOP_EAPD }, /* Samsung X60 Chane */
     { .modelname = "laptop-eapd",   .config = AD1986A_LAPTOP_EAPD },
     { .pci_subvendor = 0x144d, .pci_subdevice = 0xc024,
     .config = AD1986A_LAPTOP_EAPD }, /* Samsung R65-T2300 Charis */
     { .pci_subvendor = 0x1043, .pci_subdevice = 0x1213,
-                   .config = AD1986A_LAPTOP_EAPD }, /* ASUS A6J */
+    .config = AD1986A_LAPTOP_EAPD }, /* ASUS A6J */
+    { .pci_subvendor = 0x1043, .pci_subdevice = 0x11f7,
+    .config = AD1986A_LAPTOP_EAPD }, /* ASUS U5A */
+    { .pci_subvendor = 0x1043, .pci_subdevice = 0x1297,
+    .config = AD1986A_LAPTOP_EAPD }, /* ASUS Z62F */
+    { .pci_subvendor = 0x103c, .pci_subdevice = 0x30af,
+    .config = AD1986A_LAPTOP_EAPD }, /* HP Compaq Presario B2800 */
+    { .pci_subvendor = 0x17aa, .pci_subdevice = 0x2066,
+    .config = AD1986A_LAPTOP_EAPD }, /* Lenovo 3000 N100-07684JU */
     {0}
 };
@@ -947 +959 @@
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Route",
+                .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source",
                 .info = ad1983_spdif_route_info,
                 .get = ad1983_spdif_route_get,
@@ -1086 +1098 @@
         /* identical with AD1983 */
         {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Route",
+            .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+            .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source",
                 .info = ad1983_spdif_route_info,
                 .get = ad1983_spdif_route_get,
                 .put = ad1983_spdif_route_put,
-        },
+        },
         {0} /* end */
 };
@@ -1301 +1313 @@
         .put = ad198x_mux_enum_put,
     },
+        /* identical with AD1983 */
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source",
+                .info = ad1983_spdif_route_info,
+                .get = ad1983_spdif_route_get,
+                .put = ad1983_spdif_route_put,
+        },
     {0} /* end */
 };
@@ -1313 +1333 @@
 }
 
+/* configuration for Lenovo Thinkpad T60 */
+static struct snd_kcontrol_new ad1981_thinkpad_mixers[] = {
+    HDA_CODEC_VOLUME("Master Playback Volume", 0x05, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Master Playback Switch", 0x05, 0x0, HDA_OUTPUT),
+    HDA_CODEC_VOLUME("PCM Playback Volume", 0x11, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("PCM Playback Switch", 0x11, 0x0, HDA_OUTPUT),
+    HDA_CODEC_VOLUME("Mic Playback Volume", 0x12, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Mic Playback Switch", 0x12, 0x0, HDA_OUTPUT),
+    HDA_CODEC_VOLUME("CD Playback Volume", 0x1d, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("CD Playback Switch", 0x1d, 0x0, HDA_OUTPUT),
+    HDA_CODEC_VOLUME("Mic Boost", 0x08, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Capture Switch", 0x15, 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,
+    },
+    {0} /* end */
+};
+
+static struct hda_input_mux ad1981_thinkpad_capture_source = {
+    .num_items = 3,
+    .items = {
+        { "Mic", 0x0 },
+        { "Mix", 0x2 },
+        { "CD", 0x4 },
+    },
+};
+
 /* models */
-enum { AD1981_BASIC, AD1981_HP };
+enum { AD1981_BASIC, AD1981_HP, AD1981_THINKPAD };
 
 static struct hda_board_config ad1981_cfg_tbl[] = {
@@ -1322 +1374 @@
     { .pci_subvendor = 0x103c, .pci_subdevice = 0x309f,
     .config = AD1981_HP }, /* HP nx9420 AngelFire */
+    { .pci_subvendor = 0x30b0, .pci_subdevice = 0x103c,
+    .config = AD1981_HP }, /* HP nx6320 (reversed SSID, H/W bug) */
+    { .modelname = "basic", .config = AD1981_BASIC },
+    { .modelname = "thinkpad", .config = AD1981_THINKPAD },
+    /* Lenovo Thinkpad T60/X60/Z6xx */
+    { .pci_subvendor = 0x17aa, .config = AD1981_THINKPAD },
+    { .pci_subvendor = 0x1014, .pci_subdevice = 0x0597,
+    .config = AD1981_THINKPAD }, /* Z60m/t */
     { .modelname = "basic", .config = AD1981_BASIC },
     {0}
@@ -1367 +1427 @@
             codec->patch_ops.unsol_event = ad1981_hp_unsol_event;
             break;
+        case AD1981_THINKPAD:
+            spec->mixers[0] = ad1981_thinkpad_mixers;
+            spec->multiout.dig_out_nid = 0;
+            spec->input_mux = &ad1981_thinkpad_capture_source;
+            break;
         }
-
         return 0;
 }
@@ -1474 +1538 @@
 #define AD1988A_REV2            0x100200
 
-
+#define is_rev2(codec) \
+        ((codec)->vendor_id == 0x11d41988 && \
+         (codec)->revision_id == AD1988A_REV2)
 /*
  * mixers
@@ -2121 +2187 @@
                 /* A     B     C     D     E     F     G     H */
                 0x04, 0x05, 0x0a, 0x04, 0x06, 0x05, 0x0a, 0x06
-        };
-        if (codec->revision_id == AD1988A_REV2)
+        };
+        if (is_rev2(codec))
                 return idx_to_dac_rev2[idx];
         else
@@ -2491 +2557 @@
         codec->spec = spec;
 
-        if (codec->revision_id == AD1988A_REV2)
+        if (is_rev2(codec))
                 snd_printk(KERN_INFO "patch_analog: AD1988A rev.2 is detected, enable workarounds\n");
 
@@ -2516 +2582 @@
         case AD1988_6STACK_DIG:
                 spec->multiout.max_channels = 8;
-                spec->multiout.num_dacs = 4;
-                if (codec->revision_id == AD1988A_REV2)
+                spec->multiout.num_dacs = 4;
+                if (is_rev2(codec))
                         spec->multiout.dac_nids = ad1988_6stack_dac_nids_rev2;
                 else
                         spec->multiout.dac_nids = ad1988_6stack_dac_nids;
                 spec->input_mux = &ad1988_6stack_capture_source;
-                spec->num_mixers = 2;
-                if (codec->revision_id == AD1988A_REV2)
+                spec->num_mixers = 2;
+                if (is_rev2(codec))
                         spec->mixers[0] = ad1988_6stack_mixers1_rev2;
                 else
@@ -2538 +2604 @@
         case AD1988_3STACK_DIG:
                 spec->multiout.max_channels = 6;
-                spec->multiout.num_dacs = 3;
-                if (codec->revision_id == AD1988A_REV2)
+                spec->multiout.num_dacs = 3;
+                if (is_rev2(codec))
                         spec->multiout.dac_nids = ad1988_3stack_dac_nids_rev2;
                 else
@@ -2546 +2612 @@
                 spec->channel_mode = ad1988_3stack_modes;
                 spec->num_channel_mode = ARRAY_SIZE(ad1988_3stack_modes);
-                spec->num_mixers = 2;
-                if (codec->revision_id == AD1988A_REV2)
+                spec->num_mixers = 2;
+                if (is_rev2(codec))
                         spec->mixers[0] = ad1988_3stack_mixers1_rev2;
                 else

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

@@ -36 +36 @@
 /* ALC880 board config type */
 enum {
-        ALC880_3ST,
-        ALC880_3ST_DIG,
-        ALC880_5ST,
-        ALC880_5ST_DIG,
-        ALC880_W810,
-        ALC880_Z71V,
-        ALC880_6ST,
-        ALC880_6ST_DIG,
-        ALC880_F1734,
-        ALC880_ASUS,
-        ALC880_ASUS_DIG,
-        ALC880_ASUS_W1V,
-        ALC880_ASUS_DIG2,
-        ALC880_UNIWILL_DIG,
-        ALC880_CLEVO,
-        ALC880_TCL_S700,
-        ALC880_LG,
-        ALC880_LG_LW,
+    ALC880_3ST,
+    ALC880_3ST_DIG,
+    ALC880_5ST,
+    ALC880_5ST_DIG,
+    ALC880_W810,
+    ALC880_Z71V,
+    ALC880_6ST,
+    ALC880_6ST_DIG,
+    ALC880_F1734,
+    ALC880_ASUS,
+    ALC880_ASUS_DIG,
+    ALC880_ASUS_W1V,
+    ALC880_ASUS_DIG2,
+    ALC880_UNIWILL_DIG,
+    ALC880_CLEVO,
+    ALC880_TCL_S700,
+    ALC880_LG,
+    ALC880_LG_LW,
 #ifdef CONFIG_SND_DEBUG
-        ALC880_TEST,
+    ALC880_TEST,
 #endif
-        ALC880_AUTO,
-        ALC880_MODEL_LAST /* last tag */
+    ALC880_AUTO,
+    ALC880_MODEL_LAST /* last tag */
 };
 
 /* ALC260 models */
 enum {
-        ALC260_BASIC,
-        ALC260_HP,
-        ALC260_HP_3013,
-        ALC260_FUJITSU_S702X,
-        ALC260_ACER,
+    ALC260_BASIC,
+    ALC260_HP,
+    ALC260_HP_3013,
+    ALC260_FUJITSU_S702X,
+    ALC260_ACER,
 #ifdef CONFIG_SND_DEBUG
-        ALC260_TEST,
+    ALC260_TEST,
 #endif
-        ALC260_AUTO,
-        ALC260_MODEL_LAST /* last tag */
+    ALC260_AUTO,
+    ALC260_MODEL_LAST /* last tag */
 };
 
 /* ALC262 models */
 enum {
-        ALC262_BASIC,
-        ALC262_FUJITSU,
-        ALC262_AUTO,
-        ALC262_MODEL_LAST /* last tag */
+    ALC262_BASIC,
+    ALC262_FUJITSU,
+    ALC262_HP_BPC,
+    ALC262_AUTO,
+    ALC262_MODEL_LAST /* last tag */
 };
 
 /* ALC861 models */
 enum {
-        ALC861_3ST,
-        ALC861_3ST_DIG,
-        ALC861_6ST_DIG,
-        ALC861_AUTO,
-        ALC861_MODEL_LAST,
+    ALC861_3ST,
+    ALC660_3ST,
+    ALC861_3ST_DIG,
+    ALC861_6ST_DIG,
+    ALC861_AUTO,
+    ALC861_MODEL_LAST,
 };
 
 /* ALC882 models */
 enum {
-        ALC882_3ST_DIG,
-        ALC882_6ST_DIG,
-        ALC882_AUTO,
-        ALC882_MODEL_LAST,
+    ALC882_3ST_DIG,
+    ALC882_6ST_DIG,
+    ALC882_AUTO,
+    ALC882_MODEL_LAST,
+};
+
+/* ALC883 models */
+enum {
+    ALC883_3ST_2ch_DIG,
+    ALC883_3ST_6ch_DIG,
+    ALC883_3ST_6ch,
+    ALC883_6ST_DIG,
+    ALC888_DEMO_BOARD,
+    ALC883_AUTO,
+    ALC883_MODEL_LAST,
 };
 
@@ -104 +117 @@
 
 struct alc_spec {
-        /* codec parameterization */
-        struct snd_kcontrol_new *mixers[5];     /* mixer arrays */
-        unsigned int num_mixers;
-
-        const struct hda_verb *init_verbs[5];   /* initialization verbs
-                                                 * don't forget NULL termination!
-                                                 */
-        unsigned int num_init_verbs;
-
-        char *stream_name_analog;       /* analog PCM stream */
-        struct hda_pcm_stream *stream_analog_playback;
-        struct hda_pcm_stream *stream_analog_capture;
-
-        char *stream_name_digital;      /* digital PCM stream */
-        struct hda_pcm_stream *stream_digital_playback;
-        struct hda_pcm_stream *stream_digital_capture;
-
-        /* playback */
-        struct hda_multi_out multiout;  /* playback set-up
-                                         * max_channels, dacs must be set
-                                         * dig_out_nid and hp_nid are optional
-                                         */
-
-        /* capture */
-        unsigned int num_adc_nids;
-        hda_nid_t *adc_nids;
-        hda_nid_t dig_in_nid;           /* digital-in NID; optional */
-
-        /* capture source */
-        const struct hda_input_mux *input_mux;
-        unsigned int cur_mux[3];
-
-        /* channel model */
-        const struct hda_channel_mode *channel_mode;
-        int num_channel_mode;
-
-        /* PCM information */
-        struct hda_pcm pcm_rec[3];      /* used in alc_build_pcms() */
-
-        /* dynamic controls, init_verbs and input_mux */
-        struct auto_pin_cfg autocfg;
-        unsigned int num_kctl_alloc, num_kctl_used;
-        struct snd_kcontrol_new *kctl_alloc;
-        struct hda_input_mux private_imux;
-        hda_nid_t private_dac_nids[5];
-
-        /* hooks */
-        void (*init_hook)(struct hda_codec *codec);
-        void (*unsol_event)(struct hda_codec *codec, unsigned int res);
-
-        /* for pin sensing */
-        unsigned int sense_updated: 1;
-        unsigned int jack_present: 1;
+    /* codec parameterization */
+    struct snd_kcontrol_new *mixers[5]; /* mixer arrays */
+    unsigned int num_mixers;
+
+    const struct hda_verb *init_verbs[5]; /* initialization verbs
+    * don't forget NULL
+    * termination!
+    */
+    unsigned int num_init_verbs;
+
+    char *stream_name_analog;   /* analog PCM stream */
+    struct hda_pcm_stream *stream_analog_playback;
+    struct hda_pcm_stream *stream_analog_capture;
+
+    char *stream_name_digital;  /* digital PCM stream */
+    struct hda_pcm_stream *stream_digital_playback;
+    struct hda_pcm_stream *stream_digital_capture;
+
+    /* playback */
+    struct hda_multi_out multiout;      /* playback set-up
+    * max_channels, dacs must be set
+    * dig_out_nid and hp_nid are optional
+    */
+
+    /* capture */
+    unsigned int num_adc_nids;
+    hda_nid_t *adc_nids;
+    hda_nid_t dig_in_nid;               /* digital-in NID; optional */
+
+    /* capture source */
+    const struct hda_input_mux *input_mux;
+    unsigned int cur_mux[3];
+
+    /* channel model */
+    const struct hda_channel_mode *channel_mode;
+    int num_channel_mode;
+
+    /* PCM information */
+    struct hda_pcm pcm_rec[3];  /* used in alc_build_pcms() */
+
+    /* dynamic controls, init_verbs and input_mux */
+    struct auto_pin_cfg autocfg;
+    unsigned int num_kctl_alloc, num_kctl_used;
+    struct snd_kcontrol_new *kctl_alloc;
+    struct hda_input_mux private_imux;
+    hda_nid_t private_dac_nids[5];
+
+    /* hooks */
+    void (*init_hook)(struct hda_codec *codec);
+    void (*unsol_event)(struct hda_codec *codec, unsigned int res);
+
+    /* for pin sensing */
+    unsigned int sense_updated: 1;
+    unsigned int jack_present: 1;
 };
 
@@ -163 +177 @@
  */
 struct alc_config_preset {
-        struct snd_kcontrol_new *mixers[5]; /* should be identical size with spec */
-        const struct hda_verb *init_verbs[5];
-        unsigned int num_dacs;
-        hda_nid_t *dac_nids;
-        hda_nid_t dig_out_nid;          /* optional */
-        hda_nid_t hp_nid;               /* optional */
-        unsigned int num_adc_nids;
-        hda_nid_t *adc_nids;
-        hda_nid_t dig_in_nid;
-        unsigned int num_channel_mode;
-        const struct hda_channel_mode *channel_mode;
-        const struct hda_input_mux *input_mux;
-        void (*unsol_event)(struct hda_codec *, unsigned int);
-        void (*init_hook)(struct hda_codec *);
+    struct snd_kcontrol_new *mixers[5]; /* should be identical size with spec */
+    const struct hda_verb *init_verbs[5];
+    unsigned int num_dacs;
+    hda_nid_t *dac_nids;
+    hda_nid_t dig_out_nid;              /* optional */
+    hda_nid_t hp_nid;           /* optional */
+    unsigned int num_adc_nids;
+    hda_nid_t *adc_nids;
+    hda_nid_t dig_in_nid;
+    unsigned int num_channel_mode;
+    const struct hda_channel_mode *channel_mode;
+    const struct hda_input_mux *input_mux;
+    void (*unsol_event)(struct hda_codec *, unsigned int);
+    void (*init_hook)(struct hda_codec *);
 };
 
@@ -185 +199 @@
 static int alc_mux_enum_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct alc_spec *spec = codec->spec;
-        return snd_hda_input_mux_info(spec->input_mux, uinfo);
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    struct alc_spec *spec = codec->spec;
+    return snd_hda_input_mux_info(spec->input_mux, uinfo);
 }
 
 static int alc_mux_enum_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct alc_spec *spec = codec->spec;
-        unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
-
-        ucontrol->value.enumerated.item[0] = spec->cur_mux[adc_idx];
-        return 0;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    struct alc_spec *spec = codec->spec;
+    unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
+
+    ucontrol->value.enumerated.item[0] = spec->cur_mux[adc_idx];
+    return 0;
 }
 
 static int alc_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct alc_spec *spec = codec->spec;
-        unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
-        return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
-                                     spec->adc_nids[adc_idx], &spec->cur_mux[adc_idx]);
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    struct alc_spec *spec = codec->spec;
+    unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
+    return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
+                                 spec->adc_nids[adc_idx], &spec->cur_mux[adc_idx]);
 }
 
@@ -215 +229 @@
 static int alc_ch_mode_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct alc_spec *spec = codec->spec;
-        return snd_hda_ch_mode_info(codec, uinfo, spec->channel_mode,
-                                    spec->num_channel_mode);
-}
-
-static int alc_ch_mode_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct alc_spec *spec = codec->spec;
-        return snd_hda_ch_mode_get(codec, ucontrol, spec->channel_mode,
-                                   spec->num_channel_mode, spec->multiout.max_channels);
-}
-
-static int alc_ch_mode_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct alc_spec *spec = codec->spec;
-        return snd_hda_ch_mode_put(codec, ucontrol, spec->channel_mode,
-                                   spec->num_channel_mode, &spec->multiout.max_channels);
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    struct alc_spec *spec = codec->spec;
+    return snd_hda_ch_mode_info(codec, uinfo, spec->channel_mode,
+                                spec->num_channel_mode);
+}
+
+static int alc_ch_mode_get(struct snd_kcontrol *kcontrol,
+                           struct snd_ctl_elem_value *ucontrol)
+{
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    struct alc_spec *spec = codec->spec;
+    return snd_hda_ch_mode_get(codec, ucontrol, spec->channel_mode,
+                               spec->num_channel_mode,
+                               spec->multiout.max_channels);
+}
+
+static int alc_ch_mode_put(struct snd_kcontrol *kcontrol,
+                           struct snd_ctl_elem_value *ucontrol)
+{
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    struct alc_spec *spec = codec->spec;
+    return snd_hda_ch_mode_put(codec, ucontrol, spec->channel_mode,
+                               spec->num_channel_mode,
+                               &spec->multiout.max_channels);
 }
 
@@ -250 +268 @@
  */
 static char *alc_pin_mode_names[] = {
-        "Mic 50pc bias", "Mic 80pc bias",
-        "Line in", "Line out", "Headphone out",
+    "Mic 50pc bias", "Mic 80pc bias",
+    "Line in", "Line out", "Headphone out",
 };
 static unsigned char alc_pin_mode_values[] = {
-        PIN_VREF50, PIN_VREF80, PIN_IN, PIN_OUT, PIN_HP,
+    PIN_VREF50, PIN_VREF80, PIN_IN, PIN_OUT, PIN_HP,
 };
 /* The control can present all 5 options, or it can limit the options based
@@ -267 +285 @@
  */
 static signed char alc_pin_mode_dir_info[3][2] = {
-        { 0, 2 },    /* ALC_PIN_DIR_IN */
-        { 3, 4 },    /* ALC_PIN_DIR_OUT */
-        { 0, 4 },    /* ALC_PIN_DIR_INOUT */
+    { 0, 2 },    /* ALC_PIN_DIR_IN */
+    { 3, 4 },    /* ALC_PIN_DIR_OUT */
+    { 0, 4 },    /* ALC_PIN_DIR_INOUT */
 };
 #define alc_pin_mode_min(_dir) (alc_pin_mode_dir_info[_dir][0])
 #define alc_pin_mode_max(_dir) (alc_pin_mode_dir_info[_dir][1])
 #define alc_pin_mode_n_items(_dir) \
-        (alc_pin_mode_max(_dir)-alc_pin_mode_min(_dir)+1)
+    (alc_pin_mode_max(_dir)-alc_pin_mode_min(_dir)+1)
 
 static int alc_pin_mode_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-        unsigned int item_num = uinfo->value.enumerated.item;
-        unsigned char dir = (kcontrol->private_value >> 16) & 0xff;
-
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = alc_pin_mode_n_items(dir);
-
-        if (item_num<alc_pin_mode_min(dir) || item_num>alc_pin_mode_max(dir))
-                item_num = alc_pin_mode_min(dir);
-        strcpy(uinfo->value.enumerated.name, alc_pin_mode_names[item_num]);
-        return 0;
+    unsigned int item_num = uinfo->value.enumerated.item;
+    unsigned char dir = (kcontrol->private_value >> 16) & 0xff;
+
+    uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+    uinfo->count = 1;
+    uinfo->value.enumerated.items = alc_pin_mode_n_items(dir);
+
+    if (item_num<alc_pin_mode_min(dir) || item_num>alc_pin_mode_max(dir))
+        item_num = alc_pin_mode_min(dir);
+    strcpy(uinfo->value.enumerated.name, alc_pin_mode_names[item_num]);
+    return 0;
 }
 
 static int alc_pin_mode_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        unsigned int i;
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        hda_nid_t nid = kcontrol->private_value & 0xffff;
-        unsigned char dir = (kcontrol->private_value >> 16) & 0xff;
-        long *valp = ucontrol->value.integer.value;
-        unsigned int pinctl = snd_hda_codec_read(codec,nid,0,AC_VERB_GET_PIN_WIDGET_CONTROL,0x00);
-
-        /* Find enumerated value for current pinctl setting */
-        i = alc_pin_mode_min(dir);
-        while (alc_pin_mode_values[i]!=pinctl && i<=alc_pin_mode_max(dir))
-                i++;
-        *valp = i<=alc_pin_mode_max(dir)?i:alc_pin_mode_min(dir);
-        return 0;
+    unsigned int i;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    hda_nid_t nid = kcontrol->private_value & 0xffff;
+    unsigned char dir = (kcontrol->private_value >> 16) & 0xff;
+    long *valp = ucontrol->value.integer.value;
+    unsigned int pinctl = snd_hda_codec_read(codec,nid,0,AC_VERB_GET_PIN_WIDGET_CONTROL,0x00);
+
+    /* Find enumerated value for current pinctl setting */
+    i = alc_pin_mode_min(dir);
+    while (alc_pin_mode_values[i]!=pinctl && i<=alc_pin_mode_max(dir))
+        i++;
+    *valp = i<=alc_pin_mode_max(dir)?i:alc_pin_mode_min(dir);
+    return 0;
 }
 
 static int alc_pin_mode_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        signed int change;
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        hda_nid_t nid = kcontrol->private_value & 0xffff;
-        unsigned char dir = (kcontrol->private_value >> 16) & 0xff;
-        long val = *ucontrol->value.integer.value;
-        unsigned int pinctl = snd_hda_codec_read(codec,nid,0,AC_VERB_GET_PIN_WIDGET_CONTROL,0x00);
-
-        if (val<alc_pin_mode_min(dir) || val>alc_pin_mode_max(dir))
-                val = alc_pin_mode_min(dir);
-
-        change = pinctl != alc_pin_mode_values[val];
-        if (change) {
-                /* Set pin mode to that requested */
-                snd_hda_codec_write(codec,nid,0,AC_VERB_SET_PIN_WIDGET_CONTROL,
-                        alc_pin_mode_values[val]);
-
-                /* Also enable the retasking pin's input/output as required
-                 * for the requested pin mode.  Enum values of 2 or less are
-                 * input modes.
-                 *
-                 * Dynamically switching the input/output buffers probably
-                 * reduces noise slightly, particularly on input.  However,
-                 * havingboth input and output buffers enabled
-                 * simultaneously doesn't seem to be problematic.
-                 */
-                if (val <= 2) {
-                        snd_hda_codec_write(codec,nid,0,AC_VERB_SET_AMP_GAIN_MUTE,
-                                AMP_OUT_MUTE);
-                        snd_hda_codec_write(codec,nid,0,AC_VERB_SET_AMP_GAIN_MUTE,
-                                AMP_IN_UNMUTE(0));
-                } else {
-                        snd_hda_codec_write(codec,nid,0,AC_VERB_SET_AMP_GAIN_MUTE,
-                                AMP_IN_MUTE(0));
-                        snd_hda_codec_write(codec,nid,0,AC_VERB_SET_AMP_GAIN_MUTE,
-                                AMP_OUT_UNMUTE);
-                }
-        }
-        return change;
+    signed int change;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    hda_nid_t nid = kcontrol->private_value & 0xffff;
+    unsigned char dir = (kcontrol->private_value >> 16) & 0xff;
+    long val = *ucontrol->value.integer.value;
+    unsigned int pinctl = snd_hda_codec_read(codec,nid,0,AC_VERB_GET_PIN_WIDGET_CONTROL,0x00);
+
+    if (val<alc_pin_mode_min(dir) || val>alc_pin_mode_max(dir))
+        val = alc_pin_mode_min(dir);
+
+    change = pinctl != alc_pin_mode_values[val];
+    if (change) {
+        /* Set pin mode to that requested */
+        snd_hda_codec_write(codec,nid,0,AC_VERB_SET_PIN_WIDGET_CONTROL,
+                            alc_pin_mode_values[val]);
+
+        /* Also enable the retasking pin's input/output as required
+         * for the requested pin mode.  Enum values of 2 or less are
+         * input modes.
+         *
+         * Dynamically switching the input/output buffers probably
+         * reduces noise slightly, particularly on input.  However,
+         * havingboth input and output buffers enabled
+         * simultaneously doesn't seem to be problematic.
+         */
+        if (val <= 2) {
+            snd_hda_codec_write(codec,nid,0,AC_VERB_SET_AMP_GAIN_MUTE,
+                                AMP_OUT_MUTE);
+            snd_hda_codec_write(codec,nid,0,AC_VERB_SET_AMP_GAIN_MUTE,
+                                AMP_IN_UNMUTE(0));
+        } else {
+            snd_hda_codec_write(codec,nid,0,AC_VERB_SET_AMP_GAIN_MUTE,
+                                AMP_IN_MUTE(0));
+            snd_hda_codec_write(codec,nid,0,AC_VERB_SET_AMP_GAIN_MUTE,
+                                AMP_OUT_UNMUTE);
+        }
+    }
+    return change;
 }
 
 #define ALC_PIN_MODE(xname, nid, dir) \
-        { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \
-          .info = alc_pin_mode_info, \
-          .get = alc_pin_mode_get, \
-          .put = alc_pin_mode_put, \
-          .private_value = nid | (dir<<16) }
+    { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \
+    .info = alc_pin_mode_info, \
+    .get = alc_pin_mode_get, \
+    .put = alc_pin_mode_put, \
+    .private_value = nid | (dir<<16) }
 
 /* A switch control for ALC260 GPIO pins.  Multiple GPIOs can be ganged
@@ -365 +383 @@
 static int alc_gpio_data_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
+    uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+    uinfo->count = 1;
+    uinfo->value.integer.min = 0;
+    uinfo->value.integer.max = 1;
+    return 0;
 }
 static int alc_gpio_data_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        hda_nid_t nid = kcontrol->private_value & 0xffff;
-        unsigned char mask = (kcontrol->private_value >> 16) & 0xff;
-        long *valp = ucontrol->value.integer.value;
-        unsigned int val = snd_hda_codec_read(codec,nid,0,AC_VERB_GET_GPIO_DATA,0x00);
-
-        *valp = (val & mask) != 0;
-        return 0;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    hda_nid_t nid = kcontrol->private_value & 0xffff;
+    unsigned char mask = (kcontrol->private_value >> 16) & 0xff;
+    long *valp = ucontrol->value.integer.value;
+    unsigned int val = snd_hda_codec_read(codec,nid,0,AC_VERB_GET_GPIO_DATA,0x00);
+
+    *valp = (val & mask) != 0;
+    return 0;
 }
 static int alc_gpio_data_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        signed int change;
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        hda_nid_t nid = kcontrol->private_value & 0xffff;
-        unsigned char mask = (kcontrol->private_value >> 16) & 0xff;
-        long val = *ucontrol->value.integer.value;
-        unsigned int gpio_data = snd_hda_codec_read(codec,nid,0,AC_VERB_GET_GPIO_DATA,0x00);
-
-        /* Set/unset the masked GPIO bit(s) as needed */
-        change = (val==0?0:mask) != (gpio_data & mask);
-        if (val==0)
-                gpio_data &= ~mask;
-        else
-                gpio_data |= mask;
-        snd_hda_codec_write(codec,nid,0,AC_VERB_SET_GPIO_DATA,gpio_data);
-
-        return change;
+    signed int change;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    hda_nid_t nid = kcontrol->private_value & 0xffff;
+    unsigned char mask = (kcontrol->private_value >> 16) & 0xff;
+    long val = *ucontrol->value.integer.value;
+    unsigned int gpio_data = snd_hda_codec_read(codec,nid,0,AC_VERB_GET_GPIO_DATA,0x00);
+
+    /* Set/unset the masked GPIO bit(s) as needed */
+    change = (val==0?0:mask) != (gpio_data & mask);
+    if (val==0)
+        gpio_data &= ~mask;
+    else
+        gpio_data |= mask;
+    snd_hda_codec_write(codec,nid,0,AC_VERB_SET_GPIO_DATA,gpio_data);
+
+    return change;
 }
 #define ALC_GPIO_DATA_SWITCH(xname, nid, mask) \
-        { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \
-          .info = alc_gpio_data_info, \
-          .get = alc_gpio_data_get, \
-          .put = alc_gpio_data_put, \
-          .private_value = nid | (mask<<16) }
+    { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \
+    .info = alc_gpio_data_info, \
+    .get = alc_gpio_data_get, \
+    .put = alc_gpio_data_put, \
+    .private_value = nid | (mask<<16) }
 #endif   /* CONFIG_SND_DEBUG */
 
@@ -419 +437 @@
 static int alc_spdif_ctrl_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
+    uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+    uinfo->count = 1;
+    uinfo->value.integer.min = 0;
+    uinfo->value.integer.max = 1;
+    return 0;
 }
 static int alc_spdif_ctrl_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        hda_nid_t nid = kcontrol->private_value & 0xffff;
-        unsigned char mask = (kcontrol->private_value >> 16) & 0xff;
-        long *valp = ucontrol->value.integer.value;
-        unsigned int val = snd_hda_codec_read(codec,nid,0,AC_VERB_GET_DIGI_CONVERT,0x00);
-
-        *valp = (val & mask) != 0;
-        return 0;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    hda_nid_t nid = kcontrol->private_value & 0xffff;
+    unsigned char mask = (kcontrol->private_value >> 16) & 0xff;
+    long *valp = ucontrol->value.integer.value;
+    unsigned int val = snd_hda_codec_read(codec,nid,0,AC_VERB_GET_DIGI_CONVERT,0x00);
+
+    *valp = (val & mask) != 0;
+    return 0;
 }
 static int alc_spdif_ctrl_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        signed int change;
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        hda_nid_t nid = kcontrol->private_value & 0xffff;
-        unsigned char mask = (kcontrol->private_value >> 16) & 0xff;
-        long val = *ucontrol->value.integer.value;
-        unsigned int ctrl_data = snd_hda_codec_read(codec,nid,0,AC_VERB_GET_DIGI_CONVERT,0x00);
-
-        /* Set/unset the masked control bit(s) as needed */
-        change = (val==0?0:mask) != (ctrl_data & mask);
-        if (val==0)
-                ctrl_data &= ~mask;
-        else
-                ctrl_data |= mask;
-        snd_hda_codec_write(codec,nid,0,AC_VERB_SET_DIGI_CONVERT_1,ctrl_data);
-
-        return change;
+    signed int change;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    hda_nid_t nid = kcontrol->private_value & 0xffff;
+    unsigned char mask = (kcontrol->private_value >> 16) & 0xff;
+    long val = *ucontrol->value.integer.value;
+    unsigned int ctrl_data = snd_hda_codec_read(codec,nid,0,AC_VERB_GET_DIGI_CONVERT,0x00);
+
+    /* Set/unset the masked control bit(s) as needed */
+    change = (val==0?0:mask) != (ctrl_data & mask);
+    if (val==0)
+        ctrl_data &= ~mask;
+    else
+        ctrl_data |= mask;
+    snd_hda_codec_write(codec,nid,0,AC_VERB_SET_DIGI_CONVERT_1,ctrl_data);
+
+    return change;
 }
 #define ALC_SPDIF_CTRL_SWITCH(xname, nid, mask) \
-        { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \
-          .info = alc_spdif_ctrl_info, \
-          .get = alc_spdif_ctrl_get, \
-          .put = alc_spdif_ctrl_put, \
-          .private_value = nid | (mask<<16) }
+    { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \
+    .info = alc_spdif_ctrl_info, \
+    .get = alc_spdif_ctrl_get, \
+    .put = alc_spdif_ctrl_put, \
+    .private_value = nid | (mask<<16) }
 #endif   /* CONFIG_SND_DEBUG */
 
@@ -468 +486 @@
 static void setup_preset(struct alc_spec *spec, const struct alc_config_preset *preset)
 {
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(preset->mixers) && preset->mixers[i]; i++)
-                spec->mixers[spec->num_mixers++] = preset->mixers[i];
-        for (i = 0; i < ARRAY_SIZE(preset->init_verbs) && preset->init_verbs[i]; i++)
-                spec->init_verbs[spec->num_init_verbs++] = preset->init_verbs[i];
-
-        spec->channel_mode = preset->channel_mode;
-        spec->num_channel_mode = preset->num_channel_mode;
-
-        spec->multiout.max_channels = spec->channel_mode[0].channels;
-
-        spec->multiout.num_dacs = preset->num_dacs;
-        spec->multiout.dac_nids = preset->dac_nids;
-        spec->multiout.dig_out_nid = preset->dig_out_nid;
-        spec->multiout.hp_nid = preset->hp_nid;
-
-        spec->input_mux = preset->input_mux;
-
-        spec->num_adc_nids = preset->num_adc_nids;
-        spec->adc_nids = preset->adc_nids;
-        spec->dig_in_nid = preset->dig_in_nid;
-        spec->unsol_event = preset->unsol_event;
-        spec->init_hook = preset->init_hook;
+    int i;
+
+    for (i = 0; i < ARRAY_SIZE(preset->mixers) && preset->mixers[i]; i++)
+        spec->mixers[spec->num_mixers++] = preset->mixers[i];
+    for (i = 0; i < ARRAY_SIZE(preset->init_verbs) && preset->init_verbs[i]; i++)
+        spec->init_verbs[spec->num_init_verbs++] = preset->init_verbs[i];
+
+    spec->channel_mode = preset->channel_mode;
+    spec->num_channel_mode = preset->num_channel_mode;
+
+    spec->multiout.max_channels = spec->channel_mode[0].channels;
+
+    spec->multiout.num_dacs = preset->num_dacs;
+    spec->multiout.dac_nids = preset->dac_nids;
+    spec->multiout.dig_out_nid = preset->dig_out_nid;
+    spec->multiout.hp_nid = preset->hp_nid;
+
+    spec->input_mux = preset->input_mux;
+
+    spec->num_adc_nids = preset->num_adc_nids;
+    spec->adc_nids = preset->adc_nids;
+    spec->dig_in_nid = preset->dig_in_nid;
+    spec->unsol_event = preset->unsol_event;
+    spec->init_hook = preset->init_hook;
 }
 
@@ -503 +521 @@
 
 static hda_nid_t alc880_dac_nids[4] = {
-        /* front, rear, clfe, rear_surr */
-        0x02, 0x05, 0x04, 0x03
+    /* front, rear, clfe, rear_surr */
+    0x02, 0x05, 0x04, 0x03
 };
 
 static hda_nid_t alc880_adc_nids[3] = {
-        /* ADC0-2 */
-        0x07, 0x08, 0x09,
+    /* ADC0-2 */
+    0x07, 0x08, 0x09,
 };
 
@@ -517 +535 @@
  */
 static hda_nid_t alc880_adc_nids_alt[2] = {
-        /* ADC1-2 */
-        0x08, 0x09,
+    /* ADC1-2 */
+    0x08, 0x09,
 };
 
@@ -525 +543 @@
 
 static struct hda_input_mux alc880_capture_source = {
-        .num_items = 4,
-        .items = {
-                { "Mic", 0x0 },
-                { "Front Mic", 0x3 },
-                { "Line", 0x2 },
-                { "CD", 0x4 },
-        },
+    .num_items = 4,
+    .items = {
+        { "Mic", 0x0 },
+        { "Front Mic", 0x3 },
+        { "Line", 0x2 },
+        { "CD", 0x4 },
+    },
 };
 
@@ -537 +555 @@
 /* 2ch mode */
 static struct hda_verb alc880_threestack_ch2_init[] = {
-        /* set line-in to input, mute it */
-        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
-        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
-        /* set mic-in to input vref 80%, mute it */
-        { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
-        { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
-        {0} /* end */
+    /* set line-in to input, mute it */
+    { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
+    { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
+    /* set mic-in to input vref 80%, mute it */
+    { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
+    { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
+    {0} /* end */
 };
 
 /* 6ch mode */
 static struct hda_verb alc880_threestack_ch6_init[] = {
-        /* set line-in to output, unmute it */
-        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
-        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
-        /* set mic-in to output, unmute it */
-        { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
-        { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
-        {0} /* end */
+    /* set line-in to output, unmute it */
+    { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+    { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
+    /* set mic-in to output, unmute it */
+    { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+    { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
+    {0} /* end */
 };
 
 static struct hda_channel_mode alc880_threestack_modes[2] = {
-        { 2, alc880_threestack_ch2_init },
-        { 6, alc880_threestack_ch6_init },
+    { 2, alc880_threestack_ch2_init },
+    { 6, alc880_threestack_ch6_init },
 };
 
 static struct snd_kcontrol_new alc880_three_stack_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", 0x0f, 0x0, HDA_OUTPUT),
-        HDA_BIND_MUTE("Surround Playback Switch", 0x0f, 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("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_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x3, HDA_INPUT),
-        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x3, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("Headphone Playback Switch", 0x19, 0x0, HDA_OUTPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Channel Mode",
-                .info = alc_ch_mode_info,
-                .get = alc_ch_mode_get,
-                .put = alc_ch_mode_put,
-        },
-        {0} /* end */
+    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", 0x0f, 0x0, HDA_OUTPUT),
+    HDA_BIND_MUTE("Surround Playback Switch", 0x0f, 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("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_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x3, HDA_INPUT),
+    HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x3, HDA_INPUT),
+    HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
+    HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
+    HDA_CODEC_MUTE("Headphone Playback Switch", 0x19, 0x0, HDA_OUTPUT),
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Channel Mode",
+        .info = alc_ch_mode_info,
+        .get = alc_ch_mode_get,
+        .put = alc_ch_mode_put,
+    },
+    {0} /* end */
 };
 
 /* capture mixer elements */
 static struct snd_kcontrol_new alc880_capture_mixer[] = {
-        HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME_IDX("Capture Volume", 2, 0x09, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE_IDX("Capture Switch", 2, 0x09, 0x0, HDA_INPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                /* The multiple "Capture Source" controls confuse alsamixer
-                 * So call somewhat different..
-                 * FIXME: the controls appear in the "playback" view!
-                 */
-                /* .name = "Capture Source", */
-                .name = "Input Source",
-                .count = 3,
-                .info = alc_mux_enum_info,
-                .get = alc_mux_enum_get,
-                .put = alc_mux_enum_put,
-        },
-        {0} /* end */
+    HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x08, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x08, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME_IDX("Capture Volume", 2, 0x09, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE_IDX("Capture Switch", 2, 0x09, 0x0, HDA_INPUT),
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        /* The multiple "Capture Source" controls confuse alsamixer
+         * So call somewhat different..
+         * FIXME: the controls appear in the "playback" view!
+         */
+        /* .name = "Capture Source", */
+        .name = "Input Source",
+        .count = 3,
+        .info = alc_mux_enum_info,
+        .get = alc_mux_enum_get,
+        .put = alc_mux_enum_put,
+    },
+    {0} /* end */
 };
 
 /* capture mixer elements (in case NID 0x07 not available) */
 static struct snd_kcontrol_new alc880_capture_alt_mixer[] = {
-        HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                /* The multiple "Capture Source" controls confuse alsamixer
-                 * So call somewhat different..
-                 * FIXME: the controls appear in the "playback" view!
-                 */
-                /* .name = "Capture Source", */
-                .name = "Input Source",
-                .count = 2,
-                .info = alc_mux_enum_info,
-                .get = alc_mux_enum_get,
-                .put = alc_mux_enum_put,
-        },
-        {0} /* end */
+    HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT),
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        /* The multiple "Capture Source" controls confuse alsamixer
+         * So call somewhat different..
+         * FIXME: the controls appear in the "playback" view!
+         */
+        /* .name = "Capture Source", */
+        .name = "Input Source",
+        .count = 2,
+        .info = alc_mux_enum_info,
+        .get = alc_mux_enum_get,
+        .put = alc_mux_enum_put,
+    },
+    {0} /* end */
 };
 
@@ -650 +668 @@
 /* additional mixers to alc880_three_stack_mixer */
 static struct snd_kcontrol_new alc880_five_stack_mixer[] = {
-        HDA_CODEC_VOLUME("Side Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
-        HDA_BIND_MUTE("Side Playback Switch", 0x0d, 2, HDA_INPUT),
-        {0} /* end */
+    HDA_CODEC_VOLUME("Side Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
+    HDA_BIND_MUTE("Side Playback Switch", 0x0d, 2, HDA_INPUT),
+    {0} /* end */
 };
 
@@ -658 +676 @@
 /* 6ch mode */
 static struct hda_verb alc880_fivestack_ch6_init[] = {
-        /* set line-in to input, mute it */
-        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
-        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
-        {0} /* end */
+    /* set line-in to input, mute it */
+    { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
+    { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
+    {0} /* end */
 };
 
 /* 8ch mode */
 static struct hda_verb alc880_fivestack_ch8_init[] = {
-        /* set line-in to output, unmute it */
-        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
-        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
-        {0} /* end */
+    /* set line-in to output, unmute it */
+    { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+    { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
+    {0} /* end */
 };
 
 static struct hda_channel_mode alc880_fivestack_modes[2] = {
-        { 6, alc880_fivestack_ch6_init },
-        { 8, alc880_fivestack_ch8_init },
+    { 6, alc880_fivestack_ch6_init },
+    { 8, alc880_fivestack_ch8_init },
 };
 
@@ -687 +705 @@
 
 static hda_nid_t alc880_6st_dac_nids[4] = {
-        /* front, rear, clfe, rear_surr */
-        0x02, 0x03, 0x04, 0x05
+    /* front, rear, clfe, rear_surr */
+    0x02, 0x03, 0x04, 0x05
 };
 
 static struct hda_input_mux alc880_6stack_capture_source = {
-        .num_items = 4,
-        .items = {
-                { "Mic", 0x0 },
-                { "Front Mic", 0x1 },
-                { "Line", 0x2 },
-                { "CD", 0x4 },
-        },
+    .num_items = 4,
+    .items = {
+        { "Mic", 0x0 },
+        { "Front Mic", 0x1 },
+        { "Line", 0x2 },
+        { "CD", 0x4 },
+    },
 };
 
 /* fixed 8-channels */
 static struct hda_channel_mode alc880_sixstack_modes[1] = {
-        { 8, NULL },
+    { 8, NULL },
 };
 
 static struct snd_kcontrol_new alc880_six_stack_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_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Channel Mode",
-                .info = alc_ch_mode_info,
-                .get = alc_ch_mode_get,
-                .put = alc_ch_mode_put,
-        },
-        {0} /* end */
+    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_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+    HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
+    HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
+    HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Channel Mode",
+        .info = alc_ch_mode_info,
+        .get = alc_ch_mode_get,
+        .put = alc_ch_mode_put,
+    },
+    {0} /* end */
 };
 
@@ -764 +782 @@
 
 static hda_nid_t alc880_w810_dac_nids[3] = {
-        /* front, rear/surround, clfe */
-        0x02, 0x03, 0x04
+    /* front, rear/surround, clfe */
+    0x02, 0x03, 0x04
 };
 
 /* fixed 6 channels */
 static struct hda_channel_mode alc880_w810_modes[1] = {
-        { 6, NULL }
+    { 6, NULL }
 };
 
 /* Pin assignment: Front = 0x14, Surr = 0x15, CLFE = 0x16, HP = 0x1b */
 static struct snd_kcontrol_new alc880_w810_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_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
-        {0} /* end */
+    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_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
+    {0} /* end */
 };
 
@@ -796 +814 @@
 
 static hda_nid_t alc880_z71v_dac_nids[1] = {
-        0x02
+    0x02
 };
 #define ALC880_Z71V_HP_DAC      0x03
@@ -802 +820 @@
 /* fixed 2 channels */
 static struct hda_channel_mode alc880_2_jack_modes[1] = {
-        { 2, NULL }
+    { 2, NULL }
 };
 
 static struct snd_kcontrol_new alc880_z71v_mixer[] = {
-        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
-        HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
-        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
-        HDA_BIND_MUTE("Headphone Playback Switch", 0x0d, 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("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        {0} /* end */
+    HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+    HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
+    HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
+    HDA_BIND_MUTE("Headphone Playback Switch", 0x0d, 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("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+    {0} /* end */
 };
 
@@ -827 +845 @@
 
 static hda_nid_t alc880_f1734_dac_nids[1] = {
-        0x03
+    0x03
 };
 #define ALC880_F1734_HP_DAC     0x02
 
 static struct snd_kcontrol_new alc880_f1734_mixer[] = {
-        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
-        HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT),
-        HDA_CODEC_VOLUME("Internal Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
-        HDA_BIND_MUTE("Internal Speaker Playback Switch", 0x0d, 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("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        {0} /* end */
+    HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+    HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT),
+    HDA_CODEC_VOLUME("Internal Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
+    HDA_BIND_MUTE("Internal Speaker Playback Switch", 0x0d, 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("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+    {0} /* end */
 };
 
@@ -857 +875 @@
 
 static struct snd_kcontrol_new alc880_asus_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("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_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Channel Mode",
-                .info = alc_ch_mode_info,
-                .get = alc_ch_mode_get,
-                .put = alc_ch_mode_put,
-        },
-        {0} /* end */
+    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("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_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Channel Mode",
+        .info = alc_ch_mode_info,
+        .get = alc_ch_mode_get,
+        .put = alc_ch_mode_put,
+    },
+    {0} /* end */
 };
 
@@ -892 +910 @@
 /* additional mixers to alc880_asus_mixer */
 static struct snd_kcontrol_new alc880_asus_w1v_mixer[] = {
-        HDA_CODEC_VOLUME("Line2 Playback Volume", 0x0b, 0x03, HDA_INPUT),
-        HDA_CODEC_MUTE("Line2 Playback Switch", 0x0b, 0x03, HDA_INPUT),
-        {0} /* end */
+    HDA_CODEC_VOLUME("Line2 Playback Volume", 0x0b, 0x03, HDA_INPUT),
+    HDA_CODEC_MUTE("Line2 Playback Switch", 0x0b, 0x03, HDA_INPUT),
+    {0} /* end */
 };
 
 /* additional mixers to alc880_asus_mixer */
 static struct snd_kcontrol_new alc880_pcbeep_mixer[] = {
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
-        {0} /* end */
+    HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
+    HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
+    {0} /* end */
 };
 
 /* TCL S700 */
 static struct snd_kcontrol_new alc880_tcl_s700_mixer[] = {
-        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("CD Playback Volume", 0x0B, 0x04, HDA_INPUT),
-        HDA_CODEC_MUTE("CD Playback Switch", 0x0B, 0x04, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0B, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Mic Playback Switch", 0x0B, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                /* The multiple "Capture Source" controls confuse alsamixer
-                 * So call somewhat different..
-                 * FIXME: the controls appear in the "playback" view!
-                 */
-                /* .name = "Capture Source", */
-                .name = "Input Source",
-                .count = 1,
-                .info = alc_mux_enum_info,
-                .get = alc_mux_enum_get,
-                .put = alc_mux_enum_put,
-        },
-        {0} /* end */
+    HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),
+    HDA_CODEC_VOLUME("CD Playback Volume", 0x0B, 0x04, HDA_INPUT),
+    HDA_CODEC_MUTE("CD Playback Switch", 0x0B, 0x04, HDA_INPUT),
+    HDA_CODEC_VOLUME("Mic Playback Volume", 0x0B, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("Mic Playback Switch", 0x0B, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        /* The multiple "Capture Source" controls confuse alsamixer
+         * So call somewhat different..
+         * FIXME: the controls appear in the "playback" view!
+         */
+        /* .name = "Capture Source", */
+        .name = "Input Source",
+        .count = 1,
+        .info = alc_mux_enum_info,
+        .get = alc_mux_enum_get,
+        .put = alc_mux_enum_put,
+    },
+    {0} /* end */
 };
 
@@ -936 +954 @@
 static int alc_build_controls(struct hda_codec *codec)
 {
-        struct alc_spec *spec = codec->spec;
-        int err;
-        int i;
-
-        for (i = 0; i < spec->num_mixers; i++) {
-                err = snd_hda_add_new_ctls(codec, spec->mixers[i]);
-                if (err < 0)
-                        return err;
-        }
-
-        if (spec->multiout.dig_out_nid) {
-                err = snd_hda_create_spdif_out_ctls(codec, spec->multiout.dig_out_nid);
-                if (err < 0)
-                        return err;
-        }
-        if (spec->dig_in_nid) {
-                err = snd_hda_create_spdif_in_ctls(codec, spec->dig_in_nid);
-                if (err < 0)
-                        return err;
-        }
-        return 0;
+    struct alc_spec *spec = codec->spec;
+    int err;
+    int i;
+
+    for (i = 0; i < spec->num_mixers; i++) {
+        err = snd_hda_add_new_ctls(codec, spec->mixers[i]);
+        if (err < 0)
+            return err;
+    }
+
+    if (spec->multiout.dig_out_nid) {
+        err = snd_hda_create_spdif_out_ctls(codec, spec->multiout.dig_out_nid);
+        if (err < 0)
+            return err;
+    }
+    if (spec->dig_in_nid) {
+        err = snd_hda_create_spdif_in_ctls(codec, spec->dig_in_nid);
+        if (err < 0)
+            return err;
+    }
+    return 0;
 }
 
@@ -968 +986 @@
  */
 static struct hda_verb alc880_volume_init_verbs[] = {
-        /*
-         * Unmute ADC0-2 and set the default input to mic-in
-         */
-        {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-
-        /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
-         * mixer widget
-         * Note: PASD motherboards uses the Line In 2 as the input for front panel
-         * mic (mic 2)
-         */
-        /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
-
-        /*
-         * Set up output mixers (0x0c - 0x0f)
-         */
-        /* set vol=0 to output mixers */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        /* set up input amps for analog loopback */
-        /* Amp Indices: DAC = 0, mixer = 1 */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-
-        {0}
+    /*
+     * Unmute ADC0-2 and set the default input to mic-in
+     */
+    {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+
+    /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
+     * mixer widget
+     * Note: PASD motherboards uses the Line In 2 as the input for front panel
+     * mic (mic 2)
+     */
+    /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+
+    /*
+     * Set up output mixers (0x0c - 0x0f)
+     */
+    /* set vol=0 to output mixers */
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    /* set up input amps for analog loopback */
+    /* Amp Indices: DAC = 0, mixer = 1 */
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+
+    {0}
 };
 
@@ -1017 +1035 @@
  */
 static struct hda_verb alc880_pin_3stack_init_verbs[] = {
-        /*
-         * preset connection lists of input pins
-         * 0 = front, 1 = rear_surr, 2 = CLFE, 3 = surround
-         */
-        {0x10, AC_VERB_SET_CONNECT_SEL, 0x02}, /* mic/clfe */
-        {0x11, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
-        {0x12, AC_VERB_SET_CONNECT_SEL, 0x03}, /* line/surround */
-
-        /*
-         * Set pin mode and muting
-         */
-        /* set front pin widgets 0x14 for output */
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        /* Mic1 (rear panel) pin widget for input and vref at 80% */
-        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        /* Mic2 (as headphone out) for HP output */
-        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
-        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        /* Line In pin widget for input */
-        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        /* Line2 (as front mic) pin widget for input and vref at 80% */
-        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        /* CD pin widget for input */
-        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-
-        {0}
+    /*
+     * preset connection lists of input pins
+     * 0 = front, 1 = rear_surr, 2 = CLFE, 3 = surround
+     */
+    {0x10, AC_VERB_SET_CONNECT_SEL, 0x02}, /* mic/clfe */
+    {0x11, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
+    {0x12, AC_VERB_SET_CONNECT_SEL, 0x03}, /* line/surround */
+
+    /*
+     * Set pin mode and muting
+     */
+    /* set front pin widgets 0x14 for output */
+    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* Mic1 (rear panel) pin widget for input and vref at 80% */
+    {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    /* Mic2 (as headphone out) for HP output */
+    {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+    {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* Line In pin widget for input */
+    {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+    {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    /* Line2 (as front mic) pin widget for input and vref at 80% */
+    {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    /* CD pin widget for input */
+    {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+
+    {0}
 };
 
@@ -1055 +1073 @@
  */
 static struct hda_verb alc880_pin_5stack_init_verbs[] = {
-        /*
-         * preset connection lists of input pins
-         * 0 = front, 1 = rear_surr, 2 = CLFE, 3 = surround
-         */
-        {0x11, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
-        {0x12, AC_VERB_SET_CONNECT_SEL, 0x01}, /* line/side */
-
-        /*
-         * Set pin mode and muting
-         */
-        /* set pin widgets 0x14-0x17 for output */
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        /* unmute pins for output (no gain on this amp) */
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-
-        /* Mic1 (rear panel) pin widget for input and vref at 80% */
-        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        /* Mic2 (as headphone out) for HP output */
-        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
-        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        /* Line In pin widget for input */
-        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        /* Line2 (as front mic) pin widget for input and vref at 80% */
-        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        /* CD pin widget for input */
-        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-
-        {0}
+    /*
+     * preset connection lists of input pins
+     * 0 = front, 1 = rear_surr, 2 = CLFE, 3 = surround
+     */
+    {0x11, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
+    {0x12, AC_VERB_SET_CONNECT_SEL, 0x01}, /* line/side */
+
+    /*
+     * Set pin mode and muting
+     */
+    /* set pin widgets 0x14-0x17 for output */
+    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    /* unmute pins for output (no gain on this amp) */
+    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+
+    /* Mic1 (rear panel) pin widget for input and vref at 80% */
+    {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    /* Mic2 (as headphone out) for HP output */
+    {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+    {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* Line In pin widget for input */
+    {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+    {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    /* Line2 (as front mic) pin widget for input and vref at 80% */
+    {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    /* CD pin widget for input */
+    {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+
+    {0}
 };
 
@@ -1099 +1117 @@
  */
 static struct hda_verb alc880_pin_w810_init_verbs[] = {
-        /* hphone/speaker input selector: front DAC */
-        {0x13, AC_VERB_SET_CONNECT_SEL, 0x0},
-
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-
-        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
-        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-
-        {0}
+    /* hphone/speaker input selector: front DAC */
+    {0x13, AC_VERB_SET_CONNECT_SEL, 0x0},
+
+    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+
+    {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+    {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+
+    {0}
 };
 
@@ -1120 +1138 @@
  */
 static struct hda_verb alc880_pin_z71v_init_verbs[] = {
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-
-        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-
-        {0}
+    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+
+    {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+    {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+
+    {0}
 };
 
@@ -1139 +1157 @@
  */
 static struct hda_verb alc880_pin_6stack_init_verbs[] = {
-        {0x13, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
-
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-
-        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
-        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-
-        {0}
+    {0x13, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
+
+    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+
+    {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+    {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+    {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+
+    {0}
 };
 
@@ -1169 +1187 @@
  */
 static struct hda_verb alc880_pin_f1734_init_verbs[] = {
-        {0x10, AC_VERB_SET_CONNECT_SEL, 0x02},
-        {0x11, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0x12, AC_VERB_SET_CONNECT_SEL, 0x01},
-        {0x13, AC_VERB_SET_CONNECT_SEL, 0x00},
-
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-
-        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-
-        {0}
+    {0x10, AC_VERB_SET_CONNECT_SEL, 0x02},
+    {0x11, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x12, AC_VERB_SET_CONNECT_SEL, 0x01},
+    {0x13, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+
+    {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+
+    {0}
 };
 
@@ -1198 +1216 @@
  */
 static struct hda_verb alc880_pin_asus_init_verbs[] = {
-        {0x10, AC_VERB_SET_CONNECT_SEL, 0x02},
-        {0x11, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0x12, AC_VERB_SET_CONNECT_SEL, 0x01},
-        {0x13, AC_VERB_SET_CONNECT_SEL, 0x00},
-
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-
-        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-
-        {0}
+    {0x10, AC_VERB_SET_CONNECT_SEL, 0x02},
+    {0x11, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x12, AC_VERB_SET_CONNECT_SEL, 0x01},
+    {0x13, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+
+    {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+
+    {0}
 };
 
 /* Enable GPIO mask and set output */
 static struct hda_verb alc880_gpio1_init_verbs[] = {
-        {0x01, AC_VERB_SET_GPIO_MASK, 0x01},
-        {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x01},
-        {0x01, AC_VERB_SET_GPIO_DATA, 0x01},
-
-        {0}
+    {0x01, AC_VERB_SET_GPIO_MASK, 0x01},
+    {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x01},
+    {0x01, AC_VERB_SET_GPIO_DATA, 0x01},
+
+    {0}
 };
 
 /* Enable GPIO mask and set output */
 static struct hda_verb alc880_gpio2_init_verbs[] = {
-        {0x01, AC_VERB_SET_GPIO_MASK, 0x02},
-        {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x02},
-        {0x01, AC_VERB_SET_GPIO_DATA, 0x02},
-
-        {0}
+    {0x01, AC_VERB_SET_GPIO_MASK, 0x02},
+    {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x02},
+    {0x01, AC_VERB_SET_GPIO_DATA, 0x02},
+
+    {0}
 };
 
 /* Clevo m520g init */
 static struct hda_verb alc880_pin_clevo_init_verbs[] = {
-        /* headphone output */
-        {0x11, AC_VERB_SET_CONNECT_SEL, 0x01},
-        /* line-out */
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        /* Line-in */
-        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        /* CD */
-        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-        {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        /* Mic1 (rear panel) */
-        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        /* Mic2 (front panel) */
-        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        /* headphone */
-        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
-        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        /* change to EAPD mode */
-        {0x20, AC_VERB_SET_COEF_INDEX, 0x07},
-        {0x20, AC_VERB_SET_PROC_COEF,  0x3060},
-
-        {0}
+    /* headphone output */
+    {0x11, AC_VERB_SET_CONNECT_SEL, 0x01},
+    /* line-out */
+    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* Line-in */
+    {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+    {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* CD */
+    {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+    {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* Mic1 (rear panel) */
+    {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* Mic2 (front panel) */
+    {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* headphone */
+    {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+    {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* change to EAPD mode */
+    {0x20, AC_VERB_SET_COEF_INDEX, 0x07},
+    {0x20, AC_VERB_SET_PROC_COEF,  0x3060},
+
+    {0}
 };
 
 static struct hda_verb alc880_pin_tcl_S700_init_verbs[] = {
-        /* Headphone output */
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
-        /* Front output*/
-        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},
-
-        /* Line In pin widget for input */
-        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-        /* CD pin widget for input */
-        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-        /* Mic1 (rear panel) pin widget for input and vref at 80% */
-        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-
-        /* change to EAPD mode */
-        {0x20, AC_VERB_SET_COEF_INDEX, 0x07},
-        {0x20, AC_VERB_SET_PROC_COEF,  0x3070},
-
-        {0}
+    /* Headphone output */
+    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+    /* Front output*/
+    {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+    /* Line In pin widget for input */
+    {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+    /* CD pin widget for input */
+    {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+    /* Mic1 (rear panel) pin widget for input and vref at 80% */
+    {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+
+    /* change to EAPD mode */
+    {0x20, AC_VERB_SET_COEF_INDEX, 0x07},
+    {0x20, AC_VERB_SET_PROC_COEF,  0x3070},
+
+    {0}
 };
 
@@ -1509 +1527 @@
 static int alc_init(struct hda_codec *codec)
 {
-        struct alc_spec *spec = codec->spec;
-        unsigned int i;
-
-        for (i = 0; i < spec->num_init_verbs; i++)
-            snd_hda_sequence_write(codec, spec->init_verbs[i]);
-        if (spec->init_hook)
-            spec->init_hook(codec);
-        return 0;
+    struct alc_spec *spec = codec->spec;
+    unsigned int i;
+
+    for (i = 0; i < spec->num_init_verbs; i++)
+        snd_hda_sequence_write(codec, spec->init_verbs[i]);
+    if (spec->init_hook)
+        spec->init_hook(codec);
+    return 0;
 }
 
@@ -1533 +1551 @@
 static int alc_resume(struct hda_codec *codec)
 {
-        struct alc_spec *spec = codec->spec;
-        int i;
-
-        alc_init(codec);
-        for (i = 0; i < spec->num_mixers; i++)
-                snd_hda_resume_ctls(codec, spec->mixers[i]);
-        if (spec->multiout.dig_out_nid)
-                snd_hda_resume_spdif_out(codec);
-        if (spec->dig_in_nid)
-                snd_hda_resume_spdif_in(codec);
-
-        return 0;
+    struct alc_spec *spec = codec->spec;
+    int i;
+
+    alc_init(codec);
+    for (i = 0; i < spec->num_mixers; i++)
+        snd_hda_resume_ctls(codec, spec->mixers[i]);
+    if (spec->multiout.dig_out_nid)
+        snd_hda_resume_spdif_out(codec);
+    if (spec->dig_in_nid)
+        snd_hda_resume_spdif_in(codec);
+
+    return 0;
 }
 #endif
@@ -1552 +1570 @@
  */
 static int alc880_playback_pcm_open(struct hda_pcm_stream *hinfo,
-                                    struct hda_codec *codec,
-                                    struct snd_pcm_substream *substream)
-{
-        struct alc_spec *spec = codec->spec;
-        return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream);
+                                    struct hda_codec *codec,
+                                    struct snd_pcm_substream *substream)
+{
+    struct alc_spec *spec = codec->spec;
+    return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream);
 }
 
 static int alc880_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
-                                       struct hda_codec *codec,
-                                       unsigned int stream_tag,
-                                       unsigned int format,
-                                       struct snd_pcm_substream *substream)
-{
-        struct alc_spec *spec = codec->spec;
-        return snd_hda_multi_out_analog_prepare(codec, &spec->multiout, stream_tag,
-                                                format, substream);
+                                       struct hda_codec *codec,
+                                       unsigned int stream_tag,
+                                       unsigned int format,
+                                       struct snd_pcm_substream *substream)
+{
+    struct alc_spec *spec = codec->spec;
+    return snd_hda_multi_out_analog_prepare(codec, &spec->multiout, stream_tag,
+                                            format, substream);
 }
 
 static int alc880_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
-                                       struct hda_codec *codec,
-                                       struct snd_pcm_substream *substream)
-{
-        struct alc_spec *spec = codec->spec;
-        return snd_hda_multi_out_analog_cleanup(codec, &spec->multiout);
+                                       struct hda_codec *codec,
+                                       struct snd_pcm_substream *substream)
+{
+    struct alc_spec *spec = codec->spec;
+    return snd_hda_multi_out_analog_cleanup(codec, &spec->multiout);
 }
 
@@ -1582 +1600 @@
  */
 static int alc880_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,
-                                        struct hda_codec *codec,
-                                        struct snd_pcm_substream *substream)
-{
-        struct alc_spec *spec = codec->spec;
-        return snd_hda_multi_out_dig_open(codec, &spec->multiout);
+                                        struct hda_codec *codec,
+                                        struct snd_pcm_substream *substream)
+{
+    struct alc_spec *spec = codec->spec;
+    return snd_hda_multi_out_dig_open(codec, &spec->multiout);
 }
 
 static int alc880_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,
-                                         struct hda_codec *codec,
-                                         struct snd_pcm_substream *substream)
-{
-        struct alc_spec *spec = codec->spec;
-        return snd_hda_multi_out_dig_close(codec, &spec->multiout);
+                                         struct hda_codec *codec,
+                                         struct snd_pcm_substream *substream)
+{
+    struct alc_spec *spec = codec->spec;
+    return snd_hda_multi_out_dig_close(codec, &spec->multiout);
 }
 
@@ -1601 +1619 @@
  */
 static int alc880_capture_pcm_prepare(struct hda_pcm_stream *hinfo,
-                                      struct hda_codec *codec,
-                                      unsigned int stream_tag,
-                                      unsigned int format,
-                                      struct snd_pcm_substream *substream)
-{
-        struct alc_spec *spec = codec->spec;
-
-        snd_hda_codec_setup_stream(codec, spec->adc_nids[substream->number],
-                                   stream_tag, 0, format);
-        return 0;
+                                      struct hda_codec *codec,
+                                      unsigned int stream_tag,
+                                      unsigned int format,
+                                      struct snd_pcm_substream *substream)
+{
+    struct alc_spec *spec = codec->spec;
+
+    snd_hda_codec_setup_stream(codec, spec->adc_nids[substream->number],
+                               stream_tag, 0, format);
+    return 0;
 }
 
 static int alc880_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
-                                      struct hda_codec *codec,
-                                      struct snd_pcm_substream *substream)
-{
-        struct alc_spec *spec = codec->spec;
-
-        snd_hda_codec_setup_stream(codec, spec->adc_nids[substream->number], 0, 0, 0);
-        return 0;
+                                      struct hda_codec *codec,
+                                      struct snd_pcm_substream *substream)
+{
+    struct alc_spec *spec = codec->spec;
+
+    snd_hda_codec_setup_stream(codec, spec->adc_nids[substream->number], 0, 0, 0);
+    return 0;
 }
 
@@ -1627 +1645 @@
  */
 static struct hda_pcm_stream alc880_pcm_analog_playback = {
-        .substreams = 1,
-        .channels_min = 2,
-        .channels_max = 8,
-        /* NID is set in alc_build_pcms */
-        .ops = {
-                .open = alc880_playback_pcm_open,
-                .prepare = alc880_playback_pcm_prepare,
-                .cleanup = alc880_playback_pcm_cleanup
-        },
+    .substreams = 1,
+    .channels_min = 2,
+    .channels_max = 8,
+    /* NID is set in alc_build_pcms */
+    .ops = {
+        .open = alc880_playback_pcm_open,
+        .prepare = alc880_playback_pcm_prepare,
+        .cleanup = alc880_playback_pcm_cleanup
+    },
 };
 
 static struct hda_pcm_stream alc880_pcm_analog_capture = {
-        .substreams = 2,
-        .channels_min = 2,
-        .channels_max = 2,
-        /* NID is set in alc_build_pcms */
-        .ops = {
-                .prepare = alc880_capture_pcm_prepare,
-                .cleanup = alc880_capture_pcm_cleanup
-        },
+    .substreams = 2,
+    .channels_min = 2,
+    .channels_max = 2,
+    /* NID is set in alc_build_pcms */
+    .ops = {
+        .prepare = alc880_capture_pcm_prepare,
+        .cleanup = alc880_capture_pcm_cleanup
+    },
 };
 
 static struct hda_pcm_stream alc880_pcm_digital_playback = {
-        .substreams = 1,
-        .channels_min = 2,
-        .channels_max = 2,
-        /* NID is set in alc_build_pcms */
-        .ops = {
-                .open = alc880_dig_playback_pcm_open,
-                .close = alc880_dig_playback_pcm_close
-        },
+    .substreams = 1,
+    .channels_min = 2,
+    .channels_max = 2,
+    /* NID is set in alc_build_pcms */
+    .ops = {
+        .open = alc880_dig_playback_pcm_open,
+        .close = alc880_dig_playback_pcm_close
+    },
 };
 
 static struct hda_pcm_stream alc880_pcm_digital_capture = {
-        .substreams = 1,
-        .channels_min = 2,
-        .channels_max = 2,
-        /* NID is set in alc_build_pcms */
+    .substreams = 1,
+    .channels_min = 2,
+    .channels_max = 2,
+    /* NID is set in alc_build_pcms */
 };
 
 /* Used by alc_build_pcms to flag that a PCM has no playback stream */
 static struct hda_pcm_stream alc_pcm_null_playback = {
-        .substreams = 0,
-        .channels_min = 0,
-        .channels_max = 0,
+    .substreams = 0,
+    .channels_min = 0,
+    .channels_max = 0,
 };
 
 static int alc_build_pcms(struct hda_codec *codec)
 {
-        struct alc_spec *spec = codec->spec;
-        struct hda_pcm *info = spec->pcm_rec;
-        int i;
-
-        codec->num_pcms = 1;
-        codec->pcm_info = info;
-
-        info->name = spec->stream_name_analog;
-        if (spec->stream_analog_playback) {
-                snd_assert(spec->multiout.dac_nids, return -EINVAL);
-                info->stream[SNDRV_PCM_STREAM_PLAYBACK] = *(spec->stream_analog_playback);
-                info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dac_nids[0];
-        }
-        if (spec->stream_analog_capture) {
-                snd_assert(spec->adc_nids, return -EINVAL);
-                info->stream[SNDRV_PCM_STREAM_CAPTURE] = *(spec->stream_analog_capture);
-                info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[0];
-        }
-
-        if (spec->channel_mode) {
-                info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = 0;
-                for (i = 0; i < spec->num_channel_mode; i++) {
-                        if (spec->channel_mode[i].channels > info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max) {
-                                info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = spec->channel_mode[i].channels;
-                        }
-                }
-        }
-
-        /* If the use of more than one ADC is requested for the current
-         * model, configure a second analog capture-only PCM.
-         */
-        if (spec->num_adc_nids > 1) {
-                codec->num_pcms++;
-                info++;
-                info->name = spec->stream_name_analog;
-                /* No playback stream for second PCM */
-                info->stream[SNDRV_PCM_STREAM_PLAYBACK] = alc_pcm_null_playback;
-                info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = 0;
-                if (spec->stream_analog_capture) {
-                        snd_assert(spec->adc_nids, return -EINVAL);
-                        info->stream[SNDRV_PCM_STREAM_CAPTURE] = *(spec->stream_analog_capture);
-                        info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[1];
-                }
-        }
-
-        if (spec->multiout.dig_out_nid || spec->dig_in_nid) {
-                codec->num_pcms++;
-                info++;
-                info->name = spec->stream_name_digital;
-                if (spec->multiout.dig_out_nid &&
-                    spec->stream_digital_playback) {
-                        info->stream[SNDRV_PCM_STREAM_PLAYBACK] = *(spec->stream_digital_playback);
-                        info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dig_out_nid;
-                }
-                if (spec->dig_in_nid &&
-                    spec->stream_digital_capture) {
-                        info->stream[SNDRV_PCM_STREAM_CAPTURE] = *(spec->stream_digital_capture);
-                        info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->dig_in_nid;
-                }
-        }
-
-        return 0;
+    struct alc_spec *spec = codec->spec;
+    struct hda_pcm *info = spec->pcm_rec;
+    int i;
+
+    codec->num_pcms = 1;
+    codec->pcm_info = info;
+
+    info->name = spec->stream_name_analog;
+    if (spec->stream_analog_playback) {
+        snd_assert(spec->multiout.dac_nids, return -EINVAL);
+        info->stream[SNDRV_PCM_STREAM_PLAYBACK] = *(spec->stream_analog_playback);
+        info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dac_nids[0];
+    }
+    if (spec->stream_analog_capture) {
+        snd_assert(spec->adc_nids, return -EINVAL);
+        info->stream[SNDRV_PCM_STREAM_CAPTURE] = *(spec->stream_analog_capture);
+        info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[0];
+    }
+
+    if (spec->channel_mode) {
+        info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = 0;
+        for (i = 0; i < spec->num_channel_mode; i++) {
+            if (spec->channel_mode[i].channels > info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max) {
+                info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = spec->channel_mode[i].channels;
+            }
+        }
+    }
+
+    /* If the use of more than one ADC is requested for the current
+     * model, configure a second analog capture-only PCM.
+     */
+    if (spec->num_adc_nids > 1) {
+        codec->num_pcms++;
+        info++;
+        info->name = spec->stream_name_analog;
+        /* No playback stream for second PCM */
+        info->stream[SNDRV_PCM_STREAM_PLAYBACK] = alc_pcm_null_playback;
+        info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = 0;
+        if (spec->stream_analog_capture) {
+            snd_assert(spec->adc_nids, return -EINVAL);
+            info->stream[SNDRV_PCM_STREAM_CAPTURE] = *(spec->stream_analog_capture);
+            info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[1];
+        }
+    }
+
+    if (spec->multiout.dig_out_nid || spec->dig_in_nid) {
+        codec->num_pcms++;
+        info++;
+        info->name = spec->stream_name_digital;
+        if (spec->multiout.dig_out_nid &&
+            spec->stream_digital_playback) {
+            info->stream[SNDRV_PCM_STREAM_PLAYBACK] = *(spec->stream_digital_playback);
+            info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dig_out_nid;
+        }
+        if (spec->dig_in_nid &&
+            spec->stream_digital_capture) {
+            info->stream[SNDRV_PCM_STREAM_CAPTURE] = *(spec->stream_digital_capture);
+            info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->dig_in_nid;
+        }
+    }
+
+    return 0;
 }
 
 static void alc_free(struct hda_codec *codec)
 {
-        struct alc_spec *spec = codec->spec;
-        unsigned int i;
-
-        if (! spec)
-                return;
-
-        if (spec->kctl_alloc) {
-                for (i = 0; i < spec->num_kctl_used; i++)
-                        kfree(spec->kctl_alloc[i].name);
-                kfree(spec->kctl_alloc);
-        }
-        kfree(spec);
+    struct alc_spec *spec = codec->spec;
+    unsigned int i;
+
+    if (! spec)
+        return;
+
+    if (spec->kctl_alloc) {
+        for (i = 0; i < spec->num_kctl_used; i++)
+            kfree(spec->kctl_alloc[i].name);
+        kfree(spec->kctl_alloc);
+    }
+    kfree(spec);
 }
 
@@ -1759 +1777 @@
  */
 static struct hda_codec_ops alc_patch_ops = {
-        .build_controls = alc_build_controls,
-        .build_pcms = alc_build_pcms,
-        .init = alc_init,
-        .free = alc_free,
-        .unsol_event = alc_unsol_event,
+    .build_controls = alc_build_controls,
+    .build_pcms = alc_build_pcms,
+    .init = alc_init,
+    .free = alc_free,
+    .unsol_event = alc_unsol_event,
 #ifdef CONFIG_PM
-        .resume = alc_resume,
+    .resume = alc_resume,
 #endif
 };
@@ -1778 +1796 @@
 #ifdef CONFIG_SND_DEBUG
 static hda_nid_t alc880_test_dac_nids[4] = {
-        0x02, 0x03, 0x04, 0x05
+    0x02, 0x03, 0x04, 0x05
 };
 
 static struct hda_input_mux alc880_test_capture_source = {
-        .num_items = 7,
-        .items = {
-                { "In-1", 0x0 },
-                { "In-2", 0x1 },
-                { "In-3", 0x2 },
-                { "In-4", 0x3 },
-                { "CD", 0x4 },
-                { "Front", 0x5 },
-                { "Surround", 0x6 },
-        },
+    .num_items = 7,
+    .items = {
+        { "In-1", 0x0 },
+        { "In-2", 0x1 },
+        { "In-3", 0x2 },
+        { "In-4", 0x3 },
+        { "CD", 0x4 },
+        { "Front", 0x5 },
+        { "Surround", 0x6 },
+    },
 };
 
 static struct hda_channel_mode alc880_test_modes[4] = {
-        { 2, NULL },
-        { 4, NULL },
-        { 6, NULL },
-        { 8, NULL },
+    { 2, NULL },
+    { 4, NULL },
+    { 6, NULL },
+    { 8, NULL },
 };
 
 static int alc_test_pin_ctl_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-        static char *texts[] = {
-                "N/A", "Line Out", "HP Out",
-                "In Hi-Z", "In 50%", "In Grd", "In 80%", "In 100%"
-        };
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = 8;
-        if (uinfo->value.enumerated.item >= 8)
-                uinfo->value.enumerated.item = 7;
-        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
-        return 0;
+    static char *texts[] = {
+        "N/A", "Line Out", "HP Out",
+        "In Hi-Z", "In 50%", "In Grd", "In 80%", "In 100%"
+    };
+    uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+    uinfo->count = 1;
+    uinfo->value.enumerated.items = 8;
+    if (uinfo->value.enumerated.item >= 8)
+        uinfo->value.enumerated.item = 7;
+    strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+    return 0;
 }
 
 static int alc_test_pin_ctl_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        hda_nid_t nid = (hda_nid_t)kcontrol->private_value;
-        unsigned int pin_ctl, item = 0;
-
-        pin_ctl = snd_hda_codec_read(codec, nid, 0,
-                                     AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
-        if (pin_ctl & AC_PINCTL_OUT_EN) {
-                if (pin_ctl & AC_PINCTL_HP_EN)
-                        item = 2;
-                else
-                        item = 1;
-        } else if (pin_ctl & AC_PINCTL_IN_EN) {
-                switch (pin_ctl & AC_PINCTL_VREFEN) {
-                case AC_PINCTL_VREF_HIZ: item = 3; break;
-                case AC_PINCTL_VREF_50:  item = 4; break;
-                case AC_PINCTL_VREF_GRD: item = 5; break;
-                case AC_PINCTL_VREF_80:  item = 6; break;
-                case AC_PINCTL_VREF_100: item = 7; break;
-                }
-        }
-        ucontrol->value.enumerated.item[0] = item;
-        return 0;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    hda_nid_t nid = (hda_nid_t)kcontrol->private_value;
+    unsigned int pin_ctl, item = 0;
+
+    pin_ctl = snd_hda_codec_read(codec, nid, 0,
+                                 AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+    if (pin_ctl & AC_PINCTL_OUT_EN) {
+        if (pin_ctl & AC_PINCTL_HP_EN)
+            item = 2;
+        else
+            item = 1;
+    } else if (pin_ctl & AC_PINCTL_IN_EN) {
+        switch (pin_ctl & AC_PINCTL_VREFEN) {
+        case AC_PINCTL_VREF_HIZ: item = 3; break;
+        case AC_PINCTL_VREF_50:  item = 4; break;
+        case AC_PINCTL_VREF_GRD: item = 5; break;
+        case AC_PINCTL_VREF_80:  item = 6; break;
+        case AC_PINCTL_VREF_100: item = 7; break;
+        }
+    }
+    ucontrol->value.enumerated.item[0] = item;
+    return 0;
 }
 
 static int alc_test_pin_ctl_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        hda_nid_t nid = (hda_nid_t)kcontrol->private_value;
-        static unsigned int ctls[] = {
-                0, AC_PINCTL_OUT_EN, AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN,
-                AC_PINCTL_IN_EN | AC_PINCTL_VREF_HIZ,
-                AC_PINCTL_IN_EN | AC_PINCTL_VREF_50,
-                AC_PINCTL_IN_EN | AC_PINCTL_VREF_GRD,
-                AC_PINCTL_IN_EN | AC_PINCTL_VREF_80,
-                AC_PINCTL_IN_EN | AC_PINCTL_VREF_100,
-        };
-        unsigned int old_ctl, new_ctl;
-
-        old_ctl = snd_hda_codec_read(codec, nid, 0,
-                                     AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
-        new_ctl = ctls[ucontrol->value.enumerated.item[0]];
-        if (old_ctl != new_ctl) {
-                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, new_ctl);
-                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
-                                    ucontrol->value.enumerated.item[0] >= 3 ? 0xb080 : 0xb000);
-                return 1;
-        }
-        return 0;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    hda_nid_t nid = (hda_nid_t)kcontrol->private_value;
+    static unsigned int ctls[] = {
+        0, AC_PINCTL_OUT_EN, AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN,
+        AC_PINCTL_IN_EN | AC_PINCTL_VREF_HIZ,
+        AC_PINCTL_IN_EN | AC_PINCTL_VREF_50,
+        AC_PINCTL_IN_EN | AC_PINCTL_VREF_GRD,
+        AC_PINCTL_IN_EN | AC_PINCTL_VREF_80,
+        AC_PINCTL_IN_EN | AC_PINCTL_VREF_100,
+    };
+    unsigned int old_ctl, new_ctl;
+
+    old_ctl = snd_hda_codec_read(codec, nid, 0,
+                                 AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+    new_ctl = ctls[ucontrol->value.enumerated.item[0]];
+    if (old_ctl != new_ctl) {
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, new_ctl);
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                            ucontrol->value.enumerated.item[0] >= 3 ? 0xb080 : 0xb000);
+        return 1;
+    }
+    return 0;
 }
 
 static int alc_test_pin_src_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-        static char *texts[] = {
-                "Front", "Surround", "CLFE", "Side"
-        };
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = 4;
-        if (uinfo->value.enumerated.item >= 4)
-                uinfo->value.enumerated.item = 3;
-        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
-        return 0;
+    static char *texts[] = {
+        "Front", "Surround", "CLFE", "Side"
+    };
+    uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+    uinfo->count = 1;
+    uinfo->value.enumerated.items = 4;
+    if (uinfo->value.enumerated.item >= 4)
+        uinfo->value.enumerated.item = 3;
+    strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+    return 0;
 }
 
 static int alc_test_pin_src_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        hda_nid_t nid = (hda_nid_t)kcontrol->private_value;
-        unsigned int sel;
-
-        sel = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_SEL, 0);
-        ucontrol->value.enumerated.item[0] = sel & 3;
-        return 0;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    hda_nid_t nid = (hda_nid_t)kcontrol->private_value;
+    unsigned int sel;
+
+    sel = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_SEL, 0);
+    ucontrol->value.enumerated.item[0] = sel & 3;
+    return 0;
 }
 
 static int alc_test_pin_src_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        hda_nid_t nid = (hda_nid_t)kcontrol->private_value;
-        unsigned int sel;
-
-        sel = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_SEL, 0) & 3;
-        if (ucontrol->value.enumerated.item[0] != sel) {
-                sel = ucontrol->value.enumerated.item[0] & 3;
-                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL, sel);
-                return 1;
-        }
-        return 0;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    hda_nid_t nid = (hda_nid_t)kcontrol->private_value;
+    unsigned int sel;
+
+    sel = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_SEL, 0) & 3;
+    if (ucontrol->value.enumerated.item[0] != sel) {
+        sel = ucontrol->value.enumerated.item[0] & 3;
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL, sel);
+        return 1;
+    }
+    return 0;
 }
 
 #define PIN_CTL_TEST(xname,nid) {                       \
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,    \
-                        .name = xname,                 \
-                        .info = alc_test_pin_ctl_info, \
-                        .get = alc_test_pin_ctl_get,   \
-                        .put = alc_test_pin_ctl_put,   \
-                        .private_value = nid           \
-                        }
+    .iface = SNDRV_CTL_ELEM_IFACE_MIXER,        \
+    .name = xname,                     \
+    .info = alc_test_pin_ctl_info, \
+    .get = alc_test_pin_ctl_get,   \
+    .put = alc_test_pin_ctl_put,   \
+    .private_value = nid               \
+    }
 
 #define PIN_SRC_TEST(xname,nid) {                       \
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,    \
-                        .name = xname,                 \
-                        .info = alc_test_pin_src_info, \
-                        .get = alc_test_pin_src_get,   \
-                        .put = alc_test_pin_src_put,   \
-                        .private_value = nid           \
-                        }
+    .iface = SNDRV_CTL_ELEM_IFACE_MIXER,        \
+    .name = xname,                     \
+    .info = alc_test_pin_src_info, \
+    .get = alc_test_pin_src_get,   \
+    .put = alc_test_pin_src_put,   \
+    .private_value = nid               \
+    }
 
 static struct snd_kcontrol_new alc880_test_mixer[] = {
-        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("CLFE Playback Volume", 0x0e, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
-        HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
-        HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
-        HDA_BIND_MUTE("CLFE Playback Switch", 0x0e, 2, HDA_INPUT),
-        HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),
-        PIN_CTL_TEST("Front Pin Mode", 0x14),
-        PIN_CTL_TEST("Surround Pin Mode", 0x15),
-        PIN_CTL_TEST("CLFE Pin Mode", 0x16),
-        PIN_CTL_TEST("Side Pin Mode", 0x17),
-        PIN_CTL_TEST("In-1 Pin Mode", 0x18),
-        PIN_CTL_TEST("In-2 Pin Mode", 0x19),
-        PIN_CTL_TEST("In-3 Pin Mode", 0x1a),
-        PIN_CTL_TEST("In-4 Pin Mode", 0x1b),
-        PIN_SRC_TEST("In-1 Pin Source", 0x18),
-        PIN_SRC_TEST("In-2 Pin Source", 0x19),
-        PIN_SRC_TEST("In-3 Pin Source", 0x1a),
-        PIN_SRC_TEST("In-4 Pin Source", 0x1b),
-        HDA_CODEC_VOLUME("In-1 Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("In-1 Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("In-2 Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_MUTE("In-2 Playback Switch", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("In-3 Playback Volume", 0x0b, 0x2, HDA_INPUT),
-        HDA_CODEC_MUTE("In-3 Playback Switch", 0x0b, 0x2, HDA_INPUT),
-        HDA_CODEC_VOLUME("In-4 Playback Volume", 0x0b, 0x3, HDA_INPUT),
-        HDA_CODEC_MUTE("In-4 Playback Switch", 0x0b, 0x3, HDA_INPUT),
-        HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x4, HDA_INPUT),
-        HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x4, HDA_INPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Channel Mode",
-                .info = alc_ch_mode_info,
-                .get = alc_ch_mode_get,
-                .put = alc_ch_mode_put,
-        },
-        {0} /* end */
+    HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+    HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
+    HDA_CODEC_VOLUME("CLFE Playback Volume", 0x0e, 0x0, HDA_OUTPUT),
+    HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
+    HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
+    HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
+    HDA_BIND_MUTE("CLFE Playback Switch", 0x0e, 2, HDA_INPUT),
+    HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),
+    PIN_CTL_TEST("Front Pin Mode", 0x14),
+    PIN_CTL_TEST("Surround Pin Mode", 0x15),
+    PIN_CTL_TEST("CLFE Pin Mode", 0x16),
+    PIN_CTL_TEST("Side Pin Mode", 0x17),
+    PIN_CTL_TEST("In-1 Pin Mode", 0x18),
+    PIN_CTL_TEST("In-2 Pin Mode", 0x19),
+    PIN_CTL_TEST("In-3 Pin Mode", 0x1a),
+    PIN_CTL_TEST("In-4 Pin Mode", 0x1b),
+    PIN_SRC_TEST("In-1 Pin Source", 0x18),
+    PIN_SRC_TEST("In-2 Pin Source", 0x19),
+    PIN_SRC_TEST("In-3 Pin Source", 0x1a),
+    PIN_SRC_TEST("In-4 Pin Source", 0x1b),
+    HDA_CODEC_VOLUME("In-1 Playback Volume", 0x0b, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("In-1 Playback Switch", 0x0b, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME("In-2 Playback Volume", 0x0b, 0x1, HDA_INPUT),
+    HDA_CODEC_MUTE("In-2 Playback Switch", 0x0b, 0x1, HDA_INPUT),
+    HDA_CODEC_VOLUME("In-3 Playback Volume", 0x0b, 0x2, HDA_INPUT),
+    HDA_CODEC_MUTE("In-3 Playback Switch", 0x0b, 0x2, HDA_INPUT),
+    HDA_CODEC_VOLUME("In-4 Playback Volume", 0x0b, 0x3, HDA_INPUT),
+    HDA_CODEC_MUTE("In-4 Playback Switch", 0x0b, 0x3, HDA_INPUT),
+    HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x4, HDA_INPUT),
+    HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x4, HDA_INPUT),
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Channel Mode",
+        .info = alc_ch_mode_info,
+        .get = alc_ch_mode_get,
+        .put = alc_ch_mode_put,
+    },
+    {0} /* end */
 };
 
 static struct hda_verb alc880_test_init_verbs[] = {
-        /* Unmute inputs of 0x0c - 0x0f */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        /* Vol output for 0x0c-0x0f */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        /* Set output pins 0x14-0x17 */
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        /* Unmute output pins 0x14-0x17 */
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        /* Set input pins 0x18-0x1c */
-        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-        /* Mute input pins 0x18-0x1b */
-        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        /* ADC set up */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
-        /* Analog input/passthru */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
-        {0}
+    /* Unmute inputs of 0x0c - 0x0f */
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    /* Vol output for 0x0c-0x0f */
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    /* Set output pins 0x14-0x17 */
+    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    /* Unmute output pins 0x14-0x17 */
+    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* Set input pins 0x18-0x1c */
+    {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+    {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+    {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+    /* Mute input pins 0x18-0x1b */
+    {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    /* ADC set up */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
+    /* Analog input/passthru */
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+    {0}
 };
 #endif
@@ -2024 +2042 @@
 
 static struct hda_board_config alc880_cfg_tbl[] = {
-        /* Back 3 jack, front 2 jack */
-        { .modelname = "3stack", .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe200, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe201, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe202, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe203, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe204, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe205, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe206, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe207, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe208, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe209, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20a, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20b, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20c, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20d, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20e, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20f, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe210, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe211, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe214, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe302, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe303, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe304, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe306, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe307, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe404, .config = ALC880_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xa101, .config = ALC880_3ST },
-        { .pci_subvendor = 0x107b, .pci_subdevice = 0x3031, .config = ALC880_3ST },
-        { .pci_subvendor = 0x107b, .pci_subdevice = 0x4036, .config = ALC880_3ST },
-        { .pci_subvendor = 0x107b, .pci_subdevice = 0x4037, .config = ALC880_3ST },
-        { .pci_subvendor = 0x107b, .pci_subdevice = 0x4038, .config = ALC880_3ST },
-        { .pci_subvendor = 0x107b, .pci_subdevice = 0x4040, .config = ALC880_3ST },
-        { .pci_subvendor = 0x107b, .pci_subdevice = 0x4041, .config = ALC880_3ST },
-        /* TCL S700 */
-        { .pci_subvendor = 0x19db, .pci_subdevice = 0x4188, .config = ALC880_TCL_S700 },
-
-        /* Back 3 jack, front 2 jack (Internal add Aux-In) */
-        { .pci_subvendor = 0x1025, .pci_subdevice = 0xe310, .config = ALC880_3ST },
-        { .pci_subvendor = 0x104d, .pci_subdevice = 0x81d6, .config = ALC880_3ST },
-        { .pci_subvendor = 0x104d, .pci_subdevice = 0x81a0, .config = ALC880_3ST },
-
-        /* Back 3 jack plus 1 SPDIF out jack, front 2 jack */
-        { .modelname = "3stack-digout", .config = ALC880_3ST_DIG },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe308, .config = ALC880_3ST_DIG },
-        { .pci_subvendor = 0x1025, .pci_subdevice = 0x0070, .config = ALC880_3ST_DIG },
-        /* Clevo m520G NB */
-        { .pci_subvendor = 0x1558, .pci_subdevice = 0x0520, .config = ALC880_CLEVO },
-
-        /* Back 3 jack plus 1 SPDIF out jack, front 2 jack (Internal add Aux-In)*/
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe305, .config = ALC880_3ST_DIG },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xd402, .config = ALC880_3ST_DIG },
-        { .pci_subvendor = 0x1025, .pci_subdevice = 0xe309, .config = ALC880_3ST_DIG },
-
-        /* Back 5 jack, front 2 jack */
-        { .modelname = "5stack", .config = ALC880_5ST },
-        { .pci_subvendor = 0x107b, .pci_subdevice = 0x3033, .config = ALC880_5ST },
-        { .pci_subvendor = 0x107b, .pci_subdevice = 0x4039, .config = ALC880_5ST },
-        { .pci_subvendor = 0x107b, .pci_subdevice = 0x3032, .config = ALC880_5ST },
-        { .pci_subvendor = 0x103c, .pci_subdevice = 0x2a09, .config = ALC880_5ST },
-        { .pci_subvendor = 0x1043, .pci_subdevice = 0x814e, .config = ALC880_5ST },
-
-        /* Back 5 jack plus 1 SPDIF out jack, front 2 jack */
-        { .modelname = "5stack-digout", .config = ALC880_5ST_DIG },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe224, .config = ALC880_5ST_DIG },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe400, .config = ALC880_5ST_DIG },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe401, .config = ALC880_5ST_DIG },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe402, .config = ALC880_5ST_DIG },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xd400, .config = ALC880_5ST_DIG },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xd401, .config = ALC880_5ST_DIG },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xa100, .config = ALC880_5ST_DIG },
-        { .pci_subvendor = 0x1565, .pci_subdevice = 0x8202, .config = ALC880_5ST_DIG },
-        { .pci_subvendor = 0x1019, .pci_subdevice = 0xa880, .config = ALC880_5ST_DIG },
-        { .pci_subvendor = 0xa0a0, .pci_subdevice = 0x0560, .config = ALC880_5ST_DIG }, /* Aopen i915GMm-HFS */
-        /* { .pci_subvendor = 0x1019, .pci_subdevice = 0xa884, .config = ALC880_5ST_DIG }, */ /* conflict with 6stack */
-        { .pci_subvendor = 0x1695, .pci_subdevice = 0x400d, .config = ALC880_5ST_DIG },
-        /* note subvendor = 0 below */
-        /* { .pci_subvendor = 0x0000, .pci_subdevice = 0x8086, .config = ALC880_5ST_DIG }, */
-
-        { .modelname = "w810", .config = ALC880_W810 },
-        { .pci_subvendor = 0x161f, .pci_subdevice = 0x203d, .config = ALC880_W810 },
-
-        { .modelname = "z71v", .config = ALC880_Z71V },
-        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1964, .config = ALC880_Z71V },
-
-        { .modelname = "6stack", .config = ALC880_6ST },
-        { .pci_subvendor = 0x1043, .pci_subdevice = 0x8196, .config = ALC880_6ST }, /* ASUS P5GD1-HVM */
-        { .pci_subvendor = 0x1043, .pci_subdevice = 0x81b4, .config = ALC880_6ST },
-        { .pci_subvendor = 0x1019, .pci_subdevice = 0xa884, .config = ALC880_6ST }, /* Acer APFV */
-        { .pci_subvendor = 0x1458, .pci_subdevice = 0xa102, .config = ALC880_6ST }, /* Gigabyte K8N51 */
-
-        { .modelname = "6stack-digout", .config = ALC880_6ST_DIG },
-        { .pci_subvendor = 0x2668, .pci_subdevice = 0x8086, .config = ALC880_6ST_DIG },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0x2668, .config = ALC880_6ST_DIG },
-        { .pci_subvendor = 0x1462, .pci_subdevice = 0x1150, .config = ALC880_6ST_DIG },
-        { .pci_subvendor = 0xe803, .pci_subdevice = 0x1019, .config = ALC880_6ST_DIG },
-        { .pci_subvendor = 0x1039, .pci_subdevice = 0x1234, .config = ALC880_6ST_DIG },
-        { .pci_subvendor = 0x1025, .pci_subdevice = 0x0077, .config = ALC880_6ST_DIG },
-        { .pci_subvendor = 0x1025, .pci_subdevice = 0x0078, .config = ALC880_6ST_DIG },
-        { .pci_subvendor = 0x1025, .pci_subdevice = 0x0087, .config = ALC880_6ST_DIG },
-        { .pci_subvendor = 0x1297, .pci_subdevice = 0xc790, .config = ALC880_6ST_DIG }, /* Shuttle ST20G5 */
-        { .pci_subvendor = 0x1509, .pci_subdevice = 0x925d, .config = ALC880_6ST_DIG }, /* FIC P4M-915GD1 */
-
-        { .modelname = "asus", .config = ALC880_ASUS },
-        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1964, .config = ALC880_ASUS_DIG },
-        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1973, .config = ALC880_ASUS_DIG },
-        { .pci_subvendor = 0x1043, .pci_subdevice = 0x19b3, .config = ALC880_ASUS_DIG },
-        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1113, .config = ALC880_ASUS_DIG },
-        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1173, .config = ALC880_ASUS_DIG },
-        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1993, .config = ALC880_ASUS },
-        { .pci_subvendor = 0x1043, .pci_subdevice = 0x10c3, .config = ALC880_ASUS_DIG },
-        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1133, .config = ALC880_ASUS },
-        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1123, .config = ALC880_ASUS_DIG },
-        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1143, .config = ALC880_ASUS },
-        { .pci_subvendor = 0x1043, .pci_subdevice = 0x10b3, .config = ALC880_ASUS_W1V },
-        { .pci_subvendor = 0x1043, .pci_subdevice = 0x8181, .config = ALC880_ASUS_DIG }, /* ASUS P4GPL-X */
-        { .pci_subvendor = 0x1558, .pci_subdevice = 0x5401, .config = ALC880_ASUS_DIG2 },
-
-        { .modelname = "uniwill", .config = ALC880_UNIWILL_DIG },
-        { .pci_subvendor = 0x1584, .pci_subdevice = 0x9050, .config = ALC880_UNIWILL_DIG },
-
-        { .modelname = "F1734", .config = ALC880_F1734 },
-        { .pci_subvendor = 0x1734, .pci_subdevice = 0x107c, .config = ALC880_F1734 },
-        { .pci_subvendor = 0x1584, .pci_subdevice = 0x9054, .config = ALC880_F1734 },
-
-        { .modelname = "lg", .config = ALC880_LG },
-        { .pci_subvendor = 0x1854, .pci_subdevice = 0x003b, .config = ALC880_LG },
-        { .modelname = "lg-lw", .config = ALC880_LG_LW },
-        { .pci_subvendor = 0x1854, .pci_subdevice = 0x0018, .config = ALC880_LG_LW },
+    /* Back 3 jack, front 2 jack */
+    { .modelname = "3stack", .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe200, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe201, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe202, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe203, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe204, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe205, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe206, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe207, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe208, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe209, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20a, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20b, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20c, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20d, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20e, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20f, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe210, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe211, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe214, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe302, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe303, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe304, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe306, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe307, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe404, .config = ALC880_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xa101, .config = ALC880_3ST },
+    { .pci_subvendor = 0x107b, .pci_subdevice = 0x3031, .config = ALC880_3ST },
+    { .pci_subvendor = 0x107b, .pci_subdevice = 0x4036, .config = ALC880_3ST },
+    { .pci_subvendor = 0x107b, .pci_subdevice = 0x4037, .config = ALC880_3ST },
+    { .pci_subvendor = 0x107b, .pci_subdevice = 0x4038, .config = ALC880_3ST },
+    { .pci_subvendor = 0x107b, .pci_subdevice = 0x4040, .config = ALC880_3ST },
+    { .pci_subvendor = 0x107b, .pci_subdevice = 0x4041, .config = ALC880_3ST },
+    /* TCL S700 */
+    { .pci_subvendor = 0x19db, .pci_subdevice = 0x4188, .config = ALC880_TCL_S700 },
+
+    /* Back 3 jack, front 2 jack (Internal add Aux-In) */
+    { .pci_subvendor = 0x1025, .pci_subdevice = 0xe310, .config = ALC880_3ST },
+    { .pci_subvendor = 0x104d, .pci_subdevice = 0x81d6, .config = ALC880_3ST },
+    { .pci_subvendor = 0x104d, .pci_subdevice = 0x81a0, .config = ALC880_3ST },
+
+    /* Back 3 jack plus 1 SPDIF out jack, front 2 jack */
+    { .modelname = "3stack-digout", .config = ALC880_3ST_DIG },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe308, .config = ALC880_3ST_DIG },
+    { .pci_subvendor = 0x1025, .pci_subdevice = 0x0070, .config = ALC880_3ST_DIG },
+    /* Clevo m520G NB */
+    { .pci_subvendor = 0x1558, .pci_subdevice = 0x0520, .config = ALC880_CLEVO },
+
+    /* Back 3 jack plus 1 SPDIF out jack, front 2 jack (Internal add Aux-In)*/
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe305, .config = ALC880_3ST_DIG },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xd402, .config = ALC880_3ST_DIG },
+    { .pci_subvendor = 0x1025, .pci_subdevice = 0xe309, .config = ALC880_3ST_DIG },
+
+    /* Back 5 jack, front 2 jack */
+    { .modelname = "5stack", .config = ALC880_5ST },
+    { .pci_subvendor = 0x107b, .pci_subdevice = 0x3033, .config = ALC880_5ST },
+    { .pci_subvendor = 0x107b, .pci_subdevice = 0x4039, .config = ALC880_5ST },
+    { .pci_subvendor = 0x107b, .pci_subdevice = 0x3032, .config = ALC880_5ST },
+    { .pci_subvendor = 0x103c, .pci_subdevice = 0x2a09, .config = ALC880_5ST },
+    { .pci_subvendor = 0x1043, .pci_subdevice = 0x814e, .config = ALC880_5ST },
+
+    /* Back 5 jack plus 1 SPDIF out jack, front 2 jack */
+    { .modelname = "5stack-digout", .config = ALC880_5ST_DIG },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe224, .config = ALC880_5ST_DIG },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe400, .config = ALC880_5ST_DIG },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe401, .config = ALC880_5ST_DIG },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xe402, .config = ALC880_5ST_DIG },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xd400, .config = ALC880_5ST_DIG },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xd401, .config = ALC880_5ST_DIG },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xa100, .config = ALC880_5ST_DIG },
+    { .pci_subvendor = 0x1565, .pci_subdevice = 0x8202, .config = ALC880_5ST_DIG },
+    { .pci_subvendor = 0x1019, .pci_subdevice = 0xa880, .config = ALC880_5ST_DIG },
+    { .pci_subvendor = 0xa0a0, .pci_subdevice = 0x0560, .config = ALC880_5ST_DIG }, /* Aopen i915GMm-HFS */
+    /* { .pci_subvendor = 0x1019, .pci_subdevice = 0xa884, .config = ALC880_5ST_DIG }, */ /* conflict with 6stack */
+    { .pci_subvendor = 0x1695, .pci_subdevice = 0x400d, .config = ALC880_5ST_DIG },
+    /* note subvendor = 0 below */
+    /* { .pci_subvendor = 0x0000, .pci_subdevice = 0x8086, .config = ALC880_5ST_DIG }, */
+
+    { .modelname = "w810", .config = ALC880_W810 },
+    { .pci_subvendor = 0x161f, .pci_subdevice = 0x203d, .config = ALC880_W810 },
+
+    { .modelname = "z71v", .config = ALC880_Z71V },
+    { .pci_subvendor = 0x1043, .pci_subdevice = 0x1964, .config = ALC880_Z71V },
+
+    { .modelname = "6stack", .config = ALC880_6ST },
+    { .pci_subvendor = 0x1043, .pci_subdevice = 0x8196, .config = ALC880_6ST }, /* ASUS P5GD1-HVM */
+    { .pci_subvendor = 0x1043, .pci_subdevice = 0x81b4, .config = ALC880_6ST },
+    { .pci_subvendor = 0x1019, .pci_subdevice = 0xa884, .config = ALC880_6ST }, /* Acer APFV */
+    { .pci_subvendor = 0x1458, .pci_subdevice = 0xa102, .config = ALC880_6ST }, /* Gigabyte K8N51 */
+
+    { .modelname = "6stack-digout", .config = ALC880_6ST_DIG },
+    { .pci_subvendor = 0x2668, .pci_subdevice = 0x8086, .config = ALC880_6ST_DIG },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0x2668, .config = ALC880_6ST_DIG },
+    { .pci_subvendor = 0x1462, .pci_subdevice = 0x1150, .config = ALC880_6ST_DIG },
+    { .pci_subvendor = 0xe803, .pci_subdevice = 0x1019, .config = ALC880_6ST_DIG },
+    { .pci_subvendor = 0x1039, .pci_subdevice = 0x1234, .config = ALC880_6ST_DIG },
+    { .pci_subvendor = 0x1025, .pci_subdevice = 0x0077, .config = ALC880_6ST_DIG },
+    { .pci_subvendor = 0x1025, .pci_subdevice = 0x0078, .config = ALC880_6ST_DIG },
+    { .pci_subvendor = 0x1025, .pci_subdevice = 0x0087, .config = ALC880_6ST_DIG },
+    { .pci_subvendor = 0x1297, .pci_subdevice = 0xc790, .config = ALC880_6ST_DIG }, /* Shuttle ST20G5 */
+    { .pci_subvendor = 0x1509, .pci_subdevice = 0x925d, .config = ALC880_6ST_DIG }, /* FIC P4M-915GD1 */
+
+    { .modelname = "asus", .config = ALC880_ASUS },
+    { .pci_subvendor = 0x1043, .pci_subdevice = 0x1964, .config = ALC880_ASUS_DIG },
+    { .pci_subvendor = 0x1043, .pci_subdevice = 0x1973, .config = ALC880_ASUS_DIG },
+    { .pci_subvendor = 0x1043, .pci_subdevice = 0x19b3, .config = ALC880_ASUS_DIG },
+    { .pci_subvendor = 0x1043, .pci_subdevice = 0x1113, .config = ALC880_ASUS_DIG },
+    { .pci_subvendor = 0x1043, .pci_subdevice = 0x1173, .config = ALC880_ASUS_DIG },
+    { .pci_subvendor = 0x1043, .pci_subdevice = 0x1993, .config = ALC880_ASUS },
+    { .pci_subvendor = 0x1043, .pci_subdevice = 0x10c3, .config = ALC880_ASUS_DIG },
+    { .pci_subvendor = 0x1043, .pci_subdevice = 0x1133, .config = ALC880_ASUS },
+    { .pci_subvendor = 0x1043, .pci_subdevice = 0x1123, .config = ALC880_ASUS_DIG },
+    { .pci_subvendor = 0x1043, .pci_subdevice = 0x1143, .config = ALC880_ASUS },
+    { .pci_subvendor = 0x1043, .pci_subdevice = 0x10b3, .config = ALC880_ASUS_W1V },
+    { .pci_subvendor = 0x1043, .pci_subdevice = 0x8181, .config = ALC880_ASUS_DIG }, /* ASUS P4GPL-X */
+    { .pci_subvendor = 0x1558, .pci_subdevice = 0x5401, .config = ALC880_ASUS_DIG2 },
+
+    { .modelname = "uniwill", .config = ALC880_UNIWILL_DIG },
+    { .pci_subvendor = 0x1584, .pci_subdevice = 0x9050, .config = ALC880_UNIWILL_DIG },
+
+    { .modelname = "F1734", .config = ALC880_F1734 },
+    { .pci_subvendor = 0x1734, .pci_subdevice = 0x107c, .config = ALC880_F1734 },
+    { .pci_subvendor = 0x1584, .pci_subdevice = 0x9054, .config = ALC880_F1734 },
+
+    { .modelname = "lg", .config = ALC880_LG },
+    { .pci_subvendor = 0x1854, .pci_subdevice = 0x003b, .config = ALC880_LG },
+    { .pci_subvendor = 0x1854, .pci_subdevice = 0x0068, .config = ALC880_LG },
+    { .modelname = "lg-lw", .config = ALC880_LG_LW },
+    { .pci_subvendor = 0x1854, .pci_subdevice = 0x0018, .config = ALC880_LG_LW },
 
 #ifdef CONFIG_SND_DEBUG
-        { .modelname = "test", .config = ALC880_TEST },
+    { .modelname = "test", .config = ALC880_TEST },
 #endif
-        { .modelname = "auto", .config = ALC880_AUTO },
-
-        {0}
+    { .modelname = "auto", .config = ALC880_AUTO },
+
+    {0}
 };
 
@@ -2166 +2185 @@
  */
 static struct alc_config_preset alc880_presets[] = {
-        [ALC880_3ST] = {
-                .mixers = { alc880_three_stack_mixer },
-                .init_verbs = { alc880_volume_init_verbs, alc880_pin_3stack_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc880_dac_nids),
-                .dac_nids = alc880_dac_nids,
-                .num_channel_mode = ARRAY_SIZE(alc880_threestack_modes),
-                .channel_mode = alc880_threestack_modes,
-                .input_mux = &alc880_capture_source,
-        },
-        [ALC880_3ST_DIG] = {
-                .mixers = { alc880_three_stack_mixer },
-                .init_verbs = { alc880_volume_init_verbs, alc880_pin_3stack_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc880_dac_nids),
-                .dac_nids = alc880_dac_nids,
-                .dig_out_nid = ALC880_DIGOUT_NID,
-                .num_channel_mode = ARRAY_SIZE(alc880_threestack_modes),
-                .channel_mode = alc880_threestack_modes,
-                .input_mux = &alc880_capture_source,
-        },
-        [ALC880_TCL_S700] = {
-                .mixers = { alc880_tcl_s700_mixer },
-                .init_verbs = { alc880_volume_init_verbs,
-                                alc880_pin_tcl_S700_init_verbs,
-                                alc880_gpio2_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc880_dac_nids),
-                .dac_nids = alc880_dac_nids,
-                .hp_nid = 0x03,
-                .num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes),
-                .channel_mode = alc880_2_jack_modes,
-                .input_mux = &alc880_capture_source,
-        },
-        [ALC880_5ST] = {
-                .mixers = { alc880_three_stack_mixer, alc880_five_stack_mixer},
-                .init_verbs = { alc880_volume_init_verbs, alc880_pin_5stack_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc880_dac_nids),
-                .dac_nids = alc880_dac_nids,
-                .num_channel_mode = ARRAY_SIZE(alc880_fivestack_modes),
-                .channel_mode = alc880_fivestack_modes,
-                .input_mux = &alc880_capture_source,
-        },
-        [ALC880_5ST_DIG] = {
-                .mixers = { alc880_three_stack_mixer, alc880_five_stack_mixer },
-                .init_verbs = { alc880_volume_init_verbs, alc880_pin_5stack_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc880_dac_nids),
-                .dac_nids = alc880_dac_nids,
-                .dig_out_nid = ALC880_DIGOUT_NID,
-                .num_channel_mode = ARRAY_SIZE(alc880_fivestack_modes),
-                .channel_mode = alc880_fivestack_modes,
-                .input_mux = &alc880_capture_source,
-        },
-        [ALC880_6ST] = {
-                .mixers = { alc880_six_stack_mixer },
-                .init_verbs = { alc880_volume_init_verbs, alc880_pin_6stack_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc880_6st_dac_nids),
-                .dac_nids = alc880_6st_dac_nids,
-                .num_channel_mode = ARRAY_SIZE(alc880_sixstack_modes),
-                .channel_mode = alc880_sixstack_modes,
-                .input_mux = &alc880_6stack_capture_source,
-        },
-        [ALC880_6ST_DIG] = {
-                .mixers = { alc880_six_stack_mixer },
-                .init_verbs = { alc880_volume_init_verbs, alc880_pin_6stack_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc880_6st_dac_nids),
-                .dac_nids = alc880_6st_dac_nids,
-                .dig_out_nid = ALC880_DIGOUT_NID,
-                .num_channel_mode = ARRAY_SIZE(alc880_sixstack_modes),
-                .channel_mode = alc880_sixstack_modes,
-                .input_mux = &alc880_6stack_capture_source,
-        },
-        [ALC880_W810] = {
-                .mixers = { alc880_w810_base_mixer },
-                .init_verbs = { alc880_volume_init_verbs, alc880_pin_w810_init_verbs,
-                                alc880_gpio2_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc880_w810_dac_nids),
-                .dac_nids = alc880_w810_dac_nids,
-                .dig_out_nid = ALC880_DIGOUT_NID,
-                .num_channel_mode = ARRAY_SIZE(alc880_w810_modes),
-                .channel_mode = alc880_w810_modes,
-                .input_mux = &alc880_capture_source,
-        },
-        [ALC880_Z71V] = {
-                .mixers = { alc880_z71v_mixer },
-                .init_verbs = { alc880_volume_init_verbs, alc880_pin_z71v_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc880_z71v_dac_nids),
-                .dac_nids = alc880_z71v_dac_nids,
-                .dig_out_nid = ALC880_DIGOUT_NID,
-                .hp_nid = 0x03,
-                .num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes),
-                .channel_mode = alc880_2_jack_modes,
-                .input_mux = &alc880_capture_source,
-        },
-        [ALC880_F1734] = {
-                .mixers = { alc880_f1734_mixer },
-                .init_verbs = { alc880_volume_init_verbs, alc880_pin_f1734_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc880_f1734_dac_nids),
-                .dac_nids = alc880_f1734_dac_nids,
-                .hp_nid = 0x02,
-                .num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes),
-                .channel_mode = alc880_2_jack_modes,
-                .input_mux = &alc880_capture_source,
-        },
-        [ALC880_ASUS] = {
-                .mixers = { alc880_asus_mixer },
-                .init_verbs = { alc880_volume_init_verbs, alc880_pin_asus_init_verbs,
-                                alc880_gpio1_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),
-                .dac_nids = alc880_asus_dac_nids,
-                .num_channel_mode = ARRAY_SIZE(alc880_asus_modes),
-                .channel_mode = alc880_asus_modes,
-                .input_mux = &alc880_capture_source,
-        },
-        [ALC880_ASUS_DIG] = {
-                .mixers = { alc880_asus_mixer },
-                .init_verbs = { alc880_volume_init_verbs, alc880_pin_asus_init_verbs,
-                                alc880_gpio1_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),
-                .dac_nids = alc880_asus_dac_nids,
-                .dig_out_nid = ALC880_DIGOUT_NID,
-                .num_channel_mode = ARRAY_SIZE(alc880_asus_modes),
-                .channel_mode = alc880_asus_modes,
-                .input_mux = &alc880_capture_source,
-        },
-        [ALC880_ASUS_DIG2] = {
-                .mixers = { alc880_asus_mixer },
-                .init_verbs = { alc880_volume_init_verbs, alc880_pin_asus_init_verbs,
-                                alc880_gpio2_init_verbs }, /* use GPIO2 */
-                .num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),
-                .dac_nids = alc880_asus_dac_nids,
-                .dig_out_nid = ALC880_DIGOUT_NID,
-                .num_channel_mode = ARRAY_SIZE(alc880_asus_modes),
-                .channel_mode = alc880_asus_modes,
-                .input_mux = &alc880_capture_source,
-        },
-        [ALC880_ASUS_W1V] = {
-                .mixers = { alc880_asus_mixer, alc880_asus_w1v_mixer },
-                .init_verbs = { alc880_volume_init_verbs, alc880_pin_asus_init_verbs,
-                                alc880_gpio1_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),
-                .dac_nids = alc880_asus_dac_nids,
-                .dig_out_nid = ALC880_DIGOUT_NID,
-                .num_channel_mode = ARRAY_SIZE(alc880_asus_modes),
-                .channel_mode = alc880_asus_modes,
-                .input_mux = &alc880_capture_source,
-        },
-        [ALC880_UNIWILL_DIG] = {
-                .mixers = { alc880_asus_mixer, alc880_pcbeep_mixer },
-                .init_verbs = { alc880_volume_init_verbs, alc880_pin_asus_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),
-                .dac_nids = alc880_asus_dac_nids,
-                .dig_out_nid = ALC880_DIGOUT_NID,
-                .num_channel_mode = ARRAY_SIZE(alc880_asus_modes),
-                .channel_mode = alc880_asus_modes,
-                .input_mux = &alc880_capture_source,
-        },
-        [ALC880_CLEVO] = {
-                .mixers = { alc880_three_stack_mixer },
-                .init_verbs = { alc880_volume_init_verbs,
-                                alc880_pin_clevo_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc880_dac_nids),
-                .dac_nids = alc880_dac_nids,
-                .hp_nid = 0x03,
-                .num_channel_mode = ARRAY_SIZE(alc880_threestack_modes),
-                .channel_mode = alc880_threestack_modes,
-                .input_mux = &alc880_capture_source,
-        },
-        [ALC880_LG] = {
-            .mixers = { alc880_lg_mixer },
-            .init_verbs = { alc880_volume_init_verbs,
-            alc880_lg_init_verbs },
-            .num_dacs = ARRAY_SIZE(alc880_lg_dac_nids),
-            .dac_nids = alc880_lg_dac_nids,
-            .dig_out_nid = ALC880_DIGOUT_NID,
-            .num_channel_mode = ARRAY_SIZE(alc880_lg_ch_modes),
-            .channel_mode = alc880_lg_ch_modes,
-            .input_mux = &alc880_lg_capture_source,
-            .unsol_event = alc880_lg_unsol_event,
-            .init_hook = alc880_lg_automute,
-        },
-        [ALC880_LG_LW] = {
-            .mixers = { alc880_lg_lw_mixer },
-            .init_verbs = { alc880_volume_init_verbs,
-            alc880_lg_lw_init_verbs },
-            .num_dacs = 1,
-            .dac_nids = alc880_dac_nids,
-            .dig_out_nid = ALC880_DIGOUT_NID,
-            .num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes),
-            .channel_mode = alc880_2_jack_modes,
-            .input_mux = &alc880_lg_lw_capture_source,
-            .unsol_event = alc880_lg_lw_unsol_event,
-            .init_hook = alc880_lg_lw_automute,
-        },
+    [ALC880_3ST] = {
+        .mixers = { alc880_three_stack_mixer },
+        .init_verbs = { alc880_volume_init_verbs, alc880_pin_3stack_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc880_dac_nids),
+        .dac_nids = alc880_dac_nids,
+        .num_channel_mode = ARRAY_SIZE(alc880_threestack_modes),
+        .channel_mode = alc880_threestack_modes,
+        .input_mux = &alc880_capture_source,
+    },
+    [ALC880_3ST_DIG] = {
+        .mixers = { alc880_three_stack_mixer },
+        .init_verbs = { alc880_volume_init_verbs, alc880_pin_3stack_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc880_dac_nids),
+        .dac_nids = alc880_dac_nids,
+        .dig_out_nid = ALC880_DIGOUT_NID,
+        .num_channel_mode = ARRAY_SIZE(alc880_threestack_modes),
+        .channel_mode = alc880_threestack_modes,
+        .input_mux = &alc880_capture_source,
+    },
+    [ALC880_TCL_S700] = {
+        .mixers = { alc880_tcl_s700_mixer },
+        .init_verbs = { alc880_volume_init_verbs,
+        alc880_pin_tcl_S700_init_verbs,
+        alc880_gpio2_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc880_dac_nids),
+        .dac_nids = alc880_dac_nids,
+        .hp_nid = 0x03,
+        .num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes),
+        .channel_mode = alc880_2_jack_modes,
+        .input_mux = &alc880_capture_source,
+    },
+    [ALC880_5ST] = {
+        .mixers = { alc880_three_stack_mixer, alc880_five_stack_mixer},
+        .init_verbs = { alc880_volume_init_verbs, alc880_pin_5stack_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc880_dac_nids),
+        .dac_nids = alc880_dac_nids,
+        .num_channel_mode = ARRAY_SIZE(alc880_fivestack_modes),
+        .channel_mode = alc880_fivestack_modes,
+        .input_mux = &alc880_capture_source,
+    },
+    [ALC880_5ST_DIG] = {
+        .mixers = { alc880_three_stack_mixer, alc880_five_stack_mixer },
+        .init_verbs = { alc880_volume_init_verbs, alc880_pin_5stack_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc880_dac_nids),
+        .dac_nids = alc880_dac_nids,
+        .dig_out_nid = ALC880_DIGOUT_NID,
+        .num_channel_mode = ARRAY_SIZE(alc880_fivestack_modes),
+        .channel_mode = alc880_fivestack_modes,
+        .input_mux = &alc880_capture_source,
+    },
+    [ALC880_6ST] = {
+        .mixers = { alc880_six_stack_mixer },
+        .init_verbs = { alc880_volume_init_verbs, alc880_pin_6stack_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc880_6st_dac_nids),
+        .dac_nids = alc880_6st_dac_nids,
+        .num_channel_mode = ARRAY_SIZE(alc880_sixstack_modes),
+        .channel_mode = alc880_sixstack_modes,
+        .input_mux = &alc880_6stack_capture_source,
+    },
+    [ALC880_6ST_DIG] = {
+        .mixers = { alc880_six_stack_mixer },
+        .init_verbs = { alc880_volume_init_verbs, alc880_pin_6stack_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc880_6st_dac_nids),
+        .dac_nids = alc880_6st_dac_nids,
+        .dig_out_nid = ALC880_DIGOUT_NID,
+        .num_channel_mode = ARRAY_SIZE(alc880_sixstack_modes),
+        .channel_mode = alc880_sixstack_modes,
+        .input_mux = &alc880_6stack_capture_source,
+    },
+    [ALC880_W810] = {
+        .mixers = { alc880_w810_base_mixer },
+        .init_verbs = { alc880_volume_init_verbs, alc880_pin_w810_init_verbs,
+        alc880_gpio2_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc880_w810_dac_nids),
+        .dac_nids = alc880_w810_dac_nids,
+        .dig_out_nid = ALC880_DIGOUT_NID,
+        .num_channel_mode = ARRAY_SIZE(alc880_w810_modes),
+        .channel_mode = alc880_w810_modes,
+        .input_mux = &alc880_capture_source,
+    },
+    [ALC880_Z71V] = {
+        .mixers = { alc880_z71v_mixer },
+        .init_verbs = { alc880_volume_init_verbs, alc880_pin_z71v_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc880_z71v_dac_nids),
+        .dac_nids = alc880_z71v_dac_nids,
+        .dig_out_nid = ALC880_DIGOUT_NID,
+        .hp_nid = 0x03,
+        .num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes),
+        .channel_mode = alc880_2_jack_modes,
+        .input_mux = &alc880_capture_source,
+    },
+    [ALC880_F1734] = {
+        .mixers = { alc880_f1734_mixer },
+        .init_verbs = { alc880_volume_init_verbs, alc880_pin_f1734_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc880_f1734_dac_nids),
+        .dac_nids = alc880_f1734_dac_nids,
+        .hp_nid = 0x02,
+        .num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes),
+        .channel_mode = alc880_2_jack_modes,
+        .input_mux = &alc880_capture_source,
+    },
+    [ALC880_ASUS] = {
+        .mixers = { alc880_asus_mixer },
+        .init_verbs = { alc880_volume_init_verbs, alc880_pin_asus_init_verbs,
+        alc880_gpio1_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),
+        .dac_nids = alc880_asus_dac_nids,
+        .num_channel_mode = ARRAY_SIZE(alc880_asus_modes),
+        .channel_mode = alc880_asus_modes,
+        .input_mux = &alc880_capture_source,
+    },
+    [ALC880_ASUS_DIG] = {
+        .mixers = { alc880_asus_mixer },
+        .init_verbs = { alc880_volume_init_verbs, alc880_pin_asus_init_verbs,
+        alc880_gpio1_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),
+        .dac_nids = alc880_asus_dac_nids,
+        .dig_out_nid = ALC880_DIGOUT_NID,
+        .num_channel_mode = ARRAY_SIZE(alc880_asus_modes),
+        .channel_mode = alc880_asus_modes,
+        .input_mux = &alc880_capture_source,
+    },
+    [ALC880_ASUS_DIG2] = {
+        .mixers = { alc880_asus_mixer },
+        .init_verbs = { alc880_volume_init_verbs, alc880_pin_asus_init_verbs,
+        alc880_gpio2_init_verbs }, /* use GPIO2 */
+        .num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),
+        .dac_nids = alc880_asus_dac_nids,
+        .dig_out_nid = ALC880_DIGOUT_NID,
+        .num_channel_mode = ARRAY_SIZE(alc880_asus_modes),
+        .channel_mode = alc880_asus_modes,
+        .input_mux = &alc880_capture_source,
+    },
+    [ALC880_ASUS_W1V] = {
+        .mixers = { alc880_asus_mixer, alc880_asus_w1v_mixer },
+        .init_verbs = { alc880_volume_init_verbs, alc880_pin_asus_init_verbs,
+        alc880_gpio1_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),
+        .dac_nids = alc880_asus_dac_nids,
+        .dig_out_nid = ALC880_DIGOUT_NID,
+        .num_channel_mode = ARRAY_SIZE(alc880_asus_modes),
+        .channel_mode = alc880_asus_modes,
+        .input_mux = &alc880_capture_source,
+    },
+    [ALC880_UNIWILL_DIG] = {
+        .mixers = { alc880_asus_mixer, alc880_pcbeep_mixer },
+        .init_verbs = { alc880_volume_init_verbs, alc880_pin_asus_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),
+        .dac_nids = alc880_asus_dac_nids,
+        .dig_out_nid = ALC880_DIGOUT_NID,
+        .num_channel_mode = ARRAY_SIZE(alc880_asus_modes),
+        .channel_mode = alc880_asus_modes,
+        .input_mux = &alc880_capture_source,
+    },
+    [ALC880_CLEVO] = {
+        .mixers = { alc880_three_stack_mixer },
+        .init_verbs = { alc880_volume_init_verbs,
+        alc880_pin_clevo_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc880_dac_nids),
+        .dac_nids = alc880_dac_nids,
+        .hp_nid = 0x03,
+        .num_channel_mode = ARRAY_SIZE(alc880_threestack_modes),
+        .channel_mode = alc880_threestack_modes,
+        .input_mux = &alc880_capture_source,
+    },
+    [ALC880_LG] = {
+        .mixers = { alc880_lg_mixer },
+        .init_verbs = { alc880_volume_init_verbs,
+        alc880_lg_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc880_lg_dac_nids),
+        .dac_nids = alc880_lg_dac_nids,
+        .dig_out_nid = ALC880_DIGOUT_NID,
+        .num_channel_mode = ARRAY_SIZE(alc880_lg_ch_modes),
+        .channel_mode = alc880_lg_ch_modes,
+        .input_mux = &alc880_lg_capture_source,
+        .unsol_event = alc880_lg_unsol_event,
+        .init_hook = alc880_lg_automute,
+    },
+    [ALC880_LG_LW] = {
+        .mixers = { alc880_lg_lw_mixer },
+        .init_verbs = { alc880_volume_init_verbs,
+        alc880_lg_lw_init_verbs },
+        .num_dacs = 1,
+        .dac_nids = alc880_dac_nids,
+        .dig_out_nid = ALC880_DIGOUT_NID,
+        .num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes),
+        .channel_mode = alc880_2_jack_modes,
+        .input_mux = &alc880_lg_lw_capture_source,
+        .unsol_event = alc880_lg_lw_unsol_event,
+        .init_hook = alc880_lg_lw_automute,
+    },
 #ifdef CONFIG_SND_DEBUG
-        [ALC880_TEST] = {
-                .mixers = { alc880_test_mixer },
-                .init_verbs = { alc880_test_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc880_test_dac_nids),
-                .dac_nids = alc880_test_dac_nids,
-                .dig_out_nid = ALC880_DIGOUT_NID,
-                .num_channel_mode = ARRAY_SIZE(alc880_test_modes),
-                .channel_mode = alc880_test_modes,
-                .input_mux = &alc880_test_capture_source,
-        },
+    [ALC880_TEST] = {
+        .mixers = { alc880_test_mixer },
+        .init_verbs = { alc880_test_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc880_test_dac_nids),
+        .dac_nids = alc880_test_dac_nids,
+        .dig_out_nid = ALC880_DIGOUT_NID,
+        .num_channel_mode = ARRAY_SIZE(alc880_test_modes),
+        .channel_mode = alc880_test_modes,
+        .input_mux = &alc880_test_capture_source,
+    },
 #endif
 };
@@ -2379 +2398 @@
 
 enum {
-        ALC_CTL_WIDGET_VOL,
-        ALC_CTL_WIDGET_MUTE,
-        ALC_CTL_BIND_MUTE,
+    ALC_CTL_WIDGET_VOL,
+    ALC_CTL_WIDGET_MUTE,
+    ALC_CTL_BIND_MUTE,
 };
 static struct snd_kcontrol_new alc880_control_templates[] = {
-        HDA_CODEC_VOLUME(NULL, 0, 0, 0),
-        HDA_CODEC_MUTE(NULL, 0, 0, 0),
-        HDA_BIND_MUTE(NULL, 0, 0, 0),
+    HDA_CODEC_VOLUME(NULL, 0, 0, 0),
+    HDA_CODEC_MUTE(NULL, 0, 0, 0),
+    HDA_BIND_MUTE(NULL, 0, 0, 0),
 };
 
@@ -2392 +2411 @@
 static int add_control(struct alc_spec *spec, int type, const char *name, unsigned long val)
 {
-        struct snd_kcontrol_new *knew;
-
-        if (spec->num_kctl_used >= spec->num_kctl_alloc) {
-                int num = spec->num_kctl_alloc + NUM_CONTROL_ALLOC;
-
-                knew = kcalloc(num + 1, sizeof(*knew), GFP_KERNEL); /* array + terminator */
-                if (! knew)
-                        return -ENOMEM;
-                if (spec->kctl_alloc) {
-                        memcpy(knew, spec->kctl_alloc, sizeof(*knew) * spec->num_kctl_alloc);
-                        kfree(spec->kctl_alloc);
-                }
-                spec->kctl_alloc = knew;
-                spec->num_kctl_alloc = num;
-        }
-
-        knew = &spec->kctl_alloc[spec->num_kctl_used];
-        *knew = alc880_control_templates[type];
-        knew->name = kstrdup(name, GFP_KERNEL);
-        if (! knew->name)
-                return -ENOMEM;
-        knew->private_value = val;
-        spec->num_kctl_used++;
-        return 0;
+    struct snd_kcontrol_new *knew;
+
+    if (spec->num_kctl_used >= spec->num_kctl_alloc) {
+        int num = spec->num_kctl_alloc + NUM_CONTROL_ALLOC;
+
+        knew = kcalloc(num + 1, sizeof(*knew), GFP_KERNEL); /* array + terminator */
+        if (! knew)
+            return -ENOMEM;
+        if (spec->kctl_alloc) {
+            memcpy(knew, spec->kctl_alloc, sizeof(*knew) * spec->num_kctl_alloc);
+            kfree(spec->kctl_alloc);
+        }
+        spec->kctl_alloc = knew;
+        spec->num_kctl_alloc = num;
+    }
+
+    knew = &spec->kctl_alloc[spec->num_kctl_used];
+    *knew = alc880_control_templates[type];
+    knew->name = kstrdup(name, GFP_KERNEL);
+    if (! knew->name)
+        return -ENOMEM;
+    knew->private_value = val;
+    spec->num_kctl_used++;
+    return 0;
 }
 
@@ -2433 +2452 @@
 static int alc880_auto_fill_dac_nids(struct alc_spec *spec, const struct auto_pin_cfg *cfg)
 {
-        hda_nid_t nid;
-        int assigned[4];
-        int i, j;
-
-        memset(assigned, 0, sizeof(assigned));
-        spec->multiout.dac_nids = spec->private_dac_nids;
-
-        /* check the pins hardwired to audio widget */
-        for (i = 0; i < cfg->line_outs; i++) {
-                nid = cfg->line_out_pins[i];
-                if (alc880_is_fixed_pin(nid)) {
-                        int idx = alc880_fixed_pin_idx(nid);
-                        spec->multiout.dac_nids[i] = alc880_idx_to_dac(idx);
-                        assigned[idx] = 1;
-                }
-        }
-        /* left pins can be connect to any audio widget */
-        for (i = 0; i < cfg->line_outs; i++) {
-                nid = cfg->line_out_pins[i];
-                if (alc880_is_fixed_pin(nid))
-                        continue;
-                /* search for an empty channel */
-                for (j = 0; j < cfg->line_outs; j++) {
-                        if (! assigned[j]) {
-                                spec->multiout.dac_nids[i] = alc880_idx_to_dac(j);
-                                assigned[j] = 1;
-                                break;
-                        }
-                }
-        }
-        spec->multiout.num_dacs = cfg->line_outs;
-        return 0;
+    hda_nid_t nid;
+    int assigned[4];
+    int i, j;
+
+    memset(assigned, 0, sizeof(assigned));
+    spec->multiout.dac_nids = spec->private_dac_nids;
+
+    /* check the pins hardwired to audio widget */
+    for (i = 0; i < cfg->line_outs; i++) {
+        nid = cfg->line_out_pins[i];
+        if (alc880_is_fixed_pin(nid)) {
+            int idx = alc880_fixed_pin_idx(nid);
+            spec->multiout.dac_nids[i] = alc880_idx_to_dac(idx);
+            assigned[idx] = 1;
+        }
+    }
+    /* left pins can be connect to any audio widget */
+    for (i = 0; i < cfg->line_outs; i++) {
+        nid = cfg->line_out_pins[i];
+        if (alc880_is_fixed_pin(nid))
+            continue;
+        /* search for an empty channel */
+        for (j = 0; j < cfg->line_outs; j++) {
+            if (! assigned[j]) {
+                spec->multiout.dac_nids[i] = alc880_idx_to_dac(j);
+                assigned[j] = 1;
+                break;
+            }
+        }
+    }
+    spec->multiout.num_dacs = cfg->line_outs;
+    return 0;
 }
 
 /* add playback controls from the parsed DAC table */
 static int alc880_auto_create_multi_out_ctls(struct alc_spec *spec,
-                                             const struct auto_pin_cfg *cfg)
-{
-        char name[32];
-        static const char *chname[4] = { "Front", "Surround", NULL /*CLFE*/, "Side" };
-        hda_nid_t nid;
-        int i, err;
-
-        for (i = 0; i < cfg->line_outs; i++) {
-                if (! spec->multiout.dac_nids[i])
-                        continue;
-                nid = alc880_idx_to_mixer(alc880_dac_to_idx(spec->multiout.dac_nids[i]));
-                if (i == 2) {
-                        /* Center/LFE */
-                        if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, "Center Playback Volume",
-                                               HDA_COMPOSE_AMP_VAL(nid, 1, 0, HDA_OUTPUT))) < 0)
-                                return err;
-                        if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, "LFE Playback Volume",
-                                               HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT))) < 0)
-                                return err;
-                        if ((err = add_control(spec, ALC_CTL_BIND_MUTE, "Center Playback Switch",
-                                               HDA_COMPOSE_AMP_VAL(nid, 1, 2, HDA_INPUT))) < 0)
-                                return err;
-                        if ((err = add_control(spec, ALC_CTL_BIND_MUTE, "LFE Playback Switch",
-                                               HDA_COMPOSE_AMP_VAL(nid, 2, 2, HDA_INPUT))) < 0)
-                                return err;
-                } else {
-                        sprintf(name, "%s Playback Volume", chname[i]);
-                        if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
-                                               HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
-                                return err;
-                        sprintf(name, "%s Playback Switch", chname[i]);
-                        if ((err = add_control(spec, ALC_CTL_BIND_MUTE, name,
-                                               HDA_COMPOSE_AMP_VAL(nid, 3, 2, HDA_INPUT))) < 0)
-                                return err;
-                }
-        }
-        return 0;
+                                             const struct auto_pin_cfg *cfg)
+{
+    char name[32];
+    static const char *chname[4] = { "Front", "Surround", NULL /*CLFE*/, "Side" };
+    hda_nid_t nid;
+    int i, err;
+
+    for (i = 0; i < cfg->line_outs; i++) {
+        if (! spec->multiout.dac_nids[i])
+            continue;
+        nid = alc880_idx_to_mixer(alc880_dac_to_idx(spec->multiout.dac_nids[i]));
+        if (i == 2) {
+            /* Center/LFE */
+            if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, "Center Playback Volume",
+                                   HDA_COMPOSE_AMP_VAL(nid, 1, 0, HDA_OUTPUT))) < 0)
+                return err;
+            if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, "LFE Playback Volume",
+                                   HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT))) < 0)
+                return err;
+            if ((err = add_control(spec, ALC_CTL_BIND_MUTE, "Center Playback Switch",
+                                   HDA_COMPOSE_AMP_VAL(nid, 1, 2, HDA_INPUT))) < 0)
+                return err;
+            if ((err = add_control(spec, ALC_CTL_BIND_MUTE, "LFE Playback Switch",
+                                   HDA_COMPOSE_AMP_VAL(nid, 2, 2, HDA_INPUT))) < 0)
+                return err;
+        } else {
+            sprintf(name, "%s Playback Volume", chname[i]);
+            if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
+                                   HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
+                return err;
+            sprintf(name, "%s Playback Switch", chname[i]);
+            if ((err = add_control(spec, ALC_CTL_BIND_MUTE, name,
+                                   HDA_COMPOSE_AMP_VAL(nid, 3, 2, HDA_INPUT))) < 0)
+                return err;
+        }
+    }
+    return 0;
 }
 
 /* add playback controls for speaker and HP outputs */
 static int alc880_auto_create_extra_out(struct alc_spec *spec, hda_nid_t pin,
-                                        const char *pfx)
-{
-        hda_nid_t nid;
-        int err;
-        char name[32];
-
-        if (! pin)
-                return 0;
-
-        if (alc880_is_fixed_pin(pin)) {
-                nid = alc880_idx_to_dac(alc880_fixed_pin_idx(pin));
-                /* specify the DAC as the extra output */
-                if (! spec->multiout.hp_nid)
-                    spec->multiout.hp_nid = nid;
-                else
-                    spec->multiout.extra_out_nid[0] = nid;
-                /* control HP volume/switch on the output mixer amp */
-                nid = alc880_idx_to_mixer(alc880_fixed_pin_idx(pin));
-                sprintf(name, "%s Playback Volume", pfx);
-                if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
-                                       HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
-                        return err;
-                sprintf(name, "%s Playback Switch", pfx);
-                if ((err = add_control(spec, ALC_CTL_BIND_MUTE, name,
-                                       HDA_COMPOSE_AMP_VAL(nid, 3, 2, HDA_INPUT))) < 0)
-                        return err;
-        } else if (alc880_is_multi_pin(pin)) {
-                /* set manual connection */
-                /* we have only a switch on HP-out PIN */
-                sprintf(name, "%s Playback Switch", pfx);
-                if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, name,
-                                       HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT))) < 0)
-                        return err;
-        }
-        return 0;
+                                        const char *pfx)
+{
+    hda_nid_t nid;
+    int err;
+    char name[32];
+
+    if (! pin)
+        return 0;
+
+    if (alc880_is_fixed_pin(pin)) {
+        nid = alc880_idx_to_dac(alc880_fixed_pin_idx(pin));
+        /* specify the DAC as the extra output */
+        if (! spec->multiout.hp_nid)
+            spec->multiout.hp_nid = nid;
+        else
+            spec->multiout.extra_out_nid[0] = nid;
+        /* control HP volume/switch on the output mixer amp */
+        nid = alc880_idx_to_mixer(alc880_fixed_pin_idx(pin));
+        sprintf(name, "%s Playback Volume", pfx);
+        if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
+                               HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
+            return err;
+        sprintf(name, "%s Playback Switch", pfx);
+        if ((err = add_control(spec, ALC_CTL_BIND_MUTE, name,
+                               HDA_COMPOSE_AMP_VAL(nid, 3, 2, HDA_INPUT))) < 0)
+            return err;
+    } else if (alc880_is_multi_pin(pin)) {
+        /* set manual connection */
+        /* we have only a switch on HP-out PIN */
+        sprintf(name, "%s Playback Switch", pfx);
+        if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, name,
+                               HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT))) < 0)
+            return err;
+    }
+    return 0;
 }
 
 /* create input playback/capture controls for the given pin */
 static int new_analog_input(struct alc_spec *spec, hda_nid_t pin, const char *ctlname,
-                            int idx, hda_nid_t mix_nid)
-{
-        char name[32];
-        int err;
-
-        sprintf(name, "%s Playback Volume", ctlname);
-        if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
-                               HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT))) < 0)
-                return err;
-        sprintf(name, "%s Playback Switch", ctlname);
-        if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, name,
-                               HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT))) < 0)
-                return err;
-        return 0;
+                            int idx, hda_nid_t mix_nid)
+{
+    char name[32];
+    int err;
+
+    sprintf(name, "%s Playback Volume", ctlname);
+    if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
+                           HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT))) < 0)
+        return err;
+    sprintf(name, "%s Playback Switch", ctlname);
+    if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, name,
+                           HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT))) < 0)
+        return err;
+    return 0;
 }
 
 /* create playback/capture controls for input pins */
 static int alc880_auto_create_analog_input_ctls(struct alc_spec *spec,
-                                                const struct auto_pin_cfg *cfg)
-{
-        struct hda_input_mux *imux = &spec->private_imux;
-        int i, err, idx;
-
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                if (alc880_is_input_pin(cfg->input_pins[i])) {
-                        idx = alc880_input_pin_idx(cfg->input_pins[i]);
-                        err = new_analog_input(spec, cfg->input_pins[i],
-                                               auto_pin_cfg_labels[i],
-                                               idx, 0x0b);
-                        if (err < 0)
-                                return err;
-                        imux->items[imux->num_items].label = auto_pin_cfg_labels[i];
-                        imux->items[imux->num_items].index = alc880_input_pin_idx(cfg->input_pins[i]);
-                        imux->num_items++;
-                }
-        }
-        return 0;
+                                                const struct auto_pin_cfg *cfg)
+{
+    struct hda_input_mux *imux = &spec->private_imux;
+    int i, err, idx;
+
+    for (i = 0; i < AUTO_PIN_LAST; i++) {
+        if (alc880_is_input_pin(cfg->input_pins[i])) {
+            idx = alc880_input_pin_idx(cfg->input_pins[i]);
+            err = new_analog_input(spec, cfg->input_pins[i],
+                                   auto_pin_cfg_labels[i],
+                                   idx, 0x0b);
+            if (err < 0)
+                return err;
+            imux->items[imux->num_items].label = auto_pin_cfg_labels[i];
+            imux->items[imux->num_items].index = alc880_input_pin_idx(cfg->input_pins[i]);
+            imux->num_items++;
+        }
+    }
+    return 0;
 }
 
 static void alc880_auto_set_output_and_unmute(struct hda_codec *codec,
-                                              hda_nid_t nid, int pin_type,
-                                              int dac_idx)
-{
-        /* set as output */
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, pin_type);
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
-        /* need the manual connection? */
-        if (alc880_is_multi_pin(nid)) {
-                struct alc_spec *spec = codec->spec;
-                int idx = alc880_multi_pin_idx(nid);
-                snd_hda_codec_write(codec, alc880_idx_to_selector(idx), 0,
-                                    AC_VERB_SET_CONNECT_SEL,
-                                    alc880_dac_to_idx(spec->multiout.dac_nids[dac_idx]));
-        }
+                                              hda_nid_t nid, int pin_type,
+                                              int dac_idx)
+{
+    /* set as output */
+    snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, pin_type);
+    snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
+    /* need the manual connection? */
+    if (alc880_is_multi_pin(nid)) {
+        struct alc_spec *spec = codec->spec;
+        int idx = alc880_multi_pin_idx(nid);
+        snd_hda_codec_write(codec, alc880_idx_to_selector(idx), 0,
+                            AC_VERB_SET_CONNECT_SEL,
+                            alc880_dac_to_idx(spec->multiout.dac_nids[dac_idx]));
+    }
 }
 
 static void alc880_auto_init_multi_out(struct hda_codec *codec)
 {
-        struct alc_spec *spec = codec->spec;
-        int i;
-
-        for (i = 0; i < spec->autocfg.line_outs; i++) {
-                hda_nid_t nid = spec->autocfg.line_out_pins[i];
-                alc880_auto_set_output_and_unmute(codec, nid, PIN_OUT, i);
-        }
+    struct alc_spec *spec = codec->spec;
+    int i;
+
+    for (i = 0; i < spec->autocfg.line_outs; i++) {
+        hda_nid_t nid = spec->autocfg.line_out_pins[i];
+        alc880_auto_set_output_and_unmute(codec, nid, PIN_OUT, i);
+    }
 }
 
 static void alc880_auto_init_extra_out(struct hda_codec *codec)
 {
-        struct alc_spec *spec = codec->spec;
-        hda_nid_t pin;
-
-        pin = spec->autocfg.speaker_pins[0];
-        if (pin) /* connect to front */
-                alc880_auto_set_output_and_unmute(codec, pin, PIN_OUT, 0);
-        pin = spec->autocfg.hp_pin;
-        if (pin) /* connect to front */
-                alc880_auto_set_output_and_unmute(codec, pin, PIN_HP, 0);
+    struct alc_spec *spec = codec->spec;
+    hda_nid_t pin;
+
+    pin = spec->autocfg.speaker_pins[0];
+    if (pin) /* connect to front */
+        alc880_auto_set_output_and_unmute(codec, pin, PIN_OUT, 0);
+    pin = spec->autocfg.hp_pin;
+    if (pin) /* connect to front */
+        alc880_auto_set_output_and_unmute(codec, pin, PIN_HP, 0);
 }
 
 static void alc880_auto_init_analog_input(struct hda_codec *codec)
 {
-        struct alc_spec *spec = codec->spec;
-        int i;
-
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                hda_nid_t nid = spec->autocfg.input_pins[i];
-                if (alc880_is_input_pin(nid)) {
-                        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                            i <= AUTO_PIN_FRONT_MIC ? PIN_VREF80 : PIN_IN);
-                        if (nid != ALC880_PIN_CD_NID)
-                                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
-                                                    AMP_OUT_MUTE);
-                }
-        }
+    struct alc_spec *spec = codec->spec;
+    int i;
+
+    for (i = 0; i < AUTO_PIN_LAST; i++) {
+        hda_nid_t nid = spec->autocfg.input_pins[i];
+        if (alc880_is_input_pin(nid)) {
+            snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                i <= AUTO_PIN_FRONT_MIC ? PIN_VREF80 : PIN_IN);
+            if (nid != ALC880_PIN_CD_NID)
+                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                                    AMP_OUT_MUTE);
+        }
+    }
 }
 
@@ -2650 +2669 @@
 static int alc880_parse_auto_config(struct hda_codec *codec)
 {
-        struct alc_spec *spec = codec->spec;
-        int err;
-        static hda_nid_t alc880_ignore[] = { 0x1d, 0 };
-
-        if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
-                                                alc880_ignore)) < 0)
-            return err;
-        if (! spec->autocfg.line_outs)
-            return 0; /* can't find valid BIOS pin config */
-
-        if ((err = alc880_auto_fill_dac_nids(spec, &spec->autocfg)) < 0 ||
-            (err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 ||
-            (err = alc880_auto_create_extra_out(spec,
-                                                spec->autocfg.speaker_pins[0],
-                                                "Speaker")) < 0 ||
-            (err = alc880_auto_create_extra_out(spec, spec->autocfg.hp_pin,
-                                                "Headphone")) < 0 ||
-            (err = alc880_auto_create_analog_input_ctls(spec, &spec->autocfg)) < 0)
-                return err;
-
-        spec->multiout.max_channels = spec->multiout.num_dacs * 2;
-
-        if (spec->autocfg.dig_out_pin)
-                spec->multiout.dig_out_nid = ALC880_DIGOUT_NID;
-        if (spec->autocfg.dig_in_pin)
-                spec->dig_in_nid = ALC880_DIGIN_NID;
-
-        if (spec->kctl_alloc)
-                spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
-
-        spec->init_verbs[spec->num_init_verbs++] = alc880_volume_init_verbs;
-
-        spec->input_mux = &spec->private_imux;
-
-        return 1;
+    struct alc_spec *spec = codec->spec;
+    int err;
+    static hda_nid_t alc880_ignore[] = { 0x1d, 0 };
+
+    if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
+                                            alc880_ignore)) < 0)
+        return err;
+    if (! spec->autocfg.line_outs)
+        return 0; /* can't find valid BIOS pin config */
+
+    if ((err = alc880_auto_fill_dac_nids(spec, &spec->autocfg)) < 0 ||
+        (err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 ||
+        (err = alc880_auto_create_extra_out(spec,
+                                            spec->autocfg.speaker_pins[0],
+                                            "Speaker")) < 0 ||
+        (err = alc880_auto_create_extra_out(spec, spec->autocfg.hp_pin,
+                                            "Headphone")) < 0 ||
+        (err = alc880_auto_create_analog_input_ctls(spec, &spec->autocfg)) < 0)
+        return err;
+
+    spec->multiout.max_channels = spec->multiout.num_dacs * 2;
+
+    if (spec->autocfg.dig_out_pin)
+        spec->multiout.dig_out_nid = ALC880_DIGOUT_NID;
+    if (spec->autocfg.dig_in_pin)
+        spec->dig_in_nid = ALC880_DIGIN_NID;
+
+    if (spec->kctl_alloc)
+        spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
+
+    spec->init_verbs[spec->num_init_verbs++] = alc880_volume_init_verbs;
+
+    spec->input_mux = &spec->private_imux;
+
+    return 1;
 }
 
@@ -2701 +2720 @@
 static int patch_alc880(struct hda_codec *codec)
 {
-        struct alc_spec *spec;
-        int board_config;
-        int err;
-
-        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
-        if (spec == NULL)
-                return -ENOMEM;
-
-        codec->spec = spec;
-
-        board_config = snd_hda_check_board_config(codec, alc880_cfg_tbl);
-        if (board_config < 0 || board_config >= ALC880_MODEL_LAST) {
-                printk(KERN_INFO "hda_codec: Unknown model for ALC880, trying auto-probe from BIOS...\n");
-                board_config = ALC880_AUTO;
-        }
-
-        if (board_config == ALC880_AUTO) {
-                /* automatic parse from the BIOS config */
-                err = alc880_parse_auto_config(codec);
-                if (err < 0) {
-                        alc_free(codec);
-                        return err;
-                } else if (! err) {
-                        printk(KERN_INFO "hda_codec: Cannot set up configuration from BIOS.  Using 3-stack mode...\n");
-                        board_config = ALC880_3ST;
-                }
-        }
-
-        if (board_config != ALC880_AUTO)
-                setup_preset(spec, &alc880_presets[board_config]);
-
-        spec->stream_name_analog = "ALC880 Analog";
-        spec->stream_analog_playback = &alc880_pcm_analog_playback;
-        spec->stream_analog_capture = &alc880_pcm_analog_capture;
-
-        spec->stream_name_digital = "ALC880 Digital";
-        spec->stream_digital_playback = &alc880_pcm_digital_playback;
-        spec->stream_digital_capture = &alc880_pcm_digital_capture;
-
-        if (! spec->adc_nids && spec->input_mux) {
-                /* check whether NID 0x07 is valid */
-                unsigned int wcap = get_wcaps(codec, alc880_adc_nids[0]);
-                wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; /* get type */
-                if (wcap != AC_WID_AUD_IN) {
-                        spec->adc_nids = alc880_adc_nids_alt;
-                        spec->num_adc_nids = ARRAY_SIZE(alc880_adc_nids_alt);
-                        spec->mixers[spec->num_mixers] = alc880_capture_alt_mixer;
-                        spec->num_mixers++;
-                } else {
-                        spec->adc_nids = alc880_adc_nids;
-                        spec->num_adc_nids = ARRAY_SIZE(alc880_adc_nids);
-                        spec->mixers[spec->num_mixers] = alc880_capture_mixer;
-                        spec->num_mixers++;
-                }
-        }
-
-        codec->patch_ops = alc_patch_ops;
-        if (board_config == ALC880_AUTO)
-            spec->init_hook = alc880_auto_init;
-
-        return 0;
+    struct alc_spec *spec;
+    int board_config;
+    int err;
+
+    spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+    if (spec == NULL)
+        return -ENOMEM;
+
+    codec->spec = spec;
+
+    board_config = snd_hda_check_board_config(codec, alc880_cfg_tbl);
+    if (board_config < 0 || board_config >= ALC880_MODEL_LAST) {
+        printk(KERN_INFO "hda_codec: Unknown model for ALC880, trying auto-probe from BIOS...\n");
+        board_config = ALC880_AUTO;
+    }
+
+    if (board_config == ALC880_AUTO) {
+        /* automatic parse from the BIOS config */
+        err = alc880_parse_auto_config(codec);
+        if (err < 0) {
+            alc_free(codec);
+            return err;
+        } else if (! err) {
+            printk(KERN_INFO "hda_codec: Cannot set up configuration from BIOS.  Using 3-stack mode...\n");
+            board_config = ALC880_3ST;
+        }
+    }
+
+    if (board_config != ALC880_AUTO)
+        setup_preset(spec, &alc880_presets[board_config]);
+
+    spec->stream_name_analog = "ALC880 Analog";
+    spec->stream_analog_playback = &alc880_pcm_analog_playback;
+    spec->stream_analog_capture = &alc880_pcm_analog_capture;
+
+    spec->stream_name_digital = "ALC880 Digital";
+    spec->stream_digital_playback = &alc880_pcm_digital_playback;
+    spec->stream_digital_capture = &alc880_pcm_digital_capture;
+
+    if (! spec->adc_nids && spec->input_mux) {
+        /* check whether NID 0x07 is valid */
+        unsigned int wcap = get_wcaps(codec, alc880_adc_nids[0]);
+        wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; /* get type */
+        if (wcap != AC_WID_AUD_IN) {
+            spec->adc_nids = alc880_adc_nids_alt;
+            spec->num_adc_nids = ARRAY_SIZE(alc880_adc_nids_alt);
+            spec->mixers[spec->num_mixers] = alc880_capture_alt_mixer;
+            spec->num_mixers++;
+        } else {
+            spec->adc_nids = alc880_adc_nids;
+            spec->num_adc_nids = ARRAY_SIZE(alc880_adc_nids);
+            spec->mixers[spec->num_mixers] = alc880_capture_mixer;
+            spec->num_mixers++;
+        }
+    }
+
+    codec->patch_ops = alc_patch_ops;
+    if (board_config == ALC880_AUTO)
+        spec->init_hook = alc880_auto_init;
+
+    return 0;
 }
 
@@ -2770 +2789 @@
 
 static hda_nid_t alc260_dac_nids[1] = {
-        /* front */
-        0x02,
+    /* front */
+    0x02,
 };
 
 static hda_nid_t alc260_adc_nids[1] = {
-        /* ADC0 */
-        0x04,
+    /* ADC0 */
+    0x04,
 };
 
 static hda_nid_t alc260_adc_nids_alt[1] = {
-        /* ADC1 */
-        0x05,
+    /* ADC1 */
+    0x05,
 };
 
 static hda_nid_t alc260_hp_adc_nids[2] = {
-        /* ADC1, 0 */
-        0x05, 0x04
+    /* ADC1, 0 */
+    0x05, 0x04
 };
 
@@ -2793 +2812 @@
  */
 static hda_nid_t alc260_dual_adc_nids[2] = {
-        /* ADC0, ADC1 */
-        0x04, 0x05
+    /* ADC0, ADC1 */
+    0x04, 0x05
 };
 
@@ -2801 +2820 @@
 
 static struct hda_input_mux alc260_capture_source = {
-        .num_items = 4,
-        .items = {
-                { "Mic", 0x0 },
-                { "Front Mic", 0x1 },
-                { "Line", 0x2 },
-                { "CD", 0x4 },
-        },
+    .num_items = 4,
+    .items = {
+        { "Mic", 0x0 },
+        { "Front Mic", 0x1 },
+        { "Line", 0x2 },
+        { "CD", 0x4 },
+    },
 };
 
@@ -2814 +2833 @@
  */
 static struct hda_input_mux alc260_fujitsu_capture_source = {
-        .num_items = 3,
-        .items = {
-                { "Mic/Line", 0x0 },
-                { "CD", 0x4 },
-                { "Headphone", 0x2 },
-        },
+    .num_items = 3,
+    .items = {
+        { "Mic/Line", 0x0 },
+        { "CD", 0x4 },
+        { "Headphone", 0x2 },
+    },
 };
 
@@ -2827 +2846 @@
  */
 static struct hda_input_mux alc260_acer_capture_source = {
-        .num_items = 3,
-        .items = {
-                { "Mic", 0x0 },
-                { "Line", 0x2 },
-                { "CD", 0x4 },
-        },
+    .num_items = 3,
+    .items = {
+        { "Mic", 0x0 },
+        { "Line", 0x2 },
+        { "CD", 0x4 },
+    },
 };
 
@@ -2842 +2861 @@
  */
 static struct hda_channel_mode alc260_modes[1] = {
-        { 2, NULL },
+    { 2, NULL },
 };
 
@@ -2856 +2875 @@
 
 static struct snd_kcontrol_new alc260_base_output_mixer[] = {
-        HDA_CODEC_VOLUME("Front Playback Volume", 0x08, 0x0, HDA_OUTPUT),
-        HDA_BIND_MUTE("Front Playback Switch", 0x08, 2, HDA_INPUT),
-        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x09, 0x0, HDA_OUTPUT),
-        HDA_BIND_MUTE("Headphone Playback Switch", 0x09, 2, HDA_INPUT),
-        HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),
-        HDA_BIND_MUTE_MONO("Mono Playback Switch", 0x0a, 1, 2, HDA_INPUT),
-        {0} /* end */
+    HDA_CODEC_VOLUME("Front Playback Volume", 0x08, 0x0, HDA_OUTPUT),
+    HDA_BIND_MUTE("Front Playback Switch", 0x08, 2, HDA_INPUT),
+    HDA_CODEC_VOLUME("Headphone Playback Volume", 0x09, 0x0, HDA_OUTPUT),
+    HDA_BIND_MUTE("Headphone Playback Switch", 0x09, 2, HDA_INPUT),
+    HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),
+    HDA_BIND_MUTE_MONO("Mono Playback Switch", 0x0a, 1, 2, HDA_INPUT),
+    {0} /* end */
 };
 
 static struct snd_kcontrol_new alc260_input_mixer[] = {
-        HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),
-        HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),
-        HDA_CODEC_VOLUME("Line Playback Volume", 0x07, 0x02, HDA_INPUT),
-        HDA_CODEC_MUTE("Line Playback Switch", 0x07, 0x02, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Playback Volume", 0x07, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Mic Playback Switch", 0x07, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x07, 0x01, HDA_INPUT),
-        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x07, 0x01, HDA_INPUT),
-        {0} /* end */
+    HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),
+    HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),
+    HDA_CODEC_VOLUME("Line Playback Volume", 0x07, 0x02, HDA_INPUT),
+    HDA_CODEC_MUTE("Line Playback Switch", 0x07, 0x02, HDA_INPUT),
+    HDA_CODEC_VOLUME("Mic Playback Volume", 0x07, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("Mic Playback Switch", 0x07, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x07, 0x01, HDA_INPUT),
+    HDA_CODEC_MUTE("Front Mic Playback Switch", 0x07, 0x01, HDA_INPUT),
+    {0} /* end */
 };
 
 static struct snd_kcontrol_new alc260_pc_beep_mixer[] = {
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x07, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x07, 0x05, HDA_INPUT),
-        {0} /* end */
+    HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x07, 0x05, HDA_INPUT),
+    HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x07, 0x05, HDA_INPUT),
+    {0} /* end */
 };
 
 static struct snd_kcontrol_new alc260_hp_3013_mixer[] = {
-        HDA_CODEC_VOLUME("Front Playback Volume", 0x09, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Front Playback Switch", 0x10, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Aux-In Playback Volume", 0x07, 0x06, HDA_INPUT),
-        HDA_CODEC_MUTE("Aux-In Playback Switch", 0x07, 0x06, HDA_INPUT),
-        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x08, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME_MONO("iSpeaker Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE_MONO("iSpeaker Playback Switch", 0x11, 1, 0x0, HDA_OUTPUT),
-        {0} /* end */
+    HDA_CODEC_VOLUME("Front Playback Volume", 0x09, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Front Playback Switch", 0x10, 0x0, HDA_OUTPUT),
+    HDA_CODEC_VOLUME("Aux-In Playback Volume", 0x07, 0x06, HDA_INPUT),
+    HDA_CODEC_MUTE("Aux-In Playback Switch", 0x07, 0x06, HDA_INPUT),
+    HDA_CODEC_VOLUME("Headphone Playback Volume", 0x08, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
+    HDA_CODEC_VOLUME_MONO("iSpeaker Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE_MONO("iSpeaker Playback Switch", 0x11, 1, 0x0, HDA_OUTPUT),
+    {0} /* end */
 };
 
 static struct snd_kcontrol_new alc260_fujitsu_mixer[] = {
-        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x08, 0x0, HDA_OUTPUT),
-        HDA_BIND_MUTE("Headphone Playback Switch", 0x08, 2, HDA_INPUT),
-        ALC_PIN_MODE("Headphone Jack Mode", 0x14, ALC_PIN_DIR_INOUT),
-        HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),
-        HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic/Line Playback Volume", 0x07, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Mic/Line Playback Switch", 0x07, 0x0, HDA_INPUT),
-        ALC_PIN_MODE("Mic/Line Jack Mode", 0x12, ALC_PIN_DIR_IN),
-        HDA_CODEC_VOLUME("Beep Playback Volume", 0x07, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("Beep Playback Switch", 0x07, 0x05, HDA_INPUT),
-        HDA_CODEC_VOLUME("Internal Speaker Playback Volume", 0x09, 0x0, HDA_OUTPUT),
-        HDA_BIND_MUTE("Internal Speaker Playback Switch", 0x09, 2, HDA_INPUT),
-        {0} /* end */
+    HDA_CODEC_VOLUME("Headphone Playback Volume", 0x08, 0x0, HDA_OUTPUT),
+    HDA_BIND_MUTE("Headphone Playback Switch", 0x08, 2, HDA_INPUT),
+    ALC_PIN_MODE("Headphone Jack Mode", 0x14, ALC_PIN_DIR_INOUT),
+    HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),
+    HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),
+    HDA_CODEC_VOLUME("Mic/Line Playback Volume", 0x07, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("Mic/Line Playback Switch", 0x07, 0x0, HDA_INPUT),
+    ALC_PIN_MODE("Mic/Line Jack Mode", 0x12, ALC_PIN_DIR_IN),
+    HDA_CODEC_VOLUME("Beep Playback Volume", 0x07, 0x05, HDA_INPUT),
+    HDA_CODEC_MUTE("Beep Playback Switch", 0x07, 0x05, HDA_INPUT),
+    HDA_CODEC_VOLUME("Internal Speaker Playback Volume", 0x09, 0x0, HDA_OUTPUT),
+    HDA_BIND_MUTE("Internal Speaker Playback Switch", 0x09, 2, HDA_INPUT),
+    {0} /* end */
 };
 
 static struct snd_kcontrol_new alc260_acer_mixer[] = {
-        HDA_CODEC_VOLUME("Master Playback Volume", 0x08, 0x0, HDA_OUTPUT),
-        HDA_BIND_MUTE("Master Playback Switch", 0x08, 2, HDA_INPUT),
-        HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),
-        HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Playback Volume", 0x07, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Mic Playback Switch", 0x07, 0x0, HDA_INPUT),
-        ALC_PIN_MODE("Mic Jack Mode", 0x12, ALC_PIN_DIR_IN),
-        HDA_CODEC_VOLUME("Line Playback Volume", 0x07, 0x02, HDA_INPUT),
-        HDA_CODEC_MUTE("Line Playback Switch", 0x07, 0x02, HDA_INPUT),
-        ALC_PIN_MODE("Line Jack Mode", 0x14, ALC_PIN_DIR_INOUT),
-        HDA_CODEC_VOLUME("Beep Playback Volume", 0x07, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("Beep Playback Switch", 0x07, 0x05, HDA_INPUT),
-        {0} /* end */
+    HDA_CODEC_VOLUME("Master Playback Volume", 0x08, 0x0, HDA_OUTPUT),
+    HDA_BIND_MUTE("Master Playback Switch", 0x08, 2, HDA_INPUT),
+    HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),
+    HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),
+    HDA_CODEC_VOLUME("Mic Playback Volume", 0x07, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("Mic Playback Switch", 0x07, 0x0, HDA_INPUT),
+    ALC_PIN_MODE("Mic Jack Mode", 0x12, ALC_PIN_DIR_IN),
+    HDA_CODEC_VOLUME("Line Playback Volume", 0x07, 0x02, HDA_INPUT),
+    HDA_CODEC_MUTE("Line Playback Switch", 0x07, 0x02, HDA_INPUT),
+    ALC_PIN_MODE("Line Jack Mode", 0x14, ALC_PIN_DIR_INOUT),
+    HDA_CODEC_VOLUME("Beep Playback Volume", 0x07, 0x05, HDA_INPUT),
+    HDA_CODEC_MUTE("Beep Playback Switch", 0x07, 0x05, HDA_INPUT),
+    {0} /* end */
 };
 
 /* capture mixer elements */
 static struct snd_kcontrol_new alc260_capture_mixer[] = {
-        HDA_CODEC_VOLUME("Capture Volume", 0x04, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x04, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x05, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x05, 0x0, HDA_INPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                /* The multiple "Capture Source" controls confuse alsamixer
-                 * So call somewhat different..
-                 * FIXME: the controls appear in the "playback" view!
-                 */
-                /* .name = "Capture Source", */
-                .name = "Input Source",
-                .count = 2,
-                .info = alc_mux_enum_info,
-                .get = alc_mux_enum_get,
-                .put = alc_mux_enum_put,
-        },
-        {0} /* end */
+    HDA_CODEC_VOLUME("Capture Volume", 0x04, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("Capture Switch", 0x04, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x05, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x05, 0x0, HDA_INPUT),
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        /* The multiple "Capture Source" controls confuse alsamixer
+         * So call somewhat different..
+         * FIXME: the controls appear in the "playback" view!
+         */
+        /* .name = "Capture Source", */
+        .name = "Input Source",
+        .count = 2,
+        .info = alc_mux_enum_info,
+        .get = alc_mux_enum_get,
+        .put = alc_mux_enum_put,
+    },
+    {0} /* end */
 };
 
 static struct snd_kcontrol_new alc260_capture_alt_mixer[] = {
-        HDA_CODEC_VOLUME("Capture Volume", 0x05, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x05, 0x0, HDA_INPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                /* The multiple "Capture Source" controls confuse alsamixer
-                 * So call somewhat different..
-                 * FIXME: the controls appear in the "playback" view!
-                 */
-                /* .name = "Capture Source", */
-                .name = "Input Source",
-                .count = 1,
-                .info = alc_mux_enum_info,
-                .get = alc_mux_enum_get,
-                .put = alc_mux_enum_put,
-        },
-        {0} /* end */
+    HDA_CODEC_VOLUME("Capture Volume", 0x05, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("Capture Switch", 0x05, 0x0, HDA_INPUT),
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        /* The multiple "Capture Source" controls confuse alsamixer
+         * So call somewhat different..
+         * FIXME: the controls appear in the "playback" view!
+         */
+        /* .name = "Capture Source", */
+        .name = "Input Source",
+        .count = 1,
+        .info = alc_mux_enum_info,
+        .get = alc_mux_enum_get,
+        .put = alc_mux_enum_put,
+    },
+    {0} /* end */
 };
 
@@ -2972 +2991 @@
  */
 static struct hda_verb alc260_init_verbs[] = {
-        /* Line In pin widget for input */
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-        /* CD pin widget for input */
-        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-        /* Mic1 (rear panel) pin widget for input and vref at 80% */
-        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-        /* Mic2 (front panel) pin widget for input and vref at 80% */
-        {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-        /* LINE-2 is used for line-out in rear */
-        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        /* select line-out */
-        {0x0e, AC_VERB_SET_CONNECT_SEL, 0x00},
-        /* LINE-OUT pin */
-        {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        /* enable HP */
-        {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
-        /* enable Mono */
-        {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        /* mute capture amp left and right */
-        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        /* set connection select to line in (default select for this ADC) */
-        {0x04, AC_VERB_SET_CONNECT_SEL, 0x02},
-        /* mute capture amp left and right */
-        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        /* set connection select to line in (default select for this ADC) */
-        {0x05, AC_VERB_SET_CONNECT_SEL, 0x02},
-        /* set vol=0 Line-Out mixer amp left and right */
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        /* unmute pin widget amp left and right (no gain on this amp) */
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        /* set vol=0 HP mixer amp left and right */
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        /* unmute pin widget amp left and right (no gain on this amp) */
-        {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        /* set vol=0 Mono mixer amp left and right */
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        /* unmute pin widget amp left and right (no gain on this amp) */
-        {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        /* unmute LINE-2 out pin */
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        /* Amp Indexes: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 & Line In 2 = 0x03 */
-        /* mute CD */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
-        /* mute Line In */
-        {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        /* mute Mic */
-        {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        /* Amp Indexes: DAC = 0x01 & mixer = 0x00 */
-        /* mute Front out path */
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-        /* mute Headphone out path */
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-        /* mute Mono out path */
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-        {0}
-};
-
+    /* Line In pin widget for input */
+    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+    /* CD pin widget for input */
+    {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+    /* Mic1 (rear panel) pin widget for input and vref at 80% */
+    {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    /* Mic2 (front panel) pin widget for input and vref at 80% */
+    {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    /* LINE-2 is used for line-out in rear */
+    {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    /* select line-out */
+    {0x0e, AC_VERB_SET_CONNECT_SEL, 0x00},
+    /* LINE-OUT pin */
+    {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    /* enable HP */
+    {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+    /* enable Mono */
+    {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    /* mute capture amp left and right */
+    {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    /* set connection select to line in (default select for this ADC) */
+    {0x04, AC_VERB_SET_CONNECT_SEL, 0x02},
+    /* mute capture amp left and right */
+    {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    /* set connection select to line in (default select for this ADC) */
+    {0x05, AC_VERB_SET_CONNECT_SEL, 0x02},
+    /* set vol=0 Line-Out mixer amp left and right */
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    /* unmute pin widget amp left and right (no gain on this amp) */
+    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* set vol=0 HP mixer amp left and right */
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    /* unmute pin widget amp left and right (no gain on this amp) */
+    {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* set vol=0 Mono mixer amp left and right */
+    {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    /* unmute pin widget amp left and right (no gain on this amp) */
+    {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* unmute LINE-2 out pin */
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* Amp Indexes: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 & Line In 2 = 0x03 */
+    /* mute CD */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+    /* mute Line In */
+    {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+    /* mute Mic */
+    {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    /* Amp Indexes: DAC = 0x01 & mixer = 0x00 */
+    /* mute Front out path */
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+    /* mute Headphone out path */
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+    /* mute Mono out path */
+    {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+    {0}
+};
+
+#if 0 /* should be identical with alc260_init_verbs? */
 static struct hda_verb alc260_hp_init_verbs[] = {
-        /* Headphone and output */
-        {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},
-        /* mono output */
-        {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-        /* Mic1 (rear panel) pin widget for input and vref at 80% */
-        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
-        /* Mic2 (front panel) pin widget for input and vref at 80% */
-        {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
-        /* Line In pin widget for input */
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
-        /* Line-2 pin widget for output */
-        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-        /* CD pin widget for input */
-        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
-        /* unmute amp left and right */
-        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-        /* set connection select to line in (default select for this ADC) */
-        {0x04, AC_VERB_SET_CONNECT_SEL, 0x02},
-        /* unmute Line-Out mixer amp left and right (volume = 0) */
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        /* unmute HP mixer amp left and right (volume = 0) */
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x10, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        /* Amp Indexes: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 & Line In 2 = 0x03 */
-        /* unmute CD */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 << 8))},
-        /* unmute Line In */
-        {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8))},
-        /* unmute Mic */
-        {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        /* Amp Indexes: DAC = 0x01 & mixer = 0x00 */
-        /* Unmute Front out path */
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-        /* Unmute Headphone out path */
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-        /* Unmute Mono out path */
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-        {0}
-};
+    /* Headphone and output */
+    {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},
+    /* mono output */
+    {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+    /* Mic1 (rear panel) pin widget for input and vref at 80% */
+    {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
+    /* Mic2 (front panel) pin widget for input and vref at 80% */
+    {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
+    /* Line In pin widget for input */
+    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
+    /* Line-2 pin widget for output */
+    {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+    /* CD pin widget for input */
+    {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
+    /* unmute amp left and right */
+    {0x04, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
+    /* set connection select to line in (default select for this ADC) */
+    {0x04, AC_VERB_SET_CONNECT_SEL, 0x02},
+    /* unmute Line-Out mixer amp left and right (volume = 0) */
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
+    /* mute pin widget amp left and right (no gain on this amp) */
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
+    /* unmute HP mixer amp left and right (volume = 0) */
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
+    /* mute pin widget amp left and right (no gain on this amp) */
+    {0x10, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
+    /* Amp Indexes: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 & Line In 2 = 0x03 */
+    /* unmute CD */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 << 8))},
+    /* unmute Line In */
+    {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8))},
+    /* unmute Mic */
+    {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+    /* Amp Indexes: DAC = 0x01 & mixer = 0x00 */
+    /* Unmute Front out path */
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
+    /* Unmute Headphone out path */
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
+    /* Unmute Mono out path */
+    {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+    {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
+    {0}
+};
+#endif
 
 static struct hda_verb alc260_hp_3013_init_verbs[] = {
-        /* Line out and output */
-        {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-        /* mono output */
-        {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-        /* Mic1 (rear panel) pin widget for input and vref at 80% */
-        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
-        /* Mic2 (front panel) pin widget for input and vref at 80% */
-        {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
-        /* Line In pin widget for input */
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
-        /* Headphone pin widget for output */
-        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},
-        /* CD pin widget for input */
-        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
-        /* unmute amp left and right */
-        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-        /* set connection select to line in (default select for this ADC) */
-        {0x04, AC_VERB_SET_CONNECT_SEL, 0x02},
-        /* unmute Line-Out mixer amp left and right (volume = 0) */
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        /* unmute HP mixer amp left and right (volume = 0) */
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x10, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        /* Amp Indexes: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 & Line In 2 = 0x03 */
-        /* unmute CD */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 << 8))},
-        /* unmute Line In */
-        {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8))},
-        /* unmute Mic */
-        {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        /* Amp Indexes: DAC = 0x01 & mixer = 0x00 */
-        /* Unmute Front out path */
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-        /* Unmute Headphone out path */
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-        /* Unmute Mono out path */
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-        {0}
+    /* Line out and output */
+    {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+    /* mono output */
+    {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+    /* Mic1 (rear panel) pin widget for input and vref at 80% */
+    {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
+    /* Mic2 (front panel) pin widget for input and vref at 80% */
+    {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
+    /* Line In pin widget for input */
+    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
+    /* Headphone pin widget for output */
+    {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},
+    /* CD pin widget for input */
+    {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
+    /* unmute amp left and right */
+    {0x04, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
+    /* set connection select to line in (default select for this ADC) */
+    {0x04, AC_VERB_SET_CONNECT_SEL, 0x02},
+    /* unmute Line-Out mixer amp left and right (volume = 0) */
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
+    /* mute pin widget amp left and right (no gain on this amp) */
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
+    /* unmute HP mixer amp left and right (volume = 0) */
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
+    /* mute pin widget amp left and right (no gain on this amp) */
+    {0x10, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
+    /* Amp Indexes: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 & Line In 2 = 0x03 */
+    /* unmute CD */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 << 8))},
+    /* unmute Line In */
+    {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8))},
+    /* unmute Mic */
+    {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+    /* Amp Indexes: DAC = 0x01 & mixer = 0x00 */
+    /* Unmute Front out path */
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
+    /* Unmute Headphone out path */
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
+    /* Unmute Mono out path */
+    {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+    {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
+    {0}
 };
 
@@ -3130 +3151 @@
  */
 static struct hda_verb alc260_fujitsu_init_verbs[] = {
-        /* Disable all GPIOs */
-        {0x01, AC_VERB_SET_GPIO_MASK, 0},
-        /* Internal speaker is connected to headphone pin */
-        {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
-        /* Headphone/Line-out jack connects to Line1 pin; make it an output */
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        /* Mic/Line-in jack is connected to mic1 pin, so make it an input */
-        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-        /* Ensure all other unused pins are disabled and muted. */
-        {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
-        {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
-        {0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-
-        /* Disable digital (SPDIF) pins */
-        {0x03, AC_VERB_SET_DIGI_CONVERT_1, 0},
-        {0x06, AC_VERB_SET_DIGI_CONVERT_1, 0},
-
-        /* Ensure Line1 pin widget takes its input from the OUT1 sum bus
-         * when acting as an output.
-         */
-        {0x0d, AC_VERB_SET_CONNECT_SEL, 0},
-
-        /* Start with output sum widgets muted and their output gains at min */
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-
-        /* Unmute HP pin widget amp left and right (no equiv mixer ctrl) */
-        {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        /* Unmute Line1 pin widget output buffer since it starts as an output.
-         * If the pin mode is changed by the user the pin mode control will
-         * take care of enabling the pin's input/output buffers as needed.
-         * Therefore there's no need to enable the input buffer at this
-         * stage.
-         */
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        /* Unmute input buffer of pin widget used for Line-in (no equiv
-         * mixer ctrl)
-         */
-        {0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-
-        /* Mute capture amp left and right */
-        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        /* Set ADC connection select to match default mixer setting - line
-         * in (on mic1 pin)
-         */
-        {0x04, AC_VERB_SET_CONNECT_SEL, 0x00},
-
-        /* Do the same for the second ADC: mute capture input amp and
-         * set ADC connection to line in (on mic1 pin)
-         */
-        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x05, AC_VERB_SET_CONNECT_SEL, 0x00},
-
-        /* Mute all inputs to mixer widget (even unconnected ones) */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* mic1 pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, /* mic2 pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, /* line1 pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, /* line2 pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, /* CD pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, /* Beep-gen pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)}, /* Line-out pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)}, /* HP-pin pin */
-
-        {0}
+    /* Disable all GPIOs */
+    {0x01, AC_VERB_SET_GPIO_MASK, 0},
+    /* Internal speaker is connected to headphone pin */
+    {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+    /* Headphone/Line-out jack connects to Line1 pin; make it an output */
+    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    /* Mic/Line-in jack is connected to mic1 pin, so make it an input */
+    {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+    /* Ensure all other unused pins are disabled and muted. */
+    {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+    {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+    {0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+
+    /* Disable digital (SPDIF) pins */
+    {0x03, AC_VERB_SET_DIGI_CONVERT_1, 0},
+    {0x06, AC_VERB_SET_DIGI_CONVERT_1, 0},
+
+    /* Ensure Line1 pin widget takes its input from the OUT1 sum bus
+     * when acting as an output.
+     */
+    {0x0d, AC_VERB_SET_CONNECT_SEL, 0},
+
+    /* Start with output sum widgets muted and their output gains at min */
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+    {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+
+    /* Unmute HP pin widget amp left and right (no equiv mixer ctrl) */
+    {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* Unmute Line1 pin widget output buffer since it starts as an output.
+     * If the pin mode is changed by the user the pin mode control will
+     * take care of enabling the pin's input/output buffers as needed.
+     * Therefore there's no need to enable the input buffer at this
+     * stage.
+     */
+    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* Unmute input buffer of pin widget used for Line-in (no equiv
+     * mixer ctrl)
+     */
+    {0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+
+    /* Mute capture amp left and right */
+    {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    /* Set ADC connection select to match default mixer setting - line
+     * in (on mic1 pin)
+     */
+    {0x04, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+    /* Do the same for the second ADC: mute capture input amp and
+     * set ADC connection to line in (on mic1 pin)
+     */
+    {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x05, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+    /* Mute all inputs to mixer widget (even unconnected ones) */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* mic1 pin */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, /* mic2 pin */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, /* line1 pin */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, /* line2 pin */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, /* CD pin */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, /* Beep-gen pin */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)}, /* Line-out pin */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)}, /* HP-pin pin */
+
+    {0}
 };
 
@@ -3212 +3233 @@
  */
 static struct hda_verb alc260_acer_init_verbs[] = {
-        /* On TravelMate laptops, GPIO 0 enables the internal speaker and
-         * the headphone jack.  Turn this on and rely on the standard mute
-         * methods whenever the user wants to turn these outputs off.
-         */
-        {0x01, AC_VERB_SET_GPIO_MASK, 0x01},
-        {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x01},
-        {0x01, AC_VERB_SET_GPIO_DATA, 0x01},
-        /* Internal speaker/Headphone jack is connected to Line-out pin */
-        {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
-        /* Internal microphone/Mic jack is connected to Mic1 pin */
-        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50},
-        /* Line In jack is connected to Line1 pin */
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-        /* Ensure all other unused pins are disabled and muted. */
-        {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
-        {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
-        {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
-        {0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        /* Disable digital (SPDIF) pins */
-        {0x03, AC_VERB_SET_DIGI_CONVERT_1, 0},
-        {0x06, AC_VERB_SET_DIGI_CONVERT_1, 0},
-
-        /* Ensure Mic1 and Line1 pin widgets take input from the OUT1 sum
-         * bus when acting as outputs.
-         */
-        {0x0b, AC_VERB_SET_CONNECT_SEL, 0},
-        {0x0d, AC_VERB_SET_CONNECT_SEL, 0},
-
-        /* Start with output sum widgets muted and their output gains at min */
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-
-        /* Unmute Line-out pin widget amp left and right (no equiv mixer ctrl) */
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        /* Unmute Mic1 and Line1 pin widget input buffers since they start as
-         * inputs. If the pin mode is changed by the user the pin mode control
-         * will take care of enabling the pin's input/output buffers as needed.
-         * Therefore there's no need to enable the input buffer at this
-         * stage.
-         */
-        {0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-
-        /* Mute capture amp left and right */
-        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        /* Set ADC connection select to match default mixer setting - mic
-         * (on mic1 pin)
-         */
-        {0x04, AC_VERB_SET_CONNECT_SEL, 0x00},
-
-        /* Do similar with the second ADC: mute capture input amp and
-         * set ADC connection to line (on line1 pin)
-         */
-        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x05, AC_VERB_SET_CONNECT_SEL, 0x02},
-
-        /* Mute all inputs to mixer widget (even unconnected ones) */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* mic1 pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, /* mic2 pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, /* line1 pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, /* line2 pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, /* CD pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, /* Beep-gen pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)}, /* Line-out pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)}, /* HP-pin pin */
-
-        {0}
+    /* On TravelMate laptops, GPIO 0 enables the internal speaker and
+     * the headphone jack.  Turn this on and rely on the standard mute
+     * methods whenever the user wants to turn these outputs off.
+     */
+    {0x01, AC_VERB_SET_GPIO_MASK, 0x01},
+    {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x01},
+    {0x01, AC_VERB_SET_GPIO_DATA, 0x01},
+    /* Internal speaker/Headphone jack is connected to Line-out pin */
+    {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+    /* Internal microphone/Mic jack is connected to Mic1 pin */
+    {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50},
+    /* Line In jack is connected to Line1 pin */
+    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+    /* Ensure all other unused pins are disabled and muted. */
+    {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+    {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+    {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+    {0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    /* Disable digital (SPDIF) pins */
+    {0x03, AC_VERB_SET_DIGI_CONVERT_1, 0},
+    {0x06, AC_VERB_SET_DIGI_CONVERT_1, 0},
+
+    /* Ensure Mic1 and Line1 pin widgets take input from the OUT1 sum
+     * bus when acting as outputs.
+     */
+    {0x0b, AC_VERB_SET_CONNECT_SEL, 0},
+    {0x0d, AC_VERB_SET_CONNECT_SEL, 0},
+
+    /* Start with output sum widgets muted and their output gains at min */
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+    {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+
+    /* Unmute Line-out pin widget amp left and right (no equiv mixer ctrl) */
+    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* Unmute Mic1 and Line1 pin widget input buffers since they start as
+     * inputs. If the pin mode is changed by the user the pin mode control
+     * will take care of enabling the pin's input/output buffers as needed.
+     * Therefore there's no need to enable the input buffer at this
+     * stage.
+     */
+    {0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+
+    /* Mute capture amp left and right */
+    {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    /* Set ADC connection select to match default mixer setting - mic
+     * (on mic1 pin)
+     */
+    {0x04, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+    /* Do similar with the second ADC: mute capture input amp and
+     * set ADC connection to line (on line1 pin)
+     */
+    {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x05, AC_VERB_SET_CONNECT_SEL, 0x02},
+
+    /* Mute all inputs to mixer widget (even unconnected ones) */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* mic1 pin */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, /* mic2 pin */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, /* line1 pin */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, /* line2 pin */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, /* CD pin */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, /* Beep-gen pin */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)}, /* Line-out pin */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)}, /* HP-pin pin */
+
+    {0}
 };
 
@@ -3297 +3318 @@
 #ifdef CONFIG_SND_DEBUG
 static hda_nid_t alc260_test_dac_nids[1] = {
-        0x02,
+    0x02,
 };
 static hda_nid_t alc260_test_adc_nids[2] = {
-        0x04, 0x05,
+    0x04, 0x05,
 };
 /* This is a bit messy since the two input muxes in the ALC260 have slight
@@ -3312 +3333 @@
  */
 static struct hda_input_mux alc260_test_capture_source = {
-        .num_items = 8,
-        .items = {
-                { "MIC1 pin", 0x0 },
-                { "MIC2 pin", 0x1 },
-                { "LINE1 pin", 0x2 },
-                { "LINE2 pin", 0x3 },
-                { "CD pin", 0x4 },
-                { "LINE-OUT pin (cap1), Mixer (cap2)", 0x5 },
-                { "HP-OUT pin (cap1), LINE-OUT pin (cap2)", 0x6 },
-                { "HP-OUT pin (cap2 only)", 0x7 },
-        },
+    .num_items = 8,
+    .items = {
+        { "MIC1 pin", 0x0 },
+        { "MIC2 pin", 0x1 },
+        { "LINE1 pin", 0x2 },
+        { "LINE2 pin", 0x3 },
+        { "CD pin", 0x4 },
+        { "LINE-OUT pin (cap1), Mixer (cap2)", 0x5 },
+        { "HP-OUT pin (cap1), LINE-OUT pin (cap2)", 0x6 },
+        { "HP-OUT pin (cap2 only)", 0x7 },
+    },
 };
 static struct snd_kcontrol_new alc260_test_mixer[] = {
-        /* Output driver widgets */
-        HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),
-        HDA_BIND_MUTE_MONO("Mono Playback Switch", 0x0a, 1, 2, HDA_INPUT),
-        HDA_CODEC_VOLUME("LOUT2 Playback Volume", 0x09, 0x0, HDA_OUTPUT),
-        HDA_BIND_MUTE("LOUT2 Playback Switch", 0x09, 2, HDA_INPUT),
-        HDA_CODEC_VOLUME("LOUT1 Playback Volume", 0x08, 0x0, HDA_OUTPUT),
-        HDA_BIND_MUTE("LOUT1 Playback Switch", 0x08, 2, HDA_INPUT),
-
-        /* Modes for retasking pin widgets */
-        ALC_PIN_MODE("HP-OUT pin mode", 0x10, ALC_PIN_DIR_INOUT),
-        ALC_PIN_MODE("LINE-OUT pin mode", 0x0f, ALC_PIN_DIR_INOUT),
-        ALC_PIN_MODE("LINE2 pin mode", 0x15, ALC_PIN_DIR_INOUT),
-        ALC_PIN_MODE("LINE1 pin mode", 0x14, ALC_PIN_DIR_INOUT),
-        ALC_PIN_MODE("MIC2 pin mode", 0x13, ALC_PIN_DIR_INOUT),
-        ALC_PIN_MODE("MIC1 pin mode", 0x12, ALC_PIN_DIR_INOUT),
-
-        /* Loopback mixer controls */
-        HDA_CODEC_VOLUME("MIC1 Playback Volume", 0x07, 0x00, HDA_INPUT),
-        HDA_CODEC_MUTE("MIC1 Playback Switch", 0x07, 0x00, HDA_INPUT),
-        HDA_CODEC_VOLUME("MIC2 Playback Volume", 0x07, 0x01, HDA_INPUT),
-        HDA_CODEC_MUTE("MIC2 Playback Switch", 0x07, 0x01, HDA_INPUT),
-        HDA_CODEC_VOLUME("LINE1 Playback Volume", 0x07, 0x02, HDA_INPUT),
-        HDA_CODEC_MUTE("LINE1 Playback Switch", 0x07, 0x02, HDA_INPUT),
-        HDA_CODEC_VOLUME("LINE2 Playback Volume", 0x07, 0x03, HDA_INPUT),
-        HDA_CODEC_MUTE("LINE2 Playback Switch", 0x07, 0x03, HDA_INPUT),
-        HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),
-        HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),
-        HDA_CODEC_VOLUME("Beep Playback Volume", 0x07, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("Beep Playback Switch", 0x07, 0x05, HDA_INPUT),
-        HDA_CODEC_VOLUME("LINE-OUT loopback Playback Volume", 0x07, 0x06, HDA_INPUT),
-        HDA_CODEC_MUTE("LINE-OUT loopback Playback Switch", 0x07, 0x06, HDA_INPUT),
-        HDA_CODEC_VOLUME("HP-OUT loopback Playback Volume", 0x07, 0x7, HDA_INPUT),
-        HDA_CODEC_MUTE("HP-OUT loopback Playback Switch", 0x07, 0x7, HDA_INPUT),
-
-        /* Controls for GPIO pins, assuming they are configured as outputs */
-        ALC_GPIO_DATA_SWITCH("GPIO pin 0", 0x01, 0x01),
-        ALC_GPIO_DATA_SWITCH("GPIO pin 1", 0x01, 0x02),
-        ALC_GPIO_DATA_SWITCH("GPIO pin 2", 0x01, 0x04),
-        ALC_GPIO_DATA_SWITCH("GPIO pin 3", 0x01, 0x08),
-
-        /* Switches to allow the digital IO pins to be enabled.  The datasheet
-         * is ambigious as to which NID is which; testing on laptops which
-         * make this output available should provide clarification.
-         */
-        ALC_SPDIF_CTRL_SWITCH("SPDIF Playback Switch", 0x03, 0x01),
-        ALC_SPDIF_CTRL_SWITCH("SPDIF Capture Switch", 0x06, 0x01),
-
-        {0} /* end */
+    /* Output driver widgets */
+    HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),
+    HDA_BIND_MUTE_MONO("Mono Playback Switch", 0x0a, 1, 2, HDA_INPUT),
+    HDA_CODEC_VOLUME("LOUT2 Playback Volume", 0x09, 0x0, HDA_OUTPUT),
+    HDA_BIND_MUTE("LOUT2 Playback Switch", 0x09, 2, HDA_INPUT),
+    HDA_CODEC_VOLUME("LOUT1 Playback Volume", 0x08, 0x0, HDA_OUTPUT),
+    HDA_BIND_MUTE("LOUT1 Playback Switch", 0x08, 2, HDA_INPUT),
+
+    /* Modes for retasking pin widgets */
+    ALC_PIN_MODE("HP-OUT pin mode", 0x10, ALC_PIN_DIR_INOUT),
+    ALC_PIN_MODE("LINE-OUT pin mode", 0x0f, ALC_PIN_DIR_INOUT),
+    ALC_PIN_MODE("LINE2 pin mode", 0x15, ALC_PIN_DIR_INOUT),
+    ALC_PIN_MODE("LINE1 pin mode", 0x14, ALC_PIN_DIR_INOUT),
+    ALC_PIN_MODE("MIC2 pin mode", 0x13, ALC_PIN_DIR_INOUT),
+    ALC_PIN_MODE("MIC1 pin mode", 0x12, ALC_PIN_DIR_INOUT),
+
+    /* Loopback mixer controls */
+    HDA_CODEC_VOLUME("MIC1 Playback Volume", 0x07, 0x00, HDA_INPUT),
+    HDA_CODEC_MUTE("MIC1 Playback Switch", 0x07, 0x00, HDA_INPUT),
+    HDA_CODEC_VOLUME("MIC2 Playback Volume", 0x07, 0x01, HDA_INPUT),
+    HDA_CODEC_MUTE("MIC2 Playback Switch", 0x07, 0x01, HDA_INPUT),
+    HDA_CODEC_VOLUME("LINE1 Playback Volume", 0x07, 0x02, HDA_INPUT),
+    HDA_CODEC_MUTE("LINE1 Playback Switch", 0x07, 0x02, HDA_INPUT),
+    HDA_CODEC_VOLUME("LINE2 Playback Volume", 0x07, 0x03, HDA_INPUT),
+    HDA_CODEC_MUTE("LINE2 Playback Switch", 0x07, 0x03, HDA_INPUT),
+    HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),
+    HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),
+    HDA_CODEC_VOLUME("Beep Playback Volume", 0x07, 0x05, HDA_INPUT),
+    HDA_CODEC_MUTE("Beep Playback Switch", 0x07, 0x05, HDA_INPUT),
+    HDA_CODEC_VOLUME("LINE-OUT loopback Playback Volume", 0x07, 0x06, HDA_INPUT),
+    HDA_CODEC_MUTE("LINE-OUT loopback Playback Switch", 0x07, 0x06, HDA_INPUT),
+    HDA_CODEC_VOLUME("HP-OUT loopback Playback Volume", 0x07, 0x7, HDA_INPUT),
+    HDA_CODEC_MUTE("HP-OUT loopback Playback Switch", 0x07, 0x7, HDA_INPUT),
+
+    /* Controls for GPIO pins, assuming they are configured as outputs */
+    ALC_GPIO_DATA_SWITCH("GPIO pin 0", 0x01, 0x01),
+    ALC_GPIO_DATA_SWITCH("GPIO pin 1", 0x01, 0x02),
+    ALC_GPIO_DATA_SWITCH("GPIO pin 2", 0x01, 0x04),
+    ALC_GPIO_DATA_SWITCH("GPIO pin 3", 0x01, 0x08),
+
+    /* Switches to allow the digital IO pins to be enabled.  The datasheet
+     * is ambigious as to which NID is which; testing on laptops which
+     * make this output available should provide clarification.
+     */
+    ALC_SPDIF_CTRL_SWITCH("SPDIF Playback Switch", 0x03, 0x01),
+    ALC_SPDIF_CTRL_SWITCH("SPDIF Capture Switch", 0x06, 0x01),
+
+    {0} /* end */
 };
 static struct hda_verb alc260_test_init_verbs[] = {
-        /* Enable all GPIOs as outputs with an initial value of 0 */
-        {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x0f},
-        {0x01, AC_VERB_SET_GPIO_DATA, 0x00},
-        {0x01, AC_VERB_SET_GPIO_MASK, 0x0f},
-
-        /* Enable retasking pins as output, initially without power amp */
-        {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-
-        /* Disable digital (SPDIF) pins initially, but users can enable
-         * them via a mixer switch.  In the case of SPDIF-out, this initverb
-         * payload also sets the generation to 0, output to be in "consumer"
-         * PCM format, copyright asserted, no pre-emphasis and no validity
-         * control.
-         */
-        {0x03, AC_VERB_SET_DIGI_CONVERT_1, 0},
-        {0x06, AC_VERB_SET_DIGI_CONVERT_1, 0},
-
-        /* Ensure mic1, mic2, line1 and line2 pin widgets take input from the
-         * OUT1 sum bus when acting as an output.
-         */
-        {0x0b, AC_VERB_SET_CONNECT_SEL, 0},
-        {0x0c, AC_VERB_SET_CONNECT_SEL, 0},
-        {0x0d, AC_VERB_SET_CONNECT_SEL, 0},
-        {0x0e, AC_VERB_SET_CONNECT_SEL, 0},
-
-        /* Start with output sum widgets muted and their output gains at min */
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-
-        /* Unmute retasking pin widget output buffers since the default
-         * state appears to be output.  As the pin mode is changed by the
-         * user the pin mode control will take care of enabling the pin's
-         * input/output buffers as needed.
-         */
-        {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        /* Also unmute the mono-out pin widget */
-        {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-
-        /* Mute capture amp left and right */
-        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        /* Set ADC connection select to match default mixer setting (mic1
-         * pin)
-         */
-        {0x04, AC_VERB_SET_CONNECT_SEL, 0x00},
-
-        /* Do the same for the second ADC: mute capture input amp and
-         * set ADC connection to mic1 pin
-         */
-        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x05, AC_VERB_SET_CONNECT_SEL, 0x00},
-
-        /* Mute all inputs to mixer widget (even unconnected ones) */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* mic1 pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, /* mic2 pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, /* line1 pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, /* line2 pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, /* CD pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, /* Beep-gen pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)}, /* Line-out pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)}, /* HP-pin pin */
-
-        {0}
+    /* Enable all GPIOs as outputs with an initial value of 0 */
+    {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x0f},
+    {0x01, AC_VERB_SET_GPIO_DATA, 0x00},
+    {0x01, AC_VERB_SET_GPIO_MASK, 0x0f},
+
+    /* Enable retasking pins as output, initially without power amp */
+    {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+
+    /* Disable digital (SPDIF) pins initially, but users can enable
+     * them via a mixer switch.  In the case of SPDIF-out, this initverb
+     * payload also sets the generation to 0, output to be in "consumer"
+     * PCM format, copyright asserted, no pre-emphasis and no validity
+     * control.
+     */
+    {0x03, AC_VERB_SET_DIGI_CONVERT_1, 0},
+    {0x06, AC_VERB_SET_DIGI_CONVERT_1, 0},
+
+    /* Ensure mic1, mic2, line1 and line2 pin widgets take input from the
+     * OUT1 sum bus when acting as an output.
+     */
+    {0x0b, AC_VERB_SET_CONNECT_SEL, 0},
+    {0x0c, AC_VERB_SET_CONNECT_SEL, 0},
+    {0x0d, AC_VERB_SET_CONNECT_SEL, 0},
+    {0x0e, AC_VERB_SET_CONNECT_SEL, 0},
+
+    /* Start with output sum widgets muted and their output gains at min */
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+    {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+
+    /* Unmute retasking pin widget output buffers since the default
+     * state appears to be output.  As the pin mode is changed by the
+     * user the pin mode control will take care of enabling the pin's
+     * input/output buffers as needed.
+     */
+    {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* Also unmute the mono-out pin widget */
+    {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+
+    /* Mute capture amp left and right */
+    {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    /* Set ADC connection select to match default mixer setting (mic1
+     * pin)
+     */
+    {0x04, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+    /* Do the same for the second ADC: mute capture input amp and
+     * set ADC connection to mic1 pin
+     */
+    {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x05, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+    /* Mute all inputs to mixer widget (even unconnected ones) */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* mic1 pin */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, /* mic2 pin */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, /* line1 pin */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, /* line2 pin */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, /* CD pin */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, /* Beep-gen pin */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)}, /* Line-out pin */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)}, /* HP-pin pin */
+
+    {0}
 };
 #endif
 
 static struct hda_pcm_stream alc260_pcm_analog_playback = {
-        .substreams = 1,
-        .channels_min = 2,
-        .channels_max = 2,
+    .substreams = 1,
+    .channels_min = 2,
+    .channels_max = 2,
 };
 
 static struct hda_pcm_stream alc260_pcm_analog_capture = {
-        .substreams = 1,
-        .channels_min = 2,
-        .channels_max = 2,
+    .substreams = 1,
+    .channels_min = 2,
+    .channels_max = 2,
 };
 
@@ -3477 +3498 @@
 
 static int alc260_add_playback_controls(struct alc_spec *spec, hda_nid_t nid,
-                                        const char *pfx)
-{
-        hda_nid_t nid_vol;
-        unsigned long vol_val, sw_val;
-        char name[32];
-        int err;
-
-        if (nid >= 0x0f && nid < 0x11) {
-                nid_vol = nid - 0x7;
-                vol_val = HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0, HDA_OUTPUT);
-                sw_val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT);
-        } else if (nid == 0x11) {
-                nid_vol = nid - 0x7;
-                vol_val = HDA_COMPOSE_AMP_VAL(nid_vol, 2, 0, HDA_OUTPUT);
-                sw_val = HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT);
-        } else if (nid >= 0x12 && nid <= 0x15) {
-                nid_vol = 0x08;
-                vol_val = HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0, HDA_OUTPUT);
-                sw_val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT);
-        } else
-                return 0; /* N/A */
-
-        sprintf(name, /*sizeof(name), */"%s Playback Volume", pfx);
-        if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, name, vol_val)) < 0)
-                return err;
-        sprintf(name, /*sizeof(name), */"%s Playback Switch", pfx);
-        if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, name, sw_val)) < 0)
-                return err;
-        return 1;
+                                        const char *pfx)
+{
+    hda_nid_t nid_vol;
+    unsigned long vol_val, sw_val;
+    char name[32];
+    int err;
+
+    if (nid >= 0x0f && nid < 0x11) {
+        nid_vol = nid - 0x7;
+        vol_val = HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0, HDA_OUTPUT);
+        sw_val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT);
+    } else if (nid == 0x11) {
+        nid_vol = nid - 0x7;
+        vol_val = HDA_COMPOSE_AMP_VAL(nid_vol, 2, 0, HDA_OUTPUT);
+        sw_val = HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT);
+    } else if (nid >= 0x12 && nid <= 0x15) {
+        nid_vol = 0x08;
+        vol_val = HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0, HDA_OUTPUT);
+        sw_val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT);
+    } else
+        return 0; /* N/A */
+
+    sprintf(name, /*sizeof(name), */"%s Playback Volume", pfx);
+    if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, name, vol_val)) < 0)
+        return err;
+    sprintf(name, /*sizeof(name), */"%s Playback Switch", pfx);
+    if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, name, sw_val)) < 0)
+        return err;
+    return 1;
 }
 
 /* add playback controls from the parsed DAC table */
 static int alc260_auto_create_multi_out_ctls(struct alc_spec *spec,
-                                             const struct auto_pin_cfg *cfg)
-{
-        hda_nid_t nid;
-        int err;
-
-        spec->multiout.num_dacs = 1;
-        spec->multiout.dac_nids = spec->private_dac_nids;
-        spec->multiout.dac_nids[0] = 0x02;
-
-        nid = cfg->line_out_pins[0];
-        if (nid) {
-                err = alc260_add_playback_controls(spec, nid, "Front");
-                if (err < 0)
-                        return err;
-        }
-
-        nid = cfg->speaker_pins[0];
-        if (nid) {
-                err = alc260_add_playback_controls(spec, nid, "Speaker");
-                if (err < 0)
-                        return err;
-        }
-
-        nid = cfg->hp_pin;
-        if (nid) {
-                err = alc260_add_playback_controls(spec, nid, "Headphone");
-                if (err < 0)
-                        return err;
-        }
-        return 0;
+                                             const struct auto_pin_cfg *cfg)
+{
+    hda_nid_t nid;
+    int err;
+
+    spec->multiout.num_dacs = 1;
+    spec->multiout.dac_nids = spec->private_dac_nids;
+    spec->multiout.dac_nids[0] = 0x02;
+
+    nid = cfg->line_out_pins[0];
+    if (nid) {
+        err = alc260_add_playback_controls(spec, nid, "Front");
+        if (err < 0)
+            return err;
+    }
+
+    nid = cfg->speaker_pins[0];
+    if (nid) {
+        err = alc260_add_playback_controls(spec, nid, "Speaker");
+        if (err < 0)
+            return err;
+    }
+
+    nid = cfg->hp_pin;
+    if (nid) {
+        err = alc260_add_playback_controls(spec, nid, "Headphone");
+        if (err < 0)
+            return err;
+    }
+    return 0;
 }
 
 /* create playback/capture controls for input pins */
 static int alc260_auto_create_analog_input_ctls(struct alc_spec *spec,
-                                                const struct auto_pin_cfg *cfg)
-{
-        struct hda_input_mux *imux = &spec->private_imux;
-        int i, err, idx;
-
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                if (cfg->input_pins[i] >= 0x12) {
-                        idx = cfg->input_pins[i] - 0x12;
-                        err = new_analog_input(spec, cfg->input_pins[i],
-                                               auto_pin_cfg_labels[i], idx, 0x07);
-                        if (err < 0)
-                                return err;
-                        imux->items[imux->num_items].label = auto_pin_cfg_labels[i];
-                        imux->items[imux->num_items].index = idx;
-                        imux->num_items++;
-                }
-                if ((cfg->input_pins[i] >= 0x0f) && (cfg->input_pins[i] <= 0x10)){
-                        idx = cfg->input_pins[i] - 0x09;
-                        err = new_analog_input(spec, cfg->input_pins[i],
-                                               auto_pin_cfg_labels[i], idx, 0x07);
-                        if (err < 0)
-                                return err;
-                        imux->items[imux->num_items].label = auto_pin_cfg_labels[i];
-                        imux->items[imux->num_items].index = idx;
-                        imux->num_items++;
-                }
-        }
-        return 0;
+                                                const struct auto_pin_cfg *cfg)
+{
+    struct hda_input_mux *imux = &spec->private_imux;
+    int i, err, idx;
+
+    for (i = 0; i < AUTO_PIN_LAST; i++) {
+        if (cfg->input_pins[i] >= 0x12) {
+            idx = cfg->input_pins[i] - 0x12;
+            err = new_analog_input(spec, cfg->input_pins[i],
+                                   auto_pin_cfg_labels[i], idx, 0x07);
+            if (err < 0)
+                return err;
+            imux->items[imux->num_items].label = auto_pin_cfg_labels[i];
+            imux->items[imux->num_items].index = idx;
+            imux->num_items++;
+        }
+        if ((cfg->input_pins[i] >= 0x0f) && (cfg->input_pins[i] <= 0x10)){
+            idx = cfg->input_pins[i] - 0x09;
+            err = new_analog_input(spec, cfg->input_pins[i],
+                                   auto_pin_cfg_labels[i], idx, 0x07);
+            if (err < 0)
+                return err;
+            imux->items[imux->num_items].label = auto_pin_cfg_labels[i];
+            imux->items[imux->num_items].index = idx;
+            imux->num_items++;
+        }
+    }
+    return 0;
 }
 
 static void alc260_auto_set_output_and_unmute(struct hda_codec *codec,
-                                              hda_nid_t nid, int pin_type,
-                                              int sel_idx)
-{
-        /* set as output */
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, pin_type);
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
-        /* need the manual connection? */
-        if (nid >= 0x12) {
-                int idx = nid - 0x12;
-                snd_hda_codec_write(codec, idx + 0x0b, 0,
-                                    AC_VERB_SET_CONNECT_SEL, sel_idx);
-
-        }
+                                              hda_nid_t nid, int pin_type,
+                                              int sel_idx)
+{
+    /* set as output */
+    snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, pin_type);
+    snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
+    /* need the manual connection? */
+    if (nid >= 0x12) {
+        int idx = nid - 0x12;
+        snd_hda_codec_write(codec, idx + 0x0b, 0,
+                            AC_VERB_SET_CONNECT_SEL, sel_idx);
+
+    }
 }
 
 static void alc260_auto_init_multi_out(struct hda_codec *codec)
 {
-        struct alc_spec *spec = codec->spec;
-        hda_nid_t nid;
-
-        nid = spec->autocfg.line_out_pins[0];
-        if (nid)
-                alc260_auto_set_output_and_unmute(codec, nid, PIN_OUT, 0);
-
-        nid = spec->autocfg.speaker_pins[0];
-        if (nid)
-                alc260_auto_set_output_and_unmute(codec, nid, PIN_OUT, 0);
-
-        nid = spec->autocfg.hp_pin;
-        if (nid)
-                alc260_auto_set_output_and_unmute(codec, nid, PIN_OUT, 0);
+    struct alc_spec *spec = codec->spec;
+    hda_nid_t nid;
+
+    nid = spec->autocfg.line_out_pins[0];
+    if (nid)
+        alc260_auto_set_output_and_unmute(codec, nid, PIN_OUT, 0);
+
+    nid = spec->autocfg.speaker_pins[0];
+    if (nid)
+        alc260_auto_set_output_and_unmute(codec, nid, PIN_OUT, 0);
+
+    nid = spec->autocfg.hp_pin;
+    if (nid)
+        alc260_auto_set_output_and_unmute(codec, nid, PIN_OUT, 0);
 }
 
@@ -3611 +3632 @@
 static void alc260_auto_init_analog_input(struct hda_codec *codec)
 {
-        struct alc_spec *spec = codec->spec;
-        int i;
-
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                hda_nid_t nid = spec->autocfg.input_pins[i];
-                if (nid >= 0x12) {
-                        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                            i <= AUTO_PIN_FRONT_MIC ? PIN_VREF80 : PIN_IN);
-                        if (nid != ALC260_PIN_CD_NID)
-                                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
-                                                    AMP_OUT_MUTE);
-                }
-        }
+    struct alc_spec *spec = codec->spec;
+    int i;
+
+    for (i = 0; i < AUTO_PIN_LAST; i++) {
+        hda_nid_t nid = spec->autocfg.input_pins[i];
+        if (nid >= 0x12) {
+            snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                i <= AUTO_PIN_FRONT_MIC ? PIN_VREF80 : PIN_IN);
+            if (nid != ALC260_PIN_CD_NID)
+                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                                    AMP_OUT_MUTE);
+        }
+    }
 }
 
@@ -3630 +3651 @@
  */
 static struct hda_verb alc260_volume_init_verbs[] = {
-        /*
-         * Unmute ADC0-1 and set the default input to mic-in
-         */
-        {0x04, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x05, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-
-        /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
-         * mixer widget
-         * Note: PASD motherboards uses the Line In 2 as the input for front panel
-         * mic (mic 2)
-         */
-        /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
-
-        /*
-         * Set up output mixers (0x08 - 0x0a)
-         */
-        /* set vol=0 to output mixers */
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        /* set up input amps for analog loopback */
-        /* Amp Indices: DAC = 0, mixer = 1 */
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-
-        {0}
+    /*
+     * Unmute ADC0-1 and set the default input to mic-in
+     */
+    {0x04, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x05, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+
+    /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
+     * mixer widget
+     * Note: PASD motherboards uses the Line In 2 as the input for front panel
+     * mic (mic 2)
+     */
+    /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+
+    /*
+     * Set up output mixers (0x08 - 0x0a)
+     */
+    /* set vol=0 to output mixers */
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    /* set up input amps for analog loopback */
+    /* Amp Indices: DAC = 0, mixer = 1 */
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+
+    {0}
 };
 
 static int alc260_parse_auto_config(struct hda_codec *codec)
 {
-        struct alc_spec *spec = codec->spec;
-        unsigned int wcap;
-        int err;
-        static hda_nid_t alc260_ignore[] = { 0x17, 0 };
-
-        if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
-                                                alc260_ignore)) < 0)
-                return err;
-        if ((err = alc260_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0)
-                return err;
-        if (! spec->kctl_alloc)
-                return 0; /* can't find valid BIOS pin config */
-        if ((err = alc260_auto_create_analog_input_ctls(spec, &spec->autocfg)) < 0)
-                return err;
-
-        spec->multiout.max_channels = 2;
-
-        if (spec->autocfg.dig_out_pin)
-                spec->multiout.dig_out_nid = ALC260_DIGOUT_NID;
-        if (spec->kctl_alloc)
-                spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
-
-        spec->init_verbs[spec->num_init_verbs++] = alc260_volume_init_verbs;
-
-        spec->input_mux = &spec->private_imux;
-
-        /* check whether NID 0x04 is valid */
-        wcap = get_wcaps(codec, 0x04);
-        wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; /* get type */
-        if (wcap != AC_WID_AUD_IN) {
-                spec->adc_nids = alc260_adc_nids_alt;
-                spec->num_adc_nids = ARRAY_SIZE(alc260_adc_nids_alt);
-                spec->mixers[spec->num_mixers] = alc260_capture_alt_mixer;
-        } else {
-                spec->adc_nids = alc260_adc_nids;
-                spec->num_adc_nids = ARRAY_SIZE(alc260_adc_nids);
-                spec->mixers[spec->num_mixers] = alc260_capture_mixer;
-        }
-        spec->num_mixers++;
-
-        return 1;
+    struct alc_spec *spec = codec->spec;
+    unsigned int wcap;
+    int err;
+    static hda_nid_t alc260_ignore[] = { 0x17, 0 };
+
+    if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
+                                            alc260_ignore)) < 0)
+        return err;
+    if ((err = alc260_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0)
+        return err;
+    if (! spec->kctl_alloc)
+        return 0; /* can't find valid BIOS pin config */
+    if ((err = alc260_auto_create_analog_input_ctls(spec, &spec->autocfg)) < 0)
+        return err;
+
+    spec->multiout.max_channels = 2;
+
+    if (spec->autocfg.dig_out_pin)
+        spec->multiout.dig_out_nid = ALC260_DIGOUT_NID;
+    if (spec->kctl_alloc)
+        spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
+
+    spec->init_verbs[spec->num_init_verbs++] = alc260_volume_init_verbs;
+
+    spec->input_mux = &spec->private_imux;
+
+    /* check whether NID 0x04 is valid */
+    wcap = get_wcaps(codec, 0x04);
+    wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; /* get type */
+    if (wcap != AC_WID_AUD_IN) {
+        spec->adc_nids = alc260_adc_nids_alt;
+        spec->num_adc_nids = ARRAY_SIZE(alc260_adc_nids_alt);
+        spec->mixers[spec->num_mixers] = alc260_capture_alt_mixer;
+    } else {
+        spec->adc_nids = alc260_adc_nids;
+        spec->num_adc_nids = ARRAY_SIZE(alc260_adc_nids);
+        spec->mixers[spec->num_mixers] = alc260_capture_mixer;
+    }
+    spec->num_mixers++;
+
+    return 1;
 }
 
@@ -3725 +3746 @@
  */
 static struct hda_board_config alc260_cfg_tbl[] = {
-        { .modelname = "basic", .config = ALC260_BASIC },
-        { .pci_subvendor = 0x104d, .pci_subdevice = 0x81bb,
-        .config = ALC260_BASIC }, /* Sony VAIO */
-        { .pci_subvendor = 0x152d, .pci_subdevice = 0x0729,
-        .config = ALC260_BASIC }, /* CTL Travel Master U553W */
-        { .modelname = "hp", .config = ALC260_HP },
-        { .pci_subvendor = 0x103c, .pci_subdevice = 0x3010, .config = ALC260_HP },
-        { .pci_subvendor = 0x103c, .pci_subdevice = 0x3011, .config = ALC260_HP },
-        { .pci_subvendor = 0x103c, .pci_subdevice = 0x3012, .config = ALC260_HP },
-        { .pci_subvendor = 0x103c, .pci_subdevice = 0x3013, .config = ALC260_HP_3013 },
-        { .pci_subvendor = 0x103c, .pci_subdevice = 0x3014, .config = ALC260_HP },
-        { .pci_subvendor = 0x103c, .pci_subdevice = 0x3015, .config = ALC260_HP },
-        { .pci_subvendor = 0x103c, .pci_subdevice = 0x3016, .config = ALC260_HP },
-        { .modelname = "fujitsu", .config = ALC260_FUJITSU_S702X },
-        { .pci_subvendor = 0x10cf, .pci_subdevice = 0x1326, .config = ALC260_FUJITSU_S702X },
-        { .modelname = "acer", .config = ALC260_ACER },
-        { .pci_subvendor = 0x1025, .pci_subdevice = 0x008f, .config = ALC260_ACER },
+    { .modelname = "basic", .config = ALC260_BASIC },
+    { .pci_subvendor = 0x104d, .pci_subdevice = 0x81bb,
+    .config = ALC260_BASIC }, /* Sony VAIO */
+    { .pci_subvendor = 0x104d, .pci_subdevice = 0x81cc,
+    .config = ALC260_BASIC }, /* Sony VAIO VGN-S3HP */
+    { .pci_subvendor = 0x104d, .pci_subdevice = 0x81cd,
+    .config = ALC260_BASIC }, /* Sony VAIO */
+    { .pci_subvendor = 0x152d, .pci_subdevice = 0x0729,
+    .config = ALC260_BASIC }, /* CTL Travel Master U553W */
+    { .modelname = "hp", .config = ALC260_HP },
+    { .pci_subvendor = 0x103c, .pci_subdevice = 0x3010, .config = ALC260_HP },
+    { .pci_subvendor = 0x103c, .pci_subdevice = 0x3011, .config = ALC260_HP },
+    { .pci_subvendor = 0x103c, .pci_subdevice = 0x3012, .config = ALC260_HP_3013 },
+    { .pci_subvendor = 0x103c, .pci_subdevice = 0x3013, .config = ALC260_HP_3013 },
+    { .pci_subvendor = 0x103c, .pci_subdevice = 0x3014, .config = ALC260_HP },
+    { .pci_subvendor = 0x103c, .pci_subdevice = 0x3015, .config = ALC260_HP },
+    { .pci_subvendor = 0x103c, .pci_subdevice = 0x3016, .config = ALC260_HP },
+    { .modelname = "fujitsu", .config = ALC260_FUJITSU_S702X },
+    { .pci_subvendor = 0x10cf, .pci_subdevice = 0x1326, .config = ALC260_FUJITSU_S702X },
+    { .modelname = "acer", .config = ALC260_ACER },
+    { .pci_subvendor = 0x1025, .pci_subdevice = 0x008f, .config = ALC260_ACER },
 #ifdef CONFIG_SND_DEBUG
-        { .modelname = "test", .config = ALC260_TEST },
+    { .modelname = "test", .config = ALC260_TEST },
 #endif
-        { .modelname = "auto", .config = ALC260_AUTO },
-        {0}
+    { .modelname = "auto", .config = ALC260_AUTO },
+    {0}
 };
 
 static struct alc_config_preset alc260_presets[] = {
-        [ALC260_BASIC] = {
-                .mixers = { alc260_base_output_mixer,
-                            alc260_input_mixer,
-                            alc260_pc_beep_mixer,
-                            alc260_capture_mixer },
-                .init_verbs = { alc260_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc260_dac_nids),
-                .dac_nids = alc260_dac_nids,
-                .num_adc_nids = ARRAY_SIZE(alc260_adc_nids),
-                .adc_nids = alc260_adc_nids,
-                .num_channel_mode = ARRAY_SIZE(alc260_modes),
-                .channel_mode = alc260_modes,
-                .input_mux = &alc260_capture_source,
-        },
-        [ALC260_HP] = {
-                .mixers = { alc260_base_output_mixer,
-                            alc260_input_mixer,
-                            alc260_capture_alt_mixer },
-                .init_verbs = { alc260_hp_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc260_dac_nids),
-                .dac_nids = alc260_dac_nids,
-                .num_adc_nids = ARRAY_SIZE(alc260_hp_adc_nids),
-                .adc_nids = alc260_hp_adc_nids,
-                .num_channel_mode = ARRAY_SIZE(alc260_modes),
-                .channel_mode = alc260_modes,
-                .input_mux = &alc260_capture_source,
-        },
-        [ALC260_HP_3013] = {
-                .mixers = { alc260_hp_3013_mixer,
-                            alc260_input_mixer,
-                            alc260_capture_alt_mixer },
-                .init_verbs = { alc260_hp_3013_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc260_dac_nids),
-                .dac_nids = alc260_dac_nids,
-                .num_adc_nids = ARRAY_SIZE(alc260_hp_adc_nids),
-                .adc_nids = alc260_hp_adc_nids,
-                .num_channel_mode = ARRAY_SIZE(alc260_modes),
-                .channel_mode = alc260_modes,
-                .input_mux = &alc260_capture_source,
-        },
-        [ALC260_FUJITSU_S702X] = {
-                .mixers = { alc260_fujitsu_mixer,
-                            alc260_capture_mixer },
-                .init_verbs = { alc260_fujitsu_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc260_dac_nids),
-                .dac_nids = alc260_dac_nids,
-                .num_adc_nids = ARRAY_SIZE(alc260_dual_adc_nids),
-                .adc_nids = alc260_dual_adc_nids,
-                .num_channel_mode = ARRAY_SIZE(alc260_modes),
-                .channel_mode = alc260_modes,
-                .input_mux = &alc260_fujitsu_capture_source,
-        },
-        [ALC260_ACER] = {
-                .mixers = { alc260_acer_mixer,
-                            alc260_capture_mixer },
-                .init_verbs = { alc260_acer_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc260_dac_nids),
-                .dac_nids = alc260_dac_nids,
-                .num_adc_nids = ARRAY_SIZE(alc260_dual_adc_nids),
-                .adc_nids = alc260_dual_adc_nids,
-                .num_channel_mode = ARRAY_SIZE(alc260_modes),
-                .channel_mode = alc260_modes,
-                .input_mux = &alc260_acer_capture_source,
-        },
+    [ALC260_BASIC] = {
+        .mixers = { alc260_base_output_mixer,
+        alc260_input_mixer,
+        alc260_pc_beep_mixer,
+        alc260_capture_mixer },
+        .init_verbs = { alc260_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc260_dac_nids),
+        .dac_nids = alc260_dac_nids,
+        .num_adc_nids = ARRAY_SIZE(alc260_adc_nids),
+        .adc_nids = alc260_adc_nids,
+        .num_channel_mode = ARRAY_SIZE(alc260_modes),
+        .channel_mode = alc260_modes,
+        .input_mux = &alc260_capture_source,
+    },
+    [ALC260_HP] = {
+        .mixers = { alc260_base_output_mixer,
+        alc260_input_mixer,
+        alc260_capture_alt_mixer },
+        .init_verbs = { alc260_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc260_dac_nids),
+        .dac_nids = alc260_dac_nids,
+        .num_adc_nids = ARRAY_SIZE(alc260_hp_adc_nids),
+        .adc_nids = alc260_hp_adc_nids,
+        .num_channel_mode = ARRAY_SIZE(alc260_modes),
+        .channel_mode = alc260_modes,
+        .input_mux = &alc260_capture_source,
+    },
+    [ALC260_HP_3013] = {
+        .mixers = { alc260_hp_3013_mixer,
+        alc260_input_mixer,
+        alc260_capture_alt_mixer },
+        .init_verbs = { alc260_hp_3013_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc260_dac_nids),
+        .dac_nids = alc260_dac_nids,
+        .num_adc_nids = ARRAY_SIZE(alc260_hp_adc_nids),
+        .adc_nids = alc260_hp_adc_nids,
+        .num_channel_mode = ARRAY_SIZE(alc260_modes),
+        .channel_mode = alc260_modes,
+        .input_mux = &alc260_capture_source,
+    },
+    [ALC260_FUJITSU_S702X] = {
+        .mixers = { alc260_fujitsu_mixer,
+        alc260_capture_mixer },
+        .init_verbs = { alc260_fujitsu_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc260_dac_nids),
+        .dac_nids = alc260_dac_nids,
+        .num_adc_nids = ARRAY_SIZE(alc260_dual_adc_nids),
+        .adc_nids = alc260_dual_adc_nids,
+        .num_channel_mode = ARRAY_SIZE(alc260_modes),
+        .channel_mode = alc260_modes,
+        .input_mux = &alc260_fujitsu_capture_source,
+    },
+    [ALC260_ACER] = {
+        .mixers = { alc260_acer_mixer,
+        alc260_capture_mixer },
+        .init_verbs = { alc260_acer_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc260_dac_nids),
+        .dac_nids = alc260_dac_nids,
+        .num_adc_nids = ARRAY_SIZE(alc260_dual_adc_nids),
+        .adc_nids = alc260_dual_adc_nids,
+        .num_channel_mode = ARRAY_SIZE(alc260_modes),
+        .channel_mode = alc260_modes,
+        .input_mux = &alc260_acer_capture_source,
+    },
 #ifdef CONFIG_SND_DEBUG
-        [ALC260_TEST] = {
-                .mixers = { alc260_test_mixer,
-                            alc260_capture_mixer },
-                .init_verbs = { alc260_test_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc260_test_dac_nids),
-                .dac_nids = alc260_test_dac_nids,
-                .num_adc_nids = ARRAY_SIZE(alc260_test_adc_nids),
-                .adc_nids = alc260_test_adc_nids,
-                .num_channel_mode = ARRAY_SIZE(alc260_modes),
-                .channel_mode = alc260_modes,
-                .input_mux = &alc260_test_capture_source,
-        },
+    [ALC260_TEST] = {
+        .mixers = { alc260_test_mixer,
+        alc260_capture_mixer },
+        .init_verbs = { alc260_test_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc260_test_dac_nids),
+        .dac_nids = alc260_test_dac_nids,
+        .num_adc_nids = ARRAY_SIZE(alc260_test_adc_nids),
+        .adc_nids = alc260_test_adc_nids,
+        .num_channel_mode = ARRAY_SIZE(alc260_modes),
+        .channel_mode = alc260_modes,
+        .input_mux = &alc260_test_capture_source,
+    },
 #endif
 };
@@ -3832 +3857 @@
 static int patch_alc260(struct hda_codec *codec)
 {
-        struct alc_spec *spec;
-        int err, board_config;
-
-        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
-        if (spec == NULL)
-                return -ENOMEM;
-
-        codec->spec = spec;
-
-        board_config = snd_hda_check_board_config(codec, alc260_cfg_tbl);
-        if (board_config < 0 || board_config >= ALC260_MODEL_LAST) {
-                snd_printd(KERN_INFO "hda_codec: Unknown model for ALC260\n");
-                board_config = ALC260_AUTO;
-        }
-
-        if (board_config == ALC260_AUTO) {
-                /* automatic parse from the BIOS config */
-                err = alc260_parse_auto_config(codec);
-                if (err < 0) {
-                        alc_free(codec);
-                        return err;
-                } else if (! err) {
-                        printk(KERN_INFO "hda_codec: Cannot set up configuration from BIOS.  Using base mode...\n");
-                        board_config = ALC260_BASIC;
-                }
-        }
-
-        if (board_config != ALC260_AUTO)
-                setup_preset(spec, &alc260_presets[board_config]);
-
-        spec->stream_name_analog = "ALC260 Analog";
-        spec->stream_analog_playback = &alc260_pcm_analog_playback;
-        spec->stream_analog_capture = &alc260_pcm_analog_capture;
-
-        spec->stream_name_digital = "ALC260 Digital";
-        spec->stream_digital_playback = &alc260_pcm_digital_playback;
-        spec->stream_digital_capture = &alc260_pcm_digital_capture;
-
-        codec->patch_ops = alc_patch_ops;
-        if (board_config == ALC260_AUTO)
-            spec->init_hook = alc260_auto_init;
-
-        return 0;
+    struct alc_spec *spec;
+    int err, board_config;
+
+    spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+    if (spec == NULL)
+        return -ENOMEM;
+
+    codec->spec = spec;
+
+    board_config = snd_hda_check_board_config(codec, alc260_cfg_tbl);
+    if (board_config < 0 || board_config >= ALC260_MODEL_LAST) {
+        snd_printd(KERN_INFO "hda_codec: Unknown model for ALC260\n");
+        board_config = ALC260_AUTO;
+    }
+
+    if (board_config == ALC260_AUTO) {
+        /* automatic parse from the BIOS config */
+        err = alc260_parse_auto_config(codec);
+        if (err < 0) {
+            alc_free(codec);
+            return err;
+        } else if (! err) {
+            printk(KERN_INFO "hda_codec: Cannot set up configuration from BIOS.  Using base mode...\n");
+            board_config = ALC260_BASIC;
+        }
+    }
+
+    if (board_config != ALC260_AUTO)
+        setup_preset(spec, &alc260_presets[board_config]);
+
+    spec->stream_name_analog = "ALC260 Analog";
+    spec->stream_analog_playback = &alc260_pcm_analog_playback;
+    spec->stream_analog_capture = &alc260_pcm_analog_capture;
+
+    spec->stream_name_digital = "ALC260 Digital";
+    spec->stream_digital_playback = &alc260_pcm_digital_playback;
+    spec->stream_digital_capture = &alc260_pcm_digital_capture;
+
+    codec->patch_ops = alc_patch_ops;
+    if (board_config == ALC260_AUTO)
+        spec->init_hook = alc260_auto_init;
+
+    return 0;
 }
 
@@ -3893 +3918 @@
 
 static struct hda_channel_mode alc882_ch_modes[1] = {
-        { 8, NULL }
+    { 8, NULL }
 };
 
 static hda_nid_t alc882_dac_nids[4] = {
-        /* front, rear, clfe, rear_surr */
-        0x02, 0x03, 0x04, 0x05
+    /* front, rear, clfe, rear_surr */
+    0x02, 0x03, 0x04, 0x05
 };
 
@@ -3909 +3934 @@
 
 static struct hda_input_mux alc882_capture_source = {
-        .num_items = 4,
-        .items = {
-                { "Mic", 0x0 },
-                { "Front Mic", 0x1 },
-                { "Line", 0x2 },
-                { "CD", 0x4 },
-        },
+    .num_items = 4,
+    .items = {
+        { "Mic", 0x0 },
+        { "Front Mic", 0x1 },
+        { "Line", 0x2 },
+        { "CD", 0x4 },
+    },
 };
 
@@ -3923 +3948 @@
 static int alc882_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct alc_spec *spec = codec->spec;
-        const struct hda_input_mux *imux = spec->input_mux;
-        unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
-        static hda_nid_t capture_mixers[3] = { 0x24, 0x23, 0x22 };
-        hda_nid_t nid = capture_mixers[adc_idx];
-        unsigned int *cur_val = &spec->cur_mux[adc_idx];
-        unsigned int i, idx;
-
-        idx = ucontrol->value.enumerated.item[0];
-        if (idx >= imux->num_items)
-                idx = imux->num_items - 1;
-        if (*cur_val == idx && ! codec->in_resume)
-                return 0;
-        for (i = 0; i < imux->num_items; i++) {
-                unsigned int v = (i == idx) ? 0x7000 : 0x7080;
-                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
-                                    v | (imux->items[i].index << 8));
-        }
-        *cur_val = idx;
-        return 1;
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    struct alc_spec *spec = codec->spec;
+    const struct hda_input_mux *imux = spec->input_mux;
+    unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
+    static hda_nid_t capture_mixers[3] = { 0x24, 0x23, 0x22 };
+    hda_nid_t nid = capture_mixers[adc_idx];
+    unsigned int *cur_val = &spec->cur_mux[adc_idx];
+    unsigned int i, idx;
+
+    idx = ucontrol->value.enumerated.item[0];
+    if (idx >= imux->num_items)
+        idx = imux->num_items - 1;
+    if (*cur_val == idx && ! codec->in_resume)
+        return 0;
+    for (i = 0; i < imux->num_items; i++) {
+        unsigned int v = (i == idx) ? 0x7000 : 0x7080;
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                            v | (imux->items[i].index << 8));
+    }
+    *cur_val = idx;
+    return 1;
 }
 
@@ -3950 +3975 @@
  */
 static struct hda_verb alc882_sixstack_ch6_init[] = {
-        { 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },
-        { 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
-        { 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
-        { 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
-        {0} /* end */
+    { 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },
+    { 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+    { 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+    { 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+    {0} /* end */
 };
 
@@ -3961 +3986 @@
  */
 static struct hda_verb alc882_sixstack_ch8_init[] = {
-        { 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
-        { 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
-        { 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
-        { 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
-        {0} /* end */
+    { 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+    { 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+    { 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+    { 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+    {0} /* end */
 };
 
 static struct hda_channel_mode alc882_sixstack_modes[2] = {
-        { 6, alc882_sixstack_ch6_init },
-        { 8, alc882_sixstack_ch8_init },
+    { 6, alc882_sixstack_ch6_init },
+    { 8, alc882_sixstack_ch8_init },
 };
 
@@ -3977 +4002 @@
  */
 static struct snd_kcontrol_new alc882_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_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
-        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_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME_IDX("Capture Volume", 2, 0x09, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE_IDX("Capture Switch", 2, 0x09, 0x0, HDA_INPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                /* .name = "Capture Source", */
-                .name = "Input Source",
-                .count = 3,
-                .info = alc882_mux_enum_info,
-                .get = alc882_mux_enum_get,
-                .put = alc882_mux_enum_put,
-        },
-        {0} /* end */
+    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_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
+    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_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+    HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, 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 struct snd_kcontrol_new alc882_chmode_mixer[] = {
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Channel Mode",
-                .info = alc_ch_mode_info,
-                .get = alc_ch_mode_get,
-                .put = alc_ch_mode_put,
-        },
-        {0} /* end */
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Channel Mode",
+        .info = alc_ch_mode_info,
+        .get = alc_ch_mode_get,
+        .put = alc_ch_mode_put,
+    },
+    {0} /* end */
 };
 
 static struct hda_verb alc882_init_verbs[] = {
-        /* Front mixer: unmute input/output amp left and right (volume = 0) */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-        /* Rear mixer */
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-        /* CLFE mixer */
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-        /* Side mixer */
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-
-        /* Front Pin: output 0 (0x0c) */
-        {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},
-        /* Rear Pin: output 1 (0x0d) */
-        {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, 0x01},
-        /* CLFE Pin: output 2 (0x0e) */
-        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x16, AC_VERB_SET_CONNECT_SEL, 0x02},
-        /* Side Pin: output 3 (0x0f) */
-        {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},
-        /* Mic (rear) pin: input vref at 80% */
-        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        /* Front Mic pin: input vref at 80% */
-        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
-        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        /* Line In pin: input */
-        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        /* Line-2 In: Headphone output (output 0 - 0x0c) */
-        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
-        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},
-        /* CD pin widget for input */
-        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-
-        /* FIXME: use matrix-type input source selection */
-        /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */
-        /* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */
-        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
-        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
-        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
-        /* Input mixer2 */
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
-        /* Input mixer3 */
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
-        /* ADC1: mute amp left and right */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
-        /* ADC2: mute amp left and right */
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
-        /* ADC3: mute amp left and right */
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
-
-        {0}
+    /* Front mixer: unmute input/output amp left and right (volume = 0) */
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+    /* Rear mixer */
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+    /* CLFE mixer */
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+    /* Side mixer */
+    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+
+    /* Front Pin: output 0 (0x0c) */
+    {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},
+    /* Rear Pin: output 1 (0x0d) */
+    {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, 0x01},
+    /* CLFE Pin: output 2 (0x0e) */
+    {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x16, AC_VERB_SET_CONNECT_SEL, 0x02},
+    /* Side Pin: output 3 (0x0f) */
+    {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},
+    /* Mic (rear) pin: input vref at 80% */
+    {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    /* Front Mic pin: input vref at 80% */
+    {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    /* Line In pin: input */
+    {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+    {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    /* Line-2 In: Headphone output (output 0 - 0x0c) */
+    {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+    {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},
+    /* CD pin widget for input */
+    {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+
+    /* FIXME: use matrix-type input source selection */
+    /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */
+    /* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */
+    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+    /* Input mixer2 */
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+    /* Input mixer3 */
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+    /* ADC1: mute amp left and right */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
+    /* ADC2: mute amp left and right */
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+    /* ADC3: mute amp left and right */
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+    {0}
 };
 
@@ -4111 +4121 @@
  */
 static struct hda_verb alc882_auto_init_verbs[] = {
-        /*
-         * Unmute ADC0-2 and set the default input to mic-in
-         */
-        {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-
-        /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
-         * mixer widget
-         * Note: PASD motherboards uses the Line In 2 as the input for front panel
-         * mic (mic 2)
-         */
-        /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
-
-        /*
-         * Set up output mixers (0x0c - 0x0f)
-         */
-        /* set vol=0 to output mixers */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        /* set up input amps for analog loopback */
-        /* Amp Indices: DAC = 0, mixer = 1 */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-
-        /* FIXME: use matrix-type input source selection */
-        /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */
-        /* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */
-        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
-        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
-        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
-        /* Input mixer2 */
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
-        /* Input mixer3 */
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
-
-        {0}
+    /*
+     * Unmute ADC0-2 and set the default input to mic-in
+     */
+    {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+
+    /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
+     * mixer widget
+     * Note: PASD motherboards uses the Line In 2 as the input for front panel
+     * mic (mic 2)
+     */
+    /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+
+    /*
+     * Set up output mixers (0x0c - 0x0f)
+     */
+    /* set vol=0 to output mixers */
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    /* set up input amps for analog loopback */
+    /* Amp Indices: DAC = 0, mixer = 1 */
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+
+    /* FIXME: use matrix-type input source selection */
+    /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */
+    /* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */
+    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
+    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
+    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
+    /* Input mixer2 */
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
+    /* Input mixer3 */
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
+
+    {0}
 };
 
 /* capture mixer elements */
 static struct snd_kcontrol_new alc882_capture_alt_mixer[] = {
-        HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                /* The multiple "Capture Source" controls confuse alsamixer
-                 * So call somewhat different..
-                 * FIXME: the controls appear in the "playback" view!
-                 */
-                /* .name = "Capture Source", */
-                .name = "Input Source",
-                .count = 2,
-                .info = alc882_mux_enum_info,
-                .get = alc882_mux_enum_get,
-                .put = alc882_mux_enum_put,
-        },
-        {0} /* end */
+    HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT),
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        /* The multiple "Capture Source" controls confuse alsamixer
+         * So call somewhat different..
+         * FIXME: the controls appear in the "playback" view!
+         */
+        /* .name = "Capture Source", */
+        .name = "Input Source",
+        .count = 2,
+        .info = alc882_mux_enum_info,
+        .get = alc882_mux_enum_get,
+        .put = alc882_mux_enum_put,
+    },
+    {0} /* end */
 };
 
 static struct snd_kcontrol_new alc882_capture_mixer[] = {
-        HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME_IDX("Capture Volume", 2, 0x09, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE_IDX("Capture Switch", 2, 0x09, 0x0, HDA_INPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                /* The multiple "Capture Source" controls confuse alsamixer
-                 * So call somewhat different..
-                 * FIXME: the controls appear in the "playback" view!
-                 */
-                /* .name = "Capture Source", */
-                .name = "Input Source",
-                .count = 3,
-                .info = alc882_mux_enum_info,
-                .get = alc882_mux_enum_get,
-                .put = alc882_mux_enum_put,
-        },
-        {0} /* end */
+    HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x08, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x08, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME_IDX("Capture Volume", 2, 0x09, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE_IDX("Capture Switch", 2, 0x09, 0x0, HDA_INPUT),
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        /* The multiple "Capture Source" controls confuse alsamixer
+         * So call somewhat different..
+         * FIXME: the controls appear in the "playback" view!
+         */
+        /* .name = "Capture Source", */
+        .name = "Input Source",
+        .count = 3,
+        .info = alc882_mux_enum_info,
+        .get = alc882_mux_enum_get,
+        .put = alc882_mux_enum_put,
+    },
+    {0} /* end */
 };
 
@@ -4230 +4240 @@
  */
 static struct hda_board_config alc882_cfg_tbl[] = {
-        { .modelname = "3stack-dig", .config = ALC882_3ST_DIG },
-        { .modelname = "6stack-dig", .config = ALC882_6ST_DIG },
-        { .pci_subvendor = 0x1462, .pci_subdevice = 0x6668, .config = ALC882_6ST_DIG }, /* MSI  */
-        { .pci_subvendor = 0x105b, .pci_subdevice = 0x6668, .config = ALC882_6ST_DIG }, /* Foxconn */
-        { .pci_subvendor = 0x1019, .pci_subdevice = 0x6668, .config = ALC882_6ST_DIG }, /* ECS */
-        { .modelname = "auto", .config = ALC882_AUTO },
-        {0}
+    { .modelname = "3stack-dig", .config = ALC882_3ST_DIG },
+    { .modelname = "6stack-dig", .config = ALC882_6ST_DIG },
+    { .pci_subvendor = 0x1462, .pci_subdevice = 0x6668, .config = ALC882_6ST_DIG }, /* MSI  */
+    { .pci_subvendor = 0x105b, .pci_subdevice = 0x6668, .config = ALC882_6ST_DIG }, /* Foxconn */
+    { .pci_subvendor = 0x1019, .pci_subdevice = 0x6668, .config = ALC882_6ST_DIG }, /* ECS */
+    { .modelname = "auto", .config = ALC882_AUTO },
+    {0}
 };
 
 static struct alc_config_preset alc882_presets[] = {
-        [ALC882_3ST_DIG] = {
-                .mixers = { alc882_base_mixer },
-                .init_verbs = { alc882_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc882_dac_nids),
-                .dac_nids = alc882_dac_nids,
-                .dig_out_nid = ALC882_DIGOUT_NID,
-                .num_adc_nids = ARRAY_SIZE(alc882_adc_nids),
-                .adc_nids = alc882_adc_nids,
-                .dig_in_nid = ALC882_DIGIN_NID,
-                .num_channel_mode = ARRAY_SIZE(alc882_ch_modes),
-                .channel_mode = alc882_ch_modes,
-                .input_mux = &alc882_capture_source,
-        },
-        [ALC882_6ST_DIG] = {
-                .mixers = { alc882_base_mixer, alc882_chmode_mixer },
-                .init_verbs = { alc882_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc882_dac_nids),
-                .dac_nids = alc882_dac_nids,
-                .dig_out_nid = ALC882_DIGOUT_NID,
-                .num_adc_nids = ARRAY_SIZE(alc882_adc_nids),
-                .adc_nids = alc882_adc_nids,
-                .dig_in_nid = ALC882_DIGIN_NID,
-                .num_channel_mode = ARRAY_SIZE(alc882_sixstack_modes),
-                .channel_mode = alc882_sixstack_modes,
-                .input_mux = &alc882_capture_source,
-        },
+    [ALC882_3ST_DIG] = {
+        .mixers = { alc882_base_mixer },
+        .init_verbs = { alc882_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc882_dac_nids),
+        .dac_nids = alc882_dac_nids,
+        .dig_out_nid = ALC882_DIGOUT_NID,
+        .dig_in_nid = ALC882_DIGIN_NID,
+        .num_channel_mode = ARRAY_SIZE(alc882_ch_modes),
+        .channel_mode = alc882_ch_modes,
+        .input_mux = &alc882_capture_source,
+    },
+    [ALC882_6ST_DIG] = {
+        .mixers = { alc882_base_mixer, alc882_chmode_mixer },
+        .init_verbs = { alc882_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc882_dac_nids),
+        .dac_nids = alc882_dac_nids,
+        .dig_out_nid = ALC882_DIGOUT_NID,
+        .dig_in_nid = ALC882_DIGIN_NID,
+        .num_channel_mode = ARRAY_SIZE(alc882_sixstack_modes),
+        .channel_mode = alc882_sixstack_modes,
+        .input_mux = &alc882_capture_source,
+    },
 };
 
@@ -4273 +4279 @@
  */
 static void alc882_auto_set_output_and_unmute(struct hda_codec *codec,
-                                              hda_nid_t nid, int pin_type,
-                                              int dac_idx)
-{
-        /* set as output */
-        struct alc_spec *spec = codec->spec;
-        int idx;
-
-        if (spec->multiout.dac_nids[dac_idx] == 0x25)
-                idx = 4;
-        else
-                idx = spec->multiout.dac_nids[dac_idx] - 2;
-
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, pin_type);
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL, idx);
+                                              hda_nid_t nid, int pin_type,
+                                              int dac_idx)
+{
+    /* set as output */
+    struct alc_spec *spec = codec->spec;
+    int idx;
+
+    if (spec->multiout.dac_nids[dac_idx] == 0x25)
+        idx = 4;
+    else
+        idx = spec->multiout.dac_nids[dac_idx] - 2;
+
+    snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, pin_type);
+    snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
+    snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL, idx);
 
 }
@@ -4293 +4299 @@
 static void alc882_auto_init_multi_out(struct hda_codec *codec)
 {
-        struct alc_spec *spec = codec->spec;
-        int i;
-
-        for (i = 0; i <= HDA_SIDE; i++) {
-                hda_nid_t nid = spec->autocfg.line_out_pins[i];
-                if (nid)
-                        alc882_auto_set_output_and_unmute(codec, nid, PIN_OUT, i);
-        }
+    struct alc_spec *spec = codec->spec;
+    int i;
+
+    for (i = 0; i <= HDA_SIDE; i++) {
+        hda_nid_t nid = spec->autocfg.line_out_pins[i];
+        if (nid)
+            alc882_auto_set_output_and_unmute(codec, nid, PIN_OUT, i);
+    }
 }
 
 static void alc882_auto_init_hp_out(struct hda_codec *codec)
 {
-        struct alc_spec *spec = codec->spec;
-        hda_nid_t pin;
-
-        pin = spec->autocfg.hp_pin;
-        if (pin) /* connect to front */
-                alc882_auto_set_output_and_unmute(codec, pin, PIN_HP, 0); /* use dac 0 */
+    struct alc_spec *spec = codec->spec;
+    hda_nid_t pin;
+
+    pin = spec->autocfg.hp_pin;
+    if (pin) /* connect to front */
+        alc882_auto_set_output_and_unmute(codec, pin, PIN_HP, 0); /* use dac 0 */
 }
 
@@ -4318 +4324 @@
 static void alc882_auto_init_analog_input(struct hda_codec *codec)
 {
-        struct alc_spec *spec = codec->spec;
-        int i;
-
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                hda_nid_t nid = spec->autocfg.input_pins[i];
-                if (alc882_is_input_pin(nid)) {
-                        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                            i <= AUTO_PIN_FRONT_MIC ? PIN_VREF80 : PIN_IN);
-                        if (nid != ALC882_PIN_CD_NID)
-                                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
-                                                    AMP_OUT_MUTE);
-                }
-        }
+    struct alc_spec *spec = codec->spec;
+    int i;
+
+    for (i = 0; i < AUTO_PIN_LAST; i++) {
+        hda_nid_t nid = spec->autocfg.input_pins[i];
+        if (alc882_is_input_pin(nid)) {
+            snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                i <= AUTO_PIN_FRONT_MIC ? PIN_VREF80 : PIN_IN);
+            if (nid != ALC882_PIN_CD_NID)
+                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                                    AMP_OUT_MUTE);
+        }
+    }
 }
 
@@ -4336 +4342 @@
 static int alc882_parse_auto_config(struct hda_codec *codec)
 {
-        struct alc_spec *spec = codec->spec;
-        int err = alc880_parse_auto_config(codec);
-
-        if (err < 0)
-                return err;
-        else if (err > 0)
-                /* hack - override the init verbs */
-                spec->init_verbs[0] = alc882_auto_init_verbs;
-        return err;
+    struct alc_spec *spec = codec->spec;
+    int err = alc880_parse_auto_config(codec);
+
+    if (err < 0)
+        return err;
+    else if (err > 0)
+        /* hack - override the init verbs */
+        spec->init_verbs[0] = alc882_auto_init_verbs;
+    return err;
 }
 
@@ -4355 +4361 @@
 }
 
-/*
- *  ALC882 Headphone poll in 3.5.1a or 3.5.2
- */
-
 static int patch_alc882(struct hda_codec *codec)
 {
-        struct alc_spec *spec;
-        int err, board_config;
-
-        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
-        if (spec == NULL)
-                return -ENOMEM;
-
-        codec->spec = spec;
-
-        board_config = snd_hda_check_board_config(codec, alc882_cfg_tbl);
-
-        if (board_config < 0 || board_config >= ALC882_MODEL_LAST) {
-                printk(KERN_INFO "hda_codec: Unknown model for ALC882, trying auto-probe from BIOS...\n");
-                board_config = ALC882_AUTO;
-        }
-
-        if (board_config == ALC882_AUTO) {
-                /* automatic parse from the BIOS config */
-                err = alc882_parse_auto_config(codec);
-                if (err < 0) {
-                        alc_free(codec);
-                        return err;
-                } else if (! err) {
-                        printk(KERN_INFO "hda_codec: Cannot set up configuration from BIOS.  Using base mode...\n");
-                        board_config = ALC882_3ST_DIG;
-                }
-        }
-
-        if (board_config != ALC882_AUTO)
-                setup_preset(spec, &alc882_presets[board_config]);
-
-        spec->stream_name_analog = "ALC882 Analog";
-        spec->stream_analog_playback = &alc882_pcm_analog_playback;
-        spec->stream_analog_capture = &alc882_pcm_analog_capture;
-
-        spec->stream_name_digital = "ALC882 Digital";
-        spec->stream_digital_playback = &alc882_pcm_digital_playback;
-        spec->stream_digital_capture = &alc882_pcm_digital_capture;
-
-        if (! spec->adc_nids && spec->input_mux) {
-                /* check whether NID 0x07 is valid */
-                unsigned int wcap = get_wcaps(codec, 0x07);
-                wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; /* get type */
-                if (wcap != AC_WID_AUD_IN) {
-                        spec->adc_nids = alc882_adc_nids_alt;
-                        spec->num_adc_nids = ARRAY_SIZE(alc882_adc_nids_alt);
-                        spec->mixers[spec->num_mixers] = alc882_capture_alt_mixer;
-                        spec->num_mixers++;
-                } else {
-                        spec->adc_nids = alc882_adc_nids;
-                        spec->num_adc_nids = ARRAY_SIZE(alc882_adc_nids);
-                        spec->mixers[spec->num_mixers] = alc882_capture_mixer;
-                        spec->num_mixers++;
-                }
-        }
-
-        codec->patch_ops = alc_patch_ops;
-        if (board_config == ALC882_AUTO)
-            spec->init_hook = alc882_auto_init;
-
-        return 0;
+    struct alc_spec *spec;
+    int err, board_config;
+
+    spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+    if (spec == NULL)
+        return -ENOMEM;
+
+    codec->spec = spec;
+
+    board_config = snd_hda_check_board_config(codec, alc882_cfg_tbl);
+
+    if (board_config < 0 || board_config >= ALC882_MODEL_LAST) {
+        printk(KERN_INFO "hda_codec: Unknown model for ALC882, trying auto-probe from BIOS...\n");
+        board_config = ALC882_AUTO;
+    }
+
+    if (board_config == ALC882_AUTO) {
+        /* automatic parse from the BIOS config */
+        err = alc882_parse_auto_config(codec);
+        if (err < 0) {
+            alc_free(codec);
+            return err;
+        } else if (! err) {
+            printk(KERN_INFO "hda_codec: Cannot set up configuration from BIOS.  Using base mode...\n");
+            board_config = ALC882_3ST_DIG;
+        }
+    }
+
+    if (board_config != ALC882_AUTO)
+        setup_preset(spec, &alc882_presets[board_config]);
+
+    spec->stream_name_analog = "ALC882 Analog";
+    spec->stream_analog_playback = &alc882_pcm_analog_playback;
+    spec->stream_analog_capture = &alc882_pcm_analog_capture;
+
+    spec->stream_name_digital = "ALC882 Digital";
+    spec->stream_digital_playback = &alc882_pcm_digital_playback;
+    spec->stream_digital_capture = &alc882_pcm_digital_capture;
+
+    if (! spec->adc_nids && spec->input_mux) {
+        /* check whether NID 0x07 is valid */
+        unsigned int wcap = get_wcaps(codec, 0x07);
+        wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; /* get type */
+        if (wcap != AC_WID_AUD_IN) {
+            spec->adc_nids = alc882_adc_nids_alt;
+            spec->num_adc_nids = ARRAY_SIZE(alc882_adc_nids_alt);
+            spec->mixers[spec->num_mixers] = alc882_capture_alt_mixer;
+            spec->num_mixers++;
+        } else {
+            spec->adc_nids = alc882_adc_nids;
+            spec->num_adc_nids = ARRAY_SIZE(alc882_adc_nids);
+            spec->mixers[spec->num_mixers] = alc882_capture_mixer;
+            spec->num_mixers++;
+        }
+    }
+
+    codec->patch_ops = alc_patch_ops;
+    if (board_config == ALC882_AUTO)
+        spec->init_hook = alc882_auto_init;
+
+    return 0;
+}
+
+/*
+ * ALC883 support
+ *
+ * ALC883 is almost identical with ALC880 but has cleaner and more flexible
+ * configuration.  Each pin widget can choose any input DACs and a mixer.
+ * Each ADC is connected from a mixer of all inputs.  This makes possible
+ * 6-channel independent captures.
+ *
+ * In addition, an independent DAC for the multi-playback (not used in this
+ * driver yet).
+ */
+#define ALC883_DIGOUT_NID       0x06
+#define ALC883_DIGIN_NID        0x0a
+
+static hda_nid_t alc883_dac_nids[4] = {
+    /* front, rear, clfe, rear_surr */
+    0x02, 0x04, 0x03, 0x05
+};
+
+static hda_nid_t alc883_adc_nids[2] = {
+    /* ADC1-2 */
+    0x08, 0x09,
+};
+/* input MUX */
+/* FIXME: should be a matrix-type input source selection */
+
+static struct hda_input_mux alc883_capture_source = {
+    .num_items = 4,
+    .items = {
+        { "Mic", 0x0 },
+        { "Front Mic", 0x1 },
+        { "Line", 0x2 },
+        { "CD", 0x4 },
+    },
+};
+#define alc883_mux_enum_info alc_mux_enum_info
+#define alc883_mux_enum_get alc_mux_enum_get
+
+static int alc883_mux_enum_put(struct snd_kcontrol *kcontrol,
+                               struct snd_ctl_elem_value *ucontrol)
+{
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    struct alc_spec *spec = codec->spec;
+    const struct hda_input_mux *imux = spec->input_mux;
+    unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
+    static hda_nid_t capture_mixers[3] = { 0x24, 0x23, 0x22 };
+    hda_nid_t nid = capture_mixers[adc_idx];
+    unsigned int *cur_val = &spec->cur_mux[adc_idx];
+    unsigned int i, idx;
+
+    idx = ucontrol->value.enumerated.item[0];
+    if (idx >= imux->num_items)
+        idx = imux->num_items - 1;
+    if (*cur_val == idx && ! codec->in_resume)
+        return 0;
+    for (i = 0; i < imux->num_items; i++) {
+        unsigned int v = (i == idx) ? 0x7000 : 0x7080;
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                            v | (imux->items[i].index << 8));
+    }
+    *cur_val = idx;
+    return 1;
+}
+/*
+ * 2ch mode
+ */
+static struct hda_channel_mode alc883_3ST_2ch_modes[1] = {
+    { 2, NULL }
+};
+
+/*
+ * 2ch mode
+ */
+static struct hda_verb alc883_3ST_ch2_init[] = {
+    { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
+    { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
+    { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
+    { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
+    {0} /* end */
+};
+
+/*
+ * 6ch mode
+ */
+static struct hda_verb alc883_3ST_ch6_init[] = {
+    { 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 },
+    { 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 },
+    {0} /* end */
+};
+
+static struct hda_channel_mode alc883_3ST_6ch_modes[2] = {
+    { 2, alc883_3ST_ch2_init },
+    { 6, alc883_3ST_ch6_init },
+};
+
+/*
+ * 6ch mode
+ */
+static struct hda_verb alc883_sixstack_ch6_init[] = {
+    { 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },
+    { 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+    { 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+    { 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+    {0} /* end */
+};
+
+/*
+ * 8ch mode
+ */
+static struct hda_verb alc883_sixstack_ch8_init[] = {
+    { 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+    { 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+    { 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+    { 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+    {0} /* end */
+};
+
+static struct hda_channel_mode alc883_sixstack_modes[2] = {
+    { 6, alc883_sixstack_ch6_init },
+    { 8, alc883_sixstack_ch8_init },
+};
+
+/* Pin assignment: Front=0x14, Rear=0x15, CLFE=0x16, Side=0x17
+ *                 Mic=0x18, Front Mic=0x19, Line-In=0x1a, HP=0x1b
+ */
+
+static struct snd_kcontrol_new alc883_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_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
+    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_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+    HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
+    HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
+    HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
+    HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT),
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        /* .name = "Capture Source", */
+        .name = "Input Source",
+        .count = 2,
+        .info = alc883_mux_enum_info,
+        .get = alc883_mux_enum_get,
+        .put = alc883_mux_enum_put,
+    },
+    {0} /* end */
+};
+
+static struct snd_kcontrol_new alc883_3ST_2ch_mixer[] = {
+    HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+    HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
+    HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
+    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_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+    HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
+    HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
+    HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
+    HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT),
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        /* .name = "Capture Source", */
+        .name = "Input Source",
+        .count = 2,
+        .info = alc883_mux_enum_info,
+        .get = alc883_mux_enum_get,
+        .put = alc883_mux_enum_put,
+    },
+    {0} /* end */
+};
+
+static struct snd_kcontrol_new alc883_3ST_6ch_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_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
+    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_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+    HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
+    HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
+    HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
+    HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT),
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        /* .name = "Capture Source", */
+        .name = "Input Source",
+        .count = 2,
+        .info = alc883_mux_enum_info,
+        .get = alc883_mux_enum_get,
+        .put = alc883_mux_enum_put,
+    },
+    {0} /* end */
+};
+
+static struct snd_kcontrol_new alc883_chmode_mixer[] = {
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Channel Mode",
+        .info = alc_ch_mode_info,
+        .get = alc_ch_mode_get,
+        .put = alc_ch_mode_put,
+    },
+    {0} /* end */
+};
+
+static struct hda_verb alc883_init_verbs[] = {
+    /* ADC1: mute amp left and right */
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+    /* ADC2: mute amp left and right */
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
+    /* Front mixer: unmute input/output amp left and right (volume = 0) */
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+    /* Rear mixer */
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+    /* CLFE mixer */
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+    /* Side mixer */
+    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+
+    /* Front Pin: output 0 (0x0c) */
+    {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},
+    /* Rear Pin: output 1 (0x0d) */
+    {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, 0x01},
+    /* CLFE Pin: output 2 (0x0e) */
+    {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+    {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x16, AC_VERB_SET_CONNECT_SEL, 0x02},
+    /* Side Pin: output 3 (0x0f) */
+    {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},
+    /* Mic (rear) pin: input vref at 80% */
+    {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    /* Front Mic pin: input vref at 80% */
+    {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    /* Line In pin: input */
+    {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+    {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    /* Line-2 In: Headphone output (output 0 - 0x0c) */
+    {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+    {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},
+    /* CD pin widget for input */
+    {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+
+    /* FIXME: use matrix-type input source selection */
+    /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */
+    /* Input mixer2 */
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+    /* Input mixer3 */
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+    {0}
+};
+
+/*
+ * generic initialization of ADC, input mixers and output mixers
+ */
+static struct hda_verb alc883_auto_init_verbs[] = {
+    /*
+     * Unmute ADC0-2 and set the default input to mic-in
+     */
+    {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+
+    /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
+     * mixer widget
+     * Note: PASD motherboards uses the Line In 2 as the input for front panel
+     * mic (mic 2)
+     */
+    /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+
+    /*
+     * Set up output mixers (0x0c - 0x0f)
+     */
+    /* set vol=0 to output mixers */
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    /* set up input amps for analog loopback */
+    /* Amp Indices: DAC = 0, mixer = 1 */
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+
+    /* FIXME: use matrix-type input source selection */
+    /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */
+    /* Input mixer1 */
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+    //{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+    /* Input mixer2 */
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+    //{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+
+    {0}
+};
+
+/* capture mixer elements */
+static struct snd_kcontrol_new alc883_capture_mixer[] = {
+    HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT),
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        /* The multiple "Capture Source" controls confuse alsamixer
+         * So call somewhat different..
+         * FIXME: the controls appear in the "playback" view!
+         */
+        /* .name = "Capture Source", */
+        .name = "Input Source",
+        .count = 2,
+        .info = alc882_mux_enum_info,
+        .get = alc882_mux_enum_get,
+        .put = alc882_mux_enum_put,
+    },
+    {0} /* end */
+};
+
+/* pcm configuration: identiacal with ALC880 */
+#define alc883_pcm_analog_playback      alc880_pcm_analog_playback
+#define alc883_pcm_analog_capture       alc880_pcm_analog_capture
+#define alc883_pcm_digital_playback     alc880_pcm_digital_playback
+#define alc883_pcm_digital_capture      alc880_pcm_digital_capture
+
+/*
+ * configuration and preset
+ */
+static struct hda_board_config alc883_cfg_tbl[] = {
+    { .modelname = "3stack-dig", .config = ALC883_3ST_2ch_DIG },
+    { .modelname = "6stack-dig", .config = ALC883_6ST_DIG },
+    { .modelname = "6stack-dig-demo", .config = ALC888_DEMO_BOARD },
+    { .pci_subvendor = 0x1462, .pci_subdevice = 0x6668,
+    .config = ALC883_6ST_DIG }, /* MSI  */
+    { .pci_subvendor = 0x105b, .pci_subdevice = 0x6668,
+    .config = ALC883_6ST_DIG }, /* Foxconn */
+    { .pci_subvendor = 0x1019, .pci_subdevice = 0x6668,
+    .config = ALC883_3ST_6ch_DIG }, /* ECS to Intel*/
+    { .pci_subvendor = 0x108e, .pci_subdevice = 0x534d,
+    .config = ALC883_3ST_6ch },
+    { .modelname = "auto", .config = ALC883_AUTO },
+    {0}
+};
+
+static struct alc_config_preset alc883_presets[] = {
+    [ALC883_3ST_2ch_DIG] = {
+        .mixers = { alc883_3ST_2ch_mixer },
+        .init_verbs = { alc883_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc883_dac_nids),
+        .dac_nids = alc883_dac_nids,
+        .dig_out_nid = ALC883_DIGOUT_NID,
+        .num_adc_nids = ARRAY_SIZE(alc883_adc_nids),
+        .adc_nids = alc883_adc_nids,
+        .dig_in_nid = ALC883_DIGIN_NID,
+        .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
+        .channel_mode = alc883_3ST_2ch_modes,
+        .input_mux = &alc883_capture_source,
+    },
+    [ALC883_3ST_6ch_DIG] = {
+        .mixers = { alc883_3ST_6ch_mixer, alc883_chmode_mixer },
+        .init_verbs = { alc883_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc883_dac_nids),
+        .dac_nids = alc883_dac_nids,
+        .dig_out_nid = ALC883_DIGOUT_NID,
+        .num_adc_nids = ARRAY_SIZE(alc883_adc_nids),
+        .adc_nids = alc883_adc_nids,
+        .dig_in_nid = ALC883_DIGIN_NID,
+        .num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes),
+        .channel_mode = alc883_3ST_6ch_modes,
+        .input_mux = &alc883_capture_source,
+    },
+    [ALC883_3ST_6ch] = {
+        .mixers = { alc883_3ST_6ch_mixer, alc883_chmode_mixer },
+        .init_verbs = { alc883_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc883_dac_nids),
+        .dac_nids = alc883_dac_nids,
+        .num_adc_nids = ARRAY_SIZE(alc883_adc_nids),
+        .adc_nids = alc883_adc_nids,
+        .num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes),
+        .channel_mode = alc883_3ST_6ch_modes,
+        .input_mux = &alc883_capture_source,
+    },
+    [ALC883_6ST_DIG] = {
+        .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 = ALC883_DIGOUT_NID,
+        .num_adc_nids = ARRAY_SIZE(alc883_adc_nids),
+        .adc_nids = alc883_adc_nids,
+        .dig_in_nid = ALC883_DIGIN_NID,
+        .num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes),
+        .channel_mode = alc883_sixstack_modes,
+        .input_mux = &alc883_capture_source,
+    },
+    [ALC888_DEMO_BOARD] = {
+        .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 = ALC883_DIGOUT_NID,
+        .num_adc_nids = ARRAY_SIZE(alc883_adc_nids),
+        .adc_nids = alc883_adc_nids,
+        .dig_in_nid = ALC883_DIGIN_NID,
+        .num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes),
+        .channel_mode = alc883_sixstack_modes,
+        .input_mux = &alc883_capture_source,
+    },
+};
+
+
+/*
+ * BIOS auto configuration
+ */
+static void alc883_auto_set_output_and_unmute(struct hda_codec *codec,
+                                              hda_nid_t nid, int pin_type,
+                                              int dac_idx)
+{
+    /* set as output */
+    struct alc_spec *spec = codec->spec;
+    int idx;
+
+    if (spec->multiout.dac_nids[dac_idx] == 0x25)
+        idx = 4;
+    else
+        idx = spec->multiout.dac_nids[dac_idx] - 2;
+
+    snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
+                        pin_type);
+    snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                        AMP_OUT_UNMUTE);
+    snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL, idx);
+
+}
+
+static void alc883_auto_init_multi_out(struct hda_codec *codec)
+{
+    struct alc_spec *spec = codec->spec;
+    int i;
+
+    for (i = 0; i <= HDA_SIDE; i++) {
+        hda_nid_t nid = spec->autocfg.line_out_pins[i];
+        if (nid)
+            alc883_auto_set_output_and_unmute(codec, nid, PIN_OUT, i);
+    }
+}
+
+static void alc883_auto_init_hp_out(struct hda_codec *codec)
+{
+    struct alc_spec *spec = codec->spec;
+    hda_nid_t pin;
+
+    pin = spec->autocfg.hp_pin;
+    if (pin) /* connect to front */
+        /* use dac 0 */
+        alc883_auto_set_output_and_unmute(codec, pin, PIN_HP, 0);
+}
+
+#define alc883_is_input_pin(nid)        alc880_is_input_pin(nid)
+#define ALC883_PIN_CD_NID               ALC880_PIN_CD_NID
+
+static void alc883_auto_init_analog_input(struct hda_codec *codec)
+{
+    struct alc_spec *spec = codec->spec;
+    int i;
+
+    for (i = 0; i < AUTO_PIN_LAST; i++) {
+        hda_nid_t nid = spec->autocfg.input_pins[i];
+        if (alc883_is_input_pin(nid)) {
+            snd_hda_codec_write(codec, nid, 0,
+                                AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                (i <= AUTO_PIN_FRONT_MIC ?
+                                 PIN_VREF80 : PIN_IN));
+            if (nid != ALC883_PIN_CD_NID)
+                snd_hda_codec_write(codec, nid, 0,
+                                    AC_VERB_SET_AMP_GAIN_MUTE,
+                                    AMP_OUT_MUTE);
+        }
+    }
+}
+
+/* almost identical with ALC880 parser... */
+static int alc883_parse_auto_config(struct hda_codec *codec)
+{
+    struct alc_spec *spec = codec->spec;
+    int err = alc880_parse_auto_config(codec);
+
+    if (err < 0)
+        return err;
+    else if (err > 0)
+        /* hack - override the init verbs */
+        spec->init_verbs[0] = alc883_auto_init_verbs;
+    spec->mixers[spec->num_mixers] = alc883_capture_mixer;
+    spec->num_mixers++;
+    return err;
+}
+
+/* additional initialization for auto-configuration model */
+static void alc883_auto_init(struct hda_codec *codec)
+{
+    alc883_auto_init_multi_out(codec);
+    alc883_auto_init_hp_out(codec);
+    alc883_auto_init_analog_input(codec);
+}
+
+static int patch_alc883(struct hda_codec *codec)
+{
+    struct alc_spec *spec;
+    int err, board_config;
+
+    spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+    if (spec == NULL)
+        return -ENOMEM;
+
+    codec->spec = spec;
+
+    board_config = snd_hda_check_board_config(codec, alc883_cfg_tbl);
+    if (board_config < 0 || board_config >= ALC883_MODEL_LAST) {
+        printk(KERN_INFO "hda_codec: Unknown model for ALC883, "
+               "trying auto-probe from BIOS...\n");
+        board_config = ALC883_AUTO;
+    }
+
+    if (board_config == ALC883_AUTO) {
+        /* automatic parse from the BIOS config */
+        err = alc883_parse_auto_config(codec);
+        if (err < 0) {
+            alc_free(codec);
+            return err;
+        } else if (! err) {
+            printk(KERN_INFO
+                   "hda_codec: Cannot set up configuration "
+                   "from BIOS.  Using base mode...\n");
+            board_config = ALC883_3ST_2ch_DIG;
+        }
+    }
+
+    if (board_config != ALC883_AUTO)
+        setup_preset(spec, &alc883_presets[board_config]);
+
+    spec->stream_name_analog = "ALC883 Analog";
+    spec->stream_analog_playback = &alc883_pcm_analog_playback;
+    spec->stream_analog_capture = &alc883_pcm_analog_capture;
+
+    spec->stream_name_digital = "ALC883 Digital";
+    spec->stream_digital_playback = &alc883_pcm_digital_playback;
+    spec->stream_digital_capture = &alc883_pcm_digital_capture;
+
+    spec->adc_nids = alc883_adc_nids;
+    spec->num_adc_nids = ARRAY_SIZE(alc883_adc_nids);
+
+    codec->patch_ops = alc_patch_ops;
+    if (board_config == ALC883_AUTO)
+        spec->init_hook = alc883_auto_init;
+    return 0;
 }
 
@@ -4439 +5086 @@
 
 static struct snd_kcontrol_new alc262_base_mixer[] = {
-        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
-        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_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
-        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
-        /* HDA_CODEC_VOLUME("PC Beep Playback Volume", 0x0b, 0x05, HDA_INPUT),
-           HDA_CODEC_MUTE("PC Beelp Playback Switch", 0x0b, 0x05, HDA_INPUT), */
-        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0D, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x16, 2, 0x0, HDA_OUTPUT),
-        {0} /* end */
+    HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
+    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_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
+    HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
+    /* HDA_CODEC_VOLUME("PC Beep Playback Volume", 0x0b, 0x05, HDA_INPUT),
+     HDA_CODEC_MUTE("PC Beelp Playback Switch", 0x0b, 0x05, HDA_INPUT), */
+    HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0D, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
+    HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x16, 2, 0x0, HDA_OUTPUT),
+    {0} /* end */
+};
+
+static struct snd_kcontrol_new alc262_HP_BPC_mixer[] = {
+    HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Front Playback Switch", 0x15, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
+    HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x16, 2, 0x0, HDA_OUTPUT),
+
+    HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
+    HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, 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("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
+    HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
+    HDA_CODEC_VOLUME("PC Beep Playback Volume", 0x0b, 0x05, HDA_INPUT),
+    HDA_CODEC_MUTE("PC Beep Playback Switch", 0x0b, 0x05, HDA_INPUT),
+    HDA_CODEC_VOLUME("AUX IN Playback Volume", 0x0b, 0x06, HDA_INPUT),
+    HDA_CODEC_MUTE("AUX IN Playback Switch", 0x0b, 0x06, HDA_INPUT),
+    {0} /* end */
 };
 
@@ -4465 +5134 @@
  */
 static struct hda_verb alc262_init_verbs[] = {
-        /*
-         * Unmute ADC0-2 and set the default input to mic-in
-         */
-        {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-
-        /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
-         * mixer widget
-         * Note: PASD motherboards uses the Line In 2 as the input for front panel
-         * mic (mic 2)
-         */
-        /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
-
-        /*
-         * Set up output mixers (0x0c - 0x0e)
-         */
-        /* set vol=0 to output mixers */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        /* set up input amps for analog loopback */
-        /* Amp Indices: DAC = 0, mixer = 1 */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},
-        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
-        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
-        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
-
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-
-        {0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
-
-        /* FIXME: use matrix-type input source selection */
-        /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */
-        /* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */
-        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
-        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
-        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
-        /* Input mixer2 */
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
-        /* Input mixer3 */
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
-
-        {0}
+    /*
+     * Unmute ADC0-2 and set the default input to mic-in
+     */
+    {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+
+    /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
+     * mixer widget
+     * Note: PASD motherboards uses the Line In 2 as the input for front panel
+     * mic (mic 2)
+     */
+    /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+
+    /*
+     * Set up output mixers (0x0c - 0x0e)
+     */
+    /* set vol=0 to output mixers */
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    /* set up input amps for analog loopback */
+    /* Amp Indices: DAC = 0, mixer = 1 */
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+
+    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+    {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},
+    {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+    {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
+    {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
+    {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
+
+    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
+    {0x16, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
+    {0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
+    {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
+
+    {0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
+
+    /* FIXME: use matrix-type input source selection */
+    /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */
+    /* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */
+    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
+    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
+    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
+    /* Input mixer2 */
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
+    /* Input mixer3 */
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
+
+    {0}
 };
 
@@ -4548 +5217 @@
 
 static struct hda_verb alc262_fujitsu_unsol_verbs[] = {
-        {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
-        {0}
+    {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},
+    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+    {0}
 };
 
 static struct hda_input_mux alc262_fujitsu_capture_source = {
-        .num_items = 2,
-        .items = {
-                { "Mic", 0x0 },
-                { "CD", 0x4 },
-        },
+    .num_items = 2,
+    .items = {
+        { "Mic", 0x0 },
+        { "CD", 0x4 },
+    },
+};
+
+static struct hda_input_mux alc262_HP_capture_source = {
+    .num_items = 5,
+    .items = {
+        { "Mic", 0x0 },
+        { "Front Mic", 0x3 },
+        { "Line", 0x2 },
+        { "CD", 0x4 },
+        { "AUX IN", 0x6 },
+    },
 };
 
@@ -4564 +5244 @@
 static void alc262_fujitsu_automute(struct hda_codec *codec, int force)
 {
-        struct alc_spec *spec = codec->spec;
-        unsigned int mute;
-
-        if (force || ! spec->sense_updated) {
-                unsigned int present;
-                /* need to execute and sync at first */
-                snd_hda_codec_read(codec, 0x14, 0, AC_VERB_SET_PIN_SENSE, 0);
-                present = snd_hda_codec_read(codec, 0x14, 0,
-                                         AC_VERB_GET_PIN_SENSE, 0);
-                spec->jack_present = (present & 0x80000000) != 0;
-                spec->sense_updated = 1;
-        }
-        if (spec->jack_present) {
-                /* mute internal speaker */
-                snd_hda_codec_amp_update(codec, 0x15, 0, HDA_OUTPUT, 0,
-                                         0x80, 0x80);
-                snd_hda_codec_amp_update(codec, 0x15, 1, HDA_OUTPUT, 0,
-                                         0x80, 0x80);
-        } else {
-                /* unmute internal speaker if necessary */
-                mute = snd_hda_codec_amp_read(codec, 0x14, 0, HDA_OUTPUT, 0);
-                snd_hda_codec_amp_update(codec, 0x15, 0, HDA_OUTPUT, 0,
-                                         0x80, mute & 0x80);
-                mute = snd_hda_codec_amp_read(codec, 0x14, 1, HDA_OUTPUT, 0);
-                snd_hda_codec_amp_update(codec, 0x15, 1, HDA_OUTPUT, 0,
-                                         0x80, mute & 0x80);
-        }
+    struct alc_spec *spec = codec->spec;
+    unsigned int mute;
+
+    if (force || ! spec->sense_updated) {
+        unsigned int present;
+        /* need to execute and sync at first */
+        snd_hda_codec_read(codec, 0x14, 0, AC_VERB_SET_PIN_SENSE, 0);
+        present = snd_hda_codec_read(codec, 0x14, 0,
+                                     AC_VERB_GET_PIN_SENSE, 0);
+        spec->jack_present = (present & 0x80000000) != 0;
+        spec->sense_updated = 1;
+    }
+    if (spec->jack_present) {
+        /* mute internal speaker */
+        snd_hda_codec_amp_update(codec, 0x15, 0, HDA_OUTPUT, 0,
+                                 0x80, 0x80);
+        snd_hda_codec_amp_update(codec, 0x15, 1, HDA_OUTPUT, 0,
+                                 0x80, 0x80);
+    } else {
+        /* unmute internal speaker if necessary */
+        mute = snd_hda_codec_amp_read(codec, 0x14, 0, HDA_OUTPUT, 0);
+        snd_hda_codec_amp_update(codec, 0x15, 0, HDA_OUTPUT, 0,
+                                 0x80, mute & 0x80);
+        mute = snd_hda_codec_amp_read(codec, 0x14, 1, HDA_OUTPUT, 0);
+        snd_hda_codec_amp_update(codec, 0x15, 1, HDA_OUTPUT, 0,
+                                 0x80, mute & 0x80);
+    }
 }
 
 /* unsolicited event for HP jack sensing */
 static void alc262_fujitsu_unsol_event(struct hda_codec *codec,
-                                       unsigned int res)
-{
-        if ((res >> 26) != ALC_HP_EVENT)
-                return;
-        alc262_fujitsu_automute(codec, 1);
+                                       unsigned int res)
+{
+    if ((res >> 26) != ALC_HP_EVENT)
+        return;
+    alc262_fujitsu_automute(codec, 1);
 }
 
 /* bind volumes of both NID 0x0c and 0x0d */
 static int alc262_fujitsu_master_vol_put(struct snd_kcontrol *kcontrol,
-                                         struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        long *valp = ucontrol->value.integer.value;
-        int change;
-
-        change = snd_hda_codec_amp_update(codec, 0x0c, 0, HDA_OUTPUT, 0,
-                                          0x7f, valp[0] & 0x7f);
-        change |= snd_hda_codec_amp_update(codec, 0x0c, 1, HDA_OUTPUT, 0,
-                                           0x7f, valp[1] & 0x7f);
-        snd_hda_codec_amp_update(codec, 0x0d, 0, HDA_OUTPUT, 0,
-                                 0x7f, valp[0] & 0x7f);
-        snd_hda_codec_amp_update(codec, 0x0d, 1, HDA_OUTPUT, 0,
-                                 0x7f, valp[1] & 0x7f);
-        return change;
+                                         struct snd_ctl_elem_value *ucontrol)
+{
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    long *valp = ucontrol->value.integer.value;
+    int change;
+
+    change = snd_hda_codec_amp_update(codec, 0x0c, 0, HDA_OUTPUT, 0,
+                                      0x7f, valp[0] & 0x7f);
+    change |= snd_hda_codec_amp_update(codec, 0x0c, 1, HDA_OUTPUT, 0,
+                                       0x7f, valp[1] & 0x7f);
+    snd_hda_codec_amp_update(codec, 0x0d, 0, HDA_OUTPUT, 0,
+                             0x7f, valp[0] & 0x7f);
+    snd_hda_codec_amp_update(codec, 0x0d, 1, HDA_OUTPUT, 0,
+                             0x7f, valp[1] & 0x7f);
+    return change;
 }
 
 /* bind hp and internal speaker mute (with plug check) */
 static int alc262_fujitsu_master_sw_put(struct snd_kcontrol *kcontrol,
-                                         struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        long *valp = ucontrol->value.integer.value;
-        int change;
-
-        change = snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0,
-                                          0x80, valp[0] ? 0 : 0x80);
-        change |= snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0,
-                                           0x80, valp[1] ? 0 : 0x80);
-        if (change || codec->in_resume)
-                alc262_fujitsu_automute(codec, codec->in_resume);
-        return change;
+                                        struct snd_ctl_elem_value *ucontrol)
+{
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    long *valp = ucontrol->value.integer.value;
+    int change;
+
+    change = snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0,
+                                      0x80, valp[0] ? 0 : 0x80);
+    change |= snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0,
+                                       0x80, valp[1] ? 0 : 0x80);
+    if (change || codec->in_resume)
+        alc262_fujitsu_automute(codec, codec->in_resume);
+    return change;
 }
 
 static struct snd_kcontrol_new alc262_fujitsu_mixer[] = {
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Master Playback Volume",
-                .info = snd_hda_mixer_amp_volume_info,
-                .get = snd_hda_mixer_amp_volume_get,
-                .put = alc262_fujitsu_master_vol_put,
-                .private_value = HDA_COMPOSE_AMP_VAL(0x0c, 3, 0, HDA_OUTPUT),
-        },
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Master Playback Switch",
-                .info = snd_hda_mixer_amp_switch_info,
-                .get = snd_hda_mixer_amp_switch_get,
-                .put = alc262_fujitsu_master_sw_put,
-                .private_value = HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
-        },
-        HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
-        HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        {0} /* end */
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Master Playback Volume",
+        .info = snd_hda_mixer_amp_volume_info,
+        .get = snd_hda_mixer_amp_volume_get,
+        .put = alc262_fujitsu_master_vol_put,
+        .private_value = HDA_COMPOSE_AMP_VAL(0x0c, 3, 0, HDA_OUTPUT),
+    },
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Master Playback Switch",
+        .info = snd_hda_mixer_amp_switch_info,
+        .get = snd_hda_mixer_amp_switch_get,
+        .put = alc262_fujitsu_master_sw_put,
+        .private_value = HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
+    },
+    HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
+    HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
+    HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+    HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+    {0} /* end */
 };
 
@@ -4666 +5346 @@
 static int alc262_auto_create_multi_out_ctls(struct alc_spec *spec, const struct auto_pin_cfg *cfg)
 {
-        hda_nid_t nid;
-        int err;
-
-        spec->multiout.num_dacs = 1;    /* only use one dac */
-        spec->multiout.dac_nids = spec->private_dac_nids;
-        spec->multiout.dac_nids[0] = 2;
-
-        nid = cfg->line_out_pins[0];
-        if (nid) {
-                if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, "Front Playback Volume",
-                                       HDA_COMPOSE_AMP_VAL(0x0c, 3, 0, HDA_OUTPUT))) < 0)
-                        return err;
-                if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, "Front Playback Switch",
-                                       HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
-                        return err;
-        }
-
-        nid = cfg->speaker_pins[0];
-        if (nid) {
-                if (nid == 0x16) {
-                        if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, "Speaker Playback Switch",
-                                               HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT))) < 0)
-                                return err;
-                } else {
-                        if (! cfg->line_out_pins[0])
-                                if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, "Speaker Playback Volume",
-                                               HDA_COMPOSE_AMP_VAL(0x0c, 3, 0, HDA_OUTPUT))) < 0)
-                                        return err;
-                        if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, "Speaker Playback Switch",
-                                               HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
-                                return err;
-                }
-        }
-        nid = cfg->hp_pin;
-        if (nid) {
-                /* spec->multiout.hp_nid = 2; */
-                if (nid == 0x16) {
-                        if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, "Headphone Playback Volume",
-                                               HDA_COMPOSE_AMP_VAL(0x0e, 2, 0, HDA_OUTPUT))) < 0)
-                                return err;
-                        if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, "Headphone Playback Switch",
-                                               HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT))) < 0)
-                                return err;
-                } else {
-                        if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, "Headphone Playback Switch",
-                                               HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
-                                return err;
-                }
-        }
-        return 0;
+    hda_nid_t nid;
+    int err;
+
+    spec->multiout.num_dacs = 1;        /* only use one dac */
+    spec->multiout.dac_nids = spec->private_dac_nids;
+    spec->multiout.dac_nids[0] = 2;
+
+    nid = cfg->line_out_pins[0];
+    if (nid) {
+        if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, "Front Playback Volume",
+                               HDA_COMPOSE_AMP_VAL(0x0c, 3, 0, HDA_OUTPUT))) < 0)
+            return err;
+        if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, "Front Playback Switch",
+                               HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
+            return err;
+    }
+
+    nid = cfg->speaker_pins[0];
+    if (nid) {
+        if (nid == 0x16) {
+            if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, "Speaker Playback Switch",
+                                   HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT))) < 0)
+                return err;
+        } else {
+            if (! cfg->line_out_pins[0])
+                if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, "Speaker Playback Volume",
+                                       HDA_COMPOSE_AMP_VAL(0x0c, 3, 0, HDA_OUTPUT))) < 0)
+                    return err;
+            if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, "Speaker Playback Switch",
+                                   HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
+                return err;
+        }
+    }
+    nid = cfg->hp_pin;
+    if (nid) {
+        /* spec->multiout.hp_nid = 2; */
+        if (nid == 0x16) {
+            if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, "Headphone Playback Volume",
+                                   HDA_COMPOSE_AMP_VAL(0x0e, 2, 0, HDA_OUTPUT))) < 0)
+                return err;
+            if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, "Headphone Playback Switch",
+                                   HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT))) < 0)
+                return err;
+        } else {
+            if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, "Headphone Playback Switch",
+                                   HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
+                return err;
+        }
+    }
+    return 0;
 }
 
@@ -4725 +5405 @@
  */
 static struct hda_verb alc262_volume_init_verbs[] = {
-        /*
-         * Unmute ADC0-2 and set the default input to mic-in
-         */
-        {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-
-        /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
-         * mixer widget
-         * Note: PASD motherboards uses the Line In 2 as the input for front panel
-         * mic (mic 2)
-         */
-        /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
-
-        /*
-         * Set up output mixers (0x0c - 0x0f)
-         */
-        /* set vol=0 to output mixers */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-
-        /* set up input amps for analog loopback */
-        /* Amp Indices: DAC = 0, mixer = 1 */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-
-        /* FIXME: use matrix-type input source selection */
-        /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */
-        /* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */
-        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
-        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
-        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
-        /* Input mixer2 */
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
-        /* Input mixer3 */
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
-
-        {0}
+    /*
+     * Unmute ADC0-2 and set the default input to mic-in
+     */
+    {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+
+    /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
+     * mixer widget
+     * Note: PASD motherboards uses the Line In 2 as the input for front panel
+     * mic (mic 2)
+     */
+    /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+
+    /*
+     * Set up output mixers (0x0c - 0x0f)
+     */
+    /* set vol=0 to output mixers */
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+
+    /* set up input amps for analog loopback */
+    /* Amp Indices: DAC = 0, mixer = 1 */
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+
+    /* FIXME: use matrix-type input source selection */
+    /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */
+    /* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */
+    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
+    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
+    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
+    /* Input mixer2 */
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
+    /* Input mixer3 */
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
+
+    {0}
+};
+
+static struct hda_verb alc262_HP_BPC_init_verbs[] = {
+    /*
+     * Unmute ADC0-2 and set the default input to mic-in
+     */
+    {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+
+    /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
+     * mixer widget
+     * Note: PASD motherboards uses the Line In 2 as the input for front panel
+     * mic (mic 2)
+     */
+    /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(5)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(6)},
+
+    /*
+     * Set up output mixers (0x0c - 0x0e)
+     */
+    /* set vol=0 to output mixers */
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+
+    /* set up input amps for analog loopback */
+    /* Amp Indices: DAC = 0, mixer = 1 */
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+
+    {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},
+    {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+    {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+
+    {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
+
+    {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
+    {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
+    {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
+    {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
+    {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
+
+    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x7023 },
+    {0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 },
+    {0x19, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 },
+    {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0x7023 },
+    {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 },
+    {0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 },
+
+
+    /* FIXME: use matrix-type input source selection */
+    /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */
+    /* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */
+    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x03 << 8))},
+    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8))},
+    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 << 8))},
+    /* Input mixer2 */
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x03 << 8))},
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8))},
+    {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 << 8))},
+    /* Input mixer3 */
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x03 << 8))},
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8))},
+    {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 << 8))},
+
+    {0}
 };
 
@@ -4796 +5563 @@
 static int alc262_parse_auto_config(struct hda_codec *codec)
 {
-        struct alc_spec *spec = codec->spec;
-        int err;
-        static hda_nid_t alc262_ignore[] = { 0x1d, 0 };
-
-        if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
-                                                alc262_ignore)) < 0)
-            return err;
-        if (! spec->autocfg.line_outs)
-                return 0; /* can't find valid BIOS pin config */
-        if ((err = alc262_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 ||
-            (err = alc262_auto_create_analog_input_ctls(spec, &spec->autocfg)) < 0)
-                return err;
-
-        spec->multiout.max_channels = spec->multiout.num_dacs * 2;
-
-        if (spec->autocfg.dig_out_pin)
-                spec->multiout.dig_out_nid = ALC262_DIGOUT_NID;
-        if (spec->autocfg.dig_in_pin)
-                spec->dig_in_nid = ALC262_DIGIN_NID;
-
-        if (spec->kctl_alloc)
-                spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
-
-        spec->init_verbs[spec->num_init_verbs++] = alc262_volume_init_verbs;
-        spec->input_mux = &spec->private_imux;
-
-        return 1;
+    struct alc_spec *spec = codec->spec;
+    int err;
+    static hda_nid_t alc262_ignore[] = { 0x1d, 0 };
+
+    if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
+                                            alc262_ignore)) < 0)
+        return err;
+    if (! spec->autocfg.line_outs)
+        return 0; /* can't find valid BIOS pin config */
+    if ((err = alc262_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 ||
+        (err = alc262_auto_create_analog_input_ctls(spec, &spec->autocfg)) < 0)
+        return err;
+
+    spec->multiout.max_channels = spec->multiout.num_dacs * 2;
+
+    if (spec->autocfg.dig_out_pin)
+        spec->multiout.dig_out_nid = ALC262_DIGOUT_NID;
+    if (spec->autocfg.dig_in_pin)
+        spec->dig_in_nid = ALC262_DIGIN_NID;
+
+    if (spec->kctl_alloc)
+        spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
+
+    spec->init_verbs[spec->num_init_verbs++] = alc262_volume_init_verbs;
+    spec->input_mux = &spec->private_imux;
+
+    return 1;
 }
 
@@ -4842 +5609 @@
  */
 static struct hda_board_config alc262_cfg_tbl[] = {
-        { .modelname = "basic", .config = ALC262_BASIC },
-        { .modelname = "fujitsu", .config = ALC262_FUJITSU },
-        { .pci_subvendor = 0x10cf, .pci_subdevice = 0x1397, .config = ALC262_FUJITSU },
-        { .modelname = "auto", .config = ALC262_AUTO },
-        {0}
+    { .modelname = "basic", .config = ALC262_BASIC },
+    { .modelname = "fujitsu", .config = ALC262_FUJITSU },
+    { .pci_subvendor = 0x10cf, .pci_subdevice = 0x1397,
+    .config = ALC262_FUJITSU },
+    { .pci_subvendor = 0x103c, .pci_subdevice = 0x208c,
+    .config = ALC262_HP_BPC }, /* xw4400 */
+    { .pci_subvendor = 0x103c, .pci_subdevice = 0x3014,
+    .config = ALC262_HP_BPC }, /* xw6400 */
+    { .pci_subvendor = 0x103c, .pci_subdevice = 0x3015,
+    .config = ALC262_HP_BPC }, /* xw8400 */
+    { .pci_subvendor = 0x103c, .pci_subdevice = 0x12fe,
+    .config = ALC262_HP_BPC }, /* xw9400 */
+    { .modelname = "auto", .config = ALC262_AUTO },
+    {0}
 };
 
 static struct alc_config_preset alc262_presets[] = {
-        [ALC262_BASIC] = {
-                .mixers = { alc262_base_mixer },
-                .init_verbs = { alc262_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc262_dac_nids),
-                .dac_nids = alc262_dac_nids,
-                .hp_nid = 0x03,
-                .num_channel_mode = ARRAY_SIZE(alc262_modes),
-                .channel_mode = alc262_modes,
-                .input_mux = &alc262_capture_source,
-        },
-        [ALC262_FUJITSU] = {
-                .mixers = { alc262_fujitsu_mixer },
-                .init_verbs = { alc262_init_verbs, alc262_fujitsu_unsol_verbs },
-                .num_dacs = ARRAY_SIZE(alc262_dac_nids),
-                .dac_nids = alc262_dac_nids,
-                .hp_nid = 0x03,
-                .dig_out_nid = ALC262_DIGOUT_NID,
-                .num_channel_mode = ARRAY_SIZE(alc262_modes),
-                .channel_mode = alc262_modes,
-                .input_mux = &alc262_fujitsu_capture_source,
-                .unsol_event = alc262_fujitsu_unsol_event,
-        },
+    [ALC262_BASIC] = {
+        .mixers = { alc262_base_mixer },
+        .init_verbs = { alc262_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc262_dac_nids),
+        .dac_nids = alc262_dac_nids,
+        .hp_nid = 0x03,
+        .num_channel_mode = ARRAY_SIZE(alc262_modes),
+        .channel_mode = alc262_modes,
+        .input_mux = &alc262_capture_source,
+    },
+    [ALC262_FUJITSU] = {
+        .mixers = { alc262_fujitsu_mixer },
+        .init_verbs = { alc262_init_verbs, alc262_fujitsu_unsol_verbs },
+        .num_dacs = ARRAY_SIZE(alc262_dac_nids),
+        .dac_nids = alc262_dac_nids,
+        .hp_nid = 0x03,
+        .dig_out_nid = ALC262_DIGOUT_NID,
+        .num_channel_mode = ARRAY_SIZE(alc262_modes),
+        .channel_mode = alc262_modes,
+        .input_mux = &alc262_fujitsu_capture_source,
+        .unsol_event = alc262_fujitsu_unsol_event,
+    },
+    [ALC262_HP_BPC] = {
+        .mixers = { alc262_HP_BPC_mixer },
+        .init_verbs = { alc262_HP_BPC_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc262_dac_nids),
+        .dac_nids = alc262_dac_nids,
+        .hp_nid = 0x03,
+        .num_channel_mode = ARRAY_SIZE(alc262_modes),
+        .channel_mode = alc262_modes,
+        .input_mux = &alc262_HP_capture_source,
+    },
 };
 
 static int patch_alc262(struct hda_codec *codec)
 {
-        struct alc_spec *spec;
-        int board_config;
-        int err;
-
-        spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
-        if (spec == NULL)
-                return -ENOMEM;
-
-        codec->spec = spec;
+    struct alc_spec *spec;
+    int board_config;
+    int err;
+
+    spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
+    if (spec == NULL)
+        return -ENOMEM;
+
+    codec->spec = spec;
 #if 0
-        /* pshou 07/11/05  set a zero PCM sample to DAC when FIFO is under-run */
-        {
-        int tmp;
-        snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_COEF_INDEX, 7);
-        tmp = snd_hda_codec_read(codec, 0x20, 0, AC_VERB_GET_PROC_COEF, 0);
-        snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_COEF_INDEX, 7);
-        snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_PROC_COEF, tmp | 0x80);
-        }
+    /* pshou 07/11/05  set a zero PCM sample to DAC when FIFO is under-run */
+    {
+        int tmp;
+        snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_COEF_INDEX, 7);
+        tmp = snd_hda_codec_read(codec, 0x20, 0, AC_VERB_GET_PROC_COEF, 0);
+        snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_COEF_INDEX, 7);
+        snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_PROC_COEF, tmp | 0x80);
+    }
 #endif
 
-        board_config = snd_hda_check_board_config(codec, alc262_cfg_tbl);
-        if (board_config < 0 || board_config >= ALC262_MODEL_LAST) {
-                printk(KERN_INFO "hda_codec: Unknown model for ALC262, trying auto-probe from BIOS...\n");
-                board_config = ALC262_AUTO;
-        }
-
-        if (board_config == ALC262_AUTO) {
-                /* automatic parse from the BIOS config */
-                err = alc262_parse_auto_config(codec);
-                if (err < 0) {
-                        alc_free(codec);
-                        return err;
-                } else if (! err) {
-                        printk(KERN_INFO "hda_codec: Cannot set up configuration from BIOS.  Using base mode...\n");
-                        board_config = ALC262_BASIC;
-                }
-        }
-
-        if (board_config != ALC262_AUTO)
-                setup_preset(spec, &alc262_presets[board_config]);
-
-        spec->stream_name_analog = "ALC262 Analog";
-        spec->stream_analog_playback = &alc262_pcm_analog_playback;
-        spec->stream_analog_capture = &alc262_pcm_analog_capture;
-
-        spec->stream_name_digital = "ALC262 Digital";
-        spec->stream_digital_playback = &alc262_pcm_digital_playback;
-        spec->stream_digital_capture = &alc262_pcm_digital_capture;
-
-        if (! spec->adc_nids && spec->input_mux) {
-                /* check whether NID 0x07 is valid */
-                unsigned int wcap = get_wcaps(codec, 0x07);
-
-                wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; /* get type */
-                if (wcap != AC_WID_AUD_IN) {
-                        spec->adc_nids = alc262_adc_nids_alt;
-                        spec->num_adc_nids = ARRAY_SIZE(alc262_adc_nids_alt);
-                        spec->mixers[spec->num_mixers] = alc262_capture_alt_mixer;
-                        spec->num_mixers++;
-                } else {
-                        spec->adc_nids = alc262_adc_nids;
-                        spec->num_adc_nids = ARRAY_SIZE(alc262_adc_nids);
-                        spec->mixers[spec->num_mixers] = alc262_capture_mixer;
-                        spec->num_mixers++;
-                }
-        }
-
-        codec->patch_ops = alc_patch_ops;
-        if (board_config == ALC262_AUTO)
-            spec->init_hook = alc262_auto_init;
-
-        return 0;
+    board_config = snd_hda_check_board_config(codec, alc262_cfg_tbl);
+
+    if (board_config < 0 || board_config >= ALC262_MODEL_LAST) {
+        printk(KERN_INFO "hda_codec: Unknown model for ALC262, trying auto-probe from BIOS...\n");
+        board_config = ALC262_AUTO;
+    }
+
+    if (board_config == ALC262_AUTO) {
+        /* automatic parse from the BIOS config */
+        err = alc262_parse_auto_config(codec);
+        if (err < 0) {
+            alc_free(codec);
+            return err;
+        } else if (! err) {
+            printk(KERN_INFO "hda_codec: Cannot set up configuration from BIOS.  Using base mode...\n");
+            board_config = ALC262_BASIC;
+        }
+    }
+
+    if (board_config != ALC262_AUTO)
+        setup_preset(spec, &alc262_presets[board_config]);
+
+    spec->stream_name_analog = "ALC262 Analog";
+    spec->stream_analog_playback = &alc262_pcm_analog_playback;
+    spec->stream_analog_capture = &alc262_pcm_analog_capture;
+
+    spec->stream_name_digital = "ALC262 Digital";
+    spec->stream_digital_playback = &alc262_pcm_digital_playback;
+    spec->stream_digital_capture = &alc262_pcm_digital_capture;
+
+    if (! spec->adc_nids && spec->input_mux) {
+        /* check whether NID 0x07 is valid */
+        unsigned int wcap = get_wcaps(codec, 0x07);
+
+        wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; /* get type */
+        if (wcap != AC_WID_AUD_IN) {
+            spec->adc_nids = alc262_adc_nids_alt;
+            spec->num_adc_nids = ARRAY_SIZE(alc262_adc_nids_alt);
+            spec->mixers[spec->num_mixers] = alc262_capture_alt_mixer;
+            spec->num_mixers++;
+        } else {
+            spec->adc_nids = alc262_adc_nids;
+            spec->num_adc_nids = ARRAY_SIZE(alc262_adc_nids);
+            spec->mixers[spec->num_mixers] = alc262_capture_mixer;
+            spec->num_mixers++;
+        }
+    }
+
+    codec->patch_ops = alc_patch_ops;
+    if (board_config == ALC262_AUTO)
+        spec->init_hook = alc262_auto_init;
+
+    return 0;
 }
 
@@ -4960 +5747 @@
  */
 static struct hda_verb alc861_threestack_ch2_init[] = {
-        /* set pin widget 1Ah (line in) for input */
-        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
-        /* set pin widget 18h (mic1/2) for input, for mic also enable the vref */
-        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
-
-        { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb00c },
-        { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8)) }, //mic
-        { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8)) }, //line in
-        {0} /* end */
+    /* set pin widget 1Ah (line in) for input */
+    { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+    /* set pin widget 18h (mic1/2) for input, for mic also enable the vref */
+    { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+
+    { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb00c },
+#if 0
+    { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8)) }, /*mic*/
+    { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8)) }, /*line-in*/
+#endif
+    {0} /* end */
 };
 /*
@@ -4975 +5764 @@
  */
 static struct hda_verb alc861_threestack_ch6_init[] = {
-        /* set pin widget 1Ah (line in) for output (Back Surround)*/
-        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
-        /* set pin widget 18h (mic1) for output (CLFE)*/
-        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
-
-        { 0x0c, AC_VERB_SET_CONNECT_SEL, 0x00 },
-        { 0x0d, AC_VERB_SET_CONNECT_SEL, 0x00 },
-
-        { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080 },
-        { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x01 << 8)) }, //mic
-        { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8)) }, //line in
-        {0} /* end */
+    /* set pin widget 1Ah (line in) for output (Back Surround)*/
+    { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+    /* set pin widget 18h (mic1) for output (CLFE)*/
+    { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+
+    { 0x0c, AC_VERB_SET_CONNECT_SEL, 0x00 },
+    { 0x0d, AC_VERB_SET_CONNECT_SEL, 0x00 },
+
+    { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080 },
+#if 0
+    { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x01 << 8)) }, /*mic*/
+    { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8)) }, /*line in*/
+#endif
+    {0} /* end */
 };
 
 static struct hda_channel_mode alc861_threestack_modes[2] = {
-        { 2, alc861_threestack_ch2_init },
-        { 6, alc861_threestack_ch6_init },
+    { 2, alc861_threestack_ch2_init },
+    { 6, alc861_threestack_ch6_init },
 };
 
@@ -4997 +5788 @@
 
 static struct snd_kcontrol_new alc861_base_mixer[] = {
-        /* output mixer control */
-        HDA_CODEC_MUTE("Front Playback Switch", 0x03, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Surround Playback Switch", 0x06, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x05, 1, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x05, 2, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Side Playback Switch", 0x04, 0x0, HDA_OUTPUT),
-
-        /*Input mixer control */
-        /* HDA_CODEC_VOLUME("Input Playback Volume", 0x15, 0x0, HDA_OUTPUT),
-           HDA_CODEC_MUTE("Input Playback Switch", 0x15, 0x0, HDA_OUTPUT), */
-        HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Line Playback Volume", 0x15, 0x02, HDA_INPUT),
-        HDA_CODEC_MUTE("Line Playback Switch", 0x15, 0x02, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Playback Volume", 0x15, 0x01, HDA_INPUT),
-        HDA_CODEC_MUTE("Mic Playback Switch", 0x15, 0x01, HDA_INPUT),
-        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x10, 0x01, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x03, HDA_INPUT),
-
-        /* Capture mixer control */
-        HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Capture Source",
-                .count = 1,
-                .info = alc_mux_enum_info,
-                .get = alc_mux_enum_get,
-                .put = alc_mux_enum_put,
-        },
-        {0} /* end */
+    /* output mixer control */
+    HDA_CODEC_MUTE("Front Playback Switch", 0x03, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Surround Playback Switch", 0x06, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x05, 1, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x05, 2, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Side Playback Switch", 0x04, 0x0, HDA_OUTPUT),
+
+    /*Input mixer control */
+    /* HDA_CODEC_VOLUME("Input Playback Volume", 0x15, 0x0, HDA_OUTPUT),
+     HDA_CODEC_MUTE("Input Playback Switch", 0x15, 0x0, HDA_OUTPUT), */
+    HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME("Line Playback Volume", 0x15, 0x02, HDA_INPUT),
+    HDA_CODEC_MUTE("Line Playback Switch", 0x15, 0x02, HDA_INPUT),
+    HDA_CODEC_VOLUME("Mic Playback Volume", 0x15, 0x01, HDA_INPUT),
+    HDA_CODEC_MUTE("Mic Playback Switch", 0x15, 0x01, HDA_INPUT),
+    HDA_CODEC_MUTE("Front Mic Playback Switch", 0x10, 0x01, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x03, HDA_INPUT),
+
+    /* Capture mixer control */
+    HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Capture Source",
+        .count = 1,
+        .info = alc_mux_enum_info,
+        .get = alc_mux_enum_get,
+        .put = alc_mux_enum_put,
+    },
+    {0} /* end */
 };
 
 static struct snd_kcontrol_new alc861_3ST_mixer[] = {
-        /* output mixer control */
-        HDA_CODEC_MUTE("Front Playback Switch", 0x03, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Surround Playback Switch", 0x06, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x05, 1, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x05, 2, 0x0, HDA_OUTPUT),
-        /*HDA_CODEC_MUTE("Side Playback Switch", 0x04, 0x0, HDA_OUTPUT), */
-
-        /* Input mixer control */
-        /* HDA_CODEC_VOLUME("Input Playback Volume", 0x15, 0x0, HDA_OUTPUT),
-           HDA_CODEC_MUTE("Input Playback Switch", 0x15, 0x0, HDA_OUTPUT), */
-        HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Line Playback Volume", 0x15, 0x02, HDA_INPUT),
-        HDA_CODEC_MUTE("Line Playback Switch", 0x15, 0x02, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Playback Volume", 0x15, 0x01, HDA_INPUT),
-        HDA_CODEC_MUTE("Mic Playback Switch", 0x15, 0x01, HDA_INPUT),
-        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x10, 0x01, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x03, HDA_INPUT),
-
-        /* Capture mixer control */
-        HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Capture Source",
-                .count = 1,
-                .info = alc_mux_enum_info,
-                .get = alc_mux_enum_get,
-                .put = alc_mux_enum_put,
-        },
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Channel Mode",
-                .info = alc_ch_mode_info,
-                .get = alc_ch_mode_get,
-                .put = alc_ch_mode_put,
-                .private_value = ARRAY_SIZE(alc861_threestack_modes),
-        },
-        {0} /* end */
+    /* output mixer control */
+    HDA_CODEC_MUTE("Front Playback Switch", 0x03, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Surround Playback Switch", 0x06, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x05, 1, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x05, 2, 0x0, HDA_OUTPUT),
+    /*HDA_CODEC_MUTE("Side Playback Switch", 0x04, 0x0, HDA_OUTPUT), */
+
+    /* Input mixer control */
+    /* HDA_CODEC_VOLUME("Input Playback Volume", 0x15, 0x0, HDA_OUTPUT),
+     HDA_CODEC_MUTE("Input Playback Switch", 0x15, 0x0, HDA_OUTPUT), */
+    HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME("Line Playback Volume", 0x15, 0x02, HDA_INPUT),
+    HDA_CODEC_MUTE("Line Playback Switch", 0x15, 0x02, HDA_INPUT),
+    HDA_CODEC_VOLUME("Mic Playback Volume", 0x15, 0x01, HDA_INPUT),
+    HDA_CODEC_MUTE("Mic Playback Switch", 0x15, 0x01, HDA_INPUT),
+    HDA_CODEC_MUTE("Front Mic Playback Switch", 0x10, 0x01, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x03, HDA_INPUT),
+
+    /* Capture mixer control */
+    HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Capture Source",
+        .count = 1,
+        .info = alc_mux_enum_info,
+        .get = alc_mux_enum_get,
+        .put = alc_mux_enum_put,
+    },
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Channel Mode",
+        .info = alc_ch_mode_info,
+        .get = alc_ch_mode_get,
+        .put = alc_ch_mode_put,
+        .private_value = ARRAY_SIZE(alc861_threestack_modes),
+    },
+    {0} /* end */
 };
 
@@ -5076 +5867 @@
  */
 static struct hda_verb alc861_base_init_verbs[] = {
-        /*
-         * Unmute ADC0 and set the default input to mic-in
-         */
-        /* port-A for surround (rear panel) */
-        { 0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
-        { 0x0e, AC_VERB_SET_CONNECT_SEL, 0x00 },
-        /* port-B for mic-in (rear panel) with vref */
-        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
-        /* port-C for line-in (rear panel) */
-        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
-        /* port-D for Front */
-        { 0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
-        { 0x0b, AC_VERB_SET_CONNECT_SEL, 0x00 },
-        /* port-E for HP out (front panel) */
-        { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
-        /* route front PCM to HP */
-        { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x01 },
-        /* port-F for mic-in (front panel) with vref */
-        { 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
-        /* port-G for CLFE (rear panel) */
-        { 0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
-        { 0x1f, AC_VERB_SET_CONNECT_SEL, 0x00 },
-        /* port-H for side (rear panel) */
-        { 0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
-        { 0x20, AC_VERB_SET_CONNECT_SEL, 0x00 },
-        /* CD-in */
-        { 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
-        /* route front mic to ADC1*/
-        {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-
-        /* Unmute DAC0~3 & spdif out*/
-        {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-
-        /* Unmute Mixer 14 (mic) 1c (Line in)*/
-        {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-
-        /* Unmute Stereo Mixer 15 */
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb00c          }, //Output 0~12 step
-
-        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)}, // hp used DAC 3 (Front)
-        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-
-        {0}
+    /*
+     * Unmute ADC0 and set the default input to mic-in
+     */
+    /* port-A for surround (rear panel) */
+    { 0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+    { 0x0e, AC_VERB_SET_CONNECT_SEL, 0x00 },
+    /* port-B for mic-in (rear panel) with vref */
+    { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+    /* port-C for line-in (rear panel) */
+    { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+    /* port-D for Front */
+    { 0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+    { 0x0b, AC_VERB_SET_CONNECT_SEL, 0x00 },
+    /* port-E for HP out (front panel) */
+    { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+    /* route front PCM to HP */
+    { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x01 },
+    /* port-F for mic-in (front panel) with vref */
+    { 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+    /* port-G for CLFE (rear panel) */
+    { 0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+    { 0x1f, AC_VERB_SET_CONNECT_SEL, 0x00 },
+    /* port-H for side (rear panel) */
+    { 0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+    { 0x20, AC_VERB_SET_CONNECT_SEL, 0x00 },
+    /* CD-in */
+    { 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+    /* route front mic to ADC1*/
+    {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+
+    /* Unmute DAC0~3 & spdif out*/
+    {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+
+    /* Unmute Mixer 14 (mic) 1c (Line in)*/
+    {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+
+    /* Unmute Stereo Mixer 15 */
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb00c          }, //Output 0~12 step
+
+    {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)}, // hp used DAC 3 (Front)
+    {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+
+    {0}
 };
 
 static struct hda_verb alc861_threestack_init_verbs[] = {
-        /*
-         * Unmute ADC0 and set the default input to mic-in
-         */
-        /* port-A for surround (rear panel) */
-        { 0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },
-        /* port-B for mic-in (rear panel) with vref */
-        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
-        /* port-C for line-in (rear panel) */
-        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
-        /* port-D for Front */
-        { 0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
-        { 0x0b, AC_VERB_SET_CONNECT_SEL, 0x00 },
-        /* port-E for HP out (front panel) */
-        { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
-        /* route front PCM to HP */
-        { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x01 },
-        /* port-F for mic-in (front panel) with vref */
-        { 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
-        /* port-G for CLFE (rear panel) */
-        { 0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },
-        /* port-H for side (rear panel) */
-        { 0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },
-        /* CD-in */
-        { 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
-        /* route front mic to ADC1*/
-        {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        /* Unmute DAC0~3 & spdif out*/
-        {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-
-        /* Unmute Mixer 14 (mic) 1c (Line in)*/
-        {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-
-        /* Unmute Stereo Mixer 15 */
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb00c          }, //Output 0~12 step
-
-        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)}, // hp used DAC 3 (Front)
-        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0}
+    /*
+     * Unmute ADC0 and set the default input to mic-in
+     */
+    /* port-A for surround (rear panel) */
+    { 0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },
+    /* port-B for mic-in (rear panel) with vref */
+    { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+    /* port-C for line-in (rear panel) */
+    { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+    /* port-D for Front */
+    { 0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+    { 0x0b, AC_VERB_SET_CONNECT_SEL, 0x00 },
+    /* port-E for HP out (front panel) */
+    { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+    /* route front PCM to HP */
+    { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x01 },
+    /* port-F for mic-in (front panel) with vref */
+    { 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+    /* port-G for CLFE (rear panel) */
+    { 0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },
+    /* port-H for side (rear panel) */
+    { 0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },
+    /* CD-in */
+    { 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+    /* route front mic to ADC1*/
+    {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    /* Unmute DAC0~3 & spdif out*/
+    {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+
+    /* Unmute Mixer 14 (mic) 1c (Line in)*/
+    {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+
+    /* Unmute Stereo Mixer 15 */
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb00c          }, //Output 0~12 step
+
+    {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)}, // hp used DAC 3 (Front)
+    {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+    {0}
 };
 /*
@@ -5203 +5994 @@
  */
 static struct hda_verb alc861_auto_init_verbs[] = {
-        /*
-         * Unmute ADC0 and set the default input to mic-in
-         */
-//      {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-
-        /* Unmute DAC0~3 & spdif out*/
-        {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-
-        /* Unmute Mixer 14 (mic) 1c (Line in)*/
-        {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-
-        /* Unmute Stereo Mixer 15 */
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb00c},
-
-        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-
-        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
-        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
-
-        {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},  // set Mic 1
-
-        {0}
+    /*
+     * Unmute ADC0 and set the default input to mic-in
+     */
+    //  {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+
+    /* Unmute DAC0~3 & spdif out*/
+    {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    {0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+
+    /* Unmute Mixer 14 (mic) 1c (Line in)*/
+    {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+
+    /* Unmute Stereo Mixer 15 */
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb00c},
+
+    {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+
+    {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+    {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+    {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
+    {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+    {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+    {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+    {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
+
+    {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},      // set Mic 1
+
+    {0}
 };
 
@@ -5261 +6052 @@
 
 static struct hda_channel_mode alc861_8ch_modes[1] = {
-        { 8, NULL }
+    { 8, NULL }
 };
 
 static hda_nid_t alc861_dac_nids[4] = {
-        /* front, surround, clfe, side */
-        0x03, 0x06, 0x05, 0x04
+    /* front, surround, clfe, side */
+    0x03, 0x06, 0x05, 0x04
+};
+
+static hda_nid_t alc660_dac_nids[3] = {
+    /* front, clfe, surround */
+    0x03, 0x05, 0x06
 };
 
 static hda_nid_t alc861_adc_nids[1] = {
-        /* ADC0-2 */
-        0x08,
+    /* ADC0-2 */
+    0x08,
 };
 
 static struct hda_input_mux alc861_capture_source = {
-        .num_items = 5,
-        .items = {
-                { "Mic", 0x0 },
-                { "Front Mic", 0x3 },
-                { "Line", 0x1 },
-                { "CD", 0x4 },
-                { "Mixer", 0x5 },
-        },
+    .num_items = 5,
+    .items = {
+        { "Mic", 0x0 },
+        { "Front Mic", 0x3 },
+        { "Line", 0x1 },
+        { "CD", 0x4 },
+        { "Mixer", 0x5 },
+    },
 };
 
@@ -5288 +6084 @@
 static int alc861_auto_fill_dac_nids(struct alc_spec *spec, const struct auto_pin_cfg *cfg)
 {
-        int i;
-        hda_nid_t nid;
-
-        spec->multiout.dac_nids = spec->private_dac_nids;
-        for (i = 0; i < cfg->line_outs; i++) {
-                nid = cfg->line_out_pins[i];
-                if (nid) {
-                        if (i >= ARRAY_SIZE(alc861_dac_nids))
-                                continue;
-                        spec->multiout.dac_nids[i] = alc861_dac_nids[i];
-                }
-        }
-        spec->multiout.num_dacs = cfg->line_outs;
-        return 0;
+    int i;
+    hda_nid_t nid;
+
+    spec->multiout.dac_nids = spec->private_dac_nids;
+    for (i = 0; i < cfg->line_outs; i++) {
+        nid = cfg->line_out_pins[i];
+        if (nid) {
+            if (i >= ARRAY_SIZE(alc861_dac_nids))
+                continue;
+            spec->multiout.dac_nids[i] = alc861_dac_nids[i];
+        }
+    }
+    spec->multiout.num_dacs = cfg->line_outs;
+    return 0;
 }
 
 /* add playback controls from the parsed DAC table */
 static int alc861_auto_create_multi_out_ctls(struct alc_spec *spec,
-                                             const struct auto_pin_cfg *cfg)
-{
-        char name[32];
-        static const char *chname[4] = { "Front", "Surround", NULL /*CLFE*/, "Side" };
-        hda_nid_t nid;
-        int i, idx, err;
-
-        for (i = 0; i < cfg->line_outs; i++) {
-                nid = spec->multiout.dac_nids[i];
-                if (! nid)
-                        continue;
-                if (nid == 0x05) {
-                        /* Center/LFE */
-                        if ((err = add_control(spec, ALC_CTL_BIND_MUTE, "Center Playback Switch",
-                                               HDA_COMPOSE_AMP_VAL(nid, 1, 0, HDA_OUTPUT))) < 0)
-                                return err;
-                        if ((err = add_control(spec, ALC_CTL_BIND_MUTE, "LFE Playback Switch",
-                                               HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT))) < 0)
-                                return err;
-                } else {
-                        for (idx = 0; idx < ARRAY_SIZE(alc861_dac_nids) - 1; idx++)
-                                if (nid == alc861_dac_nids[idx])
-                                        break;
-                        sprintf(name, "%s Playback Switch", chname[idx]);
-                        if ((err = add_control(spec, ALC_CTL_BIND_MUTE, name,
-                                               HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
-                                return err;
-                }
-        }
-        return 0;
+                                             const struct auto_pin_cfg *cfg)
+{
+    char name[32];
+    static const char *chname[4] = { "Front", "Surround", NULL /*CLFE*/, "Side" };
+    hda_nid_t nid;
+    int i, idx, err;
+
+    for (i = 0; i < cfg->line_outs; i++) {
+        nid = spec->multiout.dac_nids[i];
+        if (! nid)
+            continue;
+        if (nid == 0x05) {
+            /* Center/LFE */
+            if ((err = add_control(spec, ALC_CTL_BIND_MUTE, "Center Playback Switch",
+                                   HDA_COMPOSE_AMP_VAL(nid, 1, 0, HDA_OUTPUT))) < 0)
+                return err;
+            if ((err = add_control(spec, ALC_CTL_BIND_MUTE, "LFE Playback Switch",
+                                   HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT))) < 0)
+                return err;
+        } else {
+            for (idx = 0; idx < ARRAY_SIZE(alc861_dac_nids) - 1; idx++)
+                if (nid == alc861_dac_nids[idx])
+                    break;
+            sprintf(name, "%s Playback Switch", chname[idx]);
+            if ((err = add_control(spec, ALC_CTL_BIND_MUTE, name,
+                                   HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
+                return err;
+        }
+    }
+    return 0;
 }
 
 static int alc861_auto_create_hp_ctls(struct alc_spec *spec, hda_nid_t pin)
 {
-        int err;
-        hda_nid_t nid;
-
-        if (! pin)
-                return 0;
-
-        if ((pin >= 0x0b && pin <= 0x10) || pin == 0x1f || pin == 0x20) {
-                nid = 0x03;
-                if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, "Headphone Playback Switch",
-                                       HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
-                        return err;
-                spec->multiout.hp_nid = nid;
-        }
-        return 0;
+    int err;
+    hda_nid_t nid;
+
+    if (! pin)
+        return 0;
+
+    if ((pin >= 0x0b && pin <= 0x10) || pin == 0x1f || pin == 0x20) {
+        nid = 0x03;
+        if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, "Headphone Playback Switch",
+                               HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
+            return err;
+        spec->multiout.hp_nid = nid;
+    }
+    return 0;
 }
 
@@ -5359 +6155 @@
 static int alc861_auto_create_analog_input_ctls(struct alc_spec *spec, const struct auto_pin_cfg *cfg)
 {
-        struct hda_input_mux *imux = &spec->private_imux;
-        int i, err, idx, idx1;
-
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                switch(cfg->input_pins[i]) {
-                case 0x0c:
-                        idx1 = 1;
-                        idx = 2;        // Line In
-                        break;
-                case 0x0f:
-                        idx1 = 2;
-                        idx = 2;        // Line In
-                        break;
-                case 0x0d:
-                        idx1 = 0;
-                        idx = 1;        // Mic In
-                        break;
-                case 0x10:
-                        idx1 = 3;
-                        idx = 1;        // Mic In
-                        break;
-                case 0x11:
-                        idx1 = 4;
-                        idx = 0;        // CD
-                        break;
-                default:
-                        continue;
-                }
-
-                err = new_analog_input(spec, cfg->input_pins[i],
-                                       auto_pin_cfg_labels[i], idx, 0x15);
-                if (err < 0)
-                        return err;
-
-                imux->items[imux->num_items].label = auto_pin_cfg_labels[i];
-                imux->items[imux->num_items].index = idx1;
-                imux->num_items++;
-        }
-        return 0;
+    struct hda_input_mux *imux = &spec->private_imux;
+    int i, err, idx, idx1;
+
+    for (i = 0; i < AUTO_PIN_LAST; i++) {
+        switch(cfg->input_pins[i]) {
+        case 0x0c:
+            idx1 = 1;
+            idx = 2;    // Line In
+            break;
+        case 0x0f:
+            idx1 = 2;
+            idx = 2;    // Line In
+            break;
+        case 0x0d:
+            idx1 = 0;
+            idx = 1;    // Mic In
+            break;
+        case 0x10:
+            idx1 = 3;
+            idx = 1;    // Mic In
+            break;
+        case 0x11:
+            idx1 = 4;
+            idx = 0;    // CD
+            break;
+        default:
+            continue;
+        }
+
+        err = new_analog_input(spec, cfg->input_pins[i],
+                               auto_pin_cfg_labels[i], idx, 0x15);
+        if (err < 0)
+            return err;
+
+        imux->items[imux->num_items].label = auto_pin_cfg_labels[i];
+        imux->items[imux->num_items].index = idx1;
+        imux->num_items++;
+    }
+    return 0;
 }
 
 static struct snd_kcontrol_new alc861_capture_mixer[] = {
-        HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
-
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                /* The multiple "Capture Source" controls confuse alsamixer
-                 * So call somewhat different..
-                 *FIXME: the controls appear in the "playback" view!
-                 */
-                /* .name = "Capture Source", */
-                .name = "Input Source",
-                .count = 1,
-                .info = alc_mux_enum_info,
-                .get = alc_mux_enum_get,
-                .put = alc_mux_enum_put,
-        },
-        {0} /* end */
+    HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
+
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        /* The multiple "Capture Source" controls confuse alsamixer
+         * So call somewhat different..
+         *FIXME: the controls appear in the "playback" view!
+         */
+        /* .name = "Capture Source", */
+        .name = "Input Source",
+        .count = 1,
+        .info = alc_mux_enum_info,
+        .get = alc_mux_enum_get,
+        .put = alc_mux_enum_put,
+    },
+    {0} /* end */
 };
 
 static void alc861_auto_set_output_and_unmute(struct hda_codec *codec, hda_nid_t nid,
-                                              int pin_type, int dac_idx)
-{
-        /* set as output */
-
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, pin_type);
-        snd_hda_codec_write(codec, dac_idx, 0, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
+                                              int pin_type, int dac_idx)
+{
+    /* set as output */
+
+    snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, pin_type);
+    snd_hda_codec_write(codec, dac_idx, 0, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
 
 }
@@ -5432 +6228 @@
 static void alc861_auto_init_multi_out(struct hda_codec *codec)
 {
-        struct alc_spec *spec = codec->spec;
-        int i;
-
-        for (i = 0; i < spec->autocfg.line_outs; i++) {
-                hda_nid_t nid = spec->autocfg.line_out_pins[i];
-                if (nid)
-                        alc861_auto_set_output_and_unmute(codec, nid, PIN_OUT, spec->multiout.dac_nids[i]);
-        }
+    struct alc_spec *spec = codec->spec;
+    int i;
+
+    for (i = 0; i < spec->autocfg.line_outs; i++) {
+        hda_nid_t nid = spec->autocfg.line_out_pins[i];
+        if (nid)
+            alc861_auto_set_output_and_unmute(codec, nid, PIN_OUT, spec->multiout.dac_nids[i]);
+    }
 }
 
 static void alc861_auto_init_hp_out(struct hda_codec *codec)
 {
-        struct alc_spec *spec = codec->spec;
-        hda_nid_t pin;
-
-        pin = spec->autocfg.hp_pin;
-        if (pin) /* connect to front */
-                alc861_auto_set_output_and_unmute(codec, pin, PIN_HP, spec->multiout.dac_nids[0]);
+    struct alc_spec *spec = codec->spec;
+    hda_nid_t pin;
+
+    pin = spec->autocfg.hp_pin;
+    if (pin) /* connect to front */
+        alc861_auto_set_output_and_unmute(codec, pin, PIN_HP, spec->multiout.dac_nids[0]);
 }
 
 static void alc861_auto_init_analog_input(struct hda_codec *codec)
 {
-        struct alc_spec *spec = codec->spec;
-        int i;
-
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                hda_nid_t nid = spec->autocfg.input_pins[i];
-                if ((nid>=0x0c) && (nid <=0x11)) {
-                        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                            i <= AUTO_PIN_FRONT_MIC ? PIN_VREF80 : PIN_IN);
-                }
-        }
+    struct alc_spec *spec = codec->spec;
+    int i;
+
+    for (i = 0; i < AUTO_PIN_LAST; i++) {
+        hda_nid_t nid = spec->autocfg.input_pins[i];
+        if ((nid>=0x0c) && (nid <=0x11)) {
+            snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                i <= AUTO_PIN_FRONT_MIC ? PIN_VREF80 : PIN_IN);
+        }
+    }
 }
 
@@ -5470 +6266 @@
 static int alc861_parse_auto_config(struct hda_codec *codec)
 {
-        struct alc_spec *spec = codec->spec;
-        int err;
-        static hda_nid_t alc861_ignore[] = { 0x1d, 0 };
-
-        if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
-                                                alc861_ignore)) < 0)
-            return err;
-        if (! spec->autocfg.line_outs)
-            return 0; /* can't find valid BIOS pin config */
-
-        if ((err = alc861_auto_fill_dac_nids(spec, &spec->autocfg)) < 0 ||
-            (err = alc861_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 ||
-            (err = alc861_auto_create_hp_ctls(spec, spec->autocfg.hp_pin)) < 0 ||
-            (err = alc861_auto_create_analog_input_ctls(spec, &spec->autocfg)) < 0)
-                return err;
-
-        spec->multiout.max_channels = spec->multiout.num_dacs * 2;
-
-        if (spec->autocfg.dig_out_pin)
-                spec->multiout.dig_out_nid = ALC861_DIGOUT_NID;
-
-        if (spec->kctl_alloc)
-                spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
-
-        spec->init_verbs[spec->num_init_verbs++] = alc861_auto_init_verbs;
-
-        spec->input_mux = &spec->private_imux;
-
-        spec->adc_nids = alc861_adc_nids;
-        spec->num_adc_nids = ARRAY_SIZE(alc861_adc_nids);
-        spec->mixers[spec->num_mixers] = alc861_capture_mixer;
-        spec->num_mixers++;
-
-        return 1;
+    struct alc_spec *spec = codec->spec;
+    int err;
+    static hda_nid_t alc861_ignore[] = { 0x1d, 0 };
+
+    if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
+                                            alc861_ignore)) < 0)
+        return err;
+    if (! spec->autocfg.line_outs)
+        return 0; /* can't find valid BIOS pin config */
+
+    if ((err = alc861_auto_fill_dac_nids(spec, &spec->autocfg)) < 0 ||
+        (err = alc861_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 ||
+        (err = alc861_auto_create_hp_ctls(spec, spec->autocfg.hp_pin)) < 0 ||
+        (err = alc861_auto_create_analog_input_ctls(spec, &spec->autocfg)) < 0)
+        return err;
+
+    spec->multiout.max_channels = spec->multiout.num_dacs * 2;
+
+    if (spec->autocfg.dig_out_pin)
+        spec->multiout.dig_out_nid = ALC861_DIGOUT_NID;
+
+    if (spec->kctl_alloc)
+        spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
+
+    spec->init_verbs[spec->num_init_verbs++] = alc861_auto_init_verbs;
+
+    spec->input_mux = &spec->private_imux;
+
+    spec->adc_nids = alc861_adc_nids;
+    spec->num_adc_nids = ARRAY_SIZE(alc861_adc_nids);
+    spec->mixers[spec->num_mixers] = alc861_capture_mixer;
+    spec->num_mixers++;
+
+    return 1;
 }
 
@@ -5520 +6316 @@
  */
 static struct hda_board_config alc861_cfg_tbl[] = {
-        { .modelname = "3stack", .config = ALC861_3ST },
-        { .pci_subvendor = 0x8086, .pci_subdevice = 0xd600, .config = ALC861_3ST },
-        { .modelname = "3stack-dig", .config = ALC861_3ST_DIG },
-        { .modelname = "6stack-dig", .config = ALC861_6ST_DIG },
-        { .modelname = "auto", .config = ALC861_AUTO },
-        {0}
+    { .modelname = "3stack", .config = ALC861_3ST },
+    { .pci_subvendor = 0x8086, .pci_subdevice = 0xd600,
+    .config = ALC861_3ST },
+    { .pci_subvendor = 0x1043, .pci_subdevice = 0x81e7,
+    .config = ALC660_3ST },
+    { .modelname = "3stack-dig", .config = ALC861_3ST_DIG },
+    { .modelname = "6stack-dig", .config = ALC861_6ST_DIG },
+    { .modelname = "auto", .config = ALC861_AUTO },
+    {0}
 };
 
 static struct alc_config_preset alc861_presets[] = {
-        [ALC861_3ST] = {
-                .mixers = { alc861_3ST_mixer },
-                .init_verbs = { alc861_threestack_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc861_dac_nids),
-                .dac_nids = alc861_dac_nids,
-                .num_channel_mode = ARRAY_SIZE(alc861_threestack_modes),
-                .channel_mode = alc861_threestack_modes,
-                .num_adc_nids = ARRAY_SIZE(alc861_adc_nids),
-                .adc_nids = alc861_adc_nids,
-                .input_mux = &alc861_capture_source,
-        },
-        [ALC861_3ST_DIG] = {
-                .mixers = { alc861_base_mixer },
-                .init_verbs = { alc861_threestack_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc861_dac_nids),
-                .dac_nids = alc861_dac_nids,
-                .dig_out_nid = ALC861_DIGOUT_NID,
-                .num_channel_mode = ARRAY_SIZE(alc861_threestack_modes),
-                .channel_mode = alc861_threestack_modes,
-                .num_adc_nids = ARRAY_SIZE(alc861_adc_nids),
-                .adc_nids = alc861_adc_nids,
-                .input_mux = &alc861_capture_source,
-        },
-        [ALC861_6ST_DIG] = {
-                .mixers = { alc861_base_mixer },
-                .init_verbs = { alc861_base_init_verbs },
-                .num_dacs = ARRAY_SIZE(alc861_dac_nids),
-                .dac_nids = alc861_dac_nids,
-                .dig_out_nid = ALC861_DIGOUT_NID,
-                .num_channel_mode = ARRAY_SIZE(alc861_8ch_modes),
-                .channel_mode = alc861_8ch_modes,
-                .num_adc_nids = ARRAY_SIZE(alc861_adc_nids),
-                .adc_nids = alc861_adc_nids,
-                .input_mux = &alc861_capture_source,
-        },
+    [ALC861_3ST] = {
+        .mixers = { alc861_3ST_mixer },
+        .init_verbs = { alc861_threestack_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc861_dac_nids),
+        .dac_nids = alc861_dac_nids,
+        .num_channel_mode = ARRAY_SIZE(alc861_threestack_modes),
+        .channel_mode = alc861_threestack_modes,
+        .num_adc_nids = ARRAY_SIZE(alc861_adc_nids),
+        .adc_nids = alc861_adc_nids,
+        .input_mux = &alc861_capture_source,
+    },
+    [ALC861_3ST_DIG] = {
+        .mixers = { alc861_base_mixer },
+        .init_verbs = { alc861_threestack_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc861_dac_nids),
+        .dac_nids = alc861_dac_nids,
+        .dig_out_nid = ALC861_DIGOUT_NID,
+        .num_channel_mode = ARRAY_SIZE(alc861_threestack_modes),
+        .channel_mode = alc861_threestack_modes,
+        .num_adc_nids = ARRAY_SIZE(alc861_adc_nids),
+        .adc_nids = alc861_adc_nids,
+        .input_mux = &alc861_capture_source,
+    },
+    [ALC861_6ST_DIG] = {
+        .mixers = { alc861_base_mixer },
+        .init_verbs = { alc861_base_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc861_dac_nids),
+        .dac_nids = alc861_dac_nids,
+        .dig_out_nid = ALC861_DIGOUT_NID,
+        .num_channel_mode = ARRAY_SIZE(alc861_8ch_modes),
+        .channel_mode = alc861_8ch_modes,
+        .num_adc_nids = ARRAY_SIZE(alc861_adc_nids),
+        .adc_nids = alc861_adc_nids,
+        .input_mux = &alc861_capture_source,
+    },
+    [ALC660_3ST] = {
+        .mixers = { alc861_3ST_mixer },
+        .init_verbs = { alc861_threestack_init_verbs },
+        .num_dacs = ARRAY_SIZE(alc660_dac_nids),
+        .dac_nids = alc660_dac_nids,
+        .num_channel_mode = ARRAY_SIZE(alc861_threestack_modes),
+        .channel_mode = alc861_threestack_modes,
+        .num_adc_nids = ARRAY_SIZE(alc861_adc_nids),
+        .adc_nids = alc861_adc_nids,
+        .input_mux = &alc861_capture_source,
+    },
 };
 
@@ -5569 +6379 @@
 static int patch_alc861(struct hda_codec *codec)
 {
-        struct alc_spec *spec;
-        int board_config;
-        int err;
-
-        spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
-        if (spec == NULL)
-                return -ENOMEM;
-
-        codec->spec = spec;
-
-        board_config = snd_hda_check_board_config(codec, alc861_cfg_tbl);
-        if (board_config < 0 || board_config >= ALC861_MODEL_LAST) {
-                printk(KERN_INFO "hda_codec: Unknown model for ALC861, trying auto-probe from BIOS...\n");
-                board_config = ALC861_AUTO;
-        }
-
-        if (board_config == ALC861_AUTO) {
-                /* automatic parse from the BIOS config */
-                err = alc861_parse_auto_config(codec);
-                if (err < 0) {
-                        alc_free(codec);
-                        return err;
-                } else if (! err) {
-                        printk(KERN_INFO "hda_codec: Cannot set up configuration from BIOS.  Using base mode...\n");
-                   board_config = ALC861_3ST_DIG;
-                }
-        }
-
-        if (board_config != ALC861_AUTO)
-                setup_preset(spec, &alc861_presets[board_config]);
-
-        spec->stream_name_analog = "ALC861 Analog";
-        spec->stream_analog_playback = &alc861_pcm_analog_playback;
-        spec->stream_analog_capture = &alc861_pcm_analog_capture;
-
-        spec->stream_name_digital = "ALC861 Digital";
-        spec->stream_digital_playback = &alc861_pcm_digital_playback;
-        spec->stream_digital_capture = &alc861_pcm_digital_capture;
-
-        codec->patch_ops = alc_patch_ops;
-        if (board_config == ALC861_AUTO)
-            spec->init_hook = alc861_auto_init;
-
-        return 0;
+    struct alc_spec *spec;
+    int board_config;
+    int err;
+
+    spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
+    if (spec == NULL)
+        return -ENOMEM;
+
+    codec->spec = spec;
+
+    board_config = snd_hda_check_board_config(codec, alc861_cfg_tbl);
+    if (board_config < 0 || board_config >= ALC861_MODEL_LAST) {
+        printk(KERN_INFO "hda_codec: Unknown model for ALC861, trying auto-probe from BIOS...\n");
+        board_config = ALC861_AUTO;
+    }
+
+    if (board_config == ALC861_AUTO) {
+        /* automatic parse from the BIOS config */
+        err = alc861_parse_auto_config(codec);
+        if (err < 0) {
+            alc_free(codec);
+            return err;
+        } else if (! err) {
+            printk(KERN_INFO "hda_codec: Cannot set up configuration from BIOS.  Using base mode...\n");
+            board_config = ALC861_3ST_DIG;
+        }
+    }
+
+    if (board_config != ALC861_AUTO)
+        setup_preset(spec, &alc861_presets[board_config]);
+
+    spec->stream_name_analog = "ALC861 Analog";
+    spec->stream_analog_playback = &alc861_pcm_analog_playback;
+    spec->stream_analog_capture = &alc861_pcm_analog_capture;
+
+    spec->stream_name_digital = "ALC861 Digital";
+    spec->stream_digital_playback = &alc861_pcm_digital_playback;
+    spec->stream_digital_capture = &alc861_pcm_digital_capture;
+
+    codec->patch_ops = alc_patch_ops;
+    if (board_config == ALC861_AUTO)
+        spec->init_hook = alc861_auto_init;
+
+    return 0;
 }
 
@@ -5619 +6429 @@
  */
 struct hda_codec_preset snd_hda_preset_realtek[] = {
-        { .id = 0x10ec0260, .name = "ALC260", .patch = patch_alc260 },
-        { .id = 0x10ec0262, .name = "ALC262", .patch = patch_alc262 },
-        { .id = 0x10ec0880, .name = "ALC880", .patch = patch_alc880 },
-        { .id = 0x10ec0882, .name = "ALC882", .patch = patch_alc882 },
-        { .id = 0x10ec0883, .name = "ALC883", .patch = patch_alc882 },
-        { .id = 0x10ec0885, .name = "ALC885", .patch = patch_alc882 },
-        { .id = 0x10ec0861, .name = "ALC861", .patch = patch_alc861 },
-        {0} /* terminator */
-};
+    { .id = 0x10ec0260, .name = "ALC260", .patch = patch_alc260 },
+    { .id = 0x10ec0262, .name = "ALC262", .patch = patch_alc262 },
+    { .id = 0x10ec0880, .name = "ALC880", .patch = patch_alc880 },
+    { .id = 0x10ec0882, .name = "ALC882", .patch = patch_alc882 },
+    { .id = 0x10ec0883, .name = "ALC883", .patch = patch_alc883 },
+    { .id = 0x10ec0885, .name = "ALC885", .patch = patch_alc882 },
+    { .id = 0x10ec0888, .name = "ALC888", .patch = patch_alc883 },
+    { .id = 0x10ec0861, .rev = 0x100300, .name = "ALC861",
+    .patch = patch_alc861 },
+    { .id = 0x10ec0861, .rev = 0x100340, .name = "ALC660",
+    .patch = patch_alc861 },
+    {0} /* terminator */
+};

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

@@ -42 +42 @@
 #define STAC_D945GTP3           1
 #define STAC_D945GTP5           2
+#define STAC_MACMINI            3
+#define STAC_D965_2112          4
+#define STAC_D965_284B          5
+#define STAC_922X_MODELS        6       /* number of 922x models */
 
 struct sigmatel_spec {
@@ -53 +57 @@
         unsigned int alt_switch: 1;
         unsigned int hp_detect: 1;
+        unsigned int gpio_mute: 1;
 
         /* playback */
@@ -106 +111 @@
 };
 
+static hda_nid_t stac9227_adc_nids[2] = {
+        0x07, 0x08,
+};
+
+#if 0
+static hda_nid_t d965_2112_dac_nids[3] = {
+        0x02, 0x03, 0x05,
+};
+#endif
+
 static hda_nid_t stac922x_mux_nids[2] = {
-        0x12, 0x13,
+    0x12, 0x13,
+};
+
+static hda_nid_t stac9227_mux_nids[2] = {
+        0x15, 0x16,
 };
 
@@ -168 +187 @@
 static struct hda_verb stac922x_core_init[] = {
         /* set master volume and direct control */
+    { 0x16, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
+    {0}
+};
+
+static struct hda_verb stac9227_core_init[] = {
+        /* set master volume and direct control */
         { 0x16, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
+        /* unmute node 0x1b */
+        { 0x1b, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
+        {0}
+};
+
+static struct hda_verb d965_2112_core_init[] = {
+        /* set master volume and direct control */
+        { 0x16, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
+        /* unmute node 0x1b */
+        { 0x1b, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
+        /* select node 0x03 as DAC */
+        { 0x0b, AC_VERB_SET_CONNECT_SEL, 0x01},
         {0}
 };
@@ -211 +248 @@
 };
 
+/* This needs to be generated dynamically based on sequence */
+static struct snd_kcontrol_new stac9227_mixer[] = {
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Input Source",
+                .count = 1,
+                .info = stac92xx_mux_enum_info,
+                .get = stac92xx_mux_enum_get,
+                .put = stac92xx_mux_enum_put,
+        },
+        HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x1b, 0x0, HDA_OUTPUT),
+        {0} /* end */
+};
+
 static snd_kcontrol_new_t stac927x_mixer[] = {
     {
@@ -290 +342 @@
 };
 
-static unsigned int *stac922x_brd_tbl[] = {
-        ref922x_pin_configs,
-        d945gtp3_pin_configs,
-        d945gtp5_pin_configs,
+static unsigned int d965_2112_pin_configs[10] = {
+        0x0221401f, 0x40000100, 0x40000100, 0x01014011,
+        0x01a19021, 0x01813024, 0x01452130, 0x40000100,
+        0x02a19320, 0x40000100,
+};
+
+static unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = {
+        [STAC_REF] =    ref922x_pin_configs,
+        [STAC_D945GTP3] = d945gtp3_pin_configs,
+        [STAC_D945GTP5] = d945gtp5_pin_configs,
+        [STAC_D965_2112] = d965_2112_pin_configs,
 };
 
@@ -322 +381 @@
           .pci_subdevice = 0x0417,
           .config = STAC_D945GTP5 },    /* Intel D975XBK - 5 Stack */
+          { .pci_subvendor = 0x8384,
+          .pci_subdevice = 0x7680,
+          .config = STAC_MACMINI },     /* Apple Mac Mini (early 2006) */
+          { .pci_subvendor = PCI_VENDOR_ID_INTEL,
+          .pci_subdevice = 0x2112,
+          .config = STAC_D965_2112 },
+        { .pci_subvendor = PCI_VENDOR_ID_INTEL,
+          .pci_subdevice = 0x284b,
+          .config = STAC_D965_284B },
         {0} /* terminator */
 };
@@ -842 +910 @@
                         imux->num_items++;
                 }
-        }
+        }
+        if (imux->num_items == 1) {
+            /*
+             * Set the current input for the muxes.
+             * The STAC9221 has two input muxes with identical source
+             * NID lists.  Hopefully this won't get confused.
+             */
+            for (i = 0; i < spec->num_muxes; i++) {
+                snd_hda_codec_write(codec, spec->mux_nids[i], 0,
+                                    AC_VERB_SET_CONNECT_SEL,
+                                    imux->items[0].index);
+            }
+        }
 
         return 0;
@@ -877 +957 @@
         if (! spec->autocfg.line_outs)
             return 0; /* can't find valid pin config */
-        if ((err = stac92xx_add_dyn_out_pins(codec, &spec->autocfg)) < 0)
-                return err;
-        if ((err = stac92xx_auto_fill_dac_nids(codec, &spec->autocfg)) < 0)
-                return err;
+
+        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;
 
         if ((err = stac92xx_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 ||
@@ -951 +1034 @@
         spec->input_mux = &spec->private_imux;
 
-        return 1;
+        return 1;
+}
+
+/*
+ * Early 2006 Intel Macintoshes with STAC9220X5 codecs seem to have a
+ * funky external mute control using GPIO pins.
+ */
+
+static void stac922x_gpio_mute(struct hda_codec *codec, int pin, int muted)
+{
+        unsigned int gpiostate, gpiomask, gpiodir;
+
+        gpiostate = snd_hda_codec_read(codec, codec->afg, 0,
+                                       AC_VERB_GET_GPIO_DATA, 0);
+
+        if (!muted)
+                gpiostate |= (1 << pin);
+        else
+                gpiostate &= ~(1 << pin);
+
+        gpiomask = snd_hda_codec_read(codec, codec->afg, 0,
+                                      AC_VERB_GET_GPIO_MASK, 0);
+        gpiomask |= (1 << pin);
+
+        gpiodir = snd_hda_codec_read(codec, codec->afg, 0,
+                                     AC_VERB_GET_GPIO_DIRECTION, 0);
+        gpiodir |= (1 << pin);
+
+        /* AppleHDA seems to do this -- WTF is this verb?? */
+        snd_hda_codec_write(codec, codec->afg, 0, 0x7e7, 0);
+
+        snd_hda_codec_write(codec, codec->afg, 0,
+                            AC_VERB_SET_GPIO_MASK, gpiomask);
+        snd_hda_codec_write(codec, codec->afg, 0,
+                            AC_VERB_SET_GPIO_DIRECTION, gpiodir);
+
+        msleep(1);
+
+        snd_hda_codec_write(codec, codec->afg, 0,
+                            AC_VERB_SET_GPIO_DATA, gpiostate);
 }
 
@@ -985 +1107 @@
         stac92xx_auto_set_pinctl(codec, cfg->dig_in_pin,
                                  AC_PINCTL_IN_EN);
+    if (spec->gpio_mute) {
+        stac922x_gpio_mute(codec, 0, 0);
+        stac922x_gpio_mute(codec, 1, 0);
+    }
 
     return 0;
@@ -1135 +1261 @@
         spec->board_config = snd_hda_check_board_config(codec, stac922x_cfg_tbl);
         if (spec->board_config < 0)
-                snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC922x, using BIOS defaults\n");
-        else {
+            snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC922x, using BIOS defaults\n");
+        else if (stac922x_brd_tbl[spec->board_config] != NULL) {
                 spec->num_pins = 10;
                 spec->pin_nids = stac922x_pin_nids;
@@ -1152 +1278 @@
         spec->multiout.dac_nids = spec->dac_nids;
 
+        switch (spec->board_config) {
+        case STAC_D965_2112:
+                spec->adc_nids = stac9227_adc_nids;
+                spec->mux_nids = stac9227_mux_nids;
+#if 0
+                spec->multiout.dac_nids = d965_2112_dac_nids;
+                spec->multiout.num_dacs = ARRAY_SIZE(d965_2112_dac_nids);
+#endif
+                spec->init = d965_2112_core_init;
+                spec->mixer = stac9227_mixer;
+                break;
+        case STAC_D965_284B:
+                spec->adc_nids = stac9227_adc_nids;
+                spec->mux_nids = stac9227_mux_nids;
+                spec->init = stac9227_core_init;
+                spec->mixer = stac9227_mixer;
+                break;
+        }
         err = stac92xx_parse_auto_config(codec, 0x08, 0x09);
         if (err < 0) {
@@ -1158 +1302 @@
         }
 
+        if (spec->board_config == STAC_MACMINI)
+                spec->gpio_mute = 1;
         codec->patch_ops = stac92xx_patch_ops;
 
@@ -1216 +1362 @@
     .num_items = 2,
     .items = {
-        /* { "HP", 0x0 },
-         { "Unknown", 0x1 }, */
+        /* { "HP", 0x0 }, */
+        { "Line", 0x1 },
         { "Mic", 0x2 },
         { "PCM", 0x3 },
@@ -1266 +1412 @@
 
     change = snd_hda_codec_amp_update(codec, 0x02, 0, HDA_OUTPUT, 0,
-                                      0x80, valp[0] & 0x80);
+                                      0x80, (valp[0] ? 0 : 0x80));
     change |= snd_hda_codec_amp_update(codec, 0x02, 1, HDA_OUTPUT, 0,
-                                       0x80, valp[1] & 0x80);
+                                       0x80, (valp[1] ? 0 : 0x80));
     snd_hda_codec_amp_update(codec, 0x05, 0, HDA_OUTPUT, 0,
-                             0x80, valp[0] & 0x80);
+                             0x80, (valp[0] ? 0 : 0x80));
     snd_hda_codec_amp_update(codec, 0x05, 1, HDA_OUTPUT, 0,
-                             0x80, valp[1] & 0x80);
+                             0x80, (valp[1] ? 0 : 0x80));
     return change;
 }
@@ -1369 +1515 @@
         { .id = 0x83847690, .name = "STAC9200", .patch = patch_stac9200 },
         { .id = 0x83847882, .name = "STAC9220 A1", .patch = patch_stac922x },
-        { .id = 0x83847680, .name = "STAC9221 A1", .patch = patch_stac922x },
+        { .id = 0x83847680, .name = "STAC9221 A1", .patch = patch_stac922x },
+        { .id = 0x83847618, .name = "STAC9227", .patch = patch_stac922x },
+        { .id = 0x83847619, .name = "STAC9227", .patch = patch_stac922x },
+        { .id = 0x83847616, .name = "STAC9228", .patch = patch_stac922x },
+        { .id = 0x83847617, .name = "STAC9228", .patch = patch_stac922x },
+        { .id = 0x83847614, .name = "STAC9229", .patch = patch_stac922x },
+        { .id = 0x83847615, .name = "STAC9229", .patch = patch_stac922x },
         { .id = 0x83847880, .name = "STAC9220 A2", .patch = patch_stac922x },
         { .id = 0x83847681, .name = "STAC9220D/9223D A2", .patch = patch_stac922x },

GPL/trunk/alsa-kernel/pci/intel8x0.c

@@ -1840 +1840 @@
         {
             .subvendor = 0x1028,
+            .subdevice = 0x014e,
+            .name = "Dell D800", /* STAC9750/51 */
+            .type = AC97_TUNE_HP_ONLY
+        },
+        {
+                .subvendor = 0x1028,
                 .subdevice = 0x0163,
                 .name = "Dell Unknown", /* STAC9750/51 */
@@ -1982 +1988 @@
                 .type = AC97_TUNE_HP_ONLY
         },
+        {
+            .subvendor = 0x10f1,
+            .subdevice = 0x2895,
+            .name = "Tyan Thunder K8WE",
+            .type = AC97_TUNE_HP_ONLY
+        },
         {
                 .subvendor = 0x110a,
@@ -2296 +2308 @@
     //    cnt &= ~ICH_ACLINK;
     cnt &= ~(ICH_ACLINK | ICH_PCM_246_MASK);
+#ifdef CONFIG_SND_AC97_POWER_SAVE
+    /* do cold reset - the full ac97 powerdown may leave the controller
+     * in a warm state but actually it cannot communicate with the codec.
+     */
+    iputdword(chip, ICHREG(GLOB_CNT), cnt & ~ICH_AC97COLD);
+    cnt = igetdword(chip, ICHREG(GLOB_CNT));
+    udelay(10);
+    iputdword(chip, ICHREG(GLOB_CNT), cnt | ICH_AC97COLD);
+    msleep(1);
+#else
     cnt |= (cnt & ICH_AC97COLD) == 0 ? ICH_AC97COLD : ICH_AC97WARM;
 
@@ -2321 +2343 @@
     return -EIO;
 __ok:
+#endif /* CONFIG_SND_AC97_POWER_SAVE */
 #ifdef DEBUG
     dprintf(("ICH chip init ACLink ON"));
@@ -2542 +2565 @@
     chip->irq = pci->irq;
     synchronize_irq(chip->irq);
-    snd_intel8x0_chip_init(chip, 1);
+    snd_intel8x0_chip_init(chip, 0);
     /* re-initialize mixer stuff */
     if (chip->device_type == DEVICE_INTEL_ICH4 ||
@@ -2658 +2681 @@
         chip->ac97_bus->clock = (chip->ac97_bus->clock * 48000) / pos;
     printk(KERN_INFO "intel8x0: clocking to %d\n", chip->ac97_bus->clock);
+    snd_ac97_update_power(chip->ac97[0], AC97_PCM_FRONT_DAC_RATE, 0);
 }
 

GPL/trunk/alsa-kernel/pci/maestro3.c

@@ -2889 +2889 @@
     /* TODO enable MIDI IRQ and I/O */
     err = snd_mpu401_uart_new(chip->card, 0, MPU401_HW_MPU401,
-                              chip->iobase + MPU401_DATA_PORT, 1,
+                              chip->iobase + MPU401_DATA_PORT,
+                              MPU401_INFO_INTEGRATED,
                               chip->irq, 0, &chip->rmidi);
     if (err < 0)

GPL/trunk/alsa-kernel/pci/sonicvibes.c

@@ -1578 +1578 @@
                 return err;
         }
-        if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_SONICVIBES,
-                                       sonic->midi_port, 1,
+        if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_SONICVIBES,
+                                       sonic->midi_port, MPU401_INFO_INTEGRATED,
                                        sonic->irq, 0,
                                        &midi_uart)) < 0) {

GPL/trunk/alsa-kernel/pci/trident/trident.c

@@ -149 +149 @@
                 }
         }
-        if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_TRID4DWAVE,
-                                       trident->midi_port, 1,
+        if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_TRID4DWAVE,
+                                       trident->midi_port,
+                                       MPU401_INFO_INTEGRATED,
                                        trident->irq, 0, &trident->rmidi)) < 0) {
                 snd_card_free(card);

GPL/trunk/alsa-kernel/pci/via82xx.c

@@ -1275 +1275 @@
         if (! ratep->used)
                 ratep->rate = 0;
-        spin_unlock_irq(&ratep->lock);
-
+        spin_unlock_irq(&ratep->lock);
+
+        if (! ratep->rate) {
+            if (! viadev->direction) {
+                snd_ac97_update_power(chip->ac97,
+                                      AC97_PCM_FRONT_DAC_RATE, 0);
+                snd_ac97_update_power(chip->ac97,
+                                      AC97_PCM_SURR_DAC_RATE, 0);
+                snd_ac97_update_power(chip->ac97,
+                                      AC97_PCM_LFE_DAC_RATE, 0);
+            } else
+                snd_ac97_update_power(chip->ac97,
+                                      AC97_PCM_LR_ADC_RATE, 0);
+        }
         viadev->substream = NULL;
         return 0;
@@ -1772 +1784 @@
                 .subdevice = 0x2032,
                 .name = "Targa Traveller 811",
-                .type = AC97_TUNE_HP_ONLY,
+                .type = AC97_TUNE_HP_ONLY,
+        },
+        {
+                .subvendor = 0x161f,
+                .subdevice = 0x2032,
+                .name = "m680x",
+                .type = AC97_TUNE_HP_ONLY, /* http://launchpad.net/bugs/38546 */
         },
         {0} /* terminator */
@@ -1971 +1989 @@
         pci_write_config_byte(chip->pci, VIA_PNP_CONTROL, legacy_cfg);
         if (chip->mpu_res) {
-                if (snd_mpu401_uart_new(chip->card, 0, MPU401_HW_VIA686A,
-                                        mpu_port, 1,
-                                        chip->irq, 0, &chip->rmidi) < 0) {
+            if (snd_mpu401_uart_new(chip->card, 0, MPU401_HW_VIA686A,
+                                    mpu_port, MPU401_INFO_INTEGRATED,
+                                    chip->irq, 0, &chip->rmidi) < 0) {
                         printk(KERN_WARNING "unable to initialize MPU-401"
                                " at 0x%lx, skipping\n", mpu_port);
@@ -2330 +2348 @@
 };
 
-static int __devinit check_dxs_list(struct pci_dev *pci)
+static int __devinit check_dxs_list(struct pci_dev *pci, int revision)
 {
         static struct dxs_whitelist whitelist[] = {
@@ -2360 +2378 @@
                 { .subvendor = 0x1462, .subdevice = 0x0470, .action = VIA_DXS_SRC }, /* MSI KT880 Delta-FSR */
                 { .subvendor = 0x1462, .subdevice = 0x3800, .action = VIA_DXS_ENABLE }, /* MSI KT266 */
-                { .subvendor = 0x1462, .subdevice = 0x5901, .action = VIA_DXS_NO_VRA }, /* MSI KT6 Delta-SR */
-                { .subvendor = 0x1462, .subdevice = 0x7023, .action = VIA_DXS_NO_VRA }, /* MSI K8T Neo2-FI */
+                { .subvendor = 0x1462, .subdevice = 0x5901, .action = VIA_DXS_NO_VRA }, /* MSI KT6 Delta-SR */
+                { .subvendor = 0x1462, .subdevice = 0x7023, .action = VIA_DXS_SRC }, /* MSI K8T Neo2-FI */
                 { .subvendor = 0x1462, .subdevice = 0x7120, .action = VIA_DXS_ENABLE }, /* MSI KT4V */
                 { .subvendor = 0x1462, .subdevice = 0x7142, .action = VIA_DXS_ENABLE }, /* MSI K8MM-V */
@@ -2406 +2424 @@
                                 return w->action;
                 }
-        }
-
+        }
+        /* for newer revision, default to DXS_SRC */
+        if (revision >= VIA_REV_8235)
+            return VIA_DXS_SRC;
         /*
          * not detected, try 48k rate only to be sure.
@@ -2451 +2471 @@
                 }
                 if (chip_type != TYPE_VIA8233A) {
-                        if (dxs_support == VIA_DXS_AUTO)
-                                dxs_support = check_dxs_list(pci);
+                    if (dxs_support == VIA_DXS_AUTO)
+                        dxs_support = check_dxs_list(pci, revision);
                         /* force to use VIA8233 or 8233A model according to
                          * dxs_support module option

GPL/trunk/alsa-kernel/pci/ymfpci/ymfpci.c

@@ -226 +226 @@
 #if 1
         if (chip->mpu_res) {
-                if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_YMFPCI,
-                                               mpu_port[dev], 1,
-                                               pci->irq, 0, &chip->rawmidi)) < 0) {
+            if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_YMFPCI,
+                                           mpu_port[dev],
+                                           MPU401_INFO_INTEGRATED,
+                                           pci->irq, 0, &chip->rawmidi)) < 0) {
                         printk(KERN_WARNING "ymfpci: cannot initialize MPU401 at 0x%lx, skipping...\n", mpu_port[dev]);
                         legacy_ctrl &= ~YMFPCI_LEGACY_MIEN; /* disable MPU401 irq */

GPL/trunk/alsa-kernel/synth/emux/soundfont.c

@@ -195 +195 @@
                 break;
         case SNDRV_SFNT_REMOVE_INFO:
-                /* patch must be opened */
-                if (sflist->currsf) {
-                        snd_printk("soundfont: remove_info: patch not opened\n");
-                        rc = -EINVAL;
-                } else {
-                        int bank, instr;
-                        bank = ((unsigned short)patch.optarg >> 8) & 0xff;
-                        instr = (unsigned short)patch.optarg & 0xff;
-                        if (! remove_info(sflist, sflist->currsf, bank, instr))
-                                rc = -EINVAL;
-                        else
-                                rc = 0;
-                }
-                break;
+            /* patch must be opened */
+            if (!sflist->currsf) {
+                snd_printk("soundfont: remove_info: patch not opened\n");
+                rc = -EINVAL;
+            } else {
+                int bank, instr;
+                bank = ((unsigned short)patch.optarg >> 8) & 0xff;
+                instr = (unsigned short)patch.optarg & 0xff;
+                if (! remove_info(sflist, sflist->currsf, bank, instr))
+                    rc = -EINVAL;
+                else
+                    rc = 0;
+            }
+            break;
         }
         unlock_preset(sflist);

GPL/trunk/include/version.mak

@@ -11 +11 @@
 BLDLVL_REVISION = 1.1
 BLDLVL_FILEVER = 4
-BLDLVL_DATETIME = 31.03.2006 01:05:34
+BLDLVL_DATETIME = 09.07.2006 21:27:17
 BLDLVL_MACHINE = VLAD

GPL/trunk/lib32/ioctl.c

@@ -333 +333 @@
             pHandle->file.f_flags = O_NONBLOCK;
 
+            printk("GetUniaudPcmCaps: cp1. phandle %x\n", pHandle);
             ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_INFO, (ULONG)pcminfo);
             if(ret != 0) {
@@ -350 +351 @@
             pWaveCaps->nrStreams = pcminfo->subdevices_count;
 
+            printk("GetUniaudPcmCaps: cp2. nr of streams: %i\n", pWaveCaps->nrStreams);
             //get all hardware parameters
             _snd_pcm_hw_params_any(params);
@@ -359 +361 @@
                 continue;
             }
+            printk("GetUniaudPcmCaps: cp3\n");
 
             pWaveCaps->ulMinChannels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS)->min;

GPL/trunk/lib32/sound.c

@@ -532 +532 @@
     }
 
+    printk("OSS32_WaveOpen: cp1\n");
     ret = alsa_fops->open(&pHandle->inode, &pHandle->file);
+    printk("OSS32_WaveOpen: cp2\n");
     /* check if PCM already opened (stupid uniaud16.sys doesnt closes it) */
     if (ret == -16)
@@ -549 +551 @@
         }
     }
+    printk("OSS32_WaveOpen: cp3\n");
 
     if(ret) {
@@ -557 +560 @@
     }
     pHandle->magic = MAGIC_WAVE_ALSA32;
+    printk("OSS32_WaveOpen: cp4\n");
 
     if (pStreamId)