diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2008-01-16 02:30:38 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 11:30:00 -0500 |
commit | e85e09250ab552fab6925bcde7c77746101b2d40 (patch) | |
tree | 4ca130f7c846aaa8069d7d71a91ceabf2f5af22b /sound/pci/oxygen/oxygen.c | |
parent | 84aa6b7ba746e6f637444d0e14a9b75c0b49a612 (diff) |
[ALSA] oxygen: make all DMA channels configurable
Allow the card models to specify whether each of the hardware DMA
channels is used.
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 | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index 83c6fab425fe..e2dda16d5dcc 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c | |||
@@ -256,6 +256,11 @@ static const struct oxygen_model model_generic = { | |||
256 | .update_dac_volume = update_ak4396_volume, | 256 | .update_dac_volume = update_ak4396_volume, |
257 | .update_dac_mute = update_ak4396_mute, | 257 | .update_dac_mute = update_ak4396_mute, |
258 | .dac_tlv = ak4396_db_scale, | 258 | .dac_tlv = ak4396_db_scale, |
259 | .used_channels = OXYGEN_CHANNEL_A | | ||
260 | OXYGEN_CHANNEL_C | | ||
261 | OXYGEN_CHANNEL_SPDIF | | ||
262 | OXYGEN_CHANNEL_MULTICH | | ||
263 | OXYGEN_CHANNEL_AC97, | ||
259 | .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, | 264 | .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, |
260 | }; | 265 | }; |
261 | static const struct oxygen_model model_meridian = { | 266 | static const struct oxygen_model model_meridian = { |
@@ -270,7 +275,11 @@ static const struct oxygen_model model_meridian = { | |||
270 | .update_dac_volume = update_ak4396_volume, | 275 | .update_dac_volume = update_ak4396_volume, |
271 | .update_dac_mute = update_ak4396_mute, | 276 | .update_dac_mute = update_ak4396_mute, |
272 | .dac_tlv = ak4396_db_scale, | 277 | .dac_tlv = ak4396_db_scale, |
273 | .record_from_dma_b = 1, | 278 | .used_channels = OXYGEN_CHANNEL_B | |
279 | OXYGEN_CHANNEL_C | | ||
280 | OXYGEN_CHANNEL_SPDIF | | ||
281 | OXYGEN_CHANNEL_MULTICH | | ||
282 | OXYGEN_CHANNEL_AC97, | ||
274 | .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, | 283 | .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, |
275 | }; | 284 | }; |
276 | 285 | ||