aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/sound/alsa
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-02-16 17:17:33 -0500
committerTakashi Iwai <tiwai@suse.de>2009-02-16 17:17:33 -0500
commitc844a5d38e4247fc71e371221cf762a2a44d565b (patch)
tree35521fdfbb769d65831382c7f19e3b818b0bedd5 /Documentation/sound/alsa
parentc2b73d1458014a9f461b75bc1756a699a6c0781f (diff)
ALSA: Fix documentation for snd-cs4236 driver
Updated; removal of snd-cs4232 entry. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'Documentation/sound/alsa')
-rw-r--r--Documentation/sound/alsa/ALSA-Configuration.txt30
1 files changed, 5 insertions, 25 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index a763b76afe51..57fe4f3ca2c0 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -391,34 +391,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
391 391
392 The power-management is supported. 392 The power-management is supported.
393 393
394 Module snd-cs4232
395 -----------------
396
397 Module for sound cards based on CS4232/CS4232A ISA chips.
398
399 isapnp - ISA PnP detection - 0 = disable, 1 = enable (default)
400
401 with isapnp=0, the following options are available:
402
403 port - port # for CS4232 chip (PnP setup - 0x534)
404 cport - control port # for CS4232 chip (PnP setup - 0x120,0x210,0xf00)
405 mpu_port - port # for MPU-401 UART (PnP setup - 0x300), -1 = disable
406 fm_port - FM port # for CS4232 chip (PnP setup - 0x388), -1 = disable
407 irq - IRQ # for CS4232 chip (5,7,9,11,12,15)
408 mpu_irq - IRQ # for MPU-401 UART (9,11,12,15)
409 dma1 - first DMA # for CS4232 chip (0,1,3)
410 dma2 - second DMA # for Yamaha CS4232 chip (0,1,3), -1 = disable
411
412 This module supports multiple cards. This module does not support autoprobe
413 (if ISA PnP is not used) thus main port must be specified!!! Other ports are
414 optional.
415
416 The power-management is supported.
417
418 Module snd-cs4236 394 Module snd-cs4236
419 ----------------- 395 -----------------
420 396
421 Module for sound cards based on CS4235/CS4236/CS4236B/CS4237B/ 397 Module for sound cards based on CS4232/CS4232A,
398 CS4235/CS4236/CS4236B/CS4237B/
422 CS4238B/CS4239 ISA chips. 399 CS4238B/CS4239 ISA chips.
423 400
424 isapnp - ISA PnP detection - 0 = disable, 1 = enable (default) 401 isapnp - ISA PnP detection - 0 = disable, 1 = enable (default)
@@ -440,6 +417,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
440 417
441 The power-management is supported. 418 The power-management is supported.
442 419
420 This module is aliased as snd-cs4232 since it provides the old
421 snd-cs4232 functionality, too.
422
443 Module snd-cs4281 423 Module snd-cs4281
444 ----------------- 424 -----------------
445 425