aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-08-05 05:17:04 -0400
committerTakashi Iwai <tiwai@suse.de>2010-08-05 05:17:04 -0400
commit74bf40f0793fed9e01eb6164c2ce63e8c27ca205 (patch)
treef41312c0943978842ac258873b29da04d72d0625 /Documentation
parente71981343ad29b5d929f82ac56c0b27b8ea0e540 (diff)
parentc4685849b4d725ab80cd29f5e09f5f128b4724b5 (diff)
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt167
-rw-r--r--Documentation/sound/alsa/Procfile.txt8
-rw-r--r--Documentation/sound/alsa/alsa-parameters.txt135
-rw-r--r--Documentation/sound/oss/oss-parameters.txt51
4 files changed, 200 insertions, 161 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 2b2407d9a6d0..0413f375c7b7 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -280,19 +280,12 @@ and is between 256 and 4096 characters. It is defined in the file
280 no: ACPI OperationRegions are not marked as reserved, 280 no: ACPI OperationRegions are not marked as reserved,
281 no further checks are performed. 281 no further checks are performed.
282 282
283 ad1848= [HW,OSS]
284 Format: <io>,<irq>,<dma>,<dma2>,<type>
285
286 add_efi_memmap [EFI; X86] Include EFI memory map in 283 add_efi_memmap [EFI; X86] Include EFI memory map in
287 kernel's map of available physical RAM. 284 kernel's map of available physical RAM.
288 285
289 advansys= [HW,SCSI] 286 advansys= [HW,SCSI]
290 See header of drivers/scsi/advansys.c. 287 See header of drivers/scsi/advansys.c.
291 288
292 aedsp16= [HW,OSS] Audio Excel DSP 16
293 Format: <io>,<irq>,<dma>,<mss_io>,<mpu_io>,<mpu_irq>
294 See also header of sound/oss/aedsp16.c.
295
296 agp= [AGP] 289 agp= [AGP]
297 { off | try_unsupported } 290 { off | try_unsupported }
298 off: disable AGP support 291 off: disable AGP support
@@ -311,6 +304,9 @@ and is between 256 and 4096 characters. It is defined in the file
311 aic79xx= [HW,SCSI] 304 aic79xx= [HW,SCSI]
312 See Documentation/scsi/aic79xx.txt. 305 See Documentation/scsi/aic79xx.txt.
313 306
307 ALSA [HW,ALSA]
308 See Documentation/sound/alsa/alsa-parameters.txt
309
314 alignment= [KNL,ARM] 310 alignment= [KNL,ARM]
315 Allow the default userspace alignment fault handler 311 Allow the default userspace alignment fault handler
316 behaviour to be specified. Bit 0 enables warnings, 312 behaviour to be specified. Bit 0 enables warnings,
@@ -655,8 +651,6 @@ and is between 256 and 4096 characters. It is defined in the file
655 Disable PIN 1 of APIC timer 651 Disable PIN 1 of APIC timer
656 Can be useful to work around chipset bugs. 652 Can be useful to work around chipset bugs.
657 653
658 dmasound= [HW,OSS] Sound subsystem buffers
659
660 dma_debug=off If the kernel is compiled with DMA_API_DEBUG support, 654 dma_debug=off If the kernel is compiled with DMA_API_DEBUG support,
661 this option disables the debugging code at boot. 655 this option disables the debugging code at boot.
662 656
@@ -1523,9 +1517,6 @@ and is between 256 and 4096 characters. It is defined in the file
1523 that the amount of memory usable for all allocations 1517 that the amount of memory usable for all allocations
1524 is not too small. 1518 is not too small.
1525 1519
1526 mpu401= [HW,OSS]
1527 Format: <io>,<irq>
1528
1529 MTD_Partition= [MTD] 1520 MTD_Partition= [MTD]
1530 Format: <name>,<region-number>,<size>,<offset> 1521 Format: <name>,<region-number>,<size>,<offset>
1531 1522
@@ -1849,9 +1840,6 @@ and is between 256 and 4096 characters. It is defined in the file
1849 For example, to override I2C bus2: 1840 For example, to override I2C bus2:
1850 omap_mux=i2c2_scl.i2c2_scl=0x100,i2c2_sda.i2c2_sda=0x100 1841 omap_mux=i2c2_scl.i2c2_scl=0x100,i2c2_sda.i2c2_sda=0x100
1851 1842
1852 opl3= [HW,OSS]
1853 Format: <io>
1854
1855 oprofile.timer= [HW] 1843 oprofile.timer= [HW]
1856 Use timer interrupt instead of performance counters 1844 Use timer interrupt instead of performance counters
1857 1845
@@ -1863,6 +1851,9 @@ and is between 256 and 4096 characters. It is defined in the file
1863 perfmon on Intel CPUs instead of the 1851 perfmon on Intel CPUs instead of the
1864 CPU specific event set. 1852 CPU specific event set.
1865 1853
1854 OSS [HW,OSS]
1855 See Documentation/sound/oss/oss-parameters.txt
1856
1866 osst= [HW,SCSI] SCSI Tape Driver 1857 osst= [HW,SCSI] SCSI Tape Driver
1867 Format: <buffer_size>,<write_threshold> 1858 Format: <buffer_size>,<write_threshold>
1868 See also Documentation/scsi/st.txt. 1859 See also Documentation/scsi/st.txt.
@@ -1899,9 +1890,6 @@ and is between 256 and 4096 characters. It is defined in the file
1899 Currently this function knows 686a and 8231 chips. 1890 Currently this function knows 686a and 8231 chips.
1900 Format: [spp|ps2|epp|ecp|ecpepp] 1891 Format: [spp|ps2|epp|ecp|ecpepp]
1901 1892
1902 pas2= [HW,OSS] Format:
1903 <io>,<irq>,<dma>,<dma16>,<sb_io>,<sb_irq>,<sb_dma>,<sb_dma16>
1904
1905 pas16= [HW,SCSI] 1893 pas16= [HW,SCSI]
1906 See header of drivers/scsi/pas16.c. 1894 See header of drivers/scsi/pas16.c.
1907 1895
@@ -2171,10 +2159,6 @@ and is between 256 and 4096 characters. It is defined in the file
2171 [HW,MOUSE] Controls Logitech smartscroll autorepeat. 2159 [HW,MOUSE] Controls Logitech smartscroll autorepeat.
2172 0 = disabled, 1 = enabled (default). 2160 0 = disabled, 1 = enabled (default).
2173 2161
2174 pss= [HW,OSS] Personal Sound System (ECHO ESC614)
2175 Format:
2176 <io>,<mss_io>,<mss_irq>,<mss_dma>,<mpu_io>,<mpu_irq>
2177
2178 pt. [PARIDE] 2162 pt. [PARIDE]
2179 See Documentation/blockdev/paride.txt. 2163 See Documentation/blockdev/paride.txt.
2180 2164
@@ -2383,128 +2367,6 @@ and is between 256 and 4096 characters. It is defined in the file
2383 1: Fast pin select (default) 2367 1: Fast pin select (default)
2384 2: ATC IRMode 2368 2: ATC IRMode
2385 2369
2386 snd-ad1816a= [HW,ALSA]
2387
2388 snd-ad1848= [HW,ALSA]
2389
2390 snd-ali5451= [HW,ALSA]
2391
2392 snd-als100= [HW,ALSA]
2393
2394 snd-als4000= [HW,ALSA]
2395
2396 snd-azt2320= [HW,ALSA]
2397
2398 snd-cmi8330= [HW,ALSA]
2399
2400 snd-cmipci= [HW,ALSA]
2401
2402 snd-cs4231= [HW,ALSA]
2403
2404 snd-cs4232= [HW,ALSA]
2405
2406 snd-cs4236= [HW,ALSA]
2407
2408 snd-cs4281= [HW,ALSA]
2409
2410 snd-cs46xx= [HW,ALSA]
2411
2412 snd-dt019x= [HW,ALSA]
2413
2414 snd-dummy= [HW,ALSA]
2415
2416 snd-emu10k1= [HW,ALSA]
2417
2418 snd-ens1370= [HW,ALSA]
2419
2420 snd-ens1371= [HW,ALSA]
2421
2422 snd-es968= [HW,ALSA]
2423
2424 snd-es1688= [HW,ALSA]
2425
2426 snd-es18xx= [HW,ALSA]
2427
2428 snd-es1938= [HW,ALSA]
2429
2430 snd-es1968= [HW,ALSA]
2431
2432 snd-fm801= [HW,ALSA]
2433
2434 snd-gusclassic= [HW,ALSA]
2435
2436 snd-gusextreme= [HW,ALSA]
2437
2438 snd-gusmax= [HW,ALSA]
2439
2440 snd-hdsp= [HW,ALSA]
2441
2442 snd-ice1712= [HW,ALSA]
2443
2444 snd-intel8x0= [HW,ALSA]
2445
2446 snd-interwave= [HW,ALSA]
2447
2448 snd-interwave-stb=
2449 [HW,ALSA]
2450
2451 snd-korg1212= [HW,ALSA]
2452
2453 snd-maestro3= [HW,ALSA]
2454
2455 snd-mpu401= [HW,ALSA]
2456
2457 snd-mtpav= [HW,ALSA]
2458
2459 snd-nm256= [HW,ALSA]
2460
2461 snd-opl3sa2= [HW,ALSA]
2462
2463 snd-opti92x-ad1848=
2464 [HW,ALSA]
2465
2466 snd-opti92x-cs4231=
2467 [HW,ALSA]
2468
2469 snd-opti93x= [HW,ALSA]
2470
2471 snd-pmac= [HW,ALSA]
2472
2473 snd-rme32= [HW,ALSA]
2474
2475 snd-rme96= [HW,ALSA]
2476
2477 snd-rme9652= [HW,ALSA]
2478
2479 snd-sb8= [HW,ALSA]
2480
2481 snd-sb16= [HW,ALSA]
2482
2483 snd-sbawe= [HW,ALSA]
2484
2485 snd-serial= [HW,ALSA]
2486
2487 snd-sgalaxy= [HW,ALSA]
2488
2489 snd-sonicvibes= [HW,ALSA]
2490
2491 snd-sun-amd7930=
2492 [HW,ALSA]
2493
2494 snd-sun-cs4231= [HW,ALSA]
2495
2496 snd-trident= [HW,ALSA]
2497
2498 snd-usb-audio= [HW,ALSA,USB]
2499
2500 snd-via82xx= [HW,ALSA]
2501
2502 snd-virmidi= [HW,ALSA]
2503
2504 snd-wavefront= [HW,ALSA]
2505
2506 snd-ymfpci= [HW,ALSA]
2507
2508 softlockup_panic= 2370 softlockup_panic=
2509 [KNL] Should the soft-lockup detector generate panics. 2371 [KNL] Should the soft-lockup detector generate panics.
2510 2372
@@ -2519,9 +2381,6 @@ and is between 256 and 4096 characters. It is defined in the file
2519 spia_pedr= 2381 spia_pedr=
2520 spia_peddr= 2382 spia_peddr=
2521 2383
2522 sscape= [HW,OSS]
2523 Format: <io>,<irq>,<dma>,<mpu_io>,<mpu_irq>
2524
2525 st= [HW,SCSI] SCSI tape parameters (buffers, etc.) 2384 st= [HW,SCSI] SCSI tape parameters (buffers, etc.)
2526 See Documentation/scsi/st.txt. 2385 See Documentation/scsi/st.txt.
2527 2386
@@ -2661,10 +2520,6 @@ and is between 256 and 4096 characters. It is defined in the file
2661 to facilitate early boot debugging. 2520 to facilitate early boot debugging.
2662 See also Documentation/trace/events.txt 2521 See also Documentation/trace/events.txt
2663 2522
2664 trix= [HW,OSS] MediaTrix AudioTrix Pro
2665 Format:
2666 <io>,<irq>,<dma>,<dma2>,<sb_io>,<sb_irq>,<sb_dma>,<mpu_io>,<mpu_irq>
2667
2668 tsc= Disable clocksource-must-verify flag for TSC. 2523 tsc= Disable clocksource-must-verify flag for TSC.
2669 Format: <string> 2524 Format: <string>
2670 [x86] reliable: mark tsc clocksource as reliable, this 2525 [x86] reliable: mark tsc clocksource as reliable, this
@@ -2681,12 +2536,6 @@ and is between 256 and 4096 characters. It is defined in the file
2681 u14-34f= [HW,SCSI] UltraStor 14F/34F SCSI host adapter 2536 u14-34f= [HW,SCSI] UltraStor 14F/34F SCSI host adapter
2682 See header of drivers/scsi/u14-34f.c. 2537 See header of drivers/scsi/u14-34f.c.
2683 2538
2684 uart401= [HW,OSS]
2685 Format: <io>,<irq>
2686
2687 uart6850= [HW,OSS]
2688 Format: <io>,<irq>
2689
2690 uhash_entries= [KNL,NET] 2539 uhash_entries= [KNL,NET]
2691 Set number of hash buckets for UDP/UDP-Lite connections 2540 Set number of hash buckets for UDP/UDP-Lite connections
2692 2541
@@ -2852,9 +2701,6 @@ and is between 256 and 4096 characters. It is defined in the file
2852 overridden by individual drivers. 0 will hide 2701 overridden by individual drivers. 0 will hide
2853 cursors, 1 will display them. 2702 cursors, 1 will display them.
2854 2703
2855 waveartist= [HW,OSS]
2856 Format: <io>,<irq>,<dma>,<dma2>
2857
2858 wd33c93= [HW,SCSI] 2704 wd33c93= [HW,SCSI]
2859 See header of drivers/scsi/wd33c93.c. 2705 See header of drivers/scsi/wd33c93.c.
2860 2706
@@ -2887,5 +2733,4 @@ ______________________________________________________________________
2887 2733
2888TODO: 2734TODO:
2889 2735
2890 Add documentation for ALSA options.
2891 Add more DRM drivers. 2736 Add more DRM drivers.
diff --git a/Documentation/sound/alsa/Procfile.txt b/Documentation/sound/alsa/Procfile.txt
index 07301de12cc4..7fcd1ad96fcc 100644
--- a/Documentation/sound/alsa/Procfile.txt
+++ b/Documentation/sound/alsa/Procfile.txt
@@ -103,6 +103,8 @@ card*/pcm*/xrun_debug
103 bit 2 = Enable additional jiffies check 103 bit 2 = Enable additional jiffies check
104 bit 3 = Log hwptr update at each period interrupt 104 bit 3 = Log hwptr update at each period interrupt
105 bit 4 = Log hwptr update at each snd_pcm_update_hw_ptr() 105 bit 4 = Log hwptr update at each snd_pcm_update_hw_ptr()
106 bit 5 = Show last 10 positions on error
107 bit 6 = Do above only once
106 108
107 When the bit 0 is set, the driver will show the messages to 109 When the bit 0 is set, the driver will show the messages to
108 kernel log when an xrun is detected. The debug message is 110 kernel log when an xrun is detected. The debug message is
@@ -122,6 +124,12 @@ card*/pcm*/xrun_debug
122 Bits 3 and 4 are for logging the hwptr records. Note that 124 Bits 3 and 4 are for logging the hwptr records. Note that
123 these will give flood of kernel messages. 125 these will give flood of kernel messages.
124 126
127 When bit 5 is set, the driver logs the last 10 xrun errors and
128 the proc file shows each jiffies, position, period_size,
129 buffer_size, old_hw_ptr, and hw_ptr_base values.
130
131 When bit 6 is set, the full xrun log is shown only once.
132
125card*/pcm*/sub*/info 133card*/pcm*/sub*/info
126 The general information of this PCM sub-stream. 134 The general information of this PCM sub-stream.
127 135
diff --git a/Documentation/sound/alsa/alsa-parameters.txt b/Documentation/sound/alsa/alsa-parameters.txt
new file mode 100644
index 000000000000..0fa40679b080
--- /dev/null
+++ b/Documentation/sound/alsa/alsa-parameters.txt
@@ -0,0 +1,135 @@
1 ALSA Kernel Parameters
2 ~~~~~~~~~~~~~~~~~~~~~~
3
4See Documentation/kernel-parameters.txt for general information on
5specifying module parameters.
6
7This document may not be entirely up to date and comprehensive. The command
8"modinfo -p ${modulename}" shows a current list of all parameters of a loadable
9module. Loadable modules, after being loaded into the running kernel, also
10reveal their parameters in /sys/module/${modulename}/parameters/. Some of these
11parameters may be changed at runtime by the command
12"echo -n ${value} > /sys/module/${modulename}/parameters/${parm}".
13
14
15 snd-ad1816a= [HW,ALSA]
16
17 snd-ad1848= [HW,ALSA]
18
19 snd-ali5451= [HW,ALSA]
20
21 snd-als100= [HW,ALSA]
22
23 snd-als4000= [HW,ALSA]
24
25 snd-azt2320= [HW,ALSA]
26
27 snd-cmi8330= [HW,ALSA]
28
29 snd-cmipci= [HW,ALSA]
30
31 snd-cs4231= [HW,ALSA]
32
33 snd-cs4232= [HW,ALSA]
34
35 snd-cs4236= [HW,ALSA]
36
37 snd-cs4281= [HW,ALSA]
38
39 snd-cs46xx= [HW,ALSA]
40
41 snd-dt019x= [HW,ALSA]
42
43 snd-dummy= [HW,ALSA]
44
45 snd-emu10k1= [HW,ALSA]
46
47 snd-ens1370= [HW,ALSA]
48
49 snd-ens1371= [HW,ALSA]
50
51 snd-es968= [HW,ALSA]
52
53 snd-es1688= [HW,ALSA]
54
55 snd-es18xx= [HW,ALSA]
56
57 snd-es1938= [HW,ALSA]
58
59 snd-es1968= [HW,ALSA]
60
61 snd-fm801= [HW,ALSA]
62
63 snd-gusclassic= [HW,ALSA]
64
65 snd-gusextreme= [HW,ALSA]
66
67 snd-gusmax= [HW,ALSA]
68
69 snd-hdsp= [HW,ALSA]
70
71 snd-ice1712= [HW,ALSA]
72
73 snd-intel8x0= [HW,ALSA]
74
75 snd-interwave= [HW,ALSA]
76
77 snd-interwave-stb=
78 [HW,ALSA]
79
80 snd-korg1212= [HW,ALSA]
81
82 snd-maestro3= [HW,ALSA]
83
84 snd-mpu401= [HW,ALSA]
85
86 snd-mtpav= [HW,ALSA]
87
88 snd-nm256= [HW,ALSA]
89
90 snd-opl3sa2= [HW,ALSA]
91
92 snd-opti92x-ad1848=
93 [HW,ALSA]
94
95 snd-opti92x-cs4231=
96 [HW,ALSA]
97
98 snd-opti93x= [HW,ALSA]
99
100 snd-pmac= [HW,ALSA]
101
102 snd-rme32= [HW,ALSA]
103
104 snd-rme96= [HW,ALSA]
105
106 snd-rme9652= [HW,ALSA]
107
108 snd-sb8= [HW,ALSA]
109
110 snd-sb16= [HW,ALSA]
111
112 snd-sbawe= [HW,ALSA]
113
114 snd-serial= [HW,ALSA]
115
116 snd-sgalaxy= [HW,ALSA]
117
118 snd-sonicvibes= [HW,ALSA]
119
120 snd-sun-amd7930=
121 [HW,ALSA]
122
123 snd-sun-cs4231= [HW,ALSA]
124
125 snd-trident= [HW,ALSA]
126
127 snd-usb-audio= [HW,ALSA,USB]
128
129 snd-via82xx= [HW,ALSA]
130
131 snd-virmidi= [HW,ALSA]
132
133 snd-wavefront= [HW,ALSA]
134
135 snd-ymfpci= [HW,ALSA]
diff --git a/Documentation/sound/oss/oss-parameters.txt b/Documentation/sound/oss/oss-parameters.txt
new file mode 100644
index 000000000000..3ab391e7c295
--- /dev/null
+++ b/Documentation/sound/oss/oss-parameters.txt
@@ -0,0 +1,51 @@
1 OSS Kernel Parameters
2 ~~~~~~~~~~~~~~~~~~~~~
3
4See Documentation/kernel-parameters.txt for general information on
5specifying module parameters.
6
7This document may not be entirely up to date and comprehensive. The command
8"modinfo -p ${modulename}" shows a current list of all parameters of a loadable
9module. Loadable modules, after being loaded into the running kernel, also
10reveal their parameters in /sys/module/${modulename}/parameters/. Some of these
11parameters may be changed at runtime by the command
12"echo -n ${value} > /sys/module/${modulename}/parameters/${parm}".
13
14
15 ad1848= [HW,OSS]
16 Format: <io>,<irq>,<dma>,<dma2>,<type>
17
18 aedsp16= [HW,OSS] Audio Excel DSP 16
19 Format: <io>,<irq>,<dma>,<mss_io>,<mpu_io>,<mpu_irq>
20 See also header of sound/oss/aedsp16.c.
21
22 dmasound= [HW,OSS] Sound subsystem buffers
23
24 mpu401= [HW,OSS]
25 Format: <io>,<irq>
26
27 opl3= [HW,OSS]
28 Format: <io>
29
30 pas2= [HW,OSS] Format:
31 <io>,<irq>,<dma>,<dma16>,<sb_io>,<sb_irq>,<sb_dma>,<sb_dma16>
32
33 pss= [HW,OSS] Personal Sound System (ECHO ESC614)
34 Format:
35 <io>,<mss_io>,<mss_irq>,<mss_dma>,<mpu_io>,<mpu_irq>
36
37 sscape= [HW,OSS]
38 Format: <io>,<irq>,<dma>,<mpu_io>,<mpu_irq>
39
40 trix= [HW,OSS] MediaTrix AudioTrix Pro
41 Format:
42 <io>,<irq>,<dma>,<dma2>,<sb_io>,<sb_irq>,<sb_dma>,<mpu_io>,<mpu_irq>
43
44 uart401= [HW,OSS]
45 Format: <io>,<irq>
46
47 uart6850= [HW,OSS]
48 Format: <io>,<irq>
49
50 waveartist= [HW,OSS]
51 Format: <io>,<irq>,<dma>,<dma2>