Commit Graph

37 Commits

Author SHA1 Message Date
Maximilian Rehkopf
af9b70ac00 [ALSA] Add Aux input switch control for Aureon Universe
This patch adds a mixer control which allows the user to switch the Aux
playback between the internal Aux jack, Wavetable, and Rear Line-In on
Aureon Universe cards.

For switching, a PCA9554 (8-line GPIO with I2C interface) and a 74HC4052
(dual 4-way mux/demux) are used.  Output 0 and 1 of the PCA9554 are
connected to the select pins of the 74HC4052. The I2C interface of the
PCA9554 is connected to the card's internal SPI bus which is also used
to control the WM8770 and CS8415. SPI and I2C on the same lines...

To communicate with the PCA9554 the WM8770 and CS8415 are disabled and
an I2C Stop Condition is generated before the Start Condition (needed
for synchronisation because other SPI traffic appear to confuse the
PCA9554). Then a normal I2C data transfer takes place.  Programming must
be done ridiculously slow; in theory, 4.7us is the minimum delay time
for normal-speed I2C according to the datasheet, but even with 10us
switching was unreliable.  The Windows driver from Terratec does the
programming very slowly, too (checked with an oscilloscope).

PCA9554 datasheet:
http://www.semiconductors.philips.com/acrobat/datasheets/PCA9554_9554A_6.pdf

74HC4052 datasheet:
http://www.semiconductors.philips.com/acrobat/datasheets/74HC_HCT4052_4.pdf

Signed-off-by: Maximilian Rehkopf <otakon@gmx.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2006-03-31 17:59:01 +02:00
Alan Horstmann
6285ae1df1 [ALSA] ice1712 - Fix wrong register value for DMX 6FIRE
I have just discovered I made an error in the register value set in 'Limit
dmx6fire to 6 dacs' patch (bug1472).  The value set should be '2a' not '0a'
as in the original patch, which unintentionally disables the 2nd MPU 401
UART.

Signed-off-by: Alan Horstmann <gineera@aspect135.co.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2006-03-31 17:58:56 +02:00
Matthias Gehre
910638ae7e [PATCH] Replace 0xff.. with correct DMA_xBIT_MASK
Replace all occurences of 0xff..  in calls to function pci_set_dma_mask()
and pci_set_consistant_dma_mask() with the corresponding DMA_xBIT_MASK from
linux/dma-mapping.h.

Signed-off-by: Matthias Gehre <M.Gehre@gmx.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-03-28 09:16:07 -08:00
Tobias Klauser
9d2f928ddf [PATCH] Intruduce DMA_28BIT_MASK
This patch introduces the DMA_28BIT_MASK constant in dma-mapping.h
ALSA drivers using this mask are changed to use the new constant.

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Acked-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Jaroslav Kysela <perex@suse.cz>
2006-03-22 10:53:19 +01:00
Alan Horstmann
01a00e5e42 [ALSA] ice1712 - typo fixes for dxr_enable module option
Modules: ICE1712 driver

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2006-03-22 10:40:07 +01:00
Takashi Iwai
6682025e12 [ALSA] ice1712 - Fix wrong value types for enum items
Modules: ICE1712 driver

