summaryrefslogtreecommitdiff
path: root/sound/isa
AgeCommit message (Collapse)AuthorFilesLines
2009-03-24Merge branch 'topic/sscape-fix' into for-linusTakashi Iwai3-181/+96
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/cs423x-merge' into for-linusTakashi Iwai21-257/+339
2009-03-24Merge branch 'topic/snd_card_new-err' into for-linusTakashi Iwai25-158/+182
2009-03-17Merge branch 'fix/opl3sa2-suspend' into topic/isa-miscTakashi Iwai1-6/+12
2009-03-17ALSA: opl3sa2 - Fix NULL dereference when suspending snd_opl3sa2Krzysztof Helt1-6/+12
Fix the OOPS during a opl3sa2 card suspend and resume if the driver is loaded but the card is not found. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Cc: <stable@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-03-02ALSA: opl3sa2 fix irq releasing and short name of cardKrzysztof Helt1-2/+2
Two simple fixes: 1. Use the same pointer for the free_irq() and the request_irq() calls. 2. A short name of card is appended with '2' or '3' character depending on a detected chip. Remove the '2' character from the short name. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-02-23ALSA: ALS4000, slight mixer improvementsAndreas Mohr1-38/+118
- add 8kHz / 20 kHz low-pass filter switch control - add ALS4000 Mono capture route control - add annotations to specs pages - improve ALS4000 PM saved regs selection (remove SB dummy register, add missing ones) - add some missing ALS4000 register defines - constify two variables Signed-off-by: Andreas Mohr <andi@lisas.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-02-17ALSA: cs4236 - Merge snd-cs4236-lib module into snd-cs4236Takashi Iwai2-27/+3
Since cs4232 and cs4236 drivers are merged, there is no reason to keep snd-cs4236-lib module separately. Let's merge it into the main driver as well. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-02-17ALSA: cs4236: cs4232 and cs4236 driver merge to solve PnP BIOS detectionKrzysztof Helt5-106/+77
cs4232 and cs4236 driver merge to solve PnP BIOS detection. Also, the patch adds recognition if the chip is cs4236b+ or earlier part. This unifies drivers for both cs4232 and cs4236+ chips. It allows to use the PnP BIOS detection for the cs4236+ chips. Previously, only the snd-cs4232 could be detected by the PnP BIOS. The cs4232+ cards reports two separate PnP BIOS ids. The patch adds search for the second id to find out resources assigned to a control port. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-02-17Merge branch 'topic/snd_card_new-err' into topic/cs423x-mergeTakashi Iwai25-158/+182
2009-02-05ALSA: isa/*: Add missing KERN_* prefix to printkTakashi Iwai7-37/+59
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-02-05ALSA: gus - Add missing KERN_* prefix to printkTakashi Iwai5-18/+43
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-02-05ALSA: wss - Add missing KERN_* prefix to printkTakashi Iwai1-23/+53
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-02-04ALSA: msnd - Fix build error with CONFIG_PNP=nTakashi Iwai1-2/+5
sound/isa/msnd/msnd_pinnacle.c:891: error: 'isapnp' undeclared (first use in this function) Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-02-04ALSA: sscape: drop redundant fields from soundscape structKrzysztof Helt1-28/+16
The wss_base is disuised parameter for one function. It is converted to function parameter. The code_type is only set but never read. It is removed. The midi_vol is set only to 0 so it does not work as detection of change in midi volume. It is fixed. The xport variable is alias to the port[dev]. Use the port[dev] directly to increase readability. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-02-02ALSA: msnd: add module description and license for the snd-msnd-libKrzysztof Helt1-0/+3
The missing module license generates warning during module loading. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-01-30ALSA: ess1688: fix OPL3 port settingKrzysztof Helt1-7/+16
The ess1688 driver uses the same port for PCM audio (SB compatible) and OPL3 synthesis. It is not always right so allow to choose a different port for OPL3 synthesis. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-01-29ALSA: cmi8330: add MPU-401 supportKrzysztof Helt2-6/+37
Add MPU-401 port support for the chip. Also, update some error messages and description. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-01-29ALSA: gus: update debug messagesKrzysztof Helt1-9/+15
Convert some of them to snd_printdd() and update arguments to make them compilable. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-01-29ALSA: sscape: update Kconfig description about SoundScape cardsKrzysztof Helt1-2/+5
The SoundScape driver handles more cards then described. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-01-28ALSA: enable build of snd-msnd-* driversTakashi Iwai1-1/+1
Added the missing msnd directory to Makefile. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-01-28ALSA: Turtle Beach Multisound Classic/Pinnacle driverKrzysztof Helt10-0/+3121
This is driver for Turtle Beach Multisound cards: Classic, Fiji and Pinnacle. Tested pcm playback and recording and MIDI playback on Multisound Pinnacle. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-01-21ALSA: ad1816a: enable hardware timerKrzysztof Helt2-5/+7
Enable hardware timer with 10 usec resolution. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-01-21ALSA: do not create OPL3 timers if there is no OPL3 irq wiredKrzysztof Helt4-21/+4
Most cards have OPL3 FM synthetiser but they do not have OPL3 interrupt wired to a sound chip or CPU. Do not create OPL3 timers for such cards as the timers are useless witthout interrupt. This patch removes OPL3 timers for following alsa drivers: snd-ad1816a, snd-opti93x, snd-opti92x, snd-sc6000, snd-cmi8330. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-01-21ALSA: sscape: use common MPU401 macrosKrzysztof Helt1-8/+4
Remove local macros which redefines the common ones. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-01-21ALSA: cmi8330: add OPL3 supportKrzysztof Helt2-2/+29
Add OPL3 handling to the driver and volume control for FM synthesis. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-01-17ALSA: wss-lib: remove "pops" before each played soundKrzysztof Helt1-28/+13
A WSS codec is autocalibrated each time before playing sound. Do only one calibration during codec initialization. Complete snd_wss_calibrate_mute to mute loopback volume as well. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-01-14ALSA: opti9xx - Fix build breakage by snd_card_create() conversionTakashi Iwai1-0/+1
Add a missing variable declaration. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-01-13ALSA: sscape: fix incorrect timeout after microcode uploadKrzysztof Helt1-12/+12
A comment states that one should wait up to 5 secs while a waiting loop waits only 5 system ticks. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-01-12ALSA: Return proper error code at probe in sound/isa/*Takashi Iwai6-64/+65
Some drivers in sound/isa/* don't handle the error code properly from snd_card_create(). This patch fixes these places. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-01-12ALSA: Convert to snd_card_create() in sound/isa/*Takashi Iwai25-100/+122
Convert from snd_card_new() to the new snd_card_create() function. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-01-11ALSA: wss-lib: move AD1845 frequency setting into wss-libKrzysztof Helt2-105/+48
This is required to allow the sscape driver to autodetect installed codec. Also, do not create a timer if detected codec has no hardware timer (e.g. AD1848). Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Cc: Rene Herman Signed-off-by: Takashi Iwai <tiwai@suse.de>
2008-12-21Merge branch 'topic/pcsp-fix' into topic/miscTakashi Iwai1-1/+1
2008-12-11ALSA: sb8 - Fix a return code in the error pathTakashi Iwai1-1/+3
Fixed a compile warning below: sound/isa/sb/sb8.c: In function ‘snd_sb8_probe’: sound/isa/sb/sb8.c:104: warning: ‘err’ may be used uninitialized in this function by setting the return value correctly. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2008-11-10ALSA: gusextreme: Fix build errorsVille Syrjala1-1/+1
gusextreme depends on opl3 support. Add the approriate select to Kconfig. Also remove the unnecessary hwdep select. Relevant build errors: ERROR: "snd_opl3_hwdep_new" [sound/isa/gus/snd-gusextreme.ko] undefined! ERROR: "snd_opl3_create" [sound/isa/gus/snd-gusextreme.ko] undefined! Signed-off-by: Ville Syrjala <syrjala@sci.fi> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2008-11-03ALSA: remove direct access of dev->bus_id in sound/isa/*Takashi Iwai8-45/+34
Removed the direct accesses of dev->bus_id in sound/isa/* by replacement with dev_err() or dev_warn() functions. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2008-09-09ALSA: remove stale filesTakashi Iwai1-0/+0
Empty files remained likely due to wrong patching. Remove them now. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2008-08-29ALSA: remove obsolete *_FIRMARE_IN_KERNEL in isa/KconfigTakashi Iwai1-1/+1
Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2008-08-25ALSA: wss_lib: do not mess mixer settings during probeKrzysztof Helt1-5/+5
Use the wss_dout function which does not mess shadowed register values during chip probing. Otherwise, user ends up with stupid mixer settings after driver loading. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Acked-by: Rene Herman <rene.herman@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2008-08-25ALSA: snd-ad1816a: add different TerraTec EWS64 S modelRene Herman1-1/+3
Signed-off-by: Rene Herman <rene.herman@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2008-08-25ALSA: opl3sa2: replace nd_opl3sa2_info_xxx() with snd_wss_info_xxx()Krzysztof Helt1-27/+5
Replace snd_opl3sa2_info_xxx() with snd_wss_info_xxx(). Drop check of card->private_data which cannot be NULL if card is not NULL (spotted by Rene Herman). Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Reviewed-by: Rene Herman <rene.herman@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2008-08-25ALSA: wss_lib: snd_wss_calibrate_mute improvementKrzysztof Helt1-13/+13
Mute sound by setting mute bit without setting volume to 0. It makes both source code and binary shorter. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2008-08-25ALSA: opl3sa2: drop snd_card pointer from the snd_opl3sa2 structureKrzysztof Helt1-14/+19
Remove card pointer from the snd_opl3sa2 structure and break circular reference snd_card->snd_opl3sa2->snd_card. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Acked-by: Rene Herman <rene.herman@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2008-08-13ALSA: Kill snd_assert() in sound/isa/*Takashi Iwai18-42/+80
Kill snd_assert() in sound/isa/*, either removed or replaced with if () with snd_BUG_ON(). Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2008-08-13ALSA: wss_lib: missing closing brace in (ifdeffed out) debug function.Rene Herman1-1/+1
Signed-off-by: Rene Herman <rene.herman@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2008-08-06ALSA: wss_lib: rework snd_ad1848_probe()Rene Herman1-64/+69
Make snd_ad1848_probe() easier to follow. With an exception for only trying once as soon as the codec is out of init (which should be all that's needed) the detection logic should be unchanged. Signed-off-by: Rene Herman <rene.herman@gmail.com> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2008-08-06ALSA: wss_lib: fix AZT2320 probe.Rene Herman1-5/+7
After the transition from cs4321_lib to wss_lib, azt2320 probe visits snd_ad1848_probe during detection. It expects register 0 (LEFT_INPUT) to be able to retain the value 0xaa during detection but AZT2320 does not support MIC gain meaning it reads back as 0x8a instead. Signed-off-by: Rene Herman <rene.herman@gmail.com> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2008-08-06ALSA: snd-cs4236: add Techmakers MF-4236PW PnP card IDRene Herman1-0/+2
Add the Techmakers MF-4236PW (Crystal CX4236B-XQ3) PnP card ID. Signed-off-by: Rene Herman <rene.herman@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>