14 files changed, 431 insertions, 17 deletions

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index 4a6be966bd9f..3a3228b18726 100644
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -164,6 +164,7 @@ config SND_INTERWAVE
         select SND_RAWMIDI
         select SND_CS4231_LIB
         select SND_GUS_SYNTH
+        select ISAPNP
         help
           Say Y here to include support for AMD InterWave based
           soundcards (Gravis UltraSound Plug & Play, STB SoundRage32,
diff --git a/sound/oss/ac97_codec.c b/sound/oss/ac97_codec.c
index 124b1e10a13d..3ecef4689f1b 100644
--- a/sound/oss/ac97_codec.c
+++ b/sound/oss/ac97_codec.c
@@ -155,6 +155,7 @@ static const struct {
         {0x43525931, "Cirrus Logic CS4299 rev A", &crystal_digital_ops},
         {0x43525933, "Cirrus Logic CS4299 rev C", &crystal_digital_ops},
         {0x43525934, "Cirrus Logic CS4299 rev D", &crystal_digital_ops},
+        {0x43585430, "CXT48",                   &default_ops,           AC97_DELUDED_MODEM },
         {0x43585442, "CXT66",                   &default_ops,           AC97_DELUDED_MODEM },
         {0x44543031, "Diamond Technology DT0893", &default_ops},
         {0x45838308, "ESS Allegro ES1988",      &null_ops},
diff --git a/sound/oss/msnd_pinnacle.c b/sound/oss/msnd_pinnacle.c
index 6ba03f89fc43..0c2db657badd 100644
--- a/sound/oss/msnd_pinnacle.c
+++ b/sound/oss/msnd_pinnacle.c
@@ -892,7 +892,7 @@ static __inline__ int pack_DAPF_to_DAPQ(register int start)
 static int dsp_read(char __user *buf, size_t len)
 {
         int count = len;
-        char *page = (char *)__get_free_page(PAGE_SIZE);
+        char *page = (char *)__get_free_page(GFP_KERNEL);
 
         if (!page)
                 return -ENOMEM;
diff --git a/sound/oss/sonicvibes.c b/sound/oss/sonicvibes.c
index e1d69611a257..06047e7979af 100644
--- a/sound/oss/sonicvibes.c
+++ b/sound/oss/sonicvibes.c
@@ -1149,7 +1149,7 @@ static int mixer_ioctl(struct sv_state *s, unsigned int cmd, unsigned long arg)
                         if (mixtable[i].rec)
                                 break;
                 }
-                if (!mixtable[i].rec)
+                if (i == SOUND_MIXER_NRDEVICES)
                         return 0;
                 spin_lock_irqsave(&s->lock, flags);
                 frobindir(s, SV_CIMIX_ADCINL, 0x1f, mixtable[i].rec << 5);
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index d89647a3d449..959953ca320a 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -64,7 +64,8 @@ MODULE_PARM_DESC(model, "Use the given board model.");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Intel, ICH6},"
                          "{Intel, ICH6M},"
-                         "{Intel, ICH7}}");
+                         "{Intel, ICH7},"
+                         "{Intel, ESB2}}");
 MODULE_DESCRIPTION("Intel HDA driver");
 
 #define SFX     "hda-intel: "
