summaryrefslogtreecommitdiffstats
path: root/sound/isa
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'topic/seq-kconfig-cleanup' into for-linusTakashi Iwai2009-06-101-9/+1
|\ | | | | | | | | * topic/seq-kconfig-cleanup: ALSA: clean up the logic for building sequencer modules
| * ALSA: clean up the logic for building sequencer modulesMichal Marek2009-05-291-9/+1
| | | | | | | | | | | | | | | | Instead of mangling the CONFIG_* variables in the makefiles over and over, set a few helper variables in Kconfig. Signed-off-by: Michal Marek <mmarek@suse.cz> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | Merge branch 'topic/section-fix' into for-linusTakashi Iwai2009-06-102-2/+2
|\ \ | | | | | | | | | | | | | | | | | | * topic/section-fix: ALSA: Add missing __devexit_p() markers ALSA: powermac - Replace the rest of __init* ALSA: sound/ppc: update annotations of serveral functions
| * | ALSA: Add missing __devexit_p() markersJean Delvare2009-06-042-2/+2
| |/ | | | | | | | | | | | | | | | | 3 ISA sound drivers lack their __devexit_p() markers, which would cause build failures when the kernel is built without hotplug support. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Kyle McMartin <kyle@mcmartin.ca> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | Merge branch 'topic/sc6000' into for-linusTakashi Iwai2009-06-102-30/+111
|\ \ | |/ |/| | | | | | | | | * topic/sc6000: ALSA: sc6000: enable joystick port ALSA: sc6000: fix older card initialization ALSA: sc6000: add support for SC-6600 and SC-7000
| * ALSA: sc6000: enable joystick portKrzysztof Helt2009-05-041-2/+7
| | | | | | | | | | | | | | | | | | Add module parameter to enable or disable joystick port (gameport) on the SC6600 and later cards. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: sc6000: fix older card initializationKrzysztof Helt2009-04-241-10/+12
| | | | | | | | | | | | | | | | The last patch to handle newer cards like SC7000 broke initialization of the SC6000. Fix this. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: sc6000: add support for SC-6600 and SC-7000Krzysztof Helt2009-04-142-30/+104
| | | | | | | | | | | | | | | | | | | | Add support for later cards based on CompuMedia ASC-9408 chipsets. These cards were produced by Gallant. This patch make the OSS aedsp16 driver redundant. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: Add missing SNDRV_PCM_INFO_BATCH flag to some driversTakashi Iwai2009-04-281-2/+4
| | | | | | | | | | | | | | Added SNDRV_PCM_INFO_BATCH flag to PCM info field of some drivers that really don't give the precise pointer value. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | Merge branch 'topic/memdup_user' into for-linusTakashi Iwai2009-04-153-24/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | * topic/memdup_user: ALSA: sound/pci: use memdup_user() ALSA: sound/usb: use memdup_user() ALSA: sound/isa: use memdup_user() ALSA: sound/core: use memdup_user()
| * | ALSA: sound/isa: use memdup_user()Li Zefan2009-04-143-24/+20
| |/ | | | | | | | | | | | | Remove open-coded memdup_user(). Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | Merge git://git.infradead.org/~dwmw2/firmware-2.6Linus Torvalds2009-04-103-2765/+0
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | * git://git.infradead.org/~dwmw2/firmware-2.6: qla1280: Fix off-by-some error in firmware loading. Add README.AddingFirmware file. Basically telling people not to. firmware: Remove newly-added slicoss and sxg firmware images firmware/WHENCE: Add missing origin information for Ambassador atmsar11.fw ALSA: wavefront - Always use request_firmware() Remove fdump tool for av7110 firmware firmware: convert av7110 driver to request_firmware() Partially revert "V4L/DVB (9533): cx88: Add support for TurboSight TBS8910 DVB-S PCI card" Revert "fix modules_install via NFS" Add-add conflicts in firmware/WHENCE fixed manually
| * ALSA: wavefront - Always use request_firmware()Takashi Iwai2009-04-063-2765/+0
| | | | | | | | | | | | | | Always use request_firmware() for loading yss225_registers image. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
* | ALSA: opl3sa2: add ZV port controlKrzysztof Helt2009-04-061-0/+1
|/ | | | | | | | | | | Add ZV port control switch. This patch is done after solution given in the ALSA bug #2872 report. The patch resolves the issue. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* Merge branch 'topic/sscape-fix' into for-linusTakashi Iwai2009-03-243-181/+96
|\
| * ALSA: sscape: drop redundant fields from soundscape structKrzysztof Helt2009-02-041-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>
| * ALSA: sscape: update Kconfig description about SoundScape cardsKrzysztof Helt2009-01-291-2/+5
| | | | | | | | | | | | The SoundScape driver handles more cards then described. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: sscape: use common MPU401 macrosKrzysztof Helt2009-01-211-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>
| * ALSA: wss-lib: remove "pops" before each played soundKrzysztof Helt2009-01-171-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>
| * ALSA: sscape: fix incorrect timeout after microcode uploadKrzysztof Helt2009-01-131-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>
| * ALSA: wss-lib: move AD1845 frequency setting into wss-libKrzysztof Helt2009-01-112-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>
* | Merge branch 'topic/msnd' into for-linusTakashi Iwai2009-03-2411-1/+3128
|\ \
| * | ALSA: msnd - Fix build error with CONFIG_PNP=nTakashi Iwai2009-02-041-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>
| * | ALSA: msnd: add module description and license for the snd-msnd-libKrzysztof Helt2009-02-021-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>
| * | ALSA: enable build of snd-msnd-* driversTakashi Iwai2009-01-281-1/+1
| | | | | | | | | | | | | | | | | | Added the missing msnd directory to Makefile. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: Turtle Beach Multisound Classic/Pinnacle driverKrzysztof Helt2009-01-2810-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>
* | | Merge branch 'topic/isa-misc' into for-linusTakashi Iwai2009-03-242-40/+120
|\ \ \
| * \ \ Merge branch 'fix/opl3sa2-suspend' into topic/isa-miscTakashi Iwai2009-03-171-6/+12
| |\ \ \
| * | | | ALSA: opl3sa2 fix irq releasing and short name of cardKrzysztof Helt2009-03-021-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>
| * | | | ALSA: ALS4000, slight mixer improvementsAndreas Mohr2009-02-231-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>
* | | | | Merge branch 'topic/cs423x-merge' into for-linusTakashi Iwai2009-03-2421-257/+339
|\ \ \ \ \
| * | | | | ALSA: cs4236 - Merge snd-cs4236-lib module into snd-cs4236Takashi Iwai2009-02-172-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>
| * | | | | ALSA: cs4236: cs4232 and cs4236 driver merge to solve PnP BIOS detectionKrzysztof Helt2009-02-165-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>
| * | | | | Merge branch 'topic/snd_card_new-err' into topic/cs423x-mergeTakashi Iwai2009-02-1625-158/+182
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| |
| * | | | ALSA: isa/*: Add missing KERN_* prefix to printkTakashi Iwai2009-02-057-37/+59
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | | ALSA: gus - Add missing KERN_* prefix to printkTakashi Iwai2009-02-055-18/+43
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | | ALSA: wss - Add missing KERN_* prefix to printkTakashi Iwai2009-02-051-23/+53
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | | ALSA: ess1688: fix OPL3 port settingKrzysztof Helt2009-01-301-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>
| * | | | ALSA: cmi8330: add MPU-401 supportKrzysztof Helt2009-01-292-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>
| * | | | ALSA: gus: update debug messagesKrzysztof Helt2009-01-291-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert some of them to snd_printdd() and update arguments to make them compilable. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | | ALSA: ad1816a: enable hardware timerKrzysztof Helt2009-01-212-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>
| * | | | ALSA: do not create OPL3 timers if there is no OPL3 irq wiredKrzysztof Helt2009-01-214-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>
| * | | | ALSA: cmi8330: add OPL3 supportKrzysztof Helt2009-01-212-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>
* | | | Merge branch 'topic/snd_card_new-err' into for-linusTakashi Iwai2009-03-2425-158/+182
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | ALSA: opti9xx - Fix build breakage by snd_card_create() conversionTakashi Iwai2009-01-141-0/+1
| | | | | | | | | | | | | | | | | | Add a missing variable declaration. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: Return proper error code at probe in sound/isa/*Takashi Iwai2009-01-126-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>
| * | ALSA: Convert to snd_card_create() in sound/isa/*Takashi Iwai2009-01-1225-100/+122
| |/ | | | | | | | | | | Convert from snd_card_new() to the new snd_card_create() function. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* / ALSA: opl3sa2 - Fix NULL dereference when suspending snd_opl3sa2Krzysztof Helt2009-03-171-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>
* Merge branch 'topic/pcsp-fix' into topic/miscTakashi Iwai2008-12-201-1/+1
|\
| * ALSA: gusextreme: Fix build errorsVille Syrjala2008-11-101-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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 01:23:08 +0000