Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

2 files changed, 142 insertions, 70 deletions

diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index a7630e9edf8a..7f4d619f4ddb 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -71,6 +71,12 @@ static const struct ac97_codec_id snd_ac97_codec_id_vendors[] = {
 { 0x414b4d00, 0xffffff00, "Asahi Kasei",        NULL,   NULL },
 { 0x414c4300, 0xffffff00, "Realtek",            NULL,   NULL },
 { 0x414c4700, 0xffffff00, "Realtek",            NULL,   NULL },
+/*
+ * This is an _inofficial_ Aztech Labs entry
+ * (value might differ from unknown official Aztech ID),
+ * currently used by the AC97 emulation of the almost-AC97 PCI168 card.
+ */
+{ 0x415a5400, 0xffffff00, "Aztech Labs (emulated)",     NULL,   NULL },
 { 0x434d4900, 0xffffff00, "C-Media Electronics", NULL,  NULL },
 { 0x43525900, 0xffffff00, "Cirrus Logic",       NULL,   NULL },
 { 0x43585400, 0xffffff00, "Conexant",           NULL,   NULL },
@@ -127,6 +133,7 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = {
 { 0x414c4781, 0xffffffff, "ALC658D",            NULL,   NULL }, /* already patched */
 { 0x414c4780, 0xfffffff0, "ALC658",             patch_alc655,   NULL },
 { 0x414c4790, 0xfffffff0, "ALC850",             patch_alc850,   NULL },
+{ 0x415a5401, 0xffffffff, "AZF3328",            patch_aztech_azf3328,   NULL },
 { 0x434d4941, 0xffffffff, "CMI9738",            patch_cm9738,   NULL },
 { 0x434d4961, 0xffffffff, "CMI9739",            patch_cm9739,   NULL },
 { 0x434d4969, 0xffffffff, "CMI9780",            patch_cm9780,   NULL },
@@ -590,9 +597,9 @@ static int snd_ac97_put_volsw(struct snd_kcontrol *kcontrol,
         snd_ac97_page_restore(ac97, page_save);
 #ifdef CONFIG_SND_AC97_POWER_SAVE
         /* check analog mixer power-down */
-        if ((val_mask & 0x8000) &&
+        if ((val_mask & AC97_PD_EAPD) &&
             (kcontrol->private_value & (1<<30))) {
-                if (val & 0x8000)
+                if (val & AC97_PD_EAPD)
                         ac97->power_up &= ~(1 << (reg>>1));
                 else
                         ac97->power_up |= 1 << (reg>>1);
@@ -1014,8 +1021,7 @@ static int snd_ac97_free(struct snd_ac97 *ac97)
 {
         if (ac97) {
 #ifdef CONFIG_SND_AC97_POWER_SAVE
-                cancel_delayed_work(&ac97->power_work);
-                flush_scheduled_work();
+                cancel_delayed_work_sync(&ac97->power_work);
 #endif
                 snd_ac97_proc_done(ac97);
                 if (ac97->bus)
@@ -1036,20 +1042,20 @@ static int snd_ac97_dev_free(struct snd_device *device)
 
 static int snd_ac97_try_volume_mix(struct snd_ac97 * ac97, int reg)
 {
-        unsigned short val, mask = 0x8000;
+        unsigned short val, mask = AC97_MUTE_MASK_MONO;
 
         if (! snd_ac97_valid_reg(ac97, reg))
                 return 0;
 
         switch (reg) {
         case AC97_MASTER_TONE:
-                return ac97->caps & 0x04 ? 1 : 0;
+                return ac97->caps & AC97_BC_BASS_TREBLE ? 1 : 0;
         case AC97_HEADPHONE:
-                return ac97->caps & 0x10 ? 1 : 0;
+                return ac97->caps & AC97_BC_HEADPHONE ? 1 : 0;
         case AC97_REC_GAIN_MIC:
-                return ac97->caps & 0x01 ? 1 : 0;
+                return ac97->caps & AC97_BC_DEDICATED_MIC ? 1 : 0;
         case AC97_3D_CONTROL:
-                if (ac97->caps & 0x7c00) {
+                if (ac97->caps & AC97_BC_3D_TECH_ID_MASK) {
                         val = snd_ac97_read(ac97, reg);
                         /* if nonzero - fixed and we can't set it */
                         return val == 0;
@@ -1105,7 +1111,10 @@ static void check_volume_resolution(struct snd_ac97 *ac97, int reg, unsigned cha
         *lo_max = *hi_max = 0;
         for (i = 0 ; i < ARRAY_SIZE(cbit); i++) {
                 unsigned short val;
-                snd_ac97_write(ac97, reg, 0x8080 | cbit[i] | (cbit[i] << 8));
+                snd_ac97_write(
+                        ac97, reg,
+                        AC97_MUTE_MASK_STEREO | cbit[i] | (cbit[i] << 8)
+                );
                 /* Do the read twice due to buffers on some ac97 codecs.
                  * e.g. The STAC9704 returns exactly what you wrote to the register
                  * if you read it immediately. This causes the detect routine to fail.
@@ -1140,14 +1149,14 @@ static void snd_ac97_change_volume_params2(struct snd_ac97 * ac97, int reg, int
         unsigned short val, val1;
 
         *max = 63;
-        val = 0x8080 | (0x20 << shift);
+        val = AC97_MUTE_MASK_STEREO | (0x20 << shift);
         snd_ac97_write(ac97, reg, val);
         val1 = snd_ac97_read(ac97, reg);
         if (val != val1) {
                 *max = 31;
         }
         /* reset volume to zero */
-        snd_ac97_write_cache(ac97, reg, 0x8080);
+        snd_ac97_write_cache(ac97, reg, AC97_MUTE_MASK_STEREO);
 }
 
 static inline int printable(unsigned int x)
@@ -1184,16 +1193,16 @@ static int snd_ac97_cmute_new_stereo(struct snd_card *card, char *name, int reg,
         if (! snd_ac97_valid_reg(ac97, reg))
                 return 0;
 
-        mute_mask = 0x8000;
+        mute_mask = AC97_MUTE_MASK_MONO;
         val = snd_ac97_read(ac97, reg);
         if (check_stereo || (ac97->flags & AC97_STEREO_MUTES)) {
                 /* check whether both mute bits work */
-                val1 = val | 0x8080;
+                val1 = val | AC97_MUTE_MASK_STEREO;
                 snd_ac97_write(ac97, reg, val1);
                 if (val1 == snd_ac97_read(ac97, reg))
-                        mute_mask = 0x8080;
+                        mute_mask = AC97_MUTE_MASK_STEREO;
         }
-        if (mute_mask == 0x8080) {
+        if (mute_mask == AC97_MUTE_MASK_STEREO) {
                 struct snd_kcontrol_new tmp = AC97_DOUBLE(name, reg, 15, 7, 1, 1);
                 if (check_amix)
                         tmp.private_value |= (1 << 30);
@@ -1269,9 +1278,11 @@ static int snd_ac97_cvol_new(struct snd_card *card, char *name, int reg, unsigne
         err = snd_ctl_add(card, kctl);
         if (err < 0)
                 return err;
-        snd_ac97_write_cache(ac97, reg,
-                             (snd_ac97_read(ac97, reg) & 0x8080) |
-                             lo_max | (hi_max << 8));
+        snd_ac97_write_cache(
+                ac97, reg,
+                (snd_ac97_read(ac97, reg) & AC97_MUTE_MASK_STEREO)
+                | lo_max | (hi_max << 8)
+        );
         return 0;
 }
 
@@ -1333,7 +1344,7 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)
                         return err;
         }
 
-        ac97->regs[AC97_CENTER_LFE_MASTER] = 0x8080;
+        ac97->regs[AC97_CENTER_LFE_MASTER] = AC97_MUTE_MASK_STEREO;
 
         /* build center controls */
         if ((snd_ac97_try_volume_mix(ac97, AC97_CENTER_LFE_MASTER)) 
@@ -1411,8 +1422,12 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)
                         if ((err = snd_ctl_add(card, kctl = snd_ac97_cnew(&snd_ac97_controls_pc_beep[idx], ac97))) < 0)
                                 return err;
                 set_tlv_db_scale(kctl, db_scale_4bit);
-                snd_ac97_write_cache(ac97, AC97_PC_BEEP,
-                                     snd_ac97_read(ac97, AC97_PC_BEEP) | 0x801e);
+                snd_ac97_write_cache(
+                        ac97,
+                        AC97_PC_BEEP,
+                        (snd_ac97_read(ac97, AC97_PC_BEEP)
+                                | AC97_MUTE_MASK_MONO | 0x001e)
+                );
         }
         
         /* build Phone controls */
@@ -1546,7 +1561,7 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)
         }
 
         /* build Simulated Stereo Enhancement control */
-        if (ac97->caps & 0x0008) {
+        if (ac97->caps & AC97_BC_SIM_STEREO) {
                 if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_general[AC97_GENERAL_STEREO_ENHANCEMENT], ac97))) < 0)
                         return err;
         }
@@ -1558,7 +1573,7 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)
         }
 
         /* build Loudness control */
-        if (ac97->caps & 0x0020) {
+        if (ac97->caps & AC97_BC_LOUDNESS) {
                 if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_general[AC97_GENERAL_LOUDNESS], ac97))) < 0)
                         return err;
         }
@@ -1962,7 +1977,7 @@ static int snd_ac97_dev_disconnect(struct snd_device *device)
 }
 
 /* build_ops to do nothing */
-static struct snd_ac97_build_ops null_build_ops;
+static const struct snd_ac97_build_ops null_build_ops;
 
 #ifdef CONFIG_SND_AC97_POWER_SAVE
 static void do_update_power(struct work_struct *work)
@@ -2456,8 +2471,7 @@ void snd_ac97_suspend(struct snd_ac97 *ac97)
         if (ac97->build_ops->suspend)
                 ac97->build_ops->suspend(ac97);
 #ifdef CONFIG_SND_AC97_POWER_SAVE
-        cancel_delayed_work(&ac97->power_work);
-        flush_scheduled_work();
+        cancel_delayed_work_sync(&ac97->power_work);
 #endif
         snd_ac97_powerdown(ac97);
 }
