diff options
Diffstat (limited to 'sound/pci/oxygen/oxygen.c')
| -rw-r--r-- | sound/pci/oxygen/oxygen.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index 542752442a95..9faf43c949b2 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c | |||
| @@ -303,12 +303,13 @@ static const struct oxygen_model model_generic = { | |||
| 303 | .update_dac_mute = update_ak4396_mute, | 303 | .update_dac_mute = update_ak4396_mute, |
| 304 | .ac97_switch_hook = cmi9780_switch_hook, | 304 | .ac97_switch_hook = cmi9780_switch_hook, |
| 305 | .model_data_size = sizeof(struct generic_data), | 305 | .model_data_size = sizeof(struct generic_data), |
| 306 | .pcm_dev_cfg = PLAYBACK_0_TO_I2S | | ||
| 307 | PLAYBACK_1_TO_SPDIF | | ||
| 308 | PLAYBACK_2_TO_AC97_1 | | ||
| 309 | CAPTURE_0_FROM_I2S_1 | | ||
| 310 | CAPTURE_1_FROM_SPDIF | | ||
| 311 | CAPTURE_2_FROM_AC97_1, | ||
| 306 | .dac_channels = 8, | 312 | .dac_channels = 8, |
| 307 | .used_channels = OXYGEN_CHANNEL_A | | ||
| 308 | OXYGEN_CHANNEL_C | | ||
| 309 | OXYGEN_CHANNEL_SPDIF | | ||
| 310 | OXYGEN_CHANNEL_MULTICH | | ||
| 311 | OXYGEN_CHANNEL_AC97, | ||
| 312 | .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, | 313 | .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, |
| 313 | .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | 314 | .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, |
| 314 | .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | 315 | .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, |
| @@ -327,12 +328,13 @@ static const struct oxygen_model model_meridian = { | |||
| 327 | .update_dac_mute = update_ak4396_mute, | 328 | .update_dac_mute = update_ak4396_mute, |
| 328 | .ac97_switch_hook = cmi9780_switch_hook, | 329 | .ac97_switch_hook = cmi9780_switch_hook, |
| 329 | .model_data_size = sizeof(struct generic_data), | 330 | .model_data_size = sizeof(struct generic_data), |
| 331 | .pcm_dev_cfg = PLAYBACK_0_TO_I2S | | ||
| 332 | PLAYBACK_1_TO_SPDIF | | ||
| 333 | PLAYBACK_2_TO_AC97_1 | | ||
| 334 | CAPTURE_0_FROM_I2S_2 | | ||
| 335 | CAPTURE_1_FROM_SPDIF | | ||
| 336 | CAPTURE_2_FROM_AC97_1, | ||
| 330 | .dac_channels = 8, | 337 | .dac_channels = 8, |
| 331 | .used_channels = OXYGEN_CHANNEL_B | | ||
| 332 | OXYGEN_CHANNEL_C | | ||
| 333 | OXYGEN_CHANNEL_SPDIF | | ||
| 334 | OXYGEN_CHANNEL_MULTICH | | ||
| 335 | OXYGEN_CHANNEL_AC97, | ||
| 336 | .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, | 338 | .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, |
| 337 | .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | 339 | .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, |
| 338 | .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | 340 | .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, |