vserver 1.9.3
[linux-2.6.git] / sound / pci / ac97 / ac97_patch.c
index 1baa82e..1ad062a 100644 (file)
@@ -35,8 +35,6 @@
 #include "ac97_id.h"
 #include "ac97_local.h"
 
-#define chip_t ac97_t
-
 /*
  *  Chip specific initialization
  */
@@ -51,6 +49,21 @@ static int patch_build_controls(ac97_t * ac97, const snd_kcontrol_new_t *control
        return 0;
 }
 
+/* set to the page, update bits and restore the page */
+static int ac97_update_bits_page(ac97_t *ac97, unsigned short reg, unsigned short mask, unsigned short value, unsigned short page)
+{
+       unsigned short page_save;
+       int ret;
+
+       down(&ac97->mutex);
+       page_save = snd_ac97_read(ac97, AC97_INT_PAGING) & AC97_PAGE_MASK;
+       snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, page);
+       ret = snd_ac97_update_bits(ac97, reg, mask, value);
+       snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, page_save);
+       up(&ac97->mutex); /* unlock paging */
+       return ret;
+}
+
 /* The following snd_ac97_ymf753_... items added by David Shust (dshust@shustring.com) */
 
 /* It is possible to indicate to the Yamaha YMF753 the type of speakers being used. */
@@ -204,7 +217,7 @@ static int patch_yamaha_ymf753_3d(ac97_t * ac97)
        if ((err = snd_ctl_add(ac97->bus->card, kctl = snd_ac97_cnew(&snd_ac97_controls_3d[0], ac97))) < 0)
                return err;
        strcpy(kctl->id.name, "3D Control - Wide");
-       kctl->private_value = AC97_3D_CONTROL | (9 << 8) | (7 << 16);
+       kctl->private_value = AC97_SINGLE_VALUE(AC97_3D_CONTROL, 9, 7, 0);
        snd_ac97_write_cache(ac97, AC97_3D_CONTROL, 0x0000);
        if ((err = snd_ctl_add(ac97->bus->card, snd_ac97_cnew(&snd_ac97_ymf753_controls_speaker, ac97))) < 0)
                return err;
@@ -315,7 +328,7 @@ static int patch_sigmatel_stac9700_3d(ac97_t * ac97)
        if ((err = snd_ctl_add(ac97->bus->card, kctl = snd_ac97_cnew(&snd_ac97_controls_3d[0], ac97))) < 0)
                return err;
        strcpy(kctl->id.name, "3D Control Sigmatel - Depth");
-       kctl->private_value = AC97_3D_CONTROL | (3 << 16);
+       kctl->private_value = AC97_SINGLE_VALUE(AC97_3D_CONTROL, 2, 3, 0);
        snd_ac97_write_cache(ac97, AC97_3D_CONTROL, 0x0000);
        return 0;
 }
@@ -328,11 +341,11 @@ static int patch_sigmatel_stac9708_3d(ac97_t * ac97)
        if ((err = snd_ctl_add(ac97->bus->card, kctl = snd_ac97_cnew(&snd_ac97_controls_3d[0], ac97))) < 0)
                return err;
        strcpy(kctl->id.name, "3D Control Sigmatel - Depth");
-       kctl->private_value = AC97_3D_CONTROL | (3 << 16);
+       kctl->private_value = AC97_SINGLE_VALUE(AC97_3D_CONTROL, 0, 3, 0);
        if ((err = snd_ctl_add(ac97->bus->card, kctl = snd_ac97_cnew(&snd_ac97_controls_3d[0], ac97))) < 0)
                return err;
        strcpy(kctl->id.name, "3D Control Sigmatel - Rear Depth");
-       kctl->private_value = AC97_3D_CONTROL | (2 << 8) | (3 << 16);
+       kctl->private_value = AC97_SINGLE_VALUE(AC97_3D_CONTROL, 2, 3, 0);
        snd_ac97_write_cache(ac97, AC97_3D_CONTROL, 0x0000);
        return 0;
 }
