Commit graph

859 commits

Author SHA1 Message Date
Andrew Morton a136564702 [PATCH] remove gcc-2 checks
Remove various things which were checking for gcc-1.x and gcc-2.x compilers.

From: Adrian Bunk <bunk@stusta.de>

    Some documentation updates and removes some code paths for gcc < 3.2.

Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-08 20:14:02 -08:00
Russell King 123656d4cc Merge with Linus' kernel. 2006-01-07 14:40:05 +00:00
Russell King a62c80e559 [ARM] Move AMBA include files to include/linux/amba/
Since the ARM AMBA bus is used on MIPS as well as ARM, we need
to make the bus available for other architectures to use.  Move
the AMBA include files from include/asm-arm/hardware/ to
include/linux/amba/

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2006-01-07 13:52:45 +00:00
Greg Kroah-Hartman ccf18968b1 Merge ../torvalds-2.6/ 2006-01-06 12:59:59 -08:00
Patrick Mochel 45029c3207 [PATCH] oss: remove deprecated PM interface from opl3sa2 driver
This change removes the old, deprecated interface from the opl3sa2 driver,
including the pm_{,un}register() calls, the local storage of the pmdev object
and the reference to the old header files.  This change is done to assist in
eradicating the users of the legacy interface so as to help facilitate the
removal of the interface itself.

Signed-off-by: Patrick Mochel <mochel@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-06 08:33:41 -08:00
Patrick Mochel 76cd48a397 [PATCH] oss: remove deprecated PM interface from nm256 driver
This change removes the old, deprecated interface from the nm256 driver,
including the pm_{,un}register() calls, the local storage of the pmdev object
and the reference to the old header files.  This change is done to assist in
eradicating the users of the legacy interface so as to help facilitate the
removal of the interface itself.

Note that this driver has been obsoleted by an ALSA equivalent.

Signed-off-by: Patrick Mochel <mochel@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-06 08:33:41 -08:00
Patrick Mochel 53052539f3 [PATCH] oss: remove deprecated PM interface from maestro driver
This change removes the old, deprecated interface from the maestro driver,
including the pm_{,un}register() calls, the local storage of the pmdev object
and the reference to the old header files.  This change is done to assist in
eradicating the users of the legacy interface so as to help facilitate the
removal of the interface itself.

The check_suspend() function and associated logic was not removed, even though
it is now unnecessary.

Note that this driver has been obsoleted by an ALSA equivalent.

Acked-by: Zach Brown <zab@zabbo.net>
Signed-off-by: Patrick Mochel <mochel@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-06 08:33:41 -08:00
Patrick Mochel 94661e7c33 [PATCH] oss: remove deprecated PM interface from cs46xx driver
This change removes the old, deprecated interface from the cs46xx driver,
including the pm_{,un}register() calls, the local storage of the pmdev object
and the reference to the old header files.  This change is done to assist in
eradicating the users of the legacy interface so as to help facilitate the
removal of the interface itself.

Note this driver has PCI PM hooks which are set properly.  It also has the
ability to trigger suspend/resume from an ioctl.  This functionality was not
touched, though it could use a serious review if this driver continues to
persist in the mainline tree..

Note that this driver has been obsoleted by an ALSA equivalent.

Signed-off-by: Patrick Mochel <mochel@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-06 08:33:41 -08:00
Patrick Mochel ee77e27542 [PATCH] oss: remove deprecated PM interface from cs4281 driver
This change removes the old, deprecated interface from the cs4281 driver,
including the pm_{,un}register() calls, the local storage of the pmdev object
and the reference to the old header files.  This change is done to assist in
eradicating the users of the legacy interface so as to help facilitate the
removal of the interface itself.

Note that this driver has been obsoleted by an ALSA equivalent.

Note that this driver has hooks for PCI power management, but does not
implement the ->suspend()/->resume() methods.

Signed-off-by: Patrick Mochel <mochel@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-06 08:33:41 -08:00
Patrick Mochel e7c045c14b [PATCH] oss: remove deprecated PM interface from ad1848 driver
This change removes the old, deprecated interface from the ad1848 driver,
including the pm_{,un}register() calls, the local storage of the pmdev object
and the reference to the old header files.  This change is done to assist in
eradicating the users of the legacy interface so as to help facilitate the
removal of the interface itself.