@@ -1422,6 +1423,7 @@ static void __devexit azx_remove(struct pci_dev *pci)
 static struct pci_device_id azx_ids[] = {
         { 0x8086, 0x2668, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ICH6 */
         { 0x8086, 0x27d8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ICH7 */
+        { 0x8086, 0x269a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ESB2 */
         { 0, }
 };
 MODULE_DEVICE_TABLE(pci, azx_ids);
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index d143d2c78988..8b33b12fa5dc 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -125,8 +125,8 @@ MODULE_PARM_DESC(xbox, "Set to 1 for Xbox, if you have problems with the AC'97 c
 #ifndef PCI_DEVICE_ID_INTEL_ICH7_20
 #define PCI_DEVICE_ID_INTEL_ICH7_20     0x27de
 #endif
-#ifndef PCI_DEVICE_ID_INTEL_ESB2_13
-#define PCI_DEVICE_ID_INTEL_ESB2_13     0x2698
+#ifndef PCI_DEVICE_ID_INTEL_ESB2_14
+#define PCI_DEVICE_ID_INTEL_ESB2_14     0x2698
 #endif
 #ifndef PCI_DEVICE_ID_SI_7012
 #define PCI_DEVICE_ID_SI_7012           0x7012
@@ -2741,7 +2741,7 @@ static struct shortname_table {
         { PCI_DEVICE_ID_INTEL_ESB_5, "Intel 6300ESB" },
         { PCI_DEVICE_ID_INTEL_ICH6_18, "Intel ICH6" },
         { PCI_DEVICE_ID_INTEL_ICH7_20, "Intel ICH7" },
-        { PCI_DEVICE_ID_INTEL_ESB2_13, "Intel ESB2" },
+        { PCI_DEVICE_ID_INTEL_ESB2_14, "Intel ESB2" },
         { PCI_DEVICE_ID_SI_7012, "SiS SI7012" },
         { PCI_DEVICE_ID_NVIDIA_MCP_AUDIO, "NVidia nForce" },
         { PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO, "NVidia nForce2" },
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index f1ce808501da..9b4d74d49f98 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -1836,7 +1836,7 @@ static void __devinit snd_via82xx_proc_init(via82xx_t *chip)
  *
  */
 
-static int __devinit snd_via82xx_chip_init(via82xx_t *chip)
+static int snd_via82xx_chip_init(via82xx_t *chip)
 {
         unsigned int val;
         int max_count;
diff --git a/sound/ppc/Kconfig b/sound/ppc/Kconfig
index b0a9ebf8bf3b..75213bf4d567 100644
--- a/sound/ppc/Kconfig
+++ b/sound/ppc/Kconfig
@@ -11,7 +11,7 @@ comment "ALSA PowerMac requires INPUT"
 
 config SND_POWERMAC
         tristate "PowerMac (AWACS, DACA, Burgundy, Tumbler, Keywest)"
-        depends on SND && I2C && INPUT
+        depends on SND && I2C && INPUT && PPC_PMAC
         select SND_PCM
         help
           Say Y here to include support for the integrated sound device.
diff --git a/sound/ppc/Makefile b/sound/ppc/Makefile
index 4d95c652c8ca..d6ba9959097b 100644
--- a/sound/ppc/Makefile
+++ b/sound/ppc/Makefile
@@ -3,7 +3,7 @@
 # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
 #
 
-snd-powermac-objs := powermac.o pmac.o awacs.o burgundy.o daca.o tumbler.o keywest.o beep.o
+snd-powermac-objs := powermac.o pmac.o awacs.o burgundy.o daca.o tumbler.o toonie.o keywest.o beep.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_POWERMAC) += snd-powermac.o
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index 3bf5f069a03d..32d94754acf8 100644
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -986,7 +986,13 @@ static int __init snd_pmac_detect(pmac_t *chip)
                         chip->num_freqs = ARRAY_SIZE(tumbler_freqs);
                         chip->model = PMAC_SNAPPER;
                         chip->can_byte_swap = 0; /* FIXME: check this */
-                        chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */
+                        chip->control_mask = MASK_IEPC | 0x11;/* disable IEE */
+                        break;
+                case 0x3a:
+                        chip->num_freqs = ARRAY_SIZE(tumbler_freqs);
+                        chip->model = PMAC_TOONIE;
+                        chip->can_byte_swap = 0; /* FIXME: check this */
+                        chip->control_mask = MASK_IEPC | 0x11;/* disable IEE */
                         break;
                 }
         }
diff --git a/sound/ppc/pmac.h b/sound/ppc/pmac.h
index dc6c99dd14e7..0a84c05f714b 100644
--- a/sound/ppc/pmac.h
+++ b/sound/ppc/pmac.h
@@ -94,7 +94,8 @@ struct snd_pmac_stream {
  */
 
 enum snd_pmac_model {
-        PMAC_AWACS, PMAC_SCREAMER, PMAC_BURGUNDY, PMAC_DACA, PMAC_TUMBLER, PMAC_SNAPPER
+        PMAC_AWACS, PMAC_SCREAMER, PMAC_BURGUNDY, PMAC_DACA, PMAC_TUMBLER,
+        PMAC_SNAPPER, PMAC_TOONIE
 };
 
 struct snd_pmac {
@@ -191,6 +192,7 @@ int snd_pmac_burgundy_init(pmac_t *chip);
 int snd_pmac_daca_init(pmac_t *chip);
 int snd_pmac_tumbler_init(pmac_t *chip);
 int snd_pmac_tumbler_post_init(void);
+int snd_pmac_toonie_init(pmac_t *chip);
 
 /* i2c functions */
 typedef struct snd_pmac_keywest {
diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c
index 8f1953a8e290..231f6432ea6d 100644
--- a/sound/ppc/powermac.c
+++ b/sound/ppc/powermac.c
@@ -95,6 +95,13 @@ static int __init snd_pmac_probe(void)
                 if ( snd_pmac_tumbler_init(chip) < 0 || snd_pmac_tumbler_post_init() < 0)
                         goto __error;
                 break;
+        case PMAC_TOONIE:
+                strcpy(card->driver, "PMac Toonie");
+                strcpy(card->shortname, "PowerMac Toonie");
+                strcpy(card->longname, card->shortname);
+                if ((err = snd_pmac_toonie_init(chip)) < 0)
+                        goto __error;
+                break;
         case PMAC_AWACS:
         case PMAC_SCREAMER:
                 name_ext = chip->model == PMAC_SCREAMER ? "Screamer" : "AWACS";
diff --git a/sound/ppc/toonie.c b/sound/ppc/toonie.c
new file mode 100644
index 000000000000..082bc4babab5
--- /dev/null
+++ b/sound/ppc/toonie.c
@@ -0,0 +1,379 @@
+/*
+ * Mac Mini "toonie" mixer control
+ *
+ * Copyright (c) 2005 by Benjamin Herrenschmidt <benh@kernel.crashing.org>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+
+#include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/i2c.h>
+#include <linux/i2c-dev.h>
+#include <linux/kmod.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <sound/core.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/machdep.h>
+#include <asm/pmac_feature.h>
+#include "pmac.h"
+
+#undef DEBUG
+
+#ifdef DEBUG
+#define DBG(fmt...) printk(fmt)
+#else
+#define DBG(fmt...)
+#endif
+
+struct pmac_gpio {
+        unsigned int addr;
+        u8 active_val;
+        u8 inactive_val;
+        u8 active_state;
+};
+
+struct pmac_toonie
+{
+        struct pmac_gpio        hp_detect_gpio;
+        struct pmac_gpio        hp_mute_gpio;
+        struct pmac_gpio        amp_mute_gpio;
+        int                     hp_detect_irq;
+        int                     auto_mute_notify;
+        struct work_struct      detect_work;
+};
+
+
+/*
+ * gpio access
+ */
+#define do_gpio_write(gp, val) \
+        pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL, (gp)->addr, val)
+#define do_gpio_read(gp) \
+        pmac_call_feature(PMAC_FTR_READ_GPIO, NULL, (gp)->addr, 0)
+#define tumbler_gpio_free(gp) /* NOP */
+
+static void write_audio_gpio(struct pmac_gpio *gp, int active)
+{
+        if (! gp->addr)
+                return;
+        active = active ? gp->active_val : gp->inactive_val;
+        do_gpio_write(gp, active);
+        DBG("(I) gpio %x write %d\n", gp->addr, active);
+}
+
+static int check_audio_gpio(struct pmac_gpio *gp)
+{
+        int ret;
+
+        if (! gp->addr)
+                return 0;
+
+        ret = do_gpio_read(gp);
+
+        return (ret & 0xd) == (gp->active_val & 0xd);
+}
+
+static int read_audio_gpio(struct pmac_gpio *gp)
+{
+        int ret;
+        if (! gp->addr)
+                return 0;
+        ret = ((do_gpio_read(gp) & 0x02) !=0);
+        return ret == gp->active_state;
+}
+
+
+enum { TOONIE_MUTE_HP, TOONIE_MUTE_AMP };
+
+static int toonie_get_mute_switch(snd_kcontrol_t *kcontrol,
+                                  snd_ctl_elem_value_t *ucontrol)
+{
+        pmac_t *chip = snd_kcontrol_chip(kcontrol);
+        struct pmac_toonie *mix = chip->mixer_data;
+        struct pmac_gpio *gp;
+
+        if (mix == NULL)
+                return -ENODEV;
+        switch(kcontrol->private_value) {
+        case TOONIE_MUTE_HP:
+                gp = &mix->hp_mute_gpio;
+                break;
+        case TOONIE_MUTE_AMP:
+                gp = &mix->amp_mute_gpio;
+                break;
+        default:
+                return -EINVAL;;
+        }
+        ucontrol->value.integer.value[0] = !check_audio_gpio(gp);
+        return 0;
+}
+
+static int toonie_put_mute_switch(snd_kcontrol_t *kcontrol,
+                                   snd_ctl_elem_value_t *ucontrol)
+{
+        pmac_t *chip = snd_kcontrol_chip(kcontrol);
+        struct pmac_toonie *mix = chip->mixer_data;
+        struct pmac_gpio *gp;
+        int val;
+
+        if (chip->update_automute && chip->auto_mute)
+                return 0; /* don't touch in the auto-mute mode */
+
+        if (mix == NULL)
+                return -ENODEV;
+
+        switch(kcontrol->private_value) {
+        case TOONIE_MUTE_HP:
+                gp = &mix->hp_mute_gpio;
+                break;
+        case TOONIE_MUTE_AMP:
+                gp = &mix->amp_mute_gpio;
+                break;
+        default:
+                return -EINVAL;;
+        }
+        val = ! check_audio_gpio(gp);
+        if (val != ucontrol->value.integer.value[0]) {
+                write_audio_gpio(gp, ! ucontrol->value.integer.value[0]);
+                return 1;
+        }
+        return 0;
+}
+
+static snd_kcontrol_new_t toonie_hp_sw __initdata = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Headphone Playback Switch",
+        .info = snd_pmac_boolean_mono_info,
+        .get = toonie_get_mute_switch,
+        .put = toonie_put_mute_switch,
+        .private_value = TOONIE_MUTE_HP,
+};
+static snd_kcontrol_new_t toonie_speaker_sw __initdata = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "PC Speaker Playback Switch",
+        .info = snd_pmac_boolean_mono_info,
+        .get = toonie_get_mute_switch,
+        .put = toonie_put_mute_switch,
+        .private_value = TOONIE_MUTE_AMP,
+};
+
+/*
+ * auto-mute stuffs
+ */
+static int toonie_detect_headphone(pmac_t *chip)
+{
+        struct pmac_toonie *mix = chip->mixer_data;
+        int detect = 0;
+
+        if (mix->hp_detect_gpio.addr)
+                detect |= read_audio_gpio(&mix->hp_detect_gpio);
+        return detect;
+}
+
+static void toonie_check_mute(pmac_t *chip, struct pmac_gpio *gp, int val,
+                              int do_notify, snd_kcontrol_t *sw)
+{
+        if (check_audio_gpio(gp) != val) {
+                write_audio_gpio(gp, val);
+                if (do_notify)
+                        snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
+                                       &sw->id);
+        }
+}
+
+static void toonie_detect_handler(void *self)
+{
+        pmac_t *chip = (pmac_t*) self;
+        struct pmac_toonie *mix;
+        int headphone;
+
+        if (!chip)
+                return;
+
+        mix = chip->mixer_data;
+        snd_assert(mix, return);
+
+        headphone = toonie_detect_headphone(chip);
+
+        DBG("headphone: %d, lineout: %d\n", headphone, lineout);
+
+        if (headphone) {
+                /* unmute headphone/lineout & mute speaker */
+                toonie_check_mute(chip, &mix->hp_mute_gpio, 0,
+                                  mix->auto_mute_notify, chip->master_sw_ctl);
+                toonie_check_mute(chip, &mix->amp_mute_gpio, 1,
+                                  mix->auto_mute_notify, chip->speaker_sw_ctl);
+        } else {
+                /* unmute speaker, mute others */
+                toonie_check_mute(chip, &mix->amp_mute_gpio, 0,
+                                  mix->auto_mute_notify, chip->speaker_sw_ctl);
+                toonie_check_mute(chip, &mix->hp_mute_gpio, 1,
+                                  mix->auto_mute_notify, chip->master_sw_ctl);
+        }
+        if (mix->auto_mute_notify) {
+                snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
+                                       &chip->hp_detect_ctl->id);
+        }
+}
+
+static void toonie_update_automute(pmac_t *chip, int do_notify)
+{
+        if (chip->auto_mute) {
+                struct pmac_toonie *mix;
+                mix = chip->mixer_data;
+                snd_assert(mix, return);
+                mix->auto_mute_notify = do_notify;
+                schedule_work(&mix->detect_work);
+        }
+}
+
+/* interrupt - headphone plug changed */
+static irqreturn_t toonie_hp_intr(int irq, void *devid, struct pt_regs *regs)
+{
+        pmac_t *chip = devid;
+
+        if (chip->update_automute && chip->initialized) {
+                chip->update_automute(chip, 1);
+                return IRQ_HANDLED;
+        }
+        return IRQ_NONE;
+}
+
+/* look for audio gpio device */
+static int find_audio_gpio(const char *name, const char *platform,
+                           struct pmac_gpio *gp)
+{
+        struct device_node *np;
+        u32 *base, addr;
+
+        if (! (np = find_devices("gpio")))
+                return -ENODEV;
+
+        for (np = np->child; np; np = np->sibling) {
+                char *property = get_property(np, "audio-gpio", NULL);
+                if (property && strcmp(property, name) == 0)
+                        break;
+                if (device_is_compatible(np, name))
+                        break;
+        }
+        if (np == NULL)
+                return -ENODEV;
+
+        base = (u32 *)get_property(np, "AAPL,address", NULL);
+        if (! base) {
+                base = (u32 *)get_property(np, "reg", NULL);
+                if (!base) {
+                        DBG("(E) cannot find address for device %s !\n", name);
+                        return -ENODEV;
+                }
+                addr = *base;
+                if (addr < 0x50)
+                        addr += 0x50;
+        } else
+                addr = *base;
+
+        gp->addr = addr & 0x0000ffff;
+
+        /* Try to find the active state, default to 0 ! */
+        base = (u32 *)get_property(np, "audio-gpio-active-state", NULL);
+        if (base) {
+                gp->active_state = *base;
+                gp->active_val = (*base) ? 0x5 : 0x4;
+                gp->inactive_val = (*base) ? 0x4 : 0x5;
+        } else {
+                u32 *prop = NULL;
+                gp->active_state = 0;
+                gp->active_val = 0x4;
+                gp->inactive_val = 0x5;
+                /* Here are some crude hacks to extract the GPIO polarity and
+                 * open collector informations out of the do-platform script
+                 * as we don't yet have an interpreter for these things
+                 */
+                if (platform)
+                        prop = (u32 *)get_property(np, platform, NULL);
+                if (prop) {
+                        if (prop[3] == 0x9 && prop[4] == 0x9) {
+                                gp->active_val = 0xd;
+                                gp->inactive_val = 0xc;
+                        }
+                        if (prop[3] == 0x1 && prop[4] == 0x1) {
+                                gp->active_val = 0x5;
+                                gp->inactive_val = 0x4;
+                        }
+                }
+        }
+
+        DBG("(I) GPIO device %s found, offset: %x, active state: %d !\n",
+            name, gp->addr, gp->active_state);
+
+        return (np->n_intrs > 0) ? np->intrs[0].line : 0;
+}
+
+static void toonie_cleanup(pmac_t *chip)
+{
+        struct pmac_toonie *mix = chip->mixer_data;
+        if (! mix)
+                return;
+        if (mix->hp_detect_irq >= 0)
+                free_irq(mix->hp_detect_irq, chip);
+        kfree(mix);
+        chip->mixer_data = NULL;
+}
+
+int snd_pmac_toonie_init(pmac_t *chip)
+{
+        struct pmac_toonie *mix;
+
+        mix = kmalloc(sizeof(*mix), GFP_KERNEL);
+        if (! mix)
+                return -ENOMEM;
+
+        chip->mixer_data = mix;
+        chip->mixer_free = toonie_cleanup;
+
+        find_audio_gpio("headphone-mute", NULL, &mix->hp_mute_gpio);
+        find_audio_gpio("amp-mute", NULL, &mix->amp_mute_gpio);
+        mix->hp_detect_irq = find_audio_gpio("headphone-detect",
+                                             NULL, &mix->hp_detect_gpio);
+
+        strcpy(chip->card->mixername, "PowerMac Toonie");
+
+        chip->master_sw_ctl = snd_ctl_new1(&toonie_hp_sw, chip);
+        snd_ctl_add(chip->card, chip->master_sw_ctl);
+
+        chip->speaker_sw_ctl = snd_ctl_new1(&toonie_speaker_sw, chip);
+        snd_ctl_add(chip->card, chip->speaker_sw_ctl);
+
+        INIT_WORK(&mix->detect_work, toonie_detect_handler, (void *)chip);
+
+        if (mix->hp_detect_irq >= 0) {
+                snd_pmac_add_automute(chip);
+
+                chip->detect_headphone = toonie_detect_headphone;
+                chip->update_automute = toonie_update_automute;
+                toonie_update_automute(chip, 0);
+
+                if (request_irq(mix->hp_detect_irq, toonie_hp_intr, 0,
+                                "Sound Headphone Detection", chip) < 0)
+                        mix->hp_detect_irq = -1;
+        }
+
+        return 0;
+}
+
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
index c71807e069ee..9332237cb6a4 100644
--- a/sound/ppc/tumbler.c
+++ b/sound/ppc/tumbler.c
@@ -99,6 +99,7 @@ typedef struct pmac_tumbler_t {
         pmac_gpio_t hp_detect;
         int headphone_irq;
         int lineout_irq;
+        unsigned int save_master_vol[2];
         unsigned int master_vol[2];
         unsigned int save_master_switch[2];
         unsigned int master_switch[2];
@@ -177,11 +178,22 @@ static void write_audio_gpio(pmac_gpio_t *gp, int active)
         if (! gp->addr)
                 return;
         active = active ? gp->active_val : gp->inactive_val;
-
         do_gpio_write(gp, active);
         DBG("(I) gpio %x write %d\n", gp->addr, active);
 }
 
+static int check_audio_gpio(pmac_gpio_t *gp)
+{
+        int ret;
+
+        if (! gp->addr)
+                return 0;
+
+        ret = do_gpio_read(gp);
+
+        return (ret & 0xd) == (gp->active_val & 0xd);
+}
+
 static int read_audio_gpio(pmac_gpio_t *gp)
 {
         int ret;
@@ -683,7 +695,7 @@ static int tumbler_get_mute_switch(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_
         }
         if (gp == NULL)
                 return -EINVAL;
-        ucontrol->value.integer.value[0] = ! read_audio_gpio(gp);
+        ucontrol->value.integer.value[0] = !check_audio_gpio(gp);
         return 0;
 }
 
@@ -711,7 +723,7 @@ static int tumbler_put_mute_switch(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_
         }
         if (gp == NULL)
                 return -EINVAL;
-        val = ! read_audio_gpio(gp);
+        val = ! check_audio_gpio(gp);
         if (val != ucontrol->value.integer.value[0]) {
                 write_audio_gpio(gp, ! ucontrol->value.integer.value[0]);
                 return 1;
@@ -897,11 +909,11 @@ static int tumbler_detect_lineout(pmac_t *chip)
 
 static void check_mute(pmac_t *chip, pmac_gpio_t *gp, int val, int do_notify, snd_kcontrol_t *sw)
 {
-        //pmac_tumbler_t *mix = chip->mixer_data;
-        if (val != read_audio_gpio(gp)) {
+        if (check_audio_gpio(gp) != val) {
                 write_audio_gpio(gp, val);
                 if (do_notify)
-                        snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE, &sw->id);
+                        snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
+                                       &sw->id);
         }
 }
 
@@ -1128,6 +1140,8 @@ static void tumbler_suspend(pmac_t *chip)
                 disable_irq(mix->lineout_irq);
         mix->save_master_switch[0] = mix->master_switch[0];
         mix->save_master_switch[1] = mix->master_switch[1];
+        mix->save_master_vol[0] = mix->master_vol[0];
+        mix->save_master_vol[1] = mix->master_vol[1];
         mix->master_switch[0] = mix->master_switch[1] = 0;
         tumbler_set_master_volume(mix);
         if (!mix->anded_reset) {
@@ -1155,6 +1169,8 @@ static void tumbler_resume(pmac_t *chip)
         mix->acs &= ~1;
         mix->master_switch[0] = mix->save_master_switch[0];
         mix->master_switch[1] = mix->save_master_switch[1];
+        mix->master_vol[0] = mix->save_master_vol[0];
+        mix->master_vol[1] = mix->save_master_vol[1];
         tumbler_reset_audio(chip);
         if (mix->i2c.client && mix->i2c.init_client) {
                 if (mix->i2c.init_client(&mix->i2c) < 0)