@@ -373,22 +386,29 @@ static struct snd_ac97_build_ops patch_sigmatel_stac9700_ops = {
        .build_specific = patch_sigmatel_stac97xx_specific
 };
 
-static struct snd_ac97_build_ops patch_sigmatel_stac9708_ops = {
-       .build_3d       = patch_sigmatel_stac9708_3d,
-       .build_specific = patch_sigmatel_stac97xx_specific
-};
-
 int patch_sigmatel_stac9700(ac97_t * ac97)
 {
        ac97->build_ops = &patch_sigmatel_stac9700_ops;
        return 0;
 }
 
+static int patch_sigmatel_stac9708_specific(ac97_t *ac97)
+{
+       snd_ac97_rename_vol_ctl(ac97, "Headphone Playback", "Sigmatel Surround Playback");
+       return patch_sigmatel_stac97xx_specific(ac97);
+}
+
+static struct snd_ac97_build_ops patch_sigmatel_stac9708_ops = {
+       .build_3d       = patch_sigmatel_stac9708_3d,
+       .build_specific = patch_sigmatel_stac9708_specific
+};
+
 int patch_sigmatel_stac9708(ac97_t * ac97)
 {
        unsigned int codec72, codec6c;
 
        ac97->build_ops = &patch_sigmatel_stac9708_ops;
+       ac97->caps |= 0x10;     /* HP (sigmatel surround) support */
 
        codec72 = snd_ac97_read(ac97, AC97_SIGMATEL_BIAS2) & 0x8000;
        codec6c = snd_ac97_read(ac97, AC97_SIGMATEL_ANALOG);
@@ -447,18 +467,208 @@ int patch_sigmatel_stac9756(ac97_t * ac97)
        return 0;
 }
 