@@ -2544,8 +2558,8 @@ void snd_ac97_resume(struct snd_ac97 *ac97)
                         schedule_timeout_uninterruptible(1);
                 } while (time_after_eq(end_time, jiffies));
                 /* FIXME: extra delay */
-                ac97->bus->ops->write(ac97, AC97_MASTER, 0x8000);
-                if (snd_ac97_read(ac97, AC97_MASTER) != 0x8000)
+                ac97->bus->ops->write(ac97, AC97_MASTER, AC97_MUTE_MASK_MONO);
+                if (snd_ac97_read(ac97, AC97_MASTER) != AC97_MUTE_MASK_MONO)
                         msleep(250);
         } else {
                 end_time = jiffies + msecs_to_jiffies(100);
@@ -2749,12 +2763,12 @@ static int master_mute_sw_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem
                 int rshift = (kcontrol->private_value >> 12) & 0x0f;
                 unsigned short mask;
                 if (shift != rshift)
-                        mask = 0x8080;
+                        mask = AC97_MUTE_MASK_STEREO;
                 else
-                        mask = 0x8000;
-                snd_ac97_update_bits(ac97, AC97_POWERDOWN, 0x8000,
+                        mask = AC97_MUTE_MASK_MONO;
+                snd_ac97_update_bits(ac97, AC97_POWERDOWN, AC97_PD_EAPD,
                                      (ac97->regs[AC97_MASTER] & mask) == mask ?
-                                     0x8000 : 0);
+                                     AC97_PD_EAPD : 0);
         }
         return err;
 }
