aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/oxygen.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/oxygen/oxygen.c')
-rw-r--r--sound/pci/oxygen/oxygen.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index 784d500c700f..2316884afd25 100644
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
@@ -588,7 +588,7 @@ static const struct oxygen_model model_generic = {
588 .dac_volume_max = 255, 588 .dac_volume_max = 255,
589 .function_flags = OXYGEN_FUNCTION_SPI | 589 .function_flags = OXYGEN_FUNCTION_SPI |
590 OXYGEN_FUNCTION_ENABLE_SPI_4_5, 590 OXYGEN_FUNCTION_ENABLE_SPI_4_5,
591 .dac_mclks = OXYGEN_MCLKS(256, 256, 128), 591 .dac_mclks = OXYGEN_MCLKS(256, 128, 128),
592 .adc_mclks = OXYGEN_MCLKS(256, 256, 128), 592 .adc_mclks = OXYGEN_MCLKS(256, 256, 128),
593 .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, 593 .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
594 .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, 594 .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
@@ -643,8 +643,10 @@ static int __devinit get_oxygen_model(struct oxygen *chip,
643 chip->model.dump_registers = dump_ak4396_registers; 643 chip->model.dump_registers = dump_ak4396_registers;
644 chip->model.device_config = PLAYBACK_0_TO_I2S | 644 chip->model.device_config = PLAYBACK_0_TO_I2S |
645 PLAYBACK_1_TO_SPDIF; 645 PLAYBACK_1_TO_SPDIF;
646 if (id->driver_data == MODEL_FANTASIA) 646 if (id->driver_data == MODEL_FANTASIA) {
647 chip->model.device_config |= CAPTURE_0_FROM_I2S_1; 647 chip->model.device_config |= CAPTURE_0_FROM_I2S_1;
648 chip->model.adc_mclks = OXYGEN_MCLKS(256, 128, 128);
649 }
648 chip->model.dac_channels_pcm = 2; 650 chip->model.dac_channels_pcm = 2;
649 chip->model.dac_channels_mixer = 2; 651 chip->model.dac_channels_mixer = 2;
650 break; 652 break;