+static int snd_ac97_stac9758_output_jack_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+{
+       static char *texts[5] = { "Input/Disabled", "Front Output",
+               "Rear Output", "Center/LFE Output", "Mixer Output" };
+
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+       uinfo->count = 1;
+       uinfo->value.enumerated.items = 5;
+       if (uinfo->value.enumerated.item > 4)
+               uinfo->value.enumerated.item = 4;
+       strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+       return 0;
+}
+
+static int snd_ac97_stac9758_output_jack_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t* ucontrol)
+{
+       ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
+       int shift = kcontrol->private_value;
+       unsigned short val;
+
+       val = ac97->regs[AC97_SIGMATEL_OUTSEL] >> shift;
+       if (!(val & 4))
+               ucontrol->value.enumerated.item[0] = 0;
+       else
+               ucontrol->value.enumerated.item[0] = 1 + (val & 3);
+       return 0;
+}
+
+static int snd_ac97_stac9758_output_jack_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+       ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
+       int shift = kcontrol->private_value;
+       unsigned short val;
+
+       if (ucontrol->value.enumerated.item[0] > 4)
+               return -EINVAL;
+       if (ucontrol->value.enumerated.item[0] == 0)
+               val = 0;
+       else
+               val = 4 | (ucontrol->value.enumerated.item[0] - 1);
+       return ac97_update_bits_page(ac97, AC97_SIGMATEL_OUTSEL,
+                                    7 << shift, val << shift, 0);
+}
+
+static int snd_ac97_stac9758_input_jack_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+{
+       static char *texts[7] = { "Mic2 Jack", "Mic1 Jack", "Line In Jack",
+               "Front Jack", "Rear Jack", "Center/LFE Jack", "Mute" };
+
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+       uinfo->count = 1;
+       uinfo->value.enumerated.items = 7;
+       if (uinfo->value.enumerated.item > 6)
+               uinfo->value.enumerated.item = 6;
+       strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+       return 0;
+}
+
+static int snd_ac97_stac9758_input_jack_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t* ucontrol)
+{
+       ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
+       int shift = kcontrol->private_value;
+       unsigned short val;
+
+       val = ac97->regs[AC97_SIGMATEL_INSEL];
+       ucontrol->value.enumerated.item[0] = (val >> shift) & 7;
+       return 0;
+}
+
+static int snd_ac97_stac9758_input_jack_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+       ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
+       int shift = kcontrol->private_value;
+
+       return ac97_update_bits_page(ac97, AC97_SIGMATEL_INSEL, 7 << shift,
+                                    ucontrol->value.enumerated.item[0] << shift, 0);
+}
+
+static int snd_ac97_stac9758_phonesel_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+{
+       static char *texts[3] = { "None", "Front Jack", "Rear Jack" };
+
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+       uinfo->count = 1;
+       uinfo->value.enumerated.items = 3;
+       if (uinfo->value.enumerated.item > 2)
+               uinfo->value.enumerated.item = 2;
+       strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+       return 0;
+}
+
+static int snd_ac97_stac9758_phonesel_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t* ucontrol)
+{
+       ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
+
+       ucontrol->value.enumerated.item[0] = ac97->regs[AC97_SIGMATEL_IOMISC] & 3;
+       return 0;
+}
+
+static int snd_ac97_stac9758_phonesel_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+       ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
+
+       return ac97_update_bits_page(ac97, AC97_SIGMATEL_IOMISC, 3,
+                                    ucontrol->value.enumerated.item[0], 0);
+}
+
+#define STAC9758_OUTPUT_JACK(xname, shift) \
+{      .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+       .info = snd_ac97_stac9758_output_jack_info, \
+       .get = snd_ac97_stac9758_output_jack_get, \
+       .put = snd_ac97_stac9758_output_jack_put, \
+       .private_value = shift }
+#define STAC9758_INPUT_JACK(xname, shift) \
+{      .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+       .info = snd_ac97_stac9758_input_jack_info, \
+       .get = snd_ac97_stac9758_input_jack_get, \
+       .put = snd_ac97_stac9758_input_jack_put, \
+       .private_value = shift }
+static const snd_kcontrol_new_t snd_ac97_sigmatel_stac9758_controls[] = {
+       STAC9758_OUTPUT_JACK("Mic1 Jack", 1),
+       STAC9758_OUTPUT_JACK("LineIn Jack", 4),
+       STAC9758_OUTPUT_JACK("Front Jack", 7),
+       STAC9758_OUTPUT_JACK("Rear Jack", 10),
+       STAC9758_OUTPUT_JACK("Center/LFE Jack", 13),
+       STAC9758_INPUT_JACK("Mic Input Source", 0),
+       STAC9758_INPUT_JACK("Line Input Source", 8),
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Headphone Amp",
+               .info = snd_ac97_stac9758_phonesel_info,
+               .get = snd_ac97_stac9758_phonesel_get,
+               .put = snd_ac97_stac9758_phonesel_put
+       },
+       AC97_SINGLE("Exchange Center/LFE", AC97_SIGMATEL_IOMISC, 4, 1, 0),
+       AC97_SINGLE("Headphone +3dB Boost", AC97_SIGMATEL_IOMISC, 8, 1, 0)
+};
+
+static int patch_sigmatel_stac9758_specific(ac97_t *ac97)
+{
+       int err;
+
+       err = patch_sigmatel_stac97xx_specific(ac97);
+       if (err < 0)
+               return err;
+       err = patch_build_controls(ac97, snd_ac97_sigmatel_stac9758_controls,
+                                  ARRAY_SIZE(snd_ac97_sigmatel_stac9758_controls));
+       if (err < 0)
+               return err;
+       /* DAC-A direct */
+       snd_ac97_rename_vol_ctl(ac97, "Headphone Playback", "Front Playback");
+       /* DAC-A to Mix = PCM */
+       /* DAC-B direct = Surround */
+       /* DAC-B to Mix */
+       snd_ac97_rename_vol_ctl(ac97, "Video Playback", "Surround Mix Playback");
+       /* DAC-C direct = Center/LFE */
+
+       return 0;
+}
+
+static struct snd_ac97_build_ops patch_sigmatel_stac9758_ops = {
+       .build_3d       = patch_sigmatel_stac9700_3d,
+       .build_specific = patch_sigmatel_stac9758_specific
+};
+
 int patch_sigmatel_stac9758(ac97_t * ac97)
 {
+       static unsigned short regs[4] = {
+               AC97_SIGMATEL_OUTSEL,
+               AC97_SIGMATEL_IOMISC,
+               AC97_SIGMATEL_INSEL,
+               AC97_SIGMATEL_VARIOUS
+       };
+       static unsigned short def_regs[4] = {
+               /* OUTSEL */ 0xd794, /* CL:CL, SR:SR, LO:MX, LI:DS, MI:DS */
+               /* IOMISC */ 0x2001,
+               /* INSEL */ 0x0201, /* LI:LI, MI:M1 */
+               /* VARIOUS */ 0x0040
+       };
+       static unsigned short m675_regs[4] = {
+               /* OUTSEL */ 0xfc70, /* CL:MX, SR:MX, LO:DS, LI:MX, MI:DS */
+               /* IOMISC */ 0x2102, /* HP amp on */
+               /* INSEL */ 0x0203, /* LI:LI, MI:FR */
+               /* VARIOUS */ 0x0041 /* stereo mic */
+       };
+       unsigned short *pregs = def_regs;
+       int i;
+
+       /* Gateway M675 notebook */
+       if (ac97->pci && 
+           ac97->subsystem_vendor == 0x107b &&
+           ac97->subsystem_device == 0x0601)
+               pregs = m675_regs;
+
        // patch for SigmaTel
-       ac97->build_ops = &patch_sigmatel_stac9700_ops;
-       // turn on stereo speaker, headphone and line-out
-       snd_ac97_write_cache(ac97, AC97_SIGMATEL_OUTSEL, 0x9040);
-       // headphone select and boost
-       snd_ac97_write_cache(ac97, AC97_SIGMATEL_IOMISC, 0x2102);
-       // enable mic
-       snd_ac97_write_cache(ac97, AC97_SIGMATEL_INSEL, 0x0203);
-       // enable stereo mic
-       snd_ac97_write_cache(ac97, AC97_SIGMATEL_VARIOUS, 0x0001);
+       ac97->build_ops = &patch_sigmatel_stac9758_ops;
+       /* FIXME: assume only page 0 for writing cache */
+       snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, AC97_PAGE_VENDOR);
+       for (i = 0; i < 4; i++)
+               snd_ac97_write_cache(ac97, regs[i], pregs[i]);
+
+       ac97->flags |= AC97_STEREO_MUTES;
        return 0;
 }
 
