mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
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>
This commit is contained in:
parent
466ae3055b
commit
189d34e747
1 changed files with 2 additions and 7 deletions
|
@ -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)
|
static int olpc_dc_get(struct snd_kcontrol *kctl, struct snd_ctl_elem_value *v)
|
||||||
{
|
{
|
||||||
struct cs5535audio *cs5535au = snd_kcontrol_chip(kctl);
|
v->value.integer.value[0] = geode_gpio_isset(OLPC_GPIO_MIC_AC,
|
||||||
u8 val;
|
GPIO_OUTPUT_VAL);
|
||||||
|
|
||||||
val = snd_ac97_read(cs5535au->ac97, AC97_AD_TEST2);
|
|
||||||
val >>= AC97_AD_HPFD_SHIFT;
|
|
||||||
v->value.integer.value[0] = val & 0x1;
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue