]> err.no Git - linux-2.6/commitdiff
[PATCH] ppc64: improve g5 sound headphone mute
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Sun, 1 May 2005 15:58:43 +0000 (08:58 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 1 May 2005 15:58:43 +0000 (08:58 -0700)
This patch fixes a couple more issues with the management of the GPIOs
dealing with headphone and line out mute on the G5.  It should fix the
remaining problems of people not getting any sound out of the headphone
jack.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
sound/ppc/tumbler.c

index c71807e069ee6a22cf316d438d55695a2350e18c..f3e010793a6a52806ec5524dc7ce7e8b370433d6 100644 (file)
@@ -177,11 +177,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 +694,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 +722,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 +908,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);
        }
 }