@@ -474,8 +684,10 @@ static int patch_cirrus_build_spdif(ac97_t * ac97)
 {
        int err;
 
+       /* con mask, pro mask, default */
        if ((err = patch_build_controls(ac97, &snd_ac97_controls_spdif[0], 3)) < 0)
                return err;
+       /* switch, spsa */
        if ((err = patch_build_controls(ac97, &snd_ac97_cirrus_controls_spdif[0], 1)) < 0)
                return err;
        switch (ac97->id & AC97_ID_CS_MASK) {
@@ -534,8 +746,10 @@ static int patch_conexant_build_spdif(ac97_t * ac97)
 {
        int err;
 
+       /* con mask, pro mask, default */
        if ((err = patch_build_controls(ac97, &snd_ac97_controls_spdif[0], 3)) < 0)
                return err;
+       /* switch */
        if ((err = patch_build_controls(ac97, &snd_ac97_conexant_controls_spdif[0], 1)) < 0)
                return err;
        /* set default PCM S/PDIF params */
@@ -554,6 +768,7 @@ int patch_conexant(ac97_t * ac97)
        ac97->build_ops = &patch_conexant_ops;
        ac97->flags |= AC97_CX_SPDIF;
         ac97->ext_id |= AC97_EI_SPDIF; /* force the detection of spdif */
+       ac97->rates[AC97_RATES_SPDIF] = SNDRV_PCM_RATE_48000; /* 48k only */
        return 0;
 }
 
@@ -641,8 +856,6 @@ int patch_ad1881(ac97_t * ac97)
        unsigned short val;
        int idx, num;
 
-       init_MUTEX(&ac97->spec.ad18xx.mutex);
-
        val = snd_ac97_read(ac97, AC97_AD_SERIAL_CFG);
        snd_ac97_write_cache(ac97, AC97_AD_SERIAL_CFG, val);
        codecs[0] = patch_ad1881_unchained(ac97, 0, (1<<12));
@@ -692,6 +905,8 @@ static const snd_kcontrol_new_t snd_ac97_controls_ad1885[] = {
        /* AC97_SINGLE("Digital Audio Mode", AC97_AD_MISC, 12, 1, 0), */ /* seems problematic */
        AC97_SINGLE("Low Power Mixer", AC97_AD_MISC, 14, 1, 0),
        AC97_SINGLE("Zero Fill DAC", AC97_AD_MISC, 15, 1, 0),
+       AC97_SINGLE("Headphone Jack Sense", AC97_AD_JACK_SPDIF, 9, 1, 1), /* inverted */
+       AC97_SINGLE("Line Jack Sense", AC97_AD_JACK_SPDIF, 8, 1, 1), /* inverted */
 };
 
 static int patch_ad1885_specific(ac97_t * ac97)
@@ -709,16 +924,10 @@ static struct snd_ac97_build_ops patch_ad1885_build_ops = {
 
 int patch_ad1885(ac97_t * ac97)
 {
-       unsigned short jack;
-
        patch_ad1881(ac97);
        /* This is required to deal with the Intel D815EEAL2 */
        /* i.e. Line out is actually headphone out from codec */
 
-       /* turn off jack sense bits D8 & D9 */
-       jack = snd_ac97_read(ac97, AC97_AD_JACK_SPDIF);
-       snd_ac97_write_cache(ac97, AC97_AD_JACK_SPDIF, jack | 0x0300);
-
        /* set default */
        snd_ac97_write_cache(ac97, AC97_AD_MISC, 0x0404);
 
@@ -934,10 +1143,8 @@ static const snd_kcontrol_new_t snd_ac97_ad1888_controls[] = {
 static int patch_ad1888_specific(ac97_t *ac97)
 {
        /* rename 0x04 as "Master" and 0x02 as "Master Surround" */
-       snd_ac97_rename_ctl(ac97, "Master Playback Switch", "Master Surround Playback Switch");
-       snd_ac97_rename_ctl(ac97, "Master Playback Volume", "Master Surround Playback Volume");
-       snd_ac97_rename_ctl(ac97, "Headphone Playback Switch", "Master Playback Switch");
-       snd_ac97_rename_ctl(ac97, "Headphone Playback Volume", "Master Playback Volume");
+       snd_ac97_rename_vol_ctl(ac97, "Master Playback", "Master Surround Playback");
+       snd_ac97_rename_vol_ctl(ac97, "Headphone Playback", "Master Playback");
        return patch_build_controls(ac97, snd_ac97_ad1888_controls, ARRAY_SIZE(snd_ac97_ad1888_controls));
 }
 
@@ -1027,11 +1234,13 @@ int patch_ad1985(ac97_t * ac97)
                             AC97_AD198X_MSPLT |
                             AC97_AD198X_AC97NC);
        ac97->flags |= AC97_STEREO_MUTES;
+       /* on AD1985 rev. 3, AC'97 revision bits are zero */
+       ac97->ext_id = (ac97->ext_id & ~AC97_EI_REV_MASK) | AC97_EI_REV_23;
        return 0;
 }
 
 /*
- * realtek ALC65x codecs
+ * realtek ALC65x/850 codecs
  */
 static int snd_ac97_alc650_mic_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * ucontrol)
 {
@@ -1088,6 +1297,7 @@ static const snd_kcontrol_new_t snd_ac97_controls_alc650[] = {
                .info = snd_ac97_info_single,
                .get = snd_ac97_alc650_mic_get,
                .put = snd_ac97_alc650_mic_put,
+               .private_value = AC97_SINGLE_VALUE(0, 0, 1, 0) /* only mask needed */
        },
 };
 
@@ -1120,6 +1330,17 @@ int patch_alc650(ac97_t * ac97)
 
        ac97->build_ops = &patch_alc650_ops;
 
+       /* determine the revision */
+       val = snd_ac97_read(ac97, AC97_ALC650_REVISION) & 0x3f;
+       if (val < 3)
+               ac97->id = 0x414c4720;          /* Old version */
+       else if (val < 0x10)
+               ac97->id = 0x414c4721;          /* D version */
+       else if (val < 0x20)
+               ac97->id = 0x414c4722;          /* E version */
+       else if (val < 0x30)
+               ac97->id = 0x414c4723;          /* F version */
+
        /* revision E or F */
        /* FIXME: what about revision D ? */
        ac97->spec.dev_flags = (ac97->id == 0x414c4722 ||
@@ -1168,26 +1389,26 @@ static int snd_ac97_alc655_mic_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_
 static int snd_ac97_alc655_mic_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * ucontrol)
 {
         ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
-        int change;
 
        /* misc control; vrefout disable */
        snd_ac97_update_bits(ac97, AC97_ALC650_CLOCK, 1 << 12,
                             ucontrol->value.integer.value[0] ? (1 << 12) : 0);
-       change = snd_ac97_update_bits(ac97, AC97_ALC650_MULTICH, 1 << 10,
-                                     ucontrol->value.integer.value[0] ? (1 << 10) : 0);
-       return change;
+       return ac97_update_bits_page(ac97, AC97_ALC650_MULTICH, 1 << 10,
+                                    ucontrol->value.integer.value[0] ? (1 << 10) : 0,
+                                    0);
 }
 
 
 static const snd_kcontrol_new_t snd_ac97_controls_alc655[] = {
-       AC97_SINGLE("Duplicate Front", AC97_ALC650_MULTICH, 0, 1, 0),
-       AC97_SINGLE("Line-In As Surround", AC97_ALC650_MULTICH, 9, 1, 0),
+       AC97_PAGE_SINGLE("Duplicate Front", AC97_ALC650_MULTICH, 0, 1, 0, 0),
+       AC97_PAGE_SINGLE("Line-In As Surround", AC97_ALC650_MULTICH, 9, 1, 0, 0),
        {
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                .name = "Mic As Center/LFE",
                .info = snd_ac97_info_single,
                .get = snd_ac97_alc655_mic_get,
                .put = snd_ac97_alc655_mic_put,
+               .private_value = AC97_SINGLE_VALUE(0, 0, 1, 0) /* only mask needed */
        },
 };
 
@@ -1207,7 +1428,6 @@ static int alc655_iec958_route_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_
               texts_658[uinfo->value.enumerated.item] :
               texts_655[uinfo->value.enumerated.item]);
        return 0;
-
 }
 
 static int alc655_iec958_route_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
