diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-27 12:33:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-27 12:33:01 -0400 |
commit | a7301fcc123a82baa0b9451612fd512a8f073e5a (patch) | |
tree | 409501aaea262e1a7726208458b7467b9186d36a /Documentation | |
parent | d3aa02695bec49cc4d2cc36df67c22a162e0f1a4 (diff) | |
parent | 1bb3e062d4006bda733e8a0023b83f90700f663f (diff) |
Merge tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Nothing too serious here: a couple of compress-offload core fixes,
Haswell HDMI audio fix, a fixup for new MacBook Airs and a few COEF
setups for ALC283 mic problems"
* tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda - Enable internal mic on a Thinkpad machine with ALC283
ALSA: hda - Fix Internal Mic boost can't control with ALC283
ALSA: hda - Add documentation for CS4208 fixups
ALSA: hda - Add fixup for MacBook Air 6,1 and 6,2 with CS4208 codec
ALSA : hda - not use assigned converters for all unused pins
ALSA: compress: Make sure we trigger STOP before closing the stream.
ALSA: compress: Fix compress device unregister.
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/sound/alsa/HD-Audio-Models.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt index a46ddb85e83a..f911e3656209 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt | |||
@@ -296,6 +296,12 @@ Cirrus Logic CS4206/4207 | |||
296 | imac27 IMac 27 Inch | 296 | imac27 IMac 27 Inch |
297 | auto BIOS setup (default) | 297 | auto BIOS setup (default) |
298 | 298 | ||
299 | Cirrus Logic CS4208 | ||
300 | =================== | ||
301 | mba6 MacBook Air 6,1 and 6,2 | ||
302 | gpio0 Enable GPIO 0 amp | ||
303 | auto BIOS setup (default) | ||
304 | |||
299 | VIA VT17xx/VT18xx/VT20xx | 305 | VIA VT17xx/VT18xx/VT20xx |
300 | ======================== | 306 | ======================== |
301 | auto BIOS setup (default) | 307 | auto BIOS setup (default) |