summaryrefslogtreecommitdiffstats
path: root/sound/pci/ice1712
Commit message (Collapse)AuthorAgeFilesLines
* dma-mapping: replace all DMA_28BIT_MASK macro with DMA_BIT_MASK(28)Yang Hongyang2009-04-071-2/+2
| | | | | | | | Replace all DMA_28BIT_MASK macro with DMA_BIT_MASK(28) Signed-off-by: Yang Hongyang<yanghy@cn.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Merge branch 'topic/ice' into for-linusTakashi Iwai2009-03-244-26/+54
|\
| * ALSA: Add missing KERN_* prefix to printk in sound/pci/ice1712Takashi Iwai2009-02-054-10/+27
| | | | | | | | Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: ice1724 - Dynamic MIDI TX irq controlTakashi Iwai2009-02-021-16/+27
| | | | | | | | | | | | | | | | | | MIDI_TX IRQ seems always pending when any bytes on FIFO is available. Thus, it's better to enable MPU_TX only when any bytres are really stored in the substream, and disables immediately when the queue becomes empty. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: Convert to snd_card_create() in sound/pci/*Takashi Iwai2009-01-122-6/+6
|/ | | | | | | Convert from snd_card_new() to the new snd_card_create() function in sound/pci/*. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: ice1724 - Fix a typo in IEC958 PCM nameAlan Horstmann2009-01-051-1/+1
| | | | | | | Fix trivial name string typo as reported in bug 2552. Signed-off-by: Alan Horstmann <gineera@aspect135.co.uk> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* Merge branch 'topic/fix/misc' into topic/miscTakashi Iwai2008-11-071-2/+4
|\
| * ALSA: sound/ice1712: indentation & braces disagree - add bracesIlpo Järvinen2008-10-301-2/+4
| | | | | | | | | | | | | | | | | | Neither has any significance currently to the flow because err is checked for the same condition before the place of disagreement. Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: ice1724 - Re-fix IRQ mask initializationTakashi Iwai2008-11-051-4/+4
| | | | | | | | | | | | | | The previous IRQ mask initialization was wrong. It must set the bits to be masked. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: ice1724 - Fix IRQ register initializationTakashi Iwai2008-11-011-6/+3
| | | | | | | | | | | | | | | | | | The IRQMASK register has to be set to zero expclitily at the initialization otherwise you'll get no interrupts properly at later operations. Also, removed the old commented out codes. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: ice1724 - Fix TX IRQ lockupTakashi Iwai2008-10-201-8/+12
|/ | | | | | | MPU TX causes IRQ floods on VT172x devices mysteriously. Disable TX IRQ if the IRQ flood is detected. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: ice1712.c: fix coding styleAlexander Beregalov2008-09-092-138/+151
| | | | | | | | | | | | | | | | before: total: 113 errors, 169 warnings, 2786 lines checked total: 26 errors, 24 warnings, 504 lines checked after: total: 14 errors, 163 warnings, 2799 lines checked total: 0 errors, 24 warnings, 504 lines checked Compile tested only. Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* ALSA: ice1724.c: fix coding styleAlexander Beregalov2008-09-091-84/+96
| | | | | | | | | | | | | | before: total: 96 errors, 66 warnings, 2612 lines checked after: total: 11 errors, 64 warnings, 2624 lines checked Compile tested only. Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* ALSA: ice1712/ice1724: Coding style fixes part 1 (more coming up)Vedran Miletic2008-09-096-128/+183
| | | | | | | | | | | | | | | | | Inspired by Alexander Beregalov's patches for wtm and aureon.c, I decided to run checkpatch on some more files. After some work checkpatch.pl-0.23 --no-tree --file --strict <file> reports 0 errors, 0 warnings, 0 checks, n lines checked for: phase.c phase.h juli.c (1 check about unused code, maybe we should comment it) juli.h (no changes necessary) In other files I have just fixed // comments and long lines along the way (but not all of them), more coming up. Signed-off-by: Vedran Miletic <rivanvx@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* ALSA: ice1712/wtm: fix coding styleAlexander Beregalov2008-09-092-54/+54
| | | | | | | | | | | | | | | | before: total: 2 errors, 0 warnings, 20 lines checked total: 49 errors, 2 warnings, 518 lines checked after: total: 0 errors, 0 warnings, 20 lines checked total: 0 errors, 0 warnings, 518 lines checked Compile tested, size and code are equal. Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* ALSA: ice1712/aureon.c: fix coding styleAlexander Beregalov2008-09-091-326/+351
| | | | | | | | | | | | | | | | before: total: 304 errors, 137 warnings, 2259 lines checked after: total: 0 errors, 121 warnings, 2284 lines checked Compile tested, size is different because of include was changed, but without that change md5sum is different because of cmp cx,dx/cmp dx,cx swap and __LINE__ was changed in printk function. Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* ALSA: ice1724 - limit channels for multi-channel playbackTakashi Iwai2008-09-041-2/+3
| | | | | | | | | Limit the available channels for multi-channel playback device to the real number of channels. Until now, always up to 8 channels are created, which are simply useless without the real outputs. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* ALSA: ice1724: Enable MIDI on TerraTec PHASE 22 and PHASE 28Vedran Miletic2008-09-041-6/+17
| | | | | | | | | | | | | | | | | Even though MIDI was fixed on ice1724 chips a while ago, it wasn't yet enabled for some cards as it didn't get enough testing. This was tested with MIDI keyboard on PHASE 22 and with looping back output to input and it works stable, so it's safe to enable it. Besides this, there are some more minor fixes, not exactly user visible: * added info about PHASE 28 (collected, as I don't have a card) * added info about TS22PCI and new revisions of PHASE 22 * disable 192k on PHASE 22 as AK4524 I2S doesn't support it * enable SPDIF reciever on PHASE 22 Signed-off-by: Vedran Miletic <rivanvx@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* ALSA: ice1724: enable MIDI on Terratec Aureon 7.1 UniverseMaximilian Rehkopf2008-09-041-2/+20
| | | | | | | | | | | | | This enables MIDI on Terratec Aureon 7.1 Universe cards specifically. Apparently the other envy24ht-based Aureon cards do not have MIDI ports, hence I added a Universe specific eeprom array. The newer cards (Aureon 7.1 PCI / 5.1 PCI/Fun) have MIDI but use a CMI DSP so this driver does not concern them at all. Signed-off-by: Maximilian Rehkopf <otakon@gmx.net> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* ALSA: revo51: add headphone outputAlexander Beregalov2008-08-251-2/+3
| | | | | | | | | It is ALSA bug #1754. D6 bit in 02 register is PW4. Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* ALSA: sound/pci: supported cards updateAlexander Beregalov2008-08-131-0/+1
| | | | | | | | sound/pci: supported cards update Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* ALSA: ice1724/revo: simple clean upAlexander Beregalov2008-08-131-4/+8
| | | | | | | | ice1724/revo: simple clean up Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* ALSA: Kill snd_assert() in sound/pci/*Takashi Iwai2008-08-135-7/+14
| | | | | | | | Kill snd_assert() in sound/pci/*, 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>
* ALSA: ice1724 - Support for Terrasoniq/MUSONIK TS22 PCI cardMisha Zhilin2008-08-012-1/+15
| | | | | | | | Added support for Terrasoniq/MUSONIK TS22 PCI card. Signed-off-by: Misha Zhilin <misha@epiphan.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* [ALSA] ice1724: fix MIDIClemens Ladisch2008-05-203-49/+176
| | | | | | | | | The VT1724 MIDI port is not MPU-401 compatible; remove the hacks that try to make the MPU-401 library work with it, and just use some simple device-specific code. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Tested-by: Pavel Hofman <pavel.hofman@insite.cz>
* [ALSA] ice1724 - Enable watermarksTakashi Iwai2008-04-291-2/+0
| | | | | | | | Enable watermarks settings (previously commented out) for MPU RX/TX. Otherwise irqs aren't issued properly. Tested-by: Pavel Hofman <pavel.hofman@insite.cz> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] Add MPU401_INFO_NO_ACK bitflagTakashi Iwai2008-04-291-0/+1
| | | | | | | | Added MPU401_INFO_NO_ACK bitflag to ignore the ACK check for UART commands. VT172x doesn't handle ACK commands, for example. Tested-by: Pavel Hofman <pavel.hofman@insite.cz> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] ice1724 - Fix IRQ lock-up with MPU accessTakashi Iwai2008-04-242-18/+81
| | | | | | | | The sound boards with VT1724 and compatible chips may lock up when MPU401 is accessed together with the PCM streaming. This patch fixes the problem. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] ice1712 - Add Terrasoniq TS88 supportPeter Lienig2008-04-242-1/+18
| | | | | | | Added the support of Terrasonq TS88. Signed-off-by: Peter Lienig <lienig@rheinmetall-de.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] Fix synchronize_irq() bugs, redundanciesJeff Garzik2008-04-242-6/+3
| | | | | | | | | | | | | | | | free_irq() calls synchronize_irq() for you, so there is no need for drivers to manually do the same thing (again). Thus, calls where sync-irq immediately precedes free-irq can be simplified. However, during this audit several bugs were noticed, where free-irq is preceded by a "irq >= 0" check... but the sync-irq call is not covered by the same check. So, where sync-irq could not be eliminated completely, the missing check was added. Signed-off-by: Jeff Garzik <jgarzik@redhat.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] Audiophile 192: Fix ad converter initializationKarsten Wiese2008-04-241-2/+2
| | | | | | | | Correct some arguments in calls to snd_ice1712_gpio_write_bits() from ap192_set_rate_val(). Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] Don't set gpio mask register in snd_ice1712_gpio_write_bits()Karsten Wiese2008-04-241-2/+6
| | | | | | | | | | Some calls to snd_ice1712_gpio_write() go wrong, if snd_ice1712_gpio_write_bits() ran before and changed the gpio mask register. Read the actual gpio value and combine it with the to be set bits in the cpu instead. Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] ice1724.c: toggle "chip reset" and "eeprom based setup" sequenceKarsten Wiese2008-04-241-3/+8
| | | | | | | | Let "chip reset" become first. Increasement of the "chip reset" related timeout leads to correctly read eeprom's contents here. Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] ice1724 - Improved the Juli rate settingPavel Hofman2008-04-243-195/+598
| | | | | | | | | * moving most of clock-specific code to card-specific routines * support for ESI Juli * to-be-researched - monitoring of analog/digital inputs Signed-off-by: Pavel Hofman <dustin@seznam.cz> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] ice1724 - Fix return codes in some pointis callbacksTakashi Iwai2008-04-241-2/+2
| | | | | | | Fixed the return codes (1 for changed values) in put callbacks of pontis. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] some fixes and cleanup for ICE1724 cardsPavel Hofman2008-04-242-23/+14
| | | | | | | | | * removing the hack with NON_AKM ak4xxx type * support for card-specific flags in ak4114_stats * definition of the flags for corresponding cards Signed-off-by: Pavel Hofman <dustin@seznam.cz> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] ice1724 - Fix the SPDIF input sample-rate on Juli@Takashi Iwai2008-04-242-0/+25
| | | | | | | | | AK4114 on Juli@ has the SPDIF input sample rate detection and causes errors when an incompatible sample rate is chosen. The patch adds the open hook to check the current rate and limit the hw constraints. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] sound: ice1712.c fix shadowed variable warningsHarvey Harrison2008-04-241-16/+24
| | | | | | | | | | | | | | | | | | In all four case, adding a private value to the iooff index, call it priv_idx. sound/pci/ice1712/ice1712.c:1300:6: warning: symbol 'index' shadows an earlier one sound/pci/ice1712/ice1712.c:85:12: originally declared here sound/pci/ice1712/ice1712.c:1312:6: warning: symbol 'index' shadows an earlier one sound/pci/ice1712/ice1712.c:85:12: originally declared here sound/pci/ice1712/ice1712.c:1338:6: warning: symbol 'index' shadows an earlier one sound/pci/ice1712/ice1712.c:85:12: originally declared here sound/pci/ice1712/ice1712.c:1350:6: warning: symbol 'index' shadows an earlier one sound/pci/ice1712/ice1712.c:85:12: originally declared here [tiwai - fixed coding issues as well] Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] ice1712 - added support for M-Audio Delta 66EJaroslav Kysela2008-04-242-3/+13
| | | | | | | See ALSA bug#3327 for more details. Experimental. Also fix support for M-Audio Delta 1010E - subdevice check. Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* [ALSA] Added support for Delta1010E (newer revisions of Delta1010)Jaroslav Kysela2008-04-242-0/+10
| | | | | | For more details, see ALSA bug#3327 . Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* [ALSA] ice1712 - Fix hoontech MIDI inputAlan Horstmann2008-04-241-3/+18
| | | | | | | | | Fixes the problems with Midi In on Hoontech/STA dsp24 cards, for example with DSP2000 box, without restricting the box configurations available. Also adds mpu_401 name strings. Signed-off-by: Alan Horstmann <gineera@aspect135.co.uk> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] ice1724 - Add ADC setup in set_rate callback for Audiophile192Takashi Iwai2008-04-241-8/+17
| | | | | | Added the missing GPIO setup for the AK5385A ADC codec on Audiophile192. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] ice1724 - Enable AK4114 support for Audiophile192Takashi Iwai2008-04-241-18/+8
| | | | | | Fixed and enabled the support of AK4114 chip on Audiophile192. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] sound: ice1712: unused structsHarvey Harrison2008-02-292-2/+2
| | | | | | | | | | Don't need to declare a struct when defining a structure layout. Both of these structs are unused. sound/pci/ice1712/revo.c:39:3: warning: symbol 'revo51' was not declared. Should it be static? sound/pci/ice1712/phase.c:54:3: warning: symbol 'phase28' was not declared. Should it be static? Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] ice1712, ice1724 - Code clean upTakashi Iwai2008-01-3112-407/+557
| | | | | | | | | Clean up ice1712/ice1724 codes. The board-specific data is allocated locally in each code instead of having an ungly union in struct ice1712. Also, fix coding issues in prodigy_hifi.c. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* [ALSA] ice1724 - Add missing prodigy_hifi.hJulian Scheel2008-01-311-0/+38
| | | | | | | Signed-off-by: Julian Scheel <julian@jusst.de> Signed-off-by: Konstantin Kletschke <konsti@ku-gbr.de> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* [ALSA] ice1712 - fixed midi input for Hoontech C-PortsJaroslav Kysela2008-01-311-3/+3
| | | | | | See ALSA bug#1846 for more details. Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* [ALSA] ICE1724: Added support for Audiotrak Prodigy 7.1 HiFi & HD2, Hercules ↵Julian Scheel2008-01-314-2/+1206
| | | | | | | | | | Fortissimo IV See ALSA bug#2384 for more details. Signed-off-by: Julian Scheel <julian@jusst.de> Signed-off-by: Konstantin Kletschke <konsti@ku-gbr.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* [ALSA] Remove sound/driver.hTakashi Iwai2008-01-3116-16/+0
| | | | | | | | | | | | This header file exists only for some hacks to adapt alsa-driver tree. It's useless for building in the kernel. Let's move a few lines in it to sound/core.h and remove it. With this patch, sound/driver.h isn't removed but has just a single compile warning to include it. This should be really killed in future. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* [ALSA] switching rate in STAC9460 codec of Prodigy192Pavel Hofman2008-01-312-155/+118
| | | | | | | | | | | | | * support for switching rate in STAC9460 - using set_rate_val of the akm infrastructure * listing all STAC9460 registers in proc * disabling mpu401 device for Prodigy192 - otherwise the currently flawed mpu401 code hangs kernel when opening the midi device * removing old unused commented-out code Signed-off-by: Pavel Hofman <dustin@seznam.cz> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
OpenPOWER on IntegriCloud