diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2008-04-07 10:25:30 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 12:00:31 +0200 |
| commit | a694a6a0e4ab4752d1a145b9b32e231d7c9611b5 (patch) | |
| tree | a9da08370ed6530ba640e1cba290896c03687f9d /sound/pci | |
| parent | 271ebfca5823875cc4f134515b6c3887d99b8dc2 (diff) | |
| download | op-kernel-dev-a694a6a0e4ab4752d1a145b9b32e231d7c9611b5.zip op-kernel-dev-a694a6a0e4ab4752d1a145b9b32e231d7c9611b5.tar.gz | |
[ALSA] virtuoso: allow both CS5381 and CS5361
Rename all CS5381 symbols to CS53x1 because they can also be used for
Xonar models with a CS5361.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/oxygen/virtuoso.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c index b3259fa..1627197 100644 --- a/sound/pci/oxygen/virtuoso.c +++ b/sound/pci/oxygen/virtuoso.c @@ -74,10 +74,11 @@ static struct pci_device_id xonar_ids[] __devinitdata = { MODULE_DEVICE_TABLE(pci, xonar_ids); -#define GPIO_CS5381_M_MASK 0x000c -#define GPIO_CS5381_M_SINGLE 0x0000 -#define GPIO_CS5381_M_DOUBLE 0x0004 -#define GPIO_CS5381_M_QUAD 0x0008 +#define GPIO_CS53x1_M_MASK 0x000c +#define GPIO_CS53x1_M_SINGLE 0x0000 +#define GPIO_CS53x1_M_DOUBLE 0x0004 +#define GPIO_CS53x1_M_QUAD 0x0008 + #define GPIO_EXT_POWER 0x0020 #define GPIO_ALT 0x0080 #define GPIO_OUTPUT_ENABLE 0x0100 @@ -115,10 +116,10 @@ static void xonar_d2_init(struct oxygen *chip) } oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, - GPIO_CS5381_M_MASK | GPIO_ALT); + GPIO_CS53x1_M_MASK | GPIO_ALT); oxygen_write16_masked(chip, OXYGEN_GPIO_DATA, - GPIO_CS5381_M_SINGLE, - GPIO_CS5381_M_MASK | GPIO_ALT); + GPIO_CS53x1_M_SINGLE, + GPIO_CS53x1_M_MASK | GPIO_ALT); oxygen_ac97_set_bits(chip, 0, CM9780_JACK, CM9780_FMIC2MIC); msleep(300); oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_OUTPUT_ENABLE); @@ -180,19 +181,19 @@ static void update_pcm1796_mute(struct oxygen *chip) pcm1796_write(chip, i, 18, value); } -static void set_cs5381_params(struct oxygen *chip, +static void set_cs53x1_params(struct oxygen *chip, struct snd_pcm_hw_params *params) { unsigned int value; if (params_rate(params) <= 54000) - value = GPIO_CS5381_M_SINGLE; + value = GPIO_CS53x1_M_SINGLE; else if (params_rate(params) <= 108000) - value = GPIO_CS5381_M_DOUBLE; + value = GPIO_CS53x1_M_DOUBLE; else - value = GPIO_CS5381_M_QUAD; + value = GPIO_CS53x1_M_QUAD; oxygen_write16_masked(chip, OXYGEN_GPIO_DATA, - value, GPIO_CS5381_M_MASK); + value, GPIO_CS53x1_M_MASK); } static void xonar_gpio_changed(struct oxygen *chip) @@ -293,7 +294,7 @@ static const struct oxygen_model xonar_models[] = { .mixer_init = xonar_mixer_init, .cleanup = xonar_cleanup, .set_dac_params = set_pcm1796_params, - .set_adc_params = set_cs5381_params, + .set_adc_params = set_cs53x1_params, .update_dac_volume = update_pcm1796_volume, .update_dac_mute = update_pcm1796_mute, .model_data_size = sizeof(struct xonar_data), @@ -318,7 +319,7 @@ static const struct oxygen_model xonar_models[] = { .mixer_init = xonar_mixer_init, .cleanup = xonar_cleanup, .set_dac_params = set_pcm1796_params, - .set_adc_params = set_cs5381_params, + .set_adc_params = set_cs53x1_params, .update_dac_volume = update_pcm1796_volume, .update_dac_mute = update_pcm1796_mute, .gpio_changed = xonar_gpio_changed, |
