summaryrefslogtreecommitdiffstats
path: root/sound/pci
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-linus' of ↵Linus Torvalds2011-07-251-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits) fs: Merge split strings treewide: fix potentially dangerous trailing ';' in #defined values/expressions uwb: Fix misspelling of neighbourhood in comment net, netfilter: Remove redundant goto in ebt_ulog_packet trivial: don't touch files that are removed in the staging tree lib/vsprintf: replace link to Draft by final RFC number doc: Kconfig: `to be' -> `be' doc: Kconfig: Typo: square -> squared doc: Konfig: Documentation/power/{pm => apm-acpi}.txt drivers/net: static should be at beginning of declaration drivers/media: static should be at beginning of declaration drivers/i2c: static should be at beginning of declaration XTENSA: static should be at beginning of declaration SH: static should be at beginning of declaration MIPS: static should be at beginning of declaration ARM: static should be at beginning of declaration rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check Update my e-mail address PCIe ASPM: forcedly -> forcibly gma500: push through device driver tree ... Fix up trivial conflicts: - arch/arm/mach-ep93xx/dma-m2p.c (deleted) - drivers/gpio/gpio-ep93xx.c (renamed and context nearby) - drivers/net/r8169.c (just context changes)
| * Merge branch 'master' into for-nextJiri Kosina2011-07-1110-45/+112
| |\ | | | | | | | | | | | | Sync with Linus' tree to be able to apply pending patches that are based on newer code already present upstream.
| * | treewide: transciever/transceiver spelling fixesJoe Perches2011-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | Just tyops. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | | Merge branch 'topic/hda' into for-linusTakashi Iwai2011-07-2229-21220/+18596
|\ \ \
| * | | ALSA: hda - Remove a superfluous argument of via_auto_init_output()Takashi Iwai2011-07-211-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | "force" argument is always true, so let's strip it off. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Fix indep-HP path (de-)activation for VT1708* codecsTakashi Iwai2011-07-211-40/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes non-working indep-HP control on VT1708* codecs. The problems are that via_independent_hp_put() wasn't fixed to follow the recent change of three HP paths, and hp_indep_path didn't contain the amp nids of mixer elements. Together with the fixes, a few code clean-ups are done. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Switch HP DAC dynamically with indep-HP switch for VIATakashi Iwai2011-07-181-34/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the behavior of independent-HP enum switch. Now instead of returning a busy error, the driver switches dynamically the stream of the HP (and shared) DACs according to the current mode. The logic is similar like the dual-mic ADC switch, but a bit more complicated because of the presence of shared DAC. Together with the change, a mutex is introduced to protect against the possible races for the indep-HP mode setting. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Implement dynamic loopback control for VIA codecsTakashi Iwai2011-07-181-140/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the dynamic control of analog-loopback for VIA codecs. When the loopback is enabled, the inputs from line-ins and mics are mixed with the front DAC, and sent to the front outputs. The very same input is routed to the headhpones and speakers in loopback mode. However, since the loopback mix can't take other than the front DAC, there is no longer individual volume controls for headphones and speakers. Once when the loopback control is off, these volumes take effect. Since the individual volumes are more desired in general use caess, the loopback mode is set to off as default for now. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Re-add need_dac_fix check for multi-io jacks of Realtek codecsTakashi Iwai2011-07-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During the rewrite, the check of spec->need_dac_fix and the corresponding num_dacs change was dropped from the channel-mode control. This patch re-adds it, and also enables need_dac_fix for ALC880 as default, as this feature was originally introduced to fix h/w bugs of this chip. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - fix up typos in Kconfig help for default buffer size introduced ↵Paul Menzel2011-07-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in acfa634f This commit is a fix up for commit acfa634f. commit acfa634f7e199193ec28282e82a5a6dd8edebcb7 Author: Takashi Iwai <tiwai@suse.de> Date: Tue Jul 12 17:27:46 2011 +0200 ALSA: hda - Add Kconfig for the default buffer size Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Add Kconfig for the default buffer sizeTakashi Iwai2011-07-122-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a Kconfig entry to specify the default buffer size. Distros using PulseAudio can choose a larger value here. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Expose secret DAC-AA connection of some VIA codecsTakashi Iwai2011-07-121-6/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VT1718S and co have a secret connection from DAC to AA-mix, which doesn't appear in the connection list obtained from the h/w. Currently the driver fixes the connection index locally at init, but now we can expose it statically via snd_hda_override_connections() so that this conection can be checked better by the parser in future. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Always read raw connections for proc outputTakashi Iwai2011-07-123-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In the codec proc outputs, read the raw connections instead of the cached connection list, i.e. proc files contain only raw values. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Add snd_hda_override_conn_list() helper functionTakashi Iwai2011-07-122-30/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a function to add/modify the connection-list cache entry. It'll be useful to fix a buggy hardware result. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Turn on extra EAPDs on Conexant codecsTakashi Iwai2011-07-111-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some machines seem to use EAPD control of the unused pin for controlling the overall EAPD. Since the driver currently doesn't check the EAPD of unused pins, the EAPD isn't enabled. For avoiding such a problem, turn all extra EAPDs on as default. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Preserve input pin-ctl bits in HP-automute for VIA codecTakashi Iwai2011-07-111-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For smart51 pins, we need to preserve the input pin-control bits at auto-mute controls instead of overwriting zero or pin-out-only. Otherwise the VREF won't be set properly when smart51 is disabled again. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Set line-out pin-ctls properly when indep-HP mode changesTakashi Iwai2011-07-111-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Independent-HP mode is changed for VIA, the driver needs to re-issue the auto-mute check so that the line-out pins are set properly without influence of HP pin state. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Via Fix speaker-mute checks in VIA driverTakashi Iwai2011-07-111-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the line-jack is plugged/unplugged, the driver must check also the headphone jack state in addition to the line-out jack. Currently it checks only the line-out state and ignores the headphone. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Implement 44kHz workaround for IdeadPad as fixupTakashi Iwai2011-07-091-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of checking the model quirk, use a fixup table for workaround of 44kHz-fixed PCM for Lenovo IdeaPad with ALC269. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Merge alc*_parse_auto_config() functions in patch_realtek.cTakashi Iwai2011-07-081-526/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now all alc*_parse_auto_config() do almost same thing except for the NID list to ignore and the PINs for SSID-check, we can merge all these to a single function. A good amount of code reduction. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Merge ALC260 auto-parser codeTakashi Iwai2011-07-081-142/+11
| | | | | | | | | | | | | | | | | | | | | | | | Finally the last one. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Merge ALC269 parser codeTakashi Iwai2011-07-081-114/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One more code reduction. This codec has less DACs, thus the wiring to DAC can't be filled uniquely for all output pins, i.e. some outputs share the same volume control. Except for that, all seems working fine. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Merge ALC268/269 auto-parser codesTakashi Iwai2011-07-081-239/+26
| | | | | | | | | | | | | | | | | | | | | | | | Now coming to ALC268/269 parser codes. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Merge ALC861 auto-parser codeTakashi Iwai2011-07-081-187/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge more auto-parser code in patch_realtek.c, now for ALC861. The topology of this codec is pretty simple, and can be parsed well by the current starndard parser. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Fix amp-cap checks in patch_realtek.cTakashi Iwai2011-07-081-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | query_amp_caps() may return non-zero if the amp cap isn't supported by the codec. Thus one needs to check widget-caps first, then check the corresponding amp-caps. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Merge ALC861-VD auto-parse to the standard parserTakashi Iwai2011-07-081-138/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing standard auto-parser can work well with this codec, too. Let's merge. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Fix auto-mic detection in Realtek codec-parserTakashi Iwai2011-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A regression fix from commit 21268961d3d1bbdd22a19b68adb80119e8c72dcd ALSA: hda - More flexible dynamic-ADC switching for Realtek codecs The auto-mic wasn't detected properly when no ADC-switch is needed. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Fix output-path of VT1812 codecLydia Wang2011-07-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For VT1812, add dac_mixer_idx for initialization. Signed-off-by: Lydia Wang <lydiawang@viatech.com.cn> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Fix Oops in smart51 parsing in VIA codecTakashi Iwai2011-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Typical off-by-one thinko. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Provide the standard auto_init for Realtek codecsTakashi Iwai2011-07-081-84/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove redundant definitions. Ideally, all init functions should be identical in future. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Merge ALC680 auto-parser to the standard parserTakashi Iwai2011-07-081-141/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved the standard Realtek auto-parser to support the codec topology like ALC680. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Add a fix-up for HP RP5800Takashi Iwai2011-07-081-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | The BIOS provides bogus pin configs, and also invalid SSID. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Fix Independent-HP detection on VT2002P/1802/1812 codecsLydia Wang2011-07-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For VT2002P, VT1802 and VT1812 codecs, to create Independent HP control. Signed-off-by: Lydia Wang <lydiawang@viatech.com.cn> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Fix DAC checks for VT2002P/1802/1812 codecsLydia Wang2011-07-081-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For VT2002P, VT1802 and VT1812 codecs, there're only two DACs. So smart51 control shouldn't be created. Signed-off-by: Lydia Wang <lydiawang@viatech.com.cn> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Fix VIA output-path init for VT2002P/1802/1812Lydia Wang2011-07-081-37/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For VT2002P, VT1802 and VT1812 codecs, the original activate_output_path() function can't initialize output and hp path correctly, since mixers connected to output pin widgets are not considered. So modify the activate_output_path() function to satisify this kind of codec. Signed-off-by: Lydia Wang <lydiawang@viatech.com.cn> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Split quirk codes from patch_realtek.cTakashi Iwai2011-07-0713-13921/+14124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put the all static quirk codes out of patch_realtek.c, split into the file for each codec model. For controlling the build of quirk codes, a new Kconfig, CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS is introduced. By setting this off, all quirk codes won't be built, thus you can save lots of memory. The codes in patch_realtek.c are also shuffled and more comments are given, but the contents aren't changed. This is just a refactoring. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Use common paser for digital I/O for ALC260Takashi Iwai2011-07-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Avoid open-codes. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - More flexible dynamic-ADC switching for Realtek codecsTakashi Iwai2011-07-071-486/+429
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the auto-parser and the auto-mic handling codes to allow more flexible dynamic ADC-switching with Realtek codecs. In the new code, the following strategy is taken: - When a cap-src can't handle all input-sources, either skip it, or switch to the ADC-switching mode. In ADC-switching mode, like the former dual-ADC mode for ALC275, it changes ADC on the fly according to the current input source. - When auto-mic is possible, always assign imux. If the mic pins are set statically via a quirk, rebuild imux according to the pins. In the auto-mic mode, the driver always changes the imux (although the imux isn't exposed as a mixer element). Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Fix warning with ALC882 digital-out detectionTakashi Iwai2011-07-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | The digital out pin on ALC882 may have multiple connections. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Clean-up PCM assignments in patch_realtek.cTakashi Iwai2011-07-071-171/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of assigning each default hda_pcm_stream pointers, do NULL-checks and assign default values in alc_build_pcms(). Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Unify alc*_auto_init_input_src() in patch_realtek.cTakashi Iwai2011-07-071-45/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only different implmentation was alc880_auto_init_input_src(), and now it covers this variant, and we can use the single function for all codecs. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Parse ADCs and CAPSRCs dynamically for Realtek auto-parserTakashi Iwai2011-07-071-192/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now with the new code for looking for ADCs and MUXs, we can replace the whole ADC assignment with the parsed results. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Unify alc_auto_init_analog_input() callsTakashi Iwai2011-07-071-23/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | All alc*_auto_init_analog_input() calls are identical, so let's use the same function more clearly without aliases. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Parse ADCs in alc_auto_create_input_ctls()Takashi Iwai2011-07-071-74/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parse ADCs and cap-srcs in alc_auto_create_input_ctls() by itself instead of passing explicitly from the caller. By this change, all alc*_auto_create_input_ctls() can be unified to the same calls. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Code consolidation for ALC88x and ALC662 auto-parsersTakashi Iwai2011-07-071-353/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the same common code for auto-parsing the output paths and their initializations, based on the existing ALC662 code, which is smarter than the old ALC880/2 code. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Create bind-mutes appropriately for ALC662 auto-parserTakashi Iwai2011-07-071-24/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When multiple inputs are present on the mixer widget (typically a DAC and a loopback), mute/unmute both inputs with the corresponding mixer element. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Initialize DACs in ALC662 auto-parser modeTakashi Iwai2011-07-071-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | The initialization of DACs was missing in ALC662 parser code. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Parse HP and speaker DACs even for multi connections for ALC662Takashi Iwai2011-07-071-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In alc662_auto_fill_dac_nids(), the HP and speaker DACs aren't parsed when the corresponding pins aren't fixed with single DACs. Now check these DACs even for non-fixed pins. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | Merge branch 'fix/hda' into topic/hdaTakashi Iwai2011-07-074-17/+30
| |\ \ \
| * | | | ALSA: hda - Add Realtek ALC269VC codec supportKailang Yang2011-07-061-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the support of ALC269VC codec. Also delete the unnecessary codec_variant type enum list: now only three variants (ALC269VA ALC269VB ALC269VC) are needed. In addition, added some aliases: - Add ALC269VB alias name ALC277 - Add ALC269VC alias name ALC259 ALC281X - Add ALC269VC for Lenovo device 0x21f3 name ALC3202 Signed-off-by: Kailang Yang <kailang@realtek.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>