diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-22 16:00:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-22 16:00:13 -0400 |
commit | b2094ef840697bc8ca5d17a83b7e30fad5f1e9fa (patch) | |
tree | 64e5f7253b6a85b6d5d36f95c0d3c67c1798918d /Documentation/sound | |
parent | 424a6f6ef990b7e9f56f6627bfc6c46b493faeb4 (diff) | |
parent | 6681bc0deba495fad0d6fb349e40524abd1b1732 (diff) |
Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull updates of sound stuff from Takashi Iwai:
"Here is the first big update chunk of sound stuff for 3.4-rc1.
In the common sound infrastructure, there are a few changes for
dynamic PCM support (used in ASoC) and a few clean-ups. Majority of
changes are found, as usual, in HD-audio and ASoC.
Some highlights of HD-audio changes:
- All the long-standing static quirk codes for Realtek codec were
finally removed by fixing and extending the Realtek auto-parser.
- The mute-LED control is standardized over all HD-audio codec
drivers using the extended vmaster hook.
- The vmaster slave mixer elements are initialized to 0dB as default
so that the user won't be annoyed by the silent output after
updates, e.g. due to the additions of new elements.
- Other many fix-ups for the misc HD-audio devices.
In the ASoC side, this is a very active release, including a quite a
few framework enhancements. Some highlights:
- Support for widgets not associated with a CODEC, an important part
of the dynamic PCM framework.
- A library factoring out the common code shared by dmaengine based
DMA drivers contributed by Lars-Peter Clausen. This will save a
lot of code and make it much easier to deploy enhancements to
dmaengine.
- Support for binary controls, used for providing runtime
configuration of algorithm coefficients.
- A new DAPM widget type for regulator supplies allowing drivers for
devices that can power down unused supplies while active to do
without any per-driver code.
- DAPM widgets for DAIs, initially giving a speed boost for playback
startup and shutdown and also the basis for CODEC<->CODEC DAI link
support.
- Support for specifying the number of significant bits on audio
interfaces, useful for allowing applications to know how much
effort to put into generating data for a larger sample format.
- Conversion of the FSI driver used on some SH processors to
DMAEngine.
- Conversion of EP93xx drivers to DMAEngine.
- New CODEC drivers for Maxim MAX9768 and Wolfson Microelectronics
WM2200.
- Move audmux driver from arc/arm to sound/soc
- McBSP move from arch/ to sound/ and updates
Also, a few small updates and fixes for other drivers like au88x0,
ymfpci, USB 6fire, USB usx2yaudio are included."
* tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (446 commits)
ASoC: wm8994: Provide VMID mode control and fix default sequence
ASoC: wm8994: Add missing break in resume
ASoC: wm_hubs: Don't actively manage LINEOUT_VMID_BUF
ASoC: pxa-ssp: atomically set stream active masks
ASoC: fsl: p1022ds: tell the WM8776 codec driver that it's the master
ASoC: Samsung: Added to support mono recording
ALSA: hda - Fix build with CONFIG_PM=n
ALSA: au88x0 - Avoid possible Oops at unbinding
ALSA: usb-audio - Fix build error by consitification of rate list
ASoC: core: Fix obscure leak of runtime array
ALSA: pcm - Avoid GFP_ATOMIC in snd_pcm_link()
ALSA: pcm: Constify the list in snd_pcm_hw_constraint_list
ASoC: wm8996: Add 44.1kHz support
ALSA: hda - Fix build of patch_sigmatel.c without CONFIG_SND_HDA_POWER_SAVE
ASoC: mx27vis-aic32x4: Convert it to platform driver
ALSA: hda - fix printing of high HDMI sample rates
ALSA: ymfpci - Fix legacy registers on S3/S4 resume
ALSA: control - Fixe a trailing white space error
ALSA: hda - Add expose_enum_ctl flag to snd_hda_add_vmaster_hook()
ALSA: hda - Add "Mute-LED Mode" enum control
...
Diffstat (limited to 'Documentation/sound')
-rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 8 | ||||
-rw-r--r-- | Documentation/sound/alsa/HD-Audio-Models.txt | 79 | ||||
-rw-r--r-- | Documentation/sound/alsa/HD-Audio.txt | 7 |
3 files changed, 15 insertions, 79 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index 12e3a0fb9bec..6f75ba3b8a39 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
@@ -860,7 +860,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
860 | 860 | ||
861 | [Multiple options for each card instance] | 861 | [Multiple options for each card instance] |
862 | model - force the model name | 862 | model - force the model name |
863 | position_fix - Fix DMA pointer (0 = auto, 1 = use LPIB, 2 = POSBUF) | 863 | position_fix - Fix DMA pointer (0 = auto, 1 = use LPIB, 2 = POSBUF, |
864 | 3 = VIACOMBO, 4 = COMBO) | ||
864 | probe_mask - Bitmask to probe codecs (default = -1, meaning all slots) | 865 | probe_mask - Bitmask to probe codecs (default = -1, meaning all slots) |
865 | When the bit 8 (0x100) is set, the lower 8 bits are used | 866 | When the bit 8 (0x100) is set, the lower 8 bits are used |
866 | as the "fixed" codec slots; i.e. the driver probes the | 867 | as the "fixed" codec slots; i.e. the driver probes the |
@@ -925,6 +926,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
925 | (Usually SD_LPIB register is more accurate than the | 926 | (Usually SD_LPIB register is more accurate than the |
926 | position buffer.) | 927 | position buffer.) |
927 | 928 | ||
929 | position_fix=3 is specific to VIA devices. The position | ||
930 | of the capture stream is checked from both LPIB and POSBUF | ||
931 | values. position_fix=4 is a combination mode, using LPIB | ||
932 | for playback and POSBUF for capture. | ||
933 | |||
928 | NB: If you get many "azx_get_response timeout" messages at | 934 | NB: If you get many "azx_get_response timeout" messages at |
929 | loading, it's likely a problem of interrupts (e.g. ACPI irq | 935 | loading, it's likely a problem of interrupts (e.g. ACPI irq |
930 | routing). Try to boot with options like "pci=noacpi". Also, you | 936 | routing). Try to boot with options like "pci=noacpi". Also, you |
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt index c8c54544abc5..d97d992ced14 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt | |||
@@ -8,37 +8,10 @@ ALC880 | |||
8 | 5stack-digout 5-jack in back, 2-jack in front, a SPDIF out | 8 | 5stack-digout 5-jack in back, 2-jack in front, a SPDIF out |
9 | 6stack 6-jack in back, 2-jack in front | 9 | 6stack 6-jack in back, 2-jack in front |
10 | 6stack-digout 6-jack with a SPDIF out | 10 | 6stack-digout 6-jack with a SPDIF out |
11 | w810 3-jack | ||
12 | z71v 3-jack (HP shared SPDIF) | ||
13 | asus 3-jack (ASUS Mobo) | ||
14 | asus-w1v ASUS W1V | ||
15 | asus-dig ASUS with SPDIF out | ||
16 | asus-dig2 ASUS with SPDIF out (using GPIO2) | ||
17 | uniwill 3-jack | ||
18 | fujitsu Fujitsu Laptops (Pi1536) | ||
19 | F1734 2-jack | ||
20 | lg LG laptop (m1 express dual) | ||
21 | lg-lw LG LW20/LW25 laptop | ||
22 | tcl TCL S700 | ||
23 | clevo Clevo laptops (m520G, m665n) | ||
24 | medion Medion Rim 2150 | ||
25 | test for testing/debugging purpose, almost all controls can be | ||
26 | adjusted. Appearing only when compiled with | ||
27 | $CONFIG_SND_DEBUG=y | ||
28 | auto auto-config reading BIOS (default) | ||
29 | 11 | ||
30 | ALC260 | 12 | ALC260 |
31 | ====== | 13 | ====== |
32 | fujitsu Fujitsu S7020 | 14 | N/A |
33 | acer Acer TravelMate | ||
34 | will Will laptops (PB V7900) | ||
35 | replacer Replacer 672V | ||
36 | favorit100 Maxdata Favorit 100XS | ||
37 | basic fixed pin assignment (old default model) | ||
38 | test for testing/debugging purpose, almost all controls can | ||
39 | adjusted. Appearing only when compiled with | ||
40 | $CONFIG_SND_DEBUG=y | ||
41 | auto auto-config reading BIOS (default) | ||
42 | 15 | ||
43 | ALC262 | 16 | ALC262 |
44 | ====== | 17 | ====== |
@@ -70,55 +43,7 @@ ALC680 | |||
70 | 43 | ||
71 | ALC882/883/885/888/889 | 44 | ALC882/883/885/888/889 |
72 | ====================== | 45 | ====================== |
73 | 3stack-dig 3-jack with SPDIF I/O | 46 | N/A |
74 | 6stack-dig 6-jack digital with SPDIF I/O | ||
75 | arima Arima W820Di1 | ||
76 | targa Targa T8, MSI-1049 T8 | ||
77 | asus-a7j ASUS A7J | ||
78 | asus-a7m ASUS A7M | ||
79 | macpro MacPro support | ||
80 | mb5 Macbook 5,1 | ||
81 | macmini3 Macmini 3,1 | ||
82 | mba21 Macbook Air 2,1 | ||
83 | mbp3 Macbook Pro rev3 | ||
84 | imac24 iMac 24'' with jack detection | ||
85 | imac91 iMac 9,1 | ||
86 | w2jc ASUS W2JC | ||
87 | 3stack-2ch-dig 3-jack with SPDIF I/O (ALC883) | ||
88 | alc883-6stack-dig 6-jack digital with SPDIF I/O (ALC883) | ||
89 | 3stack-6ch 3-jack 6-channel | ||
90 | 3stack-6ch-dig 3-jack 6-channel with SPDIF I/O | ||
91 | 6stack-dig-demo 6-jack digital for Intel demo board | ||
92 | acer Acer laptops (Travelmate 3012WTMi, Aspire 5600, etc) | ||
93 | acer-aspire Acer Aspire 9810 | ||
94 | acer-aspire-4930g Acer Aspire 4930G | ||
95 | acer-aspire-6530g Acer Aspire 6530G | ||
96 | acer-aspire-7730g Acer Aspire 7730G | ||
97 | acer-aspire-8930g Acer Aspire 8930G | ||
98 | medion Medion Laptops | ||
99 | targa-dig Targa/MSI | ||
100 | targa-2ch-dig Targa/MSI with 2-channel | ||
101 | targa-8ch-dig Targa/MSI with 8-channel (MSI GX620) | ||
102 | laptop-eapd 3-jack with SPDIF I/O and EAPD (Clevo M540JE, M550JE) | ||
103 | lenovo-101e Lenovo 101E | ||
104 | lenovo-nb0763 Lenovo NB0763 | ||
105 | lenovo-ms7195-dig Lenovo MS7195 | ||
106 | lenovo-sky Lenovo Sky | ||
107 | haier-w66 Haier W66 | ||
108 | 3stack-hp HP machines with 3stack (Lucknow, Samba boards) | ||
109 | 6stack-dell Dell machines with 6stack (Inspiron 530) | ||
110 | mitac Mitac 8252D | ||
111 | clevo-m540r Clevo M540R (6ch + digital) | ||
112 | clevo-m720 Clevo M720 laptop series | ||
113 | fujitsu-pi2515 Fujitsu AMILO Pi2515 | ||
114 | fujitsu-xa3530 Fujitsu AMILO XA3530 | ||
115 | 3stack-6ch-intel Intel DG33* boards | ||
116 | intel-alc889a Intel IbexPeak with ALC889A | ||
117 | intel-x58 Intel DX58 with ALC889 | ||
118 | asus-p5q ASUS P5Q-EM boards | ||
119 | mb31 MacBook 3,1 | ||
120 | sony-vaio-tt Sony VAIO TT | ||
121 | auto auto-config reading BIOS (default) | ||
122 | 47 | ||
123 | ALC861/660 | 48 | ALC861/660 |
124 | ========== | 49 | ========== |
diff --git a/Documentation/sound/alsa/HD-Audio.txt b/Documentation/sound/alsa/HD-Audio.txt index 91fee3b45fb8..7813c06a5c71 100644 --- a/Documentation/sound/alsa/HD-Audio.txt +++ b/Documentation/sound/alsa/HD-Audio.txt | |||
@@ -59,7 +59,12 @@ a case, you can change the default method via `position_fix` option. | |||
59 | `position_fix=1` means to use LPIB method explicitly. | 59 | `position_fix=1` means to use LPIB method explicitly. |
60 | `position_fix=2` means to use the position-buffer. | 60 | `position_fix=2` means to use the position-buffer. |
61 | `position_fix=3` means to use a combination of both methods, needed | 61 | `position_fix=3` means to use a combination of both methods, needed |
62 | for some VIA and ATI controllers. 0 is the default value for all other | 62 | for some VIA controllers. The capture stream position is corrected |
63 | by comparing both LPIB and position-buffer values. | ||
64 | `position_fix=4` is another combination available for all controllers, | ||
65 | and uses LPIB for the playback and the position-buffer for the capture | ||
66 | streams. | ||
67 | 0 is the default value for all other | ||
63 | controllers, the automatic check and fallback to LPIB as described in | 68 | controllers, the automatic check and fallback to LPIB as described in |
64 | the above. If you get a problem of repeated sounds, this option might | 69 | the above. If you get a problem of repeated sounds, this option might |
65 | help. | 70 | help. |