diff options
| author | Andres Salomon <dilinger@queued.net> | 2008-11-05 17:29:53 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-10 11:14:36 -0500 |
| commit | 0bed7b292d68f82316bfb8cd521e16c867689efe (patch) | |
| tree | ad3fef750ad8ce4a235cd2fdde78ec3a398cc4db | |
| parent | 061e41fdb5047b1fb161e89664057835935ca1d2 (diff) | |
ALSA: cs5535audio: stick AD1888 bitshift values into a header file
We'd like to use the High Pass Filter and V_REFOUT bitshift values elsewhere,
so stick them into a ac97_codec.h.
Signed-off-by: Andres Salomon <dilinger@debian.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | include/sound/ac97_codec.h | 2 | ||||
| -rw-r--r-- | sound/pci/ac97/ac97_patch.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h index 9c309daf492b..251fc1cd5002 100644 --- a/include/sound/ac97_codec.h +++ b/include/sound/ac97_codec.h | |||
| @@ -281,10 +281,12 @@ | |||
| 281 | /* specific - Analog Devices */ | 281 | /* specific - Analog Devices */ |
| 282 | #define AC97_AD_TEST 0x5a /* test register */ | 282 | #define AC97_AD_TEST 0x5a /* test register */ |
| 283 | #define AC97_AD_TEST2 0x5c /* undocumented test register 2 */ | 283 | #define AC97_AD_TEST2 0x5c /* undocumented test register 2 */ |
| 284 | #define AC97_AD_HPFD_SHIFT 12 /* High Pass Filter Disable */ | ||
| 284 | #define AC97_AD_CODEC_CFG 0x70 /* codec configuration */ | 285 | #define AC97_AD_CODEC_CFG 0x70 /* codec configuration */ |
| 285 | #define AC97_AD_JACK_SPDIF 0x72 /* Jack Sense & S/PDIF */ | 286 | #define AC97_AD_JACK_SPDIF 0x72 /* Jack Sense & S/PDIF */ |
| 286 | #define AC97_AD_SERIAL_CFG 0x74 /* Serial Configuration */ | 287 | #define AC97_AD_SERIAL_CFG 0x74 /* Serial Configuration */ |
| 287 | #define AC97_AD_MISC 0x76 /* Misc Control Bits */ | 288 | #define AC97_AD_MISC 0x76 /* Misc Control Bits */ |
| 289 | #define AC97_AD_VREFD_SHIFT 2 /* V_REFOUT Disable (AD1888) */ | ||
| 288 | 290 | ||
| 289 | /* specific - Cirrus Logic */ | 291 | /* specific - Cirrus Logic */ |
| 290 | #define AC97_CSR_ACMODE 0x5e /* AC Mode Register */ | 292 | #define AC97_CSR_ACMODE 0x5e /* AC Mode Register */ |
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c index 6e831aff1bd0..7ad25f439b50 100644 --- a/sound/pci/ac97/ac97_patch.c +++ b/sound/pci/ac97/ac97_patch.c | |||
| @@ -2054,8 +2054,9 @@ static const struct snd_kcontrol_new snd_ac97_ad1888_controls[] = { | |||
| 2054 | .get = snd_ac97_ad1888_lohpsel_get, | 2054 | .get = snd_ac97_ad1888_lohpsel_get, |
| 2055 | .put = snd_ac97_ad1888_lohpsel_put | 2055 | .put = snd_ac97_ad1888_lohpsel_put |
| 2056 | }, | 2056 | }, |
| 2057 | AC97_SINGLE("V_REFOUT Enable", AC97_AD_MISC, 2, 1, 1), | 2057 | AC97_SINGLE("V_REFOUT Enable", AC97_AD_MISC, AC97_AD_VREFD_SHIFT, 1, 1), |
| 2058 | AC97_SINGLE("High Pass Filter Enable", AC97_AD_TEST2, 12, 1, 1), | 2058 | AC97_SINGLE("High Pass Filter Enable", AC97_AD_TEST2, |
| 2059 | AC97_AD_HPFD_SHIFT, 1, 1), | ||
| 2059 | AC97_SINGLE("Spread Front to Surround and Center/LFE", AC97_AD_MISC, 7, 1, 0), | 2060 | AC97_SINGLE("Spread Front to Surround and Center/LFE", AC97_AD_MISC, 7, 1, 0), |
| 2060 | { | 2061 | { |
| 2061 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 2062 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
