ALSA: Oxygen: Add the separate SPI waiting function
Subsystems (2)
PATCH v4 1/19 ALSA: Oxygen: Add the separate SPI waiting function
The oxygen_wait_spi() function now performs waiting when the SPI bus completes a transaction. Introduce the timeout error checking and increase timeout to 200 from 40.
--- sound/pci/oxygen/oxygen_io.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
sound/pci/oxygen/oxygen_io.c +15 -0
@@ -194,6 +194,21 @@ void oxygen_write_ac97_masked(struct oxygen *chip, unsigned int codec, }EXPORT_SYMBOL (oxygen_write_ac97_masked); +static int oxygen_wait_spi (struct oxygen *chip) +{ +/* Higher timeout to be sure: 200 us, +Actual transaction should not need more than 40 us */ +unsigned int count; +for (count =50 ; count >0 ; count--) { +udelay (4 ); +if ((oxygen_read8 (chip,OXYGEN_SPI_CONTROL ) & +OXYGEN_SPI_BUSY ) ==0 ) +return 0 ; + } +snd_printk (KERN_ERR "Oxygen: SPI wait timeout\n" ); +return -EIO ; +} +void oxygen_write_spi (struct oxygen *chip,u8 control,unsigned int data) {unsigned int count;
Signature · 1 line
1.7.10.4
PATCH v4 2/19 ALSA: Oxygen: Modify the SPI writing function
Modify the oxygen_write_spi() function to use the newly introduced oxygen_wait_spi() function. Change return value from void to int, so it can return error codes. Older drivers just ignore that return value, new drivers can check this value. We need to wait AFTER initiating the SPI transaction, otherwise read operation will not work.
--- sound/pci/oxygen/oxygen.h | 2 +- sound/pci/oxygen/oxygen_io.c | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-)
sound/pci/oxygen/oxygen.h +1 -1
@@ -198,7 +198,7 @@ void oxygen_write_ac97(struct oxygen *chip, unsigned int codec,void oxygen_write_ac97_masked (struct oxygen *chip,unsigned int codec,unsigned int index,u16 data,u16 mask); -void oxygen_write_spi (struct oxygen *chip,u8 control,unsigned int data); +int oxygen_write_spi (struct oxygen *chip,u8 control,unsigned int data);void oxygen_write_i2c (struct oxygen *chip,u8 device,u8 map,u8 data);void oxygen_reset_uart (struct oxygen *chip);
sound/pci/oxygen/oxygen_io.c +4 -11
@@ -209,23 +209,16 @@ static int oxygen_wait_spi(struct oxygen *chip)return -EIO ; } -void oxygen_write_spi (struct oxygen *chip,u8 control,unsigned int data) +int oxygen_write_spi (struct oxygen *chip,u8 control,unsigned int data) { -unsigned int count; - -/* should not need more than 30.72 us (24 * 1.28 us) */ - count =10 ; -while ((oxygen_read8 (chip,OXYGEN_SPI_CONTROL ) &OXYGEN_SPI_BUSY ) - && count >0 ) { -udelay (4 ); - --count; - } - +/* We need to wait AFTER initiating the SPI transaction, +otherwise read operations will not work */ oxygen_write8 (chip,OXYGEN_SPI_DATA1 , data);oxygen_write8 (chip,OXYGEN_SPI_DATA2 , data >>8 );if (control &OXYGEN_SPI_DATA_LENGTH_3 )oxygen_write8 (chip,OXYGEN_SPI_DATA3 , data >>16 );oxygen_write8 (chip,OXYGEN_SPI_CONTROL , control); +return oxygen_wait_spi (chip); }EXPORT_SYMBOL (oxygen_write_spi);
Signature · 1 line
1.7.10.4
PATCH v4 3/19 ALSA: Oxygen: Add mute mask for the OXYGEN_PLAY_ROUTING register
In reply to Roman VolkovThe Xonar DG/DGX driver needs this mask to mute unnecessary channels.
--- sound/pci/oxygen/oxygen_regs.h | 1 + 1 file changed, 1 insertion(+)
sound/pci/oxygen/oxygen_regs.h +1 -0
@@ -318,6 +318,7 @@#define OXYGEN_PLAY_MUTE23 0x0002#define OXYGEN_PLAY_MUTE45 0x0004#define OXYGEN_PLAY_MUTE67 0x0008 +#define OXYGEN_PLAY_MUTE_MASK 0x000f#define OXYGEN_PLAY_MULTICH_MASK 0x0010#define OXYGEN_PLAY_MULTICH_I2S_DAC 0x0000#define OXYGEN_PLAY_MULTICH_AC97 0x0010
Signature · 1 line
1.7.10.4
PATCH v4 4/19 ALSA: Oxygen: Export oxygen_update_dac_routing symbol
In reply to Roman VolkovWhen the user switches the output from stereo to multichannel or vice versa, the driver needs to update the channel routing. Instead of creating additional subroutines, I better export existing oxygen_update_dac_routing symbol from the oxygen mixer and call this function. It calls model.adjust_dac_routing() and my function does the work.
--- sound/pci/oxygen/oxygen_mixer.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/oxygen/oxygen_mixer.c +1 -0
@@ -190,6 +190,7 @@ void oxygen_update_dac_routing(struct oxygen *chip)if (chip->model.update_center_lfe_mix) chip->model.update_center_lfe_mix (chip, chip->dac_routing >2 ); } +EXPORT_SYMBOL (oxygen_update_dac_routing);static int upmix_put (struct snd_kcontrol *ctl,struct snd_ctl_elem_value *value) {
Signature · 1 line
1.7.10.4
PATCH v4 5/19 ALSA: Oxygen: Change description of the xonar_dg.c file
In reply to Roman VolkovAdd some additional information in comments and my copyright.
--- sound/pci/oxygen/xonar_dg.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
sound/pci/oxygen/xonar_dg.c +14 -6
@@ -1,8 +1,8 @@/* -* card driver for the Xonar DG/DGX +* Card driver for the Xonar DG/DGX * * Copyright (c) Clemens Ladisch <[email protected]> -* +* Copyright (c) Roman Volkov <[email protected]> * * This driver is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License, version 2.
@@ -20,27 +20,35 @@* Xonar DG/DGX * ------------ * +* CS4245 and CS4361 both will mute all outputs if any clock ratio +* is invalid. +* * CMI8788: * * SPI 0 -> CS4245 * +* Playback: * I²S 1 -> CS4245 * I²S 2 -> CS4361 (center/LFE) * I²S 3 -> CS4361 (surround) * I²S 4 -> CS4361 (front) +* Capture: +* I²S ADC 1 <- CS4245 * * GPIO 3 <- ? * GPIO 4 <- headphone detect -* GPIO 5 -> route input jack to line-in (0) or mic-in (1) -* GPIO 6 -> route input jack to line-in (0) or mic-in (1) -* GPIO 7 -> enable rear headphone amp +* GPIO 5 -> enable ADC analog circuit for the left channel +* GPIO 6 -> enable ADC analog circuit for the right channel +* GPIO 7 -> switch green rear output jack between CS4245 and +* and the first channel of CS4361 (mechanical relay) * GPIO 8 -> enable output to speakers * * CS4245: * +* input 0 <- mic * input 1 <- aux * input 2 <- front mic -* input 4 <- line/mic +* input 4 <- line * DAC out -> headphones * aux out -> front panel headphones */
Signature · 6 lines
1.7.10.4 _______________________________________________ Alsa-devel mailing list [email protected] http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
PATCH v4 6/19 ALSA: Oxygen: Additional definitions for the Xonar DG/DGX card
In reply to Roman VolkovAdd additional constants to the xonar_dg.h file:
capture and playback sources. Move GPIO_* constants and the dg struct to the header file from the xonar_dg.c file.
--- sound/pci/oxygen/xonar_dg.c | 14 -------------- sound/pci/oxygen/xonar_dg.h | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 14 deletions(-)
sound/pci/oxygen/xonar_dg.c +0 -14
@@ -64,20 +64,6 @@#include "xonar_dg.h" #include "cs4245.h" -#define GPIO_MAGIC 0x0008 -#define GPIO_HP_DETECT 0x0010 -#define GPIO_INPUT_ROUTE 0x0060 -#define GPIO_HP_REAR 0x0080 -#define GPIO_OUTPUT_ENABLE 0x0100 - -struct dg { -unsigned int output_sel; -s8 input_vol[4 ][2 ]; -unsigned int input_sel; -u8 hp_vol_att; -u8 cs4245_regs[0x11 ]; -}; -static void cs4245_write (struct oxygen *chip,unsigned int reg,u8 value) {struct dg *data = chip->model_data;
sound/pci/oxygen/xonar_dg.h +23 -0
@@ -3,6 +3,29 @@#include "oxygen.h" +#define GPIO_MAGIC 0x0008 +#define GPIO_HP_DETECT 0x0010 +#define GPIO_INPUT_ROUTE 0x0060 +#define GPIO_HP_REAR 0x0080 +#define GPIO_OUTPUT_ENABLE 0x0100 + +#define CAPTURE_SRC_MIC 0 +#define CAPTURE_SRC_FP_MIC 1 +#define CAPTURE_SRC_LINE 2 +#define CAPTURE_SRC_AUX 3 + +#define PLAYBACK_DST_HP 0 +#define PLAYBACK_DST_HP_FP 1 +#define PLAYBACK_DST_MULTICH 2 + +struct dg { +unsigned int output_sel; +s8 input_vol[4 ][2 ]; +unsigned int input_sel; +u8 hp_vol_att; +u8 cs4245_regs[0x11 ]; +}; +extern struct oxygen_model model_xonar_dg;#endif
Signature · 1 line
1.7.10.4
PATCH v4 7/19 ALSA: Oxygen: Add new CS4245 SPI functions
In reply to Roman VolkovAdd the new SPI write and read functions. The SPI read function is used for creating initial registers dump and may be used for debugging purposes. SPI operations are cached, so there is a new function to manage the cache (shadow). I have to remove the shift from the CS4245_SPI_* constants, since when we are performing the reading, we need to shift by 8 instead of 16.
--- sound/pci/oxygen/cs4245.h | 7 +++-- sound/pci/oxygen/xonar_dg.c | 64 +++++++++++++++++++++++++++++++++++++++++-- sound/pci/oxygen/xonar_dg.h | 7 +++++ 3 files changed, 74 insertions(+), 4 deletions(-)
sound/pci/oxygen/cs4245.h +5 -2
@@ -102,6 +102,9 @@#define CS4245_ADC_OVFL 0x02#define CS4245_ADC_UNDRFL 0x01 +#define CS4245_SPI_ADDRESS_S (0x9e << 16) +#define CS4245_SPI_WRITE_S (0 << 16) -#define CS4245_SPI_ADDRESS (0x9e << 16) -#define CS4245_SPI_WRITE (0 << 16) +#define CS4245_SPI_ADDRESS 0x9e +#define CS4245_SPI_WRITE 0 +#define CS4245_SPI_READ 1
sound/pci/oxygen/xonar_dg.c +62 -2
76 lines not on this page · raw message
sound/pci/oxygen/xonar_dg.h +7 -0
@@ -18,7 +18,14 @@#define PLAYBACK_DST_HP_FP 1#define PLAYBACK_DST_MULTICH 2 +enum cs4245_shadow_operation { +CS4245_SAVE_TO_SHADOW , +CS4245_LOAD_FROM_SHADOW +}; +struct dg { +/* The shadow copy of the CS4245 register space */ +unsigned char cs4245_shadow[17 ];unsigned int output_sel;s8 input_vol[4 ][2 ];unsigned int input_sel;
Signature · 1 line
1.7.10.4
Re: [PATCH v4 07/19] ALSA: Oxygen: Add new CS4245 SPI functions
Quoted 7 lines · Roman Volkov
Add the new SPI write and read functions. The SPI read function is used for creating initial registers dump and may be used for debugging purposes. SPI operations are cached, so there is a new function to manage the cache (shadow). I have to remove the shift from the CS4245_SPI_* constants, since when we are performing the reading, we need to shift by 8 instead of 16.
I can't help but think that this driver ought to be making more use of frameworks - it sounds like an ASoC system really (split CODEC and CPU) and all this register I/O stuff sounds like it could make use of regmap.
Clemens Ladisch
maintainerRe: [PATCH v4 07/19] ALSA: Oxygen: Add new CS4245 SPI functions
Quoted 11 lines · Mark Brown
Quoted 7 lines · Roman Volkov
Add the new SPI write and read functions. The SPI read function is used for creating initial registers dump and may be used for debugging purposes. SPI operations are cached, so there is a new function to manage the cache (shadow). I have to remove the shift from the CS4245_SPI_* constants, since when we are performing the reading, we need to shift by 8 instead of 16.
I can't help but think that this driver ought to be making more use of frameworks
Everbody else thinks the same: <http://lkml.org/lkml/2012/3/13/215>.
Unfortunately, thinking requires less effort than writing patches.
Regards,
Clemens
PATCH v4 8/19 ALSA: Oxygen: Modify initialization functions
In reply to Roman VolkovChange CS4245 initialization: different sequence and GPIO values, according to datasheets and reverse-engineering information. Change Cleanup/resume/suspend functions, since they use initialization.
--- sound/pci/oxygen/xonar_dg.c | 114 +++++++++++++++++++------------------------ sound/pci/oxygen/xonar_dg.h | 1 - 2 files changed, 50 insertions(+), 65 deletions(-)
sound/pci/oxygen/xonar_dg.c +50 -64
@@ -136,68 +136,50 @@ static void cs4245_write(struct oxygen *chip, unsigned int reg, u8 value)CS4245_SPI_ADDRESS_S |CS4245_SPI_WRITE_S | (reg << 8) | value); - data->cs4245_regs[reg] = value; + data->cs4245_shadow[reg] = value; }static void cs4245_write_cached (struct oxygen *chip,unsigned int reg,u8 value) {struct dg *data = chip->model_data; -if (value != data->cs4245_regs[reg]) +if (value != data->cs4245_shadow[reg])cs4245_write (chip, reg, value); } -static void cs4245_registers_init (struct oxygen *chip) -{ -struct dg *data = chip->model_data; - -cs4245_write (chip,CS4245_POWER_CTRL ,CS4245_PDN ); -cs4245_write (chip,CS4245_DAC_CTRL_1 , - data->cs4245_regs[CS4245_DAC_CTRL_1 ]); -cs4245_write (chip,CS4245_ADC_CTRL , - data->cs4245_regs[CS4245_ADC_CTRL ]); -cs4245_write (chip,CS4245_SIGNAL_SEL , - data->cs4245_regs[CS4245_SIGNAL_SEL ]); -cs4245_write (chip,CS4245_PGA_B_CTRL , - data->cs4245_regs[CS4245_PGA_B_CTRL ]); -cs4245_write (chip,CS4245_PGA_A_CTRL , - data->cs4245_regs[CS4245_PGA_A_CTRL ]); -cs4245_write (chip,CS4245_ANALOG_IN , - data->cs4245_regs[CS4245_ANALOG_IN ]); -cs4245_write (chip,CS4245_DAC_A_CTRL , - data->cs4245_regs[CS4245_DAC_A_CTRL ]); -cs4245_write (chip,CS4245_DAC_B_CTRL , - data->cs4245_regs[CS4245_DAC_B_CTRL ]); -cs4245_write (chip,CS4245_DAC_CTRL_2 , -CS4245_DAC_SOFT |CS4245_DAC_ZERO |CS4245_INVERT_DAC ); -cs4245_write (chip,CS4245_INT_MASK ,0 ); -cs4245_write (chip,CS4245_POWER_CTRL ,0 ); -} -static void cs4245_init (struct oxygen *chip) {struct dg *data = chip->model_data; - data->cs4245_regs[CS4245_DAC_CTRL_1 ] = +/* Save the initial state: codec version, registers */ +cs4245_shadow_control (chip,CS4245_SAVE_TO_SHADOW ); + +/* +* Power up the CODEC internals, enable soft ramp & zero cross, work +* in async. mode, +* Enable aux output from DAC. Invert DAC output as in the Windows +* driver +*/ + data->cs4245_shadow[CS4245_POWER_CTRL ] =0 ; + data->cs4245_shadow[CS4245_SIGNAL_SEL ] =CS4245_A_OUT_SEL_DAC | +CS4245_ASYNCH ; + data->cs4245_shadow[CS4245_DAC_CTRL_1 ] =0 ; + data->cs4245_shadow[CS4245_DAC_CTRL_2 ] =CS4245_DAC_SOFT | +CS4245_DAC_ZERO |CS4245_INVERT_DAC ; + data->cs4245_shadow[CS4245_ADC_CTRL ] =0 ; + data->cs4245_shadow[CS4245_ANALOG_IN ] =CS4245_PGA_SOFT | +CS4245_PGA_ZERO ; + data->cs4245_shadow[CS4245_DAC_CTRL_1 ] =CS4245_DAC_FM_SINGLE |CS4245_DAC_DIF_LJUST ; - data->cs4245_regs[CS4245_ADC_CTRL ] = + data->cs4245_shadow[CS4245_ADC_CTRL ] =CS4245_ADC_FM_SINGLE |CS4245_ADC_DIF_LJUST ; - data->cs4245_regs[CS4245_SIGNAL_SEL ] = -CS4245_A_OUT_SEL_HIZ |CS4245_ASYNCH ; - data->cs4245_regs[CS4245_PGA_B_CTRL ] =0 ; - data->cs4245_regs[CS4245_PGA_A_CTRL ] =0 ; - data->cs4245_regs[CS4245_ANALOG_IN ] = -CS4245_PGA_SOFT |CS4245_PGA_ZERO |CS4245_SEL_INPUT_4 ; - data->cs4245_regs[CS4245_DAC_A_CTRL ] =0 ; - data->cs4245_regs[CS4245_DAC_B_CTRL ] =0 ; -cs4245_registers_init (chip); -snd_component_add (chip->card,"CS4245" ); -} + data->cs4245_shadow[CS4245_PGA_B_CTRL ] =0 ; + data->cs4245_shadow[CS4245_PGA_A_CTRL ] =0 ; + data->cs4245_shadow[CS4245_DAC_A_CTRL ] =4 ; + data->cs4245_shadow[CS4245_DAC_B_CTRL ] =4 ; -static void dg_output_enable (struct oxygen *chip) -{ -msleep (2500 ); -oxygen_set_bits16 (chip,OXYGEN_GPIO_DATA ,GPIO_OUTPUT_ENABLE ); +cs4245_shadow_control (chip,CS4245_LOAD_FROM_SHADOW ); +snd_component_add (chip->card,"CS4245" ); }static void dg_init (struct oxygen *chip)
@@ -208,15 +190,18 @@ static void dg_init(struct oxygen *chip) data->input_sel =3 ; data->hp_vol_att =2 *16 ; -cs4245_init (chip); +/* +* The pin XGPIO1 as XGPIO1, gpios 8,7,6,5,1,0 as outputs. +*/ -oxygen_clear_bits16 (chip,OXYGEN_GPIO_CONTROL , -GPIO_MAGIC |GPIO_HP_DETECT ); -oxygen_set_bits16 (chip,OXYGEN_GPIO_CONTROL , -GPIO_INPUT_ROUTE |GPIO_HP_REAR |GPIO_OUTPUT_ENABLE ); -oxygen_clear_bits16 (chip,OXYGEN_GPIO_DATA , -GPIO_INPUT_ROUTE |GPIO_HP_REAR ); -dg_output_enable (chip); +cs4245_init (chip); +oxygen_write16 (chip,OXYGEN_GPIO_CONTROL ,GPIO_OUTPUT_ENABLE | +GPIO_HP_REAR |GPIO_INPUT_ROUTE ); +oxygen_write16 (chip,OXYGEN_GPIO_DATA ,GPIO_INPUT_ROUTE ); +/* Anti-pop delay */ +msleep (2500 ); +oxygen_write16 (chip,OXYGEN_GPIO_DATA ,GPIO_OUTPUT_ENABLE | +GPIO_INPUT_ROUTE ); }static void dg_cleanup (struct oxygen *chip)
@@ -231,8 +216,9 @@ static void dg_suspend(struct oxygen *chip)static void dg_resume (struct oxygen *chip) { -cs4245_registers_init (chip); -dg_output_enable (chip); +cs4245_shadow_control (chip,CS4245_LOAD_FROM_SHADOW ); +msleep (2500 ); +oxygen_set_bits16 (chip,OXYGEN_GPIO_DATA ,GPIO_OUTPUT_ENABLE ); } static void set_cs4245_dac_params(struct oxygen *chip,
@@ -241,7 +227,7 @@ static void set_cs4245_dac_params(struct oxygen *chip,struct dg *data = chip->model_data;u8 value; - value = data->cs4245_regs[CS4245_DAC_CTRL_1 ] & ~CS4245_DAC_FM_MASK ; + value = data->cs4245_shadow[CS4245_DAC_CTRL_1 ] & ~CS4245_DAC_FM_MASK ;if (params_rate (params) <=50000 ) value |=CS4245_DAC_FM_SINGLE ;else if (params_rate (params) <=100000 )
@@ -257,7 +243,7 @@ static void set_cs4245_adc_params(struct oxygen *chip,struct dg *data = chip->model_data;u8 value; - value = data->cs4245_regs[CS4245_ADC_CTRL ] & ~CS4245_ADC_FM_MASK ; + value = data->cs4245_shadow[CS4245_ADC_CTRL ] & ~CS4245_ADC_FM_MASK ;if (params_rate (params) <=50000 ) value |=CS4245_ADC_FM_SINGLE ;else if (params_rate (params) <=100000 )
@@ -334,7 +320,7 @@ static int output_switch_put(struct snd_kcontrol *ctl,if (changed) { data->output_sel = value->value.enumerated.item[0 ]; - reg = data->cs4245_regs[CS4245_SIGNAL_SEL ] & + reg = data->cs4245_shadow[CS4245_SIGNAL_SEL ] & ~CS4245_A_OUT_SEL_MASK ; reg |= data->output_sel ==2 ?CS4245_A_OUT_SEL_DAC :CS4245_A_OUT_SEL_HIZ ;
@@ -505,7 +491,7 @@ static int input_sel_put(struct snd_kcontrol *ctl, data->input_sel = value->value.enumerated.item[0 ];cs4245_write (chip,CS4245_ANALOG_IN , - (data->cs4245_regs[CS4245_ANALOG_IN ] & + (data->cs4245_shadow[CS4245_ANALOG_IN ] & ~CS4245_SEL_MASK ) | sel_values[data->input_sel]);
@@ -535,7 +521,7 @@ static int hpf_get(struct snd_kcontrol *ctl, struct snd_ctl_elem_value *value)struct dg *data = chip->model_data; value->value.enumerated.item[0 ] = - !!(data->cs4245_regs[CS4245_ADC_CTRL ] &CS4245_HPF_FREEZE ); + !!(data->cs4245_shadow[CS4245_ADC_CTRL ] &CS4245_HPF_FREEZE );return 0 ; }
@@ -547,10 +533,10 @@ static int hpf_put(struct snd_kcontrol *ctl, struct snd_ctl_elem_value *value)int changed;mutex_lock (&chip->mutex); - reg = data->cs4245_regs[CS4245_ADC_CTRL ] & ~CS4245_HPF_FREEZE ; + reg = data->cs4245_shadow[CS4245_ADC_CTRL ] & ~CS4245_HPF_FREEZE ;if (value->value.enumerated.item[0 ]) reg |=CS4245_HPF_FREEZE ; - changed = reg != data->cs4245_regs[CS4245_ADC_CTRL ]; + changed = reg != data->cs4245_shadow[CS4245_ADC_CTRL ];if (changed)cs4245_write (chip,CS4245_ADC_CTRL , reg);mutex_unlock (&chip->mutex);
@@ -630,7 +616,7 @@ static void dump_cs4245_registers(struct oxygen *chip,snd_iprintf (buffer,"\nCS4245:" );for (i =1 ; i <=0x10 ; ++i) -snd_iprintf (buffer," %02x" , data->cs4245_regs[i]); +snd_iprintf (buffer," %02x" , data->cs4245_shadow[i]);snd_iprintf (buffer,"\n" ); }
sound/pci/oxygen/xonar_dg.h +0 -1
@@ -30,7 +30,6 @@ struct dg {s8 input_vol[4 ][2 ];unsigned int input_sel;u8 hp_vol_att; -u8 cs4245_regs[0x11 ]; };extern struct oxygen_model model_xonar_dg;
Signature · 1 line
1.7.10.4
PATCH v4 9/19 ALSA: Oxygen: Modify DAC/ADC parameters function
In reply to Roman VolkovWhen selecting the audio sample rate for CS4245,
the MCLK divider should also be changed.
--- sound/pci/oxygen/xonar_dg.c | 58 ++++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 20 deletions(-)
sound/pci/oxygen/xonar_dg.c +38 -20
@@ -225,32 +225,50 @@ static void set_cs4245_dac_params(struct oxygen *chip, struct snd_pcm_hw_params *params) {struct dg *data = chip->model_data; -u8 value; - - value = data->cs4245_shadow[CS4245_DAC_CTRL_1 ] & ~CS4245_DAC_FM_MASK ; -if (params_rate (params) <=50000 ) - value |=CS4245_DAC_FM_SINGLE ; -else if (params_rate (params) <=100000 ) - value |=CS4245_DAC_FM_DOUBLE ; -else - value |=CS4245_DAC_FM_QUAD ; -cs4245_write_cached (chip,CS4245_DAC_CTRL_1 , value); +unsigned char dac_ctrl; +unsigned char mclk_freq; + + dac_ctrl = data->cs4245_shadow[CS4245_DAC_CTRL_1 ] & ~CS4245_DAC_FM_MASK ; + mclk_freq = data->cs4245_shadow[CS4245_MCLK_FREQ ] & ~CS4245_MCLK1_MASK ; +if (params_rate (params) <=50000 ) { + dac_ctrl |=CS4245_DAC_FM_SINGLE ; + mclk_freq |=CS4245_MCLK_1 <<CS4245_MCLK1_SHIFT ; + }else if (params_rate (params) <=100000 ) { + dac_ctrl |=CS4245_DAC_FM_DOUBLE ; + 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,struct snd_pcm_hw_params *params) {struct dg *data = chip->model_data; -u8 value; - - value = data->cs4245_shadow[CS4245_ADC_CTRL ] & ~CS4245_ADC_FM_MASK ; -if (params_rate (params) <=50000 ) - value |=CS4245_ADC_FM_SINGLE ; -else if (params_rate (params) <=100000 ) - value |=CS4245_ADC_FM_DOUBLE ; -else - value |=CS4245_ADC_FM_QUAD ; -cs4245_write_cached (chip,CS4245_ADC_CTRL , value); +unsigned char adc_ctrl; +unsigned char mclk_freq; + + adc_ctrl = data->cs4245_shadow[CS4245_ADC_CTRL ] & ~CS4245_ADC_FM_MASK ; + mclk_freq = data->cs4245_shadow[CS4245_MCLK_FREQ ] & ~CS4245_MCLK2_MASK ; +if (params_rate (params) <=50000 ) { + adc_ctrl |=CS4245_ADC_FM_SINGLE ; + mclk_freq |=CS4245_MCLK_1 <<CS4245_MCLK2_SHIFT ; + }else if (params_rate (params) <=100000 ) { + adc_ctrl |=CS4245_ADC_FM_DOUBLE ; + 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,
Signature · 1 line
1.7.10.4
PATCH v4 10/19 ALSA: Oxygen: Modify adjust_dg_dac_routing function
In reply to Roman VolkovWhen selecting the audio output destinations (headphones, FP headphones, multichannel output), the channel routing should be changed depending on what destination selected. Also unnecessary I2S channels are digitally muted. This function called when the user selects the destination in the ALSA mixer.
--- sound/pci/oxygen/xonar_dg.c | 44 ++++++++++++++++++++----------------------- sound/pci/oxygen/xonar_dg.h | 2 ++ 2 files changed, 22 insertions(+), 24 deletions(-)
sound/pci/oxygen/xonar_dg.c +20 -24
@@ -271,33 +271,29 @@ static void set_cs4245_adc_params(struct oxygen *chip,cs4245_write_spi (chip,CS4245_MCLK_FREQ ); } -static inline unsigned int shift_bits (unsigned int value, -unsigned int shift_from, -unsigned int shift_to, -unsigned int mask) -{ -if (shift_from < shift_to) -return (value << (shift_to - shift_from)) & mask; -else -return (value >> (shift_from - shift_to)) & mask; -} -static unsigned int adjust_dg_dac_routing (struct oxygen *chip,unsigned int play_routing) { -return (play_routing &OXYGEN_PLAY_DAC0_SOURCE_MASK ) | -shift_bits (play_routing, -OXYGEN_PLAY_DAC2_SOURCE_SHIFT , -OXYGEN_PLAY_DAC1_SOURCE_SHIFT , -OXYGEN_PLAY_DAC1_SOURCE_MASK ) | -shift_bits (play_routing, -OXYGEN_PLAY_DAC1_SOURCE_SHIFT , -OXYGEN_PLAY_DAC2_SOURCE_SHIFT , -OXYGEN_PLAY_DAC2_SOURCE_MASK ) | -shift_bits (play_routing, -OXYGEN_PLAY_DAC0_SOURCE_SHIFT , -OXYGEN_PLAY_DAC3_SOURCE_SHIFT , -OXYGEN_PLAY_DAC3_SOURCE_MASK ); +struct dg *data = chip->model_data; +unsigned int routing =0 ; + +switch (data->pcm_output) { +case PLAYBACK_DST_HP : +case PLAYBACK_DST_HP_FP : +oxygen_write8_masked (chip,OXYGEN_PLAY_ROUTING , +OXYGEN_PLAY_MUTE23 |OXYGEN_PLAY_MUTE45 | +OXYGEN_PLAY_MUTE67 ,OXYGEN_PLAY_MUTE_MASK ); +break ; +case PLAYBACK_DST_MULTICH : + routing = (0 <<OXYGEN_PLAY_DAC0_SOURCE_SHIFT ) | + (2 <<OXYGEN_PLAY_DAC1_SOURCE_SHIFT ) | + (1 <<OXYGEN_PLAY_DAC2_SOURCE_SHIFT ) | + (0 <<OXYGEN_PLAY_DAC3_SOURCE_SHIFT ); +oxygen_write8_masked (chip,OXYGEN_PLAY_ROUTING , +OXYGEN_PLAY_MUTE01 ,OXYGEN_PLAY_MUTE_MASK ); +break ; + } +return routing; } static int output_switch_info(struct snd_kcontrol *ctl,
sound/pci/oxygen/xonar_dg.h +2 -0
@@ -26,6 +26,8 @@ enum cs4245_shadow_operation {struct dg {/* The shadow copy of the CS4245 register space */ unsigned char cs4245_shadow[17 ]; +/* Output select: headphone/speakers */ +unsigned char pcm_output;unsigned int output_sel;s8 input_vol[4 ][2 ];unsigned int input_sel;
Signature · 1 line
1.7.10.4
PATCH v4 11/19 ALSA: Oxygen: Modify CS4245 register dumping function
In reply to Roman VolkovChange the function to read the data from the new shadow buffer.
--- sound/pci/oxygen/xonar_dg.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
sound/pci/oxygen/xonar_dg.c +4 -3
@@ -626,11 +626,12 @@ static void dump_cs4245_registers(struct oxygen *chip, struct snd_info_buffer *buffer) {struct dg *data = chip->model_data; -unsigned int i; +unsigned int addr;snd_iprintf (buffer,"\nCS4245:" ); -for (i =1 ; i <=0x10 ; ++i) -snd_iprintf (buffer," %02x" , data->cs4245_shadow[i]); +cs4245_read_spi (chip,CS4245_INT_STATUS ); +for (addr =1 ; addr <ARRAY_SIZE (data->cs4245_shadow); addr++) +snd_iprintf (buffer," %02x" , data->cs4245_shadow[addr]);snd_iprintf (buffer,"\n" ); }
Signature · 1 line
1.7.10.4
PATCH v4 12/19 ALSA: Oxygen: Move the mixer code into another file
In reply to Roman VolkovMoving the mixer code away makes things easier. The mixer will control the driver, so the functions of the driver need to be non-static.
--- sound/pci/oxygen/Makefile | 2 +- sound/pci/oxygen/xonar_dg.c | 375 ++---------------------------------- sound/pci/oxygen/xonar_dg.h | 19 ++ sound/pci/oxygen/xonar_dg_mixer.c | 381 +++++++++++++++++++++++++++++++++++++ 4 files changed, 412 insertions(+), 365 deletions(-) create mode 100644 sound/pci/oxygen/xonar_dg_mixer.c
sound/pci/oxygen/Makefile +1 -1
@@ -1,5 +1,5 @@ snd-oxygen-lib-objs := oxygen_io.o oxygen_lib.o oxygen_mixer.o oxygen_pcm.o -snd-oxygen-objs := oxygen.o xonar_dg.o +snd-oxygen-objs := oxygen.o xonar_dg_mixer.o xonar_dg.o snd-virtuoso-objs := virtuoso.o xonar_lib.o \ xonar_pcm179x.o xonar_cs43xx.o xonar_wm87x6.o xonar_hdmi.o
sound/pci/oxygen/xonar_dg.c +11 -364
440 lines not on this page · raw message
sound/pci/oxygen/xonar_dg.h +19 -0
@@ -34,6 +34,25 @@ struct dg {u8 hp_vol_att; }; +/* Xonar DG control routines */ +int cs4245_write_spi (struct oxygen *chip,u8 reg); +int cs4245_read_spi (struct oxygen *chip,u8 reg); +int cs4245_shadow_control (struct oxygen *chip,enum cs4245_shadow_operation op); +void dg_init (struct oxygen *chip); +void set_cs4245_dac_params (struct oxygen *chip, +struct snd_pcm_hw_params *params); +void set_cs4245_adc_params (struct oxygen *chip, +struct snd_pcm_hw_params *params); +unsigned int adjust_dg_dac_routing (struct oxygen *chip, +unsigned int play_routing); +void dump_cs4245_registers (struct oxygen *chip, +struct snd_info_buffer *buffer); +void dg_suspend (struct oxygen *chip); +void dg_resume (struct oxygen *chip); +void dg_cleanup (struct oxygen *chip); +void cs4245_write (struct oxygen *chip,unsigned int reg,u8 value); +void cs4245_write_cached (struct oxygen *chip,unsigned int reg,u8 value); +extern struct oxygen_model model_xonar_dg;#endif
sound/pci/oxygen/xonar_dg_mixer.c new file +381 -0
381 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH v4 13/19 ALSA: Oxygen: Capture from I2S channel 1, not 2
In reply to Roman VolkovActually CS4245 connected to the I2S channel 1 for capture, not channel 2. Otherwise capturing and playback does not work for CS4245.
--- sound/pci/oxygen/xonar_dg_mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/oxygen/xonar_dg_mixer.c +1 -1
@@ -369,7 +369,7 @@ struct oxygen_model model_xonar_dg = { .model_data_size = sizeof(struct dg), .device_config =PLAYBACK_0_TO_I2S |PLAYBACK_1_TO_SPDIF | -CAPTURE_0_FROM_I2S_2 | +CAPTURE_0_FROM_I2S_1 | CAPTURE_1_FROM_SPDIF, .dac_channels_pcm = 6, .dac_channels_mixer = 0,
Signature · 1 line
1.7.10.4
PATCH v4 14/19 ALSA: Oxygen: Modify playback output select
In reply to Roman VolkovChange the order of elements in the output select control. This will reduce the number of relay switches. Change 'put' function to call the oxygen_update_dac_routing() function. Otherwise multichannel playback does not work. Also there is a new function to apply settings, this prevents from duplicating the code.
--- sound/pci/oxygen/xonar_dg.c | 2 +- sound/pci/oxygen/xonar_dg.h | 3 +- sound/pci/oxygen/xonar_dg_mixer.c | 76 ++++++++++++++++++++++--------------- 3 files changed, 48 insertions(+), 33 deletions(-)
sound/pci/oxygen/xonar_dg.c +1 -1
@@ -277,7 +277,7 @@ unsigned int adjust_dg_dac_routing(struct oxygen *chip,struct dg *data = chip->model_data;unsigned int routing =0 ; -switch (data->pcm_output) { +switch (data->output_sel) {case PLAYBACK_DST_HP :case PLAYBACK_DST_HP_FP : oxygen_write8_masked(chip, OXYGEN_PLAY_ROUTING,
sound/pci/oxygen/xonar_dg.h +1 -2
@@ -27,8 +27,7 @@ struct dg {/* The shadow copy of the CS4245 register space */ unsigned char cs4245_shadow[17 ];/* Output select: headphone/speakers */ -unsigned char pcm_output; -unsigned int output_sel; +unsigned char output_sel;s8 input_vol[4 ][2 ];unsigned int input_sel;u8 hp_vol_att;
sound/pci/oxygen/xonar_dg_mixer.c +46 -30
110 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH v4 15/19 ALSA: Oxygen: Use headphone volume control
In reply to Roman VolkovI tried both variants: volume control and impedance selector. In the first case one minus is that we can't change the volume of multichannel output without additional software volume control. However, I am using this variant for the last three months and this seems good. All multichannel speaker systems have internal amplifier with the volume control included, but not all headphones have this regulator. In the second case, my software volume control does not save the value after reboot.
--- sound/pci/oxygen/xonar_dg_mixer.c | 115 ++++++++++++++++++++++++++----------- 1 file changed, 83 insertions(+), 32 deletions(-)
sound/pci/oxygen/xonar_dg_mixer.c +83 -32
@@ -100,54 +100,93 @@ static int output_select_put(struct snd_kcontrol *ctl,return changed; } -static int hp_volume_offset_info (struct snd_kcontrol *ctl, -struct snd_ctl_elem_info *info) +/* CS4245 Headphone Channels A&B Volume Control */ + +static int hp_stereo_volume_info (struct snd_kcontrol *ctl, +struct snd_ctl_elem_info *info) { -static const char *const names[3 ] = { -"< 64 ohms" ,"64-150 ohms" ,"150-300 ohms" - }; + info->type =SNDRV_CTL_ELEM_TYPE_INTEGER ; + info->count =2 ; + info->value.integer.min =0 ; + info->value.integer.max =255 ; +return 0 ; +} -return snd_ctl_enum_info (info,1 ,3 , names); +static int hp_stereo_volume_get (struct snd_kcontrol *ctl, +struct snd_ctl_elem_value *val) +{ +struct oxygen *chip = ctl->private_data; +struct dg *data = chip->model_data; +unsigned int tmp; + +mutex_lock (&chip->mutex); + tmp = (~data->cs4245_shadow[CS4245_DAC_A_CTRL ]) &255 ; + val->value.integer.value[0 ] = tmp; + tmp = (~data->cs4245_shadow[CS4245_DAC_B_CTRL ]) &255 ; + val->value.integer.value[1 ] = tmp; +mutex_unlock (&chip->mutex); +return 0 ; } -static int hp_volume_offset_get (struct snd_kcontrol *ctl, -struct snd_ctl_elem_value *value) +static int hp_stereo_volume_put (struct snd_kcontrol *ctl, +struct snd_ctl_elem_value *val) {struct oxygen *chip = ctl->private_data;struct dg *data = chip->model_data; +int ret; +int changed =0 ; +long new1 = val->value.integer.value[0 ]; +long new2 = val->value.integer.value[1 ]; + +if ((new1 >255 ) || (new1 <0 ) || (new2 >255 ) || (new2 <0 )) +return -EINVAL ;mutex_lock (&chip->mutex); -if (data->hp_vol_att >2 *7 ) - value->value.enumerated.item[0 ] =0 ; -else if (data->hp_vol_att >0 ) - value->value.enumerated.item[0 ] =1 ; -else - value->value.enumerated.item[0 ] =2 ; +if ((data->cs4245_shadow[CS4245_DAC_A_CTRL ] != ~new1) || + (data->cs4245_shadow[CS4245_DAC_B_CTRL ] != ~new2)) { + data->cs4245_shadow[CS4245_DAC_A_CTRL ] = ~new1; + data->cs4245_shadow[CS4245_DAC_B_CTRL ] = ~new2; + ret =cs4245_write_spi (chip,CS4245_DAC_A_CTRL ); +if (ret >=0 ) + ret =cs4245_write_spi (chip,CS4245_DAC_B_CTRL ); + changed = ret >=0 ?1 : ret; + } +mutex_unlock (&chip->mutex); + +return changed; +} + +/* Headphone Mute */ + +static int hp_mute_get (struct snd_kcontrol *ctl, +struct snd_ctl_elem_value *val) +{ +struct oxygen *chip = ctl->private_data; +struct dg *data = chip->model_data; + +mutex_lock (&chip->mutex); + val->value.integer.value[0 ] = ((data->cs4245_shadow[CS4245_DAC_CTRL_1 ] + &CS4245_MUTE_DAC ) ==0 );mutex_unlock (&chip->mutex);return 0 ; } -static int hp_volume_offset_put (struct snd_kcontrol *ctl, -struct snd_ctl_elem_value *value) +static int hp_mute_put (struct snd_kcontrol *ctl, +struct snd_ctl_elem_value *val) { -static const s8 atts[3 ] = {2 *16 ,2 *7 ,0 };struct oxygen *chip = ctl->private_data;struct dg *data = chip->model_data; -s8 att; +int ret;int changed; -if (value->value.enumerated.item[0 ] >2 ) +if (val->value.integer.value[0 ] >1 )return -EINVAL ; - att = atts[value->value.enumerated.item[0 ]];mutex_lock (&chip->mutex); - changed = att != data->hp_vol_att; -if (changed) { - data->hp_vol_att = att; -if (data->output_sel) { -cs4245_write_cached (chip,CS4245_DAC_A_CTRL , att); -cs4245_write_cached (chip,CS4245_DAC_B_CTRL , att); - } - } + data->cs4245_shadow[CS4245_DAC_CTRL_1 ] &= ~CS4245_MUTE_DAC ; + data->cs4245_shadow[CS4245_DAC_CTRL_1 ] |= + (~val->value.integer.value[0 ] <<2 ) &CS4245_MUTE_DAC ; + ret =cs4245_write_spi (chip,CS4245_DAC_CTRL_1 ); + changed = ret >=0 ?1 : ret;mutex_unlock (&chip->mutex);return changed; }
@@ -313,6 +352,7 @@ static int hpf_put(struct snd_kcontrol *ctl, struct snd_ctl_elem_value *value) .tlv = { .p = cs4245_pga_db_scale }, \ .private_value = index, \ } +static const DECLARE_TLV_DB_MINMAX(hp_db_scale, -12550, 0);static const struct snd_kcontrol_new dg_controls[] = { { .iface =SNDRV_CTL_ELEM_IFACE_MIXER ,
@@ -323,10 +363,21 @@ static const struct snd_kcontrol_new dg_controls[] = { }, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, - .name = "Headphones Impedance Playback Enum", - .info = hp_volume_offset_info, - .get = hp_volume_offset_get, - .put = hp_volume_offset_put, + .name = "Headphone Playback Volume", + .access =SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READ, + .info = hp_stereo_volume_info, + .get = hp_stereo_volume_get, + .put = hp_stereo_volume_put, + .tlv = { .p = hp_db_scale, }, + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Headphone Playback Switch", + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, + .info = snd_ctl_boolean_mono_info, + .get = hp_mute_get, + .put = hp_mute_put, },INPUT_VOLUME ("Mic Capture Volume" ,0 ), INPUT_VOLUME("Aux Capture Volume", 1),
Signature · 1 line
1.7.10.4
PATCH v4 16/19 ALSA: Oxygen: Modify capture volume functions
In reply to Roman VolkovModify the input_vol_* functions to use the new SPI routines, There is a new applying function that will be called when the capture source changed.
--- sound/pci/oxygen/xonar_dg.h | 3 ++- sound/pci/oxygen/xonar_dg_mixer.c | 32 +++++++++++++++++++++++++------- 2 files changed, 27 insertions(+), 8 deletions(-)
sound/pci/oxygen/xonar_dg.h +2 -1
@@ -28,7 +28,8 @@ struct dg {unsigned char cs4245_shadow[17 ];/* Output select: headphone/speakers */ unsigned char output_sel; -s8 input_vol[4 ][2 ]; +/* The volumes for all capture sources */ +char input_vol[4 ][2 ];unsigned int input_sel;u8 hp_vol_att; };
sound/pci/oxygen/xonar_dg_mixer.c +25 -7
@@ -191,6 +191,22 @@ static int hp_mute_put(struct snd_kcontrol *ctl,return changed; } +/* Capture volume for all sources */ + +static int input_volume_apply (struct oxygen *chip,char left, +char right) +{ +struct dg *data = chip->model_data; +int ret; + + data->cs4245_shadow[CS4245_PGA_A_CTRL ] = left; + data->cs4245_shadow[CS4245_PGA_B_CTRL ] = right; + ret =cs4245_write_spi (chip,CS4245_PGA_A_CTRL ); +if (ret <0 ) +return ret; +return cs4245_write_spi (chip,CS4245_PGA_B_CTRL ); +} +static int input_vol_info (struct snd_kcontrol *ctl,struct snd_ctl_elem_info *info) {
@@ -222,6 +238,7 @@ static int input_vol_put(struct snd_kcontrol *ctl,struct dg *data = chip->model_data;unsigned int idx = ctl->private_value;int changed =0 ; +int ret =0 ; if (value->value.integer.value[0] < 2 * -12 || value->value.integer.value[0] > 2 * 12 ||
@@ -235,18 +252,16 @@ static int input_vol_put(struct snd_kcontrol *ctl, data->input_vol[idx][0 ] = value->value.integer.value[0 ]; data->input_vol[idx][1 ] = value->value.integer.value[1 ];if (idx == data->input_sel) { -cs4245_write_cached (chip,CS4245_PGA_A_CTRL , - data->input_vol[idx][0 ]); -cs4245_write_cached (chip,CS4245_PGA_B_CTRL , - data->input_vol[idx][1 ]); + ret =input_volume_apply (chip, + data->input_vol[idx][0 ], + data->input_vol[idx][1 ]); } + changed = ret >=0 ?1 : ret; }mutex_unlock (&chip->mutex);return changed; } -static DECLARE_TLV_DB_SCALE(cs4245_pga_db_scale, -1200, 50, 0); -static int input_sel_info (struct snd_kcontrol *ctl,struct snd_ctl_elem_info *info) {
@@ -346,13 +361,16 @@ static int hpf_put(struct snd_kcontrol *ctl, struct snd_ctl_elem_value *value)#define INPUT_VOLUME (xname, index) { \ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \ .name = xname, \ + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | \ + SNDRV_CTL_ELEM_ACCESS_TLV_READ, \ .info = input_vol_info, \ .get = input_vol_get, \ .put = input_vol_put, \ - .tlv = { .p = cs4245_pga_db_scale }, \ + .tlv = { .p = pga_db_scale }, \ .private_value = index, \ } static const DECLARE_TLV_DB_MINMAX(hp_db_scale, -12550, 0); +static const DECLARE_TLV_DB_MINMAX(pga_db_scale, -1200, 1200);static const struct snd_kcontrol_new dg_controls[] = { { .iface =SNDRV_CTL_ELEM_IFACE_MIXER ,
Signature · 1 line
1.7.10.4
PATCH v4 17/19 ALSA: Oxygen: Modify input select functions
In reply to Roman VolkovFirst of all, we should not touch the GPIOs. They are not for selecting the capture source, but they seems just enable the whole audio input curcuit. The 'put' function calls the 'apply' functions to change register values. Change the order of capture sources.
--- sound/pci/oxygen/xonar_dg.h | 3 ++- sound/pci/oxygen/xonar_dg_mixer.c | 52 ++++++++++++++++++++----------------- 2 files changed, 30 insertions(+), 25 deletions(-)
sound/pci/oxygen/xonar_dg.h +2 -1
@@ -30,7 +30,8 @@ struct dg {unsigned char output_sel;/* The volumes for all capture sources */ char input_vol[4 ][2 ]; -unsigned int input_sel; +/* Input select: mic/fp mic/line/aux */ +unsigned char input_sel;u8 hp_vol_att; };
sound/pci/oxygen/xonar_dg_mixer.c +28 -24
83 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH v4 18/19 ALSA: Oxygen: Modify High-pass filter control
In reply to Roman VolkovChange the 'put' function of the High-pass filter control to use the new SPI functions.
--- sound/pci/oxygen/xonar_dg_mixer.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
sound/pci/oxygen/xonar_dg_mixer.c +6 -2
@@ -327,6 +327,8 @@ static int input_sel_put(struct snd_kcontrol *ctl,return changed; } +/* ADC High-pass filter */ +static int hpf_info (struct snd_kcontrol *ctl,struct snd_ctl_elem_info *info) {static const char *const names[2 ] = {"Active" ,"Frozen" };
@@ -356,8 +358,10 @@ static int hpf_put(struct snd_kcontrol *ctl, struct snd_ctl_elem_value *value)if (value->value.enumerated.item[0 ]) reg |=CS4245_HPF_FREEZE ; changed = reg != data->cs4245_shadow[CS4245_ADC_CTRL ]; -if (changed) -cs4245_write (chip,CS4245_ADC_CTRL , reg); +if (changed) { + data->cs4245_shadow[CS4245_ADC_CTRL ] = reg; +cs4245_write_spi (chip,CS4245_ADC_CTRL ); + }mutex_unlock (&chip->mutex);return changed; }
Signature · 1 line
1.7.10.4
PATCH v4 19/19 ALSA: Oxygen: Cleanup and minor changes
In reply to Roman VolkovRemove old SPI control functions, change anti-pop init sequence, remove some garbage from structures. The 'Apply' functions must be called at the mixer initialization, otherwise mixer settings sometimes will not be applied at startup.
--- sound/pci/oxygen/xonar_dg.c | 36 ++++++------------------------------ sound/pci/oxygen/xonar_dg.h | 3 --- sound/pci/oxygen/xonar_dg_mixer.c | 5 +++++ 3 files changed, 11 insertions(+), 33 deletions(-)
sound/pci/oxygen/xonar_dg.c +6 -30
@@ -124,29 +124,6 @@ int cs4245_shadow_control(struct oxygen *chip, enum cs4245_shadow_operation op)return 0 ; } -void cs4245_write (struct oxygen *chip,unsigned int reg,u8 value) -{ -struct dg *data = chip->model_data; - -oxygen_write_spi (chip,OXYGEN_SPI_TRIGGER | -OXYGEN_SPI_DATA_LENGTH_3 | -OXYGEN_SPI_CLOCK_1280 | - (0 <<OXYGEN_SPI_CODEC_SHIFT ) | -OXYGEN_SPI_CEN_LATCH_CLOCK_HI , -CS4245_SPI_ADDRESS_S | -CS4245_SPI_WRITE_S | - (reg <<8 ) | value); - data->cs4245_shadow[reg] = value; -} - -void cs4245_write_cached (struct oxygen *chip,unsigned int reg,u8 value) -{ -struct dg *data = chip->model_data; - -if (value != data->cs4245_shadow[reg]) -cs4245_write (chip, reg, value); -} -void cs4245_init (struct oxygen *chip) {struct dg *data = chip->model_data;
@@ -175,8 +152,8 @@ void cs4245_init(struct oxygen *chip)CS4245_ADC_FM_SINGLE |CS4245_ADC_DIF_LJUST ; data->cs4245_shadow[CS4245_PGA_B_CTRL ] =0 ; data->cs4245_shadow[CS4245_PGA_A_CTRL ] =0 ; - data->cs4245_shadow[CS4245_DAC_A_CTRL ] =4 ; - data->cs4245_shadow[CS4245_DAC_B_CTRL ] =4 ; + data->cs4245_shadow[CS4245_DAC_A_CTRL ] =8 ; + data->cs4245_shadow[CS4245_DAC_B_CTRL ] =8 ;cs4245_shadow_control (chip,CS4245_LOAD_FROM_SHADOW );snd_component_add (chip->card,"CS4245" );
@@ -186,9 +163,8 @@ void dg_init(struct oxygen *chip) {struct dg *data = chip->model_data; - data->output_sel =0 ; - data->input_sel =3 ; - data->hp_vol_att =2 *16 ; + data->output_sel =PLAYBACK_DST_HP_FP ; + data->input_sel =CAPTURE_SRC_MIC ;/* * The pin XGPIO1 as XGPIO1, gpios 8,7,6,5,1,0 as outputs.
@@ -197,11 +173,11 @@ void dg_init(struct oxygen *chip)cs4245_init (chip);oxygen_write16 (chip,OXYGEN_GPIO_CONTROL ,GPIO_OUTPUT_ENABLE |GPIO_HP_REAR |GPIO_INPUT_ROUTE ); -oxygen_write16 (chip,OXYGEN_GPIO_DATA ,GPIO_INPUT_ROUTE ); -/* Anti-pop delay */ +/* Anti-pop delay, wait some time before enabling the output */ msleep (2500 );oxygen_write16 (chip,OXYGEN_GPIO_DATA ,GPIO_OUTPUT_ENABLE |GPIO_INPUT_ROUTE ); + }void dg_cleanup (struct oxygen *chip)
sound/pci/oxygen/xonar_dg.h +0 -3
@@ -32,7 +32,6 @@ struct dg {char input_vol[4 ][2 ];/* Input select: mic/fp mic/line/aux */ unsigned char input_sel; -u8 hp_vol_att; };/* Xonar DG control routines */
@@ -51,8 +50,6 @@ void dump_cs4245_registers(struct oxygen *chip,void dg_suspend (struct oxygen *chip);void dg_resume (struct oxygen *chip);void dg_cleanup (struct oxygen *chip); -void cs4245_write (struct oxygen *chip,unsigned int reg,u8 value); -void cs4245_write_cached (struct oxygen *chip,unsigned int reg,u8 value);extern struct oxygen_model model_xonar_dg;
sound/pci/oxygen/xonar_dg_mixer.c +5 -0
@@ -437,12 +437,17 @@ static int dg_mixer_init(struct oxygen *chip)unsigned int i;int err; +output_select_apply (chip); +input_source_apply (chip); +oxygen_update_dac_routing (chip); +for (i =0 ; i <ARRAY_SIZE (dg_controls); ++i) { err =snd_ctl_add (chip->card,snd_ctl_new1 (&dg_controls[i], chip));if (err <0 )return err; } +return 0 ; }
Signature · 1 line
1.7.10.4
Clemens Ladisch
maintainer[GIT PULL] real support for Xonar DG(X), for 3.15
In reply to Roman VolkovThe following changes since commit d8ec26d7f8287f5788a494f56e8814210f0e64be:
Linux 3.13 (2014-01-19 18:40:07 -0800)
are available in the git repository at:
git://git.alsa-project.org/alsa-kprivate.git xonar-dg
for you to fetch changes up to 3f49a66f6ceff1c87b49858644771c17763902ab:
ALSA: oxygen: Xonar DG(X): cleanup and minor changes (2014-01-29 20:45:53 +0100)
----------------------------------------------------------------
This completes the hardware support for the Asus Xonar DG/DGX cards, and makes them actually usable.
This is v4 of Roman's patch set with some small formatting changes.
----------------------------------------------------------------
Roman Volkov (19):
ALSA: oxygen: add the separate SPI waiting function
ALSA: oxygen: modify the SPI writing function
ALSA: oxygen: add mute mask for the OXYGEN_PLAY_ROUTING register
ALSA: oxygen: export oxygen_update_dac_routing symbol
ALSA: oxygen: change description of the xonar_dg.c file
ALSA: oxygen: additional definitions for the Xonar DG/DGX card
ALSA: oxygen: Xonar DG(X): add new CS4245 SPI functions
ALSA: oxygen: Xonar DG(X): modify initialization functions
ALSA: oxygen: Xonar DG(X): modify DAC/ADC parameters function
ALSA: oxygen: modify adjust_dg_dac_routing function
ALSA: oxygen: modify CS4245 register dumping function
ALSA: oxygen: Xonar DG(X): move the mixer code into another file
ALSA: oxygen: Xonar DG(X): capture from I2S channel 1, not 2
ALSA: oxygen: Xonar DG(X): modify playback output select
ALSA: oxygen: Xonar DG(X): use headphone volume control
ALSA: oxygen: Xonar DG(X): modify capture volume functions
ALSA: oxygen: Xonar DG(X): modify input select functions
ALSA: oxygen: Xonar DG(X): modify high-pass filter control
ALSA: oxygen: Xonar DG(X): cleanup and minor changes
sound/pci/oxygen/Makefile | 2 +- sound/pci/oxygen/cs4245.h | 7 +- sound/pci/oxygen/oxygen.h | 2 +- sound/pci/oxygen/oxygen_io.c | 25 +- sound/pci/oxygen/oxygen_mixer.c | 1 + sound/pci/oxygen/oxygen_regs.h | 1 + sound/pci/oxygen/xonar_dg.c | 651 ++++++++---------------------- sound/pci/oxygen/xonar_dg.h | 48 +++ sound/pci/oxygen/xonar_dg_mixer.c | 477 ++++++++++++++++++++++ 9 files changed, 713 insertions(+), 501 deletions(-) create mode 100644 sound/pci/oxygen/xonar_dg_mixer.c
Re: [GIT PULL] real support for Xonar DG(X), for 3.15
At Wed, 29 Jan 2014 22:06:46 +0100,
Quoted 11 lines · Clemens Ladisch
The following changes since commit
d8ec26d7f8287f5788a494f56e8814210f0e64be:Linux 3.13 (2014-01-19 18:40:07 -0800)
are available in the git repository at:
git://git.alsa-project.org/alsa-kprivate.gitxonar-dgfor you to fetch changes up to
3f49a66f6ceff1c87b49858644771c17763902ab:
Quoted 8 lines
ALSA: oxygen: Xonar DG(X): cleanup and minor changes (2014-01-29 20:45:53 +0100)
----------------------------------------------------------------
This completes the hardware support for the Asus Xonar DG/DGX cards, and makes them actually usable.
This is v4 of Roman's patch set with some small formatting changes.
OK, I pulled now for the next 3.14 merge, since these all look good and are local changes.
thanks,
Takashi
Quoted 35 lines
----------------------------------------------------------------
Roman Volkov (19):
ALSA: oxygen: add the separate SPI waiting function
ALSA: oxygen: modify the SPI writing function
ALSA: oxygen: add mute mask for theOXYGEN_PLAY_ROUTINGregister
ALSA: oxygen: exportoxygen_update_dac_routingsymbol
ALSA: oxygen: change description of thexonar_dg.cfile
ALSA: oxygen: additional definitions for the Xonar DG/DGX card
ALSA: oxygen: Xonar DG(X): add new CS4245 SPI functions
ALSA: oxygen: Xonar DG(X): modify initialization functions
ALSA: oxygen: Xonar DG(X): modify DAC/ADC parameters function
ALSA: oxygen: modifyadjust_dg_dac_routingfunction
ALSA: oxygen: modify CS4245 register dumping function
ALSA: oxygen: Xonar DG(X): move the mixer code into another file
ALSA: oxygen: Xonar DG(X): capture from I2S channel 1, not 2
ALSA: oxygen: Xonar DG(X): modify playback output select
ALSA: oxygen: Xonar DG(X): use headphone volume control
ALSA: oxygen: Xonar DG(X): modify capture volume functions
ALSA: oxygen: Xonar DG(X): modify input select functions
ALSA: oxygen: Xonar DG(X): modify high-pass filter control
ALSA: oxygen: Xonar DG(X): cleanup and minor changessound/pci/oxygen/Makefile | 2 +- sound/pci/oxygen/cs4245.h | 7 +- sound/pci/oxygen/oxygen.h | 2 +- sound/pci/oxygen/oxygen_io.c | 25 +- sound/pci/oxygen/oxygen_mixer.c | 1 + sound/pci/oxygen/oxygen_regs.h | 1 + sound/pci/oxygen/xonar_dg.c | 651 ++++++++---------------------- sound/pci/oxygen/xonar_dg.h | 48 +++ sound/pci/oxygen/xonar_dg_mixer.c | 477 ++++++++++++++++++++++ 9 files changed, 713 insertions(+), 501 deletions(-) create mode 100644 sound/pci/oxygen/xonar_dg_mixer.c