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

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

ALSA: oxygen: add Xonar DG support 



Add experimental support for the Asus Xonar DG sound card.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 8443d2eb

Documentation/sound/alsa/ALSA-Configuration.txt

+2 −1
Original line number Diff line number Diff line
@@ -1524,8 +1524,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
  Module snd-oxygen

  -----------------



    Module for sound cards based on the C-Media CMI8787/8788 chip:

    Module for sound cards based on the C-Media CMI8786/8787/8788 chip:

    * Asound A-8788

    * Asus Xonar DG

    * AuzenTech X-Meridian

    * AuzenTech X-Meridian 2G

    * Bgears b-Enspirer

sound/pci/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ config SND_OXYGEN_LIB 
        tristate



config SND_OXYGEN

	tristate "C-Media 8787, 8788 (Oxygen)"

	tristate "C-Media 8786, 8787, 8788 (Oxygen)"

	select SND_OXYGEN_LIB

	select SND_PCM

	select SND_MPU401_UART
@@ -217,6 +217,7 @@ config SND_OXYGEN 
	  Say Y here to include support for sound cards based on the

	  C-Media CMI8788 (Oxygen HD Audio) chip:

	   * Asound A-8788

	   * Asus Xonar DG

	   * AuzenTech X-Meridian

	   * AuzenTech X-Meridian 2G

	   * Bgears b-Enspirer

sound/pci/oxygen/Makefile

+1 −1
Original line number Diff line number Diff line 
snd-oxygen-lib-objs := oxygen_io.o oxygen_lib.o oxygen_mixer.o oxygen_pcm.o

snd-oxygen-objs := oxygen.o

snd-oxygen-objs := oxygen.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/cs4245.h

0 → 100644
+107 −0
Original line number Diff line number Diff line 
#define CS4245_CHIP_ID		0x01

#define CS4245_POWER_CTRL	0x02

#define CS4245_DAC_CTRL_1	0x03

#define CS4245_ADC_CTRL		0x04

#define CS4245_MCLK_FREQ	0x05

#define CS4245_SIGNAL_SEL	0x06

#define CS4245_PGA_B_CTRL	0x07

#define CS4245_PGA_A_CTRL	0x08

#define CS4245_ANALOG_IN	0x09

#define CS4245_DAC_A_CTRL	0x0a

#define CS4245_DAC_B_CTRL	0x0b

#define CS4245_DAC_CTRL_2	0x0c

#define CS4245_INT_STATUS	0x0d

#define CS4245_INT_MASK		0x0e

#define CS4245_INT_MODE_MSB	0x0f

#define CS4245_INT_MODE_LSB	0x10



/* Chip ID */

#define CS4245_CHIP_PART_MASK	0xf0

#define CS4245_CHIP_REV_MASK	0x0f



/* Power Control */

#define CS4245_FREEZE		0x80

#define CS4245_PDN_MIC		0x08

#define CS4245_PDN_ADC		0x04

#define CS4245_PDN_DAC		0x02

#define CS4245_PDN		0x01



/* DAC Control */

#define CS4245_DAC_FM_MASK	0xc0

#define CS4245_DAC_FM_SINGLE	0x00

#define CS4245_DAC_FM_DOUBLE	0x40

#define CS4245_DAC_FM_QUAD	0x80

#define CS4245_DAC_DIF_MASK	0x30

#define CS4245_DAC_DIF_LJUST	0x00

#define CS4245_DAC_DIF_I2S	0x10

#define CS4245_DAC_DIF_RJUST_16	0x20

#define CS4245_DAC_DIF_RJUST_24	0x30

#define CS4245_RESERVED_1	0x08

#define CS4245_MUTE_DAC		0x04

#define CS4245_DEEMPH		0x02

#define CS4245_DAC_MASTER	0x01



/* ADC Control */

#define CS4245_ADC_FM_MASK	0xc0

#define CS4245_ADC_FM_SINGLE	0x00

#define CS4245_ADC_FM_DOUBLE	0x40

#define CS4245_ADC_FM_QUAD	0x80

#define CS4245_ADC_DIF_MASK	0x10

#define CS4245_ADC_DIF_LJUST	0x00

#define CS4245_ADC_DIF_I2S	0x10

#define CS4245_MUTE_ADC		0x04

#define CS4245_HPF_FREEZE	0x02

#define CS4245_ADC_MASTER	0x01



/* MCLK Frequency */

#define CS4245_MCLK1_MASK	0x70

#define CS4245_MCLK1_SHIFT	4

