From 05855ba3f405d02c4530072527d2b1c72e3b38a9 Mon Sep 17 00:00:00 2001 From: Clemens Ladisch Date: Thu, 17 Jan 2008 09:05:09 +0100 Subject: [ALSA] oxygen: make the I2S format configurable Add proper register bit symbols for the I2S format field, and allow card models to configure the I2S format to be used for the DACs and ADCs. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela --- sound/pci/oxygen/virtuoso.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'sound/pci/oxygen/virtuoso.c') diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c index bea34f10d44..83c2c43e7b8 100644 --- a/sound/pci/oxygen/virtuoso.c +++ b/sound/pci/oxygen/virtuoso.c @@ -102,10 +102,6 @@ static void xonar_init(struct oxygen *chip) oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, 0x8c); oxygen_write16_masked(chip, OXYGEN_GPIO_DATA, 0x00, 0x8c); -#if 0 - oxygen_clear_bits16(chip, OXYGEN_I2S_MULTICH_FORMAT, - OXYGEN_I2S_MAGIC1_MASK); -#endif oxygen_ac97_set_bits(chip, 0, 0x62, 0x0080); msleep(300); oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, 0x100); @@ -253,6 +249,8 @@ static const struct oxygen_model model_xonar = { OXYGEN_CHANNEL_SPDIF | OXYGEN_CHANNEL_MULTICH, .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, + .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, + .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, }; static int __devinit xonar_probe(struct pci_dev *pci, -- cgit v1.2.3