@@ -1226,13 +1446,15 @@ static int alc655_iec958_route_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_
 static int alc655_iec958_route_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
 {
        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
-       return snd_ac97_update_bits(ac97, AC97_ALC650_MULTICH, 3 << 12,
-                                   (unsigned short)ucontrol->value.enumerated.item[0]);
+
+       return ac97_update_bits_page(ac97, AC97_ALC650_MULTICH, 3 << 12,
+                                    (unsigned short)ucontrol->value.enumerated.item[0],
+                                    0);
 }
 
 static const snd_kcontrol_new_t snd_ac97_spdif_controls_alc655[] = {
-        AC97_SINGLE("IEC958 Capture Switch", AC97_ALC650_MULTICH, 11, 1, 0),
-        AC97_SINGLE("IEC958 Input Monitor", AC97_ALC650_MULTICH, 14, 1, 0),
+        AC97_PAGE_SINGLE("IEC958 Capture Switch", AC97_ALC650_MULTICH, 11, 1, 0, 0),
+        AC97_PAGE_SINGLE("IEC958 Input Monitor", AC97_ALC650_MULTICH, 14, 1, 0, 0),
        {
                .iface  = SNDRV_CTL_ELEM_IFACE_MIXER,
                .name   = "IEC958 Playback Route",
@@ -1267,6 +1489,9 @@ int patch_alc655(ac97_t * ac97)
 
        ac97->build_ops = &patch_alc655_ops;
 
+       /* assume only page 0 for writing cache */
+       snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, AC97_PAGE_VENDOR);
+
        /* adjust default values */
        val = snd_ac97_read(ac97, 0x7a); /* misc control */
        val |= (1 << 1); /* spdif input pin */
@@ -1285,6 +1510,120 @@ int patch_alc655(ac97_t * ac97)
        return 0;
 }
 
