summaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/xonar_dg.c
Commit message (Collapse)AuthorAgeFilesLines
* ALSA: oxygen: Xonar DG(X): fix Stereo Upmixing regressionClemens Ladisch2014-03-181-6/+24
| | | | | | | | | | | | | | | | The code introduced in commit 1f91ecc14dee ("ALSA: oxygen: modify adjust_dg_dac_routing function") accidentally disregarded the old value of the playback routing register, so it broke the "Stereo Upmixing" mixer control. The unmuted parts of the channel routing are the same for all settings of the output destination, so it suffices to revert that part of the patch. Fixes: 1f91ecc14dee ('ALSA: oxygen: modify adjust_dg_dac_routing function') Tested-by: Roman Volkov <v1ron@mail.ru> Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: oxygen: Xonar DG(X): cleanup and minor changesRoman Volkov2014-01-291-30/+6
| | | | | | | | | | Remove 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. Signed-off-by: Roman Volkov <v1ron@mail.ru> Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
* ALSA: oxygen: Xonar DG(X): modify playback output selectRoman Volkov2014-01-291-1/+1
| | | | | | | | | | | Change 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. Signed-off-by: Roman Volkov <v1ron@mail.ru> Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
* ALSA: oxygen: Xonar DG(X): move the mixer code into another fileRoman Volkov2014-01-291-363/+10
| | | | | | | | | Moving the mixer code away makes things easier. The mixer will control the driver, so the functions of the driver need to be non-static. Signed-off-by: Roman Volkov <v1ron@mail.ru> Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
* ALSA: oxygen: modify CS4245 register dumping functionRoman Volkov2014-01-291-3/+4
| | | | | | | Change the function to read the data from the new shadow buffer. Signed-off-by: Roman Volkov <v1ron@mail.ru> Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
* ALSA: oxygen: modify adjust_dg_dac_routing functionRoman Volkov2014-01-291-24/+20
| | | | | | | | | | | | When 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. Signed-off-by: Roman Volkov <v1ron@mail.ru> Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
* ALSA: oxygen: Xonar DG(X): modify DAC/ADC parameters functionRoman Volkov2014-01-291-20/+38
| | | | | | | | 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>
* ALSA: oxygen: Xonar DG(X): modify initialization functionsRoman Volkov2014-01-291-64/+42
| | | | | | | | | | Change CS4245 initialization: different sequence and GPIO values, according to datasheets and reverse-engineering information. Change cleanup/resume/suspend functions, since they use initialization. Signed-off-by: Roman Volkov <v1ron@mail.ru> Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
* ALSA: oxygen: Xonar DG(X): add new CS4245 SPI functionsRoman Volkov2014-01-291-2/+61
| | | | | | | | | | | | | 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. Signed-off-by: Roman Volkov <v1ron@mail.ru> Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
* ALSA: oxygen: additional definitions for the Xonar DG/DGX cardRoman Volkov2014-01-291-14/+0
| | | | | | | | | Add 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. Signed-off-by: Roman Volkov <v1ron@mail.ru> Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
* ALSA: oxygen: change description of the xonar_dg.c fileRoman Volkov2014-01-291-5/+13
| | | | | | | Add some additional information in comments and my copyright. Signed-off-by: Roman Volkov <v1ron@mail.ru> Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
* ALSA: oxygen: add Xonar DGX supportClemens Ladisch2012-05-051-4/+3
| | | | | | | | Add the PCI ID of the Asus Xonar DGX card; it's otherwise identical with the DG. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: virtuoso: add S/PDIF input support for all XonarsClemens Ladisch2012-01-111-1/+2
| | | | | | | | | | | | All Xonar cards support S/PDIF input, but the cards without optical or coaxial plugs have only undocumented pin connectors. Support for the ST/STX was already added in a previous patch; this adds support for the D1/DX (JP2), DG (J5), DS (J5), and HDAV Slim (J12). Many thanks to Zoltan Miklos for testing the DS and DX. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: oxygen: fix output routing on Xonar DGClemens Ladisch2011-01-311-0/+36
| | | | | | | | | | This card uses separate I2S outputs for the front speakers and headphones, and reverses the order of the three speaker outputs. To work around this, add a model-specific callback to adjust the controller's playback routing. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: oxygen: Xonar DG: fix CS4245 register writesClemens Ladisch2011-01-141-1/+1
| | | | | | | | Accidentally exchanging register addresses and register values leads to many strange errors ... Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: oxygen: fix Xonar DG inputClemens Ladisch2011-01-121-1/+1
| | | | | | | Apparently, this card uses the other I2S input. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: include delay.h for msleep in Xonar DG supportStephen Rothwell2011-01-111-0/+1
| | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: core, oxygen, virtuoso: add an enum control info helperClemens Ladisch2011-01-101-26/+4
| | | | | | | | Introduce the helper function snd_ctl_enum_info() to fill out the elem_info fields for an enumerated control. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: oxygen: add Xonar DG supportClemens Ladisch2011-01-101-0/+593
Add experimental support for the Asus Xonar DG sound card. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
OpenPOWER on IntegriCloud