tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ALSA: snd-atmel-ac97c: cleanup register definitions
This patch will remove traces of channel B registers, since they are not
used by the AC97C driver. Channel B might be used for other purposes.
The driver also adds channel status bits TXEMPTY and OVRUN and a
AC97C_CH_MASK macro to ease clearing a channel settings.
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
authored by
Hans-Christian Egtvedt
and committed by
Takashi Iwai
8321fc01
0221c81b
+8
-6
+8
-6
sound/atmel/ac97c.h
+8
-6
sound/atmel/ac97c.h
···
1
1
/*
2
-
* Register definitions for the Atmel AC97C controller
2
+
* Register definitions for Atmel AC97C
3
3
*
4
4
* Copyright (C) 2005-2009 Atmel Corporation
5
5
*
···
17
17
#define AC97C_CATHR 0x24
18
18
#define AC97C_CASR 0x28
19
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
20
#define AC97C_CORHR 0x40
25
21
#define AC97C_COTHR 0x44
26
22
#define AC97C_COSR 0x48
···
42
46
#define AC97C_MR_VRA (1 << 2)
43
47
44
48
#define AC97C_CSR_TXRDY (1 << 0)
49
+
#define AC97C_CSR_TXEMPTY (1 << 1)
45
50
#define AC97C_CSR_UNRUN (1 << 2)
46
51
#define AC97C_CSR_RXRDY (1 << 4)
52
+
#define AC97C_CSR_OVRUN (1 << 5)
47
53
#define AC97C_CSR_ENDTX (1 << 10)
48
54
#define AC97C_CSR_ENDRX (1 << 14)
49
55
···
59
61
#define AC97C_CMR_DMAEN (1 << 22)
60
62
61
63
#define AC97C_SR_CAEVT (1 << 3)
64
+
#define AC97C_SR_COEVT (1 << 2)
65
+
#define AC97C_SR_WKUP (1 << 1)
66
+
#define AC97C_SR_SOF (1 << 0)
62
67
68
+
#define AC97C_CH_MASK(slot) \
69
+
(0x7 << (3 * (AC97_SLOT_##slot - 3)))
63
70
#define AC97C_CH_ASSIGN(slot, channel) \
64
71
(AC97C_CHANNEL_##channel << (3 * (AC97_SLOT_##slot - 3)))
65
72
#define AC97C_CHANNEL_NONE 0x0
66
73
#define AC97C_CHANNEL_A 0x1
67
-
#define AC97C_CHANNEL_B 0x2
68
74
69
75
#endif /* __SOUND_ATMEL_AC97C_H */