diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2008-01-17 03:05:09 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 11:30:03 -0500 |
commit | 05855ba3f405d02c4530072527d2b1c72e3b38a9 (patch) | |
tree | a3a53083e0e773d606f56922f927f719568026d9 /sound/pci/oxygen/oxygen.c | |
parent | b8c5b53e1f104a9f877f947cdb86d5c7208d6c9a (diff) |
[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 <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/oxygen/oxygen.c')
-rw-r--r-- | sound/pci/oxygen/oxygen.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index f8e3fd39749d..e618cde7f9e4 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c | |||
@@ -285,6 +285,8 @@ static const struct oxygen_model model_generic = { | |||
285 | OXYGEN_CHANNEL_MULTICH | | 285 | OXYGEN_CHANNEL_MULTICH | |
286 | OXYGEN_CHANNEL_AC97, | 286 | OXYGEN_CHANNEL_AC97, |
287 | .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, | 287 | .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, |
288 | .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | ||
289 | .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | ||
288 | }; | 290 | }; |
289 | static const struct oxygen_model model_meridian = { | 291 | static const struct oxygen_model model_meridian = { |
290 | .shortname = "C-Media CMI8788", | 292 | .shortname = "C-Media CMI8788", |
@@ -304,6 +306,8 @@ static const struct oxygen_model model_meridian = { | |||
304 | OXYGEN_CHANNEL_MULTICH | | 306 | OXYGEN_CHANNEL_MULTICH | |
305 | OXYGEN_CHANNEL_AC97, | 307 | OXYGEN_CHANNEL_AC97, |
306 | .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, | 308 | .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, |
309 | .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | ||
310 | .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | ||
307 | }; | 311 | }; |
308 | 312 | ||
309 | static int __devinit generic_oxygen_probe(struct pci_dev *pci, | 313 | static int __devinit generic_oxygen_probe(struct pci_dev *pci, |