diff options
| author |   Clemens Ladisch <clemens@ladisch.de> | 2008-01-16 08:30:38 +0100 |
|---|---|---|
| committer |   Jaroslav Kysela <perex@perex.cz> | 2008-01-31 17:30:00 +0100 |
| commit | e85e09250ab552fab6925bcde7c77746101b2d40 (patch) | |
| tree | 4ca130f7c846aaa8069d7d71a91ceabf2f5af22b /sound/pci/oxygen/oxygen.c | |
| parent | [ALSA] oxygen: make SPI configuration configurable (diff) | |
| download | linux-dev-e85e09250ab552fab6925bcde7c77746101b2d40.tar.xz linux-dev-e85e09250ab552fab6925bcde7c77746101b2d40.zip | |
[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 = { .update_dac_volume = update_ak4396_volume, .update_dac_mute = update_ak4396_mute, .dac_tlv = ak4396_db_scale, + .used_channels = OXYGEN_CHANNEL_A | + OXYGEN_CHANNEL_C | + OXYGEN_CHANNEL_SPDIF | + OXYGEN_CHANNEL_MULTICH | + OXYGEN_CHANNEL_AC97, .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, }; static const struct oxygen_model model_meridian = { @@ -270,7 +275,11 @@ static const struct oxygen_model model_meridian = { .update_dac_volume = update_ak4396_volume, .update_dac_mute = update_ak4396_mute, .dac_tlv = ak4396_db_scale, - .record_from_dma_b = 1, + .used_channels = OXYGEN_CHANNEL_B | + OXYGEN_CHANNEL_C | + OXYGEN_CHANNEL_SPDIF | + OXYGEN_CHANNEL_MULTICH | + OXYGEN_CHANNEL_AC97, .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, }; |