diff options
-rw-r--r-- | sound/atmel/ac97c.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sound/atmel/ac97c.h b/sound/atmel/ac97c.h index c17bd5825980..ecbba5021c80 100644 --- a/sound/atmel/ac97c.h +++ b/sound/atmel/ac97c.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Register definitions for the Atmel AC97C controller | 2 | * Register definitions for Atmel AC97C |
3 | * | 3 | * |
4 | * Copyright (C) 2005-2009 Atmel Corporation | 4 | * Copyright (C) 2005-2009 Atmel Corporation |
5 | * | 5 | * |
@@ -17,10 +17,6 @@ | |||
17 | #define AC97C_CATHR 0x24 | 17 | #define AC97C_CATHR 0x24 |
18 | #define AC97C_CASR 0x28 | 18 | #define AC97C_CASR 0x28 |
19 | #define AC97C_CAMR 0x2c | 19 | #define AC97C_CAMR 0x2c |
20 | #define AC97C_CBRHR 0x30 | ||
21 | #define AC97C_CBTHR 0x34 | ||
22 | #define AC97C_CBSR 0x38 | ||
23 | #define AC97C_CBMR 0x3c | ||
24 | #define AC97C_CORHR 0x40 | 20 | #define AC97C_CORHR 0x40 |
25 | #define AC97C_COTHR 0x44 | 21 | #define AC97C_COTHR 0x44 |
26 | #define AC97C_COSR 0x48 | 22 | #define AC97C_COSR 0x48 |
@@ -46,8 +42,10 @@ | |||
46 | #define AC97C_MR_VRA (1 << 2) | 42 | #define AC97C_MR_VRA (1 << 2) |
47 | 43 | ||
48 | #define AC97C_CSR_TXRDY (1 << 0) | 44 | #define AC97C_CSR_TXRDY (1 << 0) |
45 | #define AC97C_CSR_TXEMPTY (1 << 1) | ||
49 | #define AC97C_CSR_UNRUN (1 << 2) | 46 | #define AC97C_CSR_UNRUN (1 << 2) |
50 | #define AC97C_CSR_RXRDY (1 << 4) | 47 | #define AC97C_CSR_RXRDY (1 << 4) |
48 | #define AC97C_CSR_OVRUN (1 << 5) | ||
51 | #define AC97C_CSR_ENDTX (1 << 10) | 49 | #define AC97C_CSR_ENDTX (1 << 10) |
52 | #define AC97C_CSR_ENDRX (1 << 14) | 50 | #define AC97C_CSR_ENDRX (1 << 14) |
53 | 51 | ||
@@ -61,11 +59,15 @@ | |||
61 | #define AC97C_CMR_DMAEN (1 << 22) | 59 | #define AC97C_CMR_DMAEN (1 << 22) |
62 | 60 | ||
63 | #define AC97C_SR_CAEVT (1 << 3) | 61 | #define AC97C_SR_CAEVT (1 << 3) |
62 | #define AC97C_SR_COEVT (1 << 2) | ||
63 | #define AC97C_SR_WKUP (1 << 1) | ||
64 | #define AC97C_SR_SOF (1 << 0) | ||
64 | 65 | ||
66 | #define AC97C_CH_MASK(slot) \ | ||
67 | (0x7 << (3 * (AC97_SLOT_##slot - 3))) | ||
65 | #define AC97C_CH_ASSIGN(slot, channel) \ | 68 | #define AC97C_CH_ASSIGN(slot, channel) \ |
66 | (AC97C_CHANNEL_##channel << (3 * (AC97_SLOT_##slot - 3))) | 69 | (AC97C_CHANNEL_##channel << (3 * (AC97_SLOT_##slot - 3))) |
67 | #define AC97C_CHANNEL_NONE 0x0 | 70 | #define AC97C_CHANNEL_NONE 0x0 |
68 | #define AC97C_CHANNEL_A 0x1 | 71 | #define AC97C_CHANNEL_A 0x1 |
69 | #define AC97C_CHANNEL_B 0x2 | ||
70 | 72 | ||
71 | #endif /* __SOUND_ATMEL_AC97C_H */ | 73 | #endif /* __SOUND_ATMEL_AC97C_H */ |