Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 396f739e21f3b7ea9ece08bf0abf0a45693c3047

Authored by Karsten Wiese
Committed by Jaroslav Kysela
1 parent d4199f0175
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[ALSA] via82xx - Default to variable samplerate enabled for MSI K8T Neo2-FI 

Default to variable samplerate enabled for MSI K8T Neo2-FI
No crackles here with 44100.

Signed-off-by: Karsten Wiese <annabellesgarden@yahoo.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 1 changed file with 1 additions and 1 deletions Inline Diff

1 /* 1 /*
2 * ALSA driver for VIA VT82xx (South Bridge) 2 * ALSA driver for VIA VT82xx (South Bridge)
3 * 3 *
4 * VT82C686A/B/C, VT8233A/C, VT8235 4 * VT82C686A/B/C, VT8233A/C, VT8235
5 * 5 *
6 * Copyright (c) 2000 Jaroslav Kysela <perex@suse.cz> 6 * Copyright (c) 2000 Jaroslav Kysela <perex@suse.cz>
7 * Tjeerd.Mulder <Tjeerd.Mulder@fujitsu-siemens.com> 7 * Tjeerd.Mulder <Tjeerd.Mulder@fujitsu-siemens.com>
8 * 2002 Takashi Iwai <tiwai@suse.de> 8 * 2002 Takashi Iwai <tiwai@suse.de>
9 * 9 *
10 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License as published by 11 * it under the terms of the GNU General Public License as published by
12 * the Free Software Foundation; either version 2 of the License, or 12 * the Free Software Foundation; either version 2 of the License, or
13 * (at your option) any later version. 13 * (at your option) any later version.
14 * 14 *
15 * This program is distributed in the hope that it will be useful, 15 * This program is distributed in the hope that it will be useful,
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of 16 * but WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18 * GNU General Public License for more details. 18 * GNU General Public License for more details.
19 * 19 *
20 * You should have received a copy of the GNU General Public License 20 * You should have received a copy of the GNU General Public License
21 * along with this program; if not, write to the Free Software 21 * along with this program; if not, write to the Free Software
22 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 22 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
23 * 23 *
24 */ 24 */
25 25
26 /* 26 /*
27 * Changes: 27 * Changes:
28 * 28 *
29 * Dec. 19, 2002 Takashi Iwai <tiwai@suse.de> 29 * Dec. 19, 2002 Takashi Iwai <tiwai@suse.de>
30 * - use the DSX channels for the first pcm playback. 30 * - use the DSX channels for the first pcm playback.
31 * (on VIA8233, 8233C and 8235 only) 31 * (on VIA8233, 8233C and 8235 only)
32 * this will allow you play simultaneously up to 4 streams. 32 * this will allow you play simultaneously up to 4 streams.
33 * multi-channel playback is assigned to the second device 33 * multi-channel playback is assigned to the second device
34 * on these chips. 34 * on these chips.
35 * - support the secondary capture (on VIA8233/C,8235) 35 * - support the secondary capture (on VIA8233/C,8235)
36 * - SPDIF support 36 * - SPDIF support
37 * the DSX3 channel can be used for SPDIF output. 37 * the DSX3 channel can be used for SPDIF output.
38 * on VIA8233A, this channel is assigned to the second pcm 38 * on VIA8233A, this channel is assigned to the second pcm
39 * playback. 39 * playback.
40 * the card config of alsa-lib will assign the correct 40 * the card config of alsa-lib will assign the correct
41 * device for applications. 41 * device for applications.
42 * - clean up the code, separate low-level initialization 42 * - clean up the code, separate low-level initialization
43 * routines for each chipset. 43 * routines for each chipset.
44 * 44 *
45 * Sep. 26, 2005 Karsten Wiese <annabellesgarden@yahoo.de> 45 * Sep. 26, 2005 Karsten Wiese <annabellesgarden@yahoo.de>
46 * - Optimize position calculation for the 823x chips. 46 * - Optimize position calculation for the 823x chips.
47 */ 47 */
48 48
49 #include <sound/driver.h> 49 #include <sound/driver.h>
50 #include <asm/io.h> 50 #include <asm/io.h>
51 #include <linux/delay.h> 51 #include <linux/delay.h>
52 #include <linux/interrupt.h> 52 #include <linux/interrupt.h>
53 #include <linux/init.h> 53 #include <linux/init.h>
54 #include <linux/pci.h> 54 #include <linux/pci.h>
55 #include <linux/slab.h> 55 #include <linux/slab.h>
56 #include <linux/gameport.h> 56 #include <linux/gameport.h>
57 #include <linux/moduleparam.h> 57 #include <linux/moduleparam.h>
58 #include <sound/core.h> 58 #include <sound/core.h>
59 #include <sound/pcm.h> 59 #include <sound/pcm.h>
60 #include <sound/pcm_params.h> 60 #include <sound/pcm_params.h>
61 #include <sound/info.h> 61 #include <sound/info.h>
62 #include <sound/ac97_codec.h> 62 #include <sound/ac97_codec.h>
63 #include <sound/mpu401.h> 63 #include <sound/mpu401.h>
64 #include <sound/initval.h> 64 #include <sound/initval.h>
65 65
66 #if 0 66 #if 0
67 #define POINTER_DEBUG 67 #define POINTER_DEBUG
68 #endif 68 #endif
69 69
70 MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>"); 70 MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
71 MODULE_DESCRIPTION("VIA VT82xx audio"); 71 MODULE_DESCRIPTION("VIA VT82xx audio");
72 MODULE_LICENSE("GPL"); 72 MODULE_LICENSE("GPL");
73 MODULE_SUPPORTED_DEVICE("{{VIA,VT82C686A/B/C,pci},{VIA,VT8233A/C,8235}}"); 73 MODULE_SUPPORTED_DEVICE("{{VIA,VT82C686A/B/C,pci},{VIA,VT8233A/C,8235}}");
74 74
75 #if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) 75 #if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
76 #define SUPPORT_JOYSTICK 1 76 #define SUPPORT_JOYSTICK 1
77 #endif 77 #endif
78 78
79 static int index = SNDRV_DEFAULT_IDX1; /* Index 0-MAX */ 79 static int index = SNDRV_DEFAULT_IDX1; /* Index 0-MAX */
80 static char *id = SNDRV_DEFAULT_STR1; /* ID for this card */ 80 static char *id = SNDRV_DEFAULT_STR1; /* ID for this card */
81 static long mpu_port; 81 static long mpu_port;
82 #ifdef SUPPORT_JOYSTICK 82 #ifdef SUPPORT_JOYSTICK
83 static int joystick; 83 static int joystick;
84 #endif 84 #endif
85 static int ac97_clock = 48000; 85 static int ac97_clock = 48000;
86 static char *ac97_quirk; 86 static char *ac97_quirk;
87 static int dxs_support; 87 static int dxs_support;
88 88
89 module_param(index, int, 0444); 89 module_param(index, int, 0444);
90 MODULE_PARM_DESC(index, "Index value for VIA 82xx bridge."); 90 MODULE_PARM_DESC(index, "Index value for VIA 82xx bridge.");
91 module_param(id, charp, 0444); 91 module_param(id, charp, 0444);
92 MODULE_PARM_DESC(id, "ID string for VIA 82xx bridge."); 92 MODULE_PARM_DESC(id, "ID string for VIA 82xx bridge.");
93 module_param(mpu_port, long, 0444); 93 module_param(mpu_port, long, 0444);
94 MODULE_PARM_DESC(mpu_port, "MPU-401 port. (VT82C686x only)"); 94 MODULE_PARM_DESC(mpu_port, "MPU-401 port. (VT82C686x only)");
95 #ifdef SUPPORT_JOYSTICK 95 #ifdef SUPPORT_JOYSTICK
96 module_param(joystick, bool, 0444); 96 module_param(joystick, bool, 0444);
97 MODULE_PARM_DESC(joystick, "Enable joystick. (VT82C686x only)"); 97 MODULE_PARM_DESC(joystick, "Enable joystick. (VT82C686x only)");
98 #endif 98 #endif
99 module_param(ac97_clock, int, 0444); 99 module_param(ac97_clock, int, 0444);
100 MODULE_PARM_DESC(ac97_clock, "AC'97 codec clock (default 48000Hz)."); 100 MODULE_PARM_DESC(ac97_clock, "AC'97 codec clock (default 48000Hz).");
101 module_param(ac97_quirk, charp, 0444); 101 module_param(ac97_quirk, charp, 0444);
102 MODULE_PARM_DESC(ac97_quirk, "AC'97 workaround for strange hardware."); 102 MODULE_PARM_DESC(ac97_quirk, "AC'97 workaround for strange hardware.");
103 module_param(dxs_support, int, 0444); 103 module_param(dxs_support, int, 0444);
104 MODULE_PARM_DESC(dxs_support, "Support for DXS channels (0 = auto, 1 = enable, 2 = disable, 3 = 48k only, 4 = no VRA, 5 = enable any sample rate)"); 104 MODULE_PARM_DESC(dxs_support, "Support for DXS channels (0 = auto, 1 = enable, 2 = disable, 3 = 48k only, 4 = no VRA, 5 = enable any sample rate)");
105 105
106 /* just for backward compatibility */ 106 /* just for backward compatibility */
107 static int enable; 107 static int enable;
108 module_param(enable, bool, 0444); 108 module_param(enable, bool, 0444);
109 109
110 110
111 /* revision numbers for via686 */ 111 /* revision numbers for via686 */
112 #define VIA_REV_686_A 0x10 112 #define VIA_REV_686_A 0x10
113 #define VIA_REV_686_B 0x11 113 #define VIA_REV_686_B 0x11
114 #define VIA_REV_686_C 0x12 114 #define VIA_REV_686_C 0x12
115 #define VIA_REV_686_D 0x13 115 #define VIA_REV_686_D 0x13
116 #define VIA_REV_686_E 0x14 116 #define VIA_REV_686_E 0x14
117 #define VIA_REV_686_H 0x20 117 #define VIA_REV_686_H 0x20
118 118
119 /* revision numbers for via8233 */ 119 /* revision numbers for via8233 */
120 #define VIA_REV_PRE_8233 0x10 /* not in market */ 120 #define VIA_REV_PRE_8233 0x10 /* not in market */
121 #define VIA_REV_8233C 0x20 /* 2 rec, 4 pb, 1 multi-pb */ 121 #define VIA_REV_8233C 0x20 /* 2 rec, 4 pb, 1 multi-pb */
122 #define VIA_REV_8233 0x30 /* 2 rec, 4 pb, 1 multi-pb, spdif */ 122 #define VIA_REV_8233 0x30 /* 2 rec, 4 pb, 1 multi-pb, spdif */
123 #define VIA_REV_8233A 0x40 /* 1 rec, 1 multi-pb, spdf */ 123 #define VIA_REV_8233A 0x40 /* 1 rec, 1 multi-pb, spdf */
124 #define VIA_REV_8235 0x50 /* 2 rec, 4 pb, 1 multi-pb, spdif */ 124 #define VIA_REV_8235 0x50 /* 2 rec, 4 pb, 1 multi-pb, spdif */
125 #define VIA_REV_8237 0x60 125 #define VIA_REV_8237 0x60
126 #define VIA_REV_8251 0x70 126 #define VIA_REV_8251 0x70
127 127
128 /* 128 /*
129 * Direct registers 129 * Direct registers
130 */ 130 */
131 131
132 #define VIAREG(via, x) ((via)->port + VIA_REG_##x) 132 #define VIAREG(via, x) ((via)->port + VIA_REG_##x)
133 #define VIADEV_REG(viadev, x) ((viadev)->port + VIA_REG_##x) 133 #define VIADEV_REG(viadev, x) ((viadev)->port + VIA_REG_##x)
134 134
135 /* common offsets */ 135 /* common offsets */
136 #define VIA_REG_OFFSET_STATUS 0x00 /* byte - channel status */ 136 #define VIA_REG_OFFSET_STATUS 0x00 /* byte - channel status */
137 #define VIA_REG_STAT_ACTIVE 0x80 /* RO */ 137 #define VIA_REG_STAT_ACTIVE 0x80 /* RO */
138 #define VIA8233_SHADOW_STAT_ACTIVE 0x08 /* RO */ 138 #define VIA8233_SHADOW_STAT_ACTIVE 0x08 /* RO */
139 #define VIA_REG_STAT_PAUSED 0x40 /* RO */ 139 #define VIA_REG_STAT_PAUSED 0x40 /* RO */
140 #define VIA_REG_STAT_TRIGGER_QUEUED 0x08 /* RO */ 140 #define VIA_REG_STAT_TRIGGER_QUEUED 0x08 /* RO */
141 #define VIA_REG_STAT_STOPPED 0x04 /* RWC */ 141 #define VIA_REG_STAT_STOPPED 0x04 /* RWC */
142 #define VIA_REG_STAT_EOL 0x02 /* RWC */ 142 #define VIA_REG_STAT_EOL 0x02 /* RWC */
143 #define VIA_REG_STAT_FLAG 0x01 /* RWC */ 143 #define VIA_REG_STAT_FLAG 0x01 /* RWC */
144 #define VIA_REG_OFFSET_CONTROL 0x01 /* byte - channel control */ 144 #define VIA_REG_OFFSET_CONTROL 0x01 /* byte - channel control */
145 #define VIA_REG_CTRL_START 0x80 /* WO */ 145 #define VIA_REG_CTRL_START 0x80 /* WO */
146 #define VIA_REG_CTRL_TERMINATE 0x40 /* WO */ 146 #define VIA_REG_CTRL_TERMINATE 0x40 /* WO */
147 #define VIA_REG_CTRL_AUTOSTART 0x20 147 #define VIA_REG_CTRL_AUTOSTART 0x20
148 #define VIA_REG_CTRL_PAUSE 0x08 /* RW */ 148 #define VIA_REG_CTRL_PAUSE 0x08 /* RW */
149 #define VIA_REG_CTRL_INT_STOP 0x04 149 #define VIA_REG_CTRL_INT_STOP 0x04
150 #define VIA_REG_CTRL_INT_EOL 0x02 150 #define VIA_REG_CTRL_INT_EOL 0x02
151 #define VIA_REG_CTRL_INT_FLAG 0x01 151 #define VIA_REG_CTRL_INT_FLAG 0x01
152 #define VIA_REG_CTRL_RESET 0x01 /* RW - probably reset? undocumented */ 152 #define VIA_REG_CTRL_RESET 0x01 /* RW - probably reset? undocumented */
153 #define VIA_REG_CTRL_INT (VIA_REG_CTRL_INT_FLAG | VIA_REG_CTRL_INT_EOL | VIA_REG_CTRL_AUTOSTART) 153 #define VIA_REG_CTRL_INT (VIA_REG_CTRL_INT_FLAG | VIA_REG_CTRL_INT_EOL | VIA_REG_CTRL_AUTOSTART)
154 #define VIA_REG_OFFSET_TYPE 0x02 /* byte - channel type (686 only) */ 154 #define VIA_REG_OFFSET_TYPE 0x02 /* byte - channel type (686 only) */
155 #define VIA_REG_TYPE_AUTOSTART 0x80 /* RW - autostart at EOL */ 155 #define VIA_REG_TYPE_AUTOSTART 0x80 /* RW - autostart at EOL */
156 #define VIA_REG_TYPE_16BIT 0x20 /* RW */ 156 #define VIA_REG_TYPE_16BIT 0x20 /* RW */
157 #define VIA_REG_TYPE_STEREO 0x10 /* RW */ 157 #define VIA_REG_TYPE_STEREO 0x10 /* RW */
158 #define VIA_REG_TYPE_INT_LLINE 0x00 158 #define VIA_REG_TYPE_INT_LLINE 0x00
159 #define VIA_REG_TYPE_INT_LSAMPLE 0x04 159 #define VIA_REG_TYPE_INT_LSAMPLE 0x04
160 #define VIA_REG_TYPE_INT_LESSONE 0x08 160 #define VIA_REG_TYPE_INT_LESSONE 0x08
161 #define VIA_REG_TYPE_INT_MASK 0x0c 161 #define VIA_REG_TYPE_INT_MASK 0x0c
162 #define VIA_REG_TYPE_INT_EOL 0x02 162 #define VIA_REG_TYPE_INT_EOL 0x02
163 #define VIA_REG_TYPE_INT_FLAG 0x01 163 #define VIA_REG_TYPE_INT_FLAG 0x01
164 #define VIA_REG_OFFSET_TABLE_PTR 0x04 /* dword - channel table pointer */ 164 #define VIA_REG_OFFSET_TABLE_PTR 0x04 /* dword - channel table pointer */
165 #define VIA_REG_OFFSET_CURR_PTR 0x04 /* dword - channel current pointer */ 165 #define VIA_REG_OFFSET_CURR_PTR 0x04 /* dword - channel current pointer */
166 #define VIA_REG_OFFSET_STOP_IDX 0x08 /* dword - stop index, channel type, sample rate */ 166 #define VIA_REG_OFFSET_STOP_IDX 0x08 /* dword - stop index, channel type, sample rate */
167 #define VIA8233_REG_TYPE_16BIT 0x00200000 /* RW */ 167 #define VIA8233_REG_TYPE_16BIT 0x00200000 /* RW */
168 #define VIA8233_REG_TYPE_STEREO 0x00100000 /* RW */ 168 #define VIA8233_REG_TYPE_STEREO 0x00100000 /* RW */
169 #define VIA_REG_OFFSET_CURR_COUNT 0x0c /* dword - channel current count (24 bit) */ 169 #define VIA_REG_OFFSET_CURR_COUNT 0x0c /* dword - channel current count (24 bit) */
170 #define VIA_REG_OFFSET_CURR_INDEX 0x0f /* byte - channel current index (for via8233 only) */ 170 #define VIA_REG_OFFSET_CURR_INDEX 0x0f /* byte - channel current index (for via8233 only) */
171 171
172 #define DEFINE_VIA_REGSET(name,val) \ 172 #define DEFINE_VIA_REGSET(name,val) \
173 enum {\ 173 enum {\
174 VIA_REG_##name##_STATUS = (val),\ 174 VIA_REG_##name##_STATUS = (val),\
175 VIA_REG_##name##_CONTROL = (val) + 0x01,\ 175 VIA_REG_##name##_CONTROL = (val) + 0x01,\
176 VIA_REG_##name##_TYPE = (val) + 0x02,\ 176 VIA_REG_##name##_TYPE = (val) + 0x02,\
177 VIA_REG_##name##_TABLE_PTR = (val) + 0x04,\ 177 VIA_REG_##name##_TABLE_PTR = (val) + 0x04,\
178 VIA_REG_##name##_CURR_PTR = (val) + 0x04,\ 178 VIA_REG_##name##_CURR_PTR = (val) + 0x04,\
179 VIA_REG_##name##_STOP_IDX = (val) + 0x08,\ 179 VIA_REG_##name##_STOP_IDX = (val) + 0x08,\
180 VIA_REG_##name##_CURR_COUNT = (val) + 0x0c,\ 180 VIA_REG_##name##_CURR_COUNT = (val) + 0x0c,\
181 } 181 }
182 182
183 /* playback block */ 183 /* playback block */
184 DEFINE_VIA_REGSET(PLAYBACK, 0x00); 184 DEFINE_VIA_REGSET(PLAYBACK, 0x00);
185 DEFINE_VIA_REGSET(CAPTURE, 0x10); 185 DEFINE_VIA_REGSET(CAPTURE, 0x10);
186 DEFINE_VIA_REGSET(FM, 0x20); 186 DEFINE_VIA_REGSET(FM, 0x20);
187 187
188 /* AC'97 */ 188 /* AC'97 */
189 #define VIA_REG_AC97 0x80 /* dword */ 189 #define VIA_REG_AC97 0x80 /* dword */
190 #define VIA_REG_AC97_CODEC_ID_MASK (3<<30) 190 #define VIA_REG_AC97_CODEC_ID_MASK (3<<30)
191 #define VIA_REG_AC97_CODEC_ID_SHIFT 30 191 #define VIA_REG_AC97_CODEC_ID_SHIFT 30
192 #define VIA_REG_AC97_CODEC_ID_PRIMARY 0x00 192 #define VIA_REG_AC97_CODEC_ID_PRIMARY 0x00
193 #define VIA_REG_AC97_CODEC_ID_SECONDARY 0x01 193 #define VIA_REG_AC97_CODEC_ID_SECONDARY 0x01
194 #define VIA_REG_AC97_SECONDARY_VALID (1<<27) 194 #define VIA_REG_AC97_SECONDARY_VALID (1<<27)
195 #define VIA_REG_AC97_PRIMARY_VALID (1<<25) 195 #define VIA_REG_AC97_PRIMARY_VALID (1<<25)
196 #define VIA_REG_AC97_BUSY (1<<24) 196 #define VIA_REG_AC97_BUSY (1<<24)
197 #define VIA_REG_AC97_READ (1<<23) 197 #define VIA_REG_AC97_READ (1<<23)
198 #define VIA_REG_AC97_CMD_SHIFT 16 198 #define VIA_REG_AC97_CMD_SHIFT 16
199 #define VIA_REG_AC97_CMD_MASK 0x7e 199 #define VIA_REG_AC97_CMD_MASK 0x7e
200 #define VIA_REG_AC97_DATA_SHIFT 0 200 #define VIA_REG_AC97_DATA_SHIFT 0
201 #define VIA_REG_AC97_DATA_MASK 0xffff 201 #define VIA_REG_AC97_DATA_MASK 0xffff
202 202
203 #define VIA_REG_SGD_SHADOW 0x84 /* dword */ 203 #define VIA_REG_SGD_SHADOW 0x84 /* dword */
204 /* via686 */ 204 /* via686 */
205 #define VIA_REG_SGD_STAT_PB_FLAG (1<<0) 205 #define VIA_REG_SGD_STAT_PB_FLAG (1<<0)
206 #define VIA_REG_SGD_STAT_CP_FLAG (1<<1) 206 #define VIA_REG_SGD_STAT_CP_FLAG (1<<1)
207 #define VIA_REG_SGD_STAT_FM_FLAG (1<<2) 207 #define VIA_REG_SGD_STAT_FM_FLAG (1<<2)
208 #define VIA_REG_SGD_STAT_PB_EOL (1<<4) 208 #define VIA_REG_SGD_STAT_PB_EOL (1<<4)
209 #define VIA_REG_SGD_STAT_CP_EOL (1<<5) 209 #define VIA_REG_SGD_STAT_CP_EOL (1<<5)
210 #define VIA_REG_SGD_STAT_FM_EOL (1<<6) 210 #define VIA_REG_SGD_STAT_FM_EOL (1<<6)
211 #define VIA_REG_SGD_STAT_PB_STOP (1<<8) 211 #define VIA_REG_SGD_STAT_PB_STOP (1<<8)
212 #define VIA_REG_SGD_STAT_CP_STOP (1<<9) 212 #define VIA_REG_SGD_STAT_CP_STOP (1<<9)
213 #define VIA_REG_SGD_STAT_FM_STOP (1<<10) 213 #define VIA_REG_SGD_STAT_FM_STOP (1<<10)
214 #define VIA_REG_SGD_STAT_PB_ACTIVE (1<<12) 214 #define VIA_REG_SGD_STAT_PB_ACTIVE (1<<12)
215 #define VIA_REG_SGD_STAT_CP_ACTIVE (1<<13) 215 #define VIA_REG_SGD_STAT_CP_ACTIVE (1<<13)
216 #define VIA_REG_SGD_STAT_FM_ACTIVE (1<<14) 216 #define VIA_REG_SGD_STAT_FM_ACTIVE (1<<14)
217 /* via8233 */ 217 /* via8233 */
218 #define VIA8233_REG_SGD_STAT_FLAG (1<<0) 218 #define VIA8233_REG_SGD_STAT_FLAG (1<<0)
219 #define VIA8233_REG_SGD_STAT_EOL (1<<1) 219 #define VIA8233_REG_SGD_STAT_EOL (1<<1)
220 #define VIA8233_REG_SGD_STAT_STOP (1<<2) 220 #define VIA8233_REG_SGD_STAT_STOP (1<<2)
221 #define VIA8233_REG_SGD_STAT_ACTIVE (1<<3) 221 #define VIA8233_REG_SGD_STAT_ACTIVE (1<<3)
222 #define VIA8233_INTR_MASK(chan) ((VIA8233_REG_SGD_STAT_FLAG|VIA8233_REG_SGD_STAT_EOL) << ((chan) * 4)) 222 #define VIA8233_INTR_MASK(chan) ((VIA8233_REG_SGD_STAT_FLAG|VIA8233_REG_SGD_STAT_EOL) << ((chan) * 4))
223 #define VIA8233_REG_SGD_CHAN_SDX 0 223 #define VIA8233_REG_SGD_CHAN_SDX 0
224 #define VIA8233_REG_SGD_CHAN_MULTI 4 224 #define VIA8233_REG_SGD_CHAN_MULTI 4
225 #define VIA8233_REG_SGD_CHAN_REC 6 225 #define VIA8233_REG_SGD_CHAN_REC 6
226 #define VIA8233_REG_SGD_CHAN_REC1 7 226 #define VIA8233_REG_SGD_CHAN_REC1 7
227 227
228 #define VIA_REG_GPI_STATUS 0x88 228 #define VIA_REG_GPI_STATUS 0x88
229 #define VIA_REG_GPI_INTR 0x8c 229 #define VIA_REG_GPI_INTR 0x8c
230 230
231 /* multi-channel and capture registers for via8233 */ 231 /* multi-channel and capture registers for via8233 */
232 DEFINE_VIA_REGSET(MULTPLAY, 0x40); 232 DEFINE_VIA_REGSET(MULTPLAY, 0x40);
233 DEFINE_VIA_REGSET(CAPTURE_8233, 0x60); 233 DEFINE_VIA_REGSET(CAPTURE_8233, 0x60);
234 234
235 /* via8233-specific registers */ 235 /* via8233-specific registers */
236 #define VIA_REG_OFS_PLAYBACK_VOLUME_L 0x02 /* byte */ 236 #define VIA_REG_OFS_PLAYBACK_VOLUME_L 0x02 /* byte */
237 #define VIA_REG_OFS_PLAYBACK_VOLUME_R 0x03 /* byte */ 237 #define VIA_REG_OFS_PLAYBACK_VOLUME_R 0x03 /* byte */
238 #define VIA_REG_OFS_MULTPLAY_FORMAT 0x02 /* byte - format and channels */ 238 #define VIA_REG_OFS_MULTPLAY_FORMAT 0x02 /* byte - format and channels */
239 #define VIA_REG_MULTPLAY_FMT_8BIT 0x00 239 #define VIA_REG_MULTPLAY_FMT_8BIT 0x00
240 #define VIA_REG_MULTPLAY_FMT_16BIT 0x80 240 #define VIA_REG_MULTPLAY_FMT_16BIT 0x80
241 #define VIA_REG_MULTPLAY_FMT_CH_MASK 0x70 /* # channels << 4 (valid = 1,2,4,6) */ 241 #define VIA_REG_MULTPLAY_FMT_CH_MASK 0x70 /* # channels << 4 (valid = 1,2,4,6) */
242 #define VIA_REG_OFS_CAPTURE_FIFO 0x02 /* byte - bit 6 = fifo enable */ 242 #define VIA_REG_OFS_CAPTURE_FIFO 0x02 /* byte - bit 6 = fifo enable */
243 #define VIA_REG_CAPTURE_FIFO_ENABLE 0x40 243 #define VIA_REG_CAPTURE_FIFO_ENABLE 0x40
244 244
245 #define VIA_DXS_MAX_VOLUME 31 /* max. volume (attenuation) of reg 0x32/33 */ 245 #define VIA_DXS_MAX_VOLUME 31 /* max. volume (attenuation) of reg 0x32/33 */
246 246
247 #define VIA_REG_CAPTURE_CHANNEL 0x63 /* byte - input select */ 247 #define VIA_REG_CAPTURE_CHANNEL 0x63 /* byte - input select */
248 #define VIA_REG_CAPTURE_CHANNEL_MIC 0x4 248 #define VIA_REG_CAPTURE_CHANNEL_MIC 0x4
249 #define VIA_REG_CAPTURE_CHANNEL_LINE 0 249 #define VIA_REG_CAPTURE_CHANNEL_LINE 0
250 #define VIA_REG_CAPTURE_SELECT_CODEC 0x03 /* recording source codec (0 = primary) */ 250 #define VIA_REG_CAPTURE_SELECT_CODEC 0x03 /* recording source codec (0 = primary) */
251 251
252 #define VIA_TBL_BIT_FLAG 0x40000000 252 #define VIA_TBL_BIT_FLAG 0x40000000
253 #define VIA_TBL_BIT_EOL 0x80000000 253 #define VIA_TBL_BIT_EOL 0x80000000
254 254
255 /* pci space */ 255 /* pci space */
256 #define VIA_ACLINK_STAT 0x40 256 #define VIA_ACLINK_STAT 0x40
257 #define VIA_ACLINK_C11_READY 0x20 257 #define VIA_ACLINK_C11_READY 0x20
258 #define VIA_ACLINK_C10_READY 0x10 258 #define VIA_ACLINK_C10_READY 0x10
259 #define VIA_ACLINK_C01_READY 0x04 /* secondary codec ready */ 259 #define VIA_ACLINK_C01_READY 0x04 /* secondary codec ready */
260 #define VIA_ACLINK_LOWPOWER 0x02 /* low-power state */ 260 #define VIA_ACLINK_LOWPOWER 0x02 /* low-power state */
261 #define VIA_ACLINK_C00_READY 0x01 /* primary codec ready */ 261 #define VIA_ACLINK_C00_READY 0x01 /* primary codec ready */
262 #define VIA_ACLINK_CTRL 0x41 262 #define VIA_ACLINK_CTRL 0x41
263 #define VIA_ACLINK_CTRL_ENABLE 0x80 /* 0: disable, 1: enable */ 263 #define VIA_ACLINK_CTRL_ENABLE 0x80 /* 0: disable, 1: enable */
264 #define VIA_ACLINK_CTRL_RESET 0x40 /* 0: assert, 1: de-assert */ 264 #define VIA_ACLINK_CTRL_RESET 0x40 /* 0: assert, 1: de-assert */
265 #define VIA_ACLINK_CTRL_SYNC 0x20 /* 0: release SYNC, 1: force SYNC hi */ 265 #define VIA_ACLINK_CTRL_SYNC 0x20 /* 0: release SYNC, 1: force SYNC hi */
266 #define VIA_ACLINK_CTRL_SDO 0x10 /* 0: release SDO, 1: force SDO hi */ 266 #define VIA_ACLINK_CTRL_SDO 0x10 /* 0: release SDO, 1: force SDO hi */
267 #define VIA_ACLINK_CTRL_VRA 0x08 /* 0: disable VRA, 1: enable VRA */ 267 #define VIA_ACLINK_CTRL_VRA 0x08 /* 0: disable VRA, 1: enable VRA */
268 #define VIA_ACLINK_CTRL_PCM 0x04 /* 0: disable PCM, 1: enable PCM */ 268 #define VIA_ACLINK_CTRL_PCM 0x04 /* 0: disable PCM, 1: enable PCM */
269 #define VIA_ACLINK_CTRL_FM 0x02 /* via686 only */ 269 #define VIA_ACLINK_CTRL_FM 0x02 /* via686 only */
270 #define VIA_ACLINK_CTRL_SB 0x01 /* via686 only */ 270 #define VIA_ACLINK_CTRL_SB 0x01 /* via686 only */
271 #define VIA_ACLINK_CTRL_INIT (VIA_ACLINK_CTRL_ENABLE|\ 271 #define VIA_ACLINK_CTRL_INIT (VIA_ACLINK_CTRL_ENABLE|\
272 VIA_ACLINK_CTRL_RESET|\ 272 VIA_ACLINK_CTRL_RESET|\
273 VIA_ACLINK_CTRL_PCM|\ 273 VIA_ACLINK_CTRL_PCM|\
274 VIA_ACLINK_CTRL_VRA) 274 VIA_ACLINK_CTRL_VRA)
275 #define VIA_FUNC_ENABLE 0x42 275 #define VIA_FUNC_ENABLE 0x42
276 #define VIA_FUNC_MIDI_PNP 0x80 /* FIXME: it's 0x40 in the datasheet! */ 276 #define VIA_FUNC_MIDI_PNP 0x80 /* FIXME: it's 0x40 in the datasheet! */
277 #define VIA_FUNC_MIDI_IRQMASK 0x40 /* FIXME: not documented! */ 277 #define VIA_FUNC_MIDI_IRQMASK 0x40 /* FIXME: not documented! */
278 #define VIA_FUNC_RX2C_WRITE 0x20 278 #define VIA_FUNC_RX2C_WRITE 0x20
279 #define VIA_FUNC_SB_FIFO_EMPTY 0x10 279 #define VIA_FUNC_SB_FIFO_EMPTY 0x10
280 #define VIA_FUNC_ENABLE_GAME 0x08 280 #define VIA_FUNC_ENABLE_GAME 0x08
281 #define VIA_FUNC_ENABLE_FM 0x04 281 #define VIA_FUNC_ENABLE_FM 0x04
282 #define VIA_FUNC_ENABLE_MIDI 0x02 282 #define VIA_FUNC_ENABLE_MIDI 0x02
283 #define VIA_FUNC_ENABLE_SB 0x01 283 #define VIA_FUNC_ENABLE_SB 0x01
284 #define VIA_PNP_CONTROL 0x43 284 #define VIA_PNP_CONTROL 0x43
285 #define VIA_FM_NMI_CTRL 0x48 285 #define VIA_FM_NMI_CTRL 0x48
286 #define VIA8233_VOLCHG_CTRL 0x48 286 #define VIA8233_VOLCHG_CTRL 0x48
287 #define VIA8233_SPDIF_CTRL 0x49 287 #define VIA8233_SPDIF_CTRL 0x49
288 #define VIA8233_SPDIF_DX3 0x08 288 #define VIA8233_SPDIF_DX3 0x08
289 #define VIA8233_SPDIF_SLOT_MASK 0x03 289 #define VIA8233_SPDIF_SLOT_MASK 0x03
290 #define VIA8233_SPDIF_SLOT_1011 0x00 290 #define VIA8233_SPDIF_SLOT_1011 0x00
291 #define VIA8233_SPDIF_SLOT_34 0x01 291 #define VIA8233_SPDIF_SLOT_34 0x01
292 #define VIA8233_SPDIF_SLOT_78 0x02 292 #define VIA8233_SPDIF_SLOT_78 0x02
293 #define VIA8233_SPDIF_SLOT_69 0x03 293 #define VIA8233_SPDIF_SLOT_69 0x03
294 294
295 /* 295 /*
296 */ 296 */
297 297
298 #define VIA_DXS_AUTO 0 298 #define VIA_DXS_AUTO 0
299 #define VIA_DXS_ENABLE 1 299 #define VIA_DXS_ENABLE 1
300 #define VIA_DXS_DISABLE 2 300 #define VIA_DXS_DISABLE 2
301 #define VIA_DXS_48K 3 301 #define VIA_DXS_48K 3
302 #define VIA_DXS_NO_VRA 4 302 #define VIA_DXS_NO_VRA 4
303 #define VIA_DXS_SRC 5 303 #define VIA_DXS_SRC 5
304 304
305 305
306 /* 306 /*
307 * pcm stream 307 * pcm stream
308 */ 308 */
309 309
310 struct snd_via_sg_table { 310 struct snd_via_sg_table {
311 unsigned int offset; 311 unsigned int offset;
312 unsigned int size; 312 unsigned int size;
313 } ; 313 } ;
314 314
315 #define VIA_TABLE_SIZE 255 315 #define VIA_TABLE_SIZE 255
316 316
317 struct viadev { 317 struct viadev {
318 unsigned int reg_offset; 318 unsigned int reg_offset;
319 unsigned long port; 319 unsigned long port;
320 int direction; /* playback = 0, capture = 1 */ 320 int direction; /* playback = 0, capture = 1 */
321 struct snd_pcm_substream *substream; 321 struct snd_pcm_substream *substream;
322 int running; 322 int running;
323 unsigned int tbl_entries; /* # descriptors */ 323 unsigned int tbl_entries; /* # descriptors */
324 struct snd_dma_buffer table; 324 struct snd_dma_buffer table;
325 struct snd_via_sg_table *idx_table; 325 struct snd_via_sg_table *idx_table;
326 /* for recovery from the unexpected pointer */ 326 /* for recovery from the unexpected pointer */
327 unsigned int lastpos; 327 unsigned int lastpos;
328 unsigned int fragsize; 328 unsigned int fragsize;
329 unsigned int bufsize; 329 unsigned int bufsize;
330 unsigned int bufsize2; 330 unsigned int bufsize2;
331 int hwptr_done; /* processed frame position in the buffer */ 331 int hwptr_done; /* processed frame position in the buffer */
332 int in_interrupt; 332 int in_interrupt;
333 int shadow_shift; 333 int shadow_shift;
334 }; 334 };
335 335
336 336
337 enum { TYPE_CARD_VIA686 = 1, TYPE_CARD_VIA8233 }; 337 enum { TYPE_CARD_VIA686 = 1, TYPE_CARD_VIA8233 };
338 enum { TYPE_VIA686, TYPE_VIA8233, TYPE_VIA8233A }; 338 enum { TYPE_VIA686, TYPE_VIA8233, TYPE_VIA8233A };
339 339
340 #define VIA_MAX_DEVS 7 /* 4 playback, 1 multi, 2 capture */ 340 #define VIA_MAX_DEVS 7 /* 4 playback, 1 multi, 2 capture */
341 341
342 struct via_rate_lock { 342 struct via_rate_lock {
343 spinlock_t lock; 343 spinlock_t lock;
344 int rate; 344 int rate;
345 int used; 345 int used;
346 }; 346 };
347 347
348 struct via82xx { 348 struct via82xx {
349 int irq; 349 int irq;
350 350
351 unsigned long port; 351 unsigned long port;
352 struct resource *mpu_res; 352 struct resource *mpu_res;
353 int chip_type; 353 int chip_type;
354 unsigned char revision; 354 unsigned char revision;
355 355
356 unsigned char old_legacy; 356 unsigned char old_legacy;
357 unsigned char old_legacy_cfg; 357 unsigned char old_legacy_cfg;
358 #ifdef CONFIG_PM 358 #ifdef CONFIG_PM
359 unsigned char legacy_saved; 359 unsigned char legacy_saved;
360 unsigned char legacy_cfg_saved; 360 unsigned char legacy_cfg_saved;
361 unsigned char spdif_ctrl_saved; 361 unsigned char spdif_ctrl_saved;
362 unsigned char capture_src_saved[2]; 362 unsigned char capture_src_saved[2];
363 unsigned int mpu_port_saved; 363 unsigned int mpu_port_saved;
364 #endif 364 #endif
365 365
366 unsigned char playback_volume[4][2]; /* for VIA8233/C/8235; default = 0 */ 366 unsigned char playback_volume[4][2]; /* for VIA8233/C/8235; default = 0 */
367 unsigned char playback_volume_c[2]; /* for VIA8233/C/8235; default = 0 */ 367 unsigned char playback_volume_c[2]; /* for VIA8233/C/8235; default = 0 */
368 368
369 unsigned int intr_mask; /* SGD_SHADOW mask to check interrupts */ 369 unsigned int intr_mask; /* SGD_SHADOW mask to check interrupts */
370 370
371 struct pci_dev *pci; 371 struct pci_dev *pci;
372 struct snd_card *card; 372 struct snd_card *card;
373 373
374 unsigned int num_devs; 374 unsigned int num_devs;
375 unsigned int playback_devno, multi_devno, capture_devno; 375 unsigned int playback_devno, multi_devno, capture_devno;
376 struct viadev devs[VIA_MAX_DEVS]; 376 struct viadev devs[VIA_MAX_DEVS];
377 struct via_rate_lock rates[2]; /* playback and capture */ 377 struct via_rate_lock rates[2]; /* playback and capture */
378 unsigned int dxs_fixed: 1; /* DXS channel accepts only 48kHz */ 378 unsigned int dxs_fixed: 1; /* DXS channel accepts only 48kHz */
379 unsigned int no_vra: 1; /* no need to set VRA on DXS channels */ 379 unsigned int no_vra: 1; /* no need to set VRA on DXS channels */
380 unsigned int dxs_src: 1; /* use full SRC capabilities of DXS */ 380 unsigned int dxs_src: 1; /* use full SRC capabilities of DXS */
381 unsigned int spdif_on: 1; /* only spdif rates work to external DACs */ 381 unsigned int spdif_on: 1; /* only spdif rates work to external DACs */
382 382
383 struct snd_pcm *pcms[2]; 383 struct snd_pcm *pcms[2];
384 struct snd_rawmidi *rmidi; 384 struct snd_rawmidi *rmidi;
385 385
386 struct snd_ac97_bus *ac97_bus; 386 struct snd_ac97_bus *ac97_bus;
387 struct snd_ac97 *ac97; 387 struct snd_ac97 *ac97;
388 unsigned int ac97_clock; 388 unsigned int ac97_clock;
389 unsigned int ac97_secondary; /* secondary AC'97 codec is present */ 389 unsigned int ac97_secondary; /* secondary AC'97 codec is present */
390 390
391 spinlock_t reg_lock; 391 spinlock_t reg_lock;
392 struct snd_info_entry *proc_entry; 392 struct snd_info_entry *proc_entry;
393 393
394 #ifdef SUPPORT_JOYSTICK 394 #ifdef SUPPORT_JOYSTICK
395 struct gameport *gameport; 395 struct gameport *gameport;
396 #endif 396 #endif
397 }; 397 };
398 398
399 static struct pci_device_id snd_via82xx_ids[] __devinitdata = { 399 static struct pci_device_id snd_via82xx_ids[] __devinitdata = {
400 /* 0x1106, 0x3058 */ 400 /* 0x1106, 0x3058 */
401 { PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPE_CARD_VIA686, }, /* 686A */ 401 { PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPE_CARD_VIA686, }, /* 686A */
402 /* 0x1106, 0x3059 */ 402 /* 0x1106, 0x3059 */
403 { PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8233_5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPE_CARD_VIA8233, }, /* VT8233 */ 403 { PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8233_5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPE_CARD_VIA8233, }, /* VT8233 */
404 { 0, } 404 { 0, }
405 }; 405 };
406 406
407 MODULE_DEVICE_TABLE(pci, snd_via82xx_ids); 407 MODULE_DEVICE_TABLE(pci, snd_via82xx_ids);
408 408
409 /* 409 /*
410 */ 410 */
411 411
412 /* 412 /*
413 * allocate and initialize the descriptor buffers 413 * allocate and initialize the descriptor buffers
414 * periods = number of periods 414 * periods = number of periods
415 * fragsize = period size in bytes 415 * fragsize = period size in bytes
416 */ 416 */
417 static int build_via_table(struct viadev *dev, struct snd_pcm_substream *substream, 417 static int build_via_table(struct viadev *dev, struct snd_pcm_substream *substream,
418 struct pci_dev *pci, 418 struct pci_dev *pci,
419 unsigned int periods, unsigned int fragsize) 419 unsigned int periods, unsigned int fragsize)
420 { 420 {
421 unsigned int i, idx, ofs, rest; 421 unsigned int i, idx, ofs, rest;
422 struct via82xx *chip = snd_pcm_substream_chip(substream); 422 struct via82xx *chip = snd_pcm_substream_chip(substream);
423 struct snd_sg_buf *sgbuf = snd_pcm_substream_sgbuf(substream); 423 struct snd_sg_buf *sgbuf = snd_pcm_substream_sgbuf(substream);
424 424
425 if (dev->table.area == NULL) { 425 if (dev->table.area == NULL) {
426 /* the start of each lists must be aligned to 8 bytes, 426 /* the start of each lists must be aligned to 8 bytes,
427 * but the kernel pages are much bigger, so we don't care 427 * but the kernel pages are much bigger, so we don't care
428 */ 428 */
429 if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip->pci), 429 if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip->pci),
430 PAGE_ALIGN(VIA_TABLE_SIZE * 2 * 8), 430 PAGE_ALIGN(VIA_TABLE_SIZE * 2 * 8),
431 &dev->table) < 0) 431 &dev->table) < 0)
432 return -ENOMEM; 432 return -ENOMEM;
433 } 433 }
434 if (! dev->idx_table) { 434 if (! dev->idx_table) {
435 dev->idx_table = kmalloc(sizeof(*dev->idx_table) * VIA_TABLE_SIZE, GFP_KERNEL); 435 dev->idx_table = kmalloc(sizeof(*dev->idx_table) * VIA_TABLE_SIZE, GFP_KERNEL);
436 if (! dev->idx_table) 436 if (! dev->idx_table)
437 return -ENOMEM; 437 return -ENOMEM;
438 } 438 }
439 439
440 /* fill the entries */ 440 /* fill the entries */
441 idx = 0; 441 idx = 0;
442 ofs = 0; 442 ofs = 0;
443 for (i = 0; i < periods; i++) { 443 for (i = 0; i < periods; i++) {
444 rest = fragsize; 444 rest = fragsize;
445 /* fill descriptors for a period. 445 /* fill descriptors for a period.
446 * a period can be split to several descriptors if it's 446 * a period can be split to several descriptors if it's
447 * over page boundary. 447 * over page boundary.
448 */ 448 */
449 do { 449 do {
450 unsigned int r; 450 unsigned int r;
451 unsigned int flag; 451 unsigned int flag;
452 452
453 if (idx >= VIA_TABLE_SIZE) { 453 if (idx >= VIA_TABLE_SIZE) {
454 snd_printk(KERN_ERR "via82xx: too much table size!\n"); 454 snd_printk(KERN_ERR "via82xx: too much table size!\n");
455 return -EINVAL; 455 return -EINVAL;
456 } 456 }
457 ((u32 *)dev->table.area)[idx << 1] = cpu_to_le32((u32)snd_pcm_sgbuf_get_addr(sgbuf, ofs)); 457 ((u32 *)dev->table.area)[idx << 1] = cpu_to_le32((u32)snd_pcm_sgbuf_get_addr(sgbuf, ofs));
458 r = PAGE_SIZE - (ofs % PAGE_SIZE); 458 r = PAGE_SIZE - (ofs % PAGE_SIZE);
459 if (rest < r) 459 if (rest < r)
460 r = rest; 460 r = rest;
461 rest -= r; 461 rest -= r;
462 if (! rest) { 462 if (! rest) {
463 if (i == periods - 1) 463 if (i == periods - 1)
464 flag = VIA_TBL_BIT_EOL; /* buffer boundary */ 464 flag = VIA_TBL_BIT_EOL; /* buffer boundary */
465 else 465 else
466 flag = VIA_TBL_BIT_FLAG; /* period boundary */ 466 flag = VIA_TBL_BIT_FLAG; /* period boundary */
467 } else 467 } else
468 flag = 0; /* period continues to the next */ 468 flag = 0; /* period continues to the next */
469 // printk("via: tbl %d: at %d size %d (rest %d)\n", idx, ofs, r, rest); 469 // printk("via: tbl %d: at %d size %d (rest %d)\n", idx, ofs, r, rest);
470 ((u32 *)dev->table.area)[(idx<<1) + 1] = cpu_to_le32(r | flag); 470 ((u32 *)dev->table.area)[(idx<<1) + 1] = cpu_to_le32(r | flag);
471 dev->idx_table[idx].offset = ofs; 471 dev->idx_table[idx].offset = ofs;
472 dev->idx_table[idx].size = r; 472 dev->idx_table[idx].size = r;
473 ofs += r; 473 ofs += r;
474 idx++; 474 idx++;
475 } while (rest > 0); 475 } while (rest > 0);
476 } 476 }
477 dev->tbl_entries = idx; 477 dev->tbl_entries = idx;
478 dev->bufsize = periods * fragsize; 478 dev->bufsize = periods * fragsize;
479 dev->bufsize2 = dev->bufsize / 2; 479 dev->bufsize2 = dev->bufsize / 2;
480 dev->fragsize = fragsize; 480 dev->fragsize = fragsize;
481 return 0; 481 return 0;
482 } 482 }
483 483
484 484
485 static int clean_via_table(struct viadev *dev, struct snd_pcm_substream *substream, 485 static int clean_via_table(struct viadev *dev, struct snd_pcm_substream *substream,
486 struct pci_dev *pci) 486 struct pci_dev *pci)
487 { 487 {
488 if (dev->table.area) { 488 if (dev->table.area) {
489 snd_dma_free_pages(&dev->table); 489 snd_dma_free_pages(&dev->table);
490 dev->table.area = NULL; 490 dev->table.area = NULL;
491 } 491 }
492 kfree(dev->idx_table); 492 kfree(dev->idx_table);
493 dev->idx_table = NULL; 493 dev->idx_table = NULL;
494 return 0; 494 return 0;
495 } 495 }
496 496
497 /* 497 /*
498 * Basic I/O 498 * Basic I/O
499 */ 499 */
500 500
501 static inline unsigned int snd_via82xx_codec_xread(struct via82xx *chip) 501 static inline unsigned int snd_via82xx_codec_xread(struct via82xx *chip)
502 { 502 {
503 return inl(VIAREG(chip, AC97)); 503 return inl(VIAREG(chip, AC97));
504 } 504 }
505 505
506 static inline void snd_via82xx_codec_xwrite(struct via82xx *chip, unsigned int val) 506 static inline void snd_via82xx_codec_xwrite(struct via82xx *chip, unsigned int val)
507 { 507 {
508 outl(val, VIAREG(chip, AC97)); 508 outl(val, VIAREG(chip, AC97));
509 } 509 }
510 510
511 static int snd_via82xx_codec_ready(struct via82xx *chip, int secondary) 511 static int snd_via82xx_codec_ready(struct via82xx *chip, int secondary)
512 { 512 {
513 unsigned int timeout = 1000; /* 1ms */ 513 unsigned int timeout = 1000; /* 1ms */
514 unsigned int val; 514 unsigned int val;
515 515
516 while (timeout-- > 0) { 516 while (timeout-- > 0) {
517 udelay(1); 517 udelay(1);
518 if (!((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY)) 518 if (!((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY))
519 return val & 0xffff; 519 return val & 0xffff;
520 } 520 }
521 snd_printk(KERN_ERR "codec_ready: codec %i is not ready [0x%x]\n", 521 snd_printk(KERN_ERR "codec_ready: codec %i is not ready [0x%x]\n",
522 secondary, snd_via82xx_codec_xread(chip)); 522 secondary, snd_via82xx_codec_xread(chip));
523 return -EIO; 523 return -EIO;
524 } 524 }
525 525
526 static int snd_via82xx_codec_valid(struct via82xx *chip, int secondary) 526 static int snd_via82xx_codec_valid(struct via82xx *chip, int secondary)
527 { 527 {
528 unsigned int timeout = 1000; /* 1ms */ 528 unsigned int timeout = 1000; /* 1ms */
529 unsigned int val, val1; 529 unsigned int val, val1;
530 unsigned int stat = !secondary ? VIA_REG_AC97_PRIMARY_VALID : 530 unsigned int stat = !secondary ? VIA_REG_AC97_PRIMARY_VALID :
531 VIA_REG_AC97_SECONDARY_VALID; 531 VIA_REG_AC97_SECONDARY_VALID;
532 532
533 while (timeout-- > 0) { 533 while (timeout-- > 0) {
534 val = snd_via82xx_codec_xread(chip); 534 val = snd_via82xx_codec_xread(chip);
535 val1 = val & (VIA_REG_AC97_BUSY | stat); 535 val1 = val & (VIA_REG_AC97_BUSY | stat);
536 if (val1 == stat) 536 if (val1 == stat)
537 return val & 0xffff; 537 return val & 0xffff;
538 udelay(1); 538 udelay(1);
539 } 539 }
540 return -EIO; 540 return -EIO;
541 } 541 }
542 542
543 static void snd_via82xx_codec_wait(struct snd_ac97 *ac97) 543 static void snd_via82xx_codec_wait(struct snd_ac97 *ac97)
544 { 544 {
545 struct via82xx *chip = ac97->private_data; 545 struct via82xx *chip = ac97->private_data;
546 int err; 546 int err;
547 err = snd_via82xx_codec_ready(chip, ac97->num); 547 err = snd_via82xx_codec_ready(chip, ac97->num);
548 /* here we need to wait fairly for long time.. */ 548 /* here we need to wait fairly for long time.. */
549 msleep(500); 549 msleep(500);
550 } 550 }
551 551
552 static void snd_via82xx_codec_write(struct snd_ac97 *ac97, 552 static void snd_via82xx_codec_write(struct snd_ac97 *ac97,
553 unsigned short reg, 553 unsigned short reg,
554 unsigned short val) 554 unsigned short val)
555 { 555 {
556 struct via82xx *chip = ac97->private_data; 556 struct via82xx *chip = ac97->private_data;
557 unsigned int xval; 557 unsigned int xval;
558 558
559 xval = !ac97->num ? VIA_REG_AC97_CODEC_ID_PRIMARY : VIA_REG_AC97_CODEC_ID_SECONDARY; 559 xval = !ac97->num ? VIA_REG_AC97_CODEC_ID_PRIMARY : VIA_REG_AC97_CODEC_ID_SECONDARY;
560 xval <<= VIA_REG_AC97_CODEC_ID_SHIFT; 560 xval <<= VIA_REG_AC97_CODEC_ID_SHIFT;
561 xval |= reg << VIA_REG_AC97_CMD_SHIFT; 561 xval |= reg << VIA_REG_AC97_CMD_SHIFT;
562 xval |= val << VIA_REG_AC97_DATA_SHIFT; 562 xval |= val << VIA_REG_AC97_DATA_SHIFT;
563 snd_via82xx_codec_xwrite(chip, xval); 563 snd_via82xx_codec_xwrite(chip, xval);
564 snd_via82xx_codec_ready(chip, ac97->num); 564 snd_via82xx_codec_ready(chip, ac97->num);
565 } 565 }
566 566
567 static unsigned short snd_via82xx_codec_read(struct snd_ac97 *ac97, unsigned short reg) 567 static unsigned short snd_via82xx_codec_read(struct snd_ac97 *ac97, unsigned short reg)
568 { 568 {
569 struct via82xx *chip = ac97->private_data; 569 struct via82xx *chip = ac97->private_data;
570 unsigned int xval, val = 0xffff; 570 unsigned int xval, val = 0xffff;
571 int again = 0; 571 int again = 0;
572 572
573 xval = ac97->num << VIA_REG_AC97_CODEC_ID_SHIFT; 573 xval = ac97->num << VIA_REG_AC97_CODEC_ID_SHIFT;
574 xval |= ac97->num ? VIA_REG_AC97_SECONDARY_VALID : VIA_REG_AC97_PRIMARY_VALID; 574 xval |= ac97->num ? VIA_REG_AC97_SECONDARY_VALID : VIA_REG_AC97_PRIMARY_VALID;
575 xval |= VIA_REG_AC97_READ; 575 xval |= VIA_REG_AC97_READ;
576 xval |= (reg & 0x7f) << VIA_REG_AC97_CMD_SHIFT; 576 xval |= (reg & 0x7f) << VIA_REG_AC97_CMD_SHIFT;
577 while (1) { 577 while (1) {
578 if (again++ > 3) { 578 if (again++ > 3) {
579 snd_printk(KERN_ERR "codec_read: codec %i is not valid [0x%x]\n", 579 snd_printk(KERN_ERR "codec_read: codec %i is not valid [0x%x]\n",
580 ac97->num, snd_via82xx_codec_xread(chip)); 580 ac97->num, snd_via82xx_codec_xread(chip));
581 return 0xffff; 581 return 0xffff;
582 } 582 }
583 snd_via82xx_codec_xwrite(chip, xval); 583 snd_via82xx_codec_xwrite(chip, xval);
584 udelay (20); 584 udelay (20);
585 if (snd_via82xx_codec_valid(chip, ac97->num) >= 0) { 585 if (snd_via82xx_codec_valid(chip, ac97->num) >= 0) {
586 udelay(25); 586 udelay(25);
587 val = snd_via82xx_codec_xread(chip); 587 val = snd_via82xx_codec_xread(chip);
588 break; 588 break;
589 } 589 }
590 } 590 }
591 return val & 0xffff; 591 return val & 0xffff;
592 } 592 }
593 593
594 static void snd_via82xx_channel_reset(struct via82xx *chip, struct viadev *viadev) 594 static void snd_via82xx_channel_reset(struct via82xx *chip, struct viadev *viadev)
595 { 595 {
596 outb(VIA_REG_CTRL_PAUSE | VIA_REG_CTRL_TERMINATE | VIA_REG_CTRL_RESET, 596 outb(VIA_REG_CTRL_PAUSE | VIA_REG_CTRL_TERMINATE | VIA_REG_CTRL_RESET,
597 VIADEV_REG(viadev, OFFSET_CONTROL)); 597 VIADEV_REG(viadev, OFFSET_CONTROL));
598 inb(VIADEV_REG(viadev, OFFSET_CONTROL)); 598 inb(VIADEV_REG(viadev, OFFSET_CONTROL));
599 udelay(50); 599 udelay(50);
600 /* disable interrupts */ 600 /* disable interrupts */
601 outb(0x00, VIADEV_REG(viadev, OFFSET_CONTROL)); 601 outb(0x00, VIADEV_REG(viadev, OFFSET_CONTROL));
602 /* clear interrupts */ 602 /* clear interrupts */
603 outb(0x03, VIADEV_REG(viadev, OFFSET_STATUS)); 603 outb(0x03, VIADEV_REG(viadev, OFFSET_STATUS));
604 outb(0x00, VIADEV_REG(viadev, OFFSET_TYPE)); /* for via686 */ 604 outb(0x00, VIADEV_REG(viadev, OFFSET_TYPE)); /* for via686 */
605 // outl(0, VIADEV_REG(viadev, OFFSET_CURR_PTR)); 605 // outl(0, VIADEV_REG(viadev, OFFSET_CURR_PTR));
606 viadev->lastpos = 0; 606 viadev->lastpos = 0;
607 viadev->hwptr_done = 0; 607 viadev->hwptr_done = 0;
608 } 608 }
609 609
610 610
611 /* 611 /*
612 * Interrupt handler 612 * Interrupt handler
613 * Used for 686 and 8233A 613 * Used for 686 and 8233A
614 */ 614 */
615 static irqreturn_t snd_via686_interrupt(int irq, void *dev_id, struct pt_regs *regs) 615 static irqreturn_t snd_via686_interrupt(int irq, void *dev_id, struct pt_regs *regs)
616 { 616 {
617 struct via82xx *chip = dev_id; 617 struct via82xx *chip = dev_id;
618 unsigned int status; 618 unsigned int status;
619 unsigned int i; 619 unsigned int i;
620 620
621 status = inl(VIAREG(chip, SGD_SHADOW)); 621 status = inl(VIAREG(chip, SGD_SHADOW));
622 if (! (status & chip->intr_mask)) { 622 if (! (status & chip->intr_mask)) {
623 if (chip->rmidi) 623 if (chip->rmidi)
624 /* check mpu401 interrupt */ 624 /* check mpu401 interrupt */
625 return snd_mpu401_uart_interrupt(irq, chip->rmidi->private_data, regs); 625 return snd_mpu401_uart_interrupt(irq, chip->rmidi->private_data, regs);
626 return IRQ_NONE; 626 return IRQ_NONE;
627 } 627 }
628 628
629 /* check status for each stream */ 629 /* check status for each stream */
630 spin_lock(&chip->reg_lock); 630 spin_lock(&chip->reg_lock);
631 for (i = 0; i < chip->num_devs; i++) { 631 for (i = 0; i < chip->num_devs; i++) {
632 struct viadev *viadev = &chip->devs[i]; 632 struct viadev *viadev = &chip->devs[i];
633 unsigned char c_status = inb(VIADEV_REG(viadev, OFFSET_STATUS)); 633 unsigned char c_status = inb(VIADEV_REG(viadev, OFFSET_STATUS));
634 if (! (c_status & (VIA_REG_STAT_EOL|VIA_REG_STAT_FLAG|VIA_REG_STAT_STOPPED))) 634 if (! (c_status & (VIA_REG_STAT_EOL|VIA_REG_STAT_FLAG|VIA_REG_STAT_STOPPED)))
635 continue; 635 continue;
636 if (viadev->substream && viadev->running) { 636 if (viadev->substream && viadev->running) {
637 /* 637 /*
638 * Update hwptr_done based on 'period elapsed' 638 * Update hwptr_done based on 'period elapsed'
639 * interrupts. We'll use it, when the chip returns 0 639 * interrupts. We'll use it, when the chip returns 0
640 * for OFFSET_CURR_COUNT. 640 * for OFFSET_CURR_COUNT.
641 */ 641 */
642 if (c_status & VIA_REG_STAT_EOL) 642 if (c_status & VIA_REG_STAT_EOL)
643 viadev->hwptr_done = 0; 643 viadev->hwptr_done = 0;
644 else 644 else
645 viadev->hwptr_done += viadev->fragsize; 645 viadev->hwptr_done += viadev->fragsize;
646 viadev->in_interrupt = c_status; 646 viadev->in_interrupt = c_status;
647 spin_unlock(&chip->reg_lock); 647 spin_unlock(&chip->reg_lock);
648 snd_pcm_period_elapsed(viadev->substream); 648 snd_pcm_period_elapsed(viadev->substream);
649 spin_lock(&chip->reg_lock); 649 spin_lock(&chip->reg_lock);
650 viadev->in_interrupt = 0; 650 viadev->in_interrupt = 0;
651 } 651 }
652 outb(c_status, VIADEV_REG(viadev, OFFSET_STATUS)); /* ack */ 652 outb(c_status, VIADEV_REG(viadev, OFFSET_STATUS)); /* ack */
653 } 653 }
654 spin_unlock(&chip->reg_lock); 654 spin_unlock(&chip->reg_lock);
655 return IRQ_HANDLED; 655 return IRQ_HANDLED;
656 } 656 }
657 657
658 /* 658 /*
659 * Interrupt handler 659 * Interrupt handler
660 */ 660 */
661 static irqreturn_t snd_via8233_interrupt(int irq, void *dev_id, struct pt_regs *regs) 661 static irqreturn_t snd_via8233_interrupt(int irq, void *dev_id, struct pt_regs *regs)
662 { 662 {
663 struct via82xx *chip = dev_id; 663 struct via82xx *chip = dev_id;
664 unsigned int status; 664 unsigned int status;
665 unsigned int i; 665 unsigned int i;
666 int irqreturn = 0; 666 int irqreturn = 0;
667 667
668 /* check status for each stream */ 668 /* check status for each stream */
669 spin_lock(&chip->reg_lock); 669 spin_lock(&chip->reg_lock);
670 status = inl(VIAREG(chip, SGD_SHADOW)); 670 status = inl(VIAREG(chip, SGD_SHADOW));
671 671
672 for (i = 0; i < chip->num_devs; i++) { 672 for (i = 0; i < chip->num_devs; i++) {
673 struct viadev *viadev = &chip->devs[i]; 673 struct viadev *viadev = &chip->devs[i];
674 struct snd_pcm_substream *substream; 674 struct snd_pcm_substream *substream;
675 unsigned char c_status, shadow_status; 675 unsigned char c_status, shadow_status;
676 676
677 shadow_status = (status >> viadev->shadow_shift) & 677 shadow_status = (status >> viadev->shadow_shift) &
678 (VIA8233_SHADOW_STAT_ACTIVE|VIA_REG_STAT_EOL| 678 (VIA8233_SHADOW_STAT_ACTIVE|VIA_REG_STAT_EOL|
679 VIA_REG_STAT_FLAG); 679 VIA_REG_STAT_FLAG);
680 c_status = shadow_status & (VIA_REG_STAT_EOL|VIA_REG_STAT_FLAG); 680 c_status = shadow_status & (VIA_REG_STAT_EOL|VIA_REG_STAT_FLAG);
681 if (!c_status) 681 if (!c_status)
682 continue; 682 continue;
683 683
684 substream = viadev->substream; 684 substream = viadev->substream;
685 if (substream && viadev->running) { 685 if (substream && viadev->running) {
686 /* 686 /*
687 * Update hwptr_done based on 'period elapsed' 687 * Update hwptr_done based on 'period elapsed'
688 * interrupts. We'll use it, when the chip returns 0 688 * interrupts. We'll use it, when the chip returns 0
689 * for OFFSET_CURR_COUNT. 689 * for OFFSET_CURR_COUNT.
690 */ 690 */
691 if (c_status & VIA_REG_STAT_EOL) 691 if (c_status & VIA_REG_STAT_EOL)
692 viadev->hwptr_done = 0; 692 viadev->hwptr_done = 0;
693 else 693 else
694 viadev->hwptr_done += viadev->fragsize; 694 viadev->hwptr_done += viadev->fragsize;
695 viadev->in_interrupt = c_status; 695 viadev->in_interrupt = c_status;
696 if (shadow_status & VIA8233_SHADOW_STAT_ACTIVE) 696 if (shadow_status & VIA8233_SHADOW_STAT_ACTIVE)
697 viadev->in_interrupt |= VIA_REG_STAT_ACTIVE; 697 viadev->in_interrupt |= VIA_REG_STAT_ACTIVE;
698 spin_unlock(&chip->reg_lock); 698 spin_unlock(&chip->reg_lock);
699 699
700 snd_pcm_period_elapsed(substream); 700 snd_pcm_period_elapsed(substream);
701 701
702 spin_lock(&chip->reg_lock); 702 spin_lock(&chip->reg_lock);
703 viadev->in_interrupt = 0; 703 viadev->in_interrupt = 0;
704 } 704 }
705 outb(c_status, VIADEV_REG(viadev, OFFSET_STATUS)); /* ack */ 705 outb(c_status, VIADEV_REG(viadev, OFFSET_STATUS)); /* ack */
706 irqreturn = 1; 706 irqreturn = 1;
707 } 707 }
708 spin_unlock(&chip->reg_lock); 708 spin_unlock(&chip->reg_lock);
709 return IRQ_RETVAL(irqreturn); 709 return IRQ_RETVAL(irqreturn);
710 } 710 }
711 711
712 /* 712 /*
713 * PCM callbacks 713 * PCM callbacks
714 */ 714 */
715 715
716 /* 716 /*
717 * trigger callback 717 * trigger callback
718 */ 718 */
719 static int snd_via82xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) 719 static int snd_via82xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
720 { 720 {
721 struct via82xx *chip = snd_pcm_substream_chip(substream); 721 struct via82xx *chip = snd_pcm_substream_chip(substream);
722 struct viadev *viadev = substream->runtime->private_data; 722 struct viadev *viadev = substream->runtime->private_data;
723 unsigned char val; 723 unsigned char val;
724 724
725 if (chip->chip_type != TYPE_VIA686) 725 if (chip->chip_type != TYPE_VIA686)
726 val = VIA_REG_CTRL_INT; 726 val = VIA_REG_CTRL_INT;
727 else 727 else
728 val = 0; 728 val = 0;
729 switch (cmd) { 729 switch (cmd) {
730 case SNDRV_PCM_TRIGGER_START: 730 case SNDRV_PCM_TRIGGER_START:
731 case SNDRV_PCM_TRIGGER_RESUME: 731 case SNDRV_PCM_TRIGGER_RESUME:
732 val |= VIA_REG_CTRL_START; 732 val |= VIA_REG_CTRL_START;
733 viadev->running = 1; 733 viadev->running = 1;
734 break; 734 break;
735 case SNDRV_PCM_TRIGGER_STOP: 735 case SNDRV_PCM_TRIGGER_STOP:
736 case SNDRV_PCM_TRIGGER_SUSPEND: 736 case SNDRV_PCM_TRIGGER_SUSPEND:
737 val = VIA_REG_CTRL_TERMINATE; 737 val = VIA_REG_CTRL_TERMINATE;
738 viadev->running = 0; 738 viadev->running = 0;
739 break; 739 break;
740 case SNDRV_PCM_TRIGGER_PAUSE_PUSH: 740 case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
741 val |= VIA_REG_CTRL_PAUSE; 741 val |= VIA_REG_CTRL_PAUSE;
742 viadev->running = 0; 742 viadev->running = 0;
743 break; 743 break;
744 case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: 744 case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
745 viadev->running = 1; 745 viadev->running = 1;
746 break; 746 break;
747 default: 747 default:
748 return -EINVAL; 748 return -EINVAL;
749 } 749 }
750 outb(val, VIADEV_REG(viadev, OFFSET_CONTROL)); 750 outb(val, VIADEV_REG(viadev, OFFSET_CONTROL));
751 if (cmd == SNDRV_PCM_TRIGGER_STOP) 751 if (cmd == SNDRV_PCM_TRIGGER_STOP)
752 snd_via82xx_channel_reset(chip, viadev); 752 snd_via82xx_channel_reset(chip, viadev);
753 return 0; 753 return 0;
754 } 754 }
755 755
756 756
757 /* 757 /*
758 * pointer callbacks 758 * pointer callbacks
759 */ 759 */
760 760
761 /* 761 /*
762 * calculate the linear position at the given sg-buffer index and the rest count 762 * calculate the linear position at the given sg-buffer index and the rest count
763 */ 763 */
764 764
765 #define check_invalid_pos(viadev,pos) \ 765 #define check_invalid_pos(viadev,pos) \
766 ((pos) < viadev->lastpos && ((pos) >= viadev->bufsize2 ||\ 766 ((pos) < viadev->lastpos && ((pos) >= viadev->bufsize2 ||\
767 viadev->lastpos < viadev->bufsize2)) 767 viadev->lastpos < viadev->bufsize2))
768 768
769 static inline unsigned int calc_linear_pos(struct viadev *viadev, unsigned int idx, 769 static inline unsigned int calc_linear_pos(struct viadev *viadev, unsigned int idx,
770 unsigned int count) 770 unsigned int count)
771 { 771 {
772 unsigned int size, base, res; 772 unsigned int size, base, res;
773 773
774 size = viadev->idx_table[idx].size; 774 size = viadev->idx_table[idx].size;
775 base = viadev->idx_table[idx].offset; 775 base = viadev->idx_table[idx].offset;
776 res = base + size - count; 776 res = base + size - count;
777 if (res >= viadev->bufsize) 777 if (res >= viadev->bufsize)
778 res -= viadev->bufsize; 778 res -= viadev->bufsize;
779 779
780 /* check the validity of the calculated position */ 780 /* check the validity of the calculated position */
781 if (size < count) { 781 if (size < count) {
782 snd_printd(KERN_ERR "invalid via82xx_cur_ptr (size = %d, count = %d)\n", 782 snd_printd(KERN_ERR "invalid via82xx_cur_ptr (size = %d, count = %d)\n",
783 (int)size, (int)count); 783 (int)size, (int)count);
784 res = viadev->lastpos; 784 res = viadev->lastpos;
785 } else { 785 } else {
786 if (! count) { 786 if (! count) {
787 /* Some mobos report count = 0 on the DMA boundary, 787 /* Some mobos report count = 0 on the DMA boundary,
788 * i.e. count = size indeed. 788 * i.e. count = size indeed.
789 * Let's check whether this step is above the expected size. 789 * Let's check whether this step is above the expected size.
790 */ 790 */
791 int delta = res - viadev->lastpos; 791 int delta = res - viadev->lastpos;
792 if (delta < 0) 792 if (delta < 0)
793 delta += viadev->bufsize; 793 delta += viadev->bufsize;
794 if ((unsigned int)delta > viadev->fragsize) 794 if ((unsigned int)delta > viadev->fragsize)
795 res = base; 795 res = base;
796 } 796 }
797 if (check_invalid_pos(viadev, res)) { 797 if (check_invalid_pos(viadev, res)) {
798 #ifdef POINTER_DEBUG 798 #ifdef POINTER_DEBUG
799 printk(KERN_DEBUG "fail: idx = %i/%i, lastpos = 0x%x, " 799 printk(KERN_DEBUG "fail: idx = %i/%i, lastpos = 0x%x, "
800 "bufsize2 = 0x%x, offsize = 0x%x, size = 0x%x, " 800 "bufsize2 = 0x%x, offsize = 0x%x, size = 0x%x, "
801 "count = 0x%x\n", idx, viadev->tbl_entries, 801 "count = 0x%x\n", idx, viadev->tbl_entries,
802 viadev->lastpos, viadev->bufsize2, 802 viadev->lastpos, viadev->bufsize2,
803 viadev->idx_table[idx].offset, 803 viadev->idx_table[idx].offset,
804 viadev->idx_table[idx].size, count); 804 viadev->idx_table[idx].size, count);
805 #endif 805 #endif
806 /* count register returns full size when end of buffer is reached */ 806 /* count register returns full size when end of buffer is reached */
807 res = base + size; 807 res = base + size;
808 if (check_invalid_pos(viadev, res)) { 808 if (check_invalid_pos(viadev, res)) {
809 snd_printd(KERN_ERR "invalid via82xx_cur_ptr (2), " 809 snd_printd(KERN_ERR "invalid via82xx_cur_ptr (2), "
810 "using last valid pointer\n"); 810 "using last valid pointer\n");
811 res = viadev->lastpos; 811 res = viadev->lastpos;
812 } 812 }
813 } 813 }
814 } 814 }
815 return res; 815 return res;
816 } 816 }
817 817
818 /* 818 /*
819 * get the current pointer on via686 819 * get the current pointer on via686
820 */ 820 */
821 static snd_pcm_uframes_t snd_via686_pcm_pointer(struct snd_pcm_substream *substream) 821 static snd_pcm_uframes_t snd_via686_pcm_pointer(struct snd_pcm_substream *substream)
822 { 822 {
823 struct via82xx *chip = snd_pcm_substream_chip(substream); 823 struct via82xx *chip = snd_pcm_substream_chip(substream);
824 struct viadev *viadev = substream->runtime->private_data; 824 struct viadev *viadev = substream->runtime->private_data;
825 unsigned int idx, ptr, count, res; 825 unsigned int idx, ptr, count, res;
826 826
827 snd_assert(viadev->tbl_entries, return 0); 827 snd_assert(viadev->tbl_entries, return 0);
828 if (!(inb(VIADEV_REG(viadev, OFFSET_STATUS)) & VIA_REG_STAT_ACTIVE)) 828 if (!(inb(VIADEV_REG(viadev, OFFSET_STATUS)) & VIA_REG_STAT_ACTIVE))
829 return 0; 829 return 0;
830 830
831 spin_lock(&chip->reg_lock); 831 spin_lock(&chip->reg_lock);
832 count = inl(VIADEV_REG(viadev, OFFSET_CURR_COUNT)) & 0xffffff; 832 count = inl(VIADEV_REG(viadev, OFFSET_CURR_COUNT)) & 0xffffff;
833 /* The via686a does not have the current index register, 833 /* The via686a does not have the current index register,
834 * so we need to calculate the index from CURR_PTR. 834 * so we need to calculate the index from CURR_PTR.
835 */ 835 */
836 ptr = inl(VIADEV_REG(viadev, OFFSET_CURR_PTR)); 836 ptr = inl(VIADEV_REG(viadev, OFFSET_CURR_PTR));
837 if (ptr <= (unsigned int)viadev->table.addr) 837 if (ptr <= (unsigned int)viadev->table.addr)
838 idx = 0; 838 idx = 0;
839 else /* CURR_PTR holds the address + 8 */ 839 else /* CURR_PTR holds the address + 8 */
840 idx = ((ptr - (unsigned int)viadev->table.addr) / 8 - 1) % viadev->tbl_entries; 840 idx = ((ptr - (unsigned int)viadev->table.addr) / 8 - 1) % viadev->tbl_entries;
841 res = calc_linear_pos(viadev, idx, count); 841 res = calc_linear_pos(viadev, idx, count);
842 viadev->lastpos = res; /* remember the last position */ 842 viadev->lastpos = res; /* remember the last position */
843 spin_unlock(&chip->reg_lock); 843 spin_unlock(&chip->reg_lock);
844 844
845 return bytes_to_frames(substream->runtime, res); 845 return bytes_to_frames(substream->runtime, res);
846 } 846 }
847 847
848 /* 848 /*
849 * get the current pointer on via823x 849 * get the current pointer on via823x
850 */ 850 */
851 static snd_pcm_uframes_t snd_via8233_pcm_pointer(struct snd_pcm_substream *substream) 851 static snd_pcm_uframes_t snd_via8233_pcm_pointer(struct snd_pcm_substream *substream)
852 { 852 {
853 struct via82xx *chip = snd_pcm_substream_chip(substream); 853 struct via82xx *chip = snd_pcm_substream_chip(substream);
854 struct viadev *viadev = substream->runtime->private_data; 854 struct viadev *viadev = substream->runtime->private_data;
855 unsigned int idx, count, res; 855 unsigned int idx, count, res;
856 int status; 856 int status;
857 857
858 snd_assert(viadev->tbl_entries, return 0); 858 snd_assert(viadev->tbl_entries, return 0);
859 859
860 spin_lock(&chip->reg_lock); 860 spin_lock(&chip->reg_lock);
861 count = inl(VIADEV_REG(viadev, OFFSET_CURR_COUNT)); 861 count = inl(VIADEV_REG(viadev, OFFSET_CURR_COUNT));
862 status = viadev->in_interrupt; 862 status = viadev->in_interrupt;
863 if (!status) 863 if (!status)
864 status = inb(VIADEV_REG(viadev, OFFSET_STATUS)); 864 status = inb(VIADEV_REG(viadev, OFFSET_STATUS));
865 865
866 /* An apparent bug in the 8251 is worked around by sending a 866 /* An apparent bug in the 8251 is worked around by sending a
867 * REG_CTRL_START. */ 867 * REG_CTRL_START. */
868 if (chip->revision == VIA_REV_8251 && (status & VIA_REG_STAT_EOL)) 868 if (chip->revision == VIA_REV_8251 && (status & VIA_REG_STAT_EOL))
869 snd_via82xx_pcm_trigger(substream, SNDRV_PCM_TRIGGER_START); 869 snd_via82xx_pcm_trigger(substream, SNDRV_PCM_TRIGGER_START);
870 870
871 if (!(status & VIA_REG_STAT_ACTIVE)) { 871 if (!(status & VIA_REG_STAT_ACTIVE)) {
872 res = 0; 872 res = 0;
873 goto unlock; 873 goto unlock;
874 } 874 }
875 if (count & 0xffffff) { 875 if (count & 0xffffff) {
876 idx = count >> 24; 876 idx = count >> 24;
877 if (idx >= viadev->tbl_entries) { 877 if (idx >= viadev->tbl_entries) {
878 #ifdef POINTER_DEBUG 878 #ifdef POINTER_DEBUG
879 printk(KERN_DEBUG "fail: invalid idx = %i/%i\n", idx, 879 printk(KERN_DEBUG "fail: invalid idx = %i/%i\n", idx,
880 viadev->tbl_entries); 880 viadev->tbl_entries);
881 #endif 881 #endif
882 res = viadev->lastpos; 882 res = viadev->lastpos;
883 } else { 883 } else {
884 count &= 0xffffff; 884 count &= 0xffffff;
885 res = calc_linear_pos(viadev, idx, count); 885 res = calc_linear_pos(viadev, idx, count);
886 } 886 }
887 } else { 887 } else {
888 res = viadev->hwptr_done; 888 res = viadev->hwptr_done;
889 if (!viadev->in_interrupt) { 889 if (!viadev->in_interrupt) {
890 if (status & VIA_REG_STAT_EOL) { 890 if (status & VIA_REG_STAT_EOL) {
891 res = 0; 891 res = 0;
892 } else 892 } else
893 if (status & VIA_REG_STAT_FLAG) { 893 if (status & VIA_REG_STAT_FLAG) {
894 res += viadev->fragsize; 894 res += viadev->fragsize;
895 } 895 }
896 } 896 }
897 } 897 }
898 unlock: 898 unlock:
899 viadev->lastpos = res; 899 viadev->lastpos = res;
900 spin_unlock(&chip->reg_lock); 900 spin_unlock(&chip->reg_lock);
901 901
902 return bytes_to_frames(substream->runtime, res); 902 return bytes_to_frames(substream->runtime, res);
903 } 903 }
904 904
905 905
906 /* 906 /*
907 * hw_params callback: 907 * hw_params callback:
908 * allocate the buffer and build up the buffer description table 908 * allocate the buffer and build up the buffer description table
909 */ 909 */
910 static int snd_via82xx_hw_params(struct snd_pcm_substream *substream, 910 static int snd_via82xx_hw_params(struct snd_pcm_substream *substream,
911 struct snd_pcm_hw_params *hw_params) 911 struct snd_pcm_hw_params *hw_params)
912 { 912 {
913 struct via82xx *chip = snd_pcm_substream_chip(substream); 913 struct via82xx *chip = snd_pcm_substream_chip(substream);
914 struct viadev *viadev = substream->runtime->private_data; 914 struct viadev *viadev = substream->runtime->private_data;
915 int err; 915 int err;
916 916
917 err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params)); 917 err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
918 if (err < 0) 918 if (err < 0)
919 return err; 919 return err;
920 err = build_via_table(viadev, substream, chip->pci, 920 err = build_via_table(viadev, substream, chip->pci,
921 params_periods(hw_params), 921 params_periods(hw_params),
922 params_period_bytes(hw_params)); 922 params_period_bytes(hw_params));
923 if (err < 0) 923 if (err < 0)
924 return err; 924 return err;
925 925
926 return 0; 926 return 0;
927 } 927 }
928 928
929 /* 929 /*
930 * hw_free callback: 930 * hw_free callback:
931 * clean up the buffer description table and release the buffer 931 * clean up the buffer description table and release the buffer
932 */ 932 */
933 static int snd_via82xx_hw_free(struct snd_pcm_substream *substream) 933 static int snd_via82xx_hw_free(struct snd_pcm_substream *substream)
934 { 934 {
935 struct via82xx *chip = snd_pcm_substream_chip(substream); 935 struct via82xx *chip = snd_pcm_substream_chip(substream);
936 struct viadev *viadev = substream->runtime->private_data; 936 struct viadev *viadev = substream->runtime->private_data;
937 937
938 clean_via_table(viadev, substream, chip->pci); 938 clean_via_table(viadev, substream, chip->pci);
939 snd_pcm_lib_free_pages(substream); 939 snd_pcm_lib_free_pages(substream);
940 return 0; 940 return 0;
941 } 941 }
942 942
943 943
944 /* 944 /*
945 * set up the table pointer 945 * set up the table pointer
946 */ 946 */
947 static void snd_via82xx_set_table_ptr(struct via82xx *chip, struct viadev *viadev) 947 static void snd_via82xx_set_table_ptr(struct via82xx *chip, struct viadev *viadev)
948 { 948 {
949 snd_via82xx_codec_ready(chip, 0); 949 snd_via82xx_codec_ready(chip, 0);
950 outl((u32)viadev->table.addr, VIADEV_REG(viadev, OFFSET_TABLE_PTR)); 950 outl((u32)viadev->table.addr, VIADEV_REG(viadev, OFFSET_TABLE_PTR));
951 udelay(20); 951 udelay(20);
952 snd_via82xx_codec_ready(chip, 0); 952 snd_via82xx_codec_ready(chip, 0);
953 } 953 }
954 954
955 /* 955 /*
956 * prepare callback for playback and capture on via686 956 * prepare callback for playback and capture on via686
957 */ 957 */
958 static void via686_setup_format(struct via82xx *chip, struct viadev *viadev, 958 static void via686_setup_format(struct via82xx *chip, struct viadev *viadev,
959 struct snd_pcm_runtime *runtime) 959 struct snd_pcm_runtime *runtime)
960 { 960 {
961 snd_via82xx_channel_reset(chip, viadev); 961 snd_via82xx_channel_reset(chip, viadev);
962 /* this must be set after channel_reset */ 962 /* this must be set after channel_reset */
963 snd_via82xx_set_table_ptr(chip, viadev); 963 snd_via82xx_set_table_ptr(chip, viadev);
964 outb(VIA_REG_TYPE_AUTOSTART | 964 outb(VIA_REG_TYPE_AUTOSTART |
965 (runtime->format == SNDRV_PCM_FORMAT_S16_LE ? VIA_REG_TYPE_16BIT : 0) | 965 (runtime->format == SNDRV_PCM_FORMAT_S16_LE ? VIA_REG_TYPE_16BIT : 0) |
966 (runtime->channels > 1 ? VIA_REG_TYPE_STEREO : 0) | 966 (runtime->channels > 1 ? VIA_REG_TYPE_STEREO : 0) |
967 ((viadev->reg_offset & 0x10) == 0 ? VIA_REG_TYPE_INT_LSAMPLE : 0) | 967 ((viadev->reg_offset & 0x10) == 0 ? VIA_REG_TYPE_INT_LSAMPLE : 0) |
968 VIA_REG_TYPE_INT_EOL | 968 VIA_REG_TYPE_INT_EOL |
969 VIA_REG_TYPE_INT_FLAG, VIADEV_REG(viadev, OFFSET_TYPE)); 969 VIA_REG_TYPE_INT_FLAG, VIADEV_REG(viadev, OFFSET_TYPE));
970 } 970 }
971 971
972 static int snd_via686_playback_prepare(struct snd_pcm_substream *substream) 972 static int snd_via686_playback_prepare(struct snd_pcm_substream *substream)
973 { 973 {
974 struct via82xx *chip = snd_pcm_substream_chip(substream); 974 struct via82xx *chip = snd_pcm_substream_chip(substream);
975 struct viadev *viadev = substream->runtime->private_data; 975 struct viadev *viadev = substream->runtime->private_data;
976 struct snd_pcm_runtime *runtime = substream->runtime; 976 struct snd_pcm_runtime *runtime = substream->runtime;
977 977
978 snd_ac97_set_rate(chip->ac97, AC97_PCM_FRONT_DAC_RATE, runtime->rate); 978 snd_ac97_set_rate(chip->ac97, AC97_PCM_FRONT_DAC_RATE, runtime->rate);
979 snd_ac97_set_rate(chip->ac97, AC97_SPDIF, runtime->rate); 979 snd_ac97_set_rate(chip->ac97, AC97_SPDIF, runtime->rate);
980 via686_setup_format(chip, viadev, runtime); 980 via686_setup_format(chip, viadev, runtime);
981 return 0; 981 return 0;
982 } 982 }
983 983
984 static int snd_via686_capture_prepare(struct snd_pcm_substream *substream) 984 static int snd_via686_capture_prepare(struct snd_pcm_substream *substream)
985 { 985 {
986 struct via82xx *chip = snd_pcm_substream_chip(substream); 986 struct via82xx *chip = snd_pcm_substream_chip(substream);
987 struct viadev *viadev = substream->runtime->private_data; 987 struct viadev *viadev = substream->runtime->private_data;
988 struct snd_pcm_runtime *runtime = substream->runtime; 988 struct snd_pcm_runtime *runtime = substream->runtime;
989 989
990 snd_ac97_set_rate(chip->ac97, AC97_PCM_LR_ADC_RATE, runtime->rate); 990 snd_ac97_set_rate(chip->ac97, AC97_PCM_LR_ADC_RATE, runtime->rate);
991 via686_setup_format(chip, viadev, runtime); 991 via686_setup_format(chip, viadev, runtime);
992 return 0; 992 return 0;
993 } 993 }
994 994
995 /* 995 /*
996 * lock the current rate 996 * lock the current rate
997 */ 997 */
998 static int via_lock_rate(struct via_rate_lock *rec, int rate) 998 static int via_lock_rate(struct via_rate_lock *rec, int rate)
999 { 999 {
1000 int changed = 0; 1000 int changed = 0;
1001 1001
1002 spin_lock_irq(&rec->lock); 1002 spin_lock_irq(&rec->lock);
1003 if (rec->rate != rate) { 1003 if (rec->rate != rate) {
1004 if (rec->rate && rec->used > 1) /* already set */ 1004 if (rec->rate && rec->used > 1) /* already set */
1005 changed = -EINVAL; 1005 changed = -EINVAL;
1006 else { 1006 else {
1007 rec->rate = rate; 1007 rec->rate = rate;
1008 changed = 1; 1008 changed = 1;
1009 } 1009 }
1010 } 1010 }
1011 spin_unlock_irq(&rec->lock); 1011 spin_unlock_irq(&rec->lock);
1012 return changed; 1012 return changed;
1013 } 1013 }
1014 1014
1015 /* 1015 /*
1016 * prepare callback for DSX playback on via823x 1016 * prepare callback for DSX playback on via823x
1017 */ 1017 */
1018 static int snd_via8233_playback_prepare(struct snd_pcm_substream *substream) 1018 static int snd_via8233_playback_prepare(struct snd_pcm_substream *substream)
1019 { 1019 {
1020 struct via82xx *chip = snd_pcm_substream_chip(substream); 1020 struct via82xx *chip = snd_pcm_substream_chip(substream);
1021 struct viadev *viadev = substream->runtime->private_data; 1021 struct viadev *viadev = substream->runtime->private_data;
1022 struct snd_pcm_runtime *runtime = substream->runtime; 1022 struct snd_pcm_runtime *runtime = substream->runtime;
1023 int ac97_rate = chip->dxs_src ? 48000 : runtime->rate; 1023 int ac97_rate = chip->dxs_src ? 48000 : runtime->rate;
1024 int rate_changed; 1024 int rate_changed;
1025 u32 rbits; 1025 u32 rbits;
1026 1026
1027 if ((rate_changed = via_lock_rate(&chip->rates[0], ac97_rate)) < 0) 1027 if ((rate_changed = via_lock_rate(&chip->rates[0], ac97_rate)) < 0)
1028 return rate_changed; 1028 return rate_changed;
1029 if (rate_changed) 1029 if (rate_changed)
1030 snd_ac97_set_rate(chip->ac97, AC97_PCM_FRONT_DAC_RATE, 1030 snd_ac97_set_rate(chip->ac97, AC97_PCM_FRONT_DAC_RATE,
1031 chip->no_vra ? 48000 : runtime->rate); 1031 chip->no_vra ? 48000 : runtime->rate);
1032 if (chip->spdif_on && viadev->reg_offset == 0x30) 1032 if (chip->spdif_on && viadev->reg_offset == 0x30)
1033 snd_ac97_set_rate(chip->ac97, AC97_SPDIF, runtime->rate); 1033 snd_ac97_set_rate(chip->ac97, AC97_SPDIF, runtime->rate);
1034 1034
1035 if (runtime->rate == 48000) 1035 if (runtime->rate == 48000)
1036 rbits = 0xfffff; 1036 rbits = 0xfffff;
1037 else 1037 else
1038 rbits = (0x100000 / 48000) * runtime->rate + 1038 rbits = (0x100000 / 48000) * runtime->rate +
1039 ((0x100000 % 48000) * runtime->rate) / 48000; 1039 ((0x100000 % 48000) * runtime->rate) / 48000;
1040 snd_assert((rbits & ~0xfffff) == 0, return -EINVAL); 1040 snd_assert((rbits & ~0xfffff) == 0, return -EINVAL);
1041 snd_via82xx_channel_reset(chip, viadev); 1041 snd_via82xx_channel_reset(chip, viadev);
1042 snd_via82xx_set_table_ptr(chip, viadev); 1042 snd_via82xx_set_table_ptr(chip, viadev);
1043 outb(chip->playback_volume[viadev->reg_offset / 0x10][0], 1043 outb(chip->playback_volume[viadev->reg_offset / 0x10][0],
1044 VIADEV_REG(viadev, OFS_PLAYBACK_VOLUME_L)); 1044 VIADEV_REG(viadev, OFS_PLAYBACK_VOLUME_L));
1045 outb(chip->playback_volume[viadev->reg_offset / 0x10][1], 1045 outb(chip->playback_volume[viadev->reg_offset / 0x10][1],
1046 VIADEV_REG(viadev, OFS_PLAYBACK_VOLUME_R)); 1046 VIADEV_REG(viadev, OFS_PLAYBACK_VOLUME_R));
1047 outl((runtime->format == SNDRV_PCM_FORMAT_S16_LE ? VIA8233_REG_TYPE_16BIT : 0) | /* format */ 1047 outl((runtime->format == SNDRV_PCM_FORMAT_S16_LE ? VIA8233_REG_TYPE_16BIT : 0) | /* format */
1048 (runtime->channels > 1 ? VIA8233_REG_TYPE_STEREO : 0) | /* stereo */ 1048 (runtime->channels > 1 ? VIA8233_REG_TYPE_STEREO : 0) | /* stereo */
1049 rbits | /* rate */ 1049 rbits | /* rate */
1050 0xff000000, /* STOP index is never reached */ 1050 0xff000000, /* STOP index is never reached */
1051 VIADEV_REG(viadev, OFFSET_STOP_IDX)); 1051 VIADEV_REG(viadev, OFFSET_STOP_IDX));
1052 udelay(20); 1052 udelay(20);
1053 snd_via82xx_codec_ready(chip, 0); 1053 snd_via82xx_codec_ready(chip, 0);
1054 return 0; 1054 return 0;
1055 } 1055 }
1056 1056
1057 /* 1057 /*
1058 * prepare callback for multi-channel playback on via823x 1058 * prepare callback for multi-channel playback on via823x
1059 */ 1059 */
1060 static int snd_via8233_multi_prepare(struct snd_pcm_substream *substream) 1060 static int snd_via8233_multi_prepare(struct snd_pcm_substream *substream)
1061 { 1061 {
1062 struct via82xx *chip = snd_pcm_substream_chip(substream); 1062 struct via82xx *chip = snd_pcm_substream_chip(substream);
1063 struct viadev *viadev = substream->runtime->private_data; 1063 struct viadev *viadev = substream->runtime->private_data;
1064 struct snd_pcm_runtime *runtime = substream->runtime; 1064 struct snd_pcm_runtime *runtime = substream->runtime;
1065 unsigned int slots; 1065 unsigned int slots;
1066 int fmt; 1066 int fmt;
1067 1067
1068 if (via_lock_rate(&chip->rates[0], runtime->rate) < 0) 1068 if (via_lock_rate(&chip->rates[0], runtime->rate) < 0)
1069 return -EINVAL; 1069 return -EINVAL;
1070 snd_ac97_set_rate(chip->ac97, AC97_PCM_FRONT_DAC_RATE, runtime->rate); 1070 snd_ac97_set_rate(chip->ac97, AC97_PCM_FRONT_DAC_RATE, runtime->rate);
1071 snd_ac97_set_rate(chip->ac97, AC97_PCM_SURR_DAC_RATE, runtime->rate); 1071 snd_ac97_set_rate(chip->ac97, AC97_PCM_SURR_DAC_RATE, runtime->rate);
1072 snd_ac97_set_rate(chip->ac97, AC97_PCM_LFE_DAC_RATE, runtime->rate); 1072 snd_ac97_set_rate(chip->ac97, AC97_PCM_LFE_DAC_RATE, runtime->rate);
1073 snd_ac97_set_rate(chip->ac97, AC97_SPDIF, runtime->rate); 1073 snd_ac97_set_rate(chip->ac97, AC97_SPDIF, runtime->rate);
1074 snd_via82xx_channel_reset(chip, viadev); 1074 snd_via82xx_channel_reset(chip, viadev);
1075 snd_via82xx_set_table_ptr(chip, viadev); 1075 snd_via82xx_set_table_ptr(chip, viadev);
1076 1076
1077 fmt = (runtime->format == SNDRV_PCM_FORMAT_S16_LE) ? 1077 fmt = (runtime->format == SNDRV_PCM_FORMAT_S16_LE) ?
1078 VIA_REG_MULTPLAY_FMT_16BIT : VIA_REG_MULTPLAY_FMT_8BIT; 1078 VIA_REG_MULTPLAY_FMT_16BIT : VIA_REG_MULTPLAY_FMT_8BIT;
1079 fmt |= runtime->channels << 4; 1079 fmt |= runtime->channels << 4;
1080 outb(fmt, VIADEV_REG(viadev, OFS_MULTPLAY_FORMAT)); 1080 outb(fmt, VIADEV_REG(viadev, OFS_MULTPLAY_FORMAT));
1081 #if 0 1081 #if 0
1082 if (chip->revision == VIA_REV_8233A) 1082 if (chip->revision == VIA_REV_8233A)
1083 slots = 0; 1083 slots = 0;
1084 else 1084 else
1085 #endif 1085 #endif
1086 { 1086 {
1087 /* set sample number to slot 3, 4, 7, 8, 6, 9 (for VIA8233/C,8235) */ 1087 /* set sample number to slot 3, 4, 7, 8, 6, 9 (for VIA8233/C,8235) */
1088 /* corresponding to FL, FR, RL, RR, C, LFE ?? */ 1088 /* corresponding to FL, FR, RL, RR, C, LFE ?? */
1089 switch (runtime->channels) { 1089 switch (runtime->channels) {
1090 case 1: slots = (1<<0) | (1<<4); break; 1090 case 1: slots = (1<<0) | (1<<4); break;
1091 case 2: slots = (1<<0) | (2<<4); break; 1091 case 2: slots = (1<<0) | (2<<4); break;
1092 case 3: slots = (1<<0) | (2<<4) | (5<<8); break; 1092 case 3: slots = (1<<0) | (2<<4) | (5<<8); break;
1093 case 4: slots = (1<<0) | (2<<4) | (3<<8) | (4<<12); break; 1093 case 4: slots = (1<<0) | (2<<4) | (3<<8) | (4<<12); break;
1094 case 5: slots = (1<<0) | (2<<4) | (3<<8) | (4<<12) | (5<<16); break; 1094 case 5: slots = (1<<0) | (2<<4) | (3<<8) | (4<<12) | (5<<16); break;
1095 case 6: slots = (1<<0) | (2<<4) | (3<<8) | (4<<12) | (5<<16) | (6<<20); break; 1095 case 6: slots = (1<<0) | (2<<4) | (3<<8) | (4<<12) | (5<<16) | (6<<20); break;
1096 default: slots = 0; break; 1096 default: slots = 0; break;
1097 } 1097 }
1098 } 1098 }
1099 /* STOP index is never reached */ 1099 /* STOP index is never reached */
1100 outl(0xff000000 | slots, VIADEV_REG(viadev, OFFSET_STOP_IDX)); 1100 outl(0xff000000 | slots, VIADEV_REG(viadev, OFFSET_STOP_IDX));
1101 udelay(20); 1101 udelay(20);
1102 snd_via82xx_codec_ready(chip, 0); 1102 snd_via82xx_codec_ready(chip, 0);
1103 return 0; 1103 return 0;
1104 } 1104 }
1105 1105
1106 /* 1106 /*
1107 * prepare callback for capture on via823x 1107 * prepare callback for capture on via823x
1108 */ 1108 */
1109 static int snd_via8233_capture_prepare(struct snd_pcm_substream *substream) 1109 static int snd_via8233_capture_prepare(struct snd_pcm_substream *substream)
1110 { 1110 {
1111 struct via82xx *chip = snd_pcm_substream_chip(substream); 1111 struct via82xx *chip = snd_pcm_substream_chip(substream);
1112 struct viadev *viadev = substream->runtime->private_data; 1112 struct viadev *viadev = substream->runtime->private_data;
1113 struct snd_pcm_runtime *runtime = substream->runtime; 1113 struct snd_pcm_runtime *runtime = substream->runtime;
1114 1114
1115 if (via_lock_rate(&chip->rates[1], runtime->rate) < 0) 1115 if (via_lock_rate(&chip->rates[1], runtime->rate) < 0)
1116 return -EINVAL; 1116 return -EINVAL;
1117 snd_ac97_set_rate(chip->ac97, AC97_PCM_LR_ADC_RATE, runtime->rate); 1117 snd_ac97_set_rate(chip->ac97, AC97_PCM_LR_ADC_RATE, runtime->rate);
1118 snd_via82xx_channel_reset(chip, viadev); 1118 snd_via82xx_channel_reset(chip, viadev);
1119 snd_via82xx_set_table_ptr(chip, viadev); 1119 snd_via82xx_set_table_ptr(chip, viadev);
1120 outb(VIA_REG_CAPTURE_FIFO_ENABLE, VIADEV_REG(viadev, OFS_CAPTURE_FIFO)); 1120 outb(VIA_REG_CAPTURE_FIFO_ENABLE, VIADEV_REG(viadev, OFS_CAPTURE_FIFO));
1121 outl((runtime->format == SNDRV_PCM_FORMAT_S16_LE ? VIA8233_REG_TYPE_16BIT : 0) | 1121 outl((runtime->format == SNDRV_PCM_FORMAT_S16_LE ? VIA8233_REG_TYPE_16BIT : 0) |
1122 (runtime->channels > 1 ? VIA8233_REG_TYPE_STEREO : 0) | 1122 (runtime->channels > 1 ? VIA8233_REG_TYPE_STEREO : 0) |
1123 0xff000000, /* STOP index is never reached */ 1123 0xff000000, /* STOP index is never reached */
1124 VIADEV_REG(viadev, OFFSET_STOP_IDX)); 1124 VIADEV_REG(viadev, OFFSET_STOP_IDX));
1125 udelay(20); 1125 udelay(20);
1126 snd_via82xx_codec_ready(chip, 0); 1126 snd_via82xx_codec_ready(chip, 0);
1127 return 0; 1127 return 0;
1128 } 1128 }
1129 1129
1130 1130
1131 /* 1131 /*
1132 * pcm hardware definition, identical for both playback and capture 1132 * pcm hardware definition, identical for both playback and capture
1133 */ 1133 */
1134 static struct snd_pcm_hardware snd_via82xx_hw = 1134 static struct snd_pcm_hardware snd_via82xx_hw =
1135 { 1135 {
1136 .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | 1136 .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
1137 SNDRV_PCM_INFO_BLOCK_TRANSFER | 1137 SNDRV_PCM_INFO_BLOCK_TRANSFER |
1138 SNDRV_PCM_INFO_MMAP_VALID | 1138 SNDRV_PCM_INFO_MMAP_VALID |
1139 /* SNDRV_PCM_INFO_RESUME | */ 1139 /* SNDRV_PCM_INFO_RESUME | */
1140 SNDRV_PCM_INFO_PAUSE), 1140 SNDRV_PCM_INFO_PAUSE),
1141 .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, 1141 .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
1142 .rates = SNDRV_PCM_RATE_48000, 1142 .rates = SNDRV_PCM_RATE_48000,
1143 .rate_min = 48000, 1143 .rate_min = 48000,
1144 .rate_max = 48000, 1144 .rate_max = 48000,
1145 .channels_min = 1, 1145 .channels_min = 1,
1146 .channels_max = 2, 1146 .channels_max = 2,
1147 .buffer_bytes_max = 128 * 1024, 1147 .buffer_bytes_max = 128 * 1024,
1148 .period_bytes_min = 32, 1148 .period_bytes_min = 32,
1149 .period_bytes_max = 128 * 1024, 1149 .period_bytes_max = 128 * 1024,
1150 .periods_min = 2, 1150 .periods_min = 2,
1151 .periods_max = VIA_TABLE_SIZE / 2, 1151 .periods_max = VIA_TABLE_SIZE / 2,
1152 .fifo_size = 0, 1152 .fifo_size = 0,
1153 }; 1153 };
1154 1154
1155 1155
1156 /* 1156 /*
1157 * open callback skeleton 1157 * open callback skeleton
1158 */ 1158 */
1159 static int snd_via82xx_pcm_open(struct via82xx *chip, struct viadev *viadev, 1159 static int snd_via82xx_pcm_open(struct via82xx *chip, struct viadev *viadev,
1160 struct snd_pcm_substream *substream) 1160 struct snd_pcm_substream *substream)
1161 { 1161 {
1162 struct snd_pcm_runtime *runtime = substream->runtime; 1162 struct snd_pcm_runtime *runtime = substream->runtime;
1163 int err; 1163 int err;
1164 struct via_rate_lock *ratep; 1164 struct via_rate_lock *ratep;
1165 1165
1166 runtime->hw = snd_via82xx_hw; 1166 runtime->hw = snd_via82xx_hw;
1167 1167
1168 /* set the hw rate condition */ 1168 /* set the hw rate condition */
1169 ratep = &chip->rates[viadev->direction]; 1169 ratep = &chip->rates[viadev->direction];
1170 spin_lock_irq(&ratep->lock); 1170 spin_lock_irq(&ratep->lock);
1171 ratep->used++; 1171 ratep->used++;
1172 if (chip->spdif_on && viadev->reg_offset == 0x30) { 1172 if (chip->spdif_on && viadev->reg_offset == 0x30) {
1173 /* DXS#3 and spdif is on */ 1173 /* DXS#3 and spdif is on */
1174 runtime->hw.rates = chip->ac97->rates[AC97_RATES_SPDIF]; 1174 runtime->hw.rates = chip->ac97->rates[AC97_RATES_SPDIF];
1175 snd_pcm_limit_hw_rates(runtime); 1175 snd_pcm_limit_hw_rates(runtime);
1176 } else if (chip->dxs_fixed && viadev->reg_offset < 0x40) { 1176 } else if (chip->dxs_fixed && viadev->reg_offset < 0x40) {
1177 /* fixed DXS playback rate */ 1177 /* fixed DXS playback rate */
1178 runtime->hw.rates = SNDRV_PCM_RATE_48000; 1178 runtime->hw.rates = SNDRV_PCM_RATE_48000;
1179 runtime->hw.rate_min = runtime->hw.rate_max = 48000; 1179 runtime->hw.rate_min = runtime->hw.rate_max = 48000;
1180 } else if (chip->dxs_src && viadev->reg_offset < 0x40) { 1180 } else if (chip->dxs_src && viadev->reg_offset < 0x40) {
1181 /* use full SRC capabilities of DXS */ 1181 /* use full SRC capabilities of DXS */
1182 runtime->hw.rates = (SNDRV_PCM_RATE_CONTINUOUS | 1182 runtime->hw.rates = (SNDRV_PCM_RATE_CONTINUOUS |
1183 SNDRV_PCM_RATE_8000_48000); 1183 SNDRV_PCM_RATE_8000_48000);
1184 runtime->hw.rate_min = 8000; 1184 runtime->hw.rate_min = 8000;
1185 runtime->hw.rate_max = 48000; 1185 runtime->hw.rate_max = 48000;
1186 } else if (! ratep->rate) { 1186 } else if (! ratep->rate) {
1187 int idx = viadev->direction ? AC97_RATES_ADC : AC97_RATES_FRONT_DAC; 1187 int idx = viadev->direction ? AC97_RATES_ADC : AC97_RATES_FRONT_DAC;
1188 runtime->hw.rates = chip->ac97->rates[idx]; 1188 runtime->hw.rates = chip->ac97->rates[idx];
1189 snd_pcm_limit_hw_rates(runtime); 1189 snd_pcm_limit_hw_rates(runtime);
1190 } else { 1190 } else {
1191 /* a fixed rate */ 1191 /* a fixed rate */
1192 runtime->hw.rates = SNDRV_PCM_RATE_KNOT; 1192 runtime->hw.rates = SNDRV_PCM_RATE_KNOT;
1193 runtime->hw.rate_max = runtime->hw.rate_min = ratep->rate; 1193 runtime->hw.rate_max = runtime->hw.rate_min = ratep->rate;
1194 } 1194 }
1195 spin_unlock_irq(&ratep->lock); 1195 spin_unlock_irq(&ratep->lock);
1196 1196
1197 /* we may remove following constaint when we modify table entries 1197 /* we may remove following constaint when we modify table entries
1198 in interrupt */ 1198 in interrupt */
1199 if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0) 1199 if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
1200 return err; 1200 return err;
1201 1201
1202 runtime->private_data = viadev; 1202 runtime->private_data = viadev;
1203 viadev->substream = substream; 1203 viadev->substream = substream;
1204 1204
1205 return 0; 1205 return 0;
1206 } 1206 }
1207 1207
1208 1208
1209 /* 1209 /*
1210 * open callback for playback on via686 and via823x DSX 1210 * open callback for playback on via686 and via823x DSX
1211 */ 1211 */
1212 static int snd_via82xx_playback_open(struct snd_pcm_substream *substream) 1212 static int snd_via82xx_playback_open(struct snd_pcm_substream *substream)
1213 { 1213 {
1214 struct via82xx *chip = snd_pcm_substream_chip(substream); 1214 struct via82xx *chip = snd_pcm_substream_chip(substream);
1215 struct viadev *viadev = &chip->devs[chip->playback_devno + substream->number]; 1215 struct viadev *viadev = &chip->devs[chip->playback_devno + substream->number];
1216 int err; 1216 int err;
1217 1217
1218 if ((err = snd_via82xx_pcm_open(chip, viadev, substream)) < 0) 1218 if ((err = snd_via82xx_pcm_open(chip, viadev, substream)) < 0)
1219 return err; 1219 return err;
1220 return 0; 1220 return 0;
1221 } 1221 }
1222 1222
1223 /* 1223 /*
1224 * open callback for playback on via823x multi-channel 1224 * open callback for playback on via823x multi-channel
1225 */ 1225 */
1226 static int snd_via8233_multi_open(struct snd_pcm_substream *substream) 1226 static int snd_via8233_multi_open(struct snd_pcm_substream *substream)
1227 { 1227 {
1228 struct via82xx *chip = snd_pcm_substream_chip(substream); 1228 struct via82xx *chip = snd_pcm_substream_chip(substream);
1229 struct viadev *viadev = &chip->devs[chip->multi_devno]; 1229 struct viadev *viadev = &chip->devs[chip->multi_devno];
1230 int err; 1230 int err;
1231 /* channels constraint for VIA8233A 1231 /* channels constraint for VIA8233A
1232 * 3 and 5 channels are not supported 1232 * 3 and 5 channels are not supported
1233 */ 1233 */
1234 static unsigned int channels[] = { 1234 static unsigned int channels[] = {
1235 1, 2, 4, 6 1235 1, 2, 4, 6
1236 }; 1236 };
1237 static struct snd_pcm_hw_constraint_list hw_constraints_channels = { 1237 static struct snd_pcm_hw_constraint_list hw_constraints_channels = {
1238 .count = ARRAY_SIZE(channels), 1238 .count = ARRAY_SIZE(channels),
1239 .list = channels, 1239 .list = channels,
1240 .mask = 0, 1240 .mask = 0,
1241 }; 1241 };
1242 1242
1243 if ((err = snd_via82xx_pcm_open(chip, viadev, substream)) < 0) 1243 if ((err = snd_via82xx_pcm_open(chip, viadev, substream)) < 0)
1244 return err; 1244 return err;
1245 substream->runtime->hw.channels_max = 6; 1245 substream->runtime->hw.channels_max = 6;
1246 if (chip->revision == VIA_REV_8233A) 1246 if (chip->revision == VIA_REV_8233A)
1247 snd_pcm_hw_constraint_list(substream->runtime, 0, 1247 snd_pcm_hw_constraint_list(substream->runtime, 0,
1248 SNDRV_PCM_HW_PARAM_CHANNELS, 1248 SNDRV_PCM_HW_PARAM_CHANNELS,
1249 &hw_constraints_channels); 1249 &hw_constraints_channels);
1250 return 0; 1250 return 0;
1251 } 1251 }
1252 1252
1253 /* 1253 /*
1254 * open callback for capture on via686 and via823x 1254 * open callback for capture on via686 and via823x
1255 */ 1255 */
1256 static int snd_via82xx_capture_open(struct snd_pcm_substream *substream) 1256 static int snd_via82xx_capture_open(struct snd_pcm_substream *substream)
1257 { 1257 {
1258 struct via82xx *chip = snd_pcm_substream_chip(substream); 1258 struct via82xx *chip = snd_pcm_substream_chip(substream);
1259 struct viadev *viadev = &chip->devs[chip->capture_devno + substream->pcm->device]; 1259 struct viadev *viadev = &chip->devs[chip->capture_devno + substream->pcm->device];
1260 1260
1261 return snd_via82xx_pcm_open(chip, viadev, substream); 1261 return snd_via82xx_pcm_open(chip, viadev, substream);
1262 } 1262 }
1263 1263
1264 /* 1264 /*
1265 * close callback 1265 * close callback
1266 */ 1266 */
1267 static int snd_via82xx_pcm_close(struct snd_pcm_substream *substream) 1267 static int snd_via82xx_pcm_close(struct snd_pcm_substream *substream)
1268 { 1268 {
1269 struct via82xx *chip = snd_pcm_substream_chip(substream); 1269 struct via82xx *chip = snd_pcm_substream_chip(substream);
1270 struct viadev *viadev = substream->runtime->private_data; 1270 struct viadev *viadev = substream->runtime->private_data;
1271 struct via_rate_lock *ratep; 1271 struct via_rate_lock *ratep;
1272 1272
1273 /* release the rate lock */ 1273 /* release the rate lock */
1274 ratep = &chip->rates[viadev->direction]; 1274 ratep = &chip->rates[viadev->direction];
1275 spin_lock_irq(&ratep->lock); 1275 spin_lock_irq(&ratep->lock);
1276 ratep->used--; 1276 ratep->used--;
1277 if (! ratep->used) 1277 if (! ratep->used)
1278 ratep->rate = 0; 1278 ratep->rate = 0;
1279 spin_unlock_irq(&ratep->lock); 1279 spin_unlock_irq(&ratep->lock);
1280 1280
1281 viadev->substream = NULL; 1281 viadev->substream = NULL;
1282 return 0; 1282 return 0;
1283 } 1283 }
1284 1284
1285 1285
1286 /* via686 playback callbacks */ 1286 /* via686 playback callbacks */
1287 static struct snd_pcm_ops snd_via686_playback_ops = { 1287 static struct snd_pcm_ops snd_via686_playback_ops = {
1288 .open = snd_via82xx_playback_open, 1288 .open = snd_via82xx_playback_open,
1289 .close = snd_via82xx_pcm_close, 1289 .close = snd_via82xx_pcm_close,
1290 .ioctl = snd_pcm_lib_ioctl, 1290 .ioctl = snd_pcm_lib_ioctl,
1291 .hw_params = snd_via82xx_hw_params, 1291 .hw_params = snd_via82xx_hw_params,
1292 .hw_free = snd_via82xx_hw_free, 1292 .hw_free = snd_via82xx_hw_free,
1293 .prepare = snd_via686_playback_prepare, 1293 .prepare = snd_via686_playback_prepare,
1294 .trigger = snd_via82xx_pcm_trigger, 1294 .trigger = snd_via82xx_pcm_trigger,
1295 .pointer = snd_via686_pcm_pointer, 1295 .pointer = snd_via686_pcm_pointer,
1296 .page = snd_pcm_sgbuf_ops_page, 1296 .page = snd_pcm_sgbuf_ops_page,
1297 }; 1297 };
1298 1298
1299 /* via686 capture callbacks */ 1299 /* via686 capture callbacks */
1300 static struct snd_pcm_ops snd_via686_capture_ops = { 1300 static struct snd_pcm_ops snd_via686_capture_ops = {
1301 .open = snd_via82xx_capture_open, 1301 .open = snd_via82xx_capture_open,
1302 .close = snd_via82xx_pcm_close, 1302 .close = snd_via82xx_pcm_close,
1303 .ioctl = snd_pcm_lib_ioctl, 1303 .ioctl = snd_pcm_lib_ioctl,
1304 .hw_params = snd_via82xx_hw_params, 1304 .hw_params = snd_via82xx_hw_params,
1305 .hw_free = snd_via82xx_hw_free, 1305 .hw_free = snd_via82xx_hw_free,
1306 .prepare = snd_via686_capture_prepare, 1306 .prepare = snd_via686_capture_prepare,
1307 .trigger = snd_via82xx_pcm_trigger, 1307 .trigger = snd_via82xx_pcm_trigger,
1308 .pointer = snd_via686_pcm_pointer, 1308 .pointer = snd_via686_pcm_pointer,
1309 .page = snd_pcm_sgbuf_ops_page, 1309 .page = snd_pcm_sgbuf_ops_page,
1310 }; 1310 };
1311 1311
1312 /* via823x DSX playback callbacks */ 1312 /* via823x DSX playback callbacks */
1313 static struct snd_pcm_ops snd_via8233_playback_ops = { 1313 static struct snd_pcm_ops snd_via8233_playback_ops = {
1314 .open = snd_via82xx_playback_open, 1314 .open = snd_via82xx_playback_open,
1315 .close = snd_via82xx_pcm_close, 1315 .close = snd_via82xx_pcm_close,
1316 .ioctl = snd_pcm_lib_ioctl, 1316 .ioctl = snd_pcm_lib_ioctl,
1317 .hw_params = snd_via82xx_hw_params, 1317 .hw_params = snd_via82xx_hw_params,
1318 .hw_free = snd_via82xx_hw_free, 1318 .hw_free = snd_via82xx_hw_free,
1319 .prepare = snd_via8233_playback_prepare, 1319 .prepare = snd_via8233_playback_prepare,
1320 .trigger = snd_via82xx_pcm_trigger, 1320 .trigger = snd_via82xx_pcm_trigger,
1321 .pointer = snd_via8233_pcm_pointer, 1321 .pointer = snd_via8233_pcm_pointer,
1322 .page = snd_pcm_sgbuf_ops_page, 1322 .page = snd_pcm_sgbuf_ops_page,
1323 }; 1323 };
1324 1324
1325 /* via823x multi-channel playback callbacks */ 1325 /* via823x multi-channel playback callbacks */
1326 static struct snd_pcm_ops snd_via8233_multi_ops = { 1326 static struct snd_pcm_ops snd_via8233_multi_ops = {
1327 .open = snd_via8233_multi_open, 1327 .open = snd_via8233_multi_open,
1328 .close = snd_via82xx_pcm_close, 1328 .close = snd_via82xx_pcm_close,
1329 .ioctl = snd_pcm_lib_ioctl, 1329 .ioctl = snd_pcm_lib_ioctl,
1330 .hw_params = snd_via82xx_hw_params, 1330 .hw_params = snd_via82xx_hw_params,
1331 .hw_free = snd_via82xx_hw_free, 1331 .hw_free = snd_via82xx_hw_free,
1332 .prepare = snd_via8233_multi_prepare, 1332 .prepare = snd_via8233_multi_prepare,
1333 .trigger = snd_via82xx_pcm_trigger, 1333 .trigger = snd_via82xx_pcm_trigger,
1334 .pointer = snd_via8233_pcm_pointer, 1334 .pointer = snd_via8233_pcm_pointer,
1335 .page = snd_pcm_sgbuf_ops_page, 1335 .page = snd_pcm_sgbuf_ops_page,
1336 }; 1336 };
1337 1337
1338 /* via823x capture callbacks */ 1338 /* via823x capture callbacks */
1339 static struct snd_pcm_ops snd_via8233_capture_ops = { 1339 static struct snd_pcm_ops snd_via8233_capture_ops = {
1340 .open = snd_via82xx_capture_open, 1340 .open = snd_via82xx_capture_open,
1341 .close = snd_via82xx_pcm_close, 1341 .close = snd_via82xx_pcm_close,
1342 .ioctl = snd_pcm_lib_ioctl, 1342 .ioctl = snd_pcm_lib_ioctl,
1343 .hw_params = snd_via82xx_hw_params, 1343 .hw_params = snd_via82xx_hw_params,
1344 .hw_free = snd_via82xx_hw_free, 1344 .hw_free = snd_via82xx_hw_free,
1345 .prepare = snd_via8233_capture_prepare, 1345 .prepare = snd_via8233_capture_prepare,
1346 .trigger = snd_via82xx_pcm_trigger, 1346 .trigger = snd_via82xx_pcm_trigger,
1347 .pointer = snd_via8233_pcm_pointer, 1347 .pointer = snd_via8233_pcm_pointer,
1348 .page = snd_pcm_sgbuf_ops_page, 1348 .page = snd_pcm_sgbuf_ops_page,
1349 }; 1349 };
1350 1350
1351 1351
1352 static void init_viadev(struct via82xx *chip, int idx, unsigned int reg_offset, 1352 static void init_viadev(struct via82xx *chip, int idx, unsigned int reg_offset,
1353 int shadow_pos, int direction) 1353 int shadow_pos, int direction)
1354 { 1354 {
1355 chip->devs[idx].reg_offset = reg_offset; 1355 chip->devs[idx].reg_offset = reg_offset;
1356 chip->devs[idx].shadow_shift = shadow_pos * 4; 1356 chip->devs[idx].shadow_shift = shadow_pos * 4;
1357 chip->devs[idx].direction = direction; 1357 chip->devs[idx].direction = direction;
1358 chip->devs[idx].port = chip->port + reg_offset; 1358 chip->devs[idx].port = chip->port + reg_offset;
1359 } 1359 }
1360 1360
1361 /* 1361 /*
1362 * create pcm instances for VIA8233, 8233C and 8235 (not 8233A) 1362 * create pcm instances for VIA8233, 8233C and 8235 (not 8233A)
1363 */ 1363 */
1364 static int __devinit snd_via8233_pcm_new(struct via82xx *chip) 1364 static int __devinit snd_via8233_pcm_new(struct via82xx *chip)
1365 { 1365 {
1366 struct snd_pcm *pcm; 1366 struct snd_pcm *pcm;
1367 int i, err; 1367 int i, err;
1368 1368
1369 chip->playback_devno = 0; /* x 4 */ 1369 chip->playback_devno = 0; /* x 4 */
1370 chip->multi_devno = 4; /* x 1 */ 1370 chip->multi_devno = 4; /* x 1 */
1371 chip->capture_devno = 5; /* x 2 */ 1371 chip->capture_devno = 5; /* x 2 */
1372 chip->num_devs = 7; 1372 chip->num_devs = 7;
1373 chip->intr_mask = 0x33033333; /* FLAG|EOL for rec0-1, mc, sdx0-3 */ 1373 chip->intr_mask = 0x33033333; /* FLAG|EOL for rec0-1, mc, sdx0-3 */
1374 1374
1375 /* PCM #0: 4 DSX playbacks and 1 capture */ 1375 /* PCM #0: 4 DSX playbacks and 1 capture */
1376 err = snd_pcm_new(chip->card, chip->card->shortname, 0, 4, 1, &pcm); 1376 err = snd_pcm_new(chip->card, chip->card->shortname, 0, 4, 1, &pcm);
1377 if (err < 0) 1377 if (err < 0)
1378 return err; 1378 return err;
1379 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_via8233_playback_ops); 1379 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_via8233_playback_ops);
1380 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_via8233_capture_ops); 1380 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_via8233_capture_ops);
1381 pcm->private_data = chip; 1381 pcm->private_data = chip;
1382 strcpy(pcm->name, chip->card->shortname); 1382 strcpy(pcm->name, chip->card->shortname);
1383 chip->pcms[0] = pcm; 1383 chip->pcms[0] = pcm;
1384 /* set up playbacks */ 1384 /* set up playbacks */
1385 for (i = 0; i < 4; i++) 1385 for (i = 0; i < 4; i++)
1386 init_viadev(chip, i, 0x10 * i, i, 0); 1386 init_viadev(chip, i, 0x10 * i, i, 0);
1387 /* capture */ 1387 /* capture */
1388 init_viadev(chip, chip->capture_devno, VIA_REG_CAPTURE_8233_STATUS, 6, 1); 1388 init_viadev(chip, chip->capture_devno, VIA_REG_CAPTURE_8233_STATUS, 6, 1);
1389 1389
1390 if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG, 1390 if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
1391 snd_dma_pci_data(chip->pci), 1391 snd_dma_pci_data(chip->pci),
1392 64*1024, 128*1024)) < 0) 1392 64*1024, 128*1024)) < 0)
1393 return err; 1393 return err;
1394 1394
1395 /* PCM #1: multi-channel playback and 2nd capture */ 1395 /* PCM #1: multi-channel playback and 2nd capture */
1396 err = snd_pcm_new(chip->card, chip->card->shortname, 1, 1, 1, &pcm); 1396 err = snd_pcm_new(chip->card, chip->card->shortname, 1, 1, 1, &pcm);
1397 if (err < 0) 1397 if (err < 0)
1398 return err; 1398 return err;
1399 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_via8233_multi_ops); 1399 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_via8233_multi_ops);
1400 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_via8233_capture_ops); 1400 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_via8233_capture_ops);
1401 pcm->private_data = chip; 1401 pcm->private_data = chip;
1402 strcpy(pcm->name, chip->card->shortname); 1402 strcpy(pcm->name, chip->card->shortname);
1403 chip->pcms[1] = pcm; 1403 chip->pcms[1] = pcm;
1404 /* set up playback */ 1404 /* set up playback */
1405 init_viadev(chip, chip->multi_devno, VIA_REG_MULTPLAY_STATUS, 4, 0); 1405 init_viadev(chip, chip->multi_devno, VIA_REG_MULTPLAY_STATUS, 4, 0);
1406 /* set up capture */ 1406 /* set up capture */
1407 init_viadev(chip, chip->capture_devno + 1, VIA_REG_CAPTURE_8233_STATUS + 0x10, 7, 1); 1407 init_viadev(chip, chip->capture_devno + 1, VIA_REG_CAPTURE_8233_STATUS + 0x10, 7, 1);
1408 1408
1409 if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG, 1409 if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
1410 snd_dma_pci_data(chip->pci), 1410 snd_dma_pci_data(chip->pci),
1411 64*1024, 128*1024)) < 0) 1411 64*1024, 128*1024)) < 0)
1412 return err; 1412 return err;
1413 1413
1414 return 0; 1414 return 0;
1415 } 1415 }
1416 1416
1417 /* 1417 /*
1418 * create pcm instances for VIA8233A 1418 * create pcm instances for VIA8233A
1419 */ 1419 */
1420 static int __devinit snd_via8233a_pcm_new(struct via82xx *chip) 1420 static int __devinit snd_via8233a_pcm_new(struct via82xx *chip)
1421 { 1421 {
1422 struct snd_pcm *pcm; 1422 struct snd_pcm *pcm;
1423 int err; 1423 int err;
1424 1424
1425 chip->multi_devno = 0; 1425 chip->multi_devno = 0;
1426 chip->playback_devno = 1; 1426 chip->playback_devno = 1;
1427 chip->capture_devno = 2; 1427 chip->capture_devno = 2;
1428 chip->num_devs = 3; 1428 chip->num_devs = 3;
1429 chip->intr_mask = 0x03033000; /* FLAG|EOL for rec0, mc, sdx3 */ 1429 chip->intr_mask = 0x03033000; /* FLAG|EOL for rec0, mc, sdx3 */
1430 1430
1431 /* PCM #0: multi-channel playback and capture */ 1431 /* PCM #0: multi-channel playback and capture */
1432 err = snd_pcm_new(chip->card, chip->card->shortname, 0, 1, 1, &pcm); 1432 err = snd_pcm_new(chip->card, chip->card->shortname, 0, 1, 1, &pcm);
1433 if (err < 0) 1433 if (err < 0)
1434 return err; 1434 return err;
1435 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_via8233_multi_ops); 1435 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_via8233_multi_ops);
1436 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_via8233_capture_ops); 1436 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_via8233_capture_ops);
1437 pcm->private_data = chip; 1437 pcm->private_data = chip;
1438 strcpy(pcm->name, chip->card->shortname); 1438 strcpy(pcm->name, chip->card->shortname);
1439 chip->pcms[0] = pcm; 1439 chip->pcms[0] = pcm;
1440 /* set up playback */ 1440 /* set up playback */
1441 init_viadev(chip, chip->multi_devno, VIA_REG_MULTPLAY_STATUS, 4, 0); 1441 init_viadev(chip, chip->multi_devno, VIA_REG_MULTPLAY_STATUS, 4, 0);
1442 /* capture */ 1442 /* capture */
1443 init_viadev(chip, chip->capture_devno, VIA_REG_CAPTURE_8233_STATUS, 6, 1); 1443 init_viadev(chip, chip->capture_devno, VIA_REG_CAPTURE_8233_STATUS, 6, 1);
1444 1444
1445 if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG, 1445 if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
1446 snd_dma_pci_data(chip->pci), 1446 snd_dma_pci_data(chip->pci),
1447 64*1024, 128*1024)) < 0) 1447 64*1024, 128*1024)) < 0)
1448 return err; 1448 return err;
1449 1449
1450 /* SPDIF supported? */ 1450 /* SPDIF supported? */
1451 if (! ac97_can_spdif(chip->ac97)) 1451 if (! ac97_can_spdif(chip->ac97))
1452 return 0; 1452 return 0;
1453 1453
1454 /* PCM #1: DXS3 playback (for spdif) */ 1454 /* PCM #1: DXS3 playback (for spdif) */
1455 err = snd_pcm_new(chip->card, chip->card->shortname, 1, 1, 0, &pcm); 1455 err = snd_pcm_new(chip->card, chip->card->shortname, 1, 1, 0, &pcm);
1456 if (err < 0) 1456 if (err < 0)
1457 return err; 1457 return err;
1458 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_via8233_playback_ops); 1458 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_via8233_playback_ops);
1459 pcm->private_data = chip; 1459 pcm->private_data = chip;
1460 strcpy(pcm->name, chip->card->shortname); 1460 strcpy(pcm->name, chip->card->shortname);
1461 chip->pcms[1] = pcm; 1461 chip->pcms[1] = pcm;
1462 /* set up playback */ 1462 /* set up playback */
1463 init_viadev(chip, chip->playback_devno, 0x30, 3, 0); 1463 init_viadev(chip, chip->playback_devno, 0x30, 3, 0);
1464 1464
1465 if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG, 1465 if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
1466 snd_dma_pci_data(chip->pci), 1466 snd_dma_pci_data(chip->pci),
1467 64*1024, 128*1024)) < 0) 1467 64*1024, 128*1024)) < 0)
1468 return err; 1468 return err;
1469 1469
1470 return 0; 1470 return 0;
1471 } 1471 }
1472 1472
1473 /* 1473 /*
1474 * create a pcm instance for via686a/b 1474 * create a pcm instance for via686a/b
1475 */ 1475 */
1476 static int __devinit snd_via686_pcm_new(struct via82xx *chip) 1476 static int __devinit snd_via686_pcm_new(struct via82xx *chip)
1477 { 1477 {
1478 struct snd_pcm *pcm; 1478 struct snd_pcm *pcm;
1479 int err; 1479 int err;
1480 1480
1481 chip->playback_devno = 0; 1481 chip->playback_devno = 0;
1482 chip->capture_devno = 1; 1482 chip->capture_devno = 1;
1483 chip->num_devs = 2; 1483 chip->num_devs = 2;
1484 chip->intr_mask = 0x77; /* FLAG | EOL for PB, CP, FM */ 1484 chip->intr_mask = 0x77; /* FLAG | EOL for PB, CP, FM */
1485 1485
1486 err = snd_pcm_new(chip->card, chip->card->shortname, 0, 1, 1, &pcm); 1486 err = snd_pcm_new(chip->card, chip->card->shortname, 0, 1, 1, &pcm);
1487 if (err < 0) 1487 if (err < 0)
1488 return err; 1488 return err;
1489 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_via686_playback_ops); 1489 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_via686_playback_ops);
1490 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_via686_capture_ops); 1490 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_via686_capture_ops);
1491 pcm->private_data = chip; 1491 pcm->private_data = chip;
1492 strcpy(pcm->name, chip->card->shortname); 1492 strcpy(pcm->name, chip->card->shortname);
1493 chip->pcms[0] = pcm; 1493 chip->pcms[0] = pcm;
1494 init_viadev(chip, 0, VIA_REG_PLAYBACK_STATUS, 0, 0); 1494 init_viadev(chip, 0, VIA_REG_PLAYBACK_STATUS, 0, 0);
1495 init_viadev(chip, 1, VIA_REG_CAPTURE_STATUS, 0, 1); 1495 init_viadev(chip, 1, VIA_REG_CAPTURE_STATUS, 0, 1);
1496 1496
1497 if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG, 1497 if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
1498 snd_dma_pci_data(chip->pci), 1498 snd_dma_pci_data(chip->pci),
1499 64*1024, 128*1024)) < 0) 1499 64*1024, 128*1024)) < 0)
1500 return err; 1500 return err;
1501 1501
1502 return 0; 1502 return 0;
1503 } 1503 }
1504 1504
1505 1505
1506 /* 1506 /*
1507 * Mixer part 1507 * Mixer part
1508 */ 1508 */
1509 1509
1510 static int snd_via8233_capture_source_info(struct snd_kcontrol *kcontrol, 1510 static int snd_via8233_capture_source_info(struct snd_kcontrol *kcontrol,
1511 struct snd_ctl_elem_info *uinfo) 1511 struct snd_ctl_elem_info *uinfo)
1512 { 1512 {
1513 /* formerly they were "Line" and "Mic", but it looks like that they 1513 /* formerly they were "Line" and "Mic", but it looks like that they
1514 * have nothing to do with the actual physical connections... 1514 * have nothing to do with the actual physical connections...
1515 */ 1515 */
1516 static char *texts[2] = { 1516 static char *texts[2] = {
1517 "Input1", "Input2" 1517 "Input1", "Input2"
1518 }; 1518 };
1519 uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; 1519 uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
1520 uinfo->count = 1; 1520 uinfo->count = 1;
1521 uinfo->value.enumerated.items = 2; 1521 uinfo->value.enumerated.items = 2;
1522 if (uinfo->value.enumerated.item >= 2) 1522 if (uinfo->value.enumerated.item >= 2)
1523 uinfo->value.enumerated.item = 1; 1523 uinfo->value.enumerated.item = 1;
1524 strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]); 1524 strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
1525 return 0; 1525 return 0;
1526 } 1526 }
1527 1527
1528 static int snd_via8233_capture_source_get(struct snd_kcontrol *kcontrol, 1528 static int snd_via8233_capture_source_get(struct snd_kcontrol *kcontrol,
1529 struct snd_ctl_elem_value *ucontrol) 1529 struct snd_ctl_elem_value *ucontrol)
1530 { 1530 {
1531 struct via82xx *chip = snd_kcontrol_chip(kcontrol); 1531 struct via82xx *chip = snd_kcontrol_chip(kcontrol);
1532 unsigned long port = chip->port + (kcontrol->id.index ? (VIA_REG_CAPTURE_CHANNEL + 0x10) : VIA_REG_CAPTURE_CHANNEL); 1532 unsigned long port = chip->port + (kcontrol->id.index ? (VIA_REG_CAPTURE_CHANNEL + 0x10) : VIA_REG_CAPTURE_CHANNEL);
1533 ucontrol->value.enumerated.item[0] = inb(port) & VIA_REG_CAPTURE_CHANNEL_MIC ? 1 : 0; 1533 ucontrol->value.enumerated.item[0] = inb(port) & VIA_REG_CAPTURE_CHANNEL_MIC ? 1 : 0;
1534 return 0; 1534 return 0;
1535 } 1535 }
1536 1536
1537 static int snd_via8233_capture_source_put(struct snd_kcontrol *kcontrol, 1537 static int snd_via8233_capture_source_put(struct snd_kcontrol *kcontrol,
1538 struct snd_ctl_elem_value *ucontrol) 1538 struct snd_ctl_elem_value *ucontrol)
1539 { 1539 {
1540 struct via82xx *chip = snd_kcontrol_chip(kcontrol); 1540 struct via82xx *chip = snd_kcontrol_chip(kcontrol);
1541 unsigned long port = chip->port + (kcontrol->id.index ? (VIA_REG_CAPTURE_CHANNEL + 0x10) : VIA_REG_CAPTURE_CHANNEL); 1541 unsigned long port = chip->port + (kcontrol->id.index ? (VIA_REG_CAPTURE_CHANNEL + 0x10) : VIA_REG_CAPTURE_CHANNEL);
1542 u8 val, oval; 1542 u8 val, oval;
1543 1543
1544 spin_lock_irq(&chip->reg_lock); 1544 spin_lock_irq(&chip->reg_lock);
1545 oval = inb(port); 1545 oval = inb(port);
1546 val = oval & ~VIA_REG_CAPTURE_CHANNEL_MIC; 1546 val = oval & ~VIA_REG_CAPTURE_CHANNEL_MIC;
1547 if (ucontrol->value.enumerated.item[0]) 1547 if (ucontrol->value.enumerated.item[0])
1548 val |= VIA_REG_CAPTURE_CHANNEL_MIC; 1548 val |= VIA_REG_CAPTURE_CHANNEL_MIC;
1549 if (val != oval) 1549 if (val != oval)
1550 outb(val, port); 1550 outb(val, port);
1551 spin_unlock_irq(&chip->reg_lock); 1551 spin_unlock_irq(&chip->reg_lock);
1552 return val != oval; 1552 return val != oval;
1553 } 1553 }
1554 1554
1555 static struct snd_kcontrol_new snd_via8233_capture_source __devinitdata = { 1555 static struct snd_kcontrol_new snd_via8233_capture_source __devinitdata = {
1556 .name = "Input Source Select", 1556 .name = "Input Source Select",
1557 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1557 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
1558 .info = snd_via8233_capture_source_info, 1558 .info = snd_via8233_capture_source_info,
1559 .get = snd_via8233_capture_source_get, 1559 .get = snd_via8233_capture_source_get,
1560 .put = snd_via8233_capture_source_put, 1560 .put = snd_via8233_capture_source_put,
1561 }; 1561 };
1562 1562
1563 static int snd_via8233_dxs3_spdif_info(struct snd_kcontrol *kcontrol, 1563 static int snd_via8233_dxs3_spdif_info(struct snd_kcontrol *kcontrol,
1564 struct snd_ctl_elem_info *uinfo) 1564 struct snd_ctl_elem_info *uinfo)
1565 { 1565 {
1566 uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; 1566 uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
1567 uinfo->count = 1; 1567 uinfo->count = 1;
1568 uinfo->value.integer.min = 0; 1568 uinfo->value.integer.min = 0;
1569 uinfo->value.integer.max = 1; 1569 uinfo->value.integer.max = 1;
1570 return 0; 1570 return 0;
1571 } 1571 }
1572 1572
1573 static int snd_via8233_dxs3_spdif_get(struct snd_kcontrol *kcontrol, 1573 static int snd_via8233_dxs3_spdif_get(struct snd_kcontrol *kcontrol,
1574 struct snd_ctl_elem_value *ucontrol) 1574 struct snd_ctl_elem_value *ucontrol)
1575 { 1575 {
1576 struct via82xx *chip = snd_kcontrol_chip(kcontrol); 1576 struct via82xx *chip = snd_kcontrol_chip(kcontrol);
1577 u8 val; 1577 u8 val;
1578 1578
1579 pci_read_config_byte(chip->pci, VIA8233_SPDIF_CTRL, &val); 1579 pci_read_config_byte(chip->pci, VIA8233_SPDIF_CTRL, &val);
1580 ucontrol->value.integer.value[0] = (val & VIA8233_SPDIF_DX3) ? 1 : 0; 1580 ucontrol->value.integer.value[0] = (val & VIA8233_SPDIF_DX3) ? 1 : 0;
1581 return 0; 1581 return 0;
1582 } 1582 }
1583 1583
1584 static int snd_via8233_dxs3_spdif_put(struct snd_kcontrol *kcontrol, 1584 static int snd_via8233_dxs3_spdif_put(struct snd_kcontrol *kcontrol,
1585 struct snd_ctl_elem_value *ucontrol) 1585 struct snd_ctl_elem_value *ucontrol)
1586 { 1586 {
1587 struct via82xx *chip = snd_kcontrol_chip(kcontrol); 1587 struct via82xx *chip = snd_kcontrol_chip(kcontrol);
1588 u8 val, oval; 1588 u8 val, oval;
1589 1589
1590 pci_read_config_byte(chip->pci, VIA8233_SPDIF_CTRL, &oval); 1590 pci_read_config_byte(chip->pci, VIA8233_SPDIF_CTRL, &oval);
1591 val = oval & ~VIA8233_SPDIF_DX3; 1591 val = oval & ~VIA8233_SPDIF_DX3;
1592 if (ucontrol->value.integer.value[0]) 1592 if (ucontrol->value.integer.value[0])
1593 val |= VIA8233_SPDIF_DX3; 1593 val |= VIA8233_SPDIF_DX3;
1594 /* save the spdif flag for rate filtering */ 1594 /* save the spdif flag for rate filtering */
1595 chip->spdif_on = ucontrol->value.integer.value[0] ? 1 : 0; 1595 chip->spdif_on = ucontrol->value.integer.value[0] ? 1 : 0;
1596 if (val != oval) { 1596 if (val != oval) {
1597 pci_write_config_byte(chip->pci, VIA8233_SPDIF_CTRL, val); 1597 pci_write_config_byte(chip->pci, VIA8233_SPDIF_CTRL, val);
1598 return 1; 1598 return 1;
1599 } 1599 }
1600 return 0; 1600 return 0;
1601 } 1601 }
1602 1602
1603 static struct snd_kcontrol_new snd_via8233_dxs3_spdif_control __devinitdata = { 1603 static struct snd_kcontrol_new snd_via8233_dxs3_spdif_control __devinitdata = {
1604 .name = SNDRV_CTL_NAME_IEC958("Output ",NONE,SWITCH), 1604 .name = SNDRV_CTL_NAME_IEC958("Output ",NONE,SWITCH),
1605 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1605 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
1606 .info = snd_via8233_dxs3_spdif_info, 1606 .info = snd_via8233_dxs3_spdif_info,
1607 .get = snd_via8233_dxs3_spdif_get, 1607 .get = snd_via8233_dxs3_spdif_get,
1608 .put = snd_via8233_dxs3_spdif_put, 1608 .put = snd_via8233_dxs3_spdif_put,
1609 }; 1609 };
1610 1610
1611 static int snd_via8233_dxs_volume_info(struct snd_kcontrol *kcontrol, 1611 static int snd_via8233_dxs_volume_info(struct snd_kcontrol *kcontrol,
1612 struct snd_ctl_elem_info *uinfo) 1612 struct snd_ctl_elem_info *uinfo)
1613 { 1613 {
1614 uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; 1614 uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
1615 uinfo->count = 2; 1615 uinfo->count = 2;
1616 uinfo->value.integer.min = 0; 1616 uinfo->value.integer.min = 0;
1617 uinfo->value.integer.max = VIA_DXS_MAX_VOLUME; 1617 uinfo->value.integer.max = VIA_DXS_MAX_VOLUME;
1618 return 0; 1618 return 0;
1619 } 1619 }
1620 1620
1621 static int snd_via8233_dxs_volume_get(struct snd_kcontrol *kcontrol, 1621 static int snd_via8233_dxs_volume_get(struct snd_kcontrol *kcontrol,
1622 struct snd_ctl_elem_value *ucontrol) 1622 struct snd_ctl_elem_value *ucontrol)
1623 { 1623 {
1624 struct via82xx *chip = snd_kcontrol_chip(kcontrol); 1624 struct via82xx *chip = snd_kcontrol_chip(kcontrol);
1625 unsigned int idx = snd_ctl_get_ioff(kcontrol, &ucontrol->id); 1625 unsigned int idx = snd_ctl_get_ioff(kcontrol, &ucontrol->id);
1626 1626
1627 ucontrol->value.integer.value[0] = VIA_DXS_MAX_VOLUME - chip->playback_volume[idx][0]; 1627 ucontrol->value.integer.value[0] = VIA_DXS_MAX_VOLUME - chip->playback_volume[idx][0];
1628 ucontrol->value.integer.value[1] = VIA_DXS_MAX_VOLUME - chip->playback_volume[idx][1]; 1628 ucontrol->value.integer.value[1] = VIA_DXS_MAX_VOLUME - chip->playback_volume[idx][1];
1629 return 0; 1629 return 0;
1630 } 1630 }
1631 1631
1632 static int snd_via8233_pcmdxs_volume_get(struct snd_kcontrol *kcontrol, 1632 static int snd_via8233_pcmdxs_volume_get(struct snd_kcontrol *kcontrol,
1633 struct snd_ctl_elem_value *ucontrol) 1633 struct snd_ctl_elem_value *ucontrol)
1634 { 1634 {
1635 struct via82xx *chip = snd_kcontrol_chip(kcontrol); 1635 struct via82xx *chip = snd_kcontrol_chip(kcontrol);
1636 ucontrol->value.integer.value[0] = VIA_DXS_MAX_VOLUME - chip->playback_volume_c[0]; 1636 ucontrol->value.integer.value[0] = VIA_DXS_MAX_VOLUME - chip->playback_volume_c[0];
1637 ucontrol->value.integer.value[1] = VIA_DXS_MAX_VOLUME - chip->playback_volume_c[1]; 1637 ucontrol->value.integer.value[1] = VIA_DXS_MAX_VOLUME - chip->playback_volume_c[1];
1638 return 0; 1638 return 0;
1639 } 1639 }
1640 1640
1641 static int snd_via8233_dxs_volume_put(struct snd_kcontrol *kcontrol, 1641 static int snd_via8233_dxs_volume_put(struct snd_kcontrol *kcontrol,
1642 struct snd_ctl_elem_value *ucontrol) 1642 struct snd_ctl_elem_value *ucontrol)
1643 { 1643 {
1644 struct via82xx *chip = snd_kcontrol_chip(kcontrol); 1644 struct via82xx *chip = snd_kcontrol_chip(kcontrol);
1645 unsigned int idx = snd_ctl_get_ioff(kcontrol, &ucontrol->id); 1645 unsigned int idx = snd_ctl_get_ioff(kcontrol, &ucontrol->id);
1646 unsigned long port = chip->port + 0x10 * idx; 1646 unsigned long port = chip->port + 0x10 * idx;
1647 unsigned char val; 1647 unsigned char val;
1648 int i, change = 0; 1648 int i, change = 0;
1649 1649
1650 for (i = 0; i < 2; i++) { 1650 for (i = 0; i < 2; i++) {
1651 val = ucontrol->value.integer.value[i]; 1651 val = ucontrol->value.integer.value[i];
1652 if (val > VIA_DXS_MAX_VOLUME) 1652 if (val > VIA_DXS_MAX_VOLUME)
1653 val = VIA_DXS_MAX_VOLUME; 1653 val = VIA_DXS_MAX_VOLUME;
1654 val = VIA_DXS_MAX_VOLUME - val; 1654 val = VIA_DXS_MAX_VOLUME - val;
1655 change |= val != chip->playback_volume[idx][i]; 1655 change |= val != chip->playback_volume[idx][i];
1656 if (change) { 1656 if (change) {
1657 chip->playback_volume[idx][i] = val; 1657 chip->playback_volume[idx][i] = val;
1658 outb(val, port + VIA_REG_OFS_PLAYBACK_VOLUME_L + i); 1658 outb(val, port + VIA_REG_OFS_PLAYBACK_VOLUME_L + i);
1659 } 1659 }
1660 } 1660 }
1661 return change; 1661 return change;
1662 } 1662 }
1663 1663
1664 static int snd_via8233_pcmdxs_volume_put(struct snd_kcontrol *kcontrol, 1664 static int snd_via8233_pcmdxs_volume_put(struct snd_kcontrol *kcontrol,
1665 struct snd_ctl_elem_value *ucontrol) 1665 struct snd_ctl_elem_value *ucontrol)
1666 { 1666 {
1667 struct via82xx *chip = snd_kcontrol_chip(kcontrol); 1667 struct via82xx *chip = snd_kcontrol_chip(kcontrol);
1668 unsigned int idx; 1668 unsigned int idx;
1669 unsigned char val; 1669 unsigned char val;
1670 int i, change = 0; 1670 int i, change = 0;
1671 1671
1672 for (i = 0; i < 2; i++) { 1672 for (i = 0; i < 2; i++) {
1673 val = ucontrol->value.integer.value[i]; 1673 val = ucontrol->value.integer.value[i];
1674 if (val > VIA_DXS_MAX_VOLUME) 1674 if (val > VIA_DXS_MAX_VOLUME)
1675 val = VIA_DXS_MAX_VOLUME; 1675 val = VIA_DXS_MAX_VOLUME;
1676 val = VIA_DXS_MAX_VOLUME - val; 1676 val = VIA_DXS_MAX_VOLUME - val;
1677 if (val != chip->playback_volume_c[i]) { 1677 if (val != chip->playback_volume_c[i]) {
1678 change = 1; 1678 change = 1;
1679 chip->playback_volume_c[i] = val; 1679 chip->playback_volume_c[i] = val;
1680 for (idx = 0; idx < 4; idx++) { 1680 for (idx = 0; idx < 4; idx++) {
1681 unsigned long port = chip->port + 0x10 * idx; 1681 unsigned long port = chip->port + 0x10 * idx;
1682 chip->playback_volume[idx][i] = val; 1682 chip->playback_volume[idx][i] = val;
1683 outb(val, port + VIA_REG_OFS_PLAYBACK_VOLUME_L + i); 1683 outb(val, port + VIA_REG_OFS_PLAYBACK_VOLUME_L + i);
1684 } 1684 }
1685 } 1685 }
1686 } 1686 }
1687 return change; 1687 return change;
1688 } 1688 }
1689 1689
1690 static struct snd_kcontrol_new snd_via8233_pcmdxs_volume_control __devinitdata = { 1690 static struct snd_kcontrol_new snd_via8233_pcmdxs_volume_control __devinitdata = {
1691 .name = "PCM Playback Volume", 1691 .name = "PCM Playback Volume",
1692 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1692 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
1693 .info = snd_via8233_dxs_volume_info, 1693 .info = snd_via8233_dxs_volume_info,
1694 .get = snd_via8233_pcmdxs_volume_get, 1694 .get = snd_via8233_pcmdxs_volume_get,
1695 .put = snd_via8233_pcmdxs_volume_put, 1695 .put = snd_via8233_pcmdxs_volume_put,
1696 }; 1696 };
1697 1697
1698 static struct snd_kcontrol_new snd_via8233_dxs_volume_control __devinitdata = { 1698 static struct snd_kcontrol_new snd_via8233_dxs_volume_control __devinitdata = {
1699 .name = "VIA DXS Playback Volume", 1699 .name = "VIA DXS Playback Volume",
1700 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1700 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
1701 .count = 4, 1701 .count = 4,
1702 .info = snd_via8233_dxs_volume_info, 1702 .info = snd_via8233_dxs_volume_info,
1703 .get = snd_via8233_dxs_volume_get, 1703 .get = snd_via8233_dxs_volume_get,
1704 .put = snd_via8233_dxs_volume_put, 1704 .put = snd_via8233_dxs_volume_put,
1705 }; 1705 };
1706 1706
1707 /* 1707 /*
1708 */ 1708 */
1709 1709
1710 static void snd_via82xx_mixer_free_ac97_bus(struct snd_ac97_bus *bus) 1710 static void snd_via82xx_mixer_free_ac97_bus(struct snd_ac97_bus *bus)
1711 { 1711 {
1712 struct via82xx *chip = bus->private_data; 1712 struct via82xx *chip = bus->private_data;
1713 chip->ac97_bus = NULL; 1713 chip->ac97_bus = NULL;
1714 } 1714 }
1715 1715
1716 static void snd_via82xx_mixer_free_ac97(struct snd_ac97 *ac97) 1716 static void snd_via82xx_mixer_free_ac97(struct snd_ac97 *ac97)
1717 { 1717 {
1718 struct via82xx *chip = ac97->private_data; 1718 struct via82xx *chip = ac97->private_data;
1719 chip->ac97 = NULL; 1719 chip->ac97 = NULL;
1720 } 1720 }
1721 1721
1722 static struct ac97_quirk ac97_quirks[] = { 1722 static struct ac97_quirk ac97_quirks[] = {
1723 { 1723 {
1724 .subvendor = 0x1106, 1724 .subvendor = 0x1106,
1725 .subdevice = 0x4161, 1725 .subdevice = 0x4161,
1726 .codec_id = 0x56494161, /* VT1612A */ 1726 .codec_id = 0x56494161, /* VT1612A */
1727 .name = "Soltek SL-75DRV5", 1727 .name = "Soltek SL-75DRV5",
1728 .type = AC97_TUNE_NONE 1728 .type = AC97_TUNE_NONE
1729 }, 1729 },
1730 { /* FIXME: which codec? */ 1730 { /* FIXME: which codec? */
1731 .subvendor = 0x1106, 1731 .subvendor = 0x1106,
1732 .subdevice = 0x4161, 1732 .subdevice = 0x4161,
1733 .name = "ASRock K7VT2", 1733 .name = "ASRock K7VT2",
1734 .type = AC97_TUNE_HP_ONLY 1734 .type = AC97_TUNE_HP_ONLY
1735 }, 1735 },
1736 { 1736 {
1737 .subvendor = 0x1019, 1737 .subvendor = 0x1019,
1738 .subdevice = 0x0a81, 1738 .subdevice = 0x0a81,
1739 .name = "ECS K7VTA3", 1739 .name = "ECS K7VTA3",
1740 .type = AC97_TUNE_HP_ONLY 1740 .type = AC97_TUNE_HP_ONLY
1741 }, 1741 },
1742 { 1742 {
1743 .subvendor = 0x1019, 1743 .subvendor = 0x1019,
1744 .subdevice = 0x0a85, 1744 .subdevice = 0x0a85,
1745 .name = "ECS L7VMM2", 1745 .name = "ECS L7VMM2",
1746 .type = AC97_TUNE_HP_ONLY 1746 .type = AC97_TUNE_HP_ONLY
1747 }, 1747 },
1748 { 1748 {
1749 .subvendor = 0x1849, 1749 .subvendor = 0x1849,
1750 .subdevice = 0x3059, 1750 .subdevice = 0x3059,
1751 .name = "ASRock K7VM2", 1751 .name = "ASRock K7VM2",
1752 .type = AC97_TUNE_HP_ONLY /* VT1616 */ 1752 .type = AC97_TUNE_HP_ONLY /* VT1616 */
1753 }, 1753 },
1754 { 1754 {
1755 .subvendor = 0x14cd, 1755 .subvendor = 0x14cd,
1756 .subdevice = 0x7002, 1756 .subdevice = 0x7002,
1757 .name = "Unknown", 1757 .name = "Unknown",
1758 .type = AC97_TUNE_ALC_JACK 1758 .type = AC97_TUNE_ALC_JACK
1759 }, 1759 },
1760 { 1760 {
1761 .subvendor = 0x1071, 1761 .subvendor = 0x1071,
1762 .subdevice = 0x8590, 1762 .subdevice = 0x8590,
1763 .name = "Mitac Mobo", 1763 .name = "Mitac Mobo",
1764 .type = AC97_TUNE_ALC_JACK 1764 .type = AC97_TUNE_ALC_JACK
1765 }, 1765 },
1766 { 1766 {
1767 .subvendor = 0x161f, 1767 .subvendor = 0x161f,
1768 .subdevice = 0x202b, 1768 .subdevice = 0x202b,
1769 .name = "Arima Notebook", 1769 .name = "Arima Notebook",
1770 .type = AC97_TUNE_HP_ONLY, 1770 .type = AC97_TUNE_HP_ONLY,
1771 }, 1771 },
1772 { 1772 {
1773 .subvendor = 0x161f, 1773 .subvendor = 0x161f,
1774 .subdevice = 0x2032, 1774 .subdevice = 0x2032,
1775 .name = "Targa Traveller 811", 1775 .name = "Targa Traveller 811",
1776 .type = AC97_TUNE_HP_ONLY, 1776 .type = AC97_TUNE_HP_ONLY,
1777 }, 1777 },
1778 { 1778 {
1779 .subvendor = 0x161f, 1779 .subvendor = 0x161f,
1780 .subdevice = 0x2032, 1780 .subdevice = 0x2032,
1781 .name = "m680x", 1781 .name = "m680x",
1782 .type = AC97_TUNE_HP_ONLY, /* http://launchpad.net/bugs/38546 */ 1782 .type = AC97_TUNE_HP_ONLY, /* http://launchpad.net/bugs/38546 */
1783 }, 1783 },
1784 { } /* terminator */ 1784 { } /* terminator */
1785 }; 1785 };
1786 1786
1787 static int __devinit snd_via82xx_mixer_new(struct via82xx *chip, const char *quirk_override) 1787 static int __devinit snd_via82xx_mixer_new(struct via82xx *chip, const char *quirk_override)
1788 { 1788 {
1789 struct snd_ac97_template ac97; 1789 struct snd_ac97_template ac97;
1790 int err; 1790 int err;
1791 static struct snd_ac97_bus_ops ops = { 1791 static struct snd_ac97_bus_ops ops = {
1792 .write = snd_via82xx_codec_write, 1792 .write = snd_via82xx_codec_write,
1793 .read = snd_via82xx_codec_read, 1793 .read = snd_via82xx_codec_read,
1794 .wait = snd_via82xx_codec_wait, 1794 .wait = snd_via82xx_codec_wait,
1795 }; 1795 };
1796 1796
1797 if ((err = snd_ac97_bus(chip->card, 0, &ops, chip, &chip->ac97_bus)) < 0) 1797 if ((err = snd_ac97_bus(chip->card, 0, &ops, chip, &chip->ac97_bus)) < 0)
1798 return err; 1798 return err;
1799 chip->ac97_bus->private_free = snd_via82xx_mixer_free_ac97_bus; 1799 chip->ac97_bus->private_free = snd_via82xx_mixer_free_ac97_bus;
1800 chip->ac97_bus->clock = chip->ac97_clock; 1800 chip->ac97_bus->clock = chip->ac97_clock;
1801 1801
1802 memset(&ac97, 0, sizeof(ac97)); 1802 memset(&ac97, 0, sizeof(ac97));
1803 ac97.private_data = chip; 1803 ac97.private_data = chip;
1804 ac97.private_free = snd_via82xx_mixer_free_ac97; 1804 ac97.private_free = snd_via82xx_mixer_free_ac97;
1805 ac97.pci = chip->pci; 1805 ac97.pci = chip->pci;
1806 ac97.scaps = AC97_SCAP_SKIP_MODEM; 1806 ac97.scaps = AC97_SCAP_SKIP_MODEM;
1807 if ((err = snd_ac97_mixer(chip->ac97_bus, &ac97, &chip->ac97)) < 0) 1807 if ((err = snd_ac97_mixer(chip->ac97_bus, &ac97, &chip->ac97)) < 0)
1808 return err; 1808 return err;
1809 1809
1810 snd_ac97_tune_hardware(chip->ac97, ac97_quirks, quirk_override); 1810 snd_ac97_tune_hardware(chip->ac97, ac97_quirks, quirk_override);
1811 1811
1812 if (chip->chip_type != TYPE_VIA686) { 1812 if (chip->chip_type != TYPE_VIA686) {
1813 /* use slot 10/11 */ 1813 /* use slot 10/11 */
1814 snd_ac97_update_bits(chip->ac97, AC97_EXTENDED_STATUS, 0x03 << 4, 0x03 << 4); 1814 snd_ac97_update_bits(chip->ac97, AC97_EXTENDED_STATUS, 0x03 << 4, 0x03 << 4);
1815 } 1815 }
1816 1816
1817 return 0; 1817 return 0;
1818 } 1818 }
1819 1819
1820 #ifdef SUPPORT_JOYSTICK 1820 #ifdef SUPPORT_JOYSTICK
1821 #define JOYSTICK_ADDR 0x200 1821 #define JOYSTICK_ADDR 0x200
1822 static int __devinit snd_via686_create_gameport(struct via82xx *chip, unsigned char *legacy) 1822 static int __devinit snd_via686_create_gameport(struct via82xx *chip, unsigned char *legacy)
1823 { 1823 {
1824 struct gameport *gp; 1824 struct gameport *gp;
1825 struct resource *r; 1825 struct resource *r;
1826 1826
1827 if (!joystick) 1827 if (!joystick)
1828 return -ENODEV; 1828 return -ENODEV;
1829 1829
1830 r = request_region(JOYSTICK_ADDR, 8, "VIA686 gameport"); 1830 r = request_region(JOYSTICK_ADDR, 8, "VIA686 gameport");
1831 if (!r) { 1831 if (!r) {
1832 printk(KERN_WARNING "via82xx: cannot reserve joystick port 0x%#x\n", 1832 printk(KERN_WARNING "via82xx: cannot reserve joystick port 0x%#x\n",
1833 JOYSTICK_ADDR); 1833 JOYSTICK_ADDR);
1834 return -EBUSY; 1834 return -EBUSY;
1835 } 1835 }
1836 1836
1837 chip->gameport = gp = gameport_allocate_port(); 1837 chip->gameport = gp = gameport_allocate_port();
1838 if (!gp) { 1838 if (!gp) {
1839 printk(KERN_ERR "via82xx: cannot allocate memory for gameport\n"); 1839 printk(KERN_ERR "via82xx: cannot allocate memory for gameport\n");
1840 release_and_free_resource(r); 1840 release_and_free_resource(r);
1841 return -ENOMEM; 1841 return -ENOMEM;
1842 } 1842 }
1843 1843
1844 gameport_set_name(gp, "VIA686 Gameport"); 1844 gameport_set_name(gp, "VIA686 Gameport");
1845 gameport_set_phys(gp, "pci%s/gameport0", pci_name(chip->pci)); 1845 gameport_set_phys(gp, "pci%s/gameport0", pci_name(chip->pci));
1846 gameport_set_dev_parent(gp, &chip->pci->dev); 1846 gameport_set_dev_parent(gp, &chip->pci->dev);
1847 gp->io = JOYSTICK_ADDR; 1847 gp->io = JOYSTICK_ADDR;
1848 gameport_set_port_data(gp, r); 1848 gameport_set_port_data(gp, r);
1849 1849
1850 /* Enable legacy joystick port */ 1850 /* Enable legacy joystick port */
1851 *legacy |= VIA_FUNC_ENABLE_GAME; 1851 *legacy |= VIA_FUNC_ENABLE_GAME;
1852 pci_write_config_byte(chip->pci, VIA_FUNC_ENABLE, *legacy); 1852 pci_write_config_byte(chip->pci, VIA_FUNC_ENABLE, *legacy);
1853 1853
1854 gameport_register_port(chip->gameport); 1854 gameport_register_port(chip->gameport);
1855 1855
1856 return 0; 1856 return 0;
1857 } 1857 }
1858 1858
1859 static void snd_via686_free_gameport(struct via82xx *chip) 1859 static void snd_via686_free_gameport(struct via82xx *chip)
1860 { 1860 {
1861 if (chip->gameport) { 1861 if (chip->gameport) {
1862 struct resource *r = gameport_get_port_data(chip->gameport); 1862 struct resource *r = gameport_get_port_data(chip->gameport);
1863 1863
1864 gameport_unregister_port(chip->gameport); 1864 gameport_unregister_port(chip->gameport);
1865 chip->gameport = NULL; 1865 chip->gameport = NULL;
1866 release_and_free_resource(r); 1866 release_and_free_resource(r);
1867 } 1867 }
1868 } 1868 }
1869 #else 1869 #else
1870 static inline int snd_via686_create_gameport(struct via82xx *chip, unsigned char *legacy) 1870 static inline int snd_via686_create_gameport(struct via82xx *chip, unsigned char *legacy)
1871 { 1871 {
1872 return -ENOSYS; 1872 return -ENOSYS;
1873 } 1873 }
1874 static inline void snd_via686_free_gameport(struct via82xx *chip) { } 1874 static inline void snd_via686_free_gameport(struct via82xx *chip) { }
1875 #endif 1875 #endif
1876 1876
1877 1877
1878 /* 1878 /*
1879 * 1879 *
1880 */ 1880 */
1881 1881
1882 static int __devinit snd_via8233_init_misc(struct via82xx *chip) 1882 static int __devinit snd_via8233_init_misc(struct via82xx *chip)
1883 { 1883 {
1884 int i, err, caps; 1884 int i, err, caps;
1885 unsigned char val; 1885 unsigned char val;
1886 1886
1887 caps = chip->chip_type == TYPE_VIA8233A ? 1 : 2; 1887 caps = chip->chip_type == TYPE_VIA8233A ? 1 : 2;
1888 for (i = 0; i < caps; i++) { 1888 for (i = 0; i < caps; i++) {
1889 snd_via8233_capture_source.index = i; 1889 snd_via8233_capture_source.index = i;
1890 err = snd_ctl_add(chip->card, snd_ctl_new1(&snd_via8233_capture_source, chip)); 1890 err = snd_ctl_add(chip->card, snd_ctl_new1(&snd_via8233_capture_source, chip));
1891 if (err < 0) 1891 if (err < 0)
1892 return err; 1892 return err;
1893 } 1893 }
1894 if (ac97_can_spdif(chip->ac97)) { 1894 if (ac97_can_spdif(chip->ac97)) {
1895 err = snd_ctl_add(chip->card, snd_ctl_new1(&snd_via8233_dxs3_spdif_control, chip)); 1895 err = snd_ctl_add(chip->card, snd_ctl_new1(&snd_via8233_dxs3_spdif_control, chip));
1896 if (err < 0) 1896 if (err < 0)
1897 return err; 1897 return err;
1898 } 1898 }
1899 if (chip->chip_type != TYPE_VIA8233A) { 1899 if (chip->chip_type != TYPE_VIA8233A) {
1900 /* when no h/w PCM volume control is found, use DXS volume control 1900 /* when no h/w PCM volume control is found, use DXS volume control
1901 * as the PCM vol control 1901 * as the PCM vol control
1902 */ 1902 */
1903 struct snd_ctl_elem_id sid; 1903 struct snd_ctl_elem_id sid;
1904 memset(&sid, 0, sizeof(sid)); 1904 memset(&sid, 0, sizeof(sid));
1905 strcpy(sid.name, "PCM Playback Volume"); 1905 strcpy(sid.name, "PCM Playback Volume");
1906 sid.iface = SNDRV_CTL_ELEM_IFACE_MIXER; 1906 sid.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
1907 if (! snd_ctl_find_id(chip->card, &sid)) { 1907 if (! snd_ctl_find_id(chip->card, &sid)) {
1908 snd_printd(KERN_INFO "Using DXS as PCM Playback\n"); 1908 snd_printd(KERN_INFO "Using DXS as PCM Playback\n");
1909 err = snd_ctl_add(chip->card, snd_ctl_new1(&snd_via8233_pcmdxs_volume_control, chip)); 1909 err = snd_ctl_add(chip->card, snd_ctl_new1(&snd_via8233_pcmdxs_volume_control, chip));
1910 if (err < 0) 1910 if (err < 0)
1911 return err; 1911 return err;
1912 } 1912 }
1913 else /* Using DXS when PCM emulation is enabled is really weird */ 1913 else /* Using DXS when PCM emulation is enabled is really weird */
1914 { 1914 {
1915 /* Standalone DXS controls */ 1915 /* Standalone DXS controls */
1916 err = snd_ctl_add(chip->card, snd_ctl_new1(&snd_via8233_dxs_volume_control, chip)); 1916 err = snd_ctl_add(chip->card, snd_ctl_new1(&snd_via8233_dxs_volume_control, chip));
1917 if (err < 0) 1917 if (err < 0)
1918 return err; 1918 return err;
1919 } 1919 }
1920 } 1920 }
1921 /* select spdif data slot 10/11 */ 1921 /* select spdif data slot 10/11 */
1922 pci_read_config_byte(chip->pci, VIA8233_SPDIF_CTRL, &val); 1922 pci_read_config_byte(chip->pci, VIA8233_SPDIF_CTRL, &val);
1923 val = (val & ~VIA8233_SPDIF_SLOT_MASK) | VIA8233_SPDIF_SLOT_1011; 1923 val = (val & ~VIA8233_SPDIF_SLOT_MASK) | VIA8233_SPDIF_SLOT_1011;
1924 val &= ~VIA8233_SPDIF_DX3; /* SPDIF off as default */ 1924 val &= ~VIA8233_SPDIF_DX3; /* SPDIF off as default */
1925 pci_write_config_byte(chip->pci, VIA8233_SPDIF_CTRL, val); 1925 pci_write_config_byte(chip->pci, VIA8233_SPDIF_CTRL, val);
1926 1926
1927 return 0; 1927 return 0;
1928 } 1928 }
1929 1929
1930 static int __devinit snd_via686_init_misc(struct via82xx *chip) 1930 static int __devinit snd_via686_init_misc(struct via82xx *chip)
1931 { 1931 {
1932 unsigned char legacy, legacy_cfg; 1932 unsigned char legacy, legacy_cfg;
1933 int rev_h = 0; 1933 int rev_h = 0;
1934 1934
1935 legacy = chip->old_legacy; 1935 legacy = chip->old_legacy;
1936 legacy_cfg = chip->old_legacy_cfg; 1936 legacy_cfg = chip->old_legacy_cfg;
1937 legacy |= VIA_FUNC_MIDI_IRQMASK; /* FIXME: correct? (disable MIDI) */ 1937 legacy |= VIA_FUNC_MIDI_IRQMASK; /* FIXME: correct? (disable MIDI) */
1938 legacy &= ~VIA_FUNC_ENABLE_GAME; /* disable joystick */ 1938 legacy &= ~VIA_FUNC_ENABLE_GAME; /* disable joystick */
1939 if (chip->revision >= VIA_REV_686_H) { 1939 if (chip->revision >= VIA_REV_686_H) {
1940 rev_h = 1; 1940 rev_h = 1;
1941 if (mpu_port >= 0x200) { /* force MIDI */ 1941 if (mpu_port >= 0x200) { /* force MIDI */
1942 mpu_port &= 0xfffc; 1942 mpu_port &= 0xfffc;
1943 pci_write_config_dword(chip->pci, 0x18, mpu_port | 0x01); 1943 pci_write_config_dword(chip->pci, 0x18, mpu_port | 0x01);
1944 #ifdef CONFIG_PM 1944 #ifdef CONFIG_PM
1945 chip->mpu_port_saved = mpu_port; 1945 chip->mpu_port_saved = mpu_port;
1946 #endif 1946 #endif
1947 } else { 1947 } else {
1948 mpu_port = pci_resource_start(chip->pci, 2); 1948 mpu_port = pci_resource_start(chip->pci, 2);
1949 } 1949 }
1950 } else { 1950 } else {
1951 switch (mpu_port) { /* force MIDI */ 1951 switch (mpu_port) { /* force MIDI */
1952 case 0x300: 1952 case 0x300:
1953 case 0x310: 1953 case 0x310:
1954 case 0x320: 1954 case 0x320:
1955 case 0x330: 1955 case 0x330:
1956 legacy_cfg &= ~(3 << 2); 1956 legacy_cfg &= ~(3 << 2);
1957 legacy_cfg |= (mpu_port & 0x0030) >> 2; 1957 legacy_cfg |= (mpu_port & 0x0030) >> 2;
1958 break; 1958 break;
1959 default: /* no, use BIOS settings */ 1959 default: /* no, use BIOS settings */
1960 if (legacy & VIA_FUNC_ENABLE_MIDI) 1960 if (legacy & VIA_FUNC_ENABLE_MIDI)
1961 mpu_port = 0x300 + ((legacy_cfg & 0x000c) << 2); 1961 mpu_port = 0x300 + ((legacy_cfg & 0x000c) << 2);
1962 break; 1962 break;
1963 } 1963 }
1964 } 1964 }
1965 if (mpu_port >= 0x200 && 1965 if (mpu_port >= 0x200 &&
1966 (chip->mpu_res = request_region(mpu_port, 2, "VIA82xx MPU401")) 1966 (chip->mpu_res = request_region(mpu_port, 2, "VIA82xx MPU401"))
1967 != NULL) { 1967 != NULL) {
1968 if (rev_h) 1968 if (rev_h)
1969 legacy |= VIA_FUNC_MIDI_PNP; /* enable PCI I/O 2 */ 1969 legacy |= VIA_FUNC_MIDI_PNP; /* enable PCI I/O 2 */
1970 legacy |= VIA_FUNC_ENABLE_MIDI; 1970 legacy |= VIA_FUNC_ENABLE_MIDI;
1971 } else { 1971 } else {
1972 if (rev_h) 1972 if (rev_h)
1973 legacy &= ~VIA_FUNC_MIDI_PNP; /* disable PCI I/O 2 */ 1973 legacy &= ~VIA_FUNC_MIDI_PNP; /* disable PCI I/O 2 */
1974 legacy &= ~VIA_FUNC_ENABLE_MIDI; 1974 legacy &= ~VIA_FUNC_ENABLE_MIDI;
1975 mpu_port = 0; 1975 mpu_port = 0;
1976 } 1976 }
1977 1977
1978 pci_write_config_byte(chip->pci, VIA_FUNC_ENABLE, legacy); 1978 pci_write_config_byte(chip->pci, VIA_FUNC_ENABLE, legacy);
1979 pci_write_config_byte(chip->pci, VIA_PNP_CONTROL, legacy_cfg); 1979 pci_write_config_byte(chip->pci, VIA_PNP_CONTROL, legacy_cfg);
1980 if (chip->mpu_res) { 1980 if (chip->mpu_res) {
1981 if (snd_mpu401_uart_new(chip->card, 0, MPU401_HW_VIA686A, 1981 if (snd_mpu401_uart_new(chip->card, 0, MPU401_HW_VIA686A,
1982 mpu_port, MPU401_INFO_INTEGRATED, 1982 mpu_port, MPU401_INFO_INTEGRATED,
1983 chip->irq, 0, &chip->rmidi) < 0) { 1983 chip->irq, 0, &chip->rmidi) < 0) {
1984 printk(KERN_WARNING "unable to initialize MPU-401" 1984 printk(KERN_WARNING "unable to initialize MPU-401"
1985 " at 0x%lx, skipping\n", mpu_port); 1985 " at 0x%lx, skipping\n", mpu_port);
1986 legacy &= ~VIA_FUNC_ENABLE_MIDI; 1986 legacy &= ~VIA_FUNC_ENABLE_MIDI;
1987 } else { 1987 } else {
1988 legacy &= ~VIA_FUNC_MIDI_IRQMASK; /* enable MIDI interrupt */ 1988 legacy &= ~VIA_FUNC_MIDI_IRQMASK; /* enable MIDI interrupt */
1989 } 1989 }
1990 pci_write_config_byte(chip->pci, VIA_FUNC_ENABLE, legacy); 1990 pci_write_config_byte(chip->pci, VIA_FUNC_ENABLE, legacy);
1991 } 1991 }
1992 1992
1993 snd_via686_create_gameport(chip, &legacy); 1993 snd_via686_create_gameport(chip, &legacy);
1994 1994
1995 #ifdef CONFIG_PM 1995 #ifdef CONFIG_PM
1996 chip->legacy_saved = legacy; 1996 chip->legacy_saved = legacy;
1997 chip->legacy_cfg_saved = legacy_cfg; 1997 chip->legacy_cfg_saved = legacy_cfg;
1998 #endif 1998 #endif
1999 1999
2000 return 0; 2000 return 0;
2001 } 2001 }
2002 2002
2003 2003
2004 /* 2004 /*
2005 * proc interface 2005 * proc interface
2006 */ 2006 */
2007 static void snd_via82xx_proc_read(struct snd_info_entry *entry, 2007 static void snd_via82xx_proc_read(struct snd_info_entry *entry,
2008 struct snd_info_buffer *buffer) 2008 struct snd_info_buffer *buffer)
2009 { 2009 {
2010 struct via82xx *chip = entry->private_data; 2010 struct via82xx *chip = entry->private_data;
2011 int i; 2011 int i;
2012 2012
2013 snd_iprintf(buffer, "%s\n\n", chip->card->longname); 2013 snd_iprintf(buffer, "%s\n\n", chip->card->longname);
2014 for (i = 0; i < 0xa0; i += 4) { 2014 for (i = 0; i < 0xa0; i += 4) {
2015 snd_iprintf(buffer, "%02x: %08x\n", i, inl(chip->port + i)); 2015 snd_iprintf(buffer, "%02x: %08x\n", i, inl(chip->port + i));
2016 } 2016 }
2017 } 2017 }
2018 2018
2019 static void __devinit snd_via82xx_proc_init(struct via82xx *chip) 2019 static void __devinit snd_via82xx_proc_init(struct via82xx *chip)
2020 { 2020 {
2021 struct snd_info_entry *entry; 2021 struct snd_info_entry *entry;
2022 2022
2023 if (! snd_card_proc_new(chip->card, "via82xx", &entry)) 2023 if (! snd_card_proc_new(chip->card, "via82xx", &entry))
2024 snd_info_set_text_ops(entry, chip, snd_via82xx_proc_read); 2024 snd_info_set_text_ops(entry, chip, snd_via82xx_proc_read);
2025 } 2025 }
2026 2026
2027 /* 2027 /*
2028 * 2028 *
2029 */ 2029 */
2030 2030
2031 static int snd_via82xx_chip_init(struct via82xx *chip) 2031 static int snd_via82xx_chip_init(struct via82xx *chip)
2032 { 2032 {
2033 unsigned int val; 2033 unsigned int val;
2034 unsigned long end_time; 2034 unsigned long end_time;
2035 unsigned char pval; 2035 unsigned char pval;
2036 2036
2037 #if 0 /* broken on K7M? */ 2037 #if 0 /* broken on K7M? */
2038 if (chip->chip_type == TYPE_VIA686) 2038 if (chip->chip_type == TYPE_VIA686)
2039 /* disable all legacy ports */ 2039 /* disable all legacy ports */
2040 pci_write_config_byte(chip->pci, VIA_FUNC_ENABLE, 0); 2040 pci_write_config_byte(chip->pci, VIA_FUNC_ENABLE, 0);
2041 #endif 2041 #endif
2042 pci_read_config_byte(chip->pci, VIA_ACLINK_STAT, &pval); 2042 pci_read_config_byte(chip->pci, VIA_ACLINK_STAT, &pval);
2043 if (! (pval & VIA_ACLINK_C00_READY)) { /* codec not ready? */ 2043 if (! (pval & VIA_ACLINK_C00_READY)) { /* codec not ready? */
2044 /* deassert ACLink reset, force SYNC */ 2044 /* deassert ACLink reset, force SYNC */
2045 pci_write_config_byte(chip->pci, VIA_ACLINK_CTRL, 2045 pci_write_config_byte(chip->pci, VIA_ACLINK_CTRL,
2046 VIA_ACLINK_CTRL_ENABLE | 2046 VIA_ACLINK_CTRL_ENABLE |
2047 VIA_ACLINK_CTRL_RESET | 2047 VIA_ACLINK_CTRL_RESET |
2048 VIA_ACLINK_CTRL_SYNC); 2048 VIA_ACLINK_CTRL_SYNC);
2049 udelay(100); 2049 udelay(100);
2050 #if 1 /* FIXME: should we do full reset here for all chip models? */ 2050 #if 1 /* FIXME: should we do full reset here for all chip models? */
2051 pci_write_config_byte(chip->pci, VIA_ACLINK_CTRL, 0x00); 2051 pci_write_config_byte(chip->pci, VIA_ACLINK_CTRL, 0x00);
2052 udelay(100); 2052 udelay(100);
2053 #else 2053 #else
2054 /* deassert ACLink reset, force SYNC (warm AC'97 reset) */ 2054 /* deassert ACLink reset, force SYNC (warm AC'97 reset) */
2055 pci_write_config_byte(chip->pci, VIA_ACLINK_CTRL, 2055 pci_write_config_byte(chip->pci, VIA_ACLINK_CTRL,
2056 VIA_ACLINK_CTRL_RESET|VIA_ACLINK_CTRL_SYNC); 2056 VIA_ACLINK_CTRL_RESET|VIA_ACLINK_CTRL_SYNC);
2057 udelay(2); 2057 udelay(2);
2058 #endif 2058 #endif
2059 /* ACLink on, deassert ACLink reset, VSR, SGD data out */ 2059 /* ACLink on, deassert ACLink reset, VSR, SGD data out */
2060 /* note - FM data out has trouble with non VRA codecs !! */ 2060 /* note - FM data out has trouble with non VRA codecs !! */
2061 pci_write_config_byte(chip->pci, VIA_ACLINK_CTRL, VIA_ACLINK_CTRL_INIT); 2061 pci_write_config_byte(chip->pci, VIA_ACLINK_CTRL, VIA_ACLINK_CTRL_INIT);
2062 udelay(100); 2062 udelay(100);
2063 } 2063 }
2064 2064
2065 /* Make sure VRA is enabled, in case we didn't do a 2065 /* Make sure VRA is enabled, in case we didn't do a
2066 * complete codec reset, above */ 2066 * complete codec reset, above */
2067 pci_read_config_byte(chip->pci, VIA_ACLINK_CTRL, &pval); 2067 pci_read_config_byte(chip->pci, VIA_ACLINK_CTRL, &pval);
2068 if ((pval & VIA_ACLINK_CTRL_INIT) != VIA_ACLINK_CTRL_INIT) { 2068 if ((pval & VIA_ACLINK_CTRL_INIT) != VIA_ACLINK_CTRL_INIT) {
2069 /* ACLink on, deassert ACLink reset, VSR, SGD data out */ 2069 /* ACLink on, deassert ACLink reset, VSR, SGD data out */
2070 /* note - FM data out has trouble with non VRA codecs !! */ 2070 /* note - FM data out has trouble with non VRA codecs !! */
2071 pci_write_config_byte(chip->pci, VIA_ACLINK_CTRL, VIA_ACLINK_CTRL_INIT); 2071 pci_write_config_byte(chip->pci, VIA_ACLINK_CTRL, VIA_ACLINK_CTRL_INIT);
2072 udelay(100); 2072 udelay(100);
2073 } 2073 }
2074 2074
2075 /* wait until codec ready */ 2075 /* wait until codec ready */
2076 end_time = jiffies + msecs_to_jiffies(750); 2076 end_time = jiffies + msecs_to_jiffies(750);
2077 do { 2077 do {
2078 pci_read_config_byte(chip->pci, VIA_ACLINK_STAT, &pval); 2078 pci_read_config_byte(chip->pci, VIA_ACLINK_STAT, &pval);
2079 if (pval & VIA_ACLINK_C00_READY) /* primary codec ready */ 2079 if (pval & VIA_ACLINK_C00_READY) /* primary codec ready */
2080 break; 2080 break;
2081 schedule_timeout_uninterruptible(1); 2081 schedule_timeout_uninterruptible(1);
2082 } while (time_before(jiffies, end_time)); 2082 } while (time_before(jiffies, end_time));
2083 2083
2084 if ((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY) 2084 if ((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY)
2085 snd_printk(KERN_ERR "AC'97 codec is not ready [0x%x]\n", val); 2085 snd_printk(KERN_ERR "AC'97 codec is not ready [0x%x]\n", val);
2086 2086
2087 #if 0 /* FIXME: we don't support the second codec yet so skip the detection now.. */ 2087 #if 0 /* FIXME: we don't support the second codec yet so skip the detection now.. */
2088 snd_via82xx_codec_xwrite(chip, VIA_REG_AC97_READ | 2088 snd_via82xx_codec_xwrite(chip, VIA_REG_AC97_READ |
2089 VIA_REG_AC97_SECONDARY_VALID | 2089 VIA_REG_AC97_SECONDARY_VALID |
2090 (VIA_REG_AC97_CODEC_ID_SECONDARY << VIA_REG_AC97_CODEC_ID_SHIFT)); 2090 (VIA_REG_AC97_CODEC_ID_SECONDARY << VIA_REG_AC97_CODEC_ID_SHIFT));
2091 end_time = jiffies + msecs_to_jiffies(750); 2091 end_time = jiffies + msecs_to_jiffies(750);
2092 snd_via82xx_codec_xwrite(chip, VIA_REG_AC97_READ | 2092 snd_via82xx_codec_xwrite(chip, VIA_REG_AC97_READ |
2093 VIA_REG_AC97_SECONDARY_VALID | 2093 VIA_REG_AC97_SECONDARY_VALID |
2094 (VIA_REG_AC97_CODEC_ID_SECONDARY << VIA_REG_AC97_CODEC_ID_SHIFT)); 2094 (VIA_REG_AC97_CODEC_ID_SECONDARY << VIA_REG_AC97_CODEC_ID_SHIFT));
2095 do { 2095 do {
2096 if ((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_SECONDARY_VALID) { 2096 if ((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_SECONDARY_VALID) {
2097 chip->ac97_secondary = 1; 2097 chip->ac97_secondary = 1;
2098 goto __ac97_ok2; 2098 goto __ac97_ok2;
2099 } 2099 }
2100 schedule_timeout_interruptible(1); 2100 schedule_timeout_interruptible(1);
2101 } while (time_before(jiffies, end_time)); 2101 } while (time_before(jiffies, end_time));
2102 /* This is ok, the most of motherboards have only one codec */ 2102 /* This is ok, the most of motherboards have only one codec */
2103 2103
2104 __ac97_ok2: 2104 __ac97_ok2:
2105 #endif 2105 #endif
2106 2106
2107 if (chip->chip_type == TYPE_VIA686) { 2107 if (chip->chip_type == TYPE_VIA686) {
2108 /* route FM trap to IRQ, disable FM trap */ 2108 /* route FM trap to IRQ, disable FM trap */
2109 pci_write_config_byte(chip->pci, VIA_FM_NMI_CTRL, 0); 2109 pci_write_config_byte(chip->pci, VIA_FM_NMI_CTRL, 0);
2110 /* disable all GPI interrupts */ 2110 /* disable all GPI interrupts */
2111 outl(0, VIAREG(chip, GPI_INTR)); 2111 outl(0, VIAREG(chip, GPI_INTR));
2112 } 2112 }
2113 2113
2114 if (chip->chip_type != TYPE_VIA686) { 2114 if (chip->chip_type != TYPE_VIA686) {
2115 /* Workaround for Award BIOS bug: 2115 /* Workaround for Award BIOS bug:
2116 * DXS channels don't work properly with VRA if MC97 is disabled. 2116 * DXS channels don't work properly with VRA if MC97 is disabled.
2117 */ 2117 */
2118 struct pci_dev *pci; 2118 struct pci_dev *pci;
2119 pci = pci_get_device(0x1106, 0x3068, NULL); /* MC97 */ 2119 pci = pci_get_device(0x1106, 0x3068, NULL); /* MC97 */
2120 if (pci) { 2120 if (pci) {
2121 unsigned char data; 2121 unsigned char data;
2122 pci_read_config_byte(pci, 0x44, &data); 2122 pci_read_config_byte(pci, 0x44, &data);
2123 pci_write_config_byte(pci, 0x44, data | 0x40); 2123 pci_write_config_byte(pci, 0x44, data | 0x40);
2124 pci_dev_put(pci); 2124 pci_dev_put(pci);
2125 } 2125 }
2126 } 2126 }
2127 2127
2128 if (chip->chip_type != TYPE_VIA8233A) { 2128 if (chip->chip_type != TYPE_VIA8233A) {
2129 int i, idx; 2129 int i, idx;
2130 for (idx = 0; idx < 4; idx++) { 2130 for (idx = 0; idx < 4; idx++) {
2131 unsigned long port = chip->port + 0x10 * idx; 2131 unsigned long port = chip->port + 0x10 * idx;
2132 for (i = 0; i < 2; i++) { 2132 for (i = 0; i < 2; i++) {
2133 chip->playback_volume[idx][i]=chip->playback_volume_c[i]; 2133 chip->playback_volume[idx][i]=chip->playback_volume_c[i];
2134 outb(chip->playback_volume_c[i], 2134 outb(chip->playback_volume_c[i],
2135 port + VIA_REG_OFS_PLAYBACK_VOLUME_L + i); 2135 port + VIA_REG_OFS_PLAYBACK_VOLUME_L + i);
2136 } 2136 }
2137 } 2137 }
2138 } 2138 }
2139 2139
2140 return 0; 2140 return 0;
2141 } 2141 }
2142 2142
2143 #ifdef CONFIG_PM 2143 #ifdef CONFIG_PM
2144 /* 2144 /*
2145 * power management 2145 * power management
2146 */ 2146 */
2147 static int snd_via82xx_suspend(struct pci_dev *pci, pm_message_t state) 2147 static int snd_via82xx_suspend(struct pci_dev *pci, pm_message_t state)
2148 { 2148 {
2149 struct snd_card *card = pci_get_drvdata(pci); 2149 struct snd_card *card = pci_get_drvdata(pci);
2150 struct via82xx *chip = card->private_data; 2150 struct via82xx *chip = card->private_data;
2151 int i; 2151 int i;
2152 2152
2153 snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); 2153 snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
2154 for (i = 0; i < 2; i++) 2154 for (i = 0; i < 2; i++)
2155 snd_pcm_suspend_all(chip->pcms[i]); 2155 snd_pcm_suspend_all(chip->pcms[i]);
2156 for (i = 0; i < chip->num_devs; i++) 2156 for (i = 0; i < chip->num_devs; i++)
2157 snd_via82xx_channel_reset(chip, &chip->devs[i]); 2157 snd_via82xx_channel_reset(chip, &chip->devs[i]);
2158 synchronize_irq(chip->irq); 2158 synchronize_irq(chip->irq);
2159 snd_ac97_suspend(chip->ac97); 2159 snd_ac97_suspend(chip->ac97);
2160 2160
2161 /* save misc values */ 2161 /* save misc values */
2162 if (chip->chip_type != TYPE_VIA686) { 2162 if (chip->chip_type != TYPE_VIA686) {
2163 pci_read_config_byte(chip->pci, VIA8233_SPDIF_CTRL, &chip->spdif_ctrl_saved); 2163 pci_read_config_byte(chip->pci, VIA8233_SPDIF_CTRL, &chip->spdif_ctrl_saved);
2164 chip->capture_src_saved[0] = inb(chip->port + VIA_REG_CAPTURE_CHANNEL); 2164 chip->capture_src_saved[0] = inb(chip->port + VIA_REG_CAPTURE_CHANNEL);
2165 chip->capture_src_saved[1] = inb(chip->port + VIA_REG_CAPTURE_CHANNEL + 0x10); 2165 chip->capture_src_saved[1] = inb(chip->port + VIA_REG_CAPTURE_CHANNEL + 0x10);
2166 } 2166 }
2167 2167
2168 pci_set_power_state(pci, PCI_D3hot); 2168 pci_set_power_state(pci, PCI_D3hot);
2169 pci_disable_device(pci); 2169 pci_disable_device(pci);
2170 pci_save_state(pci); 2170 pci_save_state(pci);
2171 return 0; 2171 return 0;
2172 } 2172 }
2173 2173
2174 static int snd_via82xx_resume(struct pci_dev *pci) 2174 static int snd_via82xx_resume(struct pci_dev *pci)
2175 { 2175 {
2176 struct snd_card *card = pci_get_drvdata(pci); 2176 struct snd_card *card = pci_get_drvdata(pci);
2177 struct via82xx *chip = card->private_data; 2177 struct via82xx *chip = card->private_data;
2178 int i; 2178 int i;
2179 2179
2180 pci_restore_state(pci); 2180 pci_restore_state(pci);
2181 pci_enable_device(pci); 2181 pci_enable_device(pci);
2182 pci_set_power_state(pci, PCI_D0); 2182 pci_set_power_state(pci, PCI_D0);
2183 2183
2184 snd_via82xx_chip_init(chip); 2184 snd_via82xx_chip_init(chip);
2185 2185
2186 if (chip->chip_type == TYPE_VIA686) { 2186 if (chip->chip_type == TYPE_VIA686) {
2187 if (chip->mpu_port_saved) 2187 if (chip->mpu_port_saved)
2188 pci_write_config_dword(chip->pci, 0x18, chip->mpu_port_saved | 0x01); 2188 pci_write_config_dword(chip->pci, 0x18, chip->mpu_port_saved | 0x01);
2189 pci_write_config_byte(chip->pci, VIA_FUNC_ENABLE, chip->legacy_saved); 2189 pci_write_config_byte(chip->pci, VIA_FUNC_ENABLE, chip->legacy_saved);
2190 pci_write_config_byte(chip->pci, VIA_PNP_CONTROL, chip->legacy_cfg_saved); 2190 pci_write_config_byte(chip->pci, VIA_PNP_CONTROL, chip->legacy_cfg_saved);
2191 } else { 2191 } else {
2192 pci_write_config_byte(chip->pci, VIA8233_SPDIF_CTRL, chip->spdif_ctrl_saved); 2192 pci_write_config_byte(chip->pci, VIA8233_SPDIF_CTRL, chip->spdif_ctrl_saved);
2193 outb(chip->capture_src_saved[0], chip->port + VIA_REG_CAPTURE_CHANNEL); 2193 outb(chip->capture_src_saved[0], chip->port + VIA_REG_CAPTURE_CHANNEL);
2194 outb(chip->capture_src_saved[1], chip->port + VIA_REG_CAPTURE_CHANNEL + 0x10); 2194 outb(chip->capture_src_saved[1], chip->port + VIA_REG_CAPTURE_CHANNEL + 0x10);
2195 } 2195 }
2196 2196
2197 snd_ac97_resume(chip->ac97); 2197 snd_ac97_resume(chip->ac97);
2198 2198
2199 for (i = 0; i < chip->num_devs; i++) 2199 for (i = 0; i < chip->num_devs; i++)
2200 snd_via82xx_channel_reset(chip, &chip->devs[i]); 2200 snd_via82xx_channel_reset(chip, &chip->devs[i]);
2201 2201
2202 snd_power_change_state(card, SNDRV_CTL_POWER_D0); 2202 snd_power_change_state(card, SNDRV_CTL_POWER_D0);
2203 return 0; 2203 return 0;
2204 } 2204 }
2205 #endif /* CONFIG_PM */ 2205 #endif /* CONFIG_PM */
2206 2206
2207 static int snd_via82xx_free(struct via82xx *chip) 2207 static int snd_via82xx_free(struct via82xx *chip)
2208 { 2208 {
2209 unsigned int i; 2209 unsigned int i;
2210 2210
2211 if (chip->irq < 0) 2211 if (chip->irq < 0)
2212 goto __end_hw; 2212 goto __end_hw;
2213 /* disable interrupts */ 2213 /* disable interrupts */
2214 for (i = 0; i < chip->num_devs; i++) 2214 for (i = 0; i < chip->num_devs; i++)
2215 snd_via82xx_channel_reset(chip, &chip->devs[i]); 2215 snd_via82xx_channel_reset(chip, &chip->devs[i]);
2216 synchronize_irq(chip->irq); 2216 synchronize_irq(chip->irq);
2217 __end_hw: 2217 __end_hw:
2218 if (chip->irq >= 0) 2218 if (chip->irq >= 0)
2219 free_irq(chip->irq, chip); 2219 free_irq(chip->irq, chip);
2220 release_and_free_resource(chip->mpu_res); 2220 release_and_free_resource(chip->mpu_res);
2221 pci_release_regions(chip->pci); 2221 pci_release_regions(chip->pci);
2222 2222
2223 if (chip->chip_type == TYPE_VIA686) { 2223 if (chip->chip_type == TYPE_VIA686) {
2224 snd_via686_free_gameport(chip); 2224 snd_via686_free_gameport(chip);
2225 pci_write_config_byte(chip->pci, VIA_FUNC_ENABLE, chip->old_legacy); 2225 pci_write_config_byte(chip->pci, VIA_FUNC_ENABLE, chip->old_legacy);
2226 pci_write_config_byte(chip->pci, VIA_PNP_CONTROL, chip->old_legacy_cfg); 2226 pci_write_config_byte(chip->pci, VIA_PNP_CONTROL, chip->old_legacy_cfg);
2227 } 2227 }
2228 pci_disable_device(chip->pci); 2228 pci_disable_device(chip->pci);
2229 kfree(chip); 2229 kfree(chip);
2230 return 0; 2230 return 0;
2231 } 2231 }
2232 2232
2233 static int snd_via82xx_dev_free(struct snd_device *device) 2233 static int snd_via82xx_dev_free(struct snd_device *device)
2234 { 2234 {
2235 struct via82xx *chip = device->device_data; 2235 struct via82xx *chip = device->device_data;
2236 return snd_via82xx_free(chip); 2236 return snd_via82xx_free(chip);
2237 } 2237 }
2238 2238
2239 static int __devinit snd_via82xx_create(struct snd_card *card, 2239 static int __devinit snd_via82xx_create(struct snd_card *card,
2240 struct pci_dev *pci, 2240 struct pci_dev *pci,
2241 int chip_type, 2241 int chip_type,
2242 int revision, 2242 int revision,
2243 unsigned int ac97_clock, 2243 unsigned int ac97_clock,
2244 struct via82xx ** r_via) 2244 struct via82xx ** r_via)
2245 { 2245 {
2246 struct via82xx *chip; 2246 struct via82xx *chip;
2247 int err; 2247 int err;
2248 static struct snd_device_ops ops = { 2248 static struct snd_device_ops ops = {
2249 .dev_free = snd_via82xx_dev_free, 2249 .dev_free = snd_via82xx_dev_free,
2250 }; 2250 };
2251 2251
2252 if ((err = pci_enable_device(pci)) < 0) 2252 if ((err = pci_enable_device(pci)) < 0)
2253 return err; 2253 return err;
2254 2254
2255 if ((chip = kzalloc(sizeof(*chip), GFP_KERNEL)) == NULL) { 2255 if ((chip = kzalloc(sizeof(*chip), GFP_KERNEL)) == NULL) {
2256 pci_disable_device(pci); 2256 pci_disable_device(pci);
2257 return -ENOMEM; 2257 return -ENOMEM;
2258 } 2258 }
2259 2259
2260 chip->chip_type = chip_type; 2260 chip->chip_type = chip_type;
2261 chip->revision = revision; 2261 chip->revision = revision;
2262 2262
2263 spin_lock_init(&chip->reg_lock); 2263 spin_lock_init(&chip->reg_lock);
2264 spin_lock_init(&chip->rates[0].lock); 2264 spin_lock_init(&chip->rates[0].lock);
2265 spin_lock_init(&chip->rates[1].lock); 2265 spin_lock_init(&chip->rates[1].lock);
2266 chip->card = card; 2266 chip->card = card;
2267 chip->pci = pci; 2267 chip->pci = pci;
2268 chip->irq = -1; 2268 chip->irq = -1;
2269 2269
2270 pci_read_config_byte(pci, VIA_FUNC_ENABLE, &chip->old_legacy); 2270 pci_read_config_byte(pci, VIA_FUNC_ENABLE, &chip->old_legacy);
2271 pci_read_config_byte(pci, VIA_PNP_CONTROL, &chip->old_legacy_cfg); 2271 pci_read_config_byte(pci, VIA_PNP_CONTROL, &chip->old_legacy_cfg);
2272 pci_write_config_byte(chip->pci, VIA_FUNC_ENABLE, 2272 pci_write_config_byte(chip->pci, VIA_FUNC_ENABLE,
2273 chip->old_legacy & ~(VIA_FUNC_ENABLE_SB|VIA_FUNC_ENABLE_FM)); 2273 chip->old_legacy & ~(VIA_FUNC_ENABLE_SB|VIA_FUNC_ENABLE_FM));
2274 2274
2275 if ((err = pci_request_regions(pci, card->driver)) < 0) { 2275 if ((err = pci_request_regions(pci, card->driver)) < 0) {
2276 kfree(chip); 2276 kfree(chip);
2277 pci_disable_device(pci); 2277 pci_disable_device(pci);
2278 return err; 2278 return err;
2279 } 2279 }
2280 chip->port = pci_resource_start(pci, 0); 2280 chip->port = pci_resource_start(pci, 0);
2281 if (request_irq(pci->irq, 2281 if (request_irq(pci->irq,
2282 chip_type == TYPE_VIA8233 ? 2282 chip_type == TYPE_VIA8233 ?
2283 snd_via8233_interrupt : snd_via686_interrupt, 2283 snd_via8233_interrupt : snd_via686_interrupt,
2284 SA_INTERRUPT|SA_SHIRQ, 2284 SA_INTERRUPT|SA_SHIRQ,
2285 card->driver, chip)) { 2285 card->driver, chip)) {
2286 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 2286 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
2287 snd_via82xx_free(chip); 2287 snd_via82xx_free(chip);
2288 return -EBUSY; 2288 return -EBUSY;
2289 } 2289 }
2290 chip->irq = pci->irq; 2290 chip->irq = pci->irq;
2291 if (ac97_clock >= 8000 && ac97_clock <= 48000) 2291 if (ac97_clock >= 8000 && ac97_clock <= 48000)
2292 chip->ac97_clock = ac97_clock; 2292 chip->ac97_clock = ac97_clock;
2293 synchronize_irq(chip->irq); 2293 synchronize_irq(chip->irq);
2294 2294
2295 if ((err = snd_via82xx_chip_init(chip)) < 0) { 2295 if ((err = snd_via82xx_chip_init(chip)) < 0) {
2296 snd_via82xx_free(chip); 2296 snd_via82xx_free(chip);
2297 return err; 2297 return err;
2298 } 2298 }
2299 2299
2300 if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) { 2300 if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
2301 snd_via82xx_free(chip); 2301 snd_via82xx_free(chip);
2302 return err; 2302 return err;
2303 } 2303 }
2304 2304
2305 /* The 8233 ac97 controller does not implement the master bit 2305 /* The 8233 ac97 controller does not implement the master bit
2306 * in the pci command register. IMHO this is a violation of the PCI spec. 2306 * in the pci command register. IMHO this is a violation of the PCI spec.
2307 * We call pci_set_master here because it does not hurt. */ 2307 * We call pci_set_master here because it does not hurt. */
2308 pci_set_master(pci); 2308 pci_set_master(pci);
2309 2309
2310 snd_card_set_dev(card, &pci->dev); 2310 snd_card_set_dev(card, &pci->dev);
2311 2311
2312 *r_via = chip; 2312 *r_via = chip;
2313 return 0; 2313 return 0;
2314 } 2314 }
2315 2315
2316 struct via823x_info { 2316 struct via823x_info {
2317 int revision; 2317 int revision;
2318 char *name; 2318 char *name;
2319 int type; 2319 int type;
2320 }; 2320 };
2321 static struct via823x_info via823x_cards[] __devinitdata = { 2321 static struct via823x_info via823x_cards[] __devinitdata = {
2322 { VIA_REV_PRE_8233, "VIA 8233-Pre", TYPE_VIA8233 }, 2322 { VIA_REV_PRE_8233, "VIA 8233-Pre", TYPE_VIA8233 },
2323 { VIA_REV_8233C, "VIA 8233C", TYPE_VIA8233 }, 2323 { VIA_REV_8233C, "VIA 8233C", TYPE_VIA8233 },
2324 { VIA_REV_8233, "VIA 8233", TYPE_VIA8233 }, 2324 { VIA_REV_8233, "VIA 8233", TYPE_VIA8233 },
2325 { VIA_REV_8233A, "VIA 8233A", TYPE_VIA8233A }, 2325 { VIA_REV_8233A, "VIA 8233A", TYPE_VIA8233A },
2326 { VIA_REV_8235, "VIA 8235", TYPE_VIA8233 }, 2326 { VIA_REV_8235, "VIA 8235", TYPE_VIA8233 },
2327 { VIA_REV_8237, "VIA 8237", TYPE_VIA8233 }, 2327 { VIA_REV_8237, "VIA 8237", TYPE_VIA8233 },
2328 { VIA_REV_8251, "VIA 8251", TYPE_VIA8233 }, 2328 { VIA_REV_8251, "VIA 8251", TYPE_VIA8233 },
2329 }; 2329 };
2330 2330
2331 /* 2331 /*
2332 * auto detection of DXS channel supports. 2332 * auto detection of DXS channel supports.
2333 */ 2333 */
2334 struct dxs_whitelist { 2334 struct dxs_whitelist {
2335 unsigned short subvendor; 2335 unsigned short subvendor;
2336 unsigned short subdevice; 2336 unsigned short subdevice;
2337 unsigned short mask; 2337 unsigned short mask;
2338 short action; /* new dxs_support value */ 2338 short action; /* new dxs_support value */
2339 }; 2339 };
2340 2340
2341 static int __devinit check_dxs_list(struct pci_dev *pci, int revision) 2341 static int __devinit check_dxs_list(struct pci_dev *pci, int revision)
2342 { 2342 {
2343 static struct dxs_whitelist whitelist[] = { 2343 static struct dxs_whitelist whitelist[] = {
2344 { .subvendor = 0x1005, .subdevice = 0x4710, .action = VIA_DXS_ENABLE }, /* Avance Logic Mobo */ 2344 { .subvendor = 0x1005, .subdevice = 0x4710, .action = VIA_DXS_ENABLE }, /* Avance Logic Mobo */
2345 { .subvendor = 0x1019, .subdevice = 0x0996, .action = VIA_DXS_48K }, 2345 { .subvendor = 0x1019, .subdevice = 0x0996, .action = VIA_DXS_48K },
2346 { .subvendor = 0x1019, .subdevice = 0x0a81, .action = VIA_DXS_NO_VRA }, /* ECS K7VTA3 v8.0 */ 2346 { .subvendor = 0x1019, .subdevice = 0x0a81, .action = VIA_DXS_NO_VRA }, /* ECS K7VTA3 v8.0 */
2347 { .subvendor = 0x1019, .subdevice = 0x0a85, .action = VIA_DXS_NO_VRA }, /* ECS L7VMM2 */ 2347 { .subvendor = 0x1019, .subdevice = 0x0a85, .action = VIA_DXS_NO_VRA }, /* ECS L7VMM2 */
2348 { .subvendor = 0x1019, .subdevice = 0xa101, .action = VIA_DXS_SRC }, 2348 { .subvendor = 0x1019, .subdevice = 0xa101, .action = VIA_DXS_SRC },
2349 { .subvendor = 0x1019, .subdevice = 0xaa01, .action = VIA_DXS_SRC }, /* ECS K8T890-A */ 2349 { .subvendor = 0x1019, .subdevice = 0xaa01, .action = VIA_DXS_SRC }, /* ECS K8T890-A */
2350 { .subvendor = 0x1025, .subdevice = 0x0033, .action = VIA_DXS_NO_VRA }, /* Acer Inspire 1353LM */ 2350 { .subvendor = 0x1025, .subdevice = 0x0033, .action = VIA_DXS_NO_VRA }, /* Acer Inspire 1353LM */
2351 { .subvendor = 0x1025, .subdevice = 0x0046, .action = VIA_DXS_SRC }, /* Acer Aspire 1524 WLMi */ 2351 { .subvendor = 0x1025, .subdevice = 0x0046, .action = VIA_DXS_SRC }, /* Acer Aspire 1524 WLMi */
2352 { .subvendor = 0x1043, .subdevice = 0x8095, .action = VIA_DXS_NO_VRA }, /* ASUS A7V8X (FIXME: possibly VIA_DXS_ENABLE?)*/ 2352 { .subvendor = 0x1043, .subdevice = 0x8095, .action = VIA_DXS_NO_VRA }, /* ASUS A7V8X (FIXME: possibly VIA_DXS_ENABLE?)*/
2353 { .subvendor = 0x1043, .subdevice = 0x80a1, .action = VIA_DXS_NO_VRA }, /* ASUS A7V8-X */ 2353 { .subvendor = 0x1043, .subdevice = 0x80a1, .action = VIA_DXS_NO_VRA }, /* ASUS A7V8-X */
2354 { .subvendor = 0x1043, .subdevice = 0x80b0, .action = VIA_DXS_NO_VRA }, /* ASUS A7V600 & K8V*/ 2354 { .subvendor = 0x1043, .subdevice = 0x80b0, .action = VIA_DXS_NO_VRA }, /* ASUS A7V600 & K8V*/
2355 { .subvendor = 0x1043, .subdevice = 0x810d, .action = VIA_DXS_SRC }, /* ASUS */ 2355 { .subvendor = 0x1043, .subdevice = 0x810d, .action = VIA_DXS_SRC }, /* ASUS */
2356 { .subvendor = 0x1043, .subdevice = 0x812a, .action = VIA_DXS_SRC }, /* ASUS A8V Deluxe */ 2356 { .subvendor = 0x1043, .subdevice = 0x812a, .action = VIA_DXS_SRC }, /* ASUS A8V Deluxe */
2357 { .subvendor = 0x1043, .subdevice = 0x8174, .action = VIA_DXS_SRC }, /* ASUS */ 2357 { .subvendor = 0x1043, .subdevice = 0x8174, .action = VIA_DXS_SRC }, /* ASUS */
2358 { .subvendor = 0x1043, .subdevice = 0x81b9, .action = VIA_DXS_SRC }, /* ASUS A8V-MX */ 2358 { .subvendor = 0x1043, .subdevice = 0x81b9, .action = VIA_DXS_SRC }, /* ASUS A8V-MX */
2359 { .subvendor = 0x1071, .subdevice = 0x8375, .action = VIA_DXS_NO_VRA }, /* Vobis/Yakumo/Mitac notebook */ 2359 { .subvendor = 0x1071, .subdevice = 0x8375, .action = VIA_DXS_NO_VRA }, /* Vobis/Yakumo/Mitac notebook */
2360 { .subvendor = 0x1071, .subdevice = 0x8399, .action = VIA_DXS_NO_VRA }, /* Umax AB 595T (VIA K8N800A - VT8237) */ 2360 { .subvendor = 0x1071, .subdevice = 0x8399, .action = VIA_DXS_NO_VRA }, /* Umax AB 595T (VIA K8N800A - VT8237) */
2361 { .subvendor = 0x10cf, .subdevice = 0x118e, .action = VIA_DXS_ENABLE }, /* FSC laptop */ 2361 { .subvendor = 0x10cf, .subdevice = 0x118e, .action = VIA_DXS_ENABLE }, /* FSC laptop */
2362 { .subvendor = 0x1106, .subdevice = 0x4161, .action = VIA_DXS_NO_VRA }, /* ASRock K7VT2 */ 2362 { .subvendor = 0x1106, .subdevice = 0x4161, .action = VIA_DXS_NO_VRA }, /* ASRock K7VT2 */
2363 { .subvendor = 0x1106, .subdevice = 0x4552, .action = VIA_DXS_NO_VRA }, /* QDI Kudoz 7X/600-6AL */ 2363 { .subvendor = 0x1106, .subdevice = 0x4552, .action = VIA_DXS_NO_VRA }, /* QDI Kudoz 7X/600-6AL */
2364 { .subvendor = 0x1106, .subdevice = 0xaa01, .action = VIA_DXS_NO_VRA }, /* EPIA MII */ 2364 { .subvendor = 0x1106, .subdevice = 0xaa01, .action = VIA_DXS_NO_VRA }, /* EPIA MII */
2365 { .subvendor = 0x1106, .subdevice = 0xc001, .action = VIA_DXS_SRC }, /* Insight P4-ITX */ 2365 { .subvendor = 0x1106, .subdevice = 0xc001, .action = VIA_DXS_SRC }, /* Insight P4-ITX */
2366 { .subvendor = 0x1297, .subdevice = 0xa232, .action = VIA_DXS_ENABLE }, /* Shuttle ?? */ 2366 { .subvendor = 0x1297, .subdevice = 0xa232, .action = VIA_DXS_ENABLE }, /* Shuttle ?? */
2367 { .subvendor = 0x1297, .subdevice = 0xc160, .action = VIA_DXS_ENABLE }, /* Shuttle SK41G */ 2367 { .subvendor = 0x1297, .subdevice = 0xc160, .action = VIA_DXS_ENABLE }, /* Shuttle SK41G */
2368 { .subvendor = 0x1458, .subdevice = 0xa002, .action = VIA_DXS_ENABLE }, /* Gigabyte GA-7VAXP */ 2368 { .subvendor = 0x1458, .subdevice = 0xa002, .action = VIA_DXS_ENABLE }, /* Gigabyte GA-7VAXP */
2369 { .subvendor = 0x1462, .subdevice = 0x0080, .action = VIA_DXS_SRC }, /* MSI K8T Neo-FIS2R */ 2369 { .subvendor = 0x1462, .subdevice = 0x0080, .action = VIA_DXS_SRC }, /* MSI K8T Neo-FIS2R */
2370 { .subvendor = 0x1462, .subdevice = 0x0430, .action = VIA_DXS_SRC }, /* MSI 7142 (K8MM-V) */ 2370 { .subvendor = 0x1462, .subdevice = 0x0430, .action = VIA_DXS_SRC }, /* MSI 7142 (K8MM-V) */
2371 { .subvendor = 0x1462, .subdevice = 0x0470, .action = VIA_DXS_SRC }, /* MSI KT880 Delta-FSR */ 2371 { .subvendor = 0x1462, .subdevice = 0x0470, .action = VIA_DXS_SRC }, /* MSI KT880 Delta-FSR */
2372 { .subvendor = 0x1462, .subdevice = 0x3800, .action = VIA_DXS_ENABLE }, /* MSI KT266 */ 2372 { .subvendor = 0x1462, .subdevice = 0x3800, .action = VIA_DXS_ENABLE }, /* MSI KT266 */
2373 { .subvendor = 0x1462, .subdevice = 0x5901, .action = VIA_DXS_NO_VRA }, /* MSI KT6 Delta-SR */ 2373 { .subvendor = 0x1462, .subdevice = 0x5901, .action = VIA_DXS_NO_VRA }, /* MSI KT6 Delta-SR */
2374 { .subvendor = 0x1462, .subdevice = 0x7023, .action = VIA_DXS_NO_VRA }, /* MSI K8T Neo2-FI */ 2374 { .subvendor = 0x1462, .subdevice = 0x7023, .action = VIA_DXS_SRC }, /* MSI K8T Neo2-FI */
2375 { .subvendor = 0x1462, .subdevice = 0x7120, .action = VIA_DXS_ENABLE }, /* MSI KT4V */ 2375 { .subvendor = 0x1462, .subdevice = 0x7120, .action = VIA_DXS_ENABLE }, /* MSI KT4V */
2376 { .subvendor = 0x1462, .subdevice = 0x7142, .action = VIA_DXS_ENABLE }, /* MSI K8MM-V */ 2376 { .subvendor = 0x1462, .subdevice = 0x7142, .action = VIA_DXS_ENABLE }, /* MSI K8MM-V */
2377 { .subvendor = 0x1462, .subdevice = 0xb012, .action = VIA_DXS_SRC }, /* P4M800/VIA8237R */ 2377 { .subvendor = 0x1462, .subdevice = 0xb012, .action = VIA_DXS_SRC }, /* P4M800/VIA8237R */
2378 { .subvendor = 0x147b, .subdevice = 0x1401, .action = VIA_DXS_ENABLE }, /* ABIT KD7(-RAID) */ 2378 { .subvendor = 0x147b, .subdevice = 0x1401, .action = VIA_DXS_ENABLE }, /* ABIT KD7(-RAID) */
2379 { .subvendor = 0x147b, .subdevice = 0x1411, .action = VIA_DXS_ENABLE }, /* ABIT VA-20 */ 2379 { .subvendor = 0x147b, .subdevice = 0x1411, .action = VIA_DXS_ENABLE }, /* ABIT VA-20 */
2380 { .subvendor = 0x147b, .subdevice = 0x1413, .action = VIA_DXS_ENABLE }, /* ABIT KV8 Pro */ 2380 { .subvendor = 0x147b, .subdevice = 0x1413, .action = VIA_DXS_ENABLE }, /* ABIT KV8 Pro */
2381 { .subvendor = 0x147b, .subdevice = 0x1415, .action = VIA_DXS_NO_VRA }, /* Abit AV8 */ 2381 { .subvendor = 0x147b, .subdevice = 0x1415, .action = VIA_DXS_NO_VRA }, /* Abit AV8 */
2382 { .subvendor = 0x14ff, .subdevice = 0x0403, .action = VIA_DXS_ENABLE }, /* Twinhead mobo */ 2382 { .subvendor = 0x14ff, .subdevice = 0x0403, .action = VIA_DXS_ENABLE }, /* Twinhead mobo */
2383 { .subvendor = 0x14ff, .subdevice = 0x0408, .action = VIA_DXS_SRC }, /* Twinhead laptop */ 2383 { .subvendor = 0x14ff, .subdevice = 0x0408, .action = VIA_DXS_SRC }, /* Twinhead laptop */
2384 { .subvendor = 0x1558, .subdevice = 0x4701, .action = VIA_DXS_SRC }, /* Clevo D470 */ 2384 { .subvendor = 0x1558, .subdevice = 0x4701, .action = VIA_DXS_SRC }, /* Clevo D470 */
2385 { .subvendor = 0x1584, .subdevice = 0x8120, .action = VIA_DXS_ENABLE }, /* Gericom/Targa/Vobis/Uniwill laptop */ 2385 { .subvendor = 0x1584, .subdevice = 0x8120, .action = VIA_DXS_ENABLE }, /* Gericom/Targa/Vobis/Uniwill laptop */
2386 { .subvendor = 0x1584, .subdevice = 0x8123, .action = VIA_DXS_NO_VRA }, /* Uniwill (Targa Visionary XP-210) */ 2386 { .subvendor = 0x1584, .subdevice = 0x8123, .action = VIA_DXS_NO_VRA }, /* Uniwill (Targa Visionary XP-210) */
2387 { .subvendor = 0x161f, .subdevice = 0x202b, .action = VIA_DXS_NO_VRA }, /* Amira Note book */ 2387 { .subvendor = 0x161f, .subdevice = 0x202b, .action = VIA_DXS_NO_VRA }, /* Amira Note book */
2388 { .subvendor = 0x161f, .subdevice = 0x2032, .action = VIA_DXS_48K }, /* m680x machines */ 2388 { .subvendor = 0x161f, .subdevice = 0x2032, .action = VIA_DXS_48K }, /* m680x machines */
2389 { .subvendor = 0x1631, .subdevice = 0xe004, .action = VIA_DXS_ENABLE }, /* Easy Note 3174, Packard Bell */ 2389 { .subvendor = 0x1631, .subdevice = 0xe004, .action = VIA_DXS_ENABLE }, /* Easy Note 3174, Packard Bell */
2390 { .subvendor = 0x1695, .subdevice = 0x3005, .action = VIA_DXS_ENABLE }, /* EPoX EP-8K9A */ 2390 { .subvendor = 0x1695, .subdevice = 0x3005, .action = VIA_DXS_ENABLE }, /* EPoX EP-8K9A */
2391 { .subvendor = 0x1695, .subdevice = 0x300c, .action = VIA_DXS_SRC }, /* EPoX EP-8KRAI */ 2391 { .subvendor = 0x1695, .subdevice = 0x300c, .action = VIA_DXS_SRC }, /* EPoX EP-8KRAI */
2392 { .subvendor = 0x1695, .subdevice = 0x300e, .action = VIA_DXS_SRC }, /* EPoX 9HEAI */ 2392 { .subvendor = 0x1695, .subdevice = 0x300e, .action = VIA_DXS_SRC }, /* EPoX 9HEAI */
2393 { .subvendor = 0x16f3, .subdevice = 0x6405, .action = VIA_DXS_SRC }, /* Jetway K8M8MS */ 2393 { .subvendor = 0x16f3, .subdevice = 0x6405, .action = VIA_DXS_SRC }, /* Jetway K8M8MS */
2394 { .subvendor = 0x1734, .subdevice = 0x1078, .action = VIA_DXS_SRC }, /* FSC Amilo L7300 */ 2394 { .subvendor = 0x1734, .subdevice = 0x1078, .action = VIA_DXS_SRC }, /* FSC Amilo L7300 */
2395 { .subvendor = 0x1734, .subdevice = 0x1093, .action = VIA_DXS_SRC }, /* FSC */ 2395 { .subvendor = 0x1734, .subdevice = 0x1093, .action = VIA_DXS_SRC }, /* FSC */
2396 { .subvendor = 0x1849, .subdevice = 0x3059, .action = VIA_DXS_NO_VRA }, /* ASRock K7VM2 */ 2396 { .subvendor = 0x1849, .subdevice = 0x3059, .action = VIA_DXS_NO_VRA }, /* ASRock K7VM2 */
2397 { .subvendor = 0x1849, .subdevice = 0x9739, .action = VIA_DXS_SRC }, /* ASRock mobo(?) */ 2397 { .subvendor = 0x1849, .subdevice = 0x9739, .action = VIA_DXS_SRC }, /* ASRock mobo(?) */
2398 { .subvendor = 0x1849, .subdevice = 0x9761, .action = VIA_DXS_SRC }, /* ASRock mobo(?) */ 2398 { .subvendor = 0x1849, .subdevice = 0x9761, .action = VIA_DXS_SRC }, /* ASRock mobo(?) */
2399 { .subvendor = 0x1919, .subdevice = 0x200a, .action = VIA_DXS_NO_VRA }, /* Soltek SL-K8Tpro-939 */ 2399 { .subvendor = 0x1919, .subdevice = 0x200a, .action = VIA_DXS_NO_VRA }, /* Soltek SL-K8Tpro-939 */
2400 { .subvendor = 0x4005, .subdevice = 0x4710, .action = VIA_DXS_SRC }, /* MSI K7T266 Pro2 (MS-6380 V2.0) BIOS 3.7 */ 2400 { .subvendor = 0x4005, .subdevice = 0x4710, .action = VIA_DXS_SRC }, /* MSI K7T266 Pro2 (MS-6380 V2.0) BIOS 3.7 */
2401 { } /* terminator */ 2401 { } /* terminator */
2402 }; 2402 };
2403 struct dxs_whitelist *w; 2403 struct dxs_whitelist *w;
2404 unsigned short subsystem_vendor; 2404 unsigned short subsystem_vendor;
2405 unsigned short subsystem_device; 2405 unsigned short subsystem_device;
2406 2406
2407 pci_read_config_word(pci, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vendor); 2407 pci_read_config_word(pci, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vendor);
2408 pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &subsystem_device); 2408 pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &subsystem_device);
2409 2409
2410 for (w = whitelist; w->subvendor; w++) { 2410 for (w = whitelist; w->subvendor; w++) {
2411 if (w->subvendor != subsystem_vendor) 2411 if (w->subvendor != subsystem_vendor)
2412 continue; 2412 continue;
2413 if (w->mask) { 2413 if (w->mask) {
2414 if ((w->mask & subsystem_device) == w->subdevice) 2414 if ((w->mask & subsystem_device) == w->subdevice)
2415 return w->action; 2415 return w->action;
2416 } else { 2416 } else {
2417 if (subsystem_device == w->subdevice) 2417 if (subsystem_device == w->subdevice)
2418 return w->action; 2418 return w->action;
2419 } 2419 }
2420 } 2420 }
2421 2421
2422 /* for newer revision, default to DXS_SRC */ 2422 /* for newer revision, default to DXS_SRC */
2423 if (revision >= VIA_REV_8235) 2423 if (revision >= VIA_REV_8235)
2424 return VIA_DXS_SRC; 2424 return VIA_DXS_SRC;
2425 2425
2426 /* 2426 /*
2427 * not detected, try 48k rate only to be sure. 2427 * not detected, try 48k rate only to be sure.
2428 */ 2428 */
2429 printk(KERN_INFO "via82xx: Assuming DXS channels with 48k fixed sample rate.\n"); 2429 printk(KERN_INFO "via82xx: Assuming DXS channels with 48k fixed sample rate.\n");
2430 printk(KERN_INFO " Please try dxs_support=5 option\n"); 2430 printk(KERN_INFO " Please try dxs_support=5 option\n");
2431 printk(KERN_INFO " and report if it works on your machine.\n"); 2431 printk(KERN_INFO " and report if it works on your machine.\n");
2432 printk(KERN_INFO " For more details, read ALSA-Configuration.txt.\n"); 2432 printk(KERN_INFO " For more details, read ALSA-Configuration.txt.\n");
2433 return VIA_DXS_48K; 2433 return VIA_DXS_48K;
2434 }; 2434 };
2435 2435
2436 static int __devinit snd_via82xx_probe(struct pci_dev *pci, 2436 static int __devinit snd_via82xx_probe(struct pci_dev *pci,
2437 const struct pci_device_id *pci_id) 2437 const struct pci_device_id *pci_id)
2438 { 2438 {
2439 struct snd_card *card; 2439 struct snd_card *card;
2440 struct via82xx *chip; 2440 struct via82xx *chip;
2441 unsigned char revision; 2441 unsigned char revision;
2442 int chip_type = 0, card_type; 2442 int chip_type = 0, card_type;
2443 unsigned int i; 2443 unsigned int i;
2444 int err; 2444 int err;
2445 2445
2446 card = snd_card_new(index, id, THIS_MODULE, 0); 2446 card = snd_card_new(index, id, THIS_MODULE, 0);
2447 if (card == NULL) 2447 if (card == NULL)
2448 return -ENOMEM; 2448 return -ENOMEM;
2449 2449
2450 card_type = pci_id->driver_data; 2450 card_type = pci_id->driver_data;
2451 pci_read_config_byte(pci, PCI_REVISION_ID, &revision); 2451 pci_read_config_byte(pci, PCI_REVISION_ID, &revision);
2452 switch (card_type) { 2452 switch (card_type) {
2453 case TYPE_CARD_VIA686: 2453 case TYPE_CARD_VIA686:
2454 strcpy(card->driver, "VIA686A"); 2454 strcpy(card->driver, "VIA686A");
2455 sprintf(card->shortname, "VIA 82C686A/B rev%x", revision); 2455 sprintf(card->shortname, "VIA 82C686A/B rev%x", revision);
2456 chip_type = TYPE_VIA686; 2456 chip_type = TYPE_VIA686;
2457 break; 2457 break;
2458 case TYPE_CARD_VIA8233: 2458 case TYPE_CARD_VIA8233:
2459 chip_type = TYPE_VIA8233; 2459 chip_type = TYPE_VIA8233;
2460 sprintf(card->shortname, "VIA 823x rev%x", revision); 2460 sprintf(card->shortname, "VIA 823x rev%x", revision);
2461 for (i = 0; i < ARRAY_SIZE(via823x_cards); i++) { 2461 for (i = 0; i < ARRAY_SIZE(via823x_cards); i++) {
2462 if (revision == via823x_cards[i].revision) { 2462 if (revision == via823x_cards[i].revision) {
2463 chip_type = via823x_cards[i].type; 2463 chip_type = via823x_cards[i].type;
2464 strcpy(card->shortname, via823x_cards[i].name); 2464 strcpy(card->shortname, via823x_cards[i].name);
2465 break; 2465 break;
2466 } 2466 }
2467 } 2467 }
2468 if (chip_type != TYPE_VIA8233A) { 2468 if (chip_type != TYPE_VIA8233A) {
2469 if (dxs_support == VIA_DXS_AUTO) 2469 if (dxs_support == VIA_DXS_AUTO)
2470 dxs_support = check_dxs_list(pci, revision); 2470 dxs_support = check_dxs_list(pci, revision);
2471 /* force to use VIA8233 or 8233A model according to 2471 /* force to use VIA8233 or 8233A model according to
2472 * dxs_support module option 2472 * dxs_support module option
2473 */ 2473 */
2474 if (dxs_support == VIA_DXS_DISABLE) 2474 if (dxs_support == VIA_DXS_DISABLE)
2475 chip_type = TYPE_VIA8233A; 2475 chip_type = TYPE_VIA8233A;
2476 else 2476 else
2477 chip_type = TYPE_VIA8233; 2477 chip_type = TYPE_VIA8233;
2478 } 2478 }
2479 if (chip_type == TYPE_VIA8233A) 2479 if (chip_type == TYPE_VIA8233A)
2480 strcpy(card->driver, "VIA8233A"); 2480 strcpy(card->driver, "VIA8233A");
2481 else if (revision >= VIA_REV_8237) 2481 else if (revision >= VIA_REV_8237)
2482 strcpy(card->driver, "VIA8237"); /* no slog assignment */ 2482 strcpy(card->driver, "VIA8237"); /* no slog assignment */
2483 else 2483 else
2484 strcpy(card->driver, "VIA8233"); 2484 strcpy(card->driver, "VIA8233");
2485 break; 2485 break;
2486 default: 2486 default:
2487 snd_printk(KERN_ERR "invalid card type %d\n", card_type); 2487 snd_printk(KERN_ERR "invalid card type %d\n", card_type);
2488 err = -EINVAL; 2488 err = -EINVAL;
2489 goto __error; 2489 goto __error;
2490 } 2490 }
2491 2491
2492 if ((err = snd_via82xx_create(card, pci, chip_type, revision, 2492 if ((err = snd_via82xx_create(card, pci, chip_type, revision,
2493 ac97_clock, &chip)) < 0) 2493 ac97_clock, &chip)) < 0)
2494 goto __error; 2494 goto __error;
2495 card->private_data = chip; 2495 card->private_data = chip;
2496 if ((err = snd_via82xx_mixer_new(chip, ac97_quirk)) < 0) 2496 if ((err = snd_via82xx_mixer_new(chip, ac97_quirk)) < 0)
2497 goto __error; 2497 goto __error;
2498 2498
2499 if (chip_type == TYPE_VIA686) { 2499 if (chip_type == TYPE_VIA686) {
2500 if ((err = snd_via686_pcm_new(chip)) < 0 || 2500 if ((err = snd_via686_pcm_new(chip)) < 0 ||
2501 (err = snd_via686_init_misc(chip)) < 0) 2501 (err = snd_via686_init_misc(chip)) < 0)
2502 goto __error; 2502 goto __error;
2503 } else { 2503 } else {
2504 if (chip_type == TYPE_VIA8233A) { 2504 if (chip_type == TYPE_VIA8233A) {
2505 if ((err = snd_via8233a_pcm_new(chip)) < 0) 2505 if ((err = snd_via8233a_pcm_new(chip)) < 0)
2506 goto __error; 2506 goto __error;
2507 // chip->dxs_fixed = 1; /* FIXME: use 48k for DXS #3? */ 2507 // chip->dxs_fixed = 1; /* FIXME: use 48k for DXS #3? */
2508 } else { 2508 } else {
2509 if ((err = snd_via8233_pcm_new(chip)) < 0) 2509 if ((err = snd_via8233_pcm_new(chip)) < 0)
2510 goto __error; 2510 goto __error;
2511 if (dxs_support == VIA_DXS_48K) 2511 if (dxs_support == VIA_DXS_48K)
2512 chip->dxs_fixed = 1; 2512 chip->dxs_fixed = 1;
2513 else if (dxs_support == VIA_DXS_NO_VRA) 2513 else if (dxs_support == VIA_DXS_NO_VRA)
2514 chip->no_vra = 1; 2514 chip->no_vra = 1;
2515 else if (dxs_support == VIA_DXS_SRC) { 2515 else if (dxs_support == VIA_DXS_SRC) {
2516 chip->no_vra = 1; 2516 chip->no_vra = 1;
2517 chip->dxs_src = 1; 2517 chip->dxs_src = 1;
2518 } 2518 }
2519 } 2519 }
2520 if ((err = snd_via8233_init_misc(chip)) < 0) 2520 if ((err = snd_via8233_init_misc(chip)) < 0)
2521 goto __error; 2521 goto __error;
2522 } 2522 }
2523 2523
2524 /* disable interrupts */ 2524 /* disable interrupts */
2525 for (i = 0; i < chip->num_devs; i++) 2525 for (i = 0; i < chip->num_devs; i++)
2526 snd_via82xx_channel_reset(chip, &chip->devs[i]); 2526 snd_via82xx_channel_reset(chip, &chip->devs[i]);
2527 2527
2528 snprintf(card->longname, sizeof(card->longname), 2528 snprintf(card->longname, sizeof(card->longname),
2529 "%s with %s at %#lx, irq %d", card->shortname, 2529 "%s with %s at %#lx, irq %d", card->shortname,
2530 snd_ac97_get_short_name(chip->ac97), chip->port, chip->irq); 2530 snd_ac97_get_short_name(chip->ac97), chip->port, chip->irq);
2531 2531
2532 snd_via82xx_proc_init(chip); 2532 snd_via82xx_proc_init(chip);
2533 2533
2534 if ((err = snd_card_register(card)) < 0) { 2534 if ((err = snd_card_register(card)) < 0) {
2535 snd_card_free(card); 2535 snd_card_free(card);
2536 return err; 2536 return err;
2537 } 2537 }
2538 pci_set_drvdata(pci, card); 2538 pci_set_drvdata(pci, card);
2539 return 0; 2539 return 0;
2540 2540
2541 __error: 2541 __error:
2542 snd_card_free(card); 2542 snd_card_free(card);
2543 return err; 2543 return err;
2544 } 2544 }
2545 2545
2546 static void __devexit snd_via82xx_remove(struct pci_dev *pci) 2546 static void __devexit snd_via82xx_remove(struct pci_dev *pci)
2547 { 2547 {
2548 snd_card_free(pci_get_drvdata(pci)); 2548 snd_card_free(pci_get_drvdata(pci));
2549 pci_set_drvdata(pci, NULL); 2549 pci_set_drvdata(pci, NULL);
2550 } 2550 }
2551 2551
2552 static struct pci_driver driver = { 2552 static struct pci_driver driver = {
2553 .name = "VIA 82xx Audio", 2553 .name = "VIA 82xx Audio",
2554 .id_table = snd_via82xx_ids, 2554 .id_table = snd_via82xx_ids,
2555 .probe = snd_via82xx_probe, 2555 .probe = snd_via82xx_probe,
2556 .remove = __devexit_p(snd_via82xx_remove), 2556 .remove = __devexit_p(snd_via82xx_remove),
2557 #ifdef CONFIG_PM 2557 #ifdef CONFIG_PM
2558 .suspend = snd_via82xx_suspend, 2558 .suspend = snd_via82xx_suspend,
2559 .resume = snd_via82xx_resume, 2559 .resume = snd_via82xx_resume,
2560 #endif 2560 #endif
2561 }; 2561 };
2562 2562
2563 static int __init alsa_card_via82xx_init(void) 2563 static int __init alsa_card_via82xx_init(void)
2564 { 2564 {
2565 return pci_register_driver(&driver); 2565 return pci_register_driver(&driver);
2566 } 2566 }
2567 2567
2568 static void __exit alsa_card_via82xx_exit(void) 2568 static void __exit alsa_card_via82xx_exit(void)
2569 { 2569 {
2570 pci_unregister_driver(&driver); 2570 pci_unregister_driver(&driver);
2571 } 2571 }
2572 2572
2573 module_init(alsa_card_via82xx_init) 2573 module_init(alsa_card_via82xx_init)
2574 module_exit(alsa_card_via82xx_exit) 2574 module_exit(alsa_card_via82xx_exit)
2575 2575