summaryrefslogtreecommitdiffstats
path: root/sound/pci/cs5535audio
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2008-11-06 16:49:55 -0500
committerTakashi Iwai <tiwai@suse.de>2008-12-10 17:14:44 +0100
commit189d34e747e9540b70227f6682bd680868d90b10 (patch)
tree673073f24ba5846edac81491de088e280453982c /sound/pci/cs5535audio
parent466ae3055be8665525a5613456fcb387ffef4cb7 (diff)
downloadlinux-189d34e747e9540b70227f6682bd680868d90b10.tar.gz
linux-189d34e747e9540b70227f6682bd680868d90b10.tar.bz2
linux-189d34e747e9540b70227f6682bd680868d90b10.zip
ALSA: cs5535audio: check OLPC's Analog Input status vis GPIO
Checking the HPF register is irrelevant; HPF is secondary to the AI mode. Instead, check for Analog Input mode via GPIO. Signed-off-by: Andres Salomon <dilinger@debian.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/cs5535audio')
-rw-r--r--sound/pci/cs5535audio/cs5535audio_olpc.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/pci/cs5535audio/cs5535audio_olpc.c b/sound/pci/cs5535audio/cs5535audio_olpc.c
index 6c0c0dbeb218..7f26cfbc8f52 100644
--- a/sound/pci/cs5535audio/cs5535audio_olpc.c
+++ b/sound/pci/cs5535audio/cs5535audio_olpc.c
@@ -43,13 +43,8 @@ static int olpc_dc_info(struct snd_kcontrol *kctl,
static int olpc_dc_get(struct snd_kcontrol *kctl, struct snd_ctl_elem_value *v)
{
- struct cs5535audio *cs5535au = snd_kcontrol_chip(kctl);
- u8 val;
-
- val = snd_ac97_read(cs5535au->ac97, AC97_AD_TEST2);
- val >>= AC97_AD_HPFD_SHIFT;
- v->value.integer.value[0] = val & 0x1;
-
+ v->value.integer.value[0] = geode_gpio_isset(OLPC_GPIO_MIC_AC,
+ GPIO_OUTPUT_VAL);
return 0;
}