diff options
| author | James Courtier-Dutton <James@superbug.co.uk> | 2005-12-20 22:30:49 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 12:30:58 +0100 |
| commit | a5875159dd6cec0ec743971343aee8dceac281d7 (patch) | |
| tree | 72395f42105af60721e17bd443815901805cf532 /sound/pci | |
| parent | 39596dc898270fcaaa8a712b63fc033f86d874cf (diff) | |
| download | op-kernel-dev-a5875159dd6cec0ec743971343aee8dceac281d7.zip op-kernel-dev-a5875159dd6cec0ec743971343aee8dceac281d7.tar.gz | |
[ALSA] snd-ca0106: Fixes sound output for Creative Audigy SE aka.SB0570.
Modules: CA0106 driver
Fixes ALSA bug#1636
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/ca0106/ca0106.h | 1 | ||||
| -rw-r--r-- | sound/pci/ca0106/ca0106_main.c | 32 |
2 files changed, 33 insertions, 0 deletions
diff --git a/sound/pci/ca0106/ca0106.h b/sound/pci/ca0106/ca0106.h index 7088317..c8131ea 100644 --- a/sound/pci/ca0106/ca0106.h +++ b/sound/pci/ca0106/ca0106.h @@ -577,6 +577,7 @@ struct snd_ca0106_details { int ac97; int gpio_type; int i2c_adc; + int spi_dac; }; // definition of the chip-specific record diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index 5964cdc..1cf6f1f 100644 --- a/sound/pci/ca0106/ca0106_main.c +++ b/sound/pci/ca0106/ca0106_main.c @@ -183,6 +183,17 @@ static struct snd_ca0106_details ca0106_chip_details[] = { .name = "Live! 7.1 24bit [SB0413]", .gpio_type = 1, .i2c_adc = 1 } , + /* New Audigy SE. Has a different DAC. */ + /* SB0570: + * CTRL:CA0106-DAT + * ADC: WM8768GEDS + * DAC: WM8775EDS + */ + { .serial = 0x100a1102, + .name = "Audigy SE [SB0570]", + .gpio_type = 1, + .i2c_adc = 1, + .spi_dac = 1 } , /* MSI K8N Diamond Motherboard with onboard SB Live 24bit without AC97 */ { .serial = 0x10091462, .name = "MSI K8N Diamond MB [SB0438]", @@ -273,6 +284,20 @@ void snd_ca0106_ptr_write(struct snd_ca0106 *emu, spin_unlock_irqrestore(&emu->emu_lock, flags); } +int snd_ca0106_spi_write(struct snd_ca0106 *emu, + u32 value) +{ + snd_ca0106_ptr_write(emu, SPI, 0, value); + return 0; +} + +int snd_ca0106_spi_read(struct snd_ca0106 *emu, + u32 *value) +{ + *value = snd_ca0106_ptr_read(emu, SPI, 0); + return 0; +} + int snd_ca0106_i2c_write(struct snd_ca0106 *emu, u32 reg, u32 value) @@ -1304,6 +1329,13 @@ static int __devinit snd_ca0106_create(struct snd_card *card, if (chip->details->i2c_adc == 1) { /* The SB0410 and SB0413 use I2C to control ADC. */ snd_ca0106_i2c_write(chip, ADC_MUX, ADC_MUX_LINEIN); /* Enable Line-in capture. MIC in currently untested. */ } + if (chip->details->spi_dac == 1) { /* The SB0570 use SPI to control DAC. */ + u32 tmp; + snd_ca0106_spi_write(chip, 0xf0622); /* Enable speakers output. */ + snd_ca0106_spi_read(chip, &tmp); /* Read the value. */ + snd_ca0106_spi_write(chip, 0xe1400); + snd_ca0106_spi_read(chip, &tmp); /* Read the value. */ + } if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) { |
