evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALSA: oxygen: Xonar DG(X): modify DAC/ADC parameters function

Browse source 
When selecting the audio sample rate for CS4245,
the MCLK divider should also be changed.

Signed-off-by: Roman Volkov <v1ron@mail.ru>
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
This commit is contained in:
Roman Volkov 2014-01-24 16:18:10 +04:00 • committed by Clemens Ladisch
parent 3c1611ddd1
commit fddc106bc3
1 changed files with 36 additions and 18 deletions

54
sound/pci/oxygen/xonar_dg.c
View file

@ -216,32 +216,50 @@ static void set_cs4245_dac_params(struct oxygen *chip,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
struct dg *data = chip->model_data; struct dg *data = chip->model_data;
u8 value; unsigned char dac_ctrl;
unsigned char mclk_freq;
value = data->cs4245_shadow[CS4245_DAC_CTRL_1] & ~CS4245_DAC_FM_MASK; dac_ctrl = data->cs4245_shadow[CS4245_DAC_CTRL_1] & ~CS4245_DAC_FM_MASK;
if (params_rate(params) <= 50000) mclk_freq = data->cs4245_shadow[CS4245_MCLK_FREQ] & ~CS4245_MCLK1_MASK;
value |= CS4245_DAC_FM_SINGLE; if (params_rate(params) <= 50000) {
else if (params_rate(params) <= 100000) dac_ctrl |= CS4245_DAC_FM_SINGLE;
value |= CS4245_DAC_FM_DOUBLE; mclk_freq |= CS4245_MCLK_1 << CS4245_MCLK1_SHIFT;
else } else if (params_rate(params) <= 100000) {
value |= CS4245_DAC_FM_QUAD; dac_ctrl |= CS4245_DAC_FM_DOUBLE;
cs4245_write_cached(chip, CS4245_DAC_CTRL_1, value); mclk_freq |= CS4245_MCLK_1 << CS4245_MCLK1_SHIFT;
} else {
dac_ctrl |= CS4245_DAC_FM_QUAD;
mclk_freq |= CS4245_MCLK_2 << CS4245_MCLK1_SHIFT;
}
data->cs4245_shadow[CS4245_DAC_CTRL_1] = dac_ctrl;
data->cs4245_shadow[CS4245_MCLK_FREQ] = mclk_freq;
cs4245_write_spi(chip, CS4245_DAC_CTRL_1);
cs4245_write_spi(chip, CS4245_MCLK_FREQ);
} }
static void set_cs4245_adc_params(struct oxygen *chip, static void set_cs4245_adc_params(struct oxygen *chip,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
struct dg *data = chip->model_data; struct dg *data = chip->model_data;
u8 value; unsigned char adc_ctrl;
unsigned char mclk_freq;
value = data->cs4245_shadow[CS4245_ADC_CTRL] & ~CS4245_ADC_FM_MASK; adc_ctrl = data->cs4245_shadow[CS4245_ADC_CTRL] & ~CS4245_ADC_FM_MASK;
if (params_rate(params) <= 50000) mclk_freq = data->cs4245_shadow[CS4245_MCLK_FREQ] & ~CS4245_MCLK2_MASK;
value |= CS4245_ADC_FM_SINGLE; if (params_rate(params) <= 50000) {
else if (params_rate(params) <= 100000) adc_ctrl |= CS4245_ADC_FM_SINGLE;
value |= CS4245_ADC_FM_DOUBLE; mclk_freq |= CS4245_MCLK_1 << CS4245_MCLK2_SHIFT;
else } else if (params_rate(params) <= 100000) {
value |= CS4245_ADC_FM_QUAD; adc_ctrl |= CS4245_ADC_FM_DOUBLE;
cs4245_write_cached(chip, CS4245_ADC_CTRL, value); mclk_freq |= CS4245_MCLK_1 << CS4245_MCLK2_SHIFT;
} else {
adc_ctrl |= CS4245_ADC_FM_QUAD;
mclk_freq |= CS4245_MCLK_2 << CS4245_MCLK2_SHIFT;
}
data->cs4245_shadow[CS4245_ADC_CTRL] = adc_ctrl;
data->cs4245_shadow[CS4245_MCLK_FREQ] = mclk_freq;
cs4245_write_spi(chip, CS4245_ADC_CTRL);
cs4245_write_spi(chip, CS4245_MCLK_FREQ);
} }
static inline unsigned int shift_bits(unsigned int value, static inline unsigned int shift_bits(unsigned int value,