#define CS4245_MCLK2_MASK	0x07

#define CS4245_MCLK2_SHIFT	0

#define CS4245_MCLK_1		0

#define CS4245_MCLK_1_5		1

#define CS4245_MCLK_2		2

#define CS4245_MCLK_3		3

#define CS4245_MCLK_4		4



/* Signal Selection */

#define CS4245_A_OUT_SEL_MASK	0x60

#define CS4245_A_OUT_SEL_HIZ	0x00

#define CS4245_A_OUT_SEL_DAC	0x20

#define CS4245_A_OUT_SEL_PGA	0x40

#define CS4245_LOOP		0x02

#define CS4245_ASYNCH		0x01



/* Channel B/A PGA Control */

#define CS4245_PGA_GAIN_MASK	0x3f



/* ADC Input Control */

#define CS4245_PGA_SOFT		0x10

#define CS4245_PGA_ZERO		0x08

#define CS4245_SEL_MASK		0x07

#define CS4245_SEL_MIC		0x00

#define CS4245_SEL_INPUT_1	0x01

#define CS4245_SEL_INPUT_2	0x02

#define CS4245_SEL_INPUT_3	0x03

#define CS4245_SEL_INPUT_4	0x04

#define CS4245_SEL_INPUT_5	0x05

#define CS4245_SEL_INPUT_6	0x06



/* DAC Channel A/B Volume Control */

#define CS4245_VOL_MASK		0xff



/* DAC Control 2 */

#define CS4245_DAC_SOFT		0x80

#define CS4245_DAC_ZERO		0x40

#define CS4245_INVERT_DAC	0x20

#define CS4245_INT_ACTIVE_HIGH	0x01



/* Interrupt Status/Mask/Mode */

#define CS4245_ADC_CLK_ERR	0x08

#define CS4245_DAC_CLK_ERR	0x04

#define CS4245_ADC_OVFL		0x02

#define CS4245_ADC_UNDRFL	0x01





#define CS4245_SPI_ADDRESS	(0x9e << 16)

#define CS4245_SPI_WRITE	(0 << 16)

sound/pci/oxygen/oxygen.c

+10 −1
Original line number Diff line number Diff line
@@ -53,13 +53,16 @@ 
#include <sound/pcm_params.h>

#include <sound/tlv.h>

#include "oxygen.h"

#include "xonar_dg.h"

#include "ak4396.h"

#include "wm8785.h"



MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");

MODULE_DESCRIPTION("C-Media CMI8788 driver");

MODULE_LICENSE("GPL v2");

MODULE_SUPPORTED_DEVICE("{{C-Media,CMI8788}}");

MODULE_SUPPORTED_DEVICE("{{C-Media,CMI8786}"

			",{C-Media,CMI8787}"

			",{C-Media,CMI8788}}");



static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;

static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
@@ -79,6 +82,7 @@ enum { 
	MODEL_CLARO_HALO,

	MODEL_FANTASIA,

	MODEL_2CH_OUTPUT,

	MODEL_XONAR_DG,

};



static DEFINE_PCI_DEVICE_TABLE(oxygen_ids) = {
@@ -92,6 +96,8 @@ static DEFINE_PCI_DEVICE_TABLE(oxygen_ids) = { 
	{ OXYGEN_PCI_SUBID(0x13f6, 0x8788), .driver_data = MODEL_CMEDIA_REF },

	{ OXYGEN_PCI_SUBID(0x147a, 0xa017), .driver_data = MODEL_CMEDIA_REF },

	{ OXYGEN_PCI_SUBID(0x1a58, 0x0910), .driver_data = MODEL_CMEDIA_REF },

	/* Asus Xonar DG */

	{ OXYGEN_PCI_SUBID(0x1043, 0x8467), .driver_data = MODEL_XONAR_DG },

	/* PCI 2.0 HD Audio */

	{ OXYGEN_PCI_SUBID(0x13f6, 0x8782), .driver_data = MODEL_2CH_OUTPUT },

	/* Kuroutoshikou CMI8787-HG2PCI */
@@ -655,6 +661,9 @@ static int __devinit get_oxygen_model(struct oxygen *chip, 
		chip->model.dac_channels_pcm = 2;

		chip->model.dac_channels_mixer = 2;

		break;

	case MODEL_XONAR_DG:

		chip->model = model_xonar_dg;

		break;

	}

	if (id->driver_data == MODEL_MERIDIAN ||

	    id->driver_data == MODEL_CLARO_HALO) {