diff options
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/Kconfig | 30 | ||||
-rw-r--r-- | sound/pci/Makefile | 3 | ||||
-rw-r--r-- | sound/pci/als300.c | 866 | ||||
-rw-r--r-- | sound/pci/cs4281.c | 28 | ||||
-rw-r--r-- | sound/pci/hda/hda_codec.c | 2 | ||||
-rw-r--r-- | sound/pci/hda/hda_intel.c | 2 | ||||
-rw-r--r-- | sound/pci/hda/patch_analog.c | 9 | ||||
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 298 | ||||
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 53 | ||||
-rw-r--r-- | sound/pci/ice1712/aureon.c | 163 | ||||
-rw-r--r-- | sound/pci/ice1712/ice1712.c | 2 | ||||
-rw-r--r-- | sound/pci/ice1712/ice1712.h | 1 | ||||
-rw-r--r-- | sound/pci/maestro3.c | 57 | ||||
-rw-r--r-- | sound/pci/pcxhr/pcxhr_core.c | 9 | ||||
-rw-r--r-- | sound/pci/riptide/Makefile | 3 | ||||
-rw-r--r-- | sound/pci/riptide/riptide.c | 2223 | ||||
-rw-r--r-- | sound/pci/via82xx.c | 1 |
17 files changed, 3628 insertions, 122 deletions
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 1e2e19305e38..a2081803a827 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig | |||
@@ -15,6 +15,18 @@ config SND_AD1889 | |||
15 | To compile this as a module, choose M here: the module | 15 | To compile this as a module, choose M here: the module |
16 | will be called snd-ad1889. | 16 | will be called snd-ad1889. |
17 | 17 | ||
18 | config SND_ALS300 | ||
19 | tristate "Avance Logic ALS300/ALS300+" | ||
20 | depends on SND | ||
21 | select SND_PCM | ||
22 | select SND_AC97_CODEC | ||
23 | select SND_OPL3_LIB | ||
24 | help | ||
25 | Say 'Y' or 'M' to include support for Avance Logic ALS300/ALS300+ | ||
26 | |||
27 | To compile this driver as a module, choose M here: the module | ||
28 | will be called snd-als300 | ||
29 | |||
18 | config SND_ALS4000 | 30 | config SND_ALS4000 |
19 | tristate "Avance Logic ALS4000" | 31 | tristate "Avance Logic ALS4000" |
20 | depends on SND && ISA_DMA_API | 32 | depends on SND && ISA_DMA_API |
@@ -195,8 +207,9 @@ config SND_CS46XX | |||
195 | will be called snd-cs46xx. | 207 | will be called snd-cs46xx. |
196 | 208 | ||
197 | config SND_CS46XX_NEW_DSP | 209 | config SND_CS46XX_NEW_DSP |
198 | bool "Cirrus Logic (Sound Fusion) New DSP support (EXPERIMENTAL)" | 210 | bool "Cirrus Logic (Sound Fusion) New DSP support" |
199 | depends on SND_CS46XX && EXPERIMENTAL | 211 | depends on SND_CS46XX |
212 | default y | ||
200 | help | 213 | help |
201 | Say Y here to use a new DSP image for SPDIF and dual codecs. | 214 | Say Y here to use a new DSP image for SPDIF and dual codecs. |
202 | 215 | ||
@@ -466,6 +479,19 @@ config SND_PCXHR | |||
466 | To compile this driver as a module, choose M here: the module | 479 | To compile this driver as a module, choose M here: the module |
467 | will be called snd-pcxhr. | 480 | will be called snd-pcxhr. |
468 | 481 | ||
482 | config SND_RIPTIDE | ||
483 | tristate "Conexant Riptide" | ||
484 | depends on SND | ||
485 | depends on FW_LOADER | ||
486 | select SND_OPL3_LIB | ||
487 | select SND_MPU401_UART | ||
488 | select SND_AC97_CODEC | ||
489 | help | ||
490 | Say 'Y' or 'M' to include support for Conexant Riptide chip. | ||
491 | |||
492 | To compile this driver as a module, choose M here: the module | ||
493 | will be called snd-riptide | ||
494 | |||
469 | config SND_RME32 | 495 | config SND_RME32 |
470 | tristate "RME Digi32, 32/8, 32 PRO" | 496 | tristate "RME Digi32, 32/8, 32 PRO" |
471 | depends on SND | 497 | depends on SND |
diff --git a/sound/pci/Makefile b/sound/pci/Makefile index a6c3cd58fe94..cba5105aafea 100644 --- a/sound/pci/Makefile +++ b/sound/pci/Makefile | |||
@@ -4,6 +4,7 @@ | |||
4 | # | 4 | # |
5 | 5 | ||
6 | snd-ad1889-objs := ad1889.o | 6 | snd-ad1889-objs := ad1889.o |
7 | snd-als300-objs := als300.o | ||
7 | snd-als4000-objs := als4000.o | 8 | snd-als4000-objs := als4000.o |
8 | snd-atiixp-objs := atiixp.o | 9 | snd-atiixp-objs := atiixp.o |
9 | snd-atiixp-modem-objs := atiixp_modem.o | 10 | snd-atiixp-modem-objs := atiixp_modem.o |
@@ -27,6 +28,7 @@ snd-via82xx-modem-objs := via82xx_modem.o | |||
27 | 28 | ||
28 | # Toplevel Module Dependency | 29 | # Toplevel Module Dependency |
29 | obj-$(CONFIG_SND_AD1889) += snd-ad1889.o | 30 | obj-$(CONFIG_SND_AD1889) += snd-ad1889.o |
31 | obj-$(CONFIG_SND_ALS300) += snd-als300.o | ||
30 | obj-$(CONFIG_SND_ALS4000) += snd-als4000.o | 32 | obj-$(CONFIG_SND_ALS4000) += snd-als4000.o |
31 | obj-$(CONFIG_SND_ATIIXP) += snd-atiixp.o | 33 | obj-$(CONFIG_SND_ATIIXP) += snd-atiixp.o |
32 | obj-$(CONFIG_SND_ATIIXP_MODEM) += snd-atiixp-modem.o | 34 | obj-$(CONFIG_SND_ATIIXP_MODEM) += snd-atiixp-modem.o |
@@ -62,6 +64,7 @@ obj-$(CONFIG_SND) += \ | |||
62 | mixart/ \ | 64 | mixart/ \ |
63 | nm256/ \ | 65 | nm256/ \ |
64 | pcxhr/ \ | 66 | pcxhr/ \ |
67 | riptide/ \ | ||
65 | rme9652/ \ | 68 | rme9652/ \ |
66 | trident/ \ | 69 | trident/ \ |
67 | ymfpci/ \ | 70 | ymfpci/ \ |
diff --git a/sound/pci/als300.c b/sound/pci/als300.c new file mode 100644 index 000000000000..37b80570a5c6 --- /dev/null +++ b/sound/pci/als300.c | |||
@@ -0,0 +1,866 @@ | |||
1 | /* | ||
2 | * als300.c - driver for Avance Logic ALS300/ALS300+ soundcards. | ||
3 | * Copyright (C) 2005 by Ash Willis <ashwillis@programmer.net> | ||
4 | * | ||
5 | * This program is free software; you can redistribute it and/or modify | ||
6 | * it under the terms of the GNU General Public License as published by | ||
7 | * the Free Software Foundation; either version 2 of the License, or | ||
8 | * (at your option) any later version. | ||
9 | * | ||
10 | * This program is distributed in the hope that it will be useful, | ||
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
13 | * GNU General Public License for more details. | ||
14 | * | ||
15 | * You should have received a copy of the GNU General Public License | ||
16 | * along with this program; if not, write to the Free Software | ||
17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
18 | * | ||
19 | * TODO | ||
20 | * 4 channel playback for ALS300+ | ||
21 | * gameport | ||
22 | * mpu401 | ||
23 | * opl3 | ||
24 | * | ||
25 | * NOTES | ||
26 | * The BLOCK_COUNTER registers for the ALS300(+) return a figure related to | ||
27 | * the position in the current period, NOT the whole buffer. It is important | ||
28 | * to know which period we are in so we can calculate the correct pointer. | ||
29 | * This is why we always use 2 periods. We can then use a flip-flop variable | ||
30 | * to keep track of what period we are in. | ||
31 | */ | ||
32 | |||
33 | #include <sound/driver.h> | ||
34 | #include <linux/delay.h> | ||
35 | #include <linux/init.h> | ||
36 | #include <linux/moduleparam.h> | ||
37 | #include <linux/pci.h> | ||
38 | #include <linux/interrupt.h> | ||
39 | #include <linux/slab.h> | ||
40 | |||
41 | #include <asm/io.h> | ||
42 | |||
43 | #include <sound/core.h> | ||
44 | #include <sound/control.h> | ||
45 | #include <sound/initval.h> | ||
46 | #include <sound/pcm.h> | ||
47 | #include <sound/pcm_params.h> | ||
48 | #include <sound/ac97_codec.h> | ||
49 | #include <sound/opl3.h> | ||
50 | |||
51 | /* snd_als300_set_irq_flag */ | ||
52 | #define IRQ_DISABLE 0 | ||
53 | #define IRQ_ENABLE 1 | ||
54 | |||
55 | /* I/O port layout */ | ||
56 | #define AC97_ACCESS 0x00 | ||
57 | #define AC97_READ 0x04 | ||
58 | #define AC97_STATUS 0x06 | ||
59 | #define AC97_DATA_AVAIL (1<<6) | ||
60 | #define AC97_BUSY (1<<7) | ||
61 | #define ALS300_IRQ_STATUS 0x07 /* ALS300 Only */ | ||
62 | #define IRQ_PLAYBACK (1<<3) | ||
63 | #define IRQ_CAPTURE (1<<2) | ||
64 | #define GCR_DATA 0x08 | ||
65 | #define GCR_INDEX 0x0C | ||
66 | #define ALS300P_DRAM_IRQ_STATUS 0x0D /* ALS300+ Only */ | ||
67 | #define MPU_IRQ_STATUS 0x0E /* ALS300 Rev. E+, ALS300+ */ | ||
68 | #define ALS300P_IRQ_STATUS 0x0F /* ALS300+ Only */ | ||
69 | |||
70 | /* General Control Registers */ | ||
71 | #define PLAYBACK_START 0x80 | ||
72 | #define PLAYBACK_END 0x81 | ||
73 | #define PLAYBACK_CONTROL 0x82 | ||
74 | #define TRANSFER_START (1<<16) | ||
75 | #define FIFO_PAUSE (1<<17) | ||
76 | #define RECORD_START 0x83 | ||
77 | #define RECORD_END 0x84 | ||
78 | #define RECORD_CONTROL 0x85 | ||
79 | #define DRAM_WRITE_CONTROL 0x8B | ||
80 | #define WRITE_TRANS_START (1<<16) | ||
81 | #define DRAM_MODE_2 (1<<17) | ||
82 | #define MISC_CONTROL 0x8C | ||
83 | #define IRQ_SET_BIT (1<<15) | ||
84 | #define VMUTE_NORMAL (1<<20) | ||
85 | #define MMUTE_NORMAL (1<<21) | ||
86 | #define MUS_VOC_VOL 0x8E | ||
87 | #define PLAYBACK_BLOCK_COUNTER 0x9A | ||
88 | #define RECORD_BLOCK_COUNTER 0x9B | ||
89 | |||
90 | #define DEBUG_CALLS 1 | ||
91 | #define DEBUG_PLAY_REC 1 | ||
92 | |||
93 | #if DEBUG_CALLS | ||
94 | #define snd_als300_dbgcalls(format, args...) printk(format, ##args) | ||
95 | #define snd_als300_dbgcallenter() printk(KERN_ERR "--> %s\n", __FUNCTION__) | ||
96 | #define snd_als300_dbgcallleave() printk(KERN_ERR "<-- %s\n", __FUNCTION__) | ||
97 | #else | ||
98 | #define snd_als300_dbgcalls(format, args...) | ||
99 | #define snd_als300_dbgcallenter() | ||
100 | #define snd_als300_dbgcallleave() | ||
101 | #endif | ||
102 | |||
103 | #if DEBUG_PLAY_REC | ||
104 | #define snd_als300_dbgplay(format, args...) printk(KERN_ERR format, ##args) | ||
105 | #else | ||
106 | #define snd_als300_dbgplay(format, args...) | ||
107 | #endif | ||
108 | |||
109 | enum {DEVICE_ALS300, DEVICE_ALS300_PLUS}; | ||
110 | |||
111 | MODULE_AUTHOR("Ash Willis <ashwillis@programmer.net>"); | ||
112 | MODULE_DESCRIPTION("Avance Logic ALS300"); | ||
113 | MODULE_LICENSE("GPL"); | ||
114 | MODULE_SUPPORTED_DEVICE("{{Avance Logic,ALS300},{Avance Logic,ALS300+}}"); | ||
115 | |||
116 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; | ||
117 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; | ||
118 | static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; | ||
119 | |||
120 | struct snd_als300 { | ||
121 | unsigned long port; | ||
122 | spinlock_t reg_lock; | ||
123 | struct snd_card *card; | ||
124 | struct pci_dev *pci; | ||
125 | |||
126 | struct snd_pcm *pcm; | ||
127 | struct snd_pcm_substream *playback_substream; | ||
128 | struct snd_pcm_substream *capture_substream; | ||
129 | |||
130 | struct snd_ac97 *ac97; | ||
131 | struct snd_opl3 *opl3; | ||
132 | |||
133 | struct resource *res_port; | ||
134 | |||
135 | int irq; | ||
136 | |||
137 | int chip_type; /* ALS300 or ALS300+ */ | ||
138 | |||
139 | char revision; | ||
140 | }; | ||
141 | |||
142 | struct snd_als300_substream_data { | ||
143 | int period_flipflop; | ||
144 | int control_register; | ||
145 | int block_counter_register; | ||
146 | }; | ||
147 | |||
148 | static struct pci_device_id snd_als300_ids[] = { | ||
149 | { 0x4005, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALS300 }, | ||
150 | { 0x4005, 0x0308, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALS300_PLUS }, | ||
151 | { 0, } | ||
152 | }; | ||
153 | |||
154 | MODULE_DEVICE_TABLE(pci, snd_als300_ids); | ||
155 | |||
156 | static inline u32 snd_als300_gcr_read(unsigned long port, unsigned short reg) | ||
157 | { | ||
158 | outb(reg, port+GCR_INDEX); | ||
159 | return inl(port+GCR_DATA); | ||
160 | } | ||
161 | |||
162 | static inline void snd_als300_gcr_write(unsigned long port, | ||
163 | unsigned short reg, u32 val) | ||
164 | { | ||
165 | outb(reg, port+GCR_INDEX); | ||
166 | outl(val, port+GCR_DATA); | ||
167 | } | ||
168 | |||
169 | /* Enable/Disable Interrupts */ | ||
170 | static void snd_als300_set_irq_flag(struct snd_als300 *chip, int cmd) | ||
171 | { | ||
172 | u32 tmp = snd_als300_gcr_read(chip->port, MISC_CONTROL); | ||
173 | snd_als300_dbgcallenter(); | ||
174 | |||
175 | /* boolean XOR check, since old vs. new hardware have | ||
176 | directly reversed bit setting for ENABLE and DISABLE. | ||
177 | ALS300+ acts like newer versions of ALS300 */ | ||
178 | if (((chip->revision > 5 || chip->chip_type == DEVICE_ALS300_PLUS) ^ | ||
179 | (cmd == IRQ_ENABLE)) == 0) | ||
180 | tmp |= IRQ_SET_BIT; | ||
181 | else | ||
182 | tmp &= ~IRQ_SET_BIT; | ||
183 | snd_als300_gcr_write(chip->port, MISC_CONTROL, tmp); | ||
184 | snd_als300_dbgcallleave(); | ||
185 | } | ||
186 | |||
187 | static int snd_als300_free(struct snd_als300 *chip) | ||
188 | { | ||
189 | snd_als300_dbgcallenter(); | ||
190 | snd_als300_set_irq_flag(chip, IRQ_DISABLE); | ||
191 | if (chip->irq >= 0) | ||
192 | free_irq(chip->irq, (void *)chip); | ||
193 | pci_release_regions(chip->pci); | ||
194 | pci_disable_device(chip->pci); | ||
195 | kfree(chip); | ||
196 | snd_als300_dbgcallleave(); | ||
197 | return 0; | ||
198 | } | ||
199 | |||
200 | static int snd_als300_dev_free(struct snd_device *device) | ||
201 | { | ||
202 | struct snd_als300 *chip = device->device_data; | ||
203 | return snd_als300_free(chip); | ||
204 | } | ||
205 | |||
206 | static irqreturn_t snd_als300_interrupt(int irq, void *dev_id, | ||
207 | struct pt_regs *regs) | ||
208 | { | ||
209 | u8 status; | ||
210 | struct snd_als300 *chip = dev_id; | ||
211 | struct snd_als300_substream_data *data; | ||
212 | |||
213 | status = inb(chip->port+ALS300_IRQ_STATUS); | ||
214 | if (!status) /* shared IRQ, for different device?? Exit ASAP! */ | ||
215 | return IRQ_NONE; | ||
216 | |||
217 | /* ACK everything ASAP */ | ||
218 | outb(status, chip->port+ALS300_IRQ_STATUS); | ||
219 | if (status & IRQ_PLAYBACK) { | ||
220 | if (chip->pcm && chip->playback_substream) { | ||
221 | data = chip->playback_substream->runtime->private_data; | ||
222 | data->period_flipflop ^= 1; | ||
223 | snd_pcm_period_elapsed(chip->playback_substream); | ||
224 | snd_als300_dbgplay("IRQ_PLAYBACK\n"); | ||
225 | } | ||
226 | } | ||
227 | if (status & IRQ_CAPTURE) { | ||
228 | if (chip->pcm && chip->capture_substream) { | ||
229 | data = chip->capture_substream->runtime->private_data; | ||
230 | data->period_flipflop ^= 1; | ||
231 | snd_pcm_period_elapsed(chip->capture_substream); | ||
232 | snd_als300_dbgplay("IRQ_CAPTURE\n"); | ||
233 | } | ||
234 | } | ||
235 | return IRQ_HANDLED; | ||
236 | } | ||
237 | |||
238 | static irqreturn_t snd_als300plus_interrupt(int irq, void *dev_id, | ||
239 | struct pt_regs *regs) | ||
240 | { | ||
241 | u8 general, mpu, dram; | ||
242 | struct snd_als300 *chip = dev_id; | ||
243 | struct snd_als300_substream_data *data; | ||
244 | |||
245 | general = inb(chip->port+ALS300P_IRQ_STATUS); | ||
246 | mpu = inb(chip->port+MPU_IRQ_STATUS); | ||
247 | dram = inb(chip->port+ALS300P_DRAM_IRQ_STATUS); | ||
248 | |||
249 | /* shared IRQ, for different device?? Exit ASAP! */ | ||
250 | if ((general == 0) && ((mpu & 0x80) == 0) && ((dram & 0x01) == 0)) | ||
251 | return IRQ_NONE; | ||
252 | |||
253 | if (general & IRQ_PLAYBACK) { | ||
254 | if (chip->pcm && chip->playback_substream) { | ||
255 | outb(IRQ_PLAYBACK, chip->port+ALS300P_IRQ_STATUS); | ||
256 | data = chip->playback_substream->runtime->private_data; | ||
257 | data->period_flipflop ^= 1; | ||
258 | snd_pcm_period_elapsed(chip->playback_substream); | ||
259 | snd_als300_dbgplay("IRQ_PLAYBACK\n"); | ||
260 | } | ||
261 | } | ||
262 | if (general & IRQ_CAPTURE) { | ||
263 | if (chip->pcm && chip->capture_substream) { | ||
264 | outb(IRQ_CAPTURE, chip->port+ALS300P_IRQ_STATUS); | ||
265 | data = chip->capture_substream->runtime->private_data; | ||
266 | data->period_flipflop ^= 1; | ||
267 | snd_pcm_period_elapsed(chip->capture_substream); | ||
268 | snd_als300_dbgplay("IRQ_CAPTURE\n"); | ||
269 | } | ||
270 | } | ||
271 | /* FIXME: Ack other interrupt types. Not important right now as | ||
272 | * those other devices aren't enabled. */ | ||
273 | return IRQ_HANDLED; | ||
274 | } | ||
275 | |||
276 | static void __devexit snd_als300_remove(struct pci_dev *pci) | ||
277 | { | ||
278 | snd_als300_dbgcallenter(); | ||
279 | snd_card_free(pci_get_drvdata(pci)); | ||
280 | pci_set_drvdata(pci, NULL); | ||
281 | snd_als300_dbgcallleave(); | ||
282 | } | ||
283 | |||
284 | static unsigned short snd_als300_ac97_read(struct snd_ac97 *ac97, | ||
285 | unsigned short reg) | ||
286 | { | ||
287 | int i; | ||
288 | struct snd_als300 *chip = ac97->private_data; | ||
289 | |||
290 | for (i = 0; i < 1000; i++) { | ||
291 | if ((inb(chip->port+AC97_STATUS) & (AC97_BUSY)) == 0) | ||
292 | break; | ||
293 | udelay(10); | ||
294 | } | ||
295 | outl((reg << 24) | (1 << 31), chip->port+AC97_ACCESS); | ||
296 | |||
297 | for (i = 0; i < 1000; i++) { | ||
298 | if ((inb(chip->port+AC97_STATUS) & (AC97_DATA_AVAIL)) != 0) | ||
299 | break; | ||
300 | udelay(10); | ||
301 | } | ||
302 | return inw(chip->port+AC97_READ); | ||
303 | } | ||
304 | |||
305 | static void snd_als300_ac97_write(struct snd_ac97 *ac97, | ||
306 | unsigned short reg, unsigned short val) | ||
307 | { | ||
308 | int i; | ||
309 | struct snd_als300 *chip = ac97->private_data; | ||
310 | |||
311 | for (i = 0; i < 1000; i++) { | ||
312 | if ((inb(chip->port+AC97_STATUS) & (AC97_BUSY)) == 0) | ||
313 | break; | ||
314 | udelay(10); | ||
315 | } | ||
316 | outl((reg << 24) | val, chip->port+AC97_ACCESS); | ||
317 | } | ||
318 | |||
319 | static int snd_als300_ac97(struct snd_als300 *chip) | ||
320 | { | ||
321 | struct snd_ac97_bus *bus; | ||
322 | struct snd_ac97_template ac97; | ||
323 | int err; | ||
324 | static struct snd_ac97_bus_ops ops = { | ||
325 | .write = snd_als300_ac97_write, | ||
326 | .read = snd_als300_ac97_read, | ||
327 | }; | ||
328 | |||
329 | snd_als300_dbgcallenter(); | ||
330 | if ((err = snd_ac97_bus(chip->card, 0, &ops, NULL, &bus)) < 0) | ||
331 | return err; | ||
332 | |||
333 | memset(&ac97, 0, sizeof(ac97)); | ||
334 | ac97.private_data = chip; | ||
335 | |||
336 | snd_als300_dbgcallleave(); | ||
337 | return snd_ac97_mixer(bus, &ac97, &chip->ac97); | ||
338 | } | ||
339 | |||
340 | /* hardware definition | ||
341 | * | ||
342 | * In AC97 mode, we always use 48k/16bit/stereo. | ||
343 | * Any request to change data type is ignored by | ||
344 | * the card when it is running outside of legacy | ||
345 | * mode. | ||
346 | */ | ||
347 | static struct snd_pcm_hardware snd_als300_playback_hw = | ||
348 | { | ||
349 | .info = (SNDRV_PCM_INFO_MMAP | | ||
350 | SNDRV_PCM_INFO_INTERLEAVED | | ||
351 | SNDRV_PCM_INFO_PAUSE | | ||
352 | SNDRV_PCM_INFO_MMAP_VALID), | ||
353 | .formats = SNDRV_PCM_FMTBIT_S16, | ||
354 | .rates = SNDRV_PCM_RATE_48000, | ||
355 | .rate_min = 48000, | ||
356 | .rate_max = 48000, | ||
357 | .channels_min = 2, | ||
358 | .channels_max = 2, | ||
359 | .buffer_bytes_max = 64 * 1024, | ||
360 | .period_bytes_min = 64, | ||
361 | .period_bytes_max = 32 * 1024, | ||
362 | .periods_min = 2, | ||
363 | .periods_max = 2, | ||
364 | }; | ||
365 | |||
366 | static struct snd_pcm_hardware snd_als300_capture_hw = | ||
367 | { | ||
368 | .info = (SNDRV_PCM_INFO_MMAP | | ||
369 | SNDRV_PCM_INFO_INTERLEAVED | | ||
370 | SNDRV_PCM_INFO_PAUSE | | ||
371 | SNDRV_PCM_INFO_MMAP_VALID), | ||
372 | .formats = SNDRV_PCM_FMTBIT_S16, | ||
373 | .rates = SNDRV_PCM_RATE_48000, | ||
374 | .rate_min = 48000, | ||
375 | .rate_max = 48000, | ||
376 | .channels_min = 2, | ||
377 | .channels_max = 2, | ||
378 | .buffer_bytes_max = 64 * 1024, | ||
379 | .period_bytes_min = 64, | ||
380 | .period_bytes_max = 32 * 1024, | ||
381 | .periods_min = 2, | ||
382 | .periods_max = 2, | ||
383 | }; | ||
384 | |||
385 | static int snd_als300_playback_open(struct snd_pcm_substream *substream) | ||
386 | { | ||
387 | struct snd_als300 *chip = snd_pcm_substream_chip(substream); | ||
388 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
389 | struct snd_als300_substream_data *data = kzalloc(sizeof(*data), | ||
390 | GFP_KERNEL); | ||
391 | |||
392 | snd_als300_dbgcallenter(); | ||
393 | chip->playback_substream = substream; | ||
394 | runtime->hw = snd_als300_playback_hw; | ||
395 | runtime->private_data = data; | ||
396 | data->control_register = PLAYBACK_CONTROL; | ||
397 | data->block_counter_register = PLAYBACK_BLOCK_COUNTER; | ||
398 | snd_als300_dbgcallleave(); | ||
399 | return 0; | ||
400 | } | ||
401 | |||
402 | static int snd_als300_playback_close(struct snd_pcm_substream *substream) | ||
403 | { | ||
404 | struct snd_als300 *chip = snd_pcm_substream_chip(substream); | ||
405 | struct snd_als300_substream_data *data; | ||
406 | |||
407 | data = substream->runtime->private_data; | ||
408 | snd_als300_dbgcallenter(); | ||
409 | kfree(data); | ||
410 | chip->playback_substream = NULL; | ||
411 | snd_pcm_lib_free_pages(substream); | ||
412 | snd_als300_dbgcallleave(); | ||
413 | return 0; | ||
414 | } | ||
415 | |||
416 | static int snd_als300_capture_open(struct snd_pcm_substream *substream) | ||
417 | { | ||
418 | struct snd_als300 *chip = snd_pcm_substream_chip(substream); | ||
419 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
420 | struct snd_als300_substream_data *data = kzalloc(sizeof(*data), | ||
421 | GFP_KERNEL); | ||
422 | |||
423 | snd_als300_dbgcallenter(); | ||
424 | chip->capture_substream = substream; | ||
425 | runtime->hw = snd_als300_capture_hw; | ||
426 | runtime->private_data = data; | ||
427 | data->control_register = RECORD_CONTROL; | ||
428 | data->block_counter_register = RECORD_BLOCK_COUNTER; | ||
429 | snd_als300_dbgcallleave(); | ||
430 | return 0; | ||
431 | } | ||
432 | |||
433 | static int snd_als300_capture_close(struct snd_pcm_substream *substream) | ||
434 | { | ||
435 | struct snd_als300 *chip = snd_pcm_substream_chip(substream); | ||
436 | struct snd_als300_substream_data *data; | ||
437 | |||
438 | data = substream->runtime->private_data; | ||
439 | snd_als300_dbgcallenter(); | ||
440 | kfree(data); | ||
441 | chip->capture_substream = NULL; | ||
442 | snd_pcm_lib_free_pages(substream); | ||
443 | snd_als300_dbgcallleave(); | ||
444 | return 0; | ||
445 | } | ||
446 | |||
447 | static int snd_als300_pcm_hw_params(struct snd_pcm_substream *substream, | ||
448 | snd_pcm_hw_params_t * hw_params) | ||
449 | { | ||
450 | return snd_pcm_lib_malloc_pages(substream, | ||
451 | params_buffer_bytes(hw_params)); | ||
452 | } | ||
453 | |||
454 | static int snd_als300_pcm_hw_free(struct snd_pcm_substream *substream) | ||
455 | { | ||
456 | return snd_pcm_lib_free_pages(substream); | ||
457 | } | ||
458 | |||
459 | static int snd_als300_playback_prepare(struct snd_pcm_substream *substream) | ||
460 | { | ||
461 | u32 tmp; | ||
462 | struct snd_als300 *chip = snd_pcm_substream_chip(substream); | ||
463 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
464 | unsigned short period_bytes = snd_pcm_lib_period_bytes(substream); | ||
465 | unsigned short buffer_bytes = snd_pcm_lib_buffer_bytes(substream); | ||
466 | |||
467 | snd_als300_dbgcallenter(); | ||
468 | spin_lock_irq(&chip->reg_lock); | ||
469 | tmp = snd_als300_gcr_read(chip->port, PLAYBACK_CONTROL); | ||
470 | tmp &= ~TRANSFER_START; | ||
471 | |||
472 | snd_als300_dbgplay("Period bytes: %d Buffer bytes %d\n", | ||
473 | period_bytes, buffer_bytes); | ||
474 | |||
475 | /* set block size */ | ||
476 | tmp &= 0xffff0000; | ||
477 | tmp |= period_bytes - 1; | ||
478 | snd_als300_gcr_write(chip->port, PLAYBACK_CONTROL, tmp); | ||
479 | |||
480 | /* set dma area */ | ||
481 | snd_als300_gcr_write(chip->port, PLAYBACK_START, | ||
482 | runtime->dma_addr); | ||
483 | snd_als300_gcr_write(chip->port, PLAYBACK_END, | ||
484 | runtime->dma_addr + buffer_bytes - 1); | ||
485 | spin_unlock_irq(&chip->reg_lock); | ||
486 | snd_als300_dbgcallleave(); | ||
487 | return 0; | ||
488 | } | ||
489 | |||
490 | static int snd_als300_capture_prepare(struct snd_pcm_substream *substream) | ||
491 | { | ||
492 | u32 tmp; | ||
493 | struct snd_als300 *chip = snd_pcm_substream_chip(substream); | ||
494 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
495 | unsigned short period_bytes = snd_pcm_lib_period_bytes(substream); | ||
496 | unsigned short buffer_bytes = snd_pcm_lib_buffer_bytes(substream); | ||
497 | |||
498 | snd_als300_dbgcallenter(); | ||
499 | spin_lock_irq(&chip->reg_lock); | ||
500 | tmp = snd_als300_gcr_read(chip->port, RECORD_CONTROL); | ||
501 | tmp &= ~TRANSFER_START; | ||
502 | |||
503 | snd_als300_dbgplay("Period bytes: %d Buffer bytes %d\n", period_bytes, | ||
504 | buffer_bytes); | ||
505 | |||
506 | /* set block size */ | ||
507 | tmp &= 0xffff0000; | ||
508 | tmp |= period_bytes - 1; | ||
509 | |||
510 | /* set dma area */ | ||
511 | snd_als300_gcr_write(chip->port, RECORD_CONTROL, tmp); | ||
512 | snd_als300_gcr_write(chip->port, RECORD_START, | ||
513 | runtime->dma_addr); | ||
514 | snd_als300_gcr_write(chip->port, RECORD_END, | ||
515 | runtime->dma_addr + buffer_bytes - 1); | ||
516 | spin_unlock_irq(&chip->reg_lock); | ||
517 | snd_als300_dbgcallleave(); | ||
518 | return 0; | ||
519 | } | ||
520 | |||
521 | static int snd_als300_trigger(struct snd_pcm_substream *substream, int cmd) | ||
522 | { | ||
523 | struct snd_als300 *chip = snd_pcm_substream_chip(substream); | ||
524 | u32 tmp; | ||
525 | struct snd_als300_substream_data *data; | ||
526 | unsigned short reg; | ||
527 | int ret = 0; | ||
528 | |||
529 | data = substream->runtime->private_data; | ||
530 | reg = data->control_register; | ||
531 | |||
532 | snd_als300_dbgcallenter(); | ||
533 | spin_lock(&chip->reg_lock); | ||
534 | switch (cmd) { | ||
535 | case SNDRV_PCM_TRIGGER_START: | ||
536 | case SNDRV_PCM_TRIGGER_RESUME: | ||
537 | tmp = snd_als300_gcr_read(chip->port, reg); | ||
538 | data->period_flipflop = 1; | ||
539 | snd_als300_gcr_write(chip->port, reg, tmp | TRANSFER_START); | ||
540 | snd_als300_dbgplay("TRIGGER START\n"); | ||
541 | break; | ||
542 | case SNDRV_PCM_TRIGGER_STOP: | ||
543 | case SNDRV_PCM_TRIGGER_SUSPEND: | ||
544 | tmp = snd_als300_gcr_read(chip->port, reg); | ||
545 | snd_als300_gcr_write(chip->port, reg, tmp & ~TRANSFER_START); | ||
546 | snd_als300_dbgplay("TRIGGER STOP\n"); | ||
547 | break; | ||
548 | case SNDRV_PCM_TRIGGER_PAUSE_PUSH: | ||
549 | tmp = snd_als300_gcr_read(chip->port, reg); | ||
550 | snd_als300_gcr_write(chip->port, reg, tmp | FIFO_PAUSE); | ||
551 | snd_als300_dbgplay("TRIGGER PAUSE\n"); | ||
552 | break; | ||
553 | case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: | ||
554 | tmp = snd_als300_gcr_read(chip->port, reg); | ||
555 | snd_als300_gcr_write(chip->port, reg, tmp & ~FIFO_PAUSE); | ||
556 | snd_als300_dbgplay("TRIGGER RELEASE\n"); | ||
557 | break; | ||
558 | default: | ||
559 | snd_als300_dbgplay("TRIGGER INVALID\n"); | ||
560 | ret = -EINVAL; | ||
561 | } | ||
562 | spin_unlock(&chip->reg_lock); | ||
563 | snd_als300_dbgcallleave(); | ||
564 | return ret; | ||
565 | } | ||
566 | |||
567 | static snd_pcm_uframes_t snd_als300_pointer(struct snd_pcm_substream *substream) | ||
568 | { | ||
569 | u16 current_ptr; | ||
570 | struct snd_als300 *chip = snd_pcm_substream_chip(substream); | ||
571 | struct snd_als300_substream_data *data; | ||
572 | unsigned short period_bytes; | ||
573 | |||
574 | data = substream->runtime->private_data; | ||
575 | period_bytes = snd_pcm_lib_period_bytes(substream); | ||
576 | |||
577 | snd_als300_dbgcallenter(); | ||
578 | spin_lock(&chip->reg_lock); | ||
579 | current_ptr = (u16) snd_als300_gcr_read(chip->port, | ||
580 | data->block_counter_register) + 4; | ||
581 | spin_unlock(&chip->reg_lock); | ||
582 | if (current_ptr > period_bytes) | ||
583 | current_ptr = 0; | ||
584 | else | ||
585 | current_ptr = period_bytes - current_ptr; | ||
586 | |||
587 | if (data->period_flipflop == 0) | ||
588 | current_ptr += period_bytes; | ||
589 | snd_als300_dbgplay("Pointer (bytes): %d\n", current_ptr); | ||
590 | snd_als300_dbgcallleave(); | ||
591 | return bytes_to_frames(substream->runtime, current_ptr); | ||
592 | } | ||
593 | |||
594 | static struct snd_pcm_ops snd_als300_playback_ops = { | ||
595 | .open = snd_als300_playback_open, | ||
596 | .close = snd_als300_playback_close, | ||
597 | .ioctl = snd_pcm_lib_ioctl, | ||
598 | .hw_params = snd_als300_pcm_hw_params, | ||
599 | .hw_free = snd_als300_pcm_hw_free, | ||
600 | .prepare = snd_als300_playback_prepare, | ||
601 | .trigger = snd_als300_trigger, | ||
602 | .pointer = snd_als300_pointer, | ||
603 | }; | ||
604 | |||
605 | static struct snd_pcm_ops snd_als300_capture_ops = { | ||
606 | .open = snd_als300_capture_open, | ||
607 | .close = snd_als300_capture_close, | ||
608 | .ioctl = snd_pcm_lib_ioctl, | ||
609 | .hw_params = snd_als300_pcm_hw_params, | ||
610 | .hw_free = snd_als300_pcm_hw_free, | ||
611 | .prepare = snd_als300_capture_prepare, | ||
612 | .trigger = snd_als300_trigger, | ||
613 | .pointer = snd_als300_pointer, | ||
614 | }; | ||
615 | |||
616 | static int __devinit snd_als300_new_pcm(struct snd_als300 *chip) | ||
617 | { | ||
618 | struct snd_pcm *pcm; | ||
619 | int err; | ||
620 | |||
621 | snd_als300_dbgcallenter(); | ||
622 | err = snd_pcm_new(chip->card, "ALS300", 0, 1, 1, &pcm); | ||
623 | if (err < 0) | ||
624 | return err; | ||
625 | pcm->private_data = chip; | ||
626 | strcpy(pcm->name, "ALS300"); | ||
627 | chip->pcm = pcm; | ||
628 | |||
629 | /* set operators */ | ||
630 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, | ||
631 | &snd_als300_playback_ops); | ||
632 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, | ||
633 | &snd_als300_capture_ops); | ||
634 | |||
635 | /* pre-allocation of buffers */ | ||
636 | snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, | ||
637 | snd_dma_pci_data(chip->pci), 64*1024, 64*1024); | ||
638 | snd_als300_dbgcallleave(); | ||
639 | return 0; | ||
640 | } | ||
641 | |||
642 | static void snd_als300_init(struct snd_als300 *chip) | ||
643 | { | ||
644 | unsigned long flags; | ||
645 | u32 tmp; | ||
646 | |||
647 | snd_als300_dbgcallenter(); | ||
648 | spin_lock_irqsave(&chip->reg_lock, flags); | ||
649 | chip->revision = (snd_als300_gcr_read(chip->port, MISC_CONTROL) >> 16) | ||
650 | & 0x0000000F; | ||
651 | /* Setup DRAM */ | ||
652 | tmp = snd_als300_gcr_read(chip->port, DRAM_WRITE_CONTROL); | ||
653 | snd_als300_gcr_write(chip->port, DRAM_WRITE_CONTROL, | ||
654 | (tmp | DRAM_MODE_2) | ||
655 | & ~WRITE_TRANS_START); | ||
656 | |||
657 | /* Enable IRQ output */ | ||
658 | snd_als300_set_irq_flag(chip, IRQ_ENABLE); | ||
659 | |||
660 | /* Unmute hardware devices so their outputs get routed to | ||
661 | * the onboard mixer */ | ||
662 | tmp = snd_als300_gcr_read(chip->port, MISC_CONTROL); | ||
663 | snd_als300_gcr_write(chip->port, MISC_CONTROL, | ||
664 | tmp | VMUTE_NORMAL | MMUTE_NORMAL); | ||
665 | |||
666 | /* Reset volumes */ | ||
667 | snd_als300_gcr_write(chip->port, MUS_VOC_VOL, 0); | ||
668 | |||
669 | /* Make sure playback transfer is stopped */ | ||
670 | tmp = snd_als300_gcr_read(chip->port, PLAYBACK_CONTROL); | ||
671 | snd_als300_gcr_write(chip->port, PLAYBACK_CONTROL, | ||
672 | tmp & ~TRANSFER_START); | ||
673 | spin_unlock_irqrestore(&chip->reg_lock, flags); | ||
674 | snd_als300_dbgcallleave(); | ||
675 | } | ||
676 | |||
677 | static int __devinit snd_als300_create(snd_card_t *card, | ||
678 | struct pci_dev *pci, int chip_type, | ||
679 | struct snd_als300 **rchip) | ||
680 | { | ||
681 | struct snd_als300 *chip; | ||
682 | void *irq_handler; | ||
683 | int err; | ||
684 | |||
685 | static snd_device_ops_t ops = { | ||
686 | .dev_free = snd_als300_dev_free, | ||
687 | }; | ||
688 | *rchip = NULL; | ||
689 | |||
690 | snd_als300_dbgcallenter(); | ||
691 | if ((err = pci_enable_device(pci)) < 0) | ||
692 | return err; | ||
693 | |||
694 | if (pci_set_dma_mask(pci, 0x0fffffff) < 0 || | ||
695 | pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) { | ||
696 | printk(KERN_ERR "error setting 28bit DMA mask\n"); | ||
697 | pci_disable_device(pci); | ||
698 | return -ENXIO; | ||
699 | } | ||
700 | pci_set_master(pci); | ||
701 | |||
702 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); | ||
703 | if (chip == NULL) { | ||
704 | pci_disable_device(pci); | ||
705 | return -ENOMEM; | ||
706 | } | ||
707 | |||
708 | chip->card = card; | ||
709 | chip->pci = pci; | ||
710 | chip->irq = -1; | ||
711 | chip->chip_type = chip_type; | ||
712 | spin_lock_init(&chip->reg_lock); | ||
713 | |||
714 | if ((err = pci_request_regions(pci, "ALS300")) < 0) { | ||
715 | kfree(chip); | ||
716 | pci_disable_device(pci); | ||
717 | return err; | ||
718 | } | ||
719 | chip->port = pci_resource_start(pci, 0); | ||
720 | |||
721 | if (chip->chip_type == DEVICE_ALS300_PLUS) | ||
722 | irq_handler = snd_als300plus_interrupt; | ||
723 | else | ||
724 | irq_handler = snd_als300_interrupt; | ||
725 | |||
726 | if (request_irq(pci->irq, irq_handler, SA_INTERRUPT|SA_SHIRQ, | ||
727 | card->shortname, (void *)chip)) { | ||
728 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | ||
729 | snd_als300_free(chip); | ||
730 | return -EBUSY; | ||
731 | } | ||
732 | chip->irq = pci->irq; | ||
733 | |||
734 | |||
735 | snd_als300_init(chip); | ||
736 | |||
737 | if (snd_als300_ac97(chip) < 0) { | ||
738 | snd_printk(KERN_WARNING "Could not create ac97\n"); | ||
739 | snd_als300_free(chip); | ||
740 | return err; | ||
741 | } | ||
742 | |||
743 | if ((err = snd_als300_new_pcm(chip)) < 0) { | ||
744 | snd_printk(KERN_WARNING "Could not create PCM\n"); | ||
745 | snd_als300_free(chip); | ||
746 | return err; | ||
747 | } | ||
748 | |||
749 | if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, | ||
750 | chip, &ops)) < 0) { | ||
751 | snd_als300_free(chip); | ||
752 | return err; | ||
753 | } | ||
754 | |||
755 | snd_card_set_dev(card, &pci->dev); | ||
756 | |||
757 | *rchip = chip; | ||
758 | snd_als300_dbgcallleave(); | ||
759 | return 0; | ||
760 | } | ||
761 | |||
762 | #ifdef CONFIG_PM | ||
763 | static int snd_als300_suspend(struct pci_dev *pci, pm_message_t state) | ||
764 | { | ||
765 | struct snd_card *card = pci_get_drvdata(pci); | ||
766 | struct snd_als300 *chip = card->private_data; | ||
767 | |||
768 | snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); | ||
769 | snd_pcm_suspend_all(chip->pcm); | ||
770 | snd_ac97_suspend(chip->ac97); | ||
771 | |||
772 | pci_set_power_state(pci, PCI_D3hot); | ||
773 | pci_disable_device(pci); | ||
774 | pci_save_state(pci); | ||
775 | return 0; | ||
776 | } | ||
777 | |||
778 | static int snd_als300_resume(struct pci_dev *pci) | ||
779 | { | ||
780 | struct snd_card *card = pci_get_drvdata(pci); | ||
781 | struct snd_als300 *chip = card->private_data; | ||
782 | |||
783 | pci_restore_state(pci); | ||
784 | pci_enable_device(pci); | ||
785 | pci_set_power_state(pci, PCI_D0); | ||
786 | pci_set_master(pci); | ||
787 | |||
788 | snd_als300_init(chip); | ||
789 | snd_ac97_resume(chip->ac97); | ||
790 | |||
791 | snd_power_change_state(card, SNDRV_CTL_POWER_D0); | ||
792 | return 0; | ||
793 | } | ||
794 | #endif | ||
795 | |||
796 | static int __devinit snd_als300_probe(struct pci_dev *pci, | ||
797 | const struct pci_device_id *pci_id) | ||
798 | { | ||
799 | static int dev; | ||
800 | struct snd_card *card; | ||
801 | struct snd_als300 *chip; | ||
802 | int err, chip_type; | ||
803 | |||
804 | if (dev >= SNDRV_CARDS) | ||
805 | return -ENODEV; | ||
806 | if (!enable[dev]) { | ||
807 | dev++; | ||
808 | return -ENOENT; | ||
809 | } | ||
810 | |||
811 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); | ||
812 | |||
813 | if (card == NULL) | ||
814 | return -ENOMEM; | ||
815 | |||
816 | chip_type = pci_id->driver_data; | ||
817 | |||
818 | if ((err = snd_als300_create(card, pci, chip_type, &chip)) < 0) { | ||
819 | snd_card_free(card); | ||
820 | return err; | ||
821 | } | ||
822 | card->private_data = chip; | ||
823 | |||
824 | strcpy(card->driver, "ALS300"); | ||
825 | if (chip->chip_type == DEVICE_ALS300_PLUS) | ||
826 | /* don't know much about ALS300+ yet | ||
827 | * print revision number for now */ | ||
828 | sprintf(card->shortname, "ALS300+ (Rev. %d)", chip->revision); | ||
829 | else | ||
830 | sprintf(card->shortname, "ALS300 (Rev. %c)", 'A' + | ||
831 | chip->revision - 1); | ||
832 | sprintf(card->longname, "%s at 0x%lx irq %i", | ||
833 | card->shortname, chip->port, chip->irq); | ||
834 | |||
835 | if ((err = snd_card_register(card)) < 0) { | ||
836 | snd_card_free(card); | ||
837 | return err; | ||
838 | } | ||
839 | pci_set_drvdata(pci, card); | ||
840 | dev++; | ||
841 | return 0; | ||
842 | } | ||
843 | |||
844 | static struct pci_driver driver = { | ||
845 | .name = "ALS300", | ||
846 | .id_table = snd_als300_ids, | ||
847 | .probe = snd_als300_probe, | ||
848 | .remove = __devexit_p(snd_als300_remove), | ||
849 | #ifdef CONFIG_PM | ||
850 | .suspend = snd_als300_suspend, | ||
851 | .resume = snd_als300_resume, | ||
852 | #endif | ||
853 | }; | ||
854 | |||
855 | static int __init alsa_card_als300_init(void) | ||
856 | { | ||
857 | return pci_register_driver(&driver); | ||
858 | } | ||
859 | |||
860 | static void __exit alsa_card_als300_exit(void) | ||
861 | { | ||
862 | pci_unregister_driver(&driver); | ||
863 | } | ||
864 | |||
865 | module_init(alsa_card_als300_init) | ||
866 | module_exit(alsa_card_als300_exit) | ||
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c index 4f65ec56bf35..ac4e73f69c1d 100644 --- a/sound/pci/cs4281.c +++ b/sound/pci/cs4281.c | |||
@@ -1046,7 +1046,7 @@ static int snd_cs4281_put_volume(struct snd_kcontrol *kcontrol, | |||
1046 | snd_cs4281_pokeBA0(chip, regL, volL); | 1046 | snd_cs4281_pokeBA0(chip, regL, volL); |
1047 | change = 1; | 1047 | change = 1; |
1048 | } | 1048 | } |
1049 | if (ucontrol->value.integer.value[0] != volL) { | 1049 | if (ucontrol->value.integer.value[1] != volR) { |
1050 | volR = CS_VOL_MASK - (ucontrol->value.integer.value[1] & CS_VOL_MASK); | 1050 | volR = CS_VOL_MASK - (ucontrol->value.integer.value[1] & CS_VOL_MASK); |
1051 | snd_cs4281_pokeBA0(chip, regR, volR); | 1051 | snd_cs4281_pokeBA0(chip, regR, volR); |
1052 | change = 1; | 1052 | change = 1; |
@@ -1416,7 +1416,7 @@ static int __devinit snd_cs4281_create(struct snd_card *card, | |||
1416 | static int snd_cs4281_chip_init(struct cs4281 *chip) | 1416 | static int snd_cs4281_chip_init(struct cs4281 *chip) |
1417 | { | 1417 | { |
1418 | unsigned int tmp; | 1418 | unsigned int tmp; |
1419 | int timeout; | 1419 | unsigned long end_time; |
1420 | int retry_count = 2; | 1420 | int retry_count = 2; |
1421 | 1421 | ||
1422 | /* Having EPPMC.FPDN=1 prevent proper chip initialisation */ | 1422 | /* Having EPPMC.FPDN=1 prevent proper chip initialisation */ |
@@ -1496,7 +1496,7 @@ static int snd_cs4281_chip_init(struct cs4281 *chip) | |||
1496 | /* | 1496 | /* |
1497 | * Wait for the DLL ready signal from the clock logic. | 1497 | * Wait for the DLL ready signal from the clock logic. |
1498 | */ | 1498 | */ |
1499 | timeout = 100; | 1499 | end_time = jiffies + HZ; |
1500 | do { | 1500 | do { |
1501 | /* | 1501 | /* |
1502 | * Read the AC97 status register to see if we've seen a CODEC | 1502 | * Read the AC97 status register to see if we've seen a CODEC |
@@ -1504,8 +1504,8 @@ static int snd_cs4281_chip_init(struct cs4281 *chip) | |||
1504 | */ | 1504 | */ |
1505 | if (snd_cs4281_peekBA0(chip, BA0_CLKCR1) & BA0_CLKCR1_DLLRDY) | 1505 | if (snd_cs4281_peekBA0(chip, BA0_CLKCR1) & BA0_CLKCR1_DLLRDY) |
1506 | goto __ok0; | 1506 | goto __ok0; |
1507 | msleep(1); | 1507 | schedule_timeout_uninterruptible(1); |
1508 | } while (timeout-- > 0); | 1508 | } while (time_after_eq(end_time, jiffies)); |
1509 | 1509 | ||
1510 | snd_printk(KERN_ERR "DLLRDY not seen\n"); | 1510 | snd_printk(KERN_ERR "DLLRDY not seen\n"); |
1511 | return -EIO; | 1511 | return -EIO; |
@@ -1522,7 +1522,7 @@ static int snd_cs4281_chip_init(struct cs4281 *chip) | |||
1522 | /* | 1522 | /* |
1523 | * Wait for the codec ready signal from the AC97 codec. | 1523 | * Wait for the codec ready signal from the AC97 codec. |
1524 | */ | 1524 | */ |
1525 | timeout = 100; | 1525 | end_time = jiffies + HZ; |
1526 | do { | 1526 | do { |
1527 | /* | 1527 | /* |
1528 | * Read the AC97 status register to see if we've seen a CODEC | 1528 | * Read the AC97 status register to see if we've seen a CODEC |
@@ -1530,20 +1530,20 @@ static int snd_cs4281_chip_init(struct cs4281 *chip) | |||
1530 | */ | 1530 | */ |
1531 | if (snd_cs4281_peekBA0(chip, BA0_ACSTS) & BA0_ACSTS_CRDY) | 1531 | if (snd_cs4281_peekBA0(chip, BA0_ACSTS) & BA0_ACSTS_CRDY) |
1532 | goto __ok1; | 1532 | goto __ok1; |
1533 | msleep(1); | 1533 | schedule_timeout_uninterruptible(1); |
1534 | } while (timeout-- > 0); | 1534 | } while (time_after_eq(end_time, jiffies)); |
1535 | 1535 | ||
1536 | snd_printk(KERN_ERR "never read codec ready from AC'97 (0x%x)\n", snd_cs4281_peekBA0(chip, BA0_ACSTS)); | 1536 | snd_printk(KERN_ERR "never read codec ready from AC'97 (0x%x)\n", snd_cs4281_peekBA0(chip, BA0_ACSTS)); |
1537 | return -EIO; | 1537 | return -EIO; |
1538 | 1538 | ||
1539 | __ok1: | 1539 | __ok1: |
1540 | if (chip->dual_codec) { | 1540 | if (chip->dual_codec) { |
1541 | timeout = 100; | 1541 | end_time = jiffies + HZ; |
1542 | do { | 1542 | do { |
1543 | if (snd_cs4281_peekBA0(chip, BA0_ACSTS2) & BA0_ACSTS_CRDY) | 1543 | if (snd_cs4281_peekBA0(chip, BA0_ACSTS2) & BA0_ACSTS_CRDY) |
1544 | goto __codec2_ok; | 1544 | goto __codec2_ok; |
1545 | msleep(1); | 1545 | schedule_timeout_uninterruptible(1); |
1546 | } while (timeout-- > 0); | 1546 | } while (time_after_eq(end_time, jiffies)); |
1547 | snd_printk(KERN_INFO "secondary codec doesn't respond. disable it...\n"); | 1547 | snd_printk(KERN_INFO "secondary codec doesn't respond. disable it...\n"); |
1548 | chip->dual_codec = 0; | 1548 | chip->dual_codec = 0; |
1549 | __codec2_ok: ; | 1549 | __codec2_ok: ; |
@@ -1561,7 +1561,7 @@ static int snd_cs4281_chip_init(struct cs4281 *chip) | |||
1561 | * the codec is pumping ADC data across the AC-link. | 1561 | * the codec is pumping ADC data across the AC-link. |
1562 | */ | 1562 | */ |
1563 | 1563 | ||
1564 | timeout = 100; | 1564 | end_time = jiffies + HZ; |
1565 | do { | 1565 | do { |
1566 | /* | 1566 | /* |
1567 | * Read the input slot valid register and see if input slots 3 | 1567 | * Read the input slot valid register and see if input slots 3 |
@@ -1569,8 +1569,8 @@ static int snd_cs4281_chip_init(struct cs4281 *chip) | |||
1569 | */ | 1569 | */ |
1570 | if ((snd_cs4281_peekBA0(chip, BA0_ACISV) & (BA0_ACISV_SLV(3) | BA0_ACISV_SLV(4))) == (BA0_ACISV_SLV(3) | BA0_ACISV_SLV(4))) | 1570 | if ((snd_cs4281_peekBA0(chip, BA0_ACISV) & (BA0_ACISV_SLV(3) | BA0_ACISV_SLV(4))) == (BA0_ACISV_SLV(3) | BA0_ACISV_SLV(4))) |
1571 | goto __ok2; | 1571 | goto __ok2; |
1572 | msleep(1); | 1572 | schedule_timeout_uninterruptible(1); |
1573 | } while (timeout-- > 0); | 1573 | } while (time_after_eq(end_time, jiffies)); |
1574 | 1574 | ||
1575 | if (--retry_count > 0) | 1575 | if (--retry_count > 0) |
1576 | goto __retry; | 1576 | goto __retry; |
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index b42dff7ceed0..5bee3b536478 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
@@ -295,7 +295,7 @@ static int init_unsol_queue(struct hda_bus *bus) | |||
295 | snd_printk(KERN_ERR "hda_codec: can't allocate unsolicited queue\n"); | 295 | snd_printk(KERN_ERR "hda_codec: can't allocate unsolicited queue\n"); |
296 | return -ENOMEM; | 296 | return -ENOMEM; |
297 | } | 297 | } |
298 | unsol->workq = create_workqueue("hda_codec"); | 298 | unsol->workq = create_singlethread_workqueue("hda_codec"); |
299 | if (! unsol->workq) { | 299 | if (! unsol->workq) { |
300 | snd_printk(KERN_ERR "hda_codec: can't create workqueue\n"); | 300 | snd_printk(KERN_ERR "hda_codec: can't create workqueue\n"); |
301 | kfree(unsol); | 301 | kfree(unsol); |
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index c096606970ff..0ad60ae29011 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
@@ -81,6 +81,7 @@ MODULE_SUPPORTED_DEVICE("{{Intel, ICH6}," | |||
81 | "{Intel, ESB2}," | 81 | "{Intel, ESB2}," |
82 | "{Intel, ICH8}," | 82 | "{Intel, ICH8}," |
83 | "{ATI, SB450}," | 83 | "{ATI, SB450}," |
84 | "{ATI, SB600}," | ||
84 | "{VIA, VT8251}," | 85 | "{VIA, VT8251}," |
85 | "{VIA, VT8237A}," | 86 | "{VIA, VT8237A}," |
86 | "{SiS, SIS966}," | 87 | "{SiS, SIS966}," |
@@ -1619,6 +1620,7 @@ static struct pci_device_id azx_ids[] = { | |||
1619 | { 0x8086, 0x269a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ESB2 */ | 1620 | { 0x8086, 0x269a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ESB2 */ |
1620 | { 0x8086, 0x284b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH8 */ | 1621 | { 0x8086, 0x284b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH8 */ |
1621 | { 0x1002, 0x437b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATI }, /* ATI SB450 */ | 1622 | { 0x1002, 0x437b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATI }, /* ATI SB450 */ |
1623 | { 0x1002, 0x4383, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATI }, /* ATI SB600 */ | ||
1622 | { 0x1106, 0x3288, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_VIA }, /* VIA VT8251/VT8237A */ | 1624 | { 0x1106, 0x3288, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_VIA }, /* VIA VT8251/VT8237A */ |
1623 | { 0x1039, 0x7502, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_SIS }, /* SIS966 */ | 1625 | { 0x1039, 0x7502, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_SIS }, /* SIS966 */ |
1624 | { 0x10b9, 0x5461, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ULI }, /* ULI M5461 */ | 1626 | { 0x10b9, 0x5461, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ULI }, /* ULI M5461 */ |
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index 32401bd8c229..2bfe37e8543c 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c | |||
@@ -44,6 +44,7 @@ struct ad198x_spec { | |||
44 | * dig_out_nid and hp_nid are optional | 44 | * dig_out_nid and hp_nid are optional |
45 | */ | 45 | */ |
46 | unsigned int cur_eapd; | 46 | unsigned int cur_eapd; |
47 | unsigned int need_dac_fix; | ||
47 | 48 | ||
48 | /* capture */ | 49 | /* capture */ |
49 | unsigned int num_adc_nids; | 50 | unsigned int num_adc_nids; |
@@ -836,10 +837,14 @@ static int patch_ad1986a(struct hda_codec *codec) | |||
836 | case AD1986A_3STACK: | 837 | case AD1986A_3STACK: |
837 | spec->num_mixers = 2; | 838 | spec->num_mixers = 2; |
838 | spec->mixers[1] = ad1986a_3st_mixers; | 839 | spec->mixers[1] = ad1986a_3st_mixers; |
839 | spec->num_init_verbs = 2; | 840 | spec->num_init_verbs = 3; |
840 | spec->init_verbs[1] = ad1986a_3st_init_verbs; | 841 | spec->init_verbs[1] = ad1986a_3st_init_verbs; |
842 | spec->init_verbs[2] = ad1986a_ch2_init; | ||
841 | spec->channel_mode = ad1986a_modes; | 843 | spec->channel_mode = ad1986a_modes; |
842 | spec->num_channel_mode = ARRAY_SIZE(ad1986a_modes); | 844 | spec->num_channel_mode = ARRAY_SIZE(ad1986a_modes); |
845 | spec->need_dac_fix = 1; | ||
846 | spec->multiout.max_channels = 2; | ||
847 | spec->multiout.num_dacs = 1; | ||
843 | break; | 848 | break; |
844 | case AD1986A_LAPTOP: | 849 | case AD1986A_LAPTOP: |
845 | spec->mixers[0] = ad1986a_laptop_mixers; | 850 | spec->mixers[0] = ad1986a_laptop_mixers; |
@@ -1555,6 +1560,8 @@ static int ad198x_ch_mode_put(struct snd_kcontrol *kcontrol, | |||
1555 | { | 1560 | { |
1556 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | 1561 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); |
1557 | struct ad198x_spec *spec = codec->spec; | 1562 | struct ad198x_spec *spec = codec->spec; |
1563 | if (spec->need_dac_fix) | ||
1564 | spec->multiout.num_dacs = spec->multiout.max_channels / 2; | ||
1558 | return snd_hda_ch_mode_put(codec, ucontrol, spec->channel_mode, | 1565 | return snd_hda_ch_mode_put(codec, ucontrol, spec->channel_mode, |
1559 | spec->num_channel_mode, &spec->multiout.max_channels); | 1566 | spec->num_channel_mode, &spec->multiout.max_channels); |
1560 | } | 1567 | } |
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 4c6c9ec8ea5b..66bbdb60f50b 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -52,6 +52,7 @@ enum { | |||
52 | ALC880_CLEVO, | 52 | ALC880_CLEVO, |
53 | ALC880_TCL_S700, | 53 | ALC880_TCL_S700, |
54 | ALC880_LG, | 54 | ALC880_LG, |
55 | ALC880_LG_LW, | ||
55 | #ifdef CONFIG_SND_DEBUG | 56 | #ifdef CONFIG_SND_DEBUG |
56 | ALC880_TEST, | 57 | ALC880_TEST, |
57 | #endif | 58 | #endif |
@@ -131,6 +132,7 @@ struct alc_spec { | |||
131 | hda_nid_t dig_in_nid; /* digital-in NID; optional */ | 132 | hda_nid_t dig_in_nid; /* digital-in NID; optional */ |
132 | 133 | ||
133 | /* capture source */ | 134 | /* capture source */ |
135 | unsigned int num_mux_defs; | ||
134 | const struct hda_input_mux *input_mux; | 136 | const struct hda_input_mux *input_mux; |
135 | unsigned int cur_mux[3]; | 137 | unsigned int cur_mux[3]; |
136 | 138 | ||
@@ -172,6 +174,7 @@ struct alc_config_preset { | |||
172 | hda_nid_t dig_in_nid; | 174 | hda_nid_t dig_in_nid; |
173 | unsigned int num_channel_mode; | 175 | unsigned int num_channel_mode; |
174 | const struct hda_channel_mode *channel_mode; | 176 | const struct hda_channel_mode *channel_mode; |
177 | unsigned int num_mux_defs; | ||
175 | const struct hda_input_mux *input_mux; | 178 | const struct hda_input_mux *input_mux; |
176 | void (*unsol_event)(struct hda_codec *, unsigned int); | 179 | void (*unsol_event)(struct hda_codec *, unsigned int); |
177 | void (*init_hook)(struct hda_codec *); | 180 | void (*init_hook)(struct hda_codec *); |
@@ -185,7 +188,10 @@ static int alc_mux_enum_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_ | |||
185 | { | 188 | { |
186 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | 189 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); |
187 | struct alc_spec *spec = codec->spec; | 190 | struct alc_spec *spec = codec->spec; |
188 | return snd_hda_input_mux_info(spec->input_mux, uinfo); | 191 | unsigned int mux_idx = snd_ctl_get_ioffidx(kcontrol, &uinfo->id); |
192 | if (mux_idx >= spec->num_mux_defs) | ||
193 | mux_idx = 0; | ||
194 | return snd_hda_input_mux_info(&spec->input_mux[mux_idx], uinfo); | ||
189 | } | 195 | } |
190 | 196 | ||
191 | static int alc_mux_enum_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) | 197 | static int alc_mux_enum_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
@@ -203,7 +209,8 @@ static int alc_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_v | |||
203 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | 209 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); |
204 | struct alc_spec *spec = codec->spec; | 210 | struct alc_spec *spec = codec->spec; |
205 | unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); | 211 | unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); |
206 | return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol, | 212 | unsigned int mux_idx = adc_idx >= spec->num_mux_defs ? 0 : adc_idx; |
213 | return snd_hda_input_mux_put(codec, &spec->input_mux[mux_idx], ucontrol, | ||
207 | spec->adc_nids[adc_idx], &spec->cur_mux[adc_idx]); | 214 | spec->adc_nids[adc_idx], &spec->cur_mux[adc_idx]); |
208 | } | 215 | } |
209 | 216 | ||
@@ -245,7 +252,8 @@ static int alc_ch_mode_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_va | |||
245 | * states other than HiZ (eg: PIN_VREFxx) and revert to HiZ if any of these | 252 | * states other than HiZ (eg: PIN_VREFxx) and revert to HiZ if any of these |
246 | * are requested. Therefore order this list so that this behaviour will not | 253 | * are requested. Therefore order this list so that this behaviour will not |
247 | * cause problems when mixer clients move through the enum sequentially. | 254 | * cause problems when mixer clients move through the enum sequentially. |
248 | * NIDs 0x0f and 0x10 have been observed to have this behaviour. | 255 | * NIDs 0x0f and 0x10 have been observed to have this behaviour as of |
256 | * March 2006. | ||
249 | */ | 257 | */ |
250 | static char *alc_pin_mode_names[] = { | 258 | static char *alc_pin_mode_names[] = { |
251 | "Mic 50pc bias", "Mic 80pc bias", | 259 | "Mic 50pc bias", "Mic 80pc bias", |
@@ -255,19 +263,27 @@ static unsigned char alc_pin_mode_values[] = { | |||
255 | PIN_VREF50, PIN_VREF80, PIN_IN, PIN_OUT, PIN_HP, | 263 | PIN_VREF50, PIN_VREF80, PIN_IN, PIN_OUT, PIN_HP, |
256 | }; | 264 | }; |
257 | /* The control can present all 5 options, or it can limit the options based | 265 | /* The control can present all 5 options, or it can limit the options based |
258 | * in the pin being assumed to be exclusively an input or an output pin. | 266 | * in the pin being assumed to be exclusively an input or an output pin. In |
267 | * addition, "input" pins may or may not process the mic bias option | ||
268 | * depending on actual widget capability (NIDs 0x0f and 0x10 don't seem to | ||
269 | * accept requests for bias as of chip versions up to March 2006) and/or | ||
270 | * wiring in the computer. | ||
259 | */ | 271 | */ |
260 | #define ALC_PIN_DIR_IN 0x00 | 272 | #define ALC_PIN_DIR_IN 0x00 |
261 | #define ALC_PIN_DIR_OUT 0x01 | 273 | #define ALC_PIN_DIR_OUT 0x01 |
262 | #define ALC_PIN_DIR_INOUT 0x02 | 274 | #define ALC_PIN_DIR_INOUT 0x02 |
275 | #define ALC_PIN_DIR_IN_NOMICBIAS 0x03 | ||
276 | #define ALC_PIN_DIR_INOUT_NOMICBIAS 0x04 | ||
263 | 277 | ||
264 | /* Info about the pin modes supported by the three different pin directions. | 278 | /* Info about the pin modes supported by the different pin direction modes. |
265 | * For each direction the minimum and maximum values are given. | 279 | * For each direction the minimum and maximum values are given. |
266 | */ | 280 | */ |
267 | static signed char alc_pin_mode_dir_info[3][2] = { | 281 | static signed char alc_pin_mode_dir_info[5][2] = { |
268 | { 0, 2 }, /* ALC_PIN_DIR_IN */ | 282 | { 0, 2 }, /* ALC_PIN_DIR_IN */ |
269 | { 3, 4 }, /* ALC_PIN_DIR_OUT */ | 283 | { 3, 4 }, /* ALC_PIN_DIR_OUT */ |
270 | { 0, 4 }, /* ALC_PIN_DIR_INOUT */ | 284 | { 0, 4 }, /* ALC_PIN_DIR_INOUT */ |
285 | { 2, 2 }, /* ALC_PIN_DIR_IN_NOMICBIAS */ | ||
286 | { 2, 4 }, /* ALC_PIN_DIR_INOUT_NOMICBIAS */ | ||
271 | }; | 287 | }; |
272 | #define alc_pin_mode_min(_dir) (alc_pin_mode_dir_info[_dir][0]) | 288 | #define alc_pin_mode_min(_dir) (alc_pin_mode_dir_info[_dir][0]) |
273 | #define alc_pin_mode_max(_dir) (alc_pin_mode_dir_info[_dir][1]) | 289 | #define alc_pin_mode_max(_dir) (alc_pin_mode_dir_info[_dir][1]) |
@@ -329,9 +345,10 @@ static int alc_pin_mode_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_v | |||
329 | * input modes. | 345 | * input modes. |
330 | * | 346 | * |
331 | * Dynamically switching the input/output buffers probably | 347 | * Dynamically switching the input/output buffers probably |
332 | * reduces noise slightly, particularly on input. However, | 348 | * reduces noise slightly (particularly on input) so we'll |
333 | * havingboth input and output buffers enabled | 349 | * do it. However, having both input and output buffers |
334 | * simultaneously doesn't seem to be problematic. | 350 | * enabled simultaneously doesn't seem to be problematic if |
351 | * this turns out to be necessary in the future. | ||
335 | */ | 352 | */ |
336 | if (val <= 2) { | 353 | if (val <= 2) { |
337 | snd_hda_codec_write(codec,nid,0,AC_VERB_SET_AMP_GAIN_MUTE, | 354 | snd_hda_codec_write(codec,nid,0,AC_VERB_SET_AMP_GAIN_MUTE, |
@@ -483,6 +500,9 @@ static void setup_preset(struct alc_spec *spec, const struct alc_config_preset * | |||
483 | spec->multiout.dig_out_nid = preset->dig_out_nid; | 500 | spec->multiout.dig_out_nid = preset->dig_out_nid; |
484 | spec->multiout.hp_nid = preset->hp_nid; | 501 | spec->multiout.hp_nid = preset->hp_nid; |
485 | 502 | ||
503 | spec->num_mux_defs = preset->num_mux_defs; | ||
504 | if (! spec->num_mux_defs) | ||
505 | spec->num_mux_defs = 1; | ||
486 | spec->input_mux = preset->input_mux; | 506 | spec->input_mux = preset->input_mux; |
487 | 507 | ||
488 | spec->num_adc_nids = preset->num_adc_nids; | 508 | spec->num_adc_nids = preset->num_adc_nids; |
@@ -1427,6 +1447,82 @@ static void alc880_lg_unsol_event(struct hda_codec *codec, unsigned int res) | |||
1427 | } | 1447 | } |
1428 | 1448 | ||
1429 | /* | 1449 | /* |
1450 | * LG LW20 | ||
1451 | * | ||
1452 | * Pin assignment: | ||
1453 | * Speaker-out: 0x14 | ||
1454 | * Mic-In: 0x18 | ||
1455 | * Built-in Mic-In: 0x19 (?) | ||
1456 | * HP-Out: 0x1b | ||
1457 | * SPDIF-Out: 0x1e | ||
1458 | */ | ||
1459 | |||
1460 | /* seems analog CD is not working */ | ||
1461 | static struct hda_input_mux alc880_lg_lw_capture_source = { | ||
1462 | .num_items = 2, | ||
1463 | .items = { | ||
1464 | { "Mic", 0x0 }, | ||
1465 | { "Internal Mic", 0x1 }, | ||
1466 | }, | ||
1467 | }; | ||
1468 | |||
1469 | static struct snd_kcontrol_new alc880_lg_lw_mixer[] = { | ||
1470 | HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | ||
1471 | HDA_BIND_MUTE("Master Playback Switch", 0x0c, 2, HDA_INPUT), | ||
1472 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | ||
1473 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | ||
1474 | HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x01, HDA_INPUT), | ||
1475 | HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x01, HDA_INPUT), | ||
1476 | { } /* end */ | ||
1477 | }; | ||
1478 | |||
1479 | static struct hda_verb alc880_lg_lw_init_verbs[] = { | ||
1480 | /* set capture source to mic-in */ | ||
1481 | {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, | ||
1482 | {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, | ||
1483 | {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, | ||
1484 | {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(7)}, | ||
1485 | /* speaker-out */ | ||
1486 | {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, | ||
1487 | {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
1488 | /* HP-out */ | ||
1489 | {0x13, AC_VERB_SET_CONNECT_SEL, 0x00}, | ||
1490 | {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, | ||
1491 | {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
1492 | /* mic-in to input */ | ||
1493 | {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, | ||
1494 | {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
1495 | /* built-in mic */ | ||
1496 | {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, | ||
1497 | {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | ||
1498 | /* jack sense */ | ||
1499 | {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | 0x1}, | ||
1500 | { } | ||
1501 | }; | ||
1502 | |||
1503 | /* toggle speaker-output according to the hp-jack state */ | ||
1504 | static void alc880_lg_lw_automute(struct hda_codec *codec) | ||
1505 | { | ||
1506 | unsigned int present; | ||
1507 | |||
1508 | present = snd_hda_codec_read(codec, 0x1b, 0, | ||
1509 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | ||
1510 | snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0, | ||
1511 | 0x80, present ? 0x80 : 0); | ||
1512 | snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0, | ||
1513 | 0x80, present ? 0x80 : 0); | ||
1514 | } | ||
1515 | |||
1516 | static void alc880_lg_lw_unsol_event(struct hda_codec *codec, unsigned int res) | ||
1517 | { | ||
1518 | /* Looks like the unsol event is incompatible with the standard | ||
1519 | * definition. 4bit tag is placed at 28 bit! | ||
1520 | */ | ||
1521 | if ((res >> 28) == 0x01) | ||
1522 | alc880_lg_lw_automute(codec); | ||
1523 | } | ||
1524 | |||
1525 | /* | ||
1430 | * Common callbacks | 1526 | * Common callbacks |
1431 | */ | 1527 | */ |
1432 | 1528 | ||
@@ -2078,6 +2174,9 @@ static struct hda_board_config alc880_cfg_tbl[] = { | |||
2078 | { .modelname = "lg", .config = ALC880_LG }, | 2174 | { .modelname = "lg", .config = ALC880_LG }, |
2079 | { .pci_subvendor = 0x1854, .pci_subdevice = 0x003b, .config = ALC880_LG }, | 2175 | { .pci_subvendor = 0x1854, .pci_subdevice = 0x003b, .config = ALC880_LG }, |
2080 | 2176 | ||
2177 | { .modelname = "lg-lw", .config = ALC880_LG_LW }, | ||
2178 | { .pci_subvendor = 0x1854, .pci_subdevice = 0x0018, .config = ALC880_LG_LW }, | ||
2179 | |||
2081 | #ifdef CONFIG_SND_DEBUG | 2180 | #ifdef CONFIG_SND_DEBUG |
2082 | { .modelname = "test", .config = ALC880_TEST }, | 2181 | { .modelname = "test", .config = ALC880_TEST }, |
2083 | #endif | 2182 | #endif |
@@ -2268,6 +2367,19 @@ static struct alc_config_preset alc880_presets[] = { | |||
2268 | .unsol_event = alc880_lg_unsol_event, | 2367 | .unsol_event = alc880_lg_unsol_event, |
2269 | .init_hook = alc880_lg_automute, | 2368 | .init_hook = alc880_lg_automute, |
2270 | }, | 2369 | }, |
2370 | [ALC880_LG_LW] = { | ||
2371 | .mixers = { alc880_lg_lw_mixer }, | ||
2372 | .init_verbs = { alc880_volume_init_verbs, | ||
2373 | alc880_lg_lw_init_verbs }, | ||
2374 | .num_dacs = 1, | ||
2375 | .dac_nids = alc880_dac_nids, | ||
2376 | .dig_out_nid = ALC880_DIGOUT_NID, | ||
2377 | .num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes), | ||
2378 | .channel_mode = alc880_2_jack_modes, | ||
2379 | .input_mux = &alc880_lg_lw_capture_source, | ||
2380 | .unsol_event = alc880_lg_lw_unsol_event, | ||
2381 | .init_hook = alc880_lg_lw_automute, | ||
2382 | }, | ||
2271 | #ifdef CONFIG_SND_DEBUG | 2383 | #ifdef CONFIG_SND_DEBUG |
2272 | [ALC880_TEST] = { | 2384 | [ALC880_TEST] = { |
2273 | .mixers = { alc880_test_mixer }, | 2385 | .mixers = { alc880_test_mixer }, |
@@ -2593,6 +2705,7 @@ static int alc880_parse_auto_config(struct hda_codec *codec) | |||
2593 | 2705 | ||
2594 | spec->init_verbs[spec->num_init_verbs++] = alc880_volume_init_verbs; | 2706 | spec->init_verbs[spec->num_init_verbs++] = alc880_volume_init_verbs; |
2595 | 2707 | ||
2708 | spec->num_mux_defs = 1; | ||
2596 | spec->input_mux = &spec->private_imux; | 2709 | spec->input_mux = &spec->private_imux; |
2597 | 2710 | ||
2598 | return 1; | 2711 | return 1; |
@@ -2722,30 +2835,56 @@ static struct hda_input_mux alc260_capture_source = { | |||
2722 | }; | 2835 | }; |
2723 | 2836 | ||
2724 | /* On Fujitsu S702x laptops capture only makes sense from Mic/LineIn jack, | 2837 | /* On Fujitsu S702x laptops capture only makes sense from Mic/LineIn jack, |
2725 | * headphone jack and the internal CD lines. | 2838 | * headphone jack and the internal CD lines since these are the only pins at |
2839 | * which audio can appear. For flexibility, also allow the option of | ||
2840 | * recording the mixer output on the second ADC (ADC0 doesn't have a | ||
2841 | * connection to the mixer output). | ||
2726 | */ | 2842 | */ |
2727 | static struct hda_input_mux alc260_fujitsu_capture_source = { | 2843 | static struct hda_input_mux alc260_fujitsu_capture_sources[2] = { |
2728 | .num_items = 3, | 2844 | { |
2729 | .items = { | 2845 | .num_items = 3, |
2730 | { "Mic/Line", 0x0 }, | 2846 | .items = { |
2731 | { "CD", 0x4 }, | 2847 | { "Mic/Line", 0x0 }, |
2732 | { "Headphone", 0x2 }, | 2848 | { "CD", 0x4 }, |
2849 | { "Headphone", 0x2 }, | ||
2850 | }, | ||
2733 | }, | 2851 | }, |
2852 | { | ||
2853 | .num_items = 4, | ||
2854 | .items = { | ||
2855 | { "Mic/Line", 0x0 }, | ||
2856 | { "CD", 0x4 }, | ||
2857 | { "Headphone", 0x2 }, | ||
2858 | { "Mixer", 0x5 }, | ||
2859 | }, | ||
2860 | }, | ||
2861 | |||
2734 | }; | 2862 | }; |
2735 | 2863 | ||
2736 | /* Acer TravelMate(/Extensa/Aspire) notebooks have similar configutation to | 2864 | /* Acer TravelMate(/Extensa/Aspire) notebooks have similar configuration to |
2737 | * the Fujitsu S702x, but jacks are marked differently. We won't allow | 2865 | * the Fujitsu S702x, but jacks are marked differently. |
2738 | * retasking the Headphone jack, so it won't be available here. | ||
2739 | */ | 2866 | */ |
2740 | static struct hda_input_mux alc260_acer_capture_source = { | 2867 | static struct hda_input_mux alc260_acer_capture_sources[2] = { |
2741 | .num_items = 3, | 2868 | { |
2742 | .items = { | 2869 | .num_items = 4, |
2743 | { "Mic", 0x0 }, | 2870 | .items = { |
2744 | { "Line", 0x2 }, | 2871 | { "Mic", 0x0 }, |
2745 | { "CD", 0x4 }, | 2872 | { "Line", 0x2 }, |
2873 | { "CD", 0x4 }, | ||
2874 | { "Headphone", 0x5 }, | ||
2875 | }, | ||
2876 | }, | ||
2877 | { | ||
2878 | .num_items = 5, | ||
2879 | .items = { | ||
2880 | { "Mic", 0x0 }, | ||
2881 | { "Line", 0x2 }, | ||
2882 | { "CD", 0x4 }, | ||
2883 | { "Headphone", 0x6 }, | ||
2884 | { "Mixer", 0x5 }, | ||
2885 | }, | ||
2746 | }, | 2886 | }, |
2747 | }; | 2887 | }; |
2748 | |||
2749 | /* | 2888 | /* |
2750 | * This is just place-holder, so there's something for alc_build_pcms to look | 2889 | * This is just place-holder, so there's something for alc_build_pcms to look |
2751 | * at when it calculates the maximum number of channels. ALC260 has no mixer | 2890 | * at when it calculates the maximum number of channels. ALC260 has no mixer |
@@ -2806,6 +2945,9 @@ static struct snd_kcontrol_new alc260_hp_3013_mixer[] = { | |||
2806 | { } /* end */ | 2945 | { } /* end */ |
2807 | }; | 2946 | }; |
2808 | 2947 | ||
2948 | /* Fujitsu S702x series laptops. ALC260 pin usage: Mic/Line jack = 0x12, | ||
2949 | * HP jack = 0x14, CD audio = 0x16, internal speaker = 0x10. | ||
2950 | */ | ||
2809 | static struct snd_kcontrol_new alc260_fujitsu_mixer[] = { | 2951 | static struct snd_kcontrol_new alc260_fujitsu_mixer[] = { |
2810 | HDA_CODEC_VOLUME("Headphone Playback Volume", 0x08, 0x0, HDA_OUTPUT), | 2952 | HDA_CODEC_VOLUME("Headphone Playback Volume", 0x08, 0x0, HDA_OUTPUT), |
2811 | HDA_BIND_MUTE("Headphone Playback Switch", 0x08, 2, HDA_INPUT), | 2953 | HDA_BIND_MUTE("Headphone Playback Switch", 0x08, 2, HDA_INPUT), |
@@ -2822,9 +2964,28 @@ static struct snd_kcontrol_new alc260_fujitsu_mixer[] = { | |||
2822 | { } /* end */ | 2964 | { } /* end */ |
2823 | }; | 2965 | }; |
2824 | 2966 | ||
2967 | /* Mixer for Acer TravelMate(/Extensa/Aspire) notebooks. Note that current | ||
2968 | * versions of the ALC260 don't act on requests to enable mic bias from NID | ||
2969 | * 0x0f (used to drive the headphone jack in these laptops). The ALC260 | ||
2970 | * datasheet doesn't mention this restriction. At this stage it's not clear | ||
2971 | * whether this behaviour is intentional or is a hardware bug in chip | ||
2972 | * revisions available in early 2006. Therefore for now allow the | ||
2973 | * "Headphone Jack Mode" control to span all choices, but if it turns out | ||
2974 | * that the lack of mic bias for this NID is intentional we could change the | ||
2975 | * mode from ALC_PIN_DIR_INOUT to ALC_PIN_DIR_INOUT_NOMICBIAS. | ||
2976 | * | ||
2977 | * In addition, Acer TravelMate(/Extensa/Aspire) notebooks in early 2006 | ||
2978 | * don't appear to make the mic bias available from the "line" jack, even | ||
2979 | * though the NID used for this jack (0x14) can supply it. The theory is | ||
2980 | * that perhaps Acer have included blocking capacitors between the ALC260 | ||
2981 | * and the output jack. If this turns out to be the case for all such | ||
2982 | * models the "Line Jack Mode" mode could be changed from ALC_PIN_DIR_INOUT | ||
2983 | * to ALC_PIN_DIR_INOUT_NOMICBIAS. | ||
2984 | */ | ||
2825 | static struct snd_kcontrol_new alc260_acer_mixer[] = { | 2985 | static struct snd_kcontrol_new alc260_acer_mixer[] = { |
2826 | HDA_CODEC_VOLUME("Master Playback Volume", 0x08, 0x0, HDA_OUTPUT), | 2986 | HDA_CODEC_VOLUME("Master Playback Volume", 0x08, 0x0, HDA_OUTPUT), |
2827 | HDA_BIND_MUTE("Master Playback Switch", 0x08, 2, HDA_INPUT), | 2987 | HDA_BIND_MUTE("Master Playback Switch", 0x08, 2, HDA_INPUT), |
2988 | ALC_PIN_MODE("Headphone Jack Mode", 0x0f, ALC_PIN_DIR_INOUT), | ||
2828 | HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT), | 2989 | HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT), |
2829 | HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT), | 2990 | HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT), |
2830 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x07, 0x0, HDA_INPUT), | 2991 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x07, 0x0, HDA_INPUT), |
@@ -3038,7 +3199,8 @@ static struct hda_verb alc260_hp_3013_init_verbs[] = { | |||
3038 | }; | 3199 | }; |
3039 | 3200 | ||
3040 | /* Initialisation sequence for ALC260 as configured in Fujitsu S702x | 3201 | /* Initialisation sequence for ALC260 as configured in Fujitsu S702x |
3041 | * laptops. | 3202 | * laptops. ALC260 pin usage: Mic/Line jack = 0x12, HP jack = 0x14, CD |
3203 | * audio = 0x16, internal speaker = 0x10. | ||
3042 | */ | 3204 | */ |
3043 | static struct hda_verb alc260_fujitsu_init_verbs[] = { | 3205 | static struct hda_verb alc260_fujitsu_init_verbs[] = { |
3044 | /* Disable all GPIOs */ | 3206 | /* Disable all GPIOs */ |
@@ -3185,10 +3347,10 @@ static struct hda_verb alc260_acer_init_verbs[] = { | |||
3185 | {0x04, AC_VERB_SET_CONNECT_SEL, 0x00}, | 3347 | {0x04, AC_VERB_SET_CONNECT_SEL, 0x00}, |
3186 | 3348 | ||
3187 | /* Do similar with the second ADC: mute capture input amp and | 3349 | /* Do similar with the second ADC: mute capture input amp and |
3188 | * set ADC connection to line (on line1 pin) | 3350 | * set ADC connection to mic to match ALSA's default state. |
3189 | */ | 3351 | */ |
3190 | {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, | 3352 | {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, |
3191 | {0x05, AC_VERB_SET_CONNECT_SEL, 0x02}, | 3353 | {0x05, AC_VERB_SET_CONNECT_SEL, 0x00}, |
3192 | 3354 | ||
3193 | /* Mute all inputs to mixer widget (even unconnected ones) */ | 3355 | /* Mute all inputs to mixer widget (even unconnected ones) */ |
3194 | {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* mic1 pin */ | 3356 | {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* mic1 pin */ |
@@ -3213,26 +3375,35 @@ static hda_nid_t alc260_test_dac_nids[1] = { | |||
3213 | static hda_nid_t alc260_test_adc_nids[2] = { | 3375 | static hda_nid_t alc260_test_adc_nids[2] = { |
3214 | 0x04, 0x05, | 3376 | 0x04, 0x05, |
3215 | }; | 3377 | }; |
3216 | /* This is a bit messy since the two input muxes in the ALC260 have slight | 3378 | /* For testing the ALC260, each input MUX needs its own definition since |
3217 | * variations in their signal assignments. The ideal way to deal with this | 3379 | * the signal assignments are different. This assumes that the first ADC |
3218 | * is to extend alc_spec.input_mux to allow a different input MUX for each | 3380 | * is NID 0x04. |
3219 | * ADC. For the purposes of the test model it's sufficient to just list | ||
3220 | * both options for affected signal indices. The separate input mux | ||
3221 | * functionality only needs to be considered if a model comes along which | ||
3222 | * actually uses signals 0x5, 0x6 and 0x7 for something which makes sense to | ||
3223 | * record. | ||
3224 | */ | 3381 | */ |
3225 | static struct hda_input_mux alc260_test_capture_source = { | 3382 | static struct hda_input_mux alc260_test_capture_sources[2] = { |
3226 | .num_items = 8, | 3383 | { |
3227 | .items = { | 3384 | .num_items = 7, |
3228 | { "MIC1 pin", 0x0 }, | 3385 | .items = { |
3229 | { "MIC2 pin", 0x1 }, | 3386 | { "MIC1 pin", 0x0 }, |
3230 | { "LINE1 pin", 0x2 }, | 3387 | { "MIC2 pin", 0x1 }, |
3231 | { "LINE2 pin", 0x3 }, | 3388 | { "LINE1 pin", 0x2 }, |
3232 | { "CD pin", 0x4 }, | 3389 | { "LINE2 pin", 0x3 }, |
3233 | { "LINE-OUT pin (cap1), Mixer (cap2)", 0x5 }, | 3390 | { "CD pin", 0x4 }, |
3234 | { "HP-OUT pin (cap1), LINE-OUT pin (cap2)", 0x6 }, | 3391 | { "LINE-OUT pin", 0x5 }, |
3235 | { "HP-OUT pin (cap2 only)", 0x7 }, | 3392 | { "HP-OUT pin", 0x6 }, |
3393 | }, | ||
3394 | }, | ||
3395 | { | ||
3396 | .num_items = 8, | ||
3397 | .items = { | ||
3398 | { "MIC1 pin", 0x0 }, | ||
3399 | { "MIC2 pin", 0x1 }, | ||
3400 | { "LINE1 pin", 0x2 }, | ||
3401 | { "LINE2 pin", 0x3 }, | ||
3402 | { "CD pin", 0x4 }, | ||
3403 | { "Mixer", 0x5 }, | ||
3404 | { "LINE-OUT pin", 0x6 }, | ||
3405 | { "HP-OUT pin", 0x7 }, | ||
3406 | }, | ||
3236 | }, | 3407 | }, |
3237 | }; | 3408 | }; |
3238 | static struct snd_kcontrol_new alc260_test_mixer[] = { | 3409 | static struct snd_kcontrol_new alc260_test_mixer[] = { |
@@ -3244,7 +3415,17 @@ static struct snd_kcontrol_new alc260_test_mixer[] = { | |||
3244 | HDA_CODEC_VOLUME("LOUT1 Playback Volume", 0x08, 0x0, HDA_OUTPUT), | 3415 | HDA_CODEC_VOLUME("LOUT1 Playback Volume", 0x08, 0x0, HDA_OUTPUT), |
3245 | HDA_BIND_MUTE("LOUT1 Playback Switch", 0x08, 2, HDA_INPUT), | 3416 | HDA_BIND_MUTE("LOUT1 Playback Switch", 0x08, 2, HDA_INPUT), |
3246 | 3417 | ||
3247 | /* Modes for retasking pin widgets */ | 3418 | /* Modes for retasking pin widgets |
3419 | * Note: the ALC260 doesn't seem to act on requests to enable mic | ||
3420 | * bias from NIDs 0x0f and 0x10. The ALC260 datasheet doesn't | ||
3421 | * mention this restriction. At this stage it's not clear whether | ||
3422 | * this behaviour is intentional or is a hardware bug in chip | ||
3423 | * revisions available at least up until early 2006. Therefore for | ||
3424 | * now allow the "HP-OUT" and "LINE-OUT" Mode controls to span all | ||
3425 | * choices, but if it turns out that the lack of mic bias for these | ||
3426 | * NIDs is intentional we could change their modes from | ||
3427 | * ALC_PIN_DIR_INOUT to ALC_PIN_DIR_INOUT_NOMICBIAS. | ||
3428 | */ | ||
3248 | ALC_PIN_MODE("HP-OUT pin mode", 0x10, ALC_PIN_DIR_INOUT), | 3429 | ALC_PIN_MODE("HP-OUT pin mode", 0x10, ALC_PIN_DIR_INOUT), |
3249 | ALC_PIN_MODE("LINE-OUT pin mode", 0x0f, ALC_PIN_DIR_INOUT), | 3430 | ALC_PIN_MODE("LINE-OUT pin mode", 0x0f, ALC_PIN_DIR_INOUT), |
3250 | ALC_PIN_MODE("LINE2 pin mode", 0x15, ALC_PIN_DIR_INOUT), | 3431 | ALC_PIN_MODE("LINE2 pin mode", 0x15, ALC_PIN_DIR_INOUT), |
@@ -3606,6 +3787,7 @@ static int alc260_parse_auto_config(struct hda_codec *codec) | |||
3606 | 3787 | ||
3607 | spec->init_verbs[spec->num_init_verbs++] = alc260_volume_init_verbs; | 3788 | spec->init_verbs[spec->num_init_verbs++] = alc260_volume_init_verbs; |
3608 | 3789 | ||
3790 | spec->num_mux_defs = 1; | ||
3609 | spec->input_mux = &spec->private_imux; | 3791 | spec->input_mux = &spec->private_imux; |
3610 | 3792 | ||
3611 | /* check whether NID 0x04 is valid */ | 3793 | /* check whether NID 0x04 is valid */ |
@@ -3711,7 +3893,8 @@ static struct alc_config_preset alc260_presets[] = { | |||
3711 | .adc_nids = alc260_dual_adc_nids, | 3893 | .adc_nids = alc260_dual_adc_nids, |
3712 | .num_channel_mode = ARRAY_SIZE(alc260_modes), | 3894 | .num_channel_mode = ARRAY_SIZE(alc260_modes), |
3713 | .channel_mode = alc260_modes, | 3895 | .channel_mode = alc260_modes, |
3714 | .input_mux = &alc260_fujitsu_capture_source, | 3896 | .num_mux_defs = ARRAY_SIZE(alc260_fujitsu_capture_sources), |
3897 | .input_mux = alc260_fujitsu_capture_sources, | ||
3715 | }, | 3898 | }, |
3716 | [ALC260_ACER] = { | 3899 | [ALC260_ACER] = { |
3717 | .mixers = { alc260_acer_mixer, | 3900 | .mixers = { alc260_acer_mixer, |
@@ -3723,7 +3906,8 @@ static struct alc_config_preset alc260_presets[] = { | |||
3723 | .adc_nids = alc260_dual_adc_nids, | 3906 | .adc_nids = alc260_dual_adc_nids, |
3724 | .num_channel_mode = ARRAY_SIZE(alc260_modes), | 3907 | .num_channel_mode = ARRAY_SIZE(alc260_modes), |
3725 | .channel_mode = alc260_modes, | 3908 | .channel_mode = alc260_modes, |
3726 | .input_mux = &alc260_acer_capture_source, | 3909 | .num_mux_defs = ARRAY_SIZE(alc260_acer_capture_sources), |
3910 | .input_mux = alc260_acer_capture_sources, | ||
3727 | }, | 3911 | }, |
3728 | #ifdef CONFIG_SND_DEBUG | 3912 | #ifdef CONFIG_SND_DEBUG |
3729 | [ALC260_TEST] = { | 3913 | [ALC260_TEST] = { |
@@ -3736,7 +3920,8 @@ static struct alc_config_preset alc260_presets[] = { | |||
3736 | .adc_nids = alc260_test_adc_nids, | 3920 | .adc_nids = alc260_test_adc_nids, |
3737 | .num_channel_mode = ARRAY_SIZE(alc260_modes), | 3921 | .num_channel_mode = ARRAY_SIZE(alc260_modes), |
3738 | .channel_mode = alc260_modes, | 3922 | .channel_mode = alc260_modes, |
3739 | .input_mux = &alc260_test_capture_source, | 3923 | .num_mux_defs = ARRAY_SIZE(alc260_test_capture_sources), |
3924 | .input_mux = alc260_test_capture_sources, | ||
3740 | }, | 3925 | }, |
3741 | #endif | 3926 | #endif |
3742 | }; | 3927 | }; |
@@ -3828,7 +4013,6 @@ static struct hda_input_mux alc882_capture_source = { | |||
3828 | { "CD", 0x4 }, | 4013 | { "CD", 0x4 }, |
3829 | }, | 4014 | }, |
3830 | }; | 4015 | }; |
3831 | |||
3832 | #define alc882_mux_enum_info alc_mux_enum_info | 4016 | #define alc882_mux_enum_info alc_mux_enum_info |
3833 | #define alc882_mux_enum_get alc_mux_enum_get | 4017 | #define alc882_mux_enum_get alc_mux_enum_get |
3834 | 4018 | ||
@@ -4730,6 +4914,7 @@ static int alc262_parse_auto_config(struct hda_codec *codec) | |||
4730 | spec->mixers[spec->num_mixers++] = spec->kctl_alloc; | 4914 | spec->mixers[spec->num_mixers++] = spec->kctl_alloc; |
4731 | 4915 | ||
4732 | spec->init_verbs[spec->num_init_verbs++] = alc262_volume_init_verbs; | 4916 | spec->init_verbs[spec->num_init_verbs++] = alc262_volume_init_verbs; |
4917 | spec->num_mux_defs = 1; | ||
4733 | spec->input_mux = &spec->private_imux; | 4918 | spec->input_mux = &spec->private_imux; |
4734 | 4919 | ||
4735 | return 1; | 4920 | return 1; |
@@ -5406,6 +5591,7 @@ static int alc861_parse_auto_config(struct hda_codec *codec) | |||
5406 | 5591 | ||
5407 | spec->init_verbs[spec->num_init_verbs++] = alc861_auto_init_verbs; | 5592 | spec->init_verbs[spec->num_init_verbs++] = alc861_auto_init_verbs; |
5408 | 5593 | ||
5594 | spec->num_mux_defs = 1; | ||
5409 | spec->input_mux = &spec->private_imux; | 5595 | spec->input_mux = &spec->private_imux; |
5410 | 5596 | ||
5411 | spec->adc_nids = alc861_adc_nids; | 5597 | spec->adc_nids = alc861_adc_nids; |
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index b56ca4019392..abe9493f0a2c 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -534,6 +534,22 @@ static int stac92xx_build_pcms(struct hda_codec *codec) | |||
534 | return 0; | 534 | return 0; |
535 | } | 535 | } |
536 | 536 | ||
537 | static unsigned int stac92xx_get_vref(struct hda_codec *codec, hda_nid_t nid) | ||
538 | { | ||
539 | unsigned int pincap = snd_hda_param_read(codec, nid, | ||
540 | AC_PAR_PIN_CAP); | ||
541 | pincap = (pincap & AC_PINCAP_VREF) >> AC_PINCAP_VREF_SHIFT; | ||
542 | if (pincap & AC_PINCAP_VREF_100) | ||
543 | return AC_PINCTL_VREF_100; | ||
544 | if (pincap & AC_PINCAP_VREF_80) | ||
545 | return AC_PINCTL_VREF_80; | ||
546 | if (pincap & AC_PINCAP_VREF_50) | ||
547 | return AC_PINCTL_VREF_50; | ||
548 | if (pincap & AC_PINCAP_VREF_GRD) | ||
549 | return AC_PINCTL_VREF_GRD; | ||
550 | return 0; | ||
551 | } | ||
552 | |||
537 | static void stac92xx_auto_set_pinctl(struct hda_codec *codec, hda_nid_t nid, int pin_type) | 553 | static void stac92xx_auto_set_pinctl(struct hda_codec *codec, hda_nid_t nid, int pin_type) |
538 | 554 | ||
539 | { | 555 | { |
@@ -571,9 +587,12 @@ static int stac92xx_io_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_ | |||
571 | 587 | ||
572 | if (val) | 588 | if (val) |
573 | stac92xx_auto_set_pinctl(codec, nid, AC_PINCTL_OUT_EN); | 589 | stac92xx_auto_set_pinctl(codec, nid, AC_PINCTL_OUT_EN); |
574 | else | 590 | else { |
575 | stac92xx_auto_set_pinctl(codec, nid, AC_PINCTL_IN_EN); | 591 | unsigned int pinctl = AC_PINCTL_IN_EN; |
576 | 592 | if (io_idx) /* set VREF for mic */ | |
593 | pinctl |= stac92xx_get_vref(codec, nid); | ||
594 | stac92xx_auto_set_pinctl(codec, nid, pinctl); | ||
595 | } | ||
577 | return 1; | 596 | return 1; |
578 | } | 597 | } |
579 | 598 | ||
@@ -767,13 +786,8 @@ static int stac92xx_auto_create_hp_ctls(struct hda_codec *codec, struct auto_pin | |||
767 | return 0; | 786 | return 0; |
768 | 787 | ||
769 | wid_caps = get_wcaps(codec, pin); | 788 | wid_caps = get_wcaps(codec, pin); |
770 | if (wid_caps & AC_WCAP_UNSOL_CAP) { | 789 | if (wid_caps & AC_WCAP_UNSOL_CAP) |
771 | /* Enable unsolicited responses on the HP widget */ | ||
772 | snd_hda_codec_write(codec, pin, 0, | ||
773 | AC_VERB_SET_UNSOLICITED_ENABLE, | ||
774 | STAC_UNSOL_ENABLE); | ||
775 | spec->hp_detect = 1; | 790 | spec->hp_detect = 1; |
776 | } | ||
777 | 791 | ||
778 | nid = snd_hda_codec_read(codec, pin, 0, AC_VERB_GET_CONNECT_LIST, 0) & 0xff; | 792 | nid = snd_hda_codec_read(codec, pin, 0, AC_VERB_GET_CONNECT_LIST, 0) & 0xff; |
779 | for (i = 0; i < cfg->line_outs; i++) { | 793 | for (i = 0; i < cfg->line_outs; i++) { |
@@ -896,13 +910,8 @@ static int stac9200_auto_create_hp_ctls(struct hda_codec *codec, | |||
896 | return 0; | 910 | return 0; |
897 | 911 | ||
898 | wid_caps = get_wcaps(codec, pin); | 912 | wid_caps = get_wcaps(codec, pin); |
899 | if (wid_caps & AC_WCAP_UNSOL_CAP) { | 913 | if (wid_caps & AC_WCAP_UNSOL_CAP) |
900 | /* Enable unsolicited responses on the HP widget */ | ||
901 | snd_hda_codec_write(codec, pin, 0, | ||
902 | AC_VERB_SET_UNSOLICITED_ENABLE, | ||
903 | STAC_UNSOL_ENABLE); | ||
904 | spec->hp_detect = 1; | 914 | spec->hp_detect = 1; |
905 | } | ||
906 | 915 | ||
907 | return 0; | 916 | return 0; |
908 | } | 917 | } |
@@ -944,6 +953,10 @@ static int stac92xx_init(struct hda_codec *codec) | |||
944 | 953 | ||
945 | /* set up pins */ | 954 | /* set up pins */ |
946 | if (spec->hp_detect) { | 955 | if (spec->hp_detect) { |
956 | /* Enable unsolicited responses on the HP widget */ | ||
957 | snd_hda_codec_write(codec, cfg->hp_pin, 0, | ||
958 | AC_VERB_SET_UNSOLICITED_ENABLE, | ||
959 | STAC_UNSOL_ENABLE); | ||
947 | /* fake event to set up pins */ | 960 | /* fake event to set up pins */ |
948 | codec->patch_ops.unsol_event(codec, STAC_HP_EVENT << 26); | 961 | codec->patch_ops.unsol_event(codec, STAC_HP_EVENT << 26); |
949 | } else { | 962 | } else { |
@@ -951,9 +964,13 @@ static int stac92xx_init(struct hda_codec *codec) | |||
951 | stac92xx_auto_init_hp_out(codec); | 964 | stac92xx_auto_init_hp_out(codec); |
952 | } | 965 | } |
953 | for (i = 0; i < AUTO_PIN_LAST; i++) { | 966 | for (i = 0; i < AUTO_PIN_LAST; i++) { |
954 | if (cfg->input_pins[i]) | 967 | hda_nid_t nid = cfg->input_pins[i]; |
955 | stac92xx_auto_set_pinctl(codec, cfg->input_pins[i], | 968 | if (nid) { |
956 | AC_PINCTL_IN_EN); | 969 | unsigned int pinctl = AC_PINCTL_IN_EN; |
970 | if (i == AUTO_PIN_MIC || i == AUTO_PIN_FRONT_MIC) | ||
971 | pinctl |= stac92xx_get_vref(codec, nid); | ||
972 | stac92xx_auto_set_pinctl(codec, nid, pinctl); | ||
973 | } | ||
957 | } | 974 | } |
958 | if (cfg->dig_out_pin) | 975 | if (cfg->dig_out_pin) |
959 | stac92xx_auto_set_pinctl(codec, cfg->dig_out_pin, | 976 | stac92xx_auto_set_pinctl(codec, cfg->dig_out_pin, |
diff --git a/sound/pci/ice1712/aureon.c b/sound/pci/ice1712/aureon.c index 7e6608b14abc..336dc489aee1 100644 --- a/sound/pci/ice1712/aureon.c +++ b/sound/pci/ice1712/aureon.c | |||
@@ -87,7 +87,151 @@ | |||
87 | #define CS8415_C_BUFFER 0x20 | 87 | #define CS8415_C_BUFFER 0x20 |
88 | #define CS8415_ID 0x7F | 88 | #define CS8415_ID 0x7F |
89 | 89 | ||
90 | static void aureon_ac97_write(struct snd_ice1712 *ice, unsigned short reg, unsigned short val) { | 90 | /* PCA9554 registers */ |
91 | #define PCA9554_DEV 0x40 /* I2C device address */ | ||
92 | #define PCA9554_IN 0x00 /* input port */ | ||
93 | #define PCA9554_OUT 0x01 /* output port */ | ||
94 | #define PCA9554_INVERT 0x02 /* input invert */ | ||
95 | #define PCA9554_DIR 0x03 /* port directions */ | ||
96 | |||
97 | /* | ||
98 | * Aureon Universe additional controls using PCA9554 | ||
99 | */ | ||
100 | |||
101 | /* | ||
102 | * Send data to pca9554 | ||
103 | */ | ||
104 | static void aureon_pca9554_write(struct snd_ice1712 *ice, unsigned char reg, | ||
105 | unsigned char data) | ||
106 | { | ||
107 | unsigned int tmp; | ||
108 | int i, j; | ||
109 | unsigned char dev = PCA9554_DEV; /* ID 0100000, write */ | ||
110 | unsigned char val = 0; | ||
111 | |||
112 | tmp = snd_ice1712_gpio_read(ice); | ||
113 | |||
114 | snd_ice1712_gpio_set_mask(ice, ~(AUREON_SPI_MOSI|AUREON_SPI_CLK| | ||
115 | AUREON_WM_RW|AUREON_WM_CS| | ||
116 | AUREON_CS8415_CS)); | ||
117 | tmp |= AUREON_WM_RW; | ||
118 | tmp |= AUREON_CS8415_CS | AUREON_WM_CS; /* disable SPI devices */ | ||
119 | |||
120 | tmp &= ~AUREON_SPI_MOSI; | ||
121 | tmp &= ~AUREON_SPI_CLK; | ||
122 | snd_ice1712_gpio_write(ice, tmp); | ||
123 | udelay(50); | ||
124 | |||
125 | /* | ||
126 | * send i2c stop condition and start condition | ||
127 | * to obtain sane state | ||
128 | */ | ||
129 | tmp |= AUREON_SPI_CLK; | ||
130 | snd_ice1712_gpio_write(ice, tmp); | ||
131 | udelay(50); | ||
132 | tmp |= AUREON_SPI_MOSI; | ||
133 | snd_ice1712_gpio_write(ice, tmp); | ||
134 | udelay(100); | ||
135 | tmp &= ~AUREON_SPI_MOSI; | ||
136 | snd_ice1712_gpio_write(ice, tmp); | ||
137 | udelay(50); | ||
138 | tmp &= ~AUREON_SPI_CLK; | ||
139 | snd_ice1712_gpio_write(ice, tmp); | ||
140 | udelay(100); | ||
141 | /* | ||
142 | * send device address, command and value, | ||
143 | * skipping ack cycles inbetween | ||
144 | */ | ||
145 | for (j = 0; j < 3; j++) { | ||
146 | switch(j) { | ||
147 | case 0: val = dev; break; | ||
148 | case 1: val = reg; break; | ||
149 | case 2: val = data; break; | ||
150 | } | ||
151 | for (i = 7; i >= 0; i--) { | ||
152 | tmp &= ~AUREON_SPI_CLK; | ||
153 | snd_ice1712_gpio_write(ice, tmp); | ||
154 | udelay(40); | ||
155 | if (val & (1 << i)) | ||
156 | tmp |= AUREON_SPI_MOSI; | ||
157 | else | ||
158 | tmp &= ~AUREON_SPI_MOSI; | ||
159 | snd_ice1712_gpio_write(ice, tmp); | ||
160 | udelay(40); | ||
161 | tmp |= AUREON_SPI_CLK; | ||
162 | snd_ice1712_gpio_write(ice, tmp); | ||
163 | udelay(40); | ||
164 | } | ||
165 | tmp &= ~AUREON_SPI_CLK; | ||
166 | snd_ice1712_gpio_write(ice, tmp); | ||
167 | udelay(40); | ||
168 | tmp |= AUREON_SPI_CLK; | ||
169 | snd_ice1712_gpio_write(ice, tmp); | ||
170 | udelay(40); | ||
171 | tmp &= ~AUREON_SPI_CLK; | ||
172 | snd_ice1712_gpio_write(ice, tmp); | ||
173 | udelay(40); | ||
174 | } | ||
175 | tmp &= ~AUREON_SPI_CLK; | ||
176 | snd_ice1712_gpio_write(ice, tmp); | ||
177 | udelay(40); | ||
178 | tmp &= ~AUREON_SPI_MOSI; | ||
179 | snd_ice1712_gpio_write(ice, tmp); | ||
180 | udelay(40); | ||
181 | tmp |= AUREON_SPI_CLK; | ||
182 | snd_ice1712_gpio_write(ice, tmp); | ||
183 | udelay(50); | ||
184 | tmp |= AUREON_SPI_MOSI; | ||
185 | snd_ice1712_gpio_write(ice, tmp); | ||
186 | udelay(100); | ||
187 | } | ||
188 | |||
189 | static int aureon_universe_inmux_info(struct snd_kcontrol *kcontrol, | ||
190 | struct snd_ctl_elem_info *uinfo) | ||
191 | { | ||
192 | char *texts[3] = {"Internal Aux", "Wavetable", "Rear Line-In"}; | ||
193 | |||
194 | uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; | ||
195 | uinfo->count = 1; | ||
196 | uinfo->value.enumerated.items = 3; | ||
197 | if(uinfo->value.enumerated.item >= uinfo->value.enumerated.items) | ||
198 | uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1; | ||
199 | strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]); | ||
200 | return 0; | ||
201 | } | ||
202 | |||
203 | static int aureon_universe_inmux_get(struct snd_kcontrol *kcontrol, | ||
204 | struct snd_ctl_elem_value *ucontrol) | ||
205 | { | ||
206 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); | ||
207 | ucontrol->value.integer.value[0] = ice->spec.aureon.pca9554_out; | ||
208 | return 0; | ||
209 | } | ||
210 | |||
211 | static int aureon_universe_inmux_put(struct snd_kcontrol *kcontrol, | ||
212 | struct snd_ctl_elem_value *ucontrol) | ||
213 | { | ||
214 | struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); | ||
215 | unsigned char oval, nval; | ||
216 | int change; | ||
217 | |||
218 | snd_ice1712_save_gpio_status(ice); | ||
219 | |||
220 | oval = ice->spec.aureon.pca9554_out; | ||
221 | nval = ucontrol->value.integer.value[0]; | ||
222 | if ((change = (oval != nval))) { | ||
223 | aureon_pca9554_write(ice, PCA9554_OUT, nval); | ||
224 | ice->spec.aureon.pca9554_out = nval; | ||
225 | } | ||
226 | snd_ice1712_restore_gpio_status(ice); | ||
227 | |||
228 | return change; | ||
229 | } | ||
230 | |||
231 | |||
232 | static void aureon_ac97_write(struct snd_ice1712 *ice, unsigned short reg, | ||
233 | unsigned short val) | ||
234 | { | ||
91 | unsigned int tmp; | 235 | unsigned int tmp; |
92 | 236 | ||
93 | /* Send address to XILINX chip */ | 237 | /* Send address to XILINX chip */ |
@@ -146,7 +290,8 @@ static unsigned short aureon_ac97_read(struct snd_ice1712 *ice, unsigned short r | |||
146 | /* | 290 | /* |
147 | * Initialize STAC9744 chip | 291 | * Initialize STAC9744 chip |
148 | */ | 292 | */ |
149 | static int aureon_ac97_init (struct snd_ice1712 *ice) { | 293 | static int aureon_ac97_init (struct snd_ice1712 *ice) |
294 | { | ||
150 | int i; | 295 | int i; |
151 | static unsigned short ac97_defaults[] = { | 296 | static unsigned short ac97_defaults[] = { |
152 | 0x00, 0x9640, | 297 | 0x00, 0x9640, |
@@ -1598,7 +1743,15 @@ static struct snd_kcontrol_new universe_ac97_controls[] __devinitdata = { | |||
1598 | .get = aureon_ac97_vol_get, | 1743 | .get = aureon_ac97_vol_get, |
1599 | .put = aureon_ac97_vol_put, | 1744 | .put = aureon_ac97_vol_put, |
1600 | .private_value = AC97_VIDEO|AUREON_AC97_STEREO | 1745 | .private_value = AC97_VIDEO|AUREON_AC97_STEREO |
1601 | } | 1746 | }, |
1747 | { | ||
1748 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
1749 | .name = "Aux Source", | ||
1750 | .info = aureon_universe_inmux_info, | ||
1751 | .get = aureon_universe_inmux_get, | ||
1752 | .put = aureon_universe_inmux_put | ||
1753 | } | ||
1754 | |||
1602 | }; | 1755 | }; |
1603 | 1756 | ||
1604 | 1757 | ||
@@ -1856,6 +2009,10 @@ static int __devinit aureon_init(struct snd_ice1712 *ice) | |||
1856 | } | 2009 | } |
1857 | 2010 | ||
1858 | snd_ice1712_restore_gpio_status(ice); | 2011 | snd_ice1712_restore_gpio_status(ice); |
2012 | |||
2013 | /* initialize PCA9554 pin directions & set default input*/ | ||
2014 | aureon_pca9554_write(ice, PCA9554_DIR, 0x00); | ||
2015 | aureon_pca9554_write(ice, PCA9554_OUT, 0x00); /* internal AUX */ | ||
1859 | 2016 | ||
1860 | ice->spec.aureon.master[0] = WM_VOL_MUTE; | 2017 | ice->spec.aureon.master[0] = WM_VOL_MUTE; |
1861 | ice->spec.aureon.master[1] = WM_VOL_MUTE; | 2018 | ice->spec.aureon.master[1] = WM_VOL_MUTE; |
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index b88eeba2f5d1..32f8415558a5 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c | |||
@@ -2402,7 +2402,7 @@ static int __devinit snd_ice1712_chip_init(struct snd_ice1712 *ice) | |||
2402 | if (ice->eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE && !ice->dxr_enable) { | 2402 | if (ice->eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE && !ice->dxr_enable) { |
2403 | /* Limit active ADCs and DACs to 6; */ | 2403 | /* Limit active ADCs and DACs to 6; */ |
2404 | /* Note: DXR extension not supported */ | 2404 | /* Note: DXR extension not supported */ |
2405 | pci_write_config_byte(ice->pci, 0x60, 0x0a); | 2405 | pci_write_config_byte(ice->pci, 0x60, 0x2a); |
2406 | } else { | 2406 | } else { |
2407 | pci_write_config_byte(ice->pci, 0x60, ice->eeprom.data[ICE_EEP1_CODEC]); | 2407 | pci_write_config_byte(ice->pci, 0x60, ice->eeprom.data[ICE_EEP1_CODEC]); |
2408 | } | 2408 | } |
diff --git a/sound/pci/ice1712/ice1712.h b/sound/pci/ice1712/ice1712.h index f9b22d4a3932..053f8e56fd68 100644 --- a/sound/pci/ice1712/ice1712.h +++ b/sound/pci/ice1712/ice1712.h | |||
@@ -373,6 +373,7 @@ struct snd_ice1712 { | |||
373 | unsigned int cs8415_mux; | 373 | unsigned int cs8415_mux; |
374 | unsigned short master[2]; | 374 | unsigned short master[2]; |
375 | unsigned short vol[8]; | 375 | unsigned short vol[8]; |
376 | unsigned char pca9554_out; | ||
376 | } aureon; | 377 | } aureon; |
377 | /* AC97 register cache for Phase28 */ | 378 | /* AC97 register cache for Phase28 */ |
378 | struct phase28_spec { | 379 | struct phase28_spec { |
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c index 44393e190929..9c90d901e6b9 100644 --- a/sound/pci/maestro3.c +++ b/sound/pci/maestro3.c | |||
@@ -831,8 +831,8 @@ struct snd_m3 { | |||
831 | struct snd_pcm *pcm; | 831 | struct snd_pcm *pcm; |
832 | 832 | ||
833 | struct pci_dev *pci; | 833 | struct pci_dev *pci; |
834 | struct m3_quirk *quirk; | 834 | const struct m3_quirk *quirk; |
835 | struct m3_hv_quirk *hv_quirk; | 835 | const struct m3_hv_quirk *hv_quirk; |
836 | 836 | ||
837 | int dacs_active; | 837 | int dacs_active; |
838 | int timer_users; | 838 | int timer_users; |
@@ -892,7 +892,7 @@ static struct pci_device_id snd_m3_ids[] = { | |||
892 | 892 | ||
893 | MODULE_DEVICE_TABLE(pci, snd_m3_ids); | 893 | MODULE_DEVICE_TABLE(pci, snd_m3_ids); |
894 | 894 | ||
895 | static struct m3_quirk m3_quirk_list[] = { | 895 | static const struct m3_quirk m3_quirk_list[] = { |
896 | /* panasonic CF-28 "toughbook" */ | 896 | /* panasonic CF-28 "toughbook" */ |
897 | { | 897 | { |
898 | .name = "Panasonic CF-28", | 898 | .name = "Panasonic CF-28", |
@@ -950,7 +950,7 @@ static struct m3_quirk m3_quirk_list[] = { | |||
950 | }; | 950 | }; |
951 | 951 | ||
952 | /* These values came from the Windows driver. */ | 952 | /* These values came from the Windows driver. */ |
953 | static struct m3_hv_quirk m3_hv_quirk_list[] = { | 953 | static const struct m3_hv_quirk m3_hv_quirk_list[] = { |
954 | /* Allegro chips */ | 954 | /* Allegro chips */ |
955 | { 0x125D, 0x1988, 0x0E11, 0x002E, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 }, | 955 | { 0x125D, 0x1988, 0x0E11, 0x002E, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 }, |
956 | { 0x125D, 0x1988, 0x0E11, 0x0094, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 }, | 956 | { 0x125D, 0x1988, 0x0E11, 0x0094, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 }, |
@@ -1361,7 +1361,7 @@ static void snd_m3_pcm_setup2(struct snd_m3 *chip, struct m3_dma *s, | |||
1361 | } | 1361 | } |
1362 | 1362 | ||
1363 | 1363 | ||
1364 | static struct play_vals { | 1364 | static const struct play_vals { |
1365 | u16 addr, val; | 1365 | u16 addr, val; |
1366 | } pv[] = { | 1366 | } pv[] = { |
1367 | {CDATA_LEFT_VOLUME, ARB_VOLUME}, | 1367 | {CDATA_LEFT_VOLUME, ARB_VOLUME}, |
@@ -1428,7 +1428,7 @@ snd_m3_playback_setup(struct snd_m3 *chip, struct m3_dma *s, | |||
1428 | /* | 1428 | /* |
1429 | * Native record driver | 1429 | * Native record driver |
1430 | */ | 1430 | */ |
1431 | static struct rec_vals { | 1431 | static const struct rec_vals { |
1432 | u16 addr, val; | 1432 | u16 addr, val; |
1433 | } rv[] = { | 1433 | } rv[] = { |
1434 | {CDATA_LEFT_VOLUME, ARB_VOLUME}, | 1434 | {CDATA_LEFT_VOLUME, ARB_VOLUME}, |
@@ -1598,12 +1598,26 @@ static void snd_m3_update_ptr(struct snd_m3 *chip, struct m3_dma *s) | |||
1598 | if (! s->running) | 1598 | if (! s->running) |
1599 | return; | 1599 | return; |
1600 | 1600 | ||
1601 | hwptr = snd_m3_get_pointer(chip, s, subs) % s->dma_size; | 1601 | hwptr = snd_m3_get_pointer(chip, s, subs); |
1602 | diff = (s->dma_size + hwptr - s->hwptr) % s->dma_size; | 1602 | |
1603 | /* try to avoid expensive modulo divisions */ | ||
1604 | if (hwptr >= s->dma_size) | ||
1605 | hwptr %= s->dma_size; | ||
1606 | |||
1607 | diff = s->dma_size + hwptr - s->hwptr; | ||
1608 | if (diff >= s->dma_size) | ||
1609 | diff %= s->dma_size; | ||
1610 | |||
1603 | s->hwptr = hwptr; | 1611 | s->hwptr = hwptr; |
1604 | s->count += diff; | 1612 | s->count += diff; |
1613 | |||
1605 | if (s->count >= (signed)s->period_size) { | 1614 | if (s->count >= (signed)s->period_size) { |
1606 | s->count %= s->period_size; | 1615 | |
1616 | if (s->count < 2 * (signed)s->period_size) | ||
1617 | s->count -= (signed)s->period_size; | ||
1618 | else | ||
1619 | s->count %= s->period_size; | ||
1620 | |||
1607 | spin_unlock(&chip->reg_lock); | 1621 | spin_unlock(&chip->reg_lock); |
1608 | snd_pcm_period_elapsed(subs); | 1622 | snd_pcm_period_elapsed(subs); |
1609 | spin_lock(&chip->reg_lock); | 1623 | spin_lock(&chip->reg_lock); |
@@ -1942,6 +1956,7 @@ static int snd_m3_ac97_wait(struct snd_m3 *chip) | |||
1942 | do { | 1956 | do { |
1943 | if (! (snd_m3_inb(chip, 0x30) & 1)) | 1957 | if (! (snd_m3_inb(chip, 0x30) & 1)) |
1944 | return 0; | 1958 | return 0; |
1959 | cpu_relax(); | ||
1945 | } while (i-- > 0); | 1960 | } while (i-- > 0); |
1946 | 1961 | ||
1947 | snd_printk(KERN_ERR "ac97 serial bus busy\n"); | 1962 | snd_printk(KERN_ERR "ac97 serial bus busy\n"); |
@@ -1953,16 +1968,18 @@ snd_m3_ac97_read(struct snd_ac97 *ac97, unsigned short reg) | |||
1953 | { | 1968 | { |
1954 | struct snd_m3 *chip = ac97->private_data; | 1969 | struct snd_m3 *chip = ac97->private_data; |
1955 | unsigned long flags; | 1970 | unsigned long flags; |
1956 | unsigned short data; | 1971 | unsigned short data = 0xffff; |
1957 | 1972 | ||
1958 | if (snd_m3_ac97_wait(chip)) | 1973 | if (snd_m3_ac97_wait(chip)) |
1959 | return 0xffff; | 1974 | goto fail; |
1960 | spin_lock_irqsave(&chip->ac97_lock, flags); | 1975 | spin_lock_irqsave(&chip->ac97_lock, flags); |
1961 | snd_m3_outb(chip, 0x80 | (reg & 0x7f), CODEC_COMMAND); | 1976 | snd_m3_outb(chip, 0x80 | (reg & 0x7f), CODEC_COMMAND); |
1962 | if (snd_m3_ac97_wait(chip)) | 1977 | if (snd_m3_ac97_wait(chip)) |
1963 | return 0xffff; | 1978 | goto fail_unlock; |
1964 | data = snd_m3_inw(chip, CODEC_DATA); | 1979 | data = snd_m3_inw(chip, CODEC_DATA); |
1980 | fail_unlock: | ||
1965 | spin_unlock_irqrestore(&chip->ac97_lock, flags); | 1981 | spin_unlock_irqrestore(&chip->ac97_lock, flags); |
1982 | fail: | ||
1966 | return data; | 1983 | return data; |
1967 | } | 1984 | } |
1968 | 1985 | ||
@@ -2121,7 +2138,7 @@ static int __devinit snd_m3_mixer(struct snd_m3 *chip) | |||
2121 | * DSP Code images | 2138 | * DSP Code images |
2122 | */ | 2139 | */ |
2123 | 2140 | ||
2124 | static u16 assp_kernel_image[] __devinitdata = { | 2141 | static const u16 assp_kernel_image[] __devinitdata = { |
2125 | 0x7980, 0x0030, 0x7980, 0x03B4, 0x7980, 0x03B4, 0x7980, 0x00FB, 0x7980, 0x00DD, 0x7980, 0x03B4, | 2142 | 0x7980, 0x0030, 0x7980, 0x03B4, 0x7980, 0x03B4, 0x7980, 0x00FB, 0x7980, 0x00DD, 0x7980, 0x03B4, |
2126 | 0x7980, 0x0332, 0x7980, 0x0287, 0x7980, 0x03B4, 0x7980, 0x03B4, 0x7980, 0x03B4, 0x7980, 0x03B4, | 2143 | 0x7980, 0x0332, 0x7980, 0x0287, 0x7980, 0x03B4, 0x7980, 0x03B4, 0x7980, 0x03B4, 0x7980, 0x03B4, |
2127 | 0x7980, 0x031A, 0x7980, 0x03B4, 0x7980, 0x022F, 0x7980, 0x03B4, 0x7980, 0x03B4, 0x7980, 0x03B4, | 2144 | 0x7980, 0x031A, 0x7980, 0x03B4, 0x7980, 0x022F, 0x7980, 0x03B4, 0x7980, 0x03B4, 0x7980, 0x03B4, |
@@ -2208,7 +2225,7 @@ static u16 assp_kernel_image[] __devinitdata = { | |||
2208 | * Mini sample rate converter code image | 2225 | * Mini sample rate converter code image |
2209 | * that is to be loaded at 0x400 on the DSP. | 2226 | * that is to be loaded at 0x400 on the DSP. |
2210 | */ | 2227 | */ |
2211 | static u16 assp_minisrc_image[] __devinitdata = { | 2228 | static const u16 assp_minisrc_image[] __devinitdata = { |
2212 | 2229 | ||
2213 | 0xBF80, 0x101E, 0x906E, 0x006E, 0x8B88, 0x6980, 0xEF88, 0x906F, 0x0D6F, 0x6900, 0xEB08, 0x0412, | 2230 | 0xBF80, 0x101E, 0x906E, 0x006E, 0x8B88, 0x6980, 0xEF88, 0x906F, 0x0D6F, 0x6900, 0xEB08, 0x0412, |
2214 | 0xBC20, 0x696E, 0xB801, 0x906E, 0x7980, 0x0403, 0xB90E, 0x8807, 0xBE43, 0xBF01, 0xBE47, 0xBE41, | 2231 | 0xBC20, 0x696E, 0xB801, 0x906E, 0x7980, 0x0403, 0xB90E, 0x8807, 0xBE43, 0xBF01, 0xBE47, 0xBE41, |
@@ -2251,7 +2268,7 @@ static u16 assp_minisrc_image[] __devinitdata = { | |||
2251 | */ | 2268 | */ |
2252 | 2269 | ||
2253 | #define MINISRC_LPF_LEN 10 | 2270 | #define MINISRC_LPF_LEN 10 |
2254 | static u16 minisrc_lpf[MINISRC_LPF_LEN] __devinitdata = { | 2271 | static const u16 minisrc_lpf[MINISRC_LPF_LEN] __devinitdata = { |
2255 | 0X0743, 0X1104, 0X0A4C, 0XF88D, 0X242C, | 2272 | 0X0743, 0X1104, 0X0A4C, 0XF88D, 0X242C, |
2256 | 0X1023, 0X1AA9, 0X0B60, 0XEFDD, 0X186F | 2273 | 0X1023, 0X1AA9, 0X0B60, 0XEFDD, 0X186F |
2257 | }; | 2274 | }; |
@@ -2358,7 +2375,7 @@ static int __devinit snd_m3_assp_client_init(struct snd_m3 *chip, struct m3_dma | |||
2358 | */ | 2375 | */ |
2359 | 2376 | ||
2360 | /* | 2377 | /* |
2361 | * align instance address to 256 bytes so that it's | 2378 | * align instance address to 256 bytes so that its |
2362 | * shifted list address is aligned. | 2379 | * shifted list address is aligned. |
2363 | * list address = (mem address >> 1) >> 7; | 2380 | * list address = (mem address >> 1) >> 7; |
2364 | */ | 2381 | */ |
@@ -2647,8 +2664,8 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci, | |||
2647 | { | 2664 | { |
2648 | struct snd_m3 *chip; | 2665 | struct snd_m3 *chip; |
2649 | int i, err; | 2666 | int i, err; |
2650 | struct m3_quirk *quirk; | 2667 | const struct m3_quirk *quirk; |
2651 | struct m3_hv_quirk *hv_quirk; | 2668 | const struct m3_hv_quirk *hv_quirk; |
2652 | static struct snd_device_ops ops = { | 2669 | static struct snd_device_ops ops = { |
2653 | .dev_free = snd_m3_dev_free, | 2670 | .dev_free = snd_m3_dev_free, |
2654 | }; | 2671 | }; |
@@ -2843,12 +2860,12 @@ snd_m3_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) | |||
2843 | } | 2860 | } |
2844 | 2861 | ||
2845 | #if 0 /* TODO: not supported yet */ | 2862 | #if 0 /* TODO: not supported yet */ |
2846 | /* TODO enable midi irq and i/o */ | 2863 | /* TODO enable MIDI IRQ and I/O */ |
2847 | err = snd_mpu401_uart_new(chip->card, 0, MPU401_HW_MPU401, | 2864 | err = snd_mpu401_uart_new(chip->card, 0, MPU401_HW_MPU401, |
2848 | chip->iobase + MPU401_DATA_PORT, 1, | 2865 | chip->iobase + MPU401_DATA_PORT, 1, |
2849 | chip->irq, 0, &chip->rmidi); | 2866 | chip->irq, 0, &chip->rmidi); |
2850 | if (err < 0) | 2867 | if (err < 0) |
2851 | printk(KERN_WARNING "maestro3: no midi support.\n"); | 2868 | printk(KERN_WARNING "maestro3: no MIDI support.\n"); |
2852 | #endif | 2869 | #endif |
2853 | 2870 | ||
2854 | pci_set_drvdata(pci, card); | 2871 | pci_set_drvdata(pci, card); |
diff --git a/sound/pci/pcxhr/pcxhr_core.c b/sound/pci/pcxhr/pcxhr_core.c index fdc652c6992d..c40f59062684 100644 --- a/sound/pci/pcxhr/pcxhr_core.c +++ b/sound/pci/pcxhr/pcxhr_core.c | |||
@@ -274,12 +274,9 @@ int pcxhr_load_xilinx_binary(struct pcxhr_mgr *mgr, const struct firmware *xilin | |||
274 | 274 | ||
275 | /* test first xilinx */ | 275 | /* test first xilinx */ |
276 | chipsc = PCXHR_INPL(mgr, PCXHR_PLX_CHIPSC); | 276 | chipsc = PCXHR_INPL(mgr, PCXHR_PLX_CHIPSC); |
277 | if (!second) { | 277 | /* REV01 cards do not support the PCXHR_CHIPSC_GPI_USERI bit anymore */ |
278 | if (chipsc & PCXHR_CHIPSC_GPI_USERI) { | 278 | /* this bit will always be 1; no possibility to test presence of first xilinx */ |
279 | snd_printdd("no need to load first xilinx\n"); | 279 | if(second) { |
280 | return 0; /* first xilinx is already present and cannot be reset */ | ||
281 | } | ||
282 | } else { | ||
283 | if ((chipsc & PCXHR_CHIPSC_GPI_USERI) == 0) { | 280 | if ((chipsc & PCXHR_CHIPSC_GPI_USERI) == 0) { |
284 | snd_printk(KERN_ERR "error loading first xilinx\n"); | 281 | snd_printk(KERN_ERR "error loading first xilinx\n"); |
285 | return -EINVAL; | 282 | return -EINVAL; |
diff --git a/sound/pci/riptide/Makefile b/sound/pci/riptide/Makefile new file mode 100644 index 000000000000..dcd2e64e4818 --- /dev/null +++ b/sound/pci/riptide/Makefile | |||
@@ -0,0 +1,3 @@ | |||
1 | snd-riptide-objs := riptide.o | ||
2 | |||
3 | obj-$(CONFIG_SND_RIPTIDE) += snd-riptide.o | ||
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c new file mode 100644 index 000000000000..f148ee434a6b --- /dev/null +++ b/sound/pci/riptide/riptide.c | |||
@@ -0,0 +1,2223 @@ | |||
1 | /* | ||
2 | * Driver for the Conexant Riptide Soundchip | ||
3 | * | ||
4 | * Copyright (c) 2004 Peter Gruber <nokos@gmx.net> | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License as published by | ||
8 | * the Free Software Foundation; either version 2 of the License, or | ||
9 | * (at your option) any later version. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program; if not, write to the Free Software | ||
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
19 | * | ||
20 | */ | ||
21 | /* | ||
22 | History: | ||
23 | - 02/15/2004 first release | ||
24 | |||
25 | This Driver is based on the OSS Driver version from Linuxant (riptide-0.6lnxtbeta03111100) | ||
26 | credits from the original files: | ||
27 | |||
28 | MODULE NAME: cnxt_rt.h | ||
29 | AUTHOR: K. Lazarev (Transcribed by KNL) | ||
30 | HISTORY: Major Revision Date By | ||
31 | ----------------------------- -------- ----- | ||
32 | Created 02/1/2000 KNL | ||
33 | |||
34 | MODULE NAME: int_mdl.c | ||
35 | AUTHOR: Konstantin Lazarev (Transcribed by KNL) | ||
36 | HISTORY: Major Revision Date By | ||
37 | ----------------------------- -------- ----- | ||
38 | Created 10/01/99 KNL | ||
39 | |||
40 | MODULE NAME: riptide.h | ||
41 | AUTHOR: O. Druzhinin (Transcribed by OLD) | ||
42 | HISTORY: Major Revision Date By | ||
43 | ----------------------------- -------- ----- | ||
44 | Created 10/16/97 OLD | ||
45 | |||
46 | MODULE NAME: Rp_Cmdif.cpp | ||
47 | AUTHOR: O. Druzhinin (Transcribed by OLD) | ||
48 | K. Lazarev (Transcribed by KNL) | ||
49 | HISTORY: Major Revision Date By | ||
50 | ----------------------------- -------- ----- | ||
51 | Adopted from NT4 driver 6/22/99 OLD | ||
52 | Ported to Linux 9/01/99 KNL | ||
53 | |||
54 | MODULE NAME: rt_hw.c | ||
55 | AUTHOR: O. Druzhinin (Transcribed by OLD) | ||
56 | C. Lazarev (Transcribed by CNL) | ||
57 | HISTORY: Major Revision Date By | ||
58 | ----------------------------- -------- ----- | ||
59 | Created 11/18/97 OLD | ||
60 | Hardware functions for RipTide 11/24/97 CNL | ||
61 | (ES1) are coded | ||
62 | Hardware functions for RipTide 12/24/97 CNL | ||
63 | (A0) are coded | ||
64 | Hardware functions for RipTide 03/20/98 CNL | ||
65 | (A1) are coded | ||
66 | Boot loader is included 05/07/98 CNL | ||
67 | Redesigned for WDM 07/27/98 CNL | ||
68 | Redesigned for Linux 09/01/99 CNL | ||
69 | |||
70 | MODULE NAME: rt_hw.h | ||
71 | AUTHOR: C. Lazarev (Transcribed by CNL) | ||
72 | HISTORY: Major Revision Date By | ||
73 | ----------------------------- -------- ----- | ||
74 | Created 11/18/97 CNL | ||
75 | |||
76 | MODULE NAME: rt_mdl.c | ||
77 | AUTHOR: Konstantin Lazarev (Transcribed by KNL) | ||
78 | HISTORY: Major Revision Date By | ||
79 | ----------------------------- -------- ----- | ||
80 | Created 10/01/99 KNL | ||
81 | |||
82 | MODULE NAME: mixer.h | ||
83 | AUTHOR: K. Kenney | ||
84 | HISTORY: Major Revision Date By | ||
85 | ----------------------------- -------- ----- | ||
86 | Created from MS W95 Sample 11/28/95 KRS | ||
87 | RipTide 10/15/97 KRS | ||
88 | Adopted for Windows NT driver 01/20/98 CNL | ||
89 | */ | ||
90 | |||
91 | #include <sound/driver.h> | ||
92 | #include <linux/delay.h> | ||
93 | #include <linux/init.h> | ||
94 | #include <linux/interrupt.h> | ||
95 | #include <linux/pci.h> | ||
96 | #include <linux/slab.h> | ||
97 | #include <linux/wait.h> | ||
98 | #include <linux/gameport.h> | ||
99 | #include <linux/device.h> | ||
100 | #include <linux/firmware.h> | ||
101 | #include <asm/io.h> | ||
102 | #include <sound/core.h> | ||
103 | #include <sound/info.h> | ||
104 | #include <sound/control.h> | ||
105 | #include <sound/pcm.h> | ||
106 | #include <sound/pcm_params.h> | ||
107 | #include <sound/ac97_codec.h> | ||
108 | #include <sound/mpu401.h> | ||
109 | #include <sound/opl3.h> | ||
110 | #include <sound/initval.h> | ||
111 | |||
112 | #if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) | ||
113 | #define SUPPORT_JOYSTICK 1 | ||
114 | #endif | ||
115 | |||
116 | MODULE_AUTHOR("Peter Gruber <nokos@gmx.net>"); | ||
117 | MODULE_DESCRIPTION("riptide"); | ||
118 | MODULE_LICENSE("GPL"); | ||
119 | MODULE_SUPPORTED_DEVICE("{{Conexant,Riptide}}"); | ||
120 | |||
121 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; | ||
122 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; | ||
123 | static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; | ||
124 | |||
125 | #ifdef SUPPORT_JOYSTICK | ||
126 | static int joystick_port[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS - 1)] = 0x200 }; | ||
127 | #endif | ||
128 | static int mpu_port[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS - 1)] = 0x330 }; | ||
129 | static int opl3_port[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS - 1)] = 0x388 }; | ||
130 | |||
131 | module_param_array(index, int, NULL, 0444); | ||
132 | MODULE_PARM_DESC(index, "Index value for Riptide soundcard."); | ||
133 | module_param_array(id, charp, NULL, 0444); | ||
134 | MODULE_PARM_DESC(id, "ID string for Riptide soundcard."); | ||
135 | module_param_array(enable, bool, NULL, 0444); | ||
136 | MODULE_PARM_DESC(enable, "Enable Riptide soundcard."); | ||
137 | #ifdef SUPPORT_JOYSTICK | ||
138 | module_param_array(joystick_port, int, NULL, 0444); | ||
139 | MODULE_PARM_DESC(joystick_port, "Joystick port # for Riptide soundcard."); | ||
140 | #endif | ||
141 | module_param_array(mpu_port, int, NULL, 0444); | ||
142 | MODULE_PARM_DESC(mpu_port, "MPU401 port # for Riptide driver."); | ||
143 | module_param_array(opl3_port, int, NULL, 0444); | ||
144 | MODULE_PARM_DESC(opl3_port, "OPL3 port # for Riptide driver."); | ||
145 | |||
146 | /* | ||
147 | */ | ||
148 | |||
149 | #define MPU401_HW_RIPTIDE MPU401_HW_MPU401 | ||
150 | #define OPL3_HW_RIPTIDE OPL3_HW_OPL3 | ||
151 | |||
152 | #define PCI_EXT_CapId 0x40 | ||
153 | #define PCI_EXT_NextCapPrt 0x41 | ||
154 | #define PCI_EXT_PWMC 0x42 | ||
155 | #define PCI_EXT_PWSCR 0x44 | ||
156 | #define PCI_EXT_Data00 0x46 | ||
157 | #define PCI_EXT_PMSCR_BSE 0x47 | ||
158 | #define PCI_EXT_SB_Base 0x48 | ||
159 | #define PCI_EXT_FM_Base 0x4a | ||
160 | #define PCI_EXT_MPU_Base 0x4C | ||
161 | #define PCI_EXT_Game_Base 0x4E | ||
162 | #define PCI_EXT_Legacy_Mask 0x50 | ||
163 | #define PCI_EXT_AsicRev 0x52 | ||
164 | #define PCI_EXT_Reserved3 0x53 | ||
165 | |||
166 | #define LEGACY_ENABLE_ALL 0x8000 /* legacy device options */ | ||
167 | #define LEGACY_ENABLE_SB 0x4000 | ||
168 | #define LEGACY_ENABLE_FM 0x2000 | ||
169 | #define LEGACY_ENABLE_MPU_INT 0x1000 | ||
170 | #define LEGACY_ENABLE_MPU 0x0800 | ||
171 | #define LEGACY_ENABLE_GAMEPORT 0x0400 | ||
172 | |||
173 | #define MAX_WRITE_RETRY 10 /* cmd interface limits */ | ||
174 | #define MAX_ERROR_COUNT 10 | ||
175 | #define CMDIF_TIMEOUT 500000 | ||
176 | #define RESET_TRIES 5 | ||
177 | |||
178 | #define READ_PORT_ULONG(p) inl((unsigned long)&(p)) | ||
179 | #define WRITE_PORT_ULONG(p,x) outl(x,(unsigned long)&(p)) | ||
180 | |||
181 | #define READ_AUDIO_CONTROL(p) READ_PORT_ULONG(p->audio_control) | ||
182 | #define WRITE_AUDIO_CONTROL(p,x) WRITE_PORT_ULONG(p->audio_control,x) | ||
183 | #define UMASK_AUDIO_CONTROL(p,x) WRITE_PORT_ULONG(p->audio_control,READ_PORT_ULONG(p->audio_control)|x) | ||
184 | #define MASK_AUDIO_CONTROL(p,x) WRITE_PORT_ULONG(p->audio_control,READ_PORT_ULONG(p->audio_control)&x) | ||
185 | #define READ_AUDIO_STATUS(p) READ_PORT_ULONG(p->audio_status) | ||
186 | |||
187 | #define SET_GRESET(p) UMASK_AUDIO_CONTROL(p,0x0001) /* global reset switch */ | ||
188 | #define UNSET_GRESET(p) MASK_AUDIO_CONTROL(p,~0x0001) | ||
189 | #define SET_AIE(p) UMASK_AUDIO_CONTROL(p,0x0004) /* interrupt enable */ | ||
190 | #define UNSET_AIE(p) MASK_AUDIO_CONTROL(p,~0x0004) | ||
191 | #define SET_AIACK(p) UMASK_AUDIO_CONTROL(p,0x0008) /* interrupt acknowledge */ | ||
192 | #define UNSET_AIACKT(p) MASKAUDIO_CONTROL(p,~0x0008) | ||
193 | #define SET_ECMDAE(p) UMASK_AUDIO_CONTROL(p,0x0010) | ||
194 | #define UNSET_ECMDAE(p) MASK_AUDIO_CONTROL(p,~0x0010) | ||
195 | #define SET_ECMDBE(p) UMASK_AUDIO_CONTROL(p,0x0020) | ||
196 | #define UNSET_ECMDBE(p) MASK_AUDIO_CONTROL(p,~0x0020) | ||
197 | #define SET_EDATAF(p) UMASK_AUDIO_CONTROL(p,0x0040) | ||
198 | #define UNSET_EDATAF(p) MASK_AUDIO_CONTROL(p,~0x0040) | ||
199 | #define SET_EDATBF(p) UMASK_AUDIO_CONTROL(p,0x0080) | ||
200 | #define UNSET_EDATBF(p) MASK_AUDIO_CONTROL(p,~0x0080) | ||
201 | #define SET_ESBIRQON(p) UMASK_AUDIO_CONTROL(p,0x0100) | ||
202 | #define UNSET_ESBIRQON(p) MASK_AUDIO_CONTROL(p,~0x0100) | ||
203 | #define SET_EMPUIRQ(p) UMASK_AUDIO_CONTROL(p,0x0200) | ||
204 | #define UNSET_EMPUIRQ(p) MASK_AUDIO_CONTROL(p,~0x0200) | ||
205 | #define IS_CMDE(a) (READ_PORT_ULONG(a->stat)&0x1) /* cmd empty */ | ||
206 | #define IS_DATF(a) (READ_PORT_ULONG(a->stat)&0x2) /* data filled */ | ||
207 | #define IS_READY(p) (READ_AUDIO_STATUS(p)&0x0001) | ||
208 | #define IS_DLREADY(p) (READ_AUDIO_STATUS(p)&0x0002) | ||
209 | #define IS_DLERR(p) (READ_AUDIO_STATUS(p)&0x0004) | ||
210 | #define IS_GERR(p) (READ_AUDIO_STATUS(p)&0x0008) /* error ! */ | ||
211 | #define IS_CMDAEIRQ(p) (READ_AUDIO_STATUS(p)&0x0010) | ||
212 | #define IS_CMDBEIRQ(p) (READ_AUDIO_STATUS(p)&0x0020) | ||
213 | #define IS_DATAFIRQ(p) (READ_AUDIO_STATUS(p)&0x0040) | ||
214 | #define IS_DATBFIRQ(p) (READ_AUDIO_STATUS(p)&0x0080) | ||
215 | #define IS_EOBIRQ(p) (READ_AUDIO_STATUS(p)&0x0100) /* interrupt status */ | ||
216 | #define IS_EOSIRQ(p) (READ_AUDIO_STATUS(p)&0x0200) | ||
217 | #define IS_EOCIRQ(p) (READ_AUDIO_STATUS(p)&0x0400) | ||
218 | #define IS_UNSLIRQ(p) (READ_AUDIO_STATUS(p)&0x0800) | ||
219 | #define IS_SBIRQ(p) (READ_AUDIO_STATUS(p)&0x1000) | ||
220 | #define IS_MPUIRQ(p) (READ_AUDIO_STATUS(p)&0x2000) | ||
221 | |||
222 | #define RESP 0x00000001 /* command flags */ | ||
223 | #define PARM 0x00000002 | ||
224 | #define CMDA 0x00000004 | ||
225 | #define CMDB 0x00000008 | ||
226 | #define NILL 0x00000000 | ||
227 | |||
228 | #define LONG0(a) ((u32)a) /* shifts and masks */ | ||
229 | #define BYTE0(a) (LONG0(a)&0xff) | ||
230 | #define BYTE1(a) (BYTE0(a)<<8) | ||
231 | #define BYTE2(a) (BYTE0(a)<<16) | ||
232 | #define BYTE3(a) (BYTE0(a)<<24) | ||
233 | #define WORD0(a) (LONG0(a)&0xffff) | ||
234 | #define WORD1(a) (WORD0(a)<<8) | ||
235 | #define WORD2(a) (WORD0(a)<<16) | ||
236 | #define TRINIB0(a) (LONG0(a)&0xffffff) | ||
237 | #define TRINIB1(a) (TRINIB0(a)<<8) | ||
238 | |||
239 | #define RET(a) ((union cmdret *)(a)) | ||
240 | |||
241 | #define SEND_GETV(p,b) sendcmd(p,RESP,GETV,0,RET(b)) /* get version */ | ||
242 | #define SEND_GETC(p,b,c) sendcmd(p,PARM|RESP,GETC,c,RET(b)) | ||
243 | #define SEND_GUNS(p,b) sendcmd(p,RESP,GUNS,0,RET(b)) | ||
244 | #define SEND_SCID(p,b) sendcmd(p,RESP,SCID,0,RET(b)) | ||
245 | #define SEND_RMEM(p,b,c,d) sendcmd(p,PARM|RESP,RMEM|BYTE1(b),LONG0(c),RET(d)) /* memory access for firmware write */ | ||
246 | #define SEND_SMEM(p,b,c) sendcmd(p,PARM,SMEM|BYTE1(b),LONG0(c),RET(0)) /* memory access for firmware write */ | ||
247 | #define SEND_WMEM(p,b,c) sendcmd(p,PARM,WMEM|BYTE1(b),LONG0(c),RET(0)) /* memory access for firmware write */ | ||
248 | #define SEND_SDTM(p,b,c) sendcmd(p,PARM|RESP,SDTM|TRINIB1(b),0,RET(c)) /* memory access for firmware write */ | ||
249 | #define SEND_GOTO(p,b) sendcmd(p,PARM,GOTO,LONG0(b),RET(0)) /* memory access for firmware write */ | ||
250 | #define SEND_SETDPLL(p) sendcmd(p,0,ARM_SETDPLL,0,RET(0)) | ||
251 | #define SEND_SSTR(p,b,c) sendcmd(p,PARM,SSTR|BYTE3(b),LONG0(c),RET(0)) /* start stream */ | ||
252 | #define SEND_PSTR(p,b) sendcmd(p,PARM,PSTR,BYTE3(b),RET(0)) /* pause stream */ | ||
253 | #define SEND_KSTR(p,b) sendcmd(p,PARM,KSTR,BYTE3(b),RET(0)) /* stop stream */ | ||
254 | #define SEND_KDMA(p) sendcmd(p,0,KDMA,0,RET(0)) /* stop all dma */ | ||
255 | #define SEND_GPOS(p,b,c,d) sendcmd(p,PARM|RESP,GPOS,BYTE3(c)|BYTE2(b),RET(d)) /* get position in dma */ | ||
256 | #define SEND_SETF(p,b,c,d,e,f,g) sendcmd(p,PARM,SETF|WORD1(b)|BYTE3(c),d|BYTE1(e)|BYTE2(f)|BYTE3(g),RET(0)) /* set sample format at mixer */ | ||
257 | #define SEND_GSTS(p,b,c,d) sendcmd(p,PARM|RESP,GSTS,BYTE3(c)|BYTE2(b),RET(d)) | ||
258 | #define SEND_NGPOS(p,b,c,d) sendcmd(p,PARM|RESP,NGPOS,BYTE3(c)|BYTE2(b),RET(d)) | ||
259 | #define SEND_PSEL(p,b,c) sendcmd(p,PARM,PSEL,BYTE2(b)|BYTE3(c),RET(0)) /* activate lbus path */ | ||
260 | #define SEND_PCLR(p,b,c) sendcmd(p,PARM,PCLR,BYTE2(b)|BYTE3(c),RET(0)) /* deactivate lbus path */ | ||
261 | #define SEND_PLST(p,b) sendcmd(p,PARM,PLST,BYTE3(b),RET(0)) | ||
262 | #define SEND_RSSV(p,b,c,d) sendcmd(p,PARM|RESP,RSSV,BYTE2(b)|BYTE3(c),RET(d)) | ||
263 | #define SEND_LSEL(p,b,c,d,e,f,g,h) sendcmd(p,PARM,LSEL|BYTE1(b)|BYTE2(c)|BYTE3(d),BYTE0(e)|BYTE1(f)|BYTE2(g)|BYTE3(h),RET(0)) /* select paths for internal connections */ | ||
264 | #define SEND_SSRC(p,b,c,d,e) sendcmd(p,PARM,SSRC|BYTE1(b)|WORD2(c),WORD0(d)|WORD2(e),RET(0)) /* configure source */ | ||
265 | #define SEND_SLST(p,b) sendcmd(p,PARM,SLST,BYTE3(b),RET(0)) | ||
266 | #define SEND_RSRC(p,b,c) sendcmd(p,RESP,RSRC|BYTE1(b),0,RET(c)) /* read source config */ | ||
267 | #define SEND_SSRB(p,b,c) sendcmd(p,PARM,SSRB|BYTE1(b),WORD2(c),RET(0)) | ||
268 | #define SEND_SDGV(p,b,c,d,e) sendcmd(p,PARM,SDGV|BYTE2(b)|BYTE3(c),WORD0(d)|WORD2(e),RET(0)) /* set digital mixer */ | ||
269 | #define SEND_RDGV(p,b,c,d) sendcmd(p,PARM|RESP,RDGV|BYTE2(b)|BYTE3(c),0,RET(d)) /* read digital mixer */ | ||
270 | #define SEND_DLST(p,b) sendcmd(p,PARM,DLST,BYTE3(b),RET(0)) | ||
271 | #define SEND_SACR(p,b,c) sendcmd(p,PARM,SACR,WORD0(b)|WORD2(c),RET(0)) /* set AC97 register */ | ||
272 | #define SEND_RACR(p,b,c) sendcmd(p,PARM|RESP,RACR,WORD2(b),RET(c)) /* get AC97 register */ | ||
273 | #define SEND_ALST(p,b) sendcmd(p,PARM,ALST,BYTE3(b),RET(0)) | ||
274 | #define SEND_TXAC(p,b,c,d,e,f) sendcmd(p,PARM,TXAC|BYTE1(b)|WORD2(c),WORD0(d)|BYTE2(e)|BYTE3(f),RET(0)) | ||
275 | #define SEND_RXAC(p,b,c,d) sendcmd(p,PARM|RESP,RXAC,BYTE2(b)|BYTE3(c),RET(d)) | ||
276 | #define SEND_SI2S(p,b) sendcmd(p,PARM,SI2S,WORD2(b),RET(0)) | ||
277 | |||
278 | #define EOB_STATUS 0x80000000 /* status flags : block boundary */ | ||
279 | #define EOS_STATUS 0x40000000 /* : stoppped */ | ||
280 | #define EOC_STATUS 0x20000000 /* : stream end */ | ||
281 | #define ERR_STATUS 0x10000000 | ||
282 | #define EMPTY_STATUS 0x08000000 | ||
283 | |||
284 | #define IEOB_ENABLE 0x1 /* enable interrupts for status notification above */ | ||
285 | #define IEOS_ENABLE 0x2 | ||
286 | #define IEOC_ENABLE 0x4 | ||
287 | #define RDONCE 0x8 | ||
288 | #define DESC_MAX_MASK 0xff | ||
289 | |||
290 | #define ST_PLAY 0x1 /* stream states */ | ||
291 | #define ST_STOP 0x2 | ||
292 | #define ST_PAUSE 0x4 | ||
293 | |||
294 | #define I2S_INTDEC 3 /* config for I2S link */ | ||
295 | #define I2S_MERGER 0 | ||
296 | #define I2S_SPLITTER 0 | ||
297 | #define I2S_MIXER 7 | ||
298 | #define I2S_RATE 44100 | ||
299 | |||
300 | #define MODEM_INTDEC 4 /* config for modem link */ | ||
301 | #define MODEM_MERGER 3 | ||
302 | #define MODEM_SPLITTER 0 | ||
303 | #define MODEM_MIXER 11 | ||
304 | |||
305 | #define FM_INTDEC 3 /* config for FM/OPL3 link */ | ||
306 | #define FM_MERGER 0 | ||
307 | #define FM_SPLITTER 0 | ||
308 | #define FM_MIXER 9 | ||
309 | |||
310 | #define SPLIT_PATH 0x80 /* path splitting flag */ | ||
311 | |||
312 | enum FIRMWARE { | ||
313 | DATA_REC = 0, EXT_END_OF_FILE, EXT_SEG_ADDR_REC, EXT_GOTO_CMD_REC, | ||
314 | EXT_LIN_ADDR_REC, | ||
315 | }; | ||
316 | |||
317 | enum CMDS { | ||
318 | GETV = 0x00, GETC, GUNS, SCID, RMEM = | ||
319 | 0x10, SMEM, WMEM, SDTM, GOTO, SSTR = | ||
320 | 0x20, PSTR, KSTR, KDMA, GPOS, SETF, GSTS, NGPOS, PSEL = | ||
321 | 0x30, PCLR, PLST, RSSV, LSEL, SSRC = 0x40, SLST, RSRC, SSRB, SDGV = | ||
322 | 0x50, RDGV, DLST, SACR = 0x60, RACR, ALST, TXAC, RXAC, SI2S = | ||
323 | 0x70, ARM_SETDPLL = 0x72, | ||
324 | }; | ||
325 | |||
326 | enum E1SOURCE { | ||
327 | ARM2LBUS_FIFO0 = 0, ARM2LBUS_FIFO1, ARM2LBUS_FIFO2, ARM2LBUS_FIFO3, | ||
328 | ARM2LBUS_FIFO4, ARM2LBUS_FIFO5, ARM2LBUS_FIFO6, ARM2LBUS_FIFO7, | ||
329 | ARM2LBUS_FIFO8, ARM2LBUS_FIFO9, ARM2LBUS_FIFO10, ARM2LBUS_FIFO11, | ||
330 | ARM2LBUS_FIFO12, ARM2LBUS_FIFO13, ARM2LBUS_FIFO14, ARM2LBUS_FIFO15, | ||
331 | INTER0_OUT, INTER1_OUT, INTER2_OUT, INTER3_OUT, INTER4_OUT, | ||
332 | INTERM0_OUT, INTERM1_OUT, INTERM2_OUT, INTERM3_OUT, INTERM4_OUT, | ||
333 | INTERM5_OUT, INTERM6_OUT, DECIMM0_OUT, DECIMM1_OUT, DECIMM2_OUT, | ||
334 | DECIMM3_OUT, DECIM0_OUT, SR3_4_OUT, OPL3_SAMPLE, ASRC0, ASRC1, | ||
335 | ACLNK2PADC, ACLNK2MODEM0RX, ACLNK2MIC, ACLNK2MODEM1RX, ACLNK2HNDMIC, | ||
336 | DIGITAL_MIXER_OUT0, GAINFUNC0_OUT, GAINFUNC1_OUT, GAINFUNC2_OUT, | ||
337 | GAINFUNC3_OUT, GAINFUNC4_OUT, SOFTMODEMTX, SPLITTER0_OUTL, | ||
338 | SPLITTER0_OUTR, SPLITTER1_OUTL, SPLITTER1_OUTR, SPLITTER2_OUTL, | ||
339 | SPLITTER2_OUTR, SPLITTER3_OUTL, SPLITTER3_OUTR, MERGER0_OUT, | ||
340 | MERGER1_OUT, MERGER2_OUT, MERGER3_OUT, ARM2LBUS_FIFO_DIRECT, NO_OUT | ||
341 | }; | ||
342 | |||
343 | enum E2SINK { | ||
344 | LBUS2ARM_FIFO0 = 0, LBUS2ARM_FIFO1, LBUS2ARM_FIFO2, LBUS2ARM_FIFO3, | ||
345 | LBUS2ARM_FIFO4, LBUS2ARM_FIFO5, LBUS2ARM_FIFO6, LBUS2ARM_FIFO7, | ||
346 | INTER0_IN, INTER1_IN, INTER2_IN, INTER3_IN, INTER4_IN, INTERM0_IN, | ||
347 | INTERM1_IN, INTERM2_IN, INTERM3_IN, INTERM4_IN, INTERM5_IN, INTERM6_IN, | ||
348 | DECIMM0_IN, DECIMM1_IN, DECIMM2_IN, DECIMM3_IN, DECIM0_IN, SR3_4_IN, | ||
349 | PDAC2ACLNK, MODEM0TX2ACLNK, MODEM1TX2ACLNK, HNDSPK2ACLNK, | ||
350 | DIGITAL_MIXER_IN0, DIGITAL_MIXER_IN1, DIGITAL_MIXER_IN2, | ||
351 | DIGITAL_MIXER_IN3, DIGITAL_MIXER_IN4, DIGITAL_MIXER_IN5, | ||
352 | DIGITAL_MIXER_IN6, DIGITAL_MIXER_IN7, DIGITAL_MIXER_IN8, | ||
353 | DIGITAL_MIXER_IN9, DIGITAL_MIXER_IN10, DIGITAL_MIXER_IN11, | ||
354 | GAINFUNC0_IN, GAINFUNC1_IN, GAINFUNC2_IN, GAINFUNC3_IN, GAINFUNC4_IN, | ||
355 | SOFTMODEMRX, SPLITTER0_IN, SPLITTER1_IN, SPLITTER2_IN, SPLITTER3_IN, | ||
356 | MERGER0_INL, MERGER0_INR, MERGER1_INL, MERGER1_INR, MERGER2_INL, | ||
357 | MERGER2_INR, MERGER3_INL, MERGER3_INR, E2SINK_MAX | ||
358 | }; | ||
359 | |||
360 | enum LBUS_SINK { | ||
361 | LS_SRC_INTERPOLATOR = 0, LS_SRC_INTERPOLATORM, LS_SRC_DECIMATOR, | ||
362 | LS_SRC_DECIMATORM, LS_MIXER_IN, LS_MIXER_GAIN_FUNCTION, | ||
363 | LS_SRC_SPLITTER, LS_SRC_MERGER, LS_NONE1, LS_NONE2, | ||
364 | }; | ||
365 | |||
366 | enum RT_CHANNEL_IDS { | ||
367 | M0TX = 0, M1TX, TAMTX, HSSPKR, PDAC, DSNDTX0, DSNDTX1, DSNDTX2, | ||
368 | DSNDTX3, DSNDTX4, DSNDTX5, DSNDTX6, DSNDTX7, WVSTRTX, COP3DTX, SPARE, | ||
369 | M0RX, HSMIC, M1RX, CLEANRX, MICADC, PADC, COPRX1, COPRX2, | ||
370 | CHANNEL_ID_COUNTER | ||
371 | }; | ||
372 | |||
373 | enum { SB_CMD = 0, MODEM_CMD, I2S_CMD0, I2S_CMD1, FM_CMD, MAX_CMD }; | ||
374 | |||
375 | struct lbuspath { | ||
376 | unsigned char *noconv; | ||
377 | unsigned char *stereo; | ||
378 | unsigned char *mono; | ||
379 | }; | ||
380 | |||
381 | struct cmdport { | ||
382 | u32 data1; /* cmd,param */ | ||
383 | u32 data2; /* param */ | ||
384 | u32 stat; /* status */ | ||
385 | u32 pad[5]; | ||
386 | }; | ||
387 | |||
388 | struct riptideport { | ||
389 | u32 audio_control; /* status registers */ | ||
390 | u32 audio_status; | ||
391 | u32 pad[2]; | ||
392 | struct cmdport port[2]; /* command ports */ | ||
393 | }; | ||
394 | |||
395 | struct cmdif { | ||
396 | struct riptideport *hwport; | ||
397 | spinlock_t lock; | ||
398 | unsigned int cmdcnt; /* cmd statistics */ | ||
399 | unsigned int cmdtime; | ||
400 | unsigned int cmdtimemax; | ||
401 | unsigned int cmdtimemin; | ||
402 | unsigned int errcnt; | ||
403 | int is_reset; | ||
404 | }; | ||
405 | |||
406 | struct riptide_firmware { | ||
407 | u16 ASIC; | ||
408 | u16 CODEC; | ||
409 | u16 AUXDSP; | ||
410 | u16 PROG; | ||
411 | }; | ||
412 | |||
413 | union cmdret { | ||
414 | u8 retbytes[8]; | ||
415 | u16 retwords[4]; | ||
416 | u32 retlongs[2]; | ||
417 | }; | ||
418 | |||
419 | union firmware_version { | ||
420 | union cmdret ret; | ||
421 | struct riptide_firmware firmware; | ||
422 | }; | ||
423 | |||
424 | #define get_pcmhwdev(substream) (struct pcmhw *)(substream->runtime->private_data) | ||
425 | |||
426 | #define PLAYBACK_SUBSTREAMS 3 | ||
427 | struct snd_riptide { | ||
428 | struct snd_card *card; | ||
429 | struct pci_dev *pci; | ||
430 | const struct firmware *fw_entry; | ||
431 | |||
432 | struct cmdif *cif; | ||
433 | |||
434 | struct snd_pcm *pcm; | ||
435 | struct snd_pcm *pcm_i2s; | ||
436 | struct snd_rawmidi *rmidi; | ||
437 | struct snd_opl3 *opl3; | ||
438 | struct snd_ac97 *ac97; | ||
439 | struct snd_ac97_bus *ac97_bus; | ||
440 | |||
441 | struct snd_pcm_substream *playback_substream[PLAYBACK_SUBSTREAMS]; | ||
442 | struct snd_pcm_substream *capture_substream; | ||
443 | |||
444 | int openstreams; | ||
445 | |||
446 | int irq; | ||
447 | unsigned long port; | ||
448 | unsigned short mpuaddr; | ||
449 | unsigned short opladdr; | ||
450 | #ifdef SUPPORT_JOYSTICK | ||
451 | unsigned short gameaddr; | ||
452 | #endif | ||
453 | struct resource *res_port; | ||
454 | |||
455 | unsigned short device_id; | ||
456 | |||
457 | union firmware_version firmware; | ||
458 | |||
459 | spinlock_t lock; | ||
460 | struct tasklet_struct riptide_tq; | ||
461 | struct snd_info_entry *proc_entry; | ||
462 | |||
463 | unsigned long received_irqs; | ||
464 | unsigned long handled_irqs; | ||
465 | #ifdef CONFIG_PM | ||
466 | int in_suspend; | ||
467 | #endif | ||
468 | }; | ||
469 | |||
470 | struct sgd { /* scatter gather desriptor */ | ||
471 | u32 dwNextLink; | ||
472 | u32 dwSegPtrPhys; | ||
473 | u32 dwSegLen; | ||
474 | u32 dwStat_Ctl; | ||
475 | }; | ||
476 | |||
477 | struct pcmhw { /* pcm descriptor */ | ||
478 | struct lbuspath paths; | ||
479 | unsigned char *lbuspath; | ||
480 | unsigned char source; | ||
481 | unsigned char intdec[2]; | ||
482 | unsigned char mixer; | ||
483 | unsigned char id; | ||
484 | unsigned char state; | ||
485 | unsigned int rate; | ||
486 | unsigned int channels; | ||
487 | snd_pcm_format_t format; | ||
488 | struct snd_dma_buffer sgdlist; | ||
489 | struct sgd *sgdbuf; | ||
490 | unsigned int size; | ||
491 | unsigned int pages; | ||
492 | unsigned int oldpos; | ||
493 | unsigned int pointer; | ||
494 | }; | ||
495 | |||
496 | #define CMDRET_ZERO (union cmdret){{(u32)0, (u32) 0}} | ||
497 | |||
498 | static int sendcmd(struct cmdif *cif, u32 flags, u32 cmd, u32 parm, | ||
499 | union cmdret *ret); | ||
500 | static int getsourcesink(struct cmdif *cif, unsigned char source, | ||
501 | unsigned char sink, unsigned char *a, | ||
502 | unsigned char *b); | ||
503 | static int snd_riptide_initialize(struct snd_riptide *chip); | ||
504 | static int riptide_reset(struct cmdif *cif, struct snd_riptide *chip); | ||
505 | |||
506 | /* | ||
507 | */ | ||
508 | |||
509 | static struct pci_device_id snd_riptide_ids[] = { | ||
510 | { | ||
511 | .vendor = 0x127a,.device = 0x4310, | ||
512 | .subvendor = PCI_ANY_ID,.subdevice = PCI_ANY_ID, | ||
513 | }, | ||
514 | { | ||
515 | .vendor = 0x127a,.device = 0x4320, | ||
516 | .subvendor = PCI_ANY_ID,.subdevice = PCI_ANY_ID, | ||
517 | }, | ||
518 | { | ||
519 | .vendor = 0x127a,.device = 0x4330, | ||
520 | .subvendor = PCI_ANY_ID,.subdevice = PCI_ANY_ID, | ||
521 | }, | ||
522 | { | ||
523 | .vendor = 0x127a,.device = 0x4340, | ||
524 | .subvendor = PCI_ANY_ID,.subdevice = PCI_ANY_ID, | ||
525 | }, | ||
526 | {0,}, | ||
527 | }; | ||
528 | |||
529 | #ifdef SUPPORT_JOYSTICK | ||
530 | static struct pci_device_id snd_riptide_joystick_ids[] = { | ||
531 | { | ||
532 | .vendor = 0x127a,.device = 0x4312, | ||
533 | .subvendor = PCI_ANY_ID,.subdevice = PCI_ANY_ID, | ||
534 | }, | ||
535 | { | ||
536 | .vendor = 0x127a,.device = 0x4322, | ||
537 | .subvendor = PCI_ANY_ID,.subdevice = PCI_ANY_ID, | ||
538 | }, | ||
539 | {.vendor = 0x127a,.device = 0x4332, | ||
540 | .subvendor = PCI_ANY_ID,.subdevice = PCI_ANY_ID, | ||
541 | }, | ||
542 | {.vendor = 0x127a,.device = 0x4342, | ||
543 | .subvendor = PCI_ANY_ID,.subdevice = PCI_ANY_ID, | ||
544 | }, | ||
545 | {0,}, | ||
546 | }; | ||
547 | #endif | ||
548 | |||
549 | MODULE_DEVICE_TABLE(pci, snd_riptide_ids); | ||
550 | |||
551 | /* | ||
552 | */ | ||
553 | |||
554 | static unsigned char lbusin2out[E2SINK_MAX + 1][2] = { | ||
555 | {NO_OUT, LS_NONE1}, {NO_OUT, LS_NONE2}, {NO_OUT, LS_NONE1}, {NO_OUT, | ||
556 | LS_NONE2}, | ||
557 | {NO_OUT, LS_NONE1}, {NO_OUT, LS_NONE2}, {NO_OUT, LS_NONE1}, {NO_OUT, | ||
558 | LS_NONE2}, | ||
559 | {INTER0_OUT, LS_SRC_INTERPOLATOR}, {INTER1_OUT, LS_SRC_INTERPOLATOR}, | ||
560 | {INTER2_OUT, LS_SRC_INTERPOLATOR}, {INTER3_OUT, LS_SRC_INTERPOLATOR}, | ||
561 | {INTER4_OUT, LS_SRC_INTERPOLATOR}, {INTERM0_OUT, LS_SRC_INTERPOLATORM}, | ||
562 | {INTERM1_OUT, LS_SRC_INTERPOLATORM}, {INTERM2_OUT, | ||
563 | LS_SRC_INTERPOLATORM}, | ||
564 | {INTERM3_OUT, LS_SRC_INTERPOLATORM}, {INTERM4_OUT, | ||
565 | LS_SRC_INTERPOLATORM}, | ||
566 | {INTERM5_OUT, LS_SRC_INTERPOLATORM}, {INTERM6_OUT, | ||
567 | LS_SRC_INTERPOLATORM}, | ||
568 | {DECIMM0_OUT, LS_SRC_DECIMATORM}, {DECIMM1_OUT, LS_SRC_DECIMATORM}, | ||
569 | {DECIMM2_OUT, LS_SRC_DECIMATORM}, {DECIMM3_OUT, LS_SRC_DECIMATORM}, | ||
570 | {DECIM0_OUT, LS_SRC_DECIMATOR}, {SR3_4_OUT, LS_NONE1}, {NO_OUT, | ||
571 | LS_NONE2}, | ||
572 | {NO_OUT, LS_NONE1}, {NO_OUT, LS_NONE2}, {NO_OUT, LS_NONE1}, | ||
573 | {DIGITAL_MIXER_OUT0, LS_MIXER_IN}, {DIGITAL_MIXER_OUT0, LS_MIXER_IN}, | ||
574 | {DIGITAL_MIXER_OUT0, LS_MIXER_IN}, {DIGITAL_MIXER_OUT0, LS_MIXER_IN}, | ||
575 | {DIGITAL_MIXER_OUT0, LS_MIXER_IN}, {DIGITAL_MIXER_OUT0, LS_MIXER_IN}, | ||
576 | {DIGITAL_MIXER_OUT0, LS_MIXER_IN}, {DIGITAL_MIXER_OUT0, LS_MIXER_IN}, | ||
577 | {DIGITAL_MIXER_OUT0, LS_MIXER_IN}, {DIGITAL_MIXER_OUT0, LS_MIXER_IN}, | ||
578 | {DIGITAL_MIXER_OUT0, LS_MIXER_IN}, {DIGITAL_MIXER_OUT0, LS_MIXER_IN}, | ||
579 | {GAINFUNC0_OUT, LS_MIXER_GAIN_FUNCTION}, {GAINFUNC1_OUT, | ||
580 | LS_MIXER_GAIN_FUNCTION}, | ||
581 | {GAINFUNC2_OUT, LS_MIXER_GAIN_FUNCTION}, {GAINFUNC3_OUT, | ||
582 | LS_MIXER_GAIN_FUNCTION}, | ||
583 | {GAINFUNC4_OUT, LS_MIXER_GAIN_FUNCTION}, {SOFTMODEMTX, LS_NONE1}, | ||
584 | {SPLITTER0_OUTL, LS_SRC_SPLITTER}, {SPLITTER1_OUTL, LS_SRC_SPLITTER}, | ||
585 | {SPLITTER2_OUTL, LS_SRC_SPLITTER}, {SPLITTER3_OUTL, LS_SRC_SPLITTER}, | ||
586 | {MERGER0_OUT, LS_SRC_MERGER}, {MERGER0_OUT, LS_SRC_MERGER}, | ||
587 | {MERGER1_OUT, LS_SRC_MERGER}, | ||
588 | {MERGER1_OUT, LS_SRC_MERGER}, {MERGER2_OUT, LS_SRC_MERGER}, | ||
589 | {MERGER2_OUT, LS_SRC_MERGER}, | ||
590 | {MERGER3_OUT, LS_SRC_MERGER}, {MERGER3_OUT, LS_SRC_MERGER}, {NO_OUT, | ||
591 | LS_NONE2}, | ||
592 | }; | ||
593 | |||
594 | static unsigned char lbus_play_opl3[] = { | ||
595 | DIGITAL_MIXER_IN0 + FM_MIXER, 0xff | ||
596 | }; | ||
597 | static unsigned char lbus_play_modem[] = { | ||
598 | DIGITAL_MIXER_IN0 + MODEM_MIXER, 0xff | ||
599 | }; | ||
600 | static unsigned char lbus_play_i2s[] = { | ||
601 | INTER0_IN + I2S_INTDEC, DIGITAL_MIXER_IN0 + I2S_MIXER, 0xff | ||
602 | }; | ||
603 | static unsigned char lbus_play_out[] = { | ||
604 | PDAC2ACLNK, 0xff | ||
605 | }; | ||
606 | static unsigned char lbus_play_outhp[] = { | ||
607 | HNDSPK2ACLNK, 0xff | ||
608 | }; | ||
609 | static unsigned char lbus_play_noconv1[] = { | ||
610 | DIGITAL_MIXER_IN0, 0xff | ||
611 | }; | ||
612 | static unsigned char lbus_play_stereo1[] = { | ||
613 | INTER0_IN, DIGITAL_MIXER_IN0, 0xff | ||
614 | }; | ||
615 | static unsigned char lbus_play_mono1[] = { | ||
616 | INTERM0_IN, DIGITAL_MIXER_IN0, 0xff | ||
617 | }; | ||
618 | static unsigned char lbus_play_noconv2[] = { | ||
619 | DIGITAL_MIXER_IN1, 0xff | ||
620 | }; | ||
621 | static unsigned char lbus_play_stereo2[] = { | ||
622 | INTER1_IN, DIGITAL_MIXER_IN1, 0xff | ||
623 | }; | ||
624 | static unsigned char lbus_play_mono2[] = { | ||
625 | INTERM1_IN, DIGITAL_MIXER_IN1, 0xff | ||
626 | }; | ||
627 | static unsigned char lbus_play_noconv3[] = { | ||
628 | DIGITAL_MIXER_IN2, 0xff | ||
629 | }; | ||
630 | static unsigned char lbus_play_stereo3[] = { | ||
631 | INTER2_IN, DIGITAL_MIXER_IN2, 0xff | ||
632 | }; | ||
633 | static unsigned char lbus_play_mono3[] = { | ||
634 | INTERM2_IN, DIGITAL_MIXER_IN2, 0xff | ||
635 | }; | ||
636 | static unsigned char lbus_rec_noconv1[] = { | ||
637 | LBUS2ARM_FIFO5, 0xff | ||
638 | }; | ||
639 | static unsigned char lbus_rec_stereo1[] = { | ||
640 | DECIM0_IN, LBUS2ARM_FIFO5, 0xff | ||
641 | }; | ||
642 | static unsigned char lbus_rec_mono1[] = { | ||
643 | DECIMM3_IN, LBUS2ARM_FIFO5, 0xff | ||
644 | }; | ||
645 | |||
646 | static unsigned char play_ids[] = { 4, 1, 2, }; | ||
647 | static unsigned char play_sources[] = { | ||
648 | ARM2LBUS_FIFO4, ARM2LBUS_FIFO1, ARM2LBUS_FIFO2, | ||
649 | }; | ||
650 | static struct lbuspath lbus_play_paths[] = { | ||
651 | { | ||
652 | .noconv = lbus_play_noconv1, | ||
653 | .stereo = lbus_play_stereo1, | ||
654 | .mono = lbus_play_mono1, | ||
655 | }, | ||
656 | { | ||
657 | .noconv = lbus_play_noconv2, | ||
658 | .stereo = lbus_play_stereo2, | ||
659 | .mono = lbus_play_mono2, | ||
660 | }, | ||
661 | { | ||
662 | .noconv = lbus_play_noconv3, | ||
663 | .stereo = lbus_play_stereo3, | ||
664 | .mono = lbus_play_mono3, | ||
665 | }, | ||
666 | }; | ||
667 | static struct lbuspath lbus_rec_path = { | ||
668 | .noconv = lbus_rec_noconv1, | ||
669 | .stereo = lbus_rec_stereo1, | ||
670 | .mono = lbus_rec_mono1, | ||
671 | }; | ||
672 | |||
673 | #define FIRMWARE_VERSIONS 1 | ||
674 | static union firmware_version firmware_versions[] = { | ||
675 | { | ||
676 | .firmware.ASIC = 3,.firmware.CODEC = 2, | ||
677 | .firmware.AUXDSP = 3,.firmware.PROG = 773, | ||
678 | }, | ||
679 | }; | ||
680 | |||
681 | static u32 atoh(unsigned char *in, unsigned int len) | ||
682 | { | ||
683 | u32 sum = 0; | ||
684 | unsigned int mult = 1; | ||
685 | unsigned char c; | ||
686 | |||
687 | while (len) { | ||
688 | c = in[len - 1]; | ||
689 | if ((c >= '0') && (c <= '9')) | ||
690 | sum += mult * (c - '0'); | ||
691 | else if ((c >= 'A') && (c <= 'F')) | ||
692 | sum += mult * (c - ('A' - 10)); | ||
693 | else if ((c >= 'a') && (c <= 'f')) | ||
694 | sum += mult * (c - ('a' - 10)); | ||
695 | mult *= 16; | ||
696 | --len; | ||
697 | } | ||
698 | return sum; | ||
699 | } | ||
700 | |||
701 | static int senddata(struct cmdif *cif, unsigned char *in, u32 offset) | ||
702 | { | ||
703 | u32 addr; | ||
704 | u32 data; | ||
705 | u32 i; | ||
706 | unsigned char *p; | ||
707 | |||
708 | i = atoh(&in[1], 2); | ||
709 | addr = offset + atoh(&in[3], 4); | ||
710 | if (SEND_SMEM(cif, 0, addr) != 0) | ||
711 | return -EACCES; | ||
712 | p = in + 9; | ||
713 | while (i) { | ||
714 | data = atoh(p, 8); | ||
715 | if (SEND_WMEM(cif, 2, | ||
716 | ((data & 0x0f0f0f0f) << 4) | ((data & 0xf0f0f0f0) | ||
717 | >> 4))) | ||
718 | return -EACCES; | ||
719 | i -= 4; | ||
720 | p += 8; | ||
721 | } | ||
722 | return 0; | ||
723 | } | ||
724 | |||
725 | static int loadfirmware(struct cmdif *cif, unsigned char *img, | ||
726 | unsigned int size) | ||
727 | { | ||
728 | unsigned char *in; | ||
729 | u32 laddr, saddr, t, val; | ||
730 | int err = 0; | ||
731 | |||
732 | laddr = saddr = 0; | ||
733 | while (size > 0 && err == 0) { | ||
734 | in = img; | ||
735 | if (in[0] == ':') { | ||
736 | t = atoh(&in[7], 2); | ||
737 | switch (t) { | ||
738 | case DATA_REC: | ||
739 | err = senddata(cif, in, laddr + saddr); | ||
740 | break; | ||
741 | case EXT_SEG_ADDR_REC: | ||
742 | saddr = atoh(&in[9], 4) << 4; | ||
743 | break; | ||
744 | case EXT_LIN_ADDR_REC: | ||
745 | laddr = atoh(&in[9], 4) << 16; | ||
746 | break; | ||
747 | case EXT_GOTO_CMD_REC: | ||
748 | val = atoh(&in[9], 8); | ||
749 | if (SEND_GOTO(cif, val) != 0) | ||
750 | err = -EACCES; | ||
751 | break; | ||
752 | case EXT_END_OF_FILE: | ||
753 | size = 0; | ||
754 | break; | ||
755 | default: | ||
756 | break; | ||
757 | } | ||
758 | while (size > 0) { | ||
759 | size--; | ||
760 | if (*img++ == '\n') | ||
761 | break; | ||
762 | } | ||
763 | } | ||
764 | } | ||
765 | snd_printdd("load firmware return %d\n", err); | ||
766 | return err; | ||
767 | } | ||
768 | |||
769 | static void | ||
770 | alloclbuspath(struct cmdif *cif, unsigned char source, | ||
771 | unsigned char *path, unsigned char *mixer, unsigned char *s) | ||
772 | { | ||
773 | while (*path != 0xff) { | ||
774 | unsigned char sink, type; | ||
775 | |||
776 | sink = *path & (~SPLIT_PATH); | ||
777 | if (sink != E2SINK_MAX) { | ||
778 | snd_printdd("alloc path 0x%x->0x%x\n", source, sink); | ||
779 | SEND_PSEL(cif, source, sink); | ||
780 | source = lbusin2out[sink][0]; | ||
781 | type = lbusin2out[sink][1]; | ||
782 | if (type == LS_MIXER_IN) { | ||
783 | if (mixer) | ||
784 | *mixer = sink - DIGITAL_MIXER_IN0; | ||
785 | } | ||
786 | if (type == LS_SRC_DECIMATORM || | ||
787 | type == LS_SRC_DECIMATOR || | ||
788 | type == LS_SRC_INTERPOLATORM || | ||
789 | type == LS_SRC_INTERPOLATOR) { | ||
790 | if (s) { | ||
791 | if (s[0] != 0xff) | ||
792 | s[1] = sink; | ||
793 | else | ||
794 | s[0] = sink; | ||
795 | } | ||
796 | } | ||
797 | } | ||
798 | if (*path++ & SPLIT_PATH) { | ||
799 | unsigned char *npath = path; | ||
800 | |||
801 | while (*npath != 0xff) | ||
802 | npath++; | ||
803 | alloclbuspath(cif, source + 1, ++npath, mixer, s); | ||
804 | } | ||
805 | } | ||
806 | } | ||
807 | |||
808 | static void | ||
809 | freelbuspath(struct cmdif *cif, unsigned char source, unsigned char *path) | ||
810 | { | ||
811 | while (*path != 0xff) { | ||
812 | unsigned char sink; | ||
813 | |||
814 | sink = *path & (~SPLIT_PATH); | ||
815 | if (sink != E2SINK_MAX) { | ||
816 | snd_printdd("free path 0x%x->0x%x\n", source, sink); | ||
817 | SEND_PCLR(cif, source, sink); | ||
818 | source = lbusin2out[sink][0]; | ||
819 | } | ||
820 | if (*path++ & SPLIT_PATH) { | ||
821 | unsigned char *npath = path; | ||
822 | |||
823 | while (*npath != 0xff) | ||
824 | npath++; | ||
825 | freelbuspath(cif, source + 1, ++npath); | ||
826 | } | ||
827 | } | ||
828 | } | ||
829 | |||
830 | static int writearm(struct cmdif *cif, u32 addr, u32 data, u32 mask) | ||
831 | { | ||
832 | union cmdret rptr = CMDRET_ZERO; | ||
833 | unsigned int i = MAX_WRITE_RETRY; | ||
834 | int flag = 1; | ||
835 | |||
836 | SEND_RMEM(cif, 0x02, addr, &rptr); | ||
837 | rptr.retlongs[0] &= (~mask); | ||
838 | |||
839 | while (--i) { | ||
840 | SEND_SMEM(cif, 0x01, addr); | ||
841 | SEND_WMEM(cif, 0x02, (rptr.retlongs[0] | data)); | ||
842 | SEND_RMEM(cif, 0x02, addr, &rptr); | ||
843 | if ((rptr.retlongs[0] & data) == data) { | ||
844 | flag = 0; | ||
845 | break; | ||
846 | } else | ||
847 | rptr.retlongs[0] &= ~mask; | ||
848 | } | ||
849 | snd_printdd("send arm 0x%x 0x%x 0x%x return %d\n", addr, data, mask, | ||
850 | flag); | ||
851 | return flag; | ||
852 | } | ||
853 | |||
854 | static int sendcmd(struct cmdif *cif, u32 flags, u32 cmd, u32 parm, | ||
855 | union cmdret *ret) | ||
856 | { | ||
857 | int i, j; | ||
858 | int err; | ||
859 | unsigned int time = 0; | ||
860 | unsigned long irqflags; | ||
861 | struct riptideport *hwport; | ||
862 | struct cmdport *cmdport = NULL; | ||
863 | |||
864 | snd_assert(cif, return -EINVAL); | ||
865 | |||
866 | hwport = cif->hwport; | ||
867 | if (cif->errcnt > MAX_ERROR_COUNT) { | ||
868 | if (cif->is_reset) { | ||
869 | snd_printk(KERN_ERR | ||
870 | "Riptide: Too many failed cmds, reinitializing\n"); | ||
871 | if (riptide_reset(cif, NULL) == 0) { | ||
872 | cif->errcnt = 0; | ||
873 | return -EIO; | ||
874 | } | ||
875 | } | ||
876 | snd_printk(KERN_ERR "Riptide: Initialization failed.\n"); | ||
877 | return -EINVAL; | ||
878 | } | ||
879 | if (ret) { | ||
880 | ret->retlongs[0] = 0; | ||
881 | ret->retlongs[1] = 0; | ||
882 | } | ||
883 | i = 0; | ||
884 | spin_lock_irqsave(&cif->lock, irqflags); | ||
885 | while (i++ < CMDIF_TIMEOUT && !IS_READY(cif->hwport)) | ||
886 | udelay(10); | ||
887 | if (i >= CMDIF_TIMEOUT) { | ||
888 | err = -EBUSY; | ||
889 | goto errout; | ||
890 | } | ||
891 | |||
892 | err = 0; | ||
893 | for (j = 0, time = 0; time < CMDIF_TIMEOUT; j++, time += 2) { | ||
894 | cmdport = &(hwport->port[j % 2]); | ||
895 | if (IS_DATF(cmdport)) { /* free pending data */ | ||
896 | READ_PORT_ULONG(cmdport->data1); | ||
897 | READ_PORT_ULONG(cmdport->data2); | ||
898 | } | ||
899 | if (IS_CMDE(cmdport)) { | ||
900 | if (flags & PARM) /* put data */ | ||
901 | WRITE_PORT_ULONG(cmdport->data2, parm); | ||
902 | WRITE_PORT_ULONG(cmdport->data1, cmd); /* write cmd */ | ||
903 | if ((flags & RESP) && ret) { | ||
904 | while (!IS_DATF(cmdport) && | ||
905 | time++ < CMDIF_TIMEOUT) | ||
906 | udelay(10); | ||
907 | if (time < CMDIF_TIMEOUT) { /* read response */ | ||
908 | ret->retlongs[0] = | ||
909 | READ_PORT_ULONG(cmdport->data1); | ||
910 | ret->retlongs[1] = | ||
911 | READ_PORT_ULONG(cmdport->data2); | ||
912 | } else { | ||
913 | err = -ENOSYS; | ||
914 | goto errout; | ||
915 | } | ||
916 | } | ||
917 | break; | ||
918 | } | ||
919 | udelay(20); | ||
920 | } | ||
921 | if (time == CMDIF_TIMEOUT) { | ||
922 | err = -ENODATA; | ||
923 | goto errout; | ||
924 | } | ||
925 | spin_unlock_irqrestore(&cif->lock, irqflags); | ||
926 | |||
927 | cif->cmdcnt++; /* update command statistics */ | ||
928 | cif->cmdtime += time; | ||
929 | if (time > cif->cmdtimemax) | ||
930 | cif->cmdtimemax = time; | ||
931 | if (time < cif->cmdtimemin) | ||
932 | cif->cmdtimemin = time; | ||
933 | if ((cif->cmdcnt) % 1000 == 0) | ||
934 | snd_printdd | ||
935 | ("send cmd %d time: %d mintime: %d maxtime %d err: %d\n", | ||
936 | cif->cmdcnt, cif->cmdtime, cif->cmdtimemin, | ||
937 | cif->cmdtimemax, cif->errcnt); | ||
938 | return 0; | ||
939 | |||
940 | errout: | ||
941 | cif->errcnt++; | ||
942 | spin_unlock_irqrestore(&cif->lock, irqflags); | ||
943 | snd_printdd | ||
944 | ("send cmd %d hw: 0x%x flag: 0x%x cmd: 0x%x parm: 0x%x ret: 0x%x 0x%x CMDE: %d DATF: %d failed %d\n", | ||
945 | cif->cmdcnt, (int)((void *)&(cmdport->stat) - (void *)hwport), | ||
946 | flags, cmd, parm, ret ? ret->retlongs[0] : 0, | ||
947 | ret ? ret->retlongs[1] : 0, IS_CMDE(cmdport), IS_DATF(cmdport), | ||
948 | err); | ||
949 | return err; | ||
950 | } | ||
951 | |||
952 | static int | ||
953 | setmixer(struct cmdif *cif, short num, unsigned short rval, unsigned short lval) | ||
954 | { | ||
955 | union cmdret rptr = CMDRET_ZERO; | ||
956 | int i = 0; | ||
957 | |||
958 | snd_printdd("sent mixer %d: 0x%d 0x%d\n", num, rval, lval); | ||
959 | do { | ||
960 | SEND_SDGV(cif, num, num, rval, lval); | ||
961 | SEND_RDGV(cif, num, num, &rptr); | ||
962 | if (rptr.retwords[0] == lval && rptr.retwords[1] == rval) | ||
963 | return 0; | ||
964 | } while (i++ < MAX_WRITE_RETRY); | ||
965 | snd_printdd("sent mixer failed\n"); | ||
966 | return -EIO; | ||
967 | } | ||
968 | |||
969 | static int getpaths(struct cmdif *cif, unsigned char *o) | ||
970 | { | ||
971 | unsigned char src[E2SINK_MAX]; | ||
972 | unsigned char sink[E2SINK_MAX]; | ||
973 | int i, j = 0; | ||
974 | |||
975 | for (i = 0; i < E2SINK_MAX; i++) { | ||
976 | getsourcesink(cif, i, i, &src[i], &sink[i]); | ||
977 | if (sink[i] < E2SINK_MAX) { | ||
978 | o[j++] = sink[i]; | ||
979 | o[j++] = i; | ||
980 | } | ||
981 | } | ||
982 | return j; | ||
983 | } | ||
984 | |||
985 | static int | ||
986 | getsourcesink(struct cmdif *cif, unsigned char source, unsigned char sink, | ||
987 | unsigned char *a, unsigned char *b) | ||
988 | { | ||
989 | union cmdret rptr = CMDRET_ZERO; | ||
990 | |||
991 | if (SEND_RSSV(cif, source, sink, &rptr) && | ||
992 | SEND_RSSV(cif, source, sink, &rptr)) | ||
993 | return -EIO; | ||
994 | *a = rptr.retbytes[0]; | ||
995 | *b = rptr.retbytes[1]; | ||
996 | snd_printdd("getsourcesink 0x%x 0x%x\n", *a, *b); | ||
997 | return 0; | ||
998 | } | ||
999 | |||
1000 | static int | ||
1001 | getsamplerate(struct cmdif *cif, unsigned char *intdec, unsigned int *rate) | ||
1002 | { | ||
1003 | unsigned char *s; | ||
1004 | unsigned int p[2] = { 0, 0 }; | ||
1005 | int i; | ||
1006 | union cmdret rptr = CMDRET_ZERO; | ||
1007 | |||
1008 | s = intdec; | ||
1009 | for (i = 0; i < 2; i++) { | ||
1010 | if (*s != 0xff) { | ||
1011 | if (SEND_RSRC(cif, *s, &rptr) && | ||
1012 | SEND_RSRC(cif, *s, &rptr)) | ||
1013 | return -EIO; | ||
1014 | p[i] += rptr.retwords[1]; | ||
1015 | p[i] *= rptr.retwords[2]; | ||
1016 | p[i] += rptr.retwords[3]; | ||
1017 | p[i] /= 65536; | ||
1018 | } | ||
1019 | s++; | ||
1020 | } | ||
1021 | if (p[0]) { | ||
1022 | if (p[1] != p[0]) | ||
1023 | snd_printdd("rates differ %d %d\n", p[0], p[1]); | ||
1024 | *rate = (unsigned int)p[0]; | ||
1025 | } else | ||
1026 | *rate = (unsigned int)p[1]; | ||
1027 | snd_printdd("getsampleformat %d %d %d\n", intdec[0], intdec[1], *rate); | ||
1028 | return 0; | ||
1029 | } | ||
1030 | |||
1031 | static int | ||
1032 | setsampleformat(struct cmdif *cif, | ||
1033 | unsigned char mixer, unsigned char id, | ||
1034 | unsigned char channels, unsigned char format) | ||
1035 | { | ||
1036 | unsigned char w, ch, sig, order; | ||
1037 | |||
1038 | snd_printdd | ||
1039 | ("setsampleformat mixer: %d id: %d channels: %d format: %d\n", | ||
1040 | mixer, id, channels, format); | ||
1041 | ch = channels == 1; | ||
1042 | w = snd_pcm_format_width(format) == 8; | ||
1043 | sig = snd_pcm_format_unsigned(format) != 0; | ||
1044 | order = snd_pcm_format_big_endian(format) != 0; | ||
1045 | |||
1046 | if (SEND_SETF(cif, mixer, w, ch, order, sig, id) && | ||
1047 | SEND_SETF(cif, mixer, w, ch, order, sig, id)) { | ||
1048 | snd_printdd("setsampleformat failed\n"); | ||
1049 | return -EIO; | ||
1050 | } | ||
1051 | return 0; | ||
1052 | } | ||
1053 | |||
1054 | static int | ||
1055 | setsamplerate(struct cmdif *cif, unsigned char *intdec, unsigned int rate) | ||
1056 | { | ||
1057 | u32 D, M, N; | ||
1058 | union cmdret rptr = CMDRET_ZERO; | ||
1059 | int i; | ||
1060 | |||
1061 | snd_printdd("setsamplerate intdec: %d,%d rate: %d\n", intdec[0], | ||
1062 | intdec[1], rate); | ||
1063 | D = 48000; | ||
1064 | M = ((rate == 48000) ? 47999 : rate) * 65536; | ||
1065 | N = M % D; | ||
1066 | M /= D; | ||
1067 | for (i = 0; i < 2; i++) { | ||
1068 | if (*intdec != 0xff) { | ||
1069 | do { | ||
1070 | SEND_SSRC(cif, *intdec, D, M, N); | ||
1071 | SEND_RSRC(cif, *intdec, &rptr); | ||
1072 | } while (rptr.retwords[1] != D && | ||
1073 | rptr.retwords[2] != M && | ||
1074 | rptr.retwords[3] != N && | ||
1075 | i++ < MAX_WRITE_RETRY); | ||
1076 | if (i == MAX_WRITE_RETRY) { | ||
1077 | snd_printdd("sent samplerate %d: %d failed\n", | ||
1078 | *intdec, rate); | ||
1079 | return -EIO; | ||
1080 | } | ||
1081 | } | ||
1082 | intdec++; | ||
1083 | } | ||
1084 | return 0; | ||
1085 | } | ||
1086 | |||
1087 | static int | ||
1088 | getmixer(struct cmdif *cif, short num, unsigned short *rval, | ||
1089 | unsigned short *lval) | ||
1090 | { | ||
1091 | union cmdret rptr = CMDRET_ZERO; | ||
1092 | |||
1093 | if (SEND_RDGV(cif, num, num, &rptr) && SEND_RDGV(cif, num, num, &rptr)) | ||
1094 | return -EIO; | ||
1095 | *rval = rptr.retwords[0]; | ||
1096 | *lval = rptr.retwords[1]; | ||
1097 | snd_printdd("got mixer %d: 0x%d 0x%d\n", num, *rval, *lval); | ||
1098 | return 0; | ||
1099 | } | ||
1100 | |||
1101 | static void riptide_handleirq(unsigned long dev_id) | ||
1102 | { | ||
1103 | struct snd_riptide *chip = (void *)dev_id; | ||
1104 | struct cmdif *cif = chip->cif; | ||
1105 | struct snd_pcm_substream *substream[PLAYBACK_SUBSTREAMS + 1]; | ||
1106 | struct snd_pcm_runtime *runtime; | ||
1107 | struct pcmhw *data = NULL; | ||
1108 | unsigned int pos, period_bytes; | ||
1109 | struct sgd *c; | ||
1110 | int i, j; | ||
1111 | unsigned int flag; | ||
1112 | |||
1113 | if (!cif) | ||
1114 | return; | ||
1115 | |||
1116 | for (i = 0; i < PLAYBACK_SUBSTREAMS; i++) | ||
1117 | substream[i] = chip->playback_substream[i]; | ||
1118 | substream[i] = chip->capture_substream; | ||
1119 | for (i = 0; i < PLAYBACK_SUBSTREAMS + 1; i++) { | ||
1120 | if (substream[i] && | ||
1121 | (runtime = substream[i]->runtime) && | ||
1122 | (data = runtime->private_data) && data->state != ST_STOP) { | ||
1123 | pos = 0; | ||
1124 | for (j = 0; j < data->pages; j++) { | ||
1125 | c = &data->sgdbuf[j]; | ||
1126 | flag = le32_to_cpu(c->dwStat_Ctl); | ||
1127 | if (flag & EOB_STATUS) | ||
1128 | pos += le32_to_cpu(c->dwSegLen); | ||
1129 | if (flag & EOC_STATUS) | ||
1130 | pos += le32_to_cpu(c->dwSegLen); | ||
1131 | if ((flag & EOS_STATUS) | ||
1132 | && (data->state == ST_PLAY)) { | ||
1133 | data->state = ST_STOP; | ||
1134 | snd_printk(KERN_ERR | ||
1135 | "Riptide: DMA stopped unexpectedly\n"); | ||
1136 | } | ||
1137 | c->dwStat_Ctl = | ||
1138 | cpu_to_le32(flag & | ||
1139 | ~(EOS_STATUS | EOB_STATUS | | ||
1140 | EOC_STATUS)); | ||
1141 | } | ||
1142 | data->pointer += pos; | ||
1143 | pos += data->oldpos; | ||
1144 | if (data->state != ST_STOP) { | ||
1145 | period_bytes = | ||
1146 | frames_to_bytes(runtime, | ||
1147 | runtime->period_size); | ||
1148 | snd_printdd | ||
1149 | ("interrupt 0x%x after 0x%lx of 0x%lx frames in period\n", | ||
1150 | READ_AUDIO_STATUS(cif->hwport), | ||
1151 | bytes_to_frames(runtime, pos), | ||
1152 | runtime->period_size); | ||
1153 | j = 0; | ||
1154 | if (pos >= period_bytes) { | ||
1155 | j++; | ||
1156 | while (pos >= period_bytes) | ||
1157 | pos -= period_bytes; | ||
1158 | } | ||
1159 | data->oldpos = pos; | ||
1160 | if (j > 0) | ||
1161 | snd_pcm_period_elapsed(substream[i]); | ||
1162 | } | ||
1163 | } | ||
1164 | } | ||
1165 | } | ||
1166 | |||
1167 | #ifdef CONFIG_PM | ||
1168 | static int riptide_suspend(struct pci_dev *pci, pm_message_t state) | ||
1169 | { | ||
1170 | struct snd_card *card = pci_get_drvdata(pci); | ||
1171 | struct snd_riptide *chip = card->private_data; | ||
1172 | |||
1173 | chip->in_suspend = 1; | ||
1174 | snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); | ||
1175 | snd_pcm_suspend_all(chip->pcm); | ||
1176 | snd_ac97_suspend(chip->ac97); | ||
1177 | pci_set_power_state(pci, PCI_D3hot); | ||
1178 | pci_disable_device(pci); | ||
1179 | pci_save_state(pci); | ||
1180 | return 0; | ||
1181 | } | ||
1182 | |||
1183 | static int riptide_resume(struct pci_dev *pci) | ||
1184 | { | ||
1185 | struct snd_card *card = pci_get_drvdata(pci); | ||
1186 | struct snd_riptide *chip = card->private_data; | ||
1187 | |||
1188 | pci_restore_state(pci); | ||
1189 | pci_enable_device(pci); | ||
1190 | pci_set_power_state(pci, PCI_D0); | ||
1191 | pci_set_master(pci); | ||
1192 | snd_riptide_initialize(chip); | ||
1193 | snd_ac97_resume(chip->ac97); | ||
1194 | snd_power_change_state(card, SNDRV_CTL_POWER_D0); | ||
1195 | chip->in_suspend = 0; | ||
1196 | return 0; | ||
1197 | } | ||
1198 | #endif | ||
1199 | |||
1200 | static int riptide_reset(struct cmdif *cif, struct snd_riptide *chip) | ||
1201 | { | ||
1202 | int timeout, tries; | ||
1203 | union cmdret rptr = CMDRET_ZERO; | ||
1204 | union firmware_version firmware; | ||
1205 | int i, j, err, has_firmware; | ||
1206 | |||
1207 | if (!cif) | ||
1208 | return -EINVAL; | ||
1209 | |||
1210 | cif->cmdcnt = 0; | ||
1211 | cif->cmdtime = 0; | ||
1212 | cif->cmdtimemax = 0; | ||
1213 | cif->cmdtimemin = 0xffffffff; | ||
1214 | cif->errcnt = 0; | ||
1215 | cif->is_reset = 0; | ||
1216 | |||
1217 | tries = RESET_TRIES; | ||
1218 | has_firmware = 0; | ||
1219 | while (has_firmware == 0 && tries-- > 0) { | ||
1220 | for (i = 0; i < 2; i++) { | ||
1221 | WRITE_PORT_ULONG(cif->hwport->port[i].data1, 0); | ||
1222 | WRITE_PORT_ULONG(cif->hwport->port[i].data2, 0); | ||
1223 | } | ||
1224 | SET_GRESET(cif->hwport); | ||
1225 | udelay(100); | ||
1226 | UNSET_GRESET(cif->hwport); | ||
1227 | udelay(100); | ||
1228 | |||
1229 | for (timeout = 100000; --timeout; udelay(10)) { | ||
1230 | if (IS_READY(cif->hwport) && !IS_GERR(cif->hwport)) | ||
1231 | break; | ||
1232 | } | ||
1233 | if (timeout == 0) { | ||
1234 | snd_printk(KERN_ERR | ||
1235 | "Riptide: device not ready, audio status: 0x%x ready: %d gerr: %d\n", | ||
1236 | READ_AUDIO_STATUS(cif->hwport), | ||
1237 | IS_READY(cif->hwport), IS_GERR(cif->hwport)); | ||
1238 | return -EIO; | ||
1239 | } else { | ||
1240 | snd_printdd | ||
1241 | ("Riptide: audio status: 0x%x ready: %d gerr: %d\n", | ||
1242 | READ_AUDIO_STATUS(cif->hwport), | ||
1243 | IS_READY(cif->hwport), IS_GERR(cif->hwport)); | ||
1244 | } | ||
1245 | |||
1246 | SEND_GETV(cif, &rptr); | ||
1247 | for (i = 0; i < 4; i++) | ||
1248 | firmware.ret.retwords[i] = rptr.retwords[i]; | ||
1249 | |||
1250 | snd_printdd | ||
1251 | ("Firmware version: ASIC: %d CODEC %d AUXDSP %d PROG %d\n", | ||
1252 | firmware.firmware.ASIC, firmware.firmware.CODEC, | ||
1253 | firmware.firmware.AUXDSP, firmware.firmware.PROG); | ||
1254 | |||
1255 | for (j = 0; j < FIRMWARE_VERSIONS; j++) { | ||
1256 | has_firmware = 1; | ||
1257 | for (i = 0; i < 4; i++) { | ||
1258 | if (firmware_versions[j].ret.retwords[i] != | ||
1259 | firmware.ret.retwords[i]) | ||
1260 | has_firmware = 0; | ||
1261 | } | ||
1262 | if (has_firmware) | ||
1263 | break; | ||
1264 | } | ||
1265 | |||
1266 | if (chip != NULL && has_firmware == 0) { | ||
1267 | snd_printdd("Writing Firmware\n"); | ||
1268 | if (!chip->fw_entry) { | ||
1269 | if ((err = | ||
1270 | request_firmware(&chip->fw_entry, | ||
1271 | "riptide.hex", | ||
1272 | &chip->pci->dev)) != 0) { | ||
1273 | snd_printk(KERN_ERR | ||
1274 | "Riptide: Firmware not available %d\n", | ||
1275 | err); | ||
1276 | return -EIO; | ||
1277 | } | ||
1278 | } | ||
1279 | err = loadfirmware(cif, chip->fw_entry->data, | ||
1280 | chip->fw_entry->size); | ||
1281 | if (err) | ||
1282 | snd_printk(KERN_ERR | ||
1283 | "Riptide: Could not load firmware %d\n", | ||
1284 | err); | ||
1285 | } | ||
1286 | } | ||
1287 | |||
1288 | SEND_SACR(cif, 0, AC97_RESET); | ||
1289 | SEND_RACR(cif, AC97_RESET, &rptr); | ||
1290 | snd_printdd("AC97: 0x%x 0x%x\n", rptr.retlongs[0], rptr.retlongs[1]); | ||
1291 | |||
1292 | SEND_PLST(cif, 0); | ||
1293 | SEND_SLST(cif, 0); | ||
1294 | SEND_DLST(cif, 0); | ||
1295 | SEND_ALST(cif, 0); | ||
1296 | SEND_KDMA(cif); | ||
1297 | |||
1298 | writearm(cif, 0x301F8, 1, 1); | ||
1299 | writearm(cif, 0x301F4, 1, 1); | ||
1300 | |||
1301 | SEND_LSEL(cif, MODEM_CMD, 0, 0, MODEM_INTDEC, MODEM_MERGER, | ||
1302 | MODEM_SPLITTER, MODEM_MIXER); | ||
1303 | setmixer(cif, MODEM_MIXER, 0x7fff, 0x7fff); | ||
1304 | alloclbuspath(cif, ARM2LBUS_FIFO13, lbus_play_modem, NULL, NULL); | ||
1305 | |||
1306 | SEND_LSEL(cif, FM_CMD, 0, 0, FM_INTDEC, FM_MERGER, FM_SPLITTER, | ||
1307 | FM_MIXER); | ||
1308 | setmixer(cif, FM_MIXER, 0x7fff, 0x7fff); | ||
1309 | writearm(cif, 0x30648 + FM_MIXER * 4, 0x01, 0x00000005); | ||
1310 | writearm(cif, 0x301A8, 0x02, 0x00000002); | ||
1311 | writearm(cif, 0x30264, 0x08, 0xffffffff); | ||
1312 | alloclbuspath(cif, OPL3_SAMPLE, lbus_play_opl3, NULL, NULL); | ||
1313 | |||
1314 | SEND_SSRC(cif, I2S_INTDEC, 48000, | ||
1315 | ((u32) I2S_RATE * 65536) / 48000, | ||
1316 | ((u32) I2S_RATE * 65536) % 48000); | ||
1317 | SEND_LSEL(cif, I2S_CMD0, 0, 0, I2S_INTDEC, I2S_MERGER, I2S_SPLITTER, | ||
1318 | I2S_MIXER); | ||
1319 | SEND_SI2S(cif, 1); | ||
1320 | alloclbuspath(cif, ARM2LBUS_FIFO0, lbus_play_i2s, NULL, NULL); | ||
1321 | alloclbuspath(cif, DIGITAL_MIXER_OUT0, lbus_play_out, NULL, NULL); | ||
1322 | alloclbuspath(cif, DIGITAL_MIXER_OUT0, lbus_play_outhp, NULL, NULL); | ||
1323 | |||
1324 | SET_AIACK(cif->hwport); | ||
1325 | SET_AIE(cif->hwport); | ||
1326 | SET_AIACK(cif->hwport); | ||
1327 | cif->is_reset = 1; | ||
1328 | if (chip) { | ||
1329 | for (i = 0; i < 4; i++) | ||
1330 | chip->firmware.ret.retwords[i] = | ||
1331 | firmware.ret.retwords[i]; | ||
1332 | } | ||
1333 | |||
1334 | return 0; | ||
1335 | } | ||
1336 | |||
1337 | static struct snd_pcm_hardware snd_riptide_playback = { | ||
1338 | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | | ||
1339 | SNDRV_PCM_INFO_BLOCK_TRANSFER | | ||
1340 | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_MMAP_VALID), | ||
1341 | .formats = | ||
1342 | SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | ||
1343 | | SNDRV_PCM_FMTBIT_U16_LE, | ||
1344 | .rates = SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_48000, | ||
1345 | .rate_min = 5500, | ||
1346 | .rate_max = 48000, | ||
1347 | .channels_min = 1, | ||
1348 | .channels_max = 2, | ||
1349 | .buffer_bytes_max = (64 * 1024), | ||
1350 | .period_bytes_min = PAGE_SIZE >> 1, | ||
1351 | .period_bytes_max = PAGE_SIZE << 8, | ||
1352 | .periods_min = 2, | ||
1353 | .periods_max = 64, | ||
1354 | .fifo_size = 0, | ||
1355 | }; | ||
1356 | static struct snd_pcm_hardware snd_riptide_capture = { | ||
1357 | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | | ||
1358 | SNDRV_PCM_INFO_BLOCK_TRANSFER | | ||
1359 | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_MMAP_VALID), | ||
1360 | .formats = | ||
1361 | SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | ||
1362 | | SNDRV_PCM_FMTBIT_U16_LE, | ||
1363 | .rates = SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_48000, | ||
1364 | .rate_min = 5500, | ||
1365 | .rate_max = 48000, | ||
1366 | .channels_min = 1, | ||
1367 | .channels_max = 2, | ||
1368 | .buffer_bytes_max = (64 * 1024), | ||
1369 | .period_bytes_min = PAGE_SIZE >> 1, | ||
1370 | .period_bytes_max = PAGE_SIZE << 3, | ||
1371 | .periods_min = 2, | ||
1372 | .periods_max = 64, | ||
1373 | .fifo_size = 0, | ||
1374 | }; | ||
1375 | |||
1376 | static snd_pcm_uframes_t snd_riptide_pointer(struct snd_pcm_substream | ||
1377 | *substream) | ||
1378 | { | ||
1379 | struct snd_riptide *chip = snd_pcm_substream_chip(substream); | ||
1380 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
1381 | struct pcmhw *data = get_pcmhwdev(substream); | ||
1382 | struct cmdif *cif = chip->cif; | ||
1383 | union cmdret rptr = CMDRET_ZERO; | ||
1384 | snd_pcm_uframes_t ret; | ||
1385 | |||
1386 | SEND_GPOS(cif, 0, data->id, &rptr); | ||
1387 | if (data->size && runtime->period_size) { | ||
1388 | snd_printdd | ||
1389 | ("pointer stream %d position 0x%x(0x%x in buffer) bytes 0x%lx(0x%lx in period) frames\n", | ||
1390 | data->id, rptr.retlongs[1], rptr.retlongs[1] % data->size, | ||
1391 | bytes_to_frames(runtime, rptr.retlongs[1]), | ||
1392 | bytes_to_frames(runtime, | ||
1393 | rptr.retlongs[1]) % runtime->period_size); | ||
1394 | if (rptr.retlongs[1] > data->pointer) | ||
1395 | ret = | ||
1396 | bytes_to_frames(runtime, | ||
1397 | rptr.retlongs[1] % data->size); | ||
1398 | else | ||
1399 | ret = | ||
1400 | bytes_to_frames(runtime, | ||
1401 | data->pointer % data->size); | ||
1402 | } else { | ||
1403 | snd_printdd("stream not started or strange parms (%d %ld)\n", | ||
1404 | data->size, runtime->period_size); | ||
1405 | ret = bytes_to_frames(runtime, 0); | ||
1406 | } | ||
1407 | return ret; | ||
1408 | } | ||
1409 | |||
1410 | static int snd_riptide_trigger(struct snd_pcm_substream *substream, int cmd) | ||
1411 | { | ||
1412 | int i, j; | ||
1413 | struct snd_riptide *chip = snd_pcm_substream_chip(substream); | ||
1414 | struct pcmhw *data = get_pcmhwdev(substream); | ||
1415 | struct cmdif *cif = chip->cif; | ||
1416 | union cmdret rptr = CMDRET_ZERO; | ||
1417 | |||
1418 | spin_lock(&chip->lock); | ||
1419 | switch (cmd) { | ||
1420 | case SNDRV_PCM_TRIGGER_START: | ||
1421 | case SNDRV_PCM_TRIGGER_RESUME: | ||
1422 | if (!(data->state & ST_PLAY)) { | ||
1423 | SEND_SSTR(cif, data->id, data->sgdlist.addr); | ||
1424 | SET_AIE(cif->hwport); | ||
1425 | data->state = ST_PLAY; | ||
1426 | if (data->mixer != 0xff) | ||
1427 | setmixer(cif, data->mixer, 0x7fff, 0x7fff); | ||
1428 | chip->openstreams++; | ||
1429 | data->oldpos = 0; | ||
1430 | data->pointer = 0; | ||
1431 | } | ||
1432 | break; | ||
1433 | case SNDRV_PCM_TRIGGER_STOP: | ||
1434 | case SNDRV_PCM_TRIGGER_SUSPEND: | ||
1435 | if (data->mixer != 0xff) | ||
1436 | setmixer(cif, data->mixer, 0, 0); | ||
1437 | setmixer(cif, data->mixer, 0, 0); | ||
1438 | SEND_KSTR(cif, data->id); | ||
1439 | data->state = ST_STOP; | ||
1440 | chip->openstreams--; | ||
1441 | j = 0; | ||
1442 | do { | ||
1443 | i = rptr.retlongs[1]; | ||
1444 | SEND_GPOS(cif, 0, data->id, &rptr); | ||
1445 | udelay(1); | ||
1446 | } while (i != rptr.retlongs[1] && j++ < MAX_WRITE_RETRY); | ||
1447 | if (j >= MAX_WRITE_RETRY) | ||
1448 | snd_printk(KERN_ERR "Riptide: Could not stop stream!"); | ||
1449 | break; | ||
1450 | case SNDRV_PCM_TRIGGER_PAUSE_PUSH: | ||
1451 | if (!(data->state & ST_PAUSE)) { | ||
1452 | SEND_PSTR(cif, data->id); | ||
1453 | data->state |= ST_PAUSE; | ||
1454 | chip->openstreams--; | ||
1455 | } | ||
1456 | break; | ||
1457 | case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: | ||
1458 | if (data->state & ST_PAUSE) { | ||
1459 | SEND_SSTR(cif, data->id, data->sgdlist.addr); | ||
1460 | data->state &= ~ST_PAUSE; | ||
1461 | chip->openstreams++; | ||
1462 | } | ||
1463 | break; | ||
1464 | default: | ||
1465 | spin_unlock(&chip->lock); | ||
1466 | return -EINVAL; | ||
1467 | } | ||
1468 | spin_unlock(&chip->lock); | ||
1469 | return 0; | ||
1470 | } | ||
1471 | |||
1472 | static int snd_riptide_prepare(struct snd_pcm_substream *substream) | ||
1473 | { | ||
1474 | struct snd_riptide *chip = snd_pcm_substream_chip(substream); | ||
1475 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
1476 | struct snd_sg_buf *sgbuf = snd_pcm_substream_sgbuf(substream); | ||
1477 | struct pcmhw *data = get_pcmhwdev(substream); | ||
1478 | struct cmdif *cif = chip->cif; | ||
1479 | unsigned char *lbuspath = NULL; | ||
1480 | unsigned int rate, channels; | ||
1481 | int err = 0; | ||
1482 | snd_pcm_format_t format; | ||
1483 | |||
1484 | snd_assert(cif && data, return -EINVAL); | ||
1485 | |||
1486 | snd_printdd("prepare id %d ch: %d f:0x%x r:%d\n", data->id, | ||
1487 | runtime->channels, runtime->format, runtime->rate); | ||
1488 | |||
1489 | spin_lock_irq(&chip->lock); | ||
1490 | channels = runtime->channels; | ||
1491 | format = runtime->format; | ||
1492 | rate = runtime->rate; | ||
1493 | switch (channels) { | ||
1494 | case 1: | ||
1495 | if (rate == 48000 && format == SNDRV_PCM_FORMAT_S16_LE) | ||
1496 | lbuspath = data->paths.noconv; | ||
1497 | else | ||
1498 | lbuspath = data->paths.mono; | ||
1499 | break; | ||
1500 | case 2: | ||
1501 | if (rate == 48000 && format == SNDRV_PCM_FORMAT_S16_LE) | ||
1502 | lbuspath = data->paths.noconv; | ||
1503 | else | ||
1504 | lbuspath = data->paths.stereo; | ||
1505 | break; | ||
1506 | } | ||
1507 | snd_printdd("use sgdlist at 0x%p and buffer at 0x%p\n", | ||
1508 | data->sgdlist.area, sgbuf); | ||
1509 | if (data->sgdlist.area && sgbuf) { | ||
1510 | unsigned int i, j, size, pages, f, pt, period; | ||
1511 | struct sgd *c, *p = NULL; | ||
1512 | |||
1513 | size = frames_to_bytes(runtime, runtime->buffer_size); | ||
1514 | period = frames_to_bytes(runtime, runtime->period_size); | ||
1515 | f = PAGE_SIZE; | ||
1516 | while ((size + (f >> 1) - 1) <= (f << 7) && (f << 1) > period) | ||
1517 | f = f >> 1; | ||
1518 | pages = (size + f - 1) / f; | ||
1519 | data->size = size; | ||
1520 | data->pages = pages; | ||
1521 | snd_printdd | ||
1522 | ("create sgd size: 0x%x pages %d of size 0x%x for period 0x%x\n", | ||
1523 | size, pages, f, period); | ||
1524 | pt = 0; | ||
1525 | j = 0; | ||
1526 | for (i = 0; i < pages; i++) { | ||
1527 | c = &data->sgdbuf[i]; | ||
1528 | if (p) | ||
1529 | p->dwNextLink = cpu_to_le32(data->sgdlist.addr + | ||
1530 | (i * | ||
1531 | sizeof(struct | ||
1532 | sgd))); | ||
1533 | c->dwNextLink = cpu_to_le32(data->sgdlist.addr); | ||
1534 | c->dwSegPtrPhys = | ||
1535 | cpu_to_le32(sgbuf->table[j].addr + pt); | ||
1536 | pt = (pt + f) % PAGE_SIZE; | ||
1537 | if (pt == 0) | ||
1538 | j++; | ||
1539 | c->dwSegLen = cpu_to_le32(f); | ||
1540 | c->dwStat_Ctl = | ||
1541 | cpu_to_le32(IEOB_ENABLE | IEOS_ENABLE | | ||
1542 | IEOC_ENABLE); | ||
1543 | p = c; | ||
1544 | size -= f; | ||
1545 | } | ||
1546 | data->sgdbuf[i].dwSegLen = cpu_to_le32(size); | ||
1547 | } | ||
1548 | if (lbuspath && lbuspath != data->lbuspath) { | ||
1549 | if (data->lbuspath) | ||
1550 | freelbuspath(cif, data->source, data->lbuspath); | ||
1551 | alloclbuspath(cif, data->source, lbuspath, | ||
1552 | &data->mixer, data->intdec); | ||
1553 | data->lbuspath = lbuspath; | ||
1554 | data->rate = 0; | ||
1555 | } | ||
1556 | if (data->rate != rate || data->format != format || | ||
1557 | data->channels != channels) { | ||
1558 | data->rate = rate; | ||
1559 | data->format = format; | ||
1560 | data->channels = channels; | ||
1561 | if (setsampleformat | ||
1562 | (cif, data->mixer, data->id, channels, format) | ||
1563 | || setsamplerate(cif, data->intdec, rate)) | ||
1564 | err = -EIO; | ||
1565 | } | ||
1566 | spin_unlock_irq(&chip->lock); | ||
1567 | return err; | ||
1568 | } | ||
1569 | |||
1570 | static int | ||
1571 | snd_riptide_hw_params(struct snd_pcm_substream *substream, | ||
1572 | struct snd_pcm_hw_params *hw_params) | ||
1573 | { | ||
1574 | struct snd_riptide *chip = snd_pcm_substream_chip(substream); | ||
1575 | struct pcmhw *data = get_pcmhwdev(substream); | ||
1576 | struct snd_dma_buffer *sgdlist = &data->sgdlist; | ||
1577 | int err; | ||
1578 | |||
1579 | snd_printdd("hw params id %d (sgdlist: 0x%p 0x%lx %d)\n", data->id, | ||
1580 | sgdlist->area, (unsigned long)sgdlist->addr, | ||
1581 | (int)sgdlist->bytes); | ||
1582 | if (sgdlist->area) | ||
1583 | snd_dma_free_pages(sgdlist); | ||
1584 | if ((err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, | ||
1585 | snd_dma_pci_data(chip->pci), | ||
1586 | sizeof(struct sgd) * (DESC_MAX_MASK + 1), | ||
1587 | sgdlist)) < 0) { | ||
1588 | snd_printk(KERN_ERR "Riptide: failed to alloc %d dma bytes\n", | ||
1589 | (int)sizeof(struct sgd) * (DESC_MAX_MASK + 1)); | ||
1590 | return err; | ||
1591 | } | ||
1592 | data->sgdbuf = (struct sgd *)sgdlist->area; | ||
1593 | return snd_pcm_lib_malloc_pages(substream, | ||
1594 | params_buffer_bytes(hw_params)); | ||
1595 | } | ||
1596 | |||
1597 | static int snd_riptide_hw_free(struct snd_pcm_substream *substream) | ||
1598 | { | ||
1599 | struct snd_riptide *chip = snd_pcm_substream_chip(substream); | ||
1600 | struct pcmhw *data = get_pcmhwdev(substream); | ||
1601 | struct cmdif *cif = chip->cif; | ||
1602 | |||
1603 | if (cif && data) { | ||
1604 | if (data->lbuspath) | ||
1605 | freelbuspath(cif, data->source, data->lbuspath); | ||
1606 | data->lbuspath = NULL; | ||
1607 | data->source = 0xff; | ||
1608 | data->intdec[0] = 0xff; | ||
1609 | data->intdec[1] = 0xff; | ||
1610 | |||
1611 | if (data->sgdlist.area) { | ||
1612 | snd_dma_free_pages(&data->sgdlist); | ||
1613 | data->sgdlist.area = NULL; | ||
1614 | } | ||
1615 | } | ||
1616 | return snd_pcm_lib_free_pages(substream); | ||
1617 | } | ||
1618 | |||
1619 | static int snd_riptide_playback_open(struct snd_pcm_substream *substream) | ||
1620 | { | ||
1621 | struct snd_riptide *chip = snd_pcm_substream_chip(substream); | ||
1622 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
1623 | struct pcmhw *data; | ||
1624 | int index = substream->number; | ||
1625 | |||
1626 | chip->playback_substream[index] = substream; | ||
1627 | runtime->hw = snd_riptide_playback; | ||
1628 | data = kzalloc(sizeof(struct pcmhw), GFP_KERNEL); | ||
1629 | data->paths = lbus_play_paths[index]; | ||
1630 | data->id = play_ids[index]; | ||
1631 | data->source = play_sources[index]; | ||
1632 | data->intdec[0] = 0xff; | ||
1633 | data->intdec[1] = 0xff; | ||
1634 | data->state = ST_STOP; | ||
1635 | runtime->private_data = data; | ||
1636 | return snd_pcm_hw_constraint_integer(runtime, | ||
1637 | SNDRV_PCM_HW_PARAM_PERIODS); | ||
1638 | } | ||
1639 | |||
1640 | static int snd_riptide_capture_open(struct snd_pcm_substream *substream) | ||
1641 | { | ||
1642 | struct snd_riptide *chip = snd_pcm_substream_chip(substream); | ||
1643 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
1644 | struct pcmhw *data; | ||
1645 | |||
1646 | chip->capture_substream = substream; | ||
1647 | runtime->hw = snd_riptide_capture; | ||
1648 | data = kzalloc(sizeof(struct pcmhw), GFP_KERNEL); | ||
1649 | data->paths = lbus_rec_path; | ||
1650 | data->id = PADC; | ||
1651 | data->source = ACLNK2PADC; | ||
1652 | data->intdec[0] = 0xff; | ||
1653 | data->intdec[1] = 0xff; | ||
1654 | data->state = ST_STOP; | ||
1655 | runtime->private_data = data; | ||
1656 | return snd_pcm_hw_constraint_integer(runtime, | ||
1657 | SNDRV_PCM_HW_PARAM_PERIODS); | ||
1658 | } | ||
1659 | |||
1660 | static int snd_riptide_playback_close(struct snd_pcm_substream *substream) | ||
1661 | { | ||
1662 | struct snd_riptide *chip = snd_pcm_substream_chip(substream); | ||
1663 | struct pcmhw *data = get_pcmhwdev(substream); | ||
1664 | int index = substream->number; | ||
1665 | |||
1666 | substream->runtime->private_data = NULL; | ||
1667 | chip->playback_substream[index] = NULL; | ||
1668 | kfree(data); | ||
1669 | return 0; | ||
1670 | } | ||
1671 | |||
1672 | static int snd_riptide_capture_close(struct snd_pcm_substream *substream) | ||
1673 | { | ||
1674 | struct snd_riptide *chip = snd_pcm_substream_chip(substream); | ||
1675 | struct pcmhw *data = get_pcmhwdev(substream); | ||
1676 | |||
1677 | substream->runtime->private_data = NULL; | ||
1678 | chip->capture_substream = NULL; | ||
1679 | kfree(data); | ||
1680 | return 0; | ||
1681 | } | ||
1682 | |||
1683 | static struct snd_pcm_ops snd_riptide_playback_ops = { | ||
1684 | .open = snd_riptide_playback_open, | ||
1685 | .close = snd_riptide_playback_close, | ||
1686 | .ioctl = snd_pcm_lib_ioctl, | ||
1687 | .hw_params = snd_riptide_hw_params, | ||
1688 | .hw_free = snd_riptide_hw_free, | ||
1689 | .prepare = snd_riptide_prepare, | ||
1690 | .page = snd_pcm_sgbuf_ops_page, | ||
1691 | .trigger = snd_riptide_trigger, | ||
1692 | .pointer = snd_riptide_pointer, | ||
1693 | }; | ||
1694 | static struct snd_pcm_ops snd_riptide_capture_ops = { | ||
1695 | .open = snd_riptide_capture_open, | ||
1696 | .close = snd_riptide_capture_close, | ||
1697 | .ioctl = snd_pcm_lib_ioctl, | ||
1698 | .hw_params = snd_riptide_hw_params, | ||
1699 | .hw_free = snd_riptide_hw_free, | ||
1700 | .prepare = snd_riptide_prepare, | ||
1701 | .page = snd_pcm_sgbuf_ops_page, | ||
1702 | .trigger = snd_riptide_trigger, | ||
1703 | .pointer = snd_riptide_pointer, | ||
1704 | }; | ||
1705 | |||
1706 | static int __devinit | ||
1707 | snd_riptide_pcm(struct snd_riptide *chip, int device, struct snd_pcm **rpcm) | ||
1708 | { | ||
1709 | struct snd_pcm *pcm; | ||
1710 | int err; | ||
1711 | |||
1712 | if (rpcm) | ||
1713 | *rpcm = NULL; | ||
1714 | if ((err = | ||
1715 | snd_pcm_new(chip->card, "RIPTIDE", device, PLAYBACK_SUBSTREAMS, 1, | ||
1716 | &pcm)) < 0) | ||
1717 | return err; | ||
1718 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, | ||
1719 | &snd_riptide_playback_ops); | ||
1720 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, | ||
1721 | &snd_riptide_capture_ops); | ||
1722 | pcm->private_data = chip; | ||
1723 | pcm->info_flags = 0; | ||
1724 | strcpy(pcm->name, "RIPTIDE"); | ||
1725 | chip->pcm = pcm; | ||
1726 | snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG, | ||
1727 | snd_dma_pci_data(chip->pci), | ||
1728 | 64 * 1024, 128 * 1024); | ||
1729 | if (rpcm) | ||
1730 | *rpcm = pcm; | ||
1731 | return 0; | ||
1732 | } | ||
1733 | |||
1734 | static irqreturn_t | ||
1735 | snd_riptide_interrupt(int irq, void *dev_id, struct pt_regs *regs) | ||
1736 | { | ||
1737 | struct snd_riptide *chip = dev_id; | ||
1738 | struct cmdif *cif = chip->cif; | ||
1739 | |||
1740 | if (cif) { | ||
1741 | chip->received_irqs++; | ||
1742 | if (IS_EOBIRQ(cif->hwport) || IS_EOSIRQ(cif->hwport) || | ||
1743 | IS_EOCIRQ(cif->hwport)) { | ||
1744 | chip->handled_irqs++; | ||
1745 | tasklet_hi_schedule(&chip->riptide_tq); | ||
1746 | } | ||
1747 | if (chip->rmidi && IS_MPUIRQ(cif->hwport)) { | ||
1748 | chip->handled_irqs++; | ||
1749 | snd_mpu401_uart_interrupt(irq, | ||
1750 | chip->rmidi->private_data, | ||
1751 | regs); | ||
1752 | } | ||
1753 | SET_AIACK(cif->hwport); | ||
1754 | } | ||
1755 | return IRQ_HANDLED; | ||
1756 | } | ||
1757 | |||
1758 | static void | ||
1759 | snd_riptide_codec_write(struct snd_ac97 *ac97, unsigned short reg, | ||
1760 | unsigned short val) | ||
1761 | { | ||
1762 | struct snd_riptide *chip = ac97->private_data; | ||
1763 | struct cmdif *cif = chip->cif; | ||
1764 | union cmdret rptr = CMDRET_ZERO; | ||
1765 | int i = 0; | ||
1766 | |||
1767 | snd_assert(cif, return); | ||
1768 | |||
1769 | snd_printdd("Write AC97 reg 0x%x 0x%x\n", reg, val); | ||
1770 | do { | ||
1771 | SEND_SACR(cif, val, reg); | ||
1772 | SEND_RACR(cif, reg, &rptr); | ||
1773 | } while (rptr.retwords[1] != val && i++ < MAX_WRITE_RETRY); | ||
1774 | if (i == MAX_WRITE_RETRY) | ||
1775 | snd_printdd("Write AC97 reg failed\n"); | ||
1776 | } | ||
1777 | |||
1778 | static unsigned short snd_riptide_codec_read(struct snd_ac97 *ac97, | ||
1779 | unsigned short reg) | ||
1780 | { | ||
1781 | struct snd_riptide *chip = ac97->private_data; | ||
1782 | struct cmdif *cif = chip->cif; | ||
1783 | union cmdret rptr = CMDRET_ZERO; | ||
1784 | |||
1785 | snd_assert(cif, return 0); | ||
1786 | |||
1787 | if (SEND_RACR(cif, reg, &rptr) != 0) | ||
1788 | SEND_RACR(cif, reg, &rptr); | ||
1789 | snd_printdd("Read AC97 reg 0x%x got 0x%x\n", reg, rptr.retwords[1]); | ||
1790 | return rptr.retwords[1]; | ||
1791 | } | ||
1792 | |||
1793 | static int snd_riptide_initialize(struct snd_riptide *chip) | ||
1794 | { | ||
1795 | struct cmdif *cif; | ||
1796 | unsigned int device_id; | ||
1797 | int err; | ||
1798 | |||
1799 | snd_assert(chip, return -EINVAL); | ||
1800 | |||
1801 | cif = chip->cif; | ||
1802 | if (!cif) { | ||
1803 | if ((cif = kzalloc(sizeof(struct cmdif), GFP_KERNEL)) == NULL) | ||
1804 | return -ENOMEM; | ||
1805 | cif->hwport = (struct riptideport *)chip->port; | ||
1806 | spin_lock_init(&cif->lock); | ||
1807 | chip->cif = cif; | ||
1808 | } | ||
1809 | cif->is_reset = 0; | ||
1810 | if ((err = riptide_reset(cif, chip)) != 0) | ||
1811 | return err; | ||
1812 | device_id = chip->device_id; | ||
1813 | switch (device_id) { | ||
1814 | case 0x4310: | ||
1815 | case 0x4320: | ||
1816 | case 0x4330: | ||
1817 | snd_printdd("Modem enable?\n"); | ||
1818 | SEND_SETDPLL(cif); | ||
1819 | break; | ||
1820 | } | ||
1821 | snd_printdd("Enabling MPU IRQs\n"); | ||
1822 | if (chip->rmidi) | ||
1823 | SET_EMPUIRQ(cif->hwport); | ||
1824 | return err; | ||
1825 | } | ||
1826 | |||
1827 | static int snd_riptide_free(struct snd_riptide *chip) | ||
1828 | { | ||
1829 | struct cmdif *cif; | ||
1830 | |||
1831 | snd_assert(chip, return 0); | ||
1832 | |||
1833 | if ((cif = chip->cif)) { | ||
1834 | SET_GRESET(cif->hwport); | ||
1835 | udelay(100); | ||
1836 | UNSET_GRESET(cif->hwport); | ||
1837 | kfree(chip->cif); | ||
1838 | } | ||
1839 | if (chip->fw_entry) | ||
1840 | release_firmware(chip->fw_entry); | ||
1841 | release_and_free_resource(chip->res_port); | ||
1842 | if (chip->irq >= 0) | ||
1843 | free_irq(chip->irq, chip); | ||
1844 | kfree(chip); | ||
1845 | return 0; | ||
1846 | } | ||
1847 | |||
1848 | static int snd_riptide_dev_free(struct snd_device *device) | ||
1849 | { | ||
1850 | struct snd_riptide *chip = device->device_data; | ||
1851 | |||
1852 | return snd_riptide_free(chip); | ||
1853 | } | ||
1854 | |||
1855 | static int __devinit | ||
1856 | snd_riptide_create(struct snd_card *card, struct pci_dev *pci, | ||
1857 | struct snd_riptide **rchip) | ||
1858 | { | ||
1859 | struct snd_riptide *chip; | ||
1860 | struct riptideport *hwport; | ||
1861 | int err; | ||
1862 | static struct snd_device_ops ops = { | ||
1863 | .dev_free = snd_riptide_dev_free, | ||
1864 | }; | ||
1865 | |||
1866 | *rchip = NULL; | ||
1867 | if ((err = pci_enable_device(pci)) < 0) | ||
1868 | return err; | ||
1869 | if (!(chip = kzalloc(sizeof(struct snd_riptide), GFP_KERNEL))) | ||
1870 | return -ENOMEM; | ||
1871 | |||
1872 | spin_lock_init(&chip->lock); | ||
1873 | chip->card = card; | ||
1874 | chip->pci = pci; | ||
1875 | chip->irq = -1; | ||
1876 | chip->openstreams = 0; | ||
1877 | chip->port = pci_resource_start(pci, 0); | ||
1878 | chip->received_irqs = 0; | ||
1879 | chip->handled_irqs = 0; | ||
1880 | chip->cif = NULL; | ||
1881 | tasklet_init(&chip->riptide_tq, riptide_handleirq, (unsigned long)chip); | ||
1882 | |||
1883 | if ((chip->res_port = | ||
1884 | request_region(chip->port, 64, "RIPTIDE")) == NULL) { | ||
1885 | snd_printk(KERN_ERR | ||
1886 | "Riptide: unable to grab region 0x%lx-0x%lx\n", | ||
1887 | chip->port, chip->port + 64 - 1); | ||
1888 | snd_riptide_free(chip); | ||
1889 | return -EBUSY; | ||
1890 | } | ||
1891 | hwport = (struct riptideport *)chip->port; | ||
1892 | UNSET_AIE(hwport); | ||
1893 | |||
1894 | if (request_irq | ||
1895 | (pci->irq, snd_riptide_interrupt, SA_INTERRUPT | SA_SHIRQ, | ||
1896 | "RIPTIDE", chip)) { | ||
1897 | snd_printk(KERN_ERR "Riptide: unable to grab IRQ %d\n", | ||
1898 | pci->irq); | ||
1899 | snd_riptide_free(chip); | ||
1900 | return -EBUSY; | ||
1901 | } | ||
1902 | chip->irq = pci->irq; | ||
1903 | chip->device_id = pci->device; | ||
1904 | pci_set_master(pci); | ||
1905 | if ((err = snd_riptide_initialize(chip)) < 0) { | ||
1906 | snd_riptide_free(chip); | ||
1907 | return err; | ||
1908 | } | ||
1909 | |||
1910 | if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) { | ||
1911 | snd_riptide_free(chip); | ||
1912 | return err; | ||
1913 | } | ||
1914 | |||
1915 | *rchip = chip; | ||
1916 | return 0; | ||
1917 | } | ||
1918 | |||
1919 | static void | ||
1920 | snd_riptide_proc_read(struct snd_info_entry *entry, | ||
1921 | struct snd_info_buffer *buffer) | ||
1922 | { | ||
1923 | struct snd_riptide *chip = entry->private_data; | ||
1924 | struct pcmhw *data; | ||
1925 | int i; | ||
1926 | struct cmdif *cif = NULL; | ||
1927 | unsigned char p[256]; | ||
1928 | unsigned short rval = 0, lval = 0; | ||
1929 | unsigned int rate; | ||
1930 | |||
1931 | if (!chip) | ||
1932 | return; | ||
1933 | |||
1934 | snd_iprintf(buffer, "%s\n\n", chip->card->longname); | ||
1935 | snd_iprintf(buffer, "Device ID: 0x%x\nReceived IRQs: (%ld)%ld\nPorts:", | ||
1936 | chip->device_id, chip->handled_irqs, chip->received_irqs); | ||
1937 | for (i = 0; i < 64; i += 4) | ||
1938 | snd_iprintf(buffer, "%c%02x: %08x", | ||
1939 | (i % 16) ? ' ' : '\n', i, inl(chip->port + i)); | ||
1940 | if ((cif = chip->cif)) { | ||
1941 | snd_iprintf(buffer, | ||
1942 | "\nVersion: ASIC: %d CODEC: %d AUXDSP: %d PROG: %d", | ||
1943 | chip->firmware.firmware.ASIC, | ||
1944 | chip->firmware.firmware.CODEC, | ||
1945 | chip->firmware.firmware.AUXDSP, | ||
1946 | chip->firmware.firmware.PROG); | ||
1947 | snd_iprintf(buffer, "\nDigital mixer:"); | ||
1948 | for (i = 0; i < 12; i++) { | ||
1949 | getmixer(cif, i, &rval, &lval); | ||
1950 | snd_iprintf(buffer, "\n %d: %d %d", i, rval, lval); | ||
1951 | } | ||
1952 | snd_iprintf(buffer, | ||
1953 | "\nARM Commands num: %d failed: %d time: %d max: %d min: %d", | ||
1954 | cif->cmdcnt, cif->errcnt, | ||
1955 | cif->cmdtime, cif->cmdtimemax, cif->cmdtimemin); | ||
1956 | } | ||
1957 | snd_iprintf(buffer, "\nOpen streams %d:\n", chip->openstreams); | ||
1958 | for (i = 0; i < PLAYBACK_SUBSTREAMS; i++) { | ||
1959 | if (chip->playback_substream[i] | ||
1960 | && chip->playback_substream[i]->runtime | ||
1961 | && (data = | ||
1962 | chip->playback_substream[i]->runtime->private_data)) { | ||
1963 | snd_iprintf(buffer, | ||
1964 | "stream: %d mixer: %d source: %d (%d,%d)\n", | ||
1965 | data->id, data->mixer, data->source, | ||
1966 | data->intdec[0], data->intdec[1]); | ||
1967 | if (!(getsamplerate(cif, data->intdec, &rate))) | ||
1968 | snd_iprintf(buffer, "rate: %d\n", rate); | ||
1969 | } | ||
1970 | } | ||
1971 | if (chip->capture_substream | ||
1972 | && chip->capture_substream->runtime | ||
1973 | && (data = chip->capture_substream->runtime->private_data)) { | ||
1974 | snd_iprintf(buffer, | ||
1975 | "stream: %d mixer: %d source: %d (%d,%d)\n", | ||
1976 | data->id, data->mixer, | ||
1977 | data->source, data->intdec[0], data->intdec[1]); | ||
1978 | if (!(getsamplerate(cif, data->intdec, &rate))) | ||
1979 | snd_iprintf(buffer, "rate: %d\n", rate); | ||
1980 | } | ||
1981 | snd_iprintf(buffer, "Paths:\n"); | ||
1982 | i = getpaths(cif, p); | ||
1983 | while (i--) { | ||
1984 | snd_iprintf(buffer, "%x->%x ", p[i - 1], p[i]); | ||
1985 | i--; | ||
1986 | } | ||
1987 | snd_iprintf(buffer, "\n"); | ||
1988 | } | ||
1989 | |||
1990 | static void __devinit snd_riptide_proc_init(struct snd_riptide *chip) | ||
1991 | { | ||
1992 | struct snd_info_entry *entry; | ||
1993 | |||
1994 | if (!snd_card_proc_new(chip->card, "riptide", &entry)) | ||
1995 | snd_info_set_text_ops(entry, chip, 4096, snd_riptide_proc_read); | ||
1996 | } | ||
1997 | |||
1998 | static int __devinit snd_riptide_mixer(struct snd_riptide *chip) | ||
1999 | { | ||
2000 | struct snd_ac97_bus *pbus; | ||
2001 | struct snd_ac97_template ac97; | ||
2002 | int err = 0; | ||
2003 | static struct snd_ac97_bus_ops ops = { | ||
2004 | .write = snd_riptide_codec_write, | ||
2005 | .read = snd_riptide_codec_read, | ||
2006 | }; | ||
2007 | |||
2008 | memset(&ac97, 0, sizeof(ac97)); | ||
2009 | ac97.private_data = chip; | ||
2010 | ac97.scaps = AC97_SCAP_SKIP_MODEM; | ||
2011 | |||
2012 | if ((err = snd_ac97_bus(chip->card, 0, &ops, chip, &pbus)) < 0) | ||
2013 | return err; | ||
2014 | |||
2015 | chip->ac97_bus = pbus; | ||
2016 | ac97.pci = chip->pci; | ||
2017 | if ((err = snd_ac97_mixer(pbus, &ac97, &chip->ac97)) < 0) | ||
2018 | return err; | ||
2019 | return err; | ||
2020 | } | ||
2021 | |||
2022 | #ifdef SUPPORT_JOYSTICK | ||
2023 | static int have_joystick; | ||
2024 | static struct pci_dev *riptide_gameport_pci; | ||
2025 | static struct gameport *riptide_gameport; | ||
2026 | |||
2027 | static int __devinit | ||
2028 | snd_riptide_joystick_probe(struct pci_dev *pci, const struct pci_device_id *id) | ||
2029 | { | ||
2030 | static int dev; | ||
2031 | |||
2032 | if (dev >= SNDRV_CARDS) | ||
2033 | return -ENODEV; | ||
2034 | if (!enable[dev]) { | ||
2035 | dev++; | ||
2036 | return -ENOENT; | ||
2037 | } | ||
2038 | |||
2039 | if (joystick_port[dev]) { | ||
2040 | riptide_gameport = gameport_allocate_port(); | ||
2041 | if (riptide_gameport) { | ||
2042 | if (!request_region | ||
2043 | (joystick_port[dev], 8, "Riptide gameport")) { | ||
2044 | snd_printk(KERN_WARNING | ||
2045 | "Riptide: cannot grab gameport 0x%x\n", | ||
2046 | joystick_port[dev]); | ||
2047 | gameport_free_port(riptide_gameport); | ||
2048 | riptide_gameport = NULL; | ||
2049 | } else { | ||
2050 | riptide_gameport_pci = pci; | ||
2051 | riptide_gameport->io = joystick_port[dev]; | ||
2052 | gameport_register_port(riptide_gameport); | ||
2053 | } | ||
2054 | } | ||
2055 | } | ||
2056 | dev++; | ||
2057 | return 0; | ||
2058 | } | ||
2059 | |||
2060 | static void __devexit snd_riptide_joystick_remove(struct pci_dev *pci) | ||
2061 | { | ||
2062 | if (riptide_gameport) { | ||
2063 | if (riptide_gameport_pci == pci) { | ||
2064 | release_region(riptide_gameport->io, 8); | ||
2065 | riptide_gameport_pci = NULL; | ||
2066 | gameport_unregister_port(riptide_gameport); | ||
2067 | riptide_gameport = NULL; | ||
2068 | } | ||
2069 | } | ||
2070 | } | ||
2071 | #endif | ||
2072 | |||
2073 | static int __devinit | ||
2074 | snd_card_riptide_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) | ||
2075 | { | ||
2076 | static int dev; | ||
2077 | struct snd_card *card; | ||
2078 | struct snd_riptide *chip; | ||
2079 | unsigned short addr; | ||
2080 | int err = 0; | ||
2081 | |||
2082 | if (dev >= SNDRV_CARDS) | ||
2083 | return -ENODEV; | ||
2084 | if (!enable[dev]) { | ||
2085 | dev++; | ||
2086 | return -ENOENT; | ||
2087 | } | ||
2088 | |||
2089 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); | ||
2090 | if (card == NULL) | ||
2091 | return -ENOMEM; | ||
2092 | if ((err = snd_riptide_create(card, pci, &chip)) < 0) { | ||
2093 | snd_card_free(card); | ||
2094 | return err; | ||
2095 | } | ||
2096 | card->private_data = chip; | ||
2097 | if ((err = snd_riptide_pcm(chip, 0, NULL)) < 0) { | ||
2098 | snd_card_free(card); | ||
2099 | return err; | ||
2100 | } | ||
2101 | if ((err = snd_riptide_mixer(chip)) < 0) { | ||
2102 | snd_card_free(card); | ||
2103 | return err; | ||
2104 | } | ||
2105 | pci_write_config_word(chip->pci, PCI_EXT_Legacy_Mask, LEGACY_ENABLE_ALL | ||
2106 | | (opl3_port[dev] ? LEGACY_ENABLE_FM : 0) | ||
2107 | #ifdef SUPPORT_JOYSTICK | ||
2108 | | (joystick_port[dev] ? LEGACY_ENABLE_GAMEPORT : | ||
2109 | 0) | ||
2110 | #endif | ||
2111 | | (mpu_port[dev] | ||
2112 | ? (LEGACY_ENABLE_MPU_INT | LEGACY_ENABLE_MPU) : | ||
2113 | 0) | ||
2114 | | ((chip->irq << 4) & 0xF0)); | ||
2115 | if ((addr = mpu_port[dev]) != 0) { | ||
2116 | pci_write_config_word(chip->pci, PCI_EXT_MPU_Base, addr); | ||
2117 | if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_RIPTIDE, | ||
2118 | addr, 0, chip->irq, 0, | ||
2119 | &chip->rmidi)) < 0) | ||
2120 | snd_printk(KERN_WARNING | ||
2121 | "Riptide: Can't Allocate MPU at 0x%x\n", | ||
2122 | addr); | ||
2123 | else | ||
2124 | chip->mpuaddr = addr; | ||
2125 | } | ||
2126 | if ((addr = opl3_port[dev]) != 0) { | ||
2127 | pci_write_config_word(chip->pci, PCI_EXT_FM_Base, addr); | ||
2128 | if ((err = snd_opl3_create(card, addr, addr + 2, | ||
2129 | OPL3_HW_RIPTIDE, 0, | ||
2130 | &chip->opl3)) < 0) | ||
2131 | snd_printk(KERN_WARNING | ||
2132 | "Riptide: Can't Allocate OPL3 at 0x%x\n", | ||
2133 | addr); | ||
2134 | else { | ||
2135 | chip->opladdr = addr; | ||
2136 | if ((err = | ||
2137 | snd_opl3_hwdep_new(chip->opl3, 0, 1, NULL)) < 0) | ||
2138 | snd_printk(KERN_WARNING | ||
2139 | "Riptide: Can't Allocate OPL3-HWDEP\n"); | ||
2140 | } | ||
2141 | } | ||
2142 | #ifdef SUPPORT_JOYSTICK | ||
2143 | if ((addr = joystick_port[dev]) != 0) { | ||
2144 | pci_write_config_word(chip->pci, PCI_EXT_Game_Base, addr); | ||
2145 | chip->gameaddr = addr; | ||
2146 | } | ||
2147 | #endif | ||
2148 | |||
2149 | strcpy(card->driver, "RIPTIDE"); | ||
2150 | strcpy(card->shortname, "Riptide"); | ||
2151 | #ifdef SUPPORT_JOYSTICK | ||
2152 | snprintf(card->longname, sizeof(card->longname), | ||
2153 | "%s at 0x%lx, irq %i mpu 0x%x opl3 0x%x gameport 0x%x", | ||
2154 | card->shortname, chip->port, chip->irq, chip->mpuaddr, | ||
2155 | chip->opladdr, chip->gameaddr); | ||
2156 | #else | ||
2157 | snprintf(card->longname, sizeof(card->longname), | ||
2158 | "%s at 0x%lx, irq %i mpu 0x%x opl3 0x%x", | ||
2159 | card->shortname, chip->port, chip->irq, chip->mpuaddr, | ||
2160 | chip->opladdr); | ||
2161 | #endif | ||
2162 | snd_riptide_proc_init(chip); | ||
2163 | if ((err = snd_card_register(card)) < 0) { | ||
2164 | snd_card_free(card); | ||
2165 | return err; | ||
2166 | } | ||
2167 | pci_set_drvdata(pci, card); | ||
2168 | dev++; | ||
2169 | return 0; | ||
2170 | } | ||
2171 | |||
2172 | static void __devexit snd_card_riptide_remove(struct pci_dev *pci) | ||
2173 | { | ||
2174 | snd_card_free(pci_get_drvdata(pci)); | ||
2175 | pci_set_drvdata(pci, NULL); | ||
2176 | } | ||
2177 | |||
2178 | static struct pci_driver driver = { | ||
2179 | .name = "RIPTIDE", | ||
2180 | .id_table = snd_riptide_ids, | ||
2181 | .probe = snd_card_riptide_probe, | ||
2182 | .remove = __devexit_p(snd_card_riptide_remove), | ||
2183 | #ifdef CONFIG_PM | ||
2184 | .suspend = riptide_suspend, | ||
2185 | .resume = riptide_resume, | ||
2186 | #endif | ||
2187 | }; | ||
2188 | |||
2189 | #ifdef SUPPORT_JOYSTICK | ||
2190 | static struct pci_driver joystick_driver = { | ||
2191 | .name = "Riptide Joystick", | ||
2192 | .id_table = snd_riptide_joystick_ids, | ||
2193 | .probe = snd_riptide_joystick_probe, | ||
2194 | .remove = __devexit_p(snd_riptide_joystick_remove), | ||
2195 | }; | ||
2196 | #endif | ||
2197 | |||
2198 | static int __init alsa_card_riptide_init(void) | ||
2199 | { | ||
2200 | int err; | ||
2201 | if ((err = pci_register_driver(&driver)) < 0) | ||
2202 | return err; | ||
2203 | #if defined(SUPPORT_JOYSTICK) | ||
2204 | if (pci_register_driver(&joystick_driver) < 0) { | ||
2205 | have_joystick = 0; | ||
2206 | snd_printk(KERN_INFO "no joystick found\n"); | ||
2207 | } else | ||
2208 | have_joystick = 1; | ||
2209 | #endif | ||
2210 | return 0; | ||
2211 | } | ||
2212 | |||
2213 | static void __exit alsa_card_riptide_exit(void) | ||
2214 | { | ||
2215 | pci_unregister_driver(&driver); | ||
2216 | #if defined(SUPPORT_JOYSTICK) | ||
2217 | if (have_joystick) | ||
2218 | pci_unregister_driver(&joystick_driver); | ||
2219 | #endif | ||
2220 | } | ||
2221 | |||
2222 | module_init(alsa_card_riptide_init); | ||
2223 | module_exit(alsa_card_riptide_exit); | ||
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c index 1957d29c119e..1e7398de2865 100644 --- a/sound/pci/via82xx.c +++ b/sound/pci/via82xx.c | |||
@@ -2373,6 +2373,7 @@ static int __devinit check_dxs_list(struct pci_dev *pci) | |||
2373 | { .subvendor = 0x161f, .subdevice = 0x2032, .action = VIA_DXS_48K }, /* m680x machines */ | 2373 | { .subvendor = 0x161f, .subdevice = 0x2032, .action = VIA_DXS_48K }, /* m680x machines */ |
2374 | { .subvendor = 0x1631, .subdevice = 0xe004, .action = VIA_DXS_ENABLE }, /* Easy Note 3174, Packard Bell */ | 2374 | { .subvendor = 0x1631, .subdevice = 0xe004, .action = VIA_DXS_ENABLE }, /* Easy Note 3174, Packard Bell */ |
2375 | { .subvendor = 0x1695, .subdevice = 0x3005, .action = VIA_DXS_ENABLE }, /* EPoX EP-8K9A */ | 2375 | { .subvendor = 0x1695, .subdevice = 0x3005, .action = VIA_DXS_ENABLE }, /* EPoX EP-8K9A */ |
2376 | { .subvendor = 0x1695, .subdevice = 0x300c, .action = VIA_DXS_SRC }, /* EPoX EP-8KRAI */ | ||
2376 | { .subvendor = 0x1695, .subdevice = 0x300e, .action = VIA_DXS_SRC }, /* EPoX 9HEAI */ | 2377 | { .subvendor = 0x1695, .subdevice = 0x300e, .action = VIA_DXS_SRC }, /* EPoX 9HEAI */ |
2377 | { .subvendor = 0x16f3, .subdevice = 0x6405, .action = VIA_DXS_SRC }, /* Jetway K8M8MS */ | 2378 | { .subvendor = 0x16f3, .subdevice = 0x6405, .action = VIA_DXS_SRC }, /* Jetway K8M8MS */ |
2378 | { .subvendor = 0x1734, .subdevice = 0x1078, .action = VIA_DXS_SRC }, /* FSC Amilo L7300 */ | 2379 | { .subvendor = 0x1734, .subdevice = 0x1078, .action = VIA_DXS_SRC }, /* FSC Amilo L7300 */ |