Skip to content

Commit

Permalink
[ALSA] [PPC,SOUND] Fix audio gpio state detection
Browse files Browse the repository at this point in the history
When booting with line out or headphone plugged, you won't hear anything.
The problem is that after reset all channels are muted, but the actual
value of the gpio port doesn't exactly match the active_val settings as
expected by check_audio_gpio.  For example, the line_mute port is set to
7, but check_audio_gpio would expect 0xd or 0xf, thus its return value
indicates that it is not active, even though it is.  AFAICS only looking
at the low bit is enough to determine whether the port is active.

Signed-off-by: Andreas Schwab <schwab@suse.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
  • Loading branch information
Andreas Schwab authored and Jaroslav Kysela committed Sep 23, 2006
1 parent 927fc86 commit 2fd53a7
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions sound/ppc/tumbler.c
Original file line number Diff line number Diff line change
Expand Up @@ -190,15 +190,16 @@ static int check_audio_gpio(struct pmac_gpio *gp)

ret = do_gpio_read(gp);

return (ret & 0xd) == (gp->active_val & 0xd);
return (ret & 0x1) == (gp->active_val & 0x1);
}

static int read_audio_gpio(struct pmac_gpio *gp)
{
int ret;
if (! gp->addr)
return 0;
ret = ((do_gpio_read(gp) & 0x02) !=0);
ret = do_gpio_read(gp);
ret = (ret & 0x02) !=0;
return ret == gp->active_state;
}

Expand Down

0 comments on commit 2fd53a7

Please sign in to comment.