+
+#define AC97_ALC850_JACK_SELECT        0x76
+#define AC97_ALC850_MISC1      0x7a
+
+static int ac97_alc850_surround_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
+        ucontrol->value.integer.value[0] = ((ac97->regs[AC97_ALC850_JACK_SELECT] >> 12) & 7) == 2;
+        return 0;
+}
+
+static int ac97_alc850_surround_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
+
+       /* SURR 1kOhm (bit4), Amp (bit5) */
+       snd_ac97_update_bits(ac97, AC97_ALC850_MISC1, (1<<4)|(1<<5),
+                            ucontrol->value.integer.value[0] ? (1<<5) : (1<<4));
+       /* LINE-IN = 0, SURROUND = 2 */
+       return snd_ac97_update_bits(ac97, AC97_ALC850_JACK_SELECT, 7 << 12,
+                                   ucontrol->value.integer.value[0] ? (2<<12) : (0<<12));
+}
+
+static int ac97_alc850_mic_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
+        ucontrol->value.integer.value[0] = ((ac97->regs[AC97_ALC850_JACK_SELECT] >> 4) & 7) == 2;
+        return 0;
+}
+
+static int ac97_alc850_mic_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
+
+       /* Vref disable (bit12), 1kOhm (bit13) */
+       snd_ac97_update_bits(ac97, AC97_ALC850_MISC1, (1<<12)|(1<<13),
+                            ucontrol->value.integer.value[0] ? (1<<12) : (1<<13));
+       /* MIC-IN = 1, CENTER-LFE = 2 */
+       return snd_ac97_update_bits(ac97, AC97_ALC850_JACK_SELECT, 7 << 4,
+                                   ucontrol->value.integer.value[0] ? (2<<4) : (1<<4));
+}
+
+static const snd_kcontrol_new_t snd_ac97_controls_alc850[] = {
+       AC97_PAGE_SINGLE("Duplicate Front", AC97_ALC650_MULTICH, 0, 1, 0, 0),
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Line-In As Surround",
+               .info = snd_ac97_info_single,
+               .get = ac97_alc850_surround_get,
+               .put = ac97_alc850_surround_put,
+               .private_value = AC97_SINGLE_VALUE(0, 0, 1, 0) /* only mask needed */
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Mic As Center/LFE",
+               .info = snd_ac97_info_single,
+               .get = ac97_alc850_mic_get,
+               .put = ac97_alc850_mic_put,
+               .private_value = AC97_SINGLE_VALUE(0, 0, 1, 0) /* only mask needed */
+       },
+
+};
+
+static int patch_alc850_specific(ac97_t *ac97)
+{
+       int err;
+
+       if ((err = patch_build_controls(ac97, snd_ac97_controls_alc850, ARRAY_SIZE(snd_ac97_controls_alc850))) < 0)
+               return err;
+       if (ac97->ext_id & AC97_EI_SPDIF) {
+               if ((err = patch_build_controls(ac97, snd_ac97_spdif_controls_alc655, ARRAY_SIZE(snd_ac97_spdif_controls_alc655))) < 0)
+                       return err;
+       }
+       return 0;
+}
+
+static struct snd_ac97_build_ops patch_alc850_ops = {
+       .build_specific = patch_alc850_specific
+};
+
+int patch_alc850(ac97_t *ac97)
+{
+       ac97->build_ops = &patch_alc850_ops;
+
+       ac97->spec.dev_flags = 0; /* for IEC958 playback route - ALC655 compatible */
+
+       /* assume only page 0 for writing cache */
+       snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, AC97_PAGE_VENDOR);
+
+       /* adjust default values */
+       /* set default: spdif-in enabled,
+          spdif-in monitor off, spdif-in PCM off
+          center on mic off, surround on line-in off
+          duplicate front off
+       */
+       snd_ac97_write_cache(ac97, AC97_ALC650_MULTICH, 1<<15);
+       /* SURR_OUT: on, Surr 1kOhm: on, Surr Amp: off, Front 1kOhm: off
+        * Front Amp: on, Vref: enable, Center 1kOhm: on, Mix: on
+        */
+       snd_ac97_write_cache(ac97, 0x7a, (1<<1)|(1<<4)|(0<<5)|(1<<6)|
+                            (1<<7)|(0<<12)|(1<<13)|(0<<14));
+       /* detection UIO2,3: all path floating, UIO3: MIC, Vref2: disable,
+        * UIO1: FRONT, Vref3: disable, UIO3: LINE, Front-Mic: mute
+        */
+       snd_ac97_write_cache(ac97, 0x76, (0<<0)|(0<<2)|(1<<4)|(1<<7)|(2<<8)|
+                            (1<<11)|(0<<12)|(1<<15));
+
+       /* full DAC volume */
+       snd_ac97_write_cache(ac97, AC97_ALC650_SURR_DAC_VOL, 0x0808);
+       snd_ac97_write_cache(ac97, AC97_ALC650_LFE_DAC_VOL, 0x0808);
+       return 0;
+}
+
+
 /*
  * C-Media CM97xx codecs
  */