@@ -2767,7 +2781,10 @@ static int tune_mute_led(struct snd_ac97 *ac97)
                 return -ENOENT;
         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,
+                AC97_PD_EAPD, AC97_PD_EAPD /* mute LED on */
+        );
         ac97->scaps |= AC97_SCAP_EAPD_LED;
         return 0;
 }
@@ -2782,12 +2799,12 @@ static int hp_master_mute_sw_put(struct snd_kcontrol *kcontrol,
                 int rshift = (kcontrol->private_value >> 12) & 0x0f;
                 unsigned short mask;
                 if (shift != rshift)
-                        mask = 0x8080;
+                        mask = AC97_MUTE_MASK_STEREO;
                 else
-                        mask = 0x8000;
-                snd_ac97_update_bits(ac97, AC97_POWERDOWN, 0x8000,
+                        mask = AC97_MUTE_MASK_MONO;
+                snd_ac97_update_bits(ac97, AC97_POWERDOWN, AC97_PD_EAPD,
                                      (ac97->regs[AC97_MASTER] & mask) == mask ?
-                                     0x8000 : 0);
+                                     AC97_PD_EAPD : 0);
         }
         return err;
 }
@@ -2803,7 +2820,10 @@ static int tune_hp_mute_led(struct snd_ac97 *ac97)
         snd_ac97_remove_ctl(ac97, "External Amplifier", NULL);
         snd_ac97_remove_ctl(ac97, "Headphone Playback", "Switch");
         snd_ac97_remove_ctl(ac97, "Headphone Playback", "Volume");
