Commit Graph

177 Commits

Author SHA1 Message Date
Clemens Ladisch
a53fc188ec [ALSA] make local objects static
Memalloc module,PCM Midlevel,Timer Midlevel,GUS Library,AC97 Codec
ALI5451 driver,RME9652 driver
Make some functions/variables that are used in only one file static.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-08-30 08:45:01 +02:00
Sasha Khapyorsky
b65f824c1e [ALSA] hda-codec - support for Si3054/5 HDA modems
HDA generic driver,HDA Codec driver
Support for Si3054/5 HDA modem codecs.

Signed-off-by: Sasha Khapyorsky <sashak@smlink.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:44:56 +02:00
Sasha Khapyorsky
673b683a07 ALSA CVS update
HDA Codec driver,HDA generic driver
Summar: hda-codec - MFG support

This adds Modem Functional Group (MFG) support and option for 9600
sample rate.

Signed-off-by: Sasha Khapyorsky <sashak@smlink.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:44:53 +02:00
Clemens Ladisch
9bcf655109 [ALSA] ymfpci: add per-voice volume controls
YMFPCI driver
Implements mixer controls for the volume of each playback substream of
the main PCM device.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-08-30 08:44:46 +02:00
Liam Girdwood
064d2112ff [ALSA] WM9713 modem detection
AC97 Codec
This patch fixes a problem whereby the WM9713 has modem functionality
incorrectly detected after an AC97 cold reset.

Changes:-

  o Cleared AC97_SCAP_MODEM in wm9713 scaps

Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:44:19 +02:00
Clemens Ladisch
5549d54992 [ALSA] use PCM interface for IEC958 controls
Digigram VX core,ENS1370/1+ driver,CA0106 driver,EMU10K1/EMU10K2 driver
RME HDSP driver,RME9652 driver
For consistency, use the PCM interface instead of MIXER for IEC958
default/mask/stream mixer controls.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-08-30 08:43:39 +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
Liam Girdwood
0ca06a00e2 [ALSA] AC97 bus interface for ad-hoc drivers
AC97 Codec,PCI drivers
I've made the review changes and as requested I've pasted the RFC by
Nicolas below:-

'I would like to know what people think of the following patch.  It
allows for a codec on an AC97 bus to be shared with other drivers which
are completely unrelated to audio.  It registers a new bus type, and
whenever a codec instance is created then a device for it is also
registered with the driver model using that bus type.  This allows, for
example, to use the extra features of the UCB1400 like the touchscreen
interface and the additional GPIOs and ADCs available on that chip for
battery monitoring.  I have a working UCB1400 touchscreen driver here
that simply registers with the driver model happily working alongside
with audio features using this.'

Changes over RFC:-

  o Now matches codec name within codec group.
  o Added ac97_dev_release() to stop kernel complaining about no release
method for device.
  o Added 'config SND_AC97_BUS' to sound/pci/Kconfig and moved 'config
SND_AC97_CODEC' out with the PCI=n statement.
  o module is now called snd-ac97-bus

Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:43:26 +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
42dfd0adab [ALSA] via82xx - Add dxs entry for Acer Aspire 1524 WMLi
VIA82xx driver
Added the dxs entry for Acer Aspire 1524 WMLi.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:43:18 +02:00
Nicolas Graziano
b9f5a89c74 [ALSA] hda-codec - Fix LFE volume/switch
HDA Codec driver
Fixed LFE volume/switch control.

Signed-off-by: Nicolas Graziano <nicolas.graziano@wanadoo.fr>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:43:15 +02:00
Takashi Iwai
d827560c96 [ALSA] hda-codec - Add default config for ASUS P5AD2
HDA Codec driver
Added the default config for ASUS P5AD2.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:43:11 +02:00
Takashi Iwai
cb8e2f8385 [ALSA] hda-codec - Fix reordering of surround channels
HDA Codec driver
- Fixed the reordering of surround channels.
  Originally reported by Nicolas GRAZIANO <nicolas.graziano@wanadoo.fr>.

- Show the selected ssid when debug option is set.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:43:09 +02:00
Liam Girdwood
3998b70fd0 [ALSA] WM97xx AC97 codec controls
AC97 Codec
o Enhanced current WM97xx support to provide additional controls and
  use the kcontrol suffix naming convention.