Fix the access to wrong type values for enum items in aureon.c
(ALSA bug#1527).

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2006-03-22 10:39:31 +01:00
Adrian Bunk
ecefb19252 [ALSA] sound/pci/ice1712/delta.c: make 2 functions static
Modules: ICE1712 driver

This patch makes two needlessly global functions static.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2006-03-22 10:38:34 +01:00
Doug McLain
381e3cda68 [ALSA] ice1712 - Fix wordclock status on Delta1010LT
Modules: ICE1712 driver

I posted this patch to bug 1806 a while back, and have been awaiting a
reply or commit.  It currently reports the Locked/No Signal text
backwards in envy24control, since i was using an older version of
envy24control when I wrote the original code.  The Locked/No Signal test
was recently reversed in envy24control cvs, so the test in my code needs
to be reversed as well.  Here is the patch, once again.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2006-03-22 10:33:28 +01:00
Jaroslav Kysela
f7004f3975 [ALSA] ice1712 - Delta 1010LT S/PDIF fixes
Modules: ICE1712 driver

See ALSA bug#1806 for details.

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2006-03-22 10:29:25 +01:00
Alan Horstmann
531af46279 [ALSA] ice1712 - disable unused ADCs & DACs on DMX6fire
Modules: ICE1712 driver

Change the value written to hardware configuration register of envy24 chip
in the case of Terratec DMX6fire to restrict the active ADCs & DACs to 6.

Also add the dxr_enable module option to eventually leave the old behaviour
when user requests.

Signed-off-by: Alan Horstmann <gineera@aspect135.co.uk>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2006-03-22 10:28:25 +01:00
Jaroslav Kysela
e957ebf164 [ALSA] ice1712 & cs8427 - fix problem for S/PDIF input setup
Modules: I2C cs8427,ICE1712 driver

See ALSA bug#1785 for more details.

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2006-03-22 10:28:15 +01:00
Ingo Molnar
62932df8fb [ALSA] semaphore -> mutex (PCI part)
Semaphore to mutex conversion.

The conversion was generated via scripts, and the result was validated
automatically via a script as well.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2006-03-22 10:25:29 +01:00
Takashi Iwai
45fe722ba8 [ALSA] ice1724 - Add support of Prodigy-7.1LT
Modules: ICE1712 driver

Added the support of Prodigy-7.1LT board.
The patch taken from ALSA BTS bug#1090.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2006-03-22 10:23:23 +01:00
Takashi Iwai
59acf76e02 [ALSA] ice1724 - Add support of M-Audio Revolution 5.1
Modules: ICE1724 driver

Added the basic support of M-Audio Revolution 5.1.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2006-01-03 12:30:18 +01:00
Takashi Iwai
6a81dbf23d [ALSA] ice1712 - Fix Front Digital Input of Terratec DMX 6Fire
Modules: ICE1712 driver

Fix the inverted switch of 'Front Digital Input' of Terratec DMX 6Fire.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2006-01-03 12:29:33 +01:00
Takashi Iwai
ab0c7d72c3 [ALSA] Remove xxx_t typedefs: PCI ICE1724
Modules: ICE1724 driver,ICE1712 driver

Remove xxx_t typedefs from the PCI ICE1724 driver.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2006-01-03 12:19:13 +01:00
Takashi Iwai
6ca308d4ed [ALSA] Remove xxx_t typedefs: PCI ICE1712
Modules: ICE1712 driver

Remove xxx_t typedefs from the PCI ICE1712 driver.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2006-01-03 12:19:11 +01:00
Takashi Iwai
c3e6f7d876 [ALSA] Remove superfluous pcm_free callbacks
Remove superflous pcm_free callbacks.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2006-01-03 12:16:21 +01:00
Jaroslav Kysela
fd6715e564 [ALSA] ice1724 (juli) - forced analog doughter board detection
Modules: ICE1712 driver

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2006-01-03 12:15:57 +01:00
Greg Kroah-Hartman
249bb070f5 [PATCH] PCI: removed unneeded .owner field from struct pci_driver
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-11-10 16:09:17 -08:00
Takashi Iwai
63786d064c [ALSA] ice1724 - Fix ADC mux put callback in aureon.c
Modules: ICE1712 driver

Fix the return value of ADC mux put callback in aureon.c.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-11-07 11:28:55 +01:00
Takashi Iwai
09f9a891e9 [ALSA] ice1724 - Add SPDIF support to Shuttle SN25P
Modules: ICE1712 driver

Added the SPDIF support to Shuttle SN25P.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-11-04 13:25:10 +01:00
Nishanth Aravamudan
8433a509c0 [ALSA] Fix schedule_timeout usage
Use schedule_timeout_{,un}interruptible() instead of
set_current_state()/schedule_timeout() to reduce kernel size.  Also use
human-time conversion functions instead of hard-coded division to avoid
rounding issues.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-11-04 13:19:49 +01:00
Takashi Iwai
99b359ba10 [ALSA] Add missing KERN_* suffix to printk
Add missing KERN_* suffix to printk.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-11-04 13:19:23 +01:00
Takashi Iwai
2dfbeca9e9 [ALSA] Add support of high-rate SPDIF output
Modules: ICE1724 driver

Add support of SPDIF output with sample rates higher than 48kHz.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-11-04 13:18:37 +01:00
Takashi Iwai
c168143c45 [ALSA] Allow 8-44khz sample rates on Revolution 7.1
Modules: ICE1724 driver

Remove the restcition of sample rates on Revolution 7.1 board.
This enables the low 8-44kHz sample rates.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-11-04 13:17:32 +01:00
Clemens Ladisch
3bcd4649bc [ALSA] set owner field in struct pci_driver
AD1889 driver,ALS4000 driver,ATIIXP driver,ATIIXP-modem driver
AZT3328 driver,BT87x driver,CMIPCI driver,CS4281 driver
ENS1370/1+ driver,ES1938 driver,ES1968 driver,FM801 driver
Intel8x0 driver,Intel8x0-modem driver,Maestro3 driver,RME32 driver
RME96 driver,SonicVibes driver,VIA82xx driver,VIA82xx-modem driver
ALI5451 driver,au88x0 driver,CS46xx driver,EMU10K1/EMU10K2 driver
HDA Intel driver,ICE1712 driver,ICE1724 driver,KORG1212 driver
MIXART driver,NM256 driver,RME HDSP driver,RME9652 driver
Trident driver,Digigram VX222 driver,YMFPCI driver
Set the module owner field in each driver's struct pci_driver to get
the driver symlink in the sysfs device directory.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-09-12 11:12:34 +02:00
Takashi Iwai
e560d8d836 [ALSA] Replace with kzalloc() - pci stuff
AD1889 driver,ATIIXP driver,ATIIXP-modem driver,AZT3328 driver
BT87x driver,CMIPCI driver,CS4281 driver,ENS1370/1+ driver
ES1938 driver,ES1968 driver,FM801 driver,Intel8x0 driver
Intel8x0-modem driver,Maestro3 driver,SonicVibes driver,VIA82xx driver
VIA82xx-modem driver,AC97 Codec,AK4531 codec,au88x0 driver
CA0106 driver,CS46xx driver,EMU10K1/EMU10K2 driver,HDA Codec driver
HDA generic driver,HDA Intel driver,ICE1712 driver,ICE1724 driver
KORG1212 driver,MIXART driver,NM256 driver,Trident driver,YMFPCI driver
Replace kcalloc(1,..) with kzalloc().

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-09-12 10:48:16 +02:00
Takashi Iwai
8cdfd2519c [ALSA] Remove superfluous PCI ID definitions
CS46xx driver,EMU10K1/EMU10K2 driver,PCM Midlevel,Trident driver
YMFPCI driver,BT87x driver,CMIPCI driver,CS4281 driver
ENS1370/1+ driver,ES1938 driver,ES1968 driver,Intel8x0 driver
Intel8x0-modem driver,Maestro3 driver,RME32 driver,RME96 driver
SonicVibes driver,VIA82xx driver,ALI5451 driver,ICE1712 driver
ICE1724 driver,NM256 driver,RME HDSP driver,RME9652 driver
Remove superfluous PCI ID definitions.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-09-12 10:47:02 +02:00
Clemens Ladisch
10e8d78a94 [ALSA] use SNDRV_CTL_NAME_IEC958 macro
CMI8330 driver,ENS1370/1+ driver,FM801 driver,VIA82xx driver,AC97 Codec
ALI5451 driver,CS46xx driver,EMU10K1/EMU10K2 driver,HDA Codec driver
ICE1712 driver,ICE1724 driver
Where appropriate, use the SNDRV_CTL_NAME_IEC958 instead of a literal
string.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-08-30 08:43:35 +02:00
Clemens Ladisch
67ed4161f6 [ALSA] sound - fix .iface field of mixer control elements
Documentation,CS46xx driver,EMU10K1/EMU10K2 driver,AD1848 driver
SB16/AWE driver,CMIPCI driver,ENS1370/1+ driver,RME32 driver
RME96 driver,ICE1712 driver,ICE1724 driver,KORG1212 driver
RME HDSP driver,RME9652 driver
This patch changes .iface to SNDRV_CTL_ELEM_IFACE_MIXER whre _PCM or
_HWDEP was used in controls that are not associated with a specific PCM
(sub)stream or hwdep device, and changes some controls that got
inconsitent .iface values due to copy+paste errors.  Furthermore, it
makes sure that all control that do use _PCM or _HWDEP use the correct
number in the .device field.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-08-30 08:43:22 +02:00
Takashi Iwai
8cfbbac6ad [ALSA] ice1724 - Add support of Chaintech AV-710
Documentation,ICE1724 driver
Add the support of Chaintech AV-710 to ice1724 driver.
The patch includes the WM-codec initialization fix by
Jaanus Kivistik <jaanus@no.spam.ee>.

Since both AV-710 and AMP Audio2000 have the same SSID, initialize
WM codecs as default for both devices.  In case it breaks Audio2000,
you can pass 'model=amp2000' option to avoid WM codec initialization.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:15:24 +02:00
Takashi Iwai
c9bce91f90 [ALSA] Update documentation for ice1712 and ice1724
Documentation,ICE1712 driver
Updated the documentation for ice1712 and ice1724 drivers.
Added the device description for shuttle SN25P missing in the last patch.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:14:42 +02:00
Takashi Iwai
b9cce37411 [ALSA] Add Shuttle SN25P support
ICE1712 driver
Added the support for Shuttle SN25P.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:14:38 +02:00
Takashi Iwai
01d25d460a [ALSA] Replace pci_module_init() with pci_register_driver()
Documentation,ALS4000 driver,ATIIXP driver,ATIIXP-modem driver
AZT3328 driver,BT87x driver,CMIPCI driver,CS4281 driver
ENS1370/1+ driver,ES1938 driver,ES1968 driver,FM801 driver
Intel8x0 driver,Intel8x0-modem driver,Maestro3 driver,RME32 driver
RME96 driver,SonicVibes driver,VIA82xx driver,VIA82xx-modem driver
ALI5451 driver,au88x0 driver,CA0106 driver,CS46xx driver
EMU10K1/EMU10K2 driver,HDA Intel driver,ICE1712 driver,ICE1724 driver
KORG1212 driver,MIXART driver,NM256 driver,RME HDSP driver
RME9652 driver,Trident driver,Digigram VX222 driver,YMFPCI driver
Replace the obsolete pci_module_init() with pci_register_driver().

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:00:32 +02:00
Simone Zinanni
aed058e871 [ALSA] Provides preliminary support for the Terratec Phase 28 card
ICE1712 driver
Provides preliminary support for the Terratec Phase 28 card.
Not extensively tested and probably buggy, but it seems to work.

Signed-off-by: Simone Zinanni <simone@develer.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 09:58:58 +02:00
Linus Torvalds
1da177e4c3 Linux-2.6.12-rc2
Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!
2005-04-16 15:20:36 -07:00