-        snd_ac97_update_bits(ac97, AC97_POWERDOWN, 0x8000, 0x8000); /* mute LED on */
+        snd_ac97_update_bits(
+                ac97, AC97_POWERDOWN,
+                AC97_PD_EAPD, AC97_PD_EAPD /* mute LED on */
+        );
         return 0;
 }
 
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
index e68c98ef4041..200c9a1d48b7 100644
--- a/sound/pci/ac97/ac97_patch.c
+++ b/sound/pci/ac97/ac97_patch.c
@@ -27,6 +27,15 @@
 #include "ac97_patch.h"
 
 /*
+ *  Forward declarations
+ */
+
+static struct snd_kcontrol *snd_ac97_find_mixer_ctl(struct snd_ac97 *ac97,
+                                                    const char *name);
+static int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name,
+                                const unsigned int *tlv, const char **slaves);
+
+/*
  *  Chip specific initialization
  */
 
@@ -371,7 +380,7 @@ static int patch_yamaha_ymf743_build_spdif(struct snd_ac97 *ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_yamaha_ymf743_ops = {
+static const struct snd_ac97_build_ops patch_yamaha_ymf743_ops = {
         .build_spdif    = patch_yamaha_ymf743_build_spdif,
         .build_3d       = patch_yamaha_ymf7x3_3d,
 };
@@ -455,7 +464,7 @@ static int patch_yamaha_ymf753_post_spdif(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_yamaha_ymf753_ops = {
+static const struct snd_ac97_build_ops patch_yamaha_ymf753_ops = {
         .build_3d       = patch_yamaha_ymf7x3_3d,
         .build_post_spdif = patch_yamaha_ymf753_post_spdif
 };
@@ -502,7 +511,7 @@ static int patch_wolfson_wm9703_specific(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_wolfson_wm9703_ops = {
+static const struct snd_ac97_build_ops patch_wolfson_wm9703_ops = {
         .build_specific = patch_wolfson_wm9703_specific,
 };
 
@@ -533,7 +542,7 @@ static int patch_wolfson_wm9704_specific(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_wolfson_wm9704_ops = {
+static const struct snd_ac97_build_ops patch_wolfson_wm9704_ops = {
         .build_specific = patch_wolfson_wm9704_specific,
 };
 
@@ -677,7 +686,7 @@ static int patch_wolfson_wm9711_specific(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_wolfson_wm9711_ops = {
+static const struct snd_ac97_build_ops patch_wolfson_wm9711_ops = {
         .build_specific = patch_wolfson_wm9711_specific,
 };
 
@@ -871,7 +880,7 @@ static void patch_wolfson_wm9713_resume (struct snd_ac97 * ac97)
 }
 #endif
 
-static struct snd_ac97_build_ops patch_wolfson_wm9713_ops = {
+static const struct snd_ac97_build_ops patch_wolfson_wm9713_ops = {
         .build_specific = patch_wolfson_wm9713_specific,
         .build_3d = patch_wolfson_wm9713_3d,
 #ifdef CONFIG_PM        
@@ -976,7 +985,7 @@ static int patch_sigmatel_stac97xx_specific(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_sigmatel_stac9700_ops = {
+static const struct snd_ac97_build_ops patch_sigmatel_stac9700_ops = {
         .build_3d       = patch_sigmatel_stac9700_3d,
         .build_specific = patch_sigmatel_stac97xx_specific
 };
@@ -1023,7 +1032,7 @@ static int patch_sigmatel_stac9708_specific(struct snd_ac97 *ac97)
         return patch_sigmatel_stac97xx_specific(ac97);
 }
 
-static struct snd_ac97_build_ops patch_sigmatel_stac9708_ops = {
+static const struct snd_ac97_build_ops patch_sigmatel_stac9708_ops = {
         .build_3d       = patch_sigmatel_stac9708_3d,
         .build_specific = patch_sigmatel_stac9708_specific
 };
@@ -1252,7 +1261,7 @@ static int patch_sigmatel_stac9758_specific(struct snd_ac97 *ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_sigmatel_stac9758_ops = {
+static const struct snd_ac97_build_ops patch_sigmatel_stac9758_ops = {
         .build_3d       = patch_sigmatel_stac9700_3d,
         .build_specific = patch_sigmatel_stac9758_specific
 };
@@ -1327,7 +1336,7 @@ static int patch_cirrus_build_spdif(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_cirrus_ops = {
+static const struct snd_ac97_build_ops patch_cirrus_ops = {
         .build_spdif = patch_cirrus_build_spdif
 };
 
@@ -1384,7 +1393,7 @@ static int patch_conexant_build_spdif(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_conexant_ops = {
+static const struct snd_ac97_build_ops patch_conexant_ops = {
         .build_spdif = patch_conexant_build_spdif
 };
 
@@ -1560,7 +1569,7 @@ static void patch_ad1881_chained(struct snd_ac97 * ac97, int unchained_idx, int
         }
 }
 
-static struct snd_ac97_build_ops patch_ad1881_build_ops = {
+static const struct snd_ac97_build_ops patch_ad1881_build_ops = {
 #ifdef CONFIG_PM
         .resume = ad18xx_resume
 #endif
@@ -1647,7 +1656,7 @@ static int patch_ad1885_specific(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_ad1885_build_ops = {
+static const struct snd_ac97_build_ops patch_ad1885_build_ops = {
         .build_specific = &patch_ad1885_specific,
 #ifdef CONFIG_PM
         .resume = ad18xx_resume
@@ -1674,7 +1683,7 @@ static int patch_ad1886_specific(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_ad1886_build_ops = {
+static const struct snd_ac97_build_ops patch_ad1886_build_ops = {
         .build_specific = &patch_ad1886_specific,
 #ifdef CONFIG_PM
         .resume = ad18xx_resume
@@ -1881,7 +1890,7 @@ static int patch_ad1981a_specific(struct snd_ac97 * ac97)
                                     ARRAY_SIZE(snd_ac97_ad1981x_jack_sense));
 }
 
-static struct snd_ac97_build_ops patch_ad1981a_build_ops = {
+static const struct snd_ac97_build_ops patch_ad1981a_build_ops = {
         .build_post_spdif = patch_ad198x_post_spdif,
         .build_specific = patch_ad1981a_specific,
 #ifdef CONFIG_PM
@@ -1936,7 +1945,7 @@ static int patch_ad1981b_specific(struct snd_ac97 *ac97)
                                     ARRAY_SIZE(snd_ac97_ad1981x_jack_sense));
 }
 
-static struct snd_ac97_build_ops patch_ad1981b_build_ops = {
+static const struct snd_ac97_build_ops patch_ad1981b_build_ops = {
         .build_post_spdif = patch_ad198x_post_spdif,
         .build_specific = patch_ad1981b_specific,
 #ifdef CONFIG_PM
@@ -2075,7 +2084,7 @@ static int patch_ad1888_specific(struct snd_ac97 *ac97)
         return patch_build_controls(ac97, snd_ac97_ad1888_controls, ARRAY_SIZE(snd_ac97_ad1888_controls));
 }
 
-static struct snd_ac97_build_ops patch_ad1888_build_ops = {
+static const struct snd_ac97_build_ops patch_ad1888_build_ops = {
         .build_post_spdif = patch_ad198x_post_spdif,
         .build_specific = patch_ad1888_specific,
 #ifdef CONFIG_PM
@@ -2124,7 +2133,7 @@ static int patch_ad1980_specific(struct snd_ac97 *ac97)
         return patch_build_controls(ac97, &snd_ac97_ad198x_2cmic, 1);
 }
 
-static struct snd_ac97_build_ops patch_ad1980_build_ops = {
+static const struct snd_ac97_build_ops patch_ad1980_build_ops = {
         .build_post_spdif = patch_ad198x_post_spdif,
         .build_specific = patch_ad1980_specific,
 #ifdef CONFIG_PM
@@ -2239,7 +2248,7 @@ static int patch_ad1985_specific(struct snd_ac97 *ac97)
                                     ARRAY_SIZE(snd_ac97_ad1985_controls));
 }
 
-static struct snd_ac97_build_ops patch_ad1985_build_ops = {
+static const struct snd_ac97_build_ops patch_ad1985_build_ops = {
         .build_post_spdif = patch_ad198x_post_spdif,
         .build_specific = patch_ad1985_specific,
 #ifdef CONFIG_PM
@@ -2531,7 +2540,7 @@ static int patch_ad1986_specific(struct snd_ac97 *ac97)
                                     ARRAY_SIZE(snd_ac97_ad1985_controls));
 }
 
-static struct snd_ac97_build_ops patch_ad1986_build_ops = {
+static const struct snd_ac97_build_ops patch_ad1986_build_ops = {
         .build_post_spdif = patch_ad198x_post_spdif,
         .build_specific = patch_ad1986_specific,
 #ifdef CONFIG_PM
@@ -2636,7 +2645,7 @@ static int patch_alc650_specific(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_alc650_ops = {
+static const struct snd_ac97_build_ops patch_alc650_ops = {
         .build_specific = patch_alc650_specific,
         .update_jacks = alc650_update_jacks
 };
@@ -2788,7 +2797,7 @@ static int patch_alc655_specific(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_alc655_ops = {
+static const struct snd_ac97_build_ops patch_alc655_ops = {
         .build_specific = patch_alc655_specific,
         .update_jacks = alc655_update_jacks
 };
@@ -2900,7 +2909,7 @@ static int patch_alc850_specific(struct snd_ac97 *ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_alc850_ops = {
+static const struct snd_ac97_build_ops patch_alc850_ops = {
         .build_specific = patch_alc850_specific,
         .update_jacks = alc850_update_jacks
 };
@@ -2940,6 +2949,49 @@ static int patch_alc850(struct snd_ac97 *ac97)
         return 0;
 }
 
+static int patch_aztech_azf3328_specific(struct snd_ac97 *ac97)
+{
+        struct snd_kcontrol *kctl_3d_center =
+                snd_ac97_find_mixer_ctl(ac97, "3D Control - Center");
+        struct snd_kcontrol *kctl_3d_depth =
+                snd_ac97_find_mixer_ctl(ac97, "3D Control - Depth");
+
+        /*
+         * 3D register is different from AC97 standard layout
+         * (also do some renaming, to resemble Windows driver naming)
+         */
+        if (kctl_3d_center) {
+                kctl_3d_center->private_value =
+                        AC97_SINGLE_VALUE(AC97_3D_CONTROL, 1, 0x07, 0);
+                snd_ac97_rename_vol_ctl(ac97,
+                        "3D Control - Center", "3D Control - Width"
+                );
+        }
+        if (kctl_3d_depth)
+                kctl_3d_depth->private_value =
+                        AC97_SINGLE_VALUE(AC97_3D_CONTROL, 8, 0x03, 0);
+
+        /* Aztech Windows driver calls the
+           equivalent control "Modem Playback", thus rename it: */
+        snd_ac97_rename_vol_ctl(ac97,
+                "Master Mono Playback", "Modem Playback"
+        );
+        snd_ac97_rename_vol_ctl(ac97,
+                "Headphone Playback", "FM Synth Playback"
+        );
+
+        return 0;
+}
+
+static const struct snd_ac97_build_ops patch_aztech_azf3328_ops = {
+        .build_specific = patch_aztech_azf3328_specific
+};
+
+static int patch_aztech_azf3328(struct snd_ac97 *ac97)
+{
+        ac97->build_ops = &patch_aztech_azf3328_ops;
+        return 0;
+}
 
 /*
  * C-Media CM97xx codecs
@@ -2962,7 +3014,7 @@ static int patch_cm9738_specific(struct snd_ac97 * ac97)
         return patch_build_controls(ac97, snd_ac97_cm9738_controls, ARRAY_SIZE(snd_ac97_cm9738_controls));
 }
 
-static struct snd_ac97_build_ops patch_cm9738_ops = {
+static const struct snd_ac97_build_ops patch_cm9738_ops = {
         .build_specific = patch_cm9738_specific,
         .update_jacks = cm9738_update_jacks
 };
@@ -3053,7 +3105,7 @@ static int patch_cm9739_post_spdif(struct snd_ac97 * ac97)
         return patch_build_controls(ac97, snd_ac97_cm9739_controls_spdif, ARRAY_SIZE(snd_ac97_cm9739_controls_spdif));
 }
 
-static struct snd_ac97_build_ops patch_cm9739_ops = {
+static const struct snd_ac97_build_ops patch_cm9739_ops = {
         .build_specific = patch_cm9739_specific,
         .build_post_spdif = patch_cm9739_post_spdif,
         .update_jacks = cm9739_update_jacks
@@ -3227,7 +3279,7 @@ static int patch_cm9761_specific(struct snd_ac97 * ac97)
         return patch_build_controls(ac97, snd_ac97_cm9761_controls, ARRAY_SIZE(snd_ac97_cm9761_controls));
 }
 
-static struct snd_ac97_build_ops patch_cm9761_ops = {
+static const struct snd_ac97_build_ops patch_cm9761_ops = {
         .build_specific = patch_cm9761_specific,
         .build_post_spdif = patch_cm9761_post_spdif,
         .update_jacks = cm9761_update_jacks
@@ -3323,7 +3375,7 @@ static int patch_cm9780_specific(struct snd_ac97 *ac97)
         return patch_build_controls(ac97, cm9780_controls, ARRAY_SIZE(cm9780_controls));
 }
 
-static struct snd_ac97_build_ops patch_cm9780_ops = {
+static const struct snd_ac97_build_ops patch_cm9780_ops = {
         .build_specific = patch_cm9780_specific,
         .build_post_spdif = patch_cm9761_post_spdif     /* identical with CM9761 */
 };
@@ -3443,7 +3495,7 @@ static int patch_vt1616_specific(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_vt1616_ops = {
+static const struct snd_ac97_build_ops patch_vt1616_ops = {
         .build_specific = patch_vt1616_specific
 };
 
@@ -3797,7 +3849,7 @@ static int patch_it2646_specific(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_it2646_ops = {
+static const struct snd_ac97_build_ops patch_it2646_ops = {
         .build_specific = patch_it2646_specific,
         .update_jacks = it2646_update_jacks
 };
@@ -3831,7 +3883,7 @@ static int patch_si3036_specific(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_si3036_ops = {
+static const struct snd_ac97_build_ops patch_si3036_ops = {
         .build_specific = patch_si3036_specific,
 };
 
@@ -3898,7 +3950,7 @@ static int patch_ucb1400_specific(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_ucb1400_ops = {
+static const struct snd_ac97_build_ops patch_ucb1400_ops = {
         .build_specific = patch_ucb1400_specific,
 };