diff options
| author | Clemens Ladisch | 2008-01-21 08:50:19 +0100 |
|---|---|---|
| committer | Jaroslav Kysela | 2008-01-31 17:30:07 +0100 |
| commit | 878ac3ee76a5abb4952396570207f6ebe0597e52 (patch) | |
| tree | 9c5dea50a61302f3b4533314091b8cb9c02f4170 /sound/pci/oxygen/oxygen_mixer.c | |
| parent | 44fb7aae82b37f5bb66cb1423e2babb11d90969e (diff) | |
[ALSA] oxygen: add more symbols
Add symbol definitions for the various codecs and GPIO pins.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/oxygen/oxygen_mixer.c')
| -rw-r--r-- | sound/pci/oxygen/oxygen_mixer.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c index d23d18aed25c..11114cedc05d 100644 --- a/sound/pci/oxygen/oxygen_mixer.c +++ b/sound/pci/oxygen/oxygen_mixer.c @@ -23,6 +23,7 @@ #include <sound/control.h> #include <sound/tlv.h> #include "oxygen.h" +#include "cm9780.h" static int dac_volume_info(struct snd_kcontrol *ctl, struct snd_ctl_elem_info *info) @@ -460,8 +461,9 @@ static int ac97_switch_put(struct snd_kcontrol *ctl, if (change) { oxygen_write_ac97(chip, 0, index, newreg); if (index == AC97_LINE) { - oxygen_write_ac97_masked(chip, 0, 0x72, - !!(newreg & 0x8000), 0x0001); + oxygen_write_ac97_masked(chip, 0, CM9780_GPIO_STATUS, + newreg & 0x8000 ? + CM9780_GPO0 : 0, CM9780_GPO0); if (!(newreg & 0x8000)) { ac97_mute_ctl(chip, CONTROL_MIC_CAPTURE_SWITCH); ac97_mute_ctl(chip, CONTROL_CD_CAPTURE_SWITCH); @@ -471,7 +473,8 @@ static int ac97_switch_put(struct snd_kcontrol *ctl, index == AC97_VIDEO || index == AC97_AUX) && bitnr == 15 && !(newreg & 0x8000)) { ac97_mute_ctl(chip, CONTROL_LINE_CAPTURE_SWITCH); - oxygen_write_ac97_masked(chip, 0, 0x72, 0x0001, 0x0001); + oxygen_write_ac97_masked(chip, 0, CM9780_GPIO_STATUS, + CM9780_GPO0, CM9780_GPO0); } } mutex_unlock(&chip->mutex); |