ALSA: virtuoso: reduce MCLK in double rate modes

For the CSxxxx and AKxxxx DAC/ADC chips, the MCLK factor in double rate
modes (64-96 kHz) can be reduced to 128x without reducing sound quality.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index 784d500c700fb59c334bc2b843fdea7cc7c43e1b..2316884afd25078be0c1b820350095606461738c 100644 (file)
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
@@ -588,7 +588,7 @@ static const struct oxygen_model model_generic = {
        .dac_volume_max = 255,
        .function_flags = OXYGEN_FUNCTION_SPI |
                          OXYGEN_FUNCTION_ENABLE_SPI_4_5,
-       .dac_mclks = OXYGEN_MCLKS(256, 256, 128),
+       .dac_mclks = OXYGEN_MCLKS(256, 128, 128),
        .adc_mclks = OXYGEN_MCLKS(256, 256, 128),
        .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
        .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
@@ -643,8 +643,10 @@ static int __devinit get_oxygen_model(struct oxygen *chip,
                chip->model.dump_registers = dump_ak4396_registers;
                chip->model.device_config = PLAYBACK_0_TO_I2S |
                                            PLAYBACK_1_TO_SPDIF;
-               if (id->driver_data == MODEL_FANTASIA)
+               if (id->driver_data == MODEL_FANTASIA) {
                        chip->model.device_config |= CAPTURE_0_FROM_I2S_1;
+                       chip->model.adc_mclks = OXYGEN_MCLKS(256, 128, 128);
+               }
                chip->model.dac_channels_pcm = 2;
                chip->model.dac_channels_mixer = 2;
                break;

diff --git a/sound/pci/oxygen/xonar_cs43xx.c b/sound/pci/oxygen/xonar_cs43xx.c
index b651938f3248226ac7a0c8c723ea8bcea1fb0138..55c52c7e19b2fe0f7db414cd3c9db7198e30ae9e 100644 (file)
--- a/sound/pci/oxygen/xonar_cs43xx.c
+++ b/sound/pci/oxygen/xonar_cs43xx.c
@@ -430,8 +430,8 @@ static const struct oxygen_model model_xonar_d1 = {
        .dac_volume_min = 127 - 60,
        .dac_volume_max = 127,
        .function_flags = OXYGEN_FUNCTION_2WIRE,
-       .dac_mclks = OXYGEN_MCLKS(256, 256, 128),
-       .adc_mclks = OXYGEN_MCLKS(256, 256, 128),
+       .dac_mclks = OXYGEN_MCLKS(256, 128, 128),
+       .adc_mclks = OXYGEN_MCLKS(256, 128, 128),
        .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
        .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
 };

diff --git a/sound/pci/oxygen/xonar_pcm179x.c b/sound/pci/oxygen/xonar_pcm179x.c
index 9787193f6ed35d453645040ae7b8df2dac2e6179..003c4800400b977597671f745e71abd677a05744 100644 (file)
--- a/sound/pci/oxygen/xonar_pcm179x.c
+++ b/sound/pci/oxygen/xonar_pcm179x.c
@@ -1032,7 +1032,7 @@ static const struct oxygen_model model_xonar_d2 = {
        .function_flags = OXYGEN_FUNCTION_SPI |
                          OXYGEN_FUNCTION_ENABLE_SPI_4_5,
        .dac_mclks = OXYGEN_MCLKS(512, 128, 128),
-       .adc_mclks = OXYGEN_MCLKS(256, 256, 128),
+       .adc_mclks = OXYGEN_MCLKS(256, 128, 128),
        .dac_i2s_format = OXYGEN_I2S_FORMAT_I2S,
        .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
 };
@@ -1066,7 +1066,7 @@ static const struct oxygen_model model_xonar_hdav = {
        .misc_flags = OXYGEN_MISC_MIDI,
        .function_flags = OXYGEN_FUNCTION_2WIRE,
        .dac_mclks = OXYGEN_MCLKS(512, 128, 128),
-       .adc_mclks = OXYGEN_MCLKS(256, 256, 128),
+       .adc_mclks = OXYGEN_MCLKS(256, 128, 128),
        .dac_i2s_format = OXYGEN_I2S_FORMAT_I2S,
        .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
 };
@@ -1097,7 +1097,7 @@ static const struct oxygen_model model_xonar_st = {
        .dac_volume_max = 255,
        .function_flags = OXYGEN_FUNCTION_2WIRE,
        .dac_mclks = OXYGEN_MCLKS(512, 128, 128),
-       .adc_mclks = OXYGEN_MCLKS(256, 256, 128),
+       .adc_mclks = OXYGEN_MCLKS(256, 128, 128),
        .dac_i2s_format = OXYGEN_I2S_FORMAT_I2S,
        .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
 };