Signed-off-by: Patrick Mochel <mochel@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-06 08:33:41 -08:00
Greg Kroah-Hartman 2b48716d1d [PATCH] I2C: Remove .owner setting from i2c_driver as it's no longer needed
Now that i2c_add_driver() doesn't need the module owner to be set by
hand, we can delete it from the drivers.  This patch catches all of the
drivers that I found in the current tree (if a driver sets the .owner by
hand, it's not a problem, just not needed.)

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Jean Delvare <khali@linux-fr.org>
2006-01-05 22:16:25 -08:00
Laurent Riffard e100fe103e [PATCH] i2c: Drop i2c_driver.{owner,name}, 7 of 11
We should use the i2c_driver.driver's .name and .owner fields
instead of the i2c_driver's ones.

This patch updates the drivers for ppc arch.

Signed-off-by: Laurent Riffard <laurent.riffard@free.fr>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-01-05 22:16:23 -08:00
Laurent Riffard d74cdab1ca [PATCH] i2c: Drop i2c_driver.{owner,name}, 6 of 11
We should use the i2c_driver.driver's .name and .owner fields
instead of the i2c_driver's ones.

This patch updates the OSS drivers.

Signed-off-by: Laurent Riffard <laurent.riffard@free.fr>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-01-05 22:16:23 -08:00
Jean Delvare 8a9947552d [PATCH] i2c: Drop i2c_driver.flags, 2 of 3
Just about every i2c chip driver sets the I2C_DF_NOTIFY flag, so we
can simply make it the default and drop the flag. If any driver really
doesn't want to be notified when i2c adapters are added, that driver
can simply omit to set .attach_adapter. This approach is also more
robust as it prevents accidental NULL pointer dereferences.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-01-05 22:16:21 -08:00
Dominik Brodowski efe3cd105f [PATCH] pcmcia: fix sound drivers
Update the PCMCIA sound drivers to handle the recent changes to the PCMCIA
core. A part of this merge was done by Takashi Iwai <tiwai@suse.de>.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
2006-01-06 00:27:16 +01:00
Linus Torvalds 4da5cc2cec Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa 2006-01-04 16:38:36 -08:00
Greg Kroah-Hartman 75318d2d7c [PATCH] USB: remove .owner field from struct usb_driver
It is no longer needed, so let's remove it, saving a bit of memory.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-01-04 13:48:34 -08:00
Jaroslav Kysela c6f43290ae [ALSA] ad1889 - remove CVS ID from the driver identification
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2006-01-04 10:26:30 +01:00
Takashi Iwai 676338a162 [ALSA] opl3 - Fix the unreleased resources
Modules: OPL3

Fix the unreleased resources in the error path of snd_opl3_create().

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2006-01-04 10:13:52 +01:00
Takashi Iwai 3e23c65883 [ALSA] Revert the nested-device patch
Modules: ALSA Core

Revert the nested-device patch to keep the compatibility with the
current HAL configuration.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2006-01-04 10:13:48 +01:00
Jaroslav Kysela 2ad5dd8dc3 [ALSA] dummy driver - added CA0106 emulation defines
Modules: Generic drivers

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2006-01-04 10:13:46 +01:00
Takashi Iwai be9b7e8c02 [ALSA] Remove xxx_t typedefs: SPARC CS4231
Remove xxx_t typedefs from the SPARC CS4231 driver.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2006-01-03 13:43:12 +01:00
James Courtier-Dutton 0ba656d0b2 [ALSA] snd-emu10k1: Add new SB Live 5.1 PCI-ID.
Modules: EMU10K1/EMU10K2 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2006-01-03 12:31:17 +01:00
James Courtier-Dutton e3b9bc0e78 [ALSA] snd-emu10k1: Correct control names for Audigy 4 Pro.
Modules: EMU10K1/EMU10K2 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2006-01-03 12:31:15 +01:00
Takashi Iwai 041dec0173 [ALSA] hda-codec - Add model entry for Shuttle ST20G5
Modules: HDA Codec driver

Added the model entry for Shuttle ST20G5.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2006-01-03 12:31:14 +01:00
Takashi Iwai eff49137dd [ALSA] emu10k1 - Clean up p16v code
Modules: EMU10K1/EMU10K2 driver

Clean up and optimize the codes in p16v.c

- Add proper __devinit* tags
- Reduce unnecessary functions using a closure
- Fix whitespaces
- Rename 'Unknown' to 'Side' controls

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2006-01-03 12:31:13 +01:00
James Courtier-Dutton f951fd3cc4 [ALSA] snd-emu10k1: Add comments regarding chips present on the card.
Modules: EMU10K1/EMU10K2 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2006-01-03 12:31:11 +01:00
James Courtier-Dutton 54efc96d4a [ALSA] snd-emu10k1: Add some comments regarding chip types.
Modules: EMU10K1/EMU10K2 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2006-01-03 12:31:10 +01:00
James Courtier-Dutton aad9095322 [ALSA] snd-ca0106: Fix SPI driver code. Fixes speaker output.
Modules: CA0106 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2006-01-03 12:31:08 +01:00
James Courtier-Dutton 18f3c59f2b [ALSA] snd-emu10k1: Tidy SPI code.
Modules: EMU10K1/EMU10K2 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2006-01-03 12:31:07 +01:00
James Courtier-Dutton c6a02ca293 [ALSA] snd-emu10k1: Fix whitespace.
Modules: EMU10K1/EMU10K2 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2006-01-03 12:31:05 +01:00
James Courtier-Dutton 28bcbdddaf [ALSA] snd-emu10k1: Fix whitespace.
Modules: EMU10K1/EMU10K2 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2006-01-03 12:31:03 +01:00
James Courtier-Dutton ccadc3e38b [ALSA] snd-emu10k1: Enable speakers on Audigy 2 ZS Notebook.
Modules: EMU10K1/EMU10K2 driver

Description:
This enables the 7.1 speaker output of the Audigy 2 ZS Notebook.
Further towards fixing ALSA bug#927
TODO:
SPDIF/IEC958 output. (untested, might already work)
Sound capture. (untested, might already work.)

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2006-01-03 12:31:02 +01:00
James Courtier-Dutton 27fe864ec9 [ALSA] snd-emu10k1: Removes some distortion from Audigy 2 ZS Notebook.
Modules: EMU10K1/EMU10K2 driver

Description:
Part way to fix ALSA bug#927
Add support for the SPI interface on the CA0108 chip.
This is used to control the registers on the DAC.
Headphone output tested.
Other outputs and Capture not tested yet.
Note: The red LED does not come on, but sound is still OK.

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2006-01-03 12:31:01 +01:00
James Courtier-Dutton a5875159dd [ALSA] snd-ca0106: Fixes sound output for Creative Audigy SE aka.SB0570.
Modules: CA0106 driver

Fixes ALSA bug#1636

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2006-01-03 12:30:58 +01:00
James Courtier-Dutton 39596dc898 [ALSA] snd-ca0106: update SPDIF to IEC958 in mixer control names.
Modules: CA0106 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2006-01-03 12:30:57 +01:00
Takashi Iwai dac8dddd87 [ALSA] via82xx - Add a quirk for Targa Traveller 811
Modules: VIA82xx driver

Add an ac97 quirk entry for Targa Traveller 811.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2006-01-03 12:30:55 +01:00
Rene Herman 607da7f834 [ALSA] es1968 - Fix conflict with ISA boards
Modules: ES1968 driver

Fix disablement of TDMA and legacy support to prevent confliction of
resources with ISA boards.  Confirmed with Terratec DMX and CS4236.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2006-01-03 12:30:54 +01:00
Nicolas Pitre ea265c0a43 [ALSA] make the pxa2xx-ac97 module more robust against PXA27x bugs
Modules: ARM PXA2XX driver

The SDONE and CDONE interrupt on the PXA27x might become unusable in
some conditions.  Let's use an hybrid approach (interrupt with timeout)
to have the best possible behavior in all conditions.

Also let's not care about CAR_CAIP anymore.  This is useless.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2006-01-03 12:30:51 +01:00
Clemens Ladisch aa1e77e691 [ALSA] seq: reorganize sequencer client numbers
Modules: ALSA sequencer

Reduce the maximum possible number of global clients to 16 to make
more numbers available for card clients, and allow dynamically allocated
card client numbers to share the same range as application client
numbers to make sure that all 32 cards can be used at the same time.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2006-01-03 12:30:50 +01:00
Clemens Ladisch 7b6d92451a [ALSA] seq: set client name in snd_seq_create_kernel_client()
All users of snd_seq_create_kernel_client() have to set the client name
anyway, so we can just pass the name as parameter.  This relieves us
from having to muck around with a struct snd_seq_client_info in these
cases.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2006-01-03 12:30:49 +01:00
Clemens Ladisch 83e8ad6984 [ALSA] seq: remove struct snd_seq_client_callback
The fields of struct snd_seq_client_callback either aren't used or are
always set to the same value, so we can get rid of it altogether.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2006-01-03 12:30:47 +01:00
Clemens Ladisch 255bd169ab [ALSA] seq: remove superfluous fields
Modules: ALSA sequencer

None of the fields of struct snd_seq_kernel_client was actually used, so
remove them.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2006-01-03 12:30:45 +01:00
Clemens Ladisch 22fb2a708d [ALSA] ymfpci: show chip model
Modules: YMFPCI driver

Instead of 'DS-XG', show the correct chip model (DS-1/1L/1S/1E) where possible.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2006-01-03 12:30:44 +01:00
Takashi Iwai 7632c7b444 [ALSA] hda-codec - Add the model entry for ASUS P5GD1-HVM
Modules: HDA Codec driver

Add the model entry (ALC880 6stack) for ASUS P5GD1-HVM.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2006-01-03 12:30:43 +01:00
Takashi Iwai 235475cb77 [ALSA] pcm - Fix wrong asserts
Modules: PCM Midlevel

Fixed wrong or supreflous snd_assert()'s.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2006-01-03 12:30:41 +01:00
Takashi Iwai 4a471b7ddf [ALSA] hda-codec - Small clean up and fixes
Modules: HDA Codec driver,HDA generic driver

- Common labels for input pins
- Fix and clean up of Realtek codec parsers

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2006-01-03 12:30:40 +01:00
Clemens Ladisch f7a9275d94 [ALSA] unregister platform devices
Call platform_device_unregister() for all platform devices that we've
registered.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2006-01-03 12:30:39 +01:00
Clemens Ladisch 416c1079d3 [ALSA] Nest sound devices
Modules: ALSA Core

Make the control device parent of all other ALSA devices of a card.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2006-01-03 12:30:36 +01:00
Clemens Ladisch 156b2aa3be [ALSA] ens1371: fix compilation without SUPPORT_JOYSTICK
Modules: ENS1370/1+ driver

Move the spdif and lineio parameters around so that they are compiled
even when SUPPORT_JOYSTICK isn't set.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2006-01-03 12:30:35 +01:00