diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-06-05 03:26:41 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-06-05 03:26:41 -0400 |
commit | 6d74b86d3c0f9cfa949566a862aaad840e393249 (patch) | |
tree | c375d4eb75308e877111ea88b812edbc5d50aa44 /sound/pci/ctxfi/cthw20k1.c | |
parent | bd05dbd3b22612455283610b4e006ee3e421b13d (diff) |
ALSA: ctxfi - Allow 64bit DMA
emu20kx chips support 64bit address PTE. Allow the DMA bit mask to
accept 64bit address, too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ctxfi/cthw20k1.c')
-rw-r--r-- | sound/pci/ctxfi/cthw20k1.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sound/pci/ctxfi/cthw20k1.c b/sound/pci/ctxfi/cthw20k1.c index b7b8e6f41d0d..1da1f82fe812 100644 --- a/sound/pci/ctxfi/cthw20k1.c +++ b/sound/pci/ctxfi/cthw20k1.c | |||
@@ -15,8 +15,6 @@ | |||
15 | * | 15 | * |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include "cthw20k1.h" | ||
19 | #include "ct20k1reg.h" | ||
20 | #include <linux/types.h> | 18 | #include <linux/types.h> |
21 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
22 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
@@ -26,8 +24,14 @@ | |||
26 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
27 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
28 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
27 | #include "cthw20k1.h" | ||
28 | #include "ct20k1reg.h" | ||
29 | 29 | ||
30 | #define CT_XFI_DMA_MASK DMA_BIT_MASK(32) /* 32 bits */ | 30 | #if BITS_PER_LONG == 32 |
31 | #define CT_XFI_DMA_MASK DMA_BIT_MASK(32) /* 32 bit PTE */ | ||
32 | #else | ||
33 | #define CT_XFI_DMA_MASK DMA_BIT_MASK(64) /* 64 bit PTE */ | ||
34 | #endif | ||
31 | 35 | ||
32 | struct hw20k1 { | 36 | struct hw20k1 { |
33 | struct hw hw; | 37 | struct hw hw; |