summaryrefslogtreecommitdiff
path: root/sound
AgeCommit message (Collapse)AuthorFilesLines
2009-03-28Merge branch 'origin' into develRussell King374-9311/+19781
Conflicts: sound/soc/pxa/pxa2xx-i2s.c
2009-03-27Merge branch 'for-linus' of ↵Linus Torvalds1-2/+2
git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: irq_node.handler() should return irqreturn_t m68k: section mismatch fixes: Atari SCSI m68k: section mismatch fixes: DMAsound for Atari MAINTAINERS: Replace dead link to m68k CVS repository by link to new git repository m68k: mac - Add SWIM floppy support m68k: mac - Add a new entry in mac_model to identify the floppy controller type. m68k: Add install target
2009-03-27Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6Linus Torvalds9-13/+16
* 'bkl-removal' of git://git.lwn.net/linux-2.6: Rationalize fasync return values Move FASYNC bit handling to f_op->fasync() Use f_lock to protect f_flags Rename struct file->f_ep_lock
2009-03-26m68k: section mismatch fixes: DMAsound for AtariMichael Schmitz1-2/+2
add __initdata to driver presets struct Signed-off-By: Michael Schmitz <schmitz@debian.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2009-03-26Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds1-0/+1
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (96 commits) sh: add support for SMSC Polaris platform sh: fix the HD64461 level-triggered interrupts handling sh: sh-rtc wakeup support sh: sh-rtc invalid time rework sh: sh-rtc carry interrupt rework sh: disallow kexec virtual entry sh: kexec jump: fix for ftrace. sh: kexec: Drop SR.BL bit toggling. sh: add kexec jump support sh: rework kexec segment code sh: simplify kexec vbr code sh: Flush only the needed range when unmapping a VMA. sh: Update debugfs ASID dumping for 16-bit ASID support. sh: tlb-pteaex: Kill off legacy PTEA updates. sh: Support for extended ASIDs on PTEAEX-capable SH-X3 cores. sh: sh7763rdp: Change IRQ number for sh_eth of sh7763rdp sh: espt-giga board support sh: dma: Make G2 DMA configurable. sh: dma: Make PVR2 DMA configurable. sh: Move IRQ multi definition of DMAC to defconfig ...
2009-03-25Merge branch 'for-next' of ↵Russell King6-24/+48
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
2009-03-24Merge branch 'topic/usb-caiaq' into for-linusTakashi Iwai5-11/+79
2009-03-24Merge branch 'topic/usb-audio' into for-linusTakashi Iwai5-105/+154
2009-03-24Merge branch 'topic/sscape-fix' into for-linusTakashi Iwai3-181/+96
2009-03-24Merge branch 'topic/powermac' into for-linusTakashi Iwai7-24/+95
2009-03-24Merge branch 'topic/pcxhr' into for-linusTakashi Iwai6-9/+90
2009-03-24Merge branch 'topic/oxygen' into for-linusTakashi Iwai7-115/+506
2009-03-24Merge branch 'topic/oss-fix' into for-linusTakashi Iwai5-14/+11
2009-03-24Merge branch 'topic/msnd' into for-linusTakashi Iwai11-1/+3128
2009-03-24Merge branch 'topic/isa-misc' into for-linusTakashi Iwai2-40/+120
2009-03-24Merge branch 'topic/intel8x0' into for-linusTakashi Iwai4-25/+72
2009-03-24Merge branch 'topic/ice' into for-linusTakashi Iwai4-26/+54
2009-03-24Merge branch 'topic/hdsp' into for-linusTakashi Iwai1-241/+265
2009-03-24Merge branch 'topic/hda' into for-linusTakashi Iwai15-1457/+2533
2009-03-24Merge branch 'topic/emu10k1' into for-linusTakashi Iwai7-50/+132
2009-03-24Merge branch 'topic/echoaudio' into for-linusTakashi Iwai14-64/+508
2009-03-24Merge branch 'topic/drop-l3' into for-linusTakashi Iwai6-1943/+0
2009-03-24Merge branch 'topic/cs423x-merge' into for-linusTakashi Iwai21-257/+339
2009-03-24Merge branch 'topic/ca0106' into for-linusTakashi Iwai1-0/+8
2009-03-24Merge branch 'topic/atmel' into for-linusTakashi Iwai7-1/+1632
2009-03-24Merge branch 'topic/asoc' into for-linusTakashi Iwai110-3534/+8411
2009-03-24Merge branch 'topic/aoa' into for-linusTakashi Iwai4-23/+99
2009-03-24Merge branch 'topic/misc' into for-linusTakashi Iwai58-275/+489
2009-03-24Merge branch 'topic/pcm-cleanup' into for-linusTakashi Iwai3-60/+102
2009-03-24Merge branch 'topic/vmaster-update' into for-linusTakashi Iwai1-19/+43
2009-03-24Merge branch 'topic/rawmidi-fix' into for-linusTakashi Iwai1-184/+195
2009-03-24Merge branch 'topic/ctl-list-cleanup' into for-linusTakashi Iwai1-27/+15
2009-03-24Merge branch 'topic/quirk-cleanup' into for-linusTakashi Iwai1-4/+6
2009-03-24Merge branch 'topic/jack' into for-linusTakashi Iwai1-24/+21
2009-03-24Merge branch 'topic/hwdep-cleanup' into for-linusTakashi Iwai9-112/+6
2009-03-24Merge branch 'topic/snd_card_new-err' into for-linusTakashi Iwai104-479/+560
2009-03-24ALSA: hda - Add quirk for Acer Ferrari 5000Takashi Iwai1-0/+1
Add a quirk model=acer-aspire for Acer Ferrari 5000 with ALC883 codec. Note that model=auto doesn't work for this laptop because of broken BIOS (that doesn't set the subsystem id properly). Tested-by: Russ Dill <russ.dill@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-03-23ALSA: hda - Use cached calls to get widget caps and pin capsTakashi Iwai2-4/+2
Replace with the standard function calls to use caches for reading the widget caps and pin caps. hda_proc.c is still using the direct verbs to get raw values as much as possible. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-03-23ALSA: hda - Don't create empty/single-item input sourceTakashi Iwai1-12/+35
In patch_realtek.c, don't create empty or single-item "Input Source" control elements that are simply superfluous. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-03-23ALSA: hda - Fix the wrong pin-cap check in patch_realtek.cTakashi Iwai1-11/+9
The check for the amp-output must be done for widget-caps rather than pin-caps as implemented in the recent change... Simply a thinko. Also, add the similar checks to all places that put output-amp mutes in the initialization. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-03-23ALSA: hda - Cache pin-cap valuesTakashi Iwai5-8/+24
Added snd_hda_query_pin_caps() to read and cache pin-cap values to avoid too frequently issuing the same verbs. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-03-23ALSA: hda - Avoid output amp manipulation to digital mic pinsTakashi Iwai1-1/+8
Don't set amp-out values to pins without PINCAP_OUT capability, which are usually assigned for digital mics on ALC663/ALC272. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-03-23ALSA: hda - Add function id to proc outputPascal de Bruijn3-5/+7
This patch does two things: Output Intel HDA Function Id in /proc/asound/cardX/codec#X Align Vendor/Subsystem/Revision Ids to 8 characters, front-padded with zeros Before: Vendor Id: 0x11d41884 Subsystem Id: 0x103c281a Revision Id: 0x100100 After: Function Id: 0x1 Vendor Id: 0x11d41884 Subsystem Id: 0x103c281a Revision Id: 0x0100100 As report on the Kernel Bugzilla #12888 Signed-off-by: Pascal de Bruijn <pascal@unilogicnetworks.net> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-03-20Merge branch 'topic/hda-optimize' into topic/hdaTakashi Iwai1-25/+54
2009-03-20ALSA: pcm - Safer boundary checksTakashi Iwai1-4/+5
Make the boundary checks a bit safer. These caese are rare or theoretically won't happen, but nothing bad to keep the checks safer... Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-03-20ALSA: hda - Detect digital-mic inputs on ALC663 / ALC272Takashi Iwai1-16/+47
Fix the detection of digital-mic inputs on ALC663 / ALC272 codecs in the auto-detection mode. The automatic mic switch via plugging isn't implemented yet, though. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-03-20ALSA: sound/ali5451: typo: s/resouces/resources/Wolfram Sang1-2/+2
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-03-19ALSA: hda - Don't show the current connection for power widgetsTakashi Iwai1-2/+4
The power-widgets have no connection selection, so skip the check in proc output, too. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-03-19ALSA: Fix wrong pointer to dev_err() in arm/pxa2xx-ac97-lib.cTakashi Iwai1-1/+1
Fix the wrong device pointer passed to dev_err(). Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-03-19ASoC: Declare Headset as Mic and Headphone widgets for SDP3430Lopez Cruz, Misael1-8/+16
Headset was declared previously as a Headphone widget connecting HSMIC and HSOL/HSOR pins of TWL4030 codec in SDP430 machine driver. The capture path becomes invalid as the Headphone widget is not a valid input endpoint. Instead of that, the Headset is declared as separate Microphone and Headphone widgets. Current patch modifies audio map: - Headset Mic: HSMIC with bias - Headset Stereophone: HSOL, HSOR Signed-off-by: Misael Lopez Cruz <x0052729@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>