summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-11-11ALSA: hda - hdmi: Add error-checking to some codec readsAnssi Hannula2-2/+8
Add error checks to HBR status reads (both generic and ATI/AMD) and ATI/AMD codec reads for ELD generation. Unchecked errors in these just caused more errors later on (invalid codec writes for the HBR ones and ELD parsing errors for the ATI/AMD ELD ones), but it is better to catch them earlier. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-11-11ALSA: usb: Fix wrong mapping of RLC and RRC channelsAnssi Hannula1-2/+2
According to USB Audio spec v2 bits 25 and 26 of bmChannelConfig are "Back Left of Center - BLC" and "Back Right of Center - BRC", respectively. They are currently assigned to ALSA channels BLC/BRC. However, the ALSA BLC/BRC are actually the rather nonsensical "bottom left center" and "bottom right center", so the channels will be assigned wrongly. The comments in the USB code are also similarly wrong, so this is not readily apparent without looking at the actual specification. Fix the channel mapping by mapping bits 25 and 26 to RLC (Rear Left Center) and RRC (Rear Right Center), respectively, instead. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-11-11ALSA: hda - hdmi: Use TFx channel positions instead of FxHAnssi Hannula1-3/+3
Channel map positions FLH, FCH, FRH duplicate positions TFL, TFC, TFR. Both are the speakers above the front speakers (CEA uses "high" and USB audio uses "top" nomenclature). Since the USB audio code has used the TFx positions since v3.8 (04324ccc75f96, "ALSA: usb-audio: add channel map support") but the HDMI code only just started using FxH in a5b7d510b2220cccb ("ALSA: hda - hdmi: Fix channel maps with less common speakers") which is not yet in any released kernel, standardize on TFx instead. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-11-11ALSA: sparc: fix missing unlock on error in snd_cs4231_playback_prepare()Wei Yongjun1-3/+8
Add the missing unlock before return from function snd_cs4231_playback_prepare() in the error handling case. Fixes: 5a19b178d7b4 ('ALSA: sparc/cs4231: Use WARN_ON() instead of BUG_ON()') Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-11-11ALSA: hda - Control SPDIF out pin on MacBookPro 11,2Takashi Iwai1-1/+55
The SPDIF output MBP11,2 requires the pin control to be set/cleared for turning on/off the optical SPDIF. The red light turns off only when the corresponding pin control is cleared (or powered to D3). Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=64401 Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-11-08Merge tag 'asoc-v3.13-fixes' of ↵Takashi Iwai126-867/+1049
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus ASoC: Updates for v3.13 Some additional fixes for v3.13, the majority of which are removals and downgrades of BUG()s from Takashi.
2013-11-08ALSA: hda/realtek - Add new codec ALC255/ALC3234 UAJ supportedKailang Yang1-7/+97
New codec ALC255/ALC3234 support multifunction jacks. It used for menual select the input device. Signed-off-by: Kailang Yang <kailang@realtek.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-11-08ALSA: hda - Apply MacBook fixups for CS4208 correctlyTakashi Iwai1-2/+25
The commit [8fe7b65ab465: ALSA: hda - Apply GPIO setup for MacBooks with CS4208] added a fixup entry matching with the vendor id 0x106b. This broke the fixups for previous MBA6,1 and 6,2, since the PCI SSID vendor id matches before evaluating the codec SSIDs. We had a similar issue on Mac with Sigmatel codecs, and solve this problem again similarly, by introducing a skeleton entry matching with the all MacBooks, then remap to the right one. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=64401 Fixes: 8fe7b65ab465 ('ALSA: hda - Apply GPIO setup for MacBooks with CS4208') Cc: <stable@vger.kernel.org> [v3.12+] Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-11-08Merge remote-tracking branch 'asoc/topic/wm8996' into asoc-nextMark Brown1-0/+2
2013-11-08Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-nextMark Brown1-110/+116
2013-11-08Merge remote-tracking branch 'asoc/topic/wm8400' into asoc-nextMark Brown1-75/+20
2013-11-08Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-nextMark Brown1-4/+4
2013-11-08Merge remote-tracking branch 'asoc/topic/warn' into asoc-nextMark Brown28-92/+138
2013-11-08Merge remote-tracking branch 'asoc/topic/twl6040' into asoc-nextMark Brown1-19/+7
2013-11-08Merge remote-tracking branch 'asoc/topic/twl4030' into asoc-nextMark Brown4-63/+70
2013-11-08Merge remote-tracking branch 'asoc/topic/tpa6130a2' into asoc-nextMark Brown2-9/+50
2013-11-08Merge remote-tracking branch 'asoc/topic/tlv320aic3x' into asoc-nextMark Brown2-121/+139
2013-11-08Merge remote-tracking branch 'asoc/topic/tlv320aic32x4' into asoc-nextMark Brown1-71/+30
2013-11-08Merge remote-tracking branch 'asoc/topic/tlv320aic26' into asoc-nextMark Brown2-116/+28
2013-11-08Merge remote-tracking branch 'asoc/topic/tlv320aic23' into asoc-nextMark Brown1-50/+34
2013-11-08Merge remote-tracking branch 'asoc/topic/tegra' into asoc-nextMark Brown6-28/+186
2013-11-08Merge remote-tracking branch 'asoc/topic/tas5086' into asoc-nextMark Brown1-62/+109
2013-11-08Merge remote-tracking branch 'asoc/topic/spear' into asoc-nextMark Brown2-22/+4
2013-11-08Merge remote-tracking branch 'asoc/topic/sn95031' into asoc-nextMark Brown1-15/+20
2013-11-08Merge remote-tracking branch 'asoc/topic/simple' into asoc-nextMark Brown1-0/+5
2013-11-08Merge remote-tracking branch 'asoc/topic/si476x' into asoc-nextMark Brown1-48/+16
2013-11-08Merge remote-tracking branch 'asoc/topic/samsung' into asoc-nextMark Brown3-19/+12
2013-11-08Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-nextMark Brown1-6/+25
2013-11-08Merge remote-tracking branch 'asoc/topic/rcar' into asoc-nextMark Brown11-197/+346
2013-11-08Merge remote-tracking branch 'asoc/topic/pxa' into asoc-nextMark Brown13-48/+46
2013-11-08Merge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-nextMark Brown1-0/+1
2013-11-08Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-nextMark Brown1-0/+1
2013-11-08Merge remote-tracking branch 'asoc/topic/mxs' into asoc-nextMark Brown4-22/+40
2013-11-08Merge remote-tracking branch 'asoc/topic/ml26124' into asoc-nextMark Brown1-0/+2
2013-11-08Merge remote-tracking branch 'asoc/topic/mc13783' into asoc-nextMark Brown4-61/+91
2013-11-08Merge remote-tracking branch 'asoc/topic/max9850' into asoc-nextMark Brown1-10/+29
2013-11-08Merge remote-tracking branch 'asoc/topic/max98095' into asoc-nextMark Brown1-296/+170
2013-11-08Merge remote-tracking branch 'asoc/topic/max98088' into asoc-nextMark Brown1-351/+273
2013-11-08Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-nextMark Brown5-28/+94
2013-11-08Merge remote-tracking branch 'asoc/topic/fsl' into asoc-nextMark Brown8-36/+28
2013-11-08Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-nextMark Brown1-1/+1
2013-11-08Merge remote-tracking branch 'asoc/topic/doc' into asoc-nextMark Brown5-66/+456
2013-11-08Merge remote-tracking branch 'asoc/topic/devm' into asoc-nextMark Brown12-52/+108
2013-11-08Merge remote-tracking branch 'asoc/topic/davinci' into asoc-nextMark Brown8-91/+382
2013-11-08Merge remote-tracking branch 'asoc/topic/cs42l73' into asoc-nextMark Brown4-90/+173
2013-11-08Merge remote-tracking branch 'asoc/topic/cs42l52' into asoc-nextMark Brown3-40/+57
2013-11-08Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-nextMark Brown1-0/+1
2013-11-08Merge remote-tracking branch 'asoc/topic/cq93vc' into asoc-nextMark Brown1-32/+14
2013-11-08Merge remote-tracking branch 'asoc/topic/core' into asoc-nextMark Brown7-381/+177
2013-11-08Merge remote-tracking branch 'asoc/topic/component' into asoc-nextMark Brown2-104/+174