@@ -1358,8 +1697,34 @@ static const snd_kcontrol_new_t snd_ac97_cm9739_controls_spdif[] = {
        /* BIT 8: SPD32 - 32bit SPDIF - not supported yet */
 };
 
+static int snd_ac97_cm9739_center_mic_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+       ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
+       if (ac97->regs[AC97_CM9739_MULTI_CHAN] & 0x1000)
+               ucontrol->value.integer.value[0] = 1;
+       else
+               ucontrol->value.integer.value[0] = 0;
+       return 0;
+}
+
+static int snd_ac97_cm9739_center_mic_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+       ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
+       return snd_ac97_update_bits(ac97, AC97_CM9739_MULTI_CHAN, 0x3000,
+                                   ucontrol->value.integer.value[0] ? 
+                                   0x1000 : 0x2000);
+}
+
 static const snd_kcontrol_new_t snd_ac97_cm9739_controls[] = {
        AC97_SINGLE("Line-In As Surround", AC97_CM9739_MULTI_CHAN, 10, 1, 0),
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Mic As Center/LFE",
+               .info = snd_ac97_info_single,
+               .get = snd_ac97_cm9739_center_mic_get,
+               .put = snd_ac97_cm9739_center_mic_put,
+               .private_value = AC97_SINGLE_VALUE(0, 0, 1, 0) /* only mask needed */
+       },
 };
 
 static int patch_cm9739_specific(ac97_t * ac97)