o Added AC97_HAS_NO_MIC, AC97_HAS_NO_TONE and AC97_HAS_NO_STD_PCM.
o Cleaned up WM97xx related comments.
o Removed some wm9713 double mono controls and replaced with stereo
  controls.

Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30 08:43:05 +02:00
Al Viro
276bd31ce5 [PATCH] Kconfig fix (ISA_DMA_API and sound/*)
fixed kconfig dependencies on ISA_DMA_API for parts of sound/* that rely
on it.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-08-23 18:43:40 -07:00
Len Brown
adbedd3424 merge 2.6.13-rc4 with ACPI's to-linus tree 2005-07-30 01:55:32 -04:00
Len Brown
d6ac1a7910 /home/lenb/src/to-linus branch 'acpi-2.6.12' 2005-07-29 23:31:17 -04:00
Rafael J. Wysocki
90158b8320 [ACPI] fix resume issues on Asus L5D
http://bugzilla.kernel.org/show_bug.cgi?id=4416

Signed-off-by: Rafael J. Wysocki <rjwysocki@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
2005-07-29 22:04:26 -04:00
Takashi Iwai
69c3e5f856 [ALSA] via82xx - Fix dxs_support of twinhead laptop
VIA82xx driver
Changed the dxs_support value of twinhead laptop to DXS_SRC.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-07-28 12:27:09 +02:00
Sergey Ulanov
eeacb5457c [ALSA] Jack Sense support for AD1980 and AD1888
AC97 Codec
Attached patch adds 'Jack Sense' controls for AD1980 and AD1888 chips.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-07-28 12:27:05 +02:00
Nicolas Graziano
fb92e6f05e [ALSA] hda driver, correct bug in model 'auto'
HDA Codec driver
- Correct some index variable inversion in patch_cmedia.c

Signed-off-by: Nicolas Graziano <nicolas.graziano@wanadoo.fr>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-07-28 12:27:00 +02:00
Clemens Ladisch
7858ffa062 [ALSA] ac97 - remove unused variable
AC97 Codec
remove a variable made obsolete by the last change

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-07-28 12:22:31 +02:00
James Courtier-Dutton
c9eab129fc [ALSA] ac97: Fix volume control bit size detection for STAC9704.
AC97 Codec

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-07-28 12:22:27 +02:00
James Courtier-Dutton
7c1d549aa9 [ALSA] emu10k1: Add EMU 1212m card entry and document it as not supported yet.
EMU10K1/EMU10K2 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-07-28 12:22:25 +02:00
Nishanth Aravamudan
ef21ca24fa [ALSA] sound/pci: fix-up sleeping paths
ENS1370/1+ driver,ES1968 driver,Intel8x0 driver,VIA82xx driver
VIA82xx-modem driver,AC97 Codec,ALI5451 driver,CS46xx driver
MIXART driver,RME HDSP driver,Trident driver,YMFPCI driver
Description: Fix-up sleeping in sound/pci. These changes fall under the
following two categories:

        1) Replace schedule_timeout() with msleep() to guarantee the
        task delays as expected. This also involved replacing/removing
        custom sleep functions.
        2) Do not assume jiffies will only increment by one if you
        request a 1 jiffy sleep, i.e. use time_after/time_before in
        while loops.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-07-28 12:22:13 +02:00
Jaroslav Kysela
072c01194d [ALSA] ens1371 - added extra delay for ac97 codec initialization
ENS1370/1+ driver

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-07-28 12:22:09 +02:00
James Courtier-Dutton
ae3a72d8cb [ALSA] snd-emu10k1: Fixes recognition of Audigy ES.
EMU10K1/EMU10K2 driver
Fixes ALSA bug #1237.

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-07-28 12:22:03 +02:00
James Courtier-Dutton
e66bc8b2a7 [ALSA] emu10k1: Add module option uint subsystem.
EMU10K1/EMU10K2 driver
It allows the user to force the snd-emu10k1 module to think the user
has a particular sound card. Useful if their particular sound card
is not yet recognised.

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-07-28 12:22:00 +02:00
Jaroslav Kysela
2201987c56 [ALSA] via82xx - changed MSI K7T266 Pro2 - 4005:4710 in white list (SRC enable)
VIA82xx driver

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-07-28 12:21:56 +02:00
Takashi Iwai
e3ea4d8961 [ALSA] hdsp - Add 'Sample Clock Source Locking' control
RME HDSP driver
Added 'Sample Clock Source Locking' control.  If this switch is on,
the clock source can't be changed via PCM hw_params API (as sample rate).
This will fix the problem of OSS-emulation, for example.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-07-28 12:21:53 +02:00
Matt
4e55096e27 [ALSA] hda: add sigmatel hp detect support
HDA Codec driver
Adds support for detecting hp insertion/removal and enable/disable of
lineouts based on unsolicited events.

Signed-off-by: Matt <matt@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-07-28 12:21:52 +02:00
Matt
41e2fce431 [ALSA] hda: enable unsolicited responses
HDA Intel driver
Patch enables unsolicited responses on the HDA controller. Without
the UREN bit set, the controller will not place unsolicited responses
in a RIRB.

Signed-off-by: Matt <matt@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-07-28 12:21:48 +02:00
James Courtier-Dutton
88dc0e5dad [ALSA] emu10k1: Added tested status comments.
EMU10K1/EMU10K2 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-07-28 12:21:32 +02:00
James Courtier-Dutton
a6f6192bb3 [ALSA] emu10k1: Sort by card id.
EMU10K1/EMU10K2 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-07-28 12:21:31 +02:00
James Courtier-Dutton
3818152e64 [ALSA] snd-emu10k1: Tidy mixer controls.
EMU10K1/EMU10K2 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-07-28 12:21:28 +02:00
James Courtier-Dutton
e0474e5398 [ALSA] snd-emu10k1: Card capabilities tidy up.
EMU10K1/EMU10K2 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-07-28 12:21:26 +02:00
Jaroslav Kysela
7bc71ecd64 [ALSA] via82xx - added MSI K7T266 Pro2 - 4005:4710 to white list (DXS enable)
VIA82xx driver
Reporter: Marko Kohtala <marko.kohtala@gmail.com>

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-07-28 12:21:25 +02:00
Takashi Iwai
5ba1e7b594 [ALSA] maestro3 - Clean up
Maestro3 driver
- Clean up maestro3 code
- Use msleep()
- Don't enable hw-vol irq when not defined

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-07-28 12:21:13 +02:00
Takashi Iwai
52b723888c [ALSA] Fix resume of intel8x0
Intel8x0 driver,AC97 Codec
Fix resume of intel8x0 driver.  The ac97 codec didn't restore some registers
properly, and the restore of ICH4 SPDIF and SDIN settings was missing.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-07-28 12:10:04 +02:00
Takashi Iwai
2eff7ec81e [ALSA] cmipci - Add Mic Boost capture switch
CMIPCI driver
Added 'Mic Boost Capture Switch' and 'Phone' switches.
The existing playback switch is renamed as 'Mic Boost Playback Switch'.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-07-28 12:09:59 +02:00
Takashi Iwai
82fe0c5803 [ALSA] Use kstrdup
HDA Codec driver
Use the new kstrdup() function instead of in-house one.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-07-28 12:09:52 +02:00
Takashi Iwai
7a318a70a4 [ALSA] hda-codec - Add entry for Acer APFV
HDA Codec driver
Added the model entry for Acer APFV.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-07-28 12:09:41 +02:00
Takashi Iwai
b6482d48e5 [ALSA] hda-codec - Add 6stack model for ALC880
Documentation,HDA Codec driver
- Added a new '6stack' model for ALC880.
- Fixed the typo in 6stack-digout model name.
- Added description for missing models in ALSA-Configuration.txt.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-07-28 12:09:39 +02:00
Harald Welte
548e7823bc [ALSA] Add new pci device id (SB400) to atiixp-modem
ATIIXP-modem driver
I didn't actually test whether the modem works, but at least the driver
loads and initializes fine.  Please consider inclusion.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-07-28 12:09:37 +02:00
Takashi Iwai
b95eed7cde [ALSA] trident - Shut up compile warnings
Trident driver
Shut up compile warnings about uninitialized variables.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-07-28 12:09:35 +02:00
Matt
ff6fdc37fb [ALSA] hda-codec - SigmaTel HDA resume support
HDA Codec driver
Adds resume support to the SigmaTel HDA patch. Please apply.

Signed-off-by: Matt <matt@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-07-28 12:09:31 +02:00
Matt
c7d4b2fa31 [ALSA] hda-codec - SigmaTel HDA multichannel support
HDA Codec driver
Adds 6/8 channel support to the SigmaTel HDA patch. Please apply.

Signed-off-by: Matt <matt@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-07-28 12:09:29 +02:00
Takashi Iwai
b0af0de5cb [ALSA] hda-codec - Fix oops with ALC880
HDA Codec driver
- Fixed oops with ALC880 auto-config mode
- Fixed a wrong config table entry for ALC880

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-07-28 12:09:22 +02:00
Jesper Juhl
77933d7276 [PATCH] clean up inline static vs static inline
`gcc -W' likes to complain if the static keyword is not at the beginning of
the declaration.  This patch fixes all remaining occurrences of "inline
static" up with "static inline" in the entire kernel tree (140 occurrences in
47 files).

While making this change I came across a few lines with trailing whitespace
that I also fixed up, I have also added or removed a blank line or two here
and there, but there are no functional changes in the patch.

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-27 16:26:20 -07:00
Olaf Hering
44456d37b5 [PATCH] turn many #if $undefined_string into #ifdef $undefined_string
turn many #if $undefined_string into #ifdef $undefined_string to fix some
warnings after -Wno-def was added to global CFLAGS

Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-27 16:26:08 -07:00