diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2008-03-19 03:20:13 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 06:00:28 -0400 |
commit | 87eedd2fd409d5cd515ccd6fc454cef15c5fa38b (patch) | |
tree | c955e0f3073e743e00f01a8aad8fe55b09d6556c /sound/pci/oxygen/oxygen.c | |
parent | f009ad9b39e6484d8e36e9e5029c07eab8c12e8f (diff) |
[ALSA] oxygen: make SPI/2-wire configuration model-specific
Allow the model drivers to specify if the codec communication goes over
SPI or a 2-wire bus.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/oxygen.c')
-rw-r--r-- | sound/pci/oxygen/oxygen.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index 9faf43c949b2..e9031ede9621 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c | |||
@@ -310,7 +310,8 @@ static const struct oxygen_model model_generic = { | |||
310 | CAPTURE_1_FROM_SPDIF | | 310 | CAPTURE_1_FROM_SPDIF | |
311 | CAPTURE_2_FROM_AC97_1, | 311 | CAPTURE_2_FROM_AC97_1, |
312 | .dac_channels = 8, | 312 | .dac_channels = 8, |
313 | .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, | 313 | .function_flags = OXYGEN_FUNCTION_SPI | |
314 | OXYGEN_FUNCTION_ENABLE_SPI_4_5, | ||
314 | .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | 315 | .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, |
315 | .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | 316 | .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, |
316 | }; | 317 | }; |
@@ -335,7 +336,8 @@ static const struct oxygen_model model_meridian = { | |||
335 | CAPTURE_1_FROM_SPDIF | | 336 | CAPTURE_1_FROM_SPDIF | |
336 | CAPTURE_2_FROM_AC97_1, | 337 | CAPTURE_2_FROM_AC97_1, |
337 | .dac_channels = 8, | 338 | .dac_channels = 8, |
338 | .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, | 339 | .function_flags = OXYGEN_FUNCTION_SPI | |
340 | OXYGEN_FUNCTION_ENABLE_SPI_4_5, | ||
339 | .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | 341 | .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, |
340 | .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | 342 | .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, |
341 | }; | 343 | }; |