Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce2c4920 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai
Browse files

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: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 5b8bf2a5

sound/pci/oxygen/oxygen.c

+4 −2
Original line number Diff line number Diff line
@@ -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;

sound/pci/oxygen/xonar_cs43xx.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

};

sound/pci/oxygen/xonar_pcm179x.c

+3 −3
Original line number Diff line number Diff line
@@ -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,

};