Takashi Iwai [Wed, 22 Nov 2006 10:52:52 +0000 (11:52 +0100)]
[ALSA] hda-codec - Add asus-laptop model for ALC861 (ALC660)
Added a new model 'asus-laptop' for ASUS F2*/F3* laptops
with ALC861 (equivalent with ALC660) codec chip.
Also fixed the model for PCI SSID 1043:1338.
Corresponding to ALSA bug#2480.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Randy Dunlap [Tue, 21 Nov 2006 18:01:51 +0000 (19:01 +0100)]
[ALSA] korg1212: fix printk format warning
sound/pci/korg1212/korg1212.c:2359: warning: format '%d' expects type 'int', but
argument 4 has type 'size_t'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Takashi Iwai [Tue, 21 Nov 2006 11:10:55 +0000 (12:10 +0100)]
[ALSA] hda-intel - Disable INTX when MSI is used
Call pci_intx() to disable/enable INTX when MSI is used/unused.
Nvidia and AMD boards seem to have problems with MSI when INTX
isn't disabled.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Adrian Bunk [Mon, 20 Nov 2006 16:50:17 +0000 (17:50 +0100)]
[ALSA] make sound/core/control.c:snd_ctl_new() static
Now that everyone uses snd_ctl_new1() and noone is using snd_ctl_new()
anymore, we can make it static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Tobin Davis [Mon, 20 Nov 2006 16:42:09 +0000 (17:42 +0100)]
[ALSA] hda-codec - Add missing array to conexant driver
This patch adds a missing array to the conexant driver.
Signed-off-by: Tobin Davis <tdavis@dsl-only.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Dan Carpenter [Mon, 20 Nov 2006 15:35:18 +0000 (16:35 +0100)]
[ALSA] atiixp - Add a parameter ac97_quirk
Add an option to specify the AC'97 codec instead of
probing. This is a fix for bugzilla #7467.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Adrian Bunk [Mon, 20 Nov 2006 11:03:44 +0000 (12:03 +0100)]
[ALSA] make sound/pci/hda/patch_sigmatel.c:stac92xx_dmic_labels[] static
This patch makes the needlessly global stac92xx_dmic_labels[] static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Tobin Davis [Mon, 20 Nov 2006 11:02:56 +0000 (12:02 +0100)]
[ALSA] hda-codec - Add support for Evesham Voyager C530RD laptops
This patch adds support for the Evesham Voyager C530RD series laptops.
So far, only playback has been tested, but microphone should also work.
Signed-off-by: Tobin Davis <tdavis@dsl-only.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Takashi Iwai [Thu, 16 Nov 2006 16:24:20 +0000 (17:24 +0100)]
[ALSA] hda-codec - Add model for ASUS W3j laptop
Added a proper model entry (model=laptop-eapd) for ASUS W3j laptop
with
AD1986A codec.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Takashi Iwai [Thu, 16 Nov 2006 16:12:49 +0000 (17:12 +0100)]
[ALSA] hda-codec - Fix ALC861 connection of front-output
Fix the wrongly set SET_CONNECTION verb for NID 0x0f of ALC861.
The widget has only a single connection although the init verb
sets to 0x01.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Tobin Davis [Thu, 16 Nov 2006 15:24:35 +0000 (16:24 +0100)]
[ALSA] hda-codec - Change Gigabyte K8N51 from 6stack to 6stack-digout
This patch moves the entry for the Gigabyte K8N51 from the 6stack
grouping to the 6stack-digout grouping, allowing for S/PDIF output
functionality.
Signed-off-by: Tobin Davis <tdavis@dsl-only.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Takashi Iwai [Tue, 14 Nov 2006 11:30:52 +0000 (12:30 +0100)]
[ALSA] hda-codec - Add support for Sony UX-90s
Added the model entry (model=hippo) for Sony UX-90s with ALC262 codec.
Although the device has no SPDIF output, the hippo model adds a
PCM output, but it must be harmless.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Tobin Davis [Tue, 14 Nov 2006 11:13:39 +0000 (12:13 +0100)]
[ALSA] Add Conexant audio support to the HD Audio driver
This driver adds limited support for the Conexant 5045 and 5047 HD Audio
codecs. Some issues still need to be resolved. The code is based
primarily on code from the Analog Devices AD1981 support and the Realtek
ALC260 support. Some code came from the original code developed by Alex
Pototskiy (see alsa bugtracker 2485).
Signed-off-by: Tobin Davis <tdavis@dsl-only.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
James Courtier-Dutton [Sat, 11 Nov 2006 10:52:06 +0000 (10:52 +0000)]
[ALSA] snd-ca0106: Updated Enum control names.
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
James Courtier-Dutton [Sat, 11 Nov 2006 10:48:58 +0000 (10:48 +0000)]
[ALSA] snd-emu10k1: Update Enum naming.
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Takashi Iwai [Thu, 9 Nov 2006 15:47:26 +0000 (16:47 +0100)]
[ALSA] ice1724 - Add support of M-Audio Audiophile 192
Added the (experimental) support of M-Audio Audiophile 192 board.
Currently, the analog and the digital playbacks seem working fine.
The inputs seem not working as far as I've tested yet.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Liam Girdwood [Thu, 9 Nov 2006 15:35:01 +0000 (16:35 +0100)]
[ALSA] ASoC - mixer name changes for older OSS app support
This patch suggested by Richard Purdie changes the names of some WM8731
and WM8750 mixers so that they will be recognised by some older OSS
mixer apps.
Changes:-
o WM8731 Playback changed to Master Playback
o WM8750 Out1 changed to Headphone
o WM8750 Out2 changed to Speaker
Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Andrew L. Neporada [Tue, 7 Nov 2006 10:37:08 +0000 (11:37 +0100)]
[ALSA] hda-codec - Clevo M540JE, M550JE laptops (Nvidia MCP51 chipset, ALC883 codec)
We need to enable External Amplifier on this laptops. This patch basicly
adds laptop-eapd model to ALC883 codec.
Signed-off-by: Andrew L. Neporada <nepal@asplinux.ru>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Takashi Iwai [Mon, 6 Nov 2006 14:38:55 +0000 (15:38 +0100)]
[ALSA] hdspm - Fix printk warnings
sound/pci/rme9652/hdspm.c: In function 'snd_hdspm_hw_params':
sound/pci/rme9652/hdspm.c:3681: warning: format '%08X' expects type 'unsigned int', but argument 4 has type 'unsigned char *'
sound/pci/rme9652/hdspm.c:3692: warning: format '%08X' expects type 'unsigned int', but argument 4 has type 'unsigned char *'
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Takashi Iwai [Mon, 6 Nov 2006 13:45:42 +0000 (14:45 +0100)]
[ALSA] hda-codec - Fix model for ASUS M2N-MX
Add a proper model (3stack) for ASUS M2N-MX with
AD1986A codec.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Clemens Ladisch [Mon, 6 Nov 2006 08:26:41 +0000 (09:26 +0100)]
[ALSA] maestro3: add request_firmware()
Load the ASSP codes using request_firmware(), if possible, instead of
using the built-in blobs.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Clemens Ladisch [Mon, 6 Nov 2006 08:24:29 +0000 (09:24 +0100)]
[ALSA] korg1212: add request_firmware()
Load the DSP code using request_firmware(), if possible, instead of
using the built-in blob.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Clemens Ladisch [Mon, 6 Nov 2006 08:21:58 +0000 (09:21 +0100)]
[ALSA] wavefront: add request_firmware()
Load the YSS225 register initialization data using request_firmware(),
if possible, instead of using the built-in data blob.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Clemens Ladisch [Mon, 6 Nov 2006 08:20:04 +0000 (09:20 +0100)]
[ALSA] wavefront: simplify YSS225 register initialization
Instead of using a somewhat algorithmic approach of initializing the
YSS225's registers, just use a simple series of port/value pairs.
This makes it easier to later replace or entirely remove the register
data blob.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Clemens Ladisch [Mon, 6 Nov 2006 08:18:34 +0000 (09:18 +0100)]
[ALSA] sb16: add request_firmware()
Load the CSP programs using request_firmware(), if possible, instead of
using the built-in firmware blobs.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Hubert Kahlert [Tue, 31 Oct 2006 14:31:27 +0000 (15:31 +0100)]
[ALSA] Fix mask to stop AT91 SSC clock on shutdown
This patch by Frank Mandarino and Hubert Kahlert fixes a bug in the AT91
SSC (i2s) shutdown code that would erroneously disable other AT91
peripheral clocks.
Signed-off-by: Hubert Kahlert <hkahlert@hk-datentechnik.de>
Signed-off-by: Frank Mandarino <fmandarino@endrelia.com>
Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Matt Porter [Thu, 26 Oct 2006 15:12:59 +0000 (17:12 +0200)]
[ALSA] hda: add dig mic support for sigmatel codecs
Adds support for digital microphone pin widgets on SigmaTel codecs.
Enables support only on the 9205 codecs for now.
Signed-off-by: Matt Porter <mporter@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Takashi Iwai [Tue, 24 Oct 2006 17:49:39 +0000 (19:49 +0200)]
[ALSA] hda-codec - Fix model for Lenovo A60 desktop
Add a proper model entry (3stack) for Lenovo A60 desktop with
AD1986a codec to fix noise problems.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Takashi Iwai [Tue, 24 Oct 2006 16:25:29 +0000 (18:25 +0200)]
[ALSA] ac97 - Suppress power-saving mode on non-supporting drivers
Don't enable power-saving mode on drivers that don't support
it. The supporting drivers set AC97_SCAP_POWER_SAVE to scaps
at creation of ac97 instance.
Currently enable on the following drivers: intel8x0, intel8x0m,
atiixp, atiixp-modem, via82xx and via82xx-modem.
Also, a bit clean up of power-saving stuff:
- Don't create an own workq
- Remove superfluous ifdefs
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Mariusz Domanski [Mon, 23 Oct 2006 11:42:56 +0000 (13:42 +0200)]
[ALSA] hda-codec - Add asus model to ALC861 codec
This patch adds support for Asus laptops (for example: Asus
A6Rp-AP002).
Signed-off-by: Mariusz Domanski <mariook@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Liam Girdwood [Thu, 19 Oct 2006 18:35:56 +0000 (20:35 +0200)]
[ALSA] ASoC: Add support for BCLK based on (Rate * Chn * Word Size)
This patch adds support for the DAI BCLK to be generated by multiplying
Rate * Channels * Word Size (RCW).
This now gives 3 options for BCLK clocking and synchronisation :-
1. BCLK = Rate * x
2. BCLK = MCLK / x
3. BCLK = Rate * Chn * Word Size. (New)
Changes:-
o Add support for RCW generation of BCLK
o Update Documentation to include RCW.
o Update DAI documentation for label = value DAI modes.
o Add RCW support to wm8731, wm8750 and pxa2xx-i2s drivers.
Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Frank Mandarino [Thu, 19 Oct 2006 16:22:53 +0000 (18:22 +0200)]
[ALSA] ASoC AT91 DAI modes update
This patch by Frank Mandarino updates the AT91RM9200 I2S DAI audio modes
as follows:-
o fixes a typo in the 16k mode
o removes experimental 24k mode
o adds a 32k mode.
Signed-off-by: Frank Mandarino <fmandarino@endrelia.com>
Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Remy Bruno [Tue, 17 Oct 2006 10:41:56 +0000 (12:41 +0200)]
[ALSA] hdsp - Add DDS register support for RME9632 rev >= 152
Add DDS register support for RME9632 rev >= 152.
This register sets the sample rate for these cards and is required
in addition to the standard control register. It corresponds to a
quartz divisor.
Signed-off-by: Remy Bruno <remy.bruno@trinnov.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Kailang Yang [Tue, 17 Oct 2006 10:32:26 +0000 (12:32 +0200)]
[ALSA] hda-codec - Add new modesl for Realtek codecs
Changes from Realtek driver:
- New models hippo and hippo_1 for ALC262
- New models tagra-dig and tagra-2ch-dig for ALC883
- New id for ALC660 codec chip
Signed-off-by: Kailang Yang <kailang@realtek.com.tw>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Tobin Davis [Tue, 17 Oct 2006 10:00:28 +0000 (12:00 +0200)]
[ALSA] hda-codec - Add toshiba model to ALC861 codec
This patch adds support for Toshiba laptops. Code is from
RealTek's alsa-driver-1.0.12-4.05b tree.
Signed-off-by: Tobin Davis <tdavis@dsl-only.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Liam Girdwood [Mon, 16 Oct 2006 19:19:48 +0000 (21:19 +0200)]
[ALSA] ASoC - Fix build warnings in soc-core.c
This patch fixes some build warnings in soc-core.c
Changes:-
o Check the return value of soc_ac97_dev_register()
o Check return value of calls to device_create_file()
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Jerome Demange [Mon, 16 Oct 2006 19:08:57 +0000 (21:08 +0200)]
[ALSA] ac97 - enables sound output through speakers on MSI S250 laptop
Signed-off-by: Jerome Demange <jdemange@cict.fr>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Remy Bruno [Mon, 16 Oct 2006 10:46:32 +0000 (12:46 +0200)]
[ALSA] hdspm: Add support for AES32
Add support for AES32. Difference between MADI and AES32 is done
through revision. Master support is not finished for now (RME so-called DDS
feature is not supported yet)
Signed-off-by: Remy Bruno <remy.bruno@trinnov.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Takashi Iwai [Fri, 13 Oct 2006 18:09:59 +0000 (20:09 +0200)]
[ALSA] Remove trailing whitespaces from soc/* files
Remove trailing whitespaces from soc/* files added by the
conversion to C99-style initialization.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Liam Girdwood [Fri, 13 Oct 2006 17:13:41 +0000 (19:13 +0200)]
[ALSA] ASoC debug output build breakage
This patch fixes a build failure when ASoC debug is enabled.
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Takashi Iwai [Fri, 13 Oct 2006 10:46:10 +0000 (12:46 +0200)]
[ALSA] hda-codec - Add missing comma
Added a missing comma in the medion patch.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Liam Girdwood [Fri, 13 Oct 2006 10:33:56 +0000 (12:33 +0200)]
[ALSA] ASoC DAI capabilities labelling
This patch suggested by Takashi changes the DAI capabilities definitions
in pxa-i2s.c, at91rm9200-i2s.c, wm8731.c, wm8750.c and wm9712.c to use a
label = value style.
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Tobin Davis [Fri, 13 Oct 2006 10:32:16 +0000 (12:32 +0200)]
[ALSA] hda-codec - Add support for Medion laptops
This patch adds audio support for Medion's line of laptops,
based on code shipped with the laptops. Microphone support is
still being explored.
Signed-off-by: Tobin Davis <tdavis@dsl-only.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Liam Girdwood [Thu, 12 Oct 2006 12:34:32 +0000 (14:34 +0200)]
[ALSA] ASoC pxa2xx build support
This patch builds ASoC pxa2xx support for Corgi, Spitz, Tosa and Poodle
Zaurus machines.
From: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Liam Girdwood [Thu, 12 Oct 2006 12:33:45 +0000 (14:33 +0200)]
[ALSA] ASoC pxa2xx Poodle machine support
This patch adds Alsa audio support to the Sharp Zaurus SL-C5600 (Poodle)
machine.
From: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Liam Girdwood [Thu, 12 Oct 2006 12:33:09 +0000 (14:33 +0200)]
[ALSA] ASoC pxa2xx Tosa machine support
This patch adds Alsa audio support to the Sharp Zaurus SL-C6000 (Tosa)
machine.
From: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Dirk Opfer <Dirk@Opfer-Online.de>
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Liam Girdwood [Thu, 12 Oct 2006 12:32:13 +0000 (14:32 +0200)]
[ALSA] ASoC pxa2xx Spitz machine support
This patch adds Alsa audio support to the Sharp Zaurus SL-C1000/SL-C3x00
(Akita/Spitz) machines.
From: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Liam Girdwood [Thu, 12 Oct 2006 12:31:16 +0000 (14:31 +0200)]
[ALSA] ASoC pxa2xx Corgi machine support
This patch adds Alsa audio support to the Sharp Zaurus SL-C7x0/C860
(Corgi) machines.
From: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Graeme Gregory <dp@xora.org.uk>
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Liam Girdwood [Thu, 12 Oct 2006 12:29:03 +0000 (14:29 +0200)]
[ALSA] ASoC pxa2xx AC97 support
This patch adds pxa2xx AC97 ASoC audio support. It's based on
sound/arm/pxa-ac97 by Nicolas Pitre with the following differences.
o Modified driver structure to use ASoC core PCM callbacks.
o Removed AC97 configuration function (all handled in ASoC core)
o Added and exported ASoC DAI configuration table.
o Added DMA support for AUX DAC and Mic ADC
o Separated out AC97 reset into cold and warm reset functions.
From: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Liam Girdwood [Thu, 12 Oct 2006 12:28:10 +0000 (14:28 +0200)]
[ALSA] ASoC pxa2xx I2S support
This patch adds pxa2xx I2S ASoC audio support. Features:-
o Supports playback/capture
o 16 bit PCM
o 8k - 96k sample rates
o Supports master and slave mode.
From: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Liam Girdwood [Thu, 12 Oct 2006 12:26:55 +0000 (14:26 +0200)]
[ALSA] ASoC pxa2xx DMA support
This patch adds pxa2xx ASoC DMA audio support. It's based on
sound/arm/pxa-pcm.c by Nicolas Pitre with the following differences.
o Modified driver structure to use ASoC core PCM callbacks and data
structures.
o Registration with ASoC core.
From: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Clemens Ladisch [Wed, 11 Oct 2006 10:05:59 +0000 (12:05 +0200)]
[ALSA] ymfpci: add request_firmware()
Load the DSP and controller microcode using request_firmware(), if
possible, instead of using the built-in firmware.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
James Courtier-Dutton [Tue, 10 Oct 2006 17:44:29 +0000 (18:44 +0100)]
[ALSA] snd-emu10k1: emu1010: replace long udelay with msleep.
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
James Courtier-Dutton [Tue, 10 Oct 2006 17:08:45 +0000 (18:08 +0100)]
[ALSA] snd-emu10k1: Add emu1010 internal clock rate control for 44100 or 48000.
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Takashi Iwai [Tue, 10 Oct 2006 13:59:46 +0000 (15:59 +0200)]
[ALSA] Fix irq handler in soc/at91/at91rm9200-i2s.c
Fixed the irq handler in soc/at91-at91rm9200-i2s.c to follow the
new style without pt_regs.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
James Courtier-Dutton [Mon, 9 Oct 2006 22:08:00 +0000 (23:08 +0100)]
[ALSA] snd_emu10k1: Added support for 14dB Attenuation PADS on DACs and ADCs.
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Remy Bruno [Mon, 9 Oct 2006 13:52:01 +0000 (15:52 +0200)]
[ALSA] hdsp: support for mixer matrix of RME9632 rev 152
Added the support for mixer matrix of RME9632 rev 152.
Signed-off-by: Remy Bruno <remy.bruno@trinnov.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Clemens Ladisch [Mon, 9 Oct 2006 06:18:26 +0000 (08:18 +0200)]
[ALSA] emu10k1: select FW_LOADER
Let the emu10k1 driver select FW_LOADER because the new Emu1010 support
requires it.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Clemens Ladisch [Mon, 9 Oct 2006 06:17:48 +0000 (08:17 +0200)]
[ALSA] pci: select FW_LOADER instead of depending on it
Let the AudioScience, Echoaudio and Riptide drivers select FW_LOADER
instead of depending on it so that they can be configured without having
to enable FW_LOADER manually.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Clemens Ladisch [Mon, 9 Oct 2006 06:14:58 +0000 (08:14 +0200)]
[ALSA] soc-core: fix multi-line string literal
Properly quote a string that had an embedded newline.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Frank Mandarino [Fri, 6 Oct 2006 16:41:42 +0000 (18:41 +0200)]
[ALSA] ASoC AT91RM92000 build
This patch adds a Makefile and Kconfig to build the ASoC AT91RM9200
support.
Signed-off-by: Frank Mandarino <fmandarino@endrelia.com>
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Frank Mandarino [Fri, 6 Oct 2006 16:41:10 +0000 (18:41 +0200)]
[ALSA] ASoC AT91RM92000 eti_b1 machine support
This patch adds support for the Endrelia ETI_B1 machine using the WM8731
codec and the AT91RM9200 platform.
Signed-off-by: Frank Mandarino <fmandarino@endrelia.com>
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Frank Mandarino [Fri, 6 Oct 2006 16:40:25 +0000 (18:40 +0200)]
[ALSA] ASoC AT91RM92000 I2S support
This patch adds I2S support to the Atmel AT91RM9200 CPU.
Features:-
o Playback/Capture supported.
o 16 Bit data size.
o 8k - 48k sample rates.
o ssc0, ssc1 and ssc2 supported as I2S ports.
Signed-off-by: Frank Mandarino <fmandarino@endrelia.com>
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Frank Mandarino [Fri, 6 Oct 2006 16:39:29 +0000 (18:39 +0200)]
[ALSA] ASoC AT91RM92000 audio DMA
This patch adds ASoC audio DMA support to the Atmel AT91RM9200 CPU.
Features:-
o Playback/Capture supported.
o 16 Bit data size.
Signed-off-by: Frank Mandarino <fmandarino@endrelia.com>
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Richard Purdie [Fri, 6 Oct 2006 16:38:37 +0000 (18:38 +0200)]
[ALSA] ASoC codecs: build files
This patch adds an ASoC Makefile and Kconfig for the WM8731, WM8750 and
WM9712 codecs.
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Richard Purdie [Fri, 6 Oct 2006 16:38:03 +0000 (18:38 +0200)]
[ALSA] ASoC codecs: generic AC97 support
This patch allows the std Alsa AC97 codec driver to use any AsoC AC97
controller driver. Currently, only HiFi playback and Capture are
supported atm.
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Richard Purdie [Fri, 6 Oct 2006 16:37:32 +0000 (18:37 +0200)]
[ALSA] ASoC codecs: WM9712 support
This patch adds ASoC support for the WM9712 codec.
Supported features:-
o Capture/Playback/Sidetone/Bypass.
o Aux DAC.
o 8k - 48k sample rates.
o DAPM.
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Richard Purdie [Fri, 6 Oct 2006 16:36:39 +0000 (18:36 +0200)]
[ALSA] ASoC codecs: WM8750 support
This patch adds ASoC support for the WM8750 codec.
Supported features:-
o Capture/Playback/Sidetone/Bypass.
o 16 & 24 bit audio.
o 8k - 96k sample rates.
o DAPM.
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Richard Purdie [Fri, 6 Oct 2006 16:36:07 +0000 (18:36 +0200)]
[ALSA] ASoC codecs: WM8731 support
This patch adds ASoC support for the WM8731 codec.
Supported features:-
o Capture/Playback/Sidetone/Bypass.
o 16 & 24 bit audio.
o 8k - 96k sample rates.
o DAPM.
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Liam Girdwood [Fri, 6 Oct 2006 16:34:51 +0000 (18:34 +0200)]
[ALSA] ASoC: documentation & maintainer
This patch adds documentation describing the ASoC architecture and a
maintainer entry for ASoC.
The documentation includes the following files:-
codec.txt: Codec driver internals.
DAI.txt: Description of Digital Audio Interface standards and how to
configure a DAI within your codec and CPU DAI drivers.
dapm.txt: Dynamic Audio Power Management.
platform.txt: Platform audio DMA and DAI.
machine.txt: Machine driver internals.
pop_clicks.txt: How to minimise audio artifacts.
clocking.txt: ASoC clocking for best power performance.
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Liam Girdwood [Fri, 6 Oct 2006 16:33:55 +0000 (18:33 +0200)]
[ALSA] ASoC: Build files
This patch adds support for building the ASoC core and the dynamic audio
power management support.
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Richard Purdie [Fri, 6 Oct 2006 16:32:18 +0000 (18:32 +0200)]
[ALSA] ASoC: dynamic audio power management (DAPM)
This patch adds Dynamic Audio Power Management (DAPM) to ASoC.
Dynamic Audio Power Management (DAPM) is designed to allow portable and
handheld Linux devices to use the minimum amount of power within the
audio subsystem at all times. It is independent of other kernel PM and
as such, can easily co-exist with the other PM systems.
DAPM is also completely transparent to all user space applications as
all power switching is done within the ASoC core. No code changes or
recompiling are required for user space applications. DAPM makes power
switching decisions based upon any audio stream (capture/playback)
activity and audio mixer settings within the device.
DAPM spans the whole machine. It covers power control within the entire
audio subsystem, this includes internal codec power blocks and machine
level power systems.
There are 4 power domains within DAPM:-
1. Codec domain - VREF, VMID (core codec and audio power)
Usually controlled at codec probe/remove and suspend/resume, although
can be set at stream time if power is not needed for sidetone, etc.
2. Platform/Machine domain - physically connected inputs and outputs
Is platform/machine and user action specific, is configured by the
machine driver and responds to asynchronous events e.g when HP are
inserted
3. Path domain - audio subsystem signal paths
Automatically set when mixer and mux settings are changed by the user.
e.g. alsamixer, amixer.
4. Stream domain - DAC's and ADC's.
Enabled and disabled when stream playback/capture is started and stopped
respectively. e.g. aplay, arecord.
All DAPM power switching decisions are made automatically by consulting
an audio routing map of the whole machine. This map is specific to each
machine and consists of the interconnections between every audio
component (including internal codec components).
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Frank Mandarino [Fri, 6 Oct 2006 16:31:09 +0000 (18:31 +0200)]
[ALSA] ASoC: core code
This patch is the core of ASoC functionality.
The ASoC core is designed to provide the following features :-
o Codec independence. Allows reuse of codec drivers on other platforms
and machines.
o Platform driver code reuse. Reuse of platform specific audio DMA and
DAI drivers on different machines.
o Easy I2S/PCM digital audio interface configuration between codec and
SoC. Each SoC interface and codec registers their audio interface
capabilities with the core at initialisation. The capabilities are
subsequently matched and configured at run time for best power and
performance when the application hw params are known.
o Machine specific controls/operations: Allow machines to add controls
and operations to the audio subsystem. e.g. volume control for speaker
amp.
To achieve all this, ASoC splits an embedded audio system into 3
components :-
1. Codec driver: The codec driver is platform independent and contains
audio controls, audio interface capabilities, codec dapm and codec IO
functions.
2. Platform driver: The platform driver contains the audio dma engine
and audio interface drivers (e.g. I2S, AC97, PCM) for that platform.
3. Machine driver: The machine driver handles any machine specific
controls and audio events. i.e. turning on an amp at start of playback.
Signed-off-by: Frank Mandarino <fmandarino@endrelia.com>
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Liam Girdwood <liam.Girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Richard Purdie [Fri, 6 Oct 2006 16:20:14 +0000 (18:20 +0200)]
[ALSA] ASoC: core and dapm headers
This patch adds the ASoC and DAPM headers.
Features:-
o Defines Digital Audio Interface (DAI) API
o Defines Codec, Platform and Machine API
o Defines Dynamic Audio Power Management API
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Takashi Iwai [Fri, 6 Oct 2006 15:06:39 +0000 (17:06 +0200)]
[ALSA] intel8x0 - Use pci_iomap
Use pci_iomap and ioread*/iowrite*() functions for accessing
hardwares. pci_iomap is suitable for hardwares like ICH and
compatible that have both PIO and MMIO.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Jaroslav Kysela [Fri, 6 Oct 2006 13:12:29 +0000 (15:12 +0200)]
[ALSA] pcm core: add prealloc_max file to substream directory to show maximum DMA size
Users ask us many times about the maximum DMA size for PCM devices. This
file gives them a hint in KB.
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Jaroslav Kysela [Fri, 6 Oct 2006 07:34:20 +0000 (09:34 +0200)]
[ALSA] hda_intel: increase maximum DMA buffer size to 1024MB
See ALSA bug#2481 .
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Takashi Iwai [Thu, 5 Oct 2006 14:21:19 +0000 (16:21 +0200)]
[ALSA] emu10k1 - Fix compile warning
Fixed a compile warning regarding print format for size_t.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Johannes Berg [Thu, 5 Oct 2006 14:02:22 +0000 (16:02 +0200)]
[ALSA] alsa core: convert to list_for_each_entry*
This patch converts most uses of list_for_each to list_for_each_entry all
across alsa. In some place apparently an item can be on a list with
different pointers so of course that isn't compatible with list_for_each, I
therefore didn't touch those places.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Johannes Berg [Thu, 5 Oct 2006 13:08:23 +0000 (15:08 +0200)]
[ALSA] aoa: fix up i2sbus_attach_codec
This patch changes i2sbus_attach_codec to implement a proper error handling
strategy using labels to jump to the right part. Since it has an elaborate
set-up sequence it also needs that tear-down, which I had hard-coded
inbetween all the checks. This increases readability and should reduce .text
size as well.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Johannes Berg [Thu, 5 Oct 2006 13:07:23 +0000 (15:07 +0200)]
[ALSA] aoa: set device pointer in pcms
This patch makes a few whitespace cleanups and makes i2sbus assign the new
struct device pointer in struct snd_pcm so that the proper device symlink
shows up in sysfs.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Johannes Berg [Thu, 5 Oct 2006 13:06:34 +0000 (15:06 +0200)]
[ALSA] alsa core: add struct device pointer to struct snd_pcm
This patch adds a struct device pointer to struct snd_pcm in order to be
able to give it a different device than the card. It defaults to the card's
device, however, so it should behave identically for drivers not touching
the field.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Johannes Berg [Thu, 5 Oct 2006 13:05:34 +0000 (15:05 +0200)]
[ALSA] allow registering an alsa device with struct device pointer
This patch adds snd_register_device_for_dev taking a struct device
pointer to link the new device to and makes snd_register_device a simple
static inline wrapper around it.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Jochen Voss [Wed, 4 Oct 2006 16:08:43 +0000 (18:08 +0200)]
[ALSA] Enable the analog loopback of the Revolution 5.1
Enable the analog loopback of the Revolution 5.1 card.
This patch adds support for the PT2258 volume controller and modifies
the Revolution 5.1 driver to make use of this facility. This allows
to control the analog loopback of the card.
Signed-off-by: Jochen Voss <voss@seehuhn.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Jochen Voss [Wed, 4 Oct 2006 16:04:10 +0000 (18:04 +0200)]
[ALSA] Enable capture from line-in and CD on Revolution 5.1
Enable capture from line-in and CD on the Revolution 5.1 card.
This patch adds support for switching between the 5 input channels of
the AK5365 ADC and modifies the Revolution 5.1 driver to make use of
this facility. Previously the capture channel was fixed to channel 0
(microphone on the Revolution 5.1 card).
Signed-off-by: Jochen Voss <voss@seehuhn.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Clemens Ladisch [Wed, 4 Oct 2006 11:42:57 +0000 (13:42 +0200)]
[ALSA] usb-audio: allow pausing
Add pause capabilities for both USB playback and capture streams.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Clemens Ladisch [Wed, 4 Oct 2006 11:41:25 +0000 (13:41 +0200)]
[ALSA] usb-audio: merge playback/capture hardware information structs
The hardware information structures for playback and capture streams,
respectively, are the same, so we can use just one structure for both
streams.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
James Courtier-Dutton [Sun, 1 Oct 2006 09:48:04 +0000 (10:48 +0100)]
[ALSA] snd-emu10k1: Added support for emu1010, including E-Mu 1212m and E-Mu 1820m
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Linus Torvalds [Thu, 8 Feb 2007 18:37:22 +0000 (10:37 -0800)]
Merge branch 'upstream-linus' of /linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mfasheh/ocfs2: (22 commits)
configfs: Zero terminate data in configfs attribute writes.
[PATCH] ocfs2 heartbeat: clean up bio submission code
ocfs2: introduce sc->sc_send_lock to protect outbound outbound messages
[PATCH] ocfs2: drop INET from Kconfig, not needed
ocfs2_dlm: Add timeout to dlm join domain
ocfs2_dlm: Silence some messages during join domain
ocfs2_dlm: disallow a domain join if node maps mismatch
ocfs2_dlm: Ensure correct ordering of set/clear refmap bit on lockres
ocfs2: Binds listener to the configured ip address
ocfs2_dlm: Calling post handler function in assert master handler
ocfs2: Added post handler callable function in o2net message handler
ocfs2_dlm: Cookies in locks not being printed correctly in error messages
ocfs2_dlm: Silence a failed convert
ocfs2_dlm: wake up sleepers on the lockres waitqueue
ocfs2_dlm: Dlm dispatch was stopping too early
ocfs2_dlm: Drop inflight refmap even if no locks found on the lockres
ocfs2_dlm: Flush dlm workqueue before starting to migrate
ocfs2_dlm: Fix migrate lockres handler queue scanning
ocfs2_dlm: Make dlmunlock() wait for migration to complete
ocfs2_dlm: Fixes race between migrate and dirty
...
Linus Torvalds [Thu, 8 Feb 2007 18:04:48 +0000 (10:04 -0800)]
Merge /pub/scm/linux/kernel/git/gregkh/driver-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
Revert "Driver core: convert SPI code to use struct device"
Linus Torvalds [Thu, 8 Feb 2007 18:04:20 +0000 (10:04 -0800)]
Merge /pub/scm/linux/kernel/git/paulus/powerpc
* master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc: (116 commits)
[POWERPC] Add export of vgacon_remap_base
[POWERPC] Remove bogus comment about page_is_ram
[POWERPC] windfarm: don't die on suspend thread signal
[POWERPC] Fix comment in kernel/irq.c
[POWERPC] ppc: Fix booke watchdog initialization
[POWERPC] PPC: Use ARRAY_SIZE macro when appropriate
[POWERPC] Use ARRAY_SIZE macro when appropriate
[POWERPC] Fix ppc64's writing to struct file_operations
[POWERPC] ppc: use syslog macro for the printk log level
[POWERPC] ppc: cs4218_tdm remove extra brace
[POWERPC] Add mpc52xx/lite5200 PCI support
[POWERPC] Only use H_BULK_REMOVE if the firmware supports it
[POWERPC] Fixup error handling when emulating a floating point instruction
[POWERPC] Enable interrupts if we are doing fp math emulation
[POWERPC] Added kprobes support to ppc32
[POWERPC] Make pSeries use the H_BULK_REMOVE hypervisor call
[POWERPC] Clear RI bit in MSR before restoring r13 when returning to userspace
[POWERPC] Fix performance monitor exception
[POWERPC] Compile fixes for arch/powerpc dcr code
[POWERPC] Maple: use mmio nvram
...
Linus Torvalds [Thu, 8 Feb 2007 18:03:28 +0000 (10:03 -0800)]
Merge branch 'drm-patches' of /linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: Allow for 44 bit user-tokens (or drm_file offsets)
drm/via: Disable AGP DMA for chips with the new 3D engine.
drm: update core memory manager from git drm tree
drm: remove drm_ioremap and drm_ioremapfree
i810/i830: use drm_core_ioremap instead of drm_ioremap
drm: use vmalloc_user instead of vmalloc_32 for DRM_SHM
via: allow for npot texture pitch alignment
via: add some new chipsets
via: some PCI posting flushes
Linus Torvalds [Thu, 8 Feb 2007 16:16:44 +0000 (08:16 -0800)]
kbuild: fix space for good (take 103)
Michal Ostrowski points out what the real problem was: the spaces at the
start of the definition of the 'checker-shell' make function.
Cc: Michal Ostrowski <mostrows@watson.ibm.com>
Acked-by: David Miller <davem@davemloft.net>
Acked-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Acked-by: Oleg Verych <olecom@flower.upol.cz>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Greg Kroah-Hartman [Thu, 8 Feb 2007 05:34:08 +0000 (21:34 -0800)]
Revert "Driver core: convert SPI code to use struct device"
This reverts commit
2943ecf2ed32632473c06f1975db47a7aa98c10f.
This should go through the SPI maintainer, it was my fault that it did
not. Especially as it conflicts with other patches he has pending.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Thomas Hellstrom [Thu, 8 Feb 2007 05:14:05 +0000 (16:14 +1100)]
drm: Allow for 44 bit user-tokens (or drm_file offsets)
Mathieu Desnoyers [Thu, 8 Feb 2007 00:04:44 +0000 (19:04 -0500)]
[POWERPC] Add export of vgacon_remap_base
The following macro :
include/asm-powerpc/vga.h:#define VGA_MAP_MEM(x,s) (x + vgacon_remap_base)
is used by drivers/video/console/vgacon.c which can be compiled as a module
(drivers/video/vga16fb.ko).
Therefore, vgacon_remap_base should be exported.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Johannes Berg [Wed, 7 Feb 2007 12:45:45 +0000 (13:45 +0100)]
[POWERPC] Remove bogus comment about page_is_ram
arch/powerpc/mm/mem.c states that page_is_ram is called by the code that
implements /dev/mem, which isn't true. Remove the comment.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Johannes Berg [Mon, 5 Feb 2007 18:30:29 +0000 (19:30 +0100)]
[POWERPC] windfarm: don't die on suspend thread signal
When the windfarm thread gets a suspend signal it will die instead of
freezing. This fixes it.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Johannes Berg [Wed, 13 Dec 2006 12:38:22 +0000 (13:38 +0100)]
[POWERPC] Fix comment in kernel/irq.c
kernel/irq.c contains a comment that speaks of -1 and -2 as interrupt
numbers, but this is actually dependent on configuration options now.
Replace by NO_IRQ and NO_IRQ_ENABLED.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Stefan Roese [Wed, 7 Feb 2007 08:45:55 +0000 (09:45 +0100)]
[POWERPC] ppc: Fix booke watchdog initialization
Fix two problems in the book-e watchdog driver.
a) The 4xx default period was defined wrong
b) Clear status before enabling the watchdog exception
Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>