diff options
Diffstat (limited to 'Documentation/sound')
-rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 58 | ||||
-rw-r--r-- | Documentation/sound/alsa/HD-Audio-Models.txt | 5 | ||||
-rw-r--r-- | Documentation/sound/alsa/HD-Audio.txt | 47 | ||||
-rw-r--r-- | Documentation/sound/alsa/soc/dapm.txt | 4 | ||||
-rw-r--r-- | Documentation/sound/alsa/soc/machine.txt | 2 | ||||
-rw-r--r-- | Documentation/sound/alsa/soc/overview.txt | 2 |
6 files changed, 95 insertions, 23 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index 8923597bd2bd..2075bbb8b3e2 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
@@ -227,6 +227,16 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
227 | 227 | ||
228 | The power-management is supported. | 228 | The power-management is supported. |
229 | 229 | ||
230 | Module snd-asihpi | ||
231 | ----------------- | ||
232 | |||
233 | Module for AudioScience ASI soundcards | ||
234 | |||
235 | enable_hpi_hwdep - enable HPI hwdep for AudioScience soundcard | ||
236 | |||
237 | This module supports multiple cards. | ||
238 | The driver requires the firmware loader support on kernel. | ||
239 | |||
230 | Module snd-atiixp | 240 | Module snd-atiixp |
231 | ----------------- | 241 | ----------------- |
232 | 242 | ||
@@ -482,6 +492,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
482 | 492 | ||
483 | reference_rate - reference sample rate, 44100 or 48000 (default) | 493 | reference_rate - reference sample rate, 44100 or 48000 (default) |
484 | multiple - multiple to ref. sample rate, 1 or 2 (default) | 494 | multiple - multiple to ref. sample rate, 1 or 2 (default) |
495 | subsystem - override the PCI SSID for probing; the value | ||
496 | consists of SSVID << 16 | SSDID. The default is | ||
497 | zero, which means no override. | ||
485 | 498 | ||
486 | This module supports multiple cards. | 499 | This module supports multiple cards. |
487 | 500 | ||
@@ -619,28 +632,23 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
619 | 632 | ||
620 | The power-management is supported. | 633 | The power-management is supported. |
621 | 634 | ||
622 | Module snd-es968 | ||
623 | ---------------- | ||
624 | |||
625 | Module for sound cards based on ESS ES968 chip (PnP only). | ||
626 | |||
627 | This module supports multiple cards, PnP and autoprobe. | ||
628 | |||
629 | The power-management is supported. | ||
630 | |||
631 | Module snd-es1688 | 635 | Module snd-es1688 |
632 | ----------------- | 636 | ----------------- |
633 | 637 | ||
634 | Module for ESS AudioDrive ES-1688 and ES-688 sound cards. | 638 | Module for ESS AudioDrive ES-1688 and ES-688 sound cards. |
635 | 639 | ||
636 | port - port # for ES-1688 chip (0x220,0x240,0x260) | 640 | isapnp - ISA PnP detection - 0 = disable, 1 = enable (default) |
637 | fm_port - port # for OPL3 (option; share the same port as default) | ||
638 | mpu_port - port # for MPU-401 port (0x300,0x310,0x320,0x330), -1 = disable (default) | 641 | mpu_port - port # for MPU-401 port (0x300,0x310,0x320,0x330), -1 = disable (default) |
639 | irq - IRQ # for ES-1688 chip (5,7,9,10) | ||
640 | mpu_irq - IRQ # for MPU-401 port (5,7,9,10) | 642 | mpu_irq - IRQ # for MPU-401 port (5,7,9,10) |
643 | fm_port - port # for OPL3 (option; share the same port as default) | ||
644 | |||
645 | with isapnp=0, the following additional options are available: | ||
646 | port - port # for ES-1688 chip (0x220,0x240,0x260) | ||
647 | irq - IRQ # for ES-1688 chip (5,7,9,10) | ||
641 | dma8 - DMA # for ES-1688 chip (0,1,3) | 648 | dma8 - DMA # for ES-1688 chip (0,1,3) |
642 | 649 | ||
643 | This module supports multiple cards and autoprobe (without MPU-401 port). | 650 | This module supports multiple cards and autoprobe (without MPU-401 port) |
651 | and PnP with the ES968 chip. | ||
644 | 652 | ||
645 | Module snd-es18xx | 653 | Module snd-es18xx |
646 | ----------------- | 654 | ----------------- |
@@ -1123,6 +1131,21 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
1123 | 1131 | ||
1124 | This module supports multiple cards, autoprobe and ISA PnP. | 1132 | This module supports multiple cards, autoprobe and ISA PnP. |
1125 | 1133 | ||
1134 | Module snd-jazz16 | ||
1135 | ------------------- | ||
1136 | |||
1137 | Module for Media Vision Jazz16 chipset. The chipset consists of 3 chips: | ||
1138 | MVD1216 + MVA416 + MVA514. | ||
1139 | |||
1140 | port - port # for SB DSP chip (0x210,0x220,0x230,0x240,0x250,0x260) | ||
1141 | irq - IRQ # for SB DSP chip (3,5,7,9,10,15) | ||
1142 | dma8 - DMA # for SB DSP chip (1,3) | ||
1143 | dma16 - DMA # for SB DSP chip (5,7) | ||
1144 | mpu_port - MPU-401 port # (0x300,0x310,0x320,0x330) | ||
1145 | mpu_irq - MPU-401 irq # (2,3,5,7) | ||
1146 | |||
1147 | This module supports multiple cards. | ||
1148 | |||
1126 | Module snd-korg1212 | 1149 | Module snd-korg1212 |
1127 | ------------------- | 1150 | ------------------- |
1128 | 1151 | ||
@@ -1791,6 +1814,13 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
1791 | 1814 | ||
1792 | The power-management is supported. | 1815 | The power-management is supported. |
1793 | 1816 | ||
1817 | Module snd-ua101 | ||
1818 | ---------------- | ||
1819 | |||
1820 | Module for the Edirol UA-101/UA-1000 audio/MIDI interfaces. | ||
1821 | |||
1822 | This module supports multiple devices, autoprobe and hotplugging. | ||
1823 | |||
1794 | Module snd-usb-audio | 1824 | Module snd-usb-audio |
1795 | -------------------- | 1825 | -------------------- |
1796 | 1826 | ||
@@ -1923,7 +1953,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
1923 | ------------------- | 1953 | ------------------- |
1924 | 1954 | ||
1925 | Module for sound cards based on the Asus AV100/AV200 chips, | 1955 | Module for sound cards based on the Asus AV100/AV200 chips, |
1926 | i.e., Xonar D1, DX, D2, D2X, HDAV1.3 (Deluxe), Essence ST | 1956 | i.e., Xonar D1, DX, D2, D2X, DS, HDAV1.3 (Deluxe), Essence ST |
1927 | (Deluxe) and Essence STX. | 1957 | (Deluxe) and Essence STX. |
1928 | 1958 | ||
1929 | This module supports autoprobe and multiple cards. | 1959 | This module supports autoprobe and multiple cards. |
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt index e72cee9e2a71..1d38b0dfba95 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt | |||
@@ -124,6 +124,8 @@ ALC882/883/885/888/889 | |||
124 | asus-a7m ASUS A7M | 124 | asus-a7m ASUS A7M |
125 | macpro MacPro support | 125 | macpro MacPro support |
126 | mb5 Macbook 5,1 | 126 | mb5 Macbook 5,1 |
127 | macmini3 Macmini 3,1 | ||
128 | mba21 Macbook Air 2,1 | ||
127 | mbp3 Macbook Pro rev3 | 129 | mbp3 Macbook Pro rev3 |
128 | imac24 iMac 24'' with jack detection | 130 | imac24 iMac 24'' with jack detection |
129 | imac91 iMac 9,1 | 131 | imac91 iMac 9,1 |
@@ -279,13 +281,16 @@ Conexant 5051 | |||
279 | laptop Basic Laptop config (default) | 281 | laptop Basic Laptop config (default) |
280 | hp HP Spartan laptop | 282 | hp HP Spartan laptop |
281 | hp-dv6736 HP dv6736 | 283 | hp-dv6736 HP dv6736 |
284 | hp-f700 HP Compaq Presario F700 | ||
282 | lenovo-x200 Lenovo X200 laptop | 285 | lenovo-x200 Lenovo X200 laptop |
286 | toshiba Toshiba Satellite M300 | ||
283 | 287 | ||
284 | Conexant 5066 | 288 | Conexant 5066 |
285 | ============= | 289 | ============= |
286 | laptop Basic Laptop config (default) | 290 | laptop Basic Laptop config (default) |
287 | dell-laptop Dell laptops | 291 | dell-laptop Dell laptops |
288 | olpc-xo-1_5 OLPC XO 1.5 | 292 | olpc-xo-1_5 OLPC XO 1.5 |
293 | ideapad Lenovo IdeaPad U150 | ||
289 | 294 | ||
290 | STAC9200 | 295 | STAC9200 |
291 | ======== | 296 | ======== |
diff --git a/Documentation/sound/alsa/HD-Audio.txt b/Documentation/sound/alsa/HD-Audio.txt index 6325bec06a72..bdafdbd32561 100644 --- a/Documentation/sound/alsa/HD-Audio.txt +++ b/Documentation/sound/alsa/HD-Audio.txt | |||
@@ -119,10 +119,18 @@ the codec slots 0 and 1 no matter what the hardware reports. | |||
119 | 119 | ||
120 | Interrupt Handling | 120 | Interrupt Handling |
121 | ~~~~~~~~~~~~~~~~~~ | 121 | ~~~~~~~~~~~~~~~~~~ |
122 | In rare but some cases, the interrupt isn't properly handled as | 122 | HD-audio driver uses MSI as default (if available) since 2.6.33 |
123 | default. You would notice this by the DMA transfer error reported by | 123 | kernel as MSI works better on some machines, and in general, it's |
124 | ALSA PCM core, for example. Using MSI might help in such a case. | 124 | better for performance. However, Nvidia controllers showed bad |
125 | Pass `enable_msi=1` option for enabling MSI. | 125 | regressions with MSI (especially in a combination with AMD chipset), |
126 | thus we disabled MSI for them. | ||
127 | |||
128 | There seem also still other devices that don't work with MSI. If you | ||
129 | see a regression wrt the sound quality (stuttering, etc) or a lock-up | ||
130 | in the recent kernel, try to pass `enable_msi=0` option to disable | ||
131 | MSI. If it works, you can add the known bad device to the blacklist | ||
132 | defined in hda_intel.c. In such a case, please report and give the | ||
133 | patch back to the upstream developer. | ||
126 | 134 | ||
127 | 135 | ||
128 | HD-AUDIO CODEC | 136 | HD-AUDIO CODEC |
@@ -196,7 +204,6 @@ generic parser regardless of the codec. Usually the codec-specific | |||
196 | parser is much better than the generic parser (as now). Thus this | 204 | parser is much better than the generic parser (as now). Thus this |
197 | option is more about the debugging purpose. | 205 | option is more about the debugging purpose. |
198 | 206 | ||
199 | |||
200 | Speaker and Headphone Output | 207 | Speaker and Headphone Output |
201 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 208 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
202 | One of the most frequent (and obvious) bugs with HD-audio is the | 209 | One of the most frequent (and obvious) bugs with HD-audio is the |
@@ -452,6 +459,33 @@ Similarly, the lines after `[verb]` are parsed as `init_verbs` | |||
452 | sysfs entries, and the lines after `[hint]` are parsed as `hints` | 459 | sysfs entries, and the lines after `[hint]` are parsed as `hints` |
453 | sysfs entries, respectively. | 460 | sysfs entries, respectively. |
454 | 461 | ||
462 | Another example to override the codec vendor id from 0x12345678 to | ||
463 | 0xdeadbeef is like below: | ||
464 | ------------------------------------------------------------------------ | ||
465 | [codec] | ||
466 | 0x12345678 0xabcd1234 2 | ||
467 | |||
468 | [vendor_id] | ||
469 | 0xdeadbeef | ||
470 | ------------------------------------------------------------------------ | ||
471 | |||
472 | In the similar way, you can override the codec subsystem_id via | ||
473 | `[subsystem_id]`, the revision id via `[revision_id]` line. | ||
474 | Also, the codec chip name can be rewritten via `[chip_name]` line. | ||
475 | ------------------------------------------------------------------------ | ||
476 | [codec] | ||
477 | 0x12345678 0xabcd1234 2 | ||
478 | |||
479 | [subsystem_id] | ||
480 | 0xffff1111 | ||
481 | |||
482 | [revision_id] | ||
483 | 0x10 | ||
484 | |||
485 | [chip_name] | ||
486 | My-own NEWS-0002 | ||
487 | ------------------------------------------------------------------------ | ||
488 | |||
455 | The hd-audio driver reads the file via request_firmware(). Thus, | 489 | The hd-audio driver reads the file via request_firmware(). Thus, |
456 | a patch file has to be located on the appropriate firmware path, | 490 | a patch file has to be located on the appropriate firmware path, |
457 | typically, /lib/firmware. For example, when you pass the option | 491 | typically, /lib/firmware. For example, when you pass the option |
@@ -565,6 +599,9 @@ probing, the proc file is available, so you can get the raw codec | |||
565 | information before modified by the driver. Of course, the driver | 599 | information before modified by the driver. Of course, the driver |
566 | isn't usable with `probe_only=1`. But you can continue the | 600 | isn't usable with `probe_only=1`. But you can continue the |
567 | configuration via hwdep sysfs file if hda-reconfig option is enabled. | 601 | configuration via hwdep sysfs file if hda-reconfig option is enabled. |
602 | Using `probe_only` mask 2 skips the reset of HDA codecs (use | ||
603 | `probe_only=3` as module option). The hwdep interface can be used | ||
604 | to determine the BIOS codec initialization. | ||
568 | 605 | ||
569 | 606 | ||
570 | hda-verb | 607 | hda-verb |
diff --git a/Documentation/sound/alsa/soc/dapm.txt b/Documentation/sound/alsa/soc/dapm.txt index 9ac842be9b4f..05bf5a0eee41 100644 --- a/Documentation/sound/alsa/soc/dapm.txt +++ b/Documentation/sound/alsa/soc/dapm.txt | |||
@@ -188,8 +188,8 @@ The WM8731 output mixer has 3 inputs (sources) | |||
188 | 3. Mic Sidetone Input | 188 | 3. Mic Sidetone Input |
189 | 189 | ||
190 | Each input in this example has a kcontrol associated with it (defined in example | 190 | Each input in this example has a kcontrol associated with it (defined in example |
191 | above) and is connected to the output mixer via it's kcontrol name. We can now | 191 | above) and is connected to the output mixer via its kcontrol name. We can now |
192 | connect the destination widget (wrt audio signal) with it's source widgets. | 192 | connect the destination widget (wrt audio signal) with its source widgets. |
193 | 193 | ||
194 | /* output mixer */ | 194 | /* output mixer */ |
195 | {"Output Mixer", "Line Bypass Switch", "Line Input"}, | 195 | {"Output Mixer", "Line Bypass Switch", "Line Input"}, |
diff --git a/Documentation/sound/alsa/soc/machine.txt b/Documentation/sound/alsa/soc/machine.txt index bab7711ce963..2524c75557df 100644 --- a/Documentation/sound/alsa/soc/machine.txt +++ b/Documentation/sound/alsa/soc/machine.txt | |||
@@ -67,7 +67,7 @@ static struct snd_soc_dai_link corgi_dai = { | |||
67 | .ops = &corgi_ops, | 67 | .ops = &corgi_ops, |
68 | }; | 68 | }; |
69 | 69 | ||
70 | struct snd_soc_card then sets up the machine with it's DAIs. e.g. | 70 | struct snd_soc_card then sets up the machine with its DAIs. e.g. |
71 | 71 | ||
72 | /* corgi audio machine driver */ | 72 | /* corgi audio machine driver */ |
73 | static struct snd_soc_card snd_soc_corgi = { | 73 | static struct snd_soc_card snd_soc_corgi = { |
diff --git a/Documentation/sound/alsa/soc/overview.txt b/Documentation/sound/alsa/soc/overview.txt index 1e4c6d3655f2..138ac88c1461 100644 --- a/Documentation/sound/alsa/soc/overview.txt +++ b/Documentation/sound/alsa/soc/overview.txt | |||
@@ -33,7 +33,7 @@ features :- | |||
33 | and machines. | 33 | and machines. |
34 | 34 | ||
35 | * Easy I2S/PCM audio interface setup between codec and SoC. Each SoC | 35 | * Easy I2S/PCM audio interface setup between codec and SoC. Each SoC |
36 | interface and codec registers it's audio interface capabilities with the | 36 | interface and codec registers its audio interface capabilities with the |
37 | core and are subsequently matched and configured when the application | 37 | core and are subsequently matched and configured when the application |
38 | hardware parameters are known. | 38 | hardware parameters are known. |
39 | 39 | ||