diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 20:07:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 20:07:31 -0400 |
commit | faa38b5e0e092914764cdba9f83d31a3f794d182 (patch) | |
tree | b3e5921bdc36378033b4910eb4f29cb0dfc486e0 /Documentation/sound | |
parent | 78417334b5cb6e1f915b8fdcc4fce3f1a1b4420c (diff) | |
parent | 74bf40f0793fed9e01eb6164c2ce63e8c27ca205 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (214 commits)
ALSA: hda - Add pin-fix for HP dc5750
ALSA: als4000: Fix potentially invalid DMA mode setup
ALSA: als4000: enable burst mode
ALSA: hda - Fix initial capsrc selection in patch_alc269()
ASoC: TWL4030: Capture route runtime DAPM ordering fix
ALSA: hda - Add PC-beep whitelist for an Intel board
ALSA: hda - More relax for pending period handling
ALSA: hda - Define AC_FMT_* constants
ALSA: hda - Fix beep frequency on IDT 92HD73xx and 92HD71Bxx codecs
ALSA: hda - Add support for HDMI HBR passthrough
ALSA: hda - Set Stream Type in Stream Format according to AES0
ALSA: hda - Fix Thinkpad X300 so SPDIF is not exposed
ALSA: hda - FIX to not expose SPDIF on Thinkpad X301, since it does not have the ability to use SPDIF
ASoC: wm9081: fix resource reclaim in wm9081_register error path
ASoC: wm8978: fix a memory leak if a wm8978_register fail
ASoC: wm8974: fix a memory leak if another WM8974 is registered
ASoC: wm8961: fix resource reclaim in wm8961_register error path
ASoC: wm8955: fix resource reclaim in wm8955_register error path
ASoC: wm8940: fix a memory leak if wm8940_register return error
ASoC: wm8904: fix resource reclaim in wm8904_register error path
...
Diffstat (limited to 'Documentation/sound')
-rw-r--r-- | Documentation/sound/alsa/HD-Audio-Models.txt | 6 | ||||
-rw-r--r-- | Documentation/sound/alsa/Procfile.txt | 8 | ||||
-rw-r--r-- | Documentation/sound/alsa/alsa-parameters.txt | 135 | ||||
-rw-r--r-- | Documentation/sound/oss/oss-parameters.txt | 51 |
4 files changed, 200 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt index 1d38b0dfba95..03771d7c5dd7 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt | |||
@@ -114,6 +114,11 @@ ALC662/663/272 | |||
114 | samsung-nc10 Samsung NC10 mini notebook | 114 | samsung-nc10 Samsung NC10 mini notebook |
115 | auto auto-config reading BIOS (default) | 115 | auto auto-config reading BIOS (default) |
116 | 116 | ||
117 | ALC680 | ||
118 | ====== | ||
119 | base Base model (ASUS NX90) | ||
120 | auto auto-config reading BIOS (default) | ||
121 | |||
117 | ALC882/883/885/888/889 | 122 | ALC882/883/885/888/889 |
118 | ====================== | 123 | ====================== |
119 | 3stack-dig 3-jack with SPDIF I/O | 124 | 3stack-dig 3-jack with SPDIF I/O |
@@ -282,6 +287,7 @@ Conexant 5051 | |||
282 | hp HP Spartan laptop | 287 | hp HP Spartan laptop |
283 | hp-dv6736 HP dv6736 | 288 | hp-dv6736 HP dv6736 |
284 | hp-f700 HP Compaq Presario F700 | 289 | hp-f700 HP Compaq Presario F700 |
290 | ideapad Lenovo IdeaPad laptop | ||
285 | lenovo-x200 Lenovo X200 laptop | 291 | lenovo-x200 Lenovo X200 laptop |
286 | toshiba Toshiba Satellite M300 | 292 | toshiba Toshiba Satellite M300 |
287 | 293 | ||
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 | |||
125 | card*/pcm*/sub*/info | 133 | card*/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 | |||
4 | See Documentation/kernel-parameters.txt for general information on | ||
5 | specifying module parameters. | ||
6 | |||
7 | This 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 | ||
9 | module. Loadable modules, after being loaded into the running kernel, also | ||
10 | reveal their parameters in /sys/module/${modulename}/parameters/. Some of these | ||
11 | parameters 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 | |||
4 | See Documentation/kernel-parameters.txt for general information on | ||
5 | specifying module parameters. | ||
6 | |||
7 | This 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 | ||
9 | module. Loadable modules, after being loaded into the running kernel, also | ||
10 | reveal their parameters in /sys/module/${modulename}/parameters/. Some of these | ||
11 | parameters 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> | ||