@@ -1389,15 +1754,20 @@ int patch_cm9739(ac97_t * ac97)
                /* enable spdif in */
                snd_ac97_write_cache(ac97, AC97_CM9739_SPDIF_CTRL,
                                     snd_ac97_read(ac97, AC97_CM9739_SPDIF_CTRL) | 0x01);
+               ac97->rates[AC97_RATES_SPDIF] = SNDRV_PCM_RATE_48000; /* 48k only */
        } else {
                ac97->ext_id &= ~AC97_EI_SPDIF; /* disable extended-id */
+               ac97->rates[AC97_RATES_SPDIF] = 0;
        }
 
        /* set-up multi channel */
-       /* bit 13: enable internal vref output for mic */
-       /* bit 12: enable center/lfe */
        /* bit 14: 0 = SPDIF, 1 = EAPD */
-       val = (1 << 12) | (1 << 13);
+       /* bit 13: enable internal vref output for mic */
+       /* bit 12: disable center/lfe (swithable) */
+       /* bit 10: disable surround/line (switchable) */
+       /* bit 9: mix 2 surround off */
+       /* bit 0: dB */
+       val = (1 << 13);
        if (! (ac97->ext_id & AC97_EI_SPDIF))
                val |= (1 << 14);
        snd_ac97_write_cache(ac97, AC97_CM9739_MULTI_CHAN, val);