Commit Graph

229 Commits

Author SHA1 Message Date
Benjamin Herrenschmidt
8c8709334c [PATCH] ppc32: Remove CONFIG_PMAC_PBOOK
This patch removes CONFIG_PMAC_PBOOK (PowerBook support).  This is now
split into CONFIG_PMAC_MEDIABAY for the actual hotswap bay that some
powerbooks have, CONFIG_PM for power management related code, and just left
out of any CONFIG_* option for some generally useful stuff that can be used
on non-laptops as well.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-27 15:11:43 -07:00
Linus Torvalds
3bd19078c2 Merge 'upstream' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6 2005-06-27 14:53:48 -07:00
Linus Torvalds
3e0777b8fa Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input.git manually
Some manual fixups required due to clashes with the PF_FREEZE cleanups.
2005-06-27 14:47:31 -07:00
Tobias Klauser
3e90928d81 [PATCH] sound/oss/via82cxxx_audio: Use the DMA_32BIT_MASK constant
Use the DMA_32BIT_MASK constant from dma-mapping.h
when calling pci_set_dma_mask() or pci_set_consistent_dma_mask()
See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Domen Puncer <domen@coderock.org>
2005-06-27 00:49:23 -04:00
Tobias Klauser
4f11842ebb [PATCH] sound/oss/cmpci: Use the DMA_32BIT_MASK constant
Use the DMA_32BIT_MASK constant from dma-mapping.h when calling
pci_set_dma_mask() or pci_set_consistent_dma_mask() See
http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-25 16:25:09 -07:00
Tobias Klauser
738c7b4f7f [PATCH] sound/oss/es1370: Use the DMA_32BIT_MASK constant
Use the DMA_32BIT_MASK constant from dma-mapping.h when calling
pci_set_dma_mask() or pci_set_consistent_dma_mask() See
http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-25 16:25:08 -07:00
Tobias Klauser
3ee538a2e8 [PATCH] sound/oss/es1371: Use the DMA_32BIT_MASK constant
Use the DMA_32BIT_MASK constant from dma-mapping.h when calling
pci_set_dma_mask() or pci_set_consistent_dma_mask() See
http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-25 16:25:08 -07:00
Tobias Klauser
caac3a444c [PATCH] sound/oss/esssolo1: Use the DMA_32BIT_MASK constant
Use the DMA_32BIT_MASK constant from dma-mapping.h when calling
pci_set_dma_mask() or pci_set_consistent_dma_mask() See
http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-25 16:25:08 -07:00
Adrian Bunk
b6260cd354 [PATCH] change the SOUND_PRIME handling
SOUND_PRIME (for OSS) is a tristate.

This doesn't make much sense if most users are checking for
SOUND_PRIME!=0.

This patch changes the semantics of SOUND_PRIME to being a limit for all
OSS modules, IOW: SOUND_PRIME=m does now say that all OSS drivers can
only be modular.

As a side effect, since SOUND_PRIME already depends on SOUND, there's no
longer a reason for drivers depending on SOUND_PRIME to additionally
depend on SOUND.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-25 16:25:05 -07:00
Adrian Bunk
f25ad2d3b8 [PATCH] sound/oss/sscape.c: remove dead code
The Coverity checker found that sscape_sb_enable never get's assigned any
value different from 0, and therefore some code paths are impossible.

This patch removes this variable and the dead code paths.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-25 16:25:03 -07:00
Adrian Bunk
f040ffab74 [PATCH] sound/oss/rme96xx.c: remove kernel 2.2 #if's
This patch removes #if's for kernel 2.2 .

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-25 16:25:01 -07:00
Dave Jones
4f00945a8e [PATCH] nm256 oss build failure
static declaration follows non static

Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-25 16:25:01 -07:00
Adrian Bunk
155542c271 [PATCH] sound/oss/: cleanups
This patch contains cleanups including the following:
- make needlessly global code static

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-25 16:25:01 -07:00
Jesper Juhl
09417379be [PATCH] remove redundant NULL checks before kfree() in sound/ and avoid casting pointers about to be kfree()'ed
Checking a pointer for NULL before calling kfree() on it is redundant,
kfree() deals with NULL pointers just fine.
This patch removes such checks from sound/

This patch also makes another, but closely related, change.
It avoids casting pointers about to be kfree()'ed.

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-06-25 16:25:00 -07:00
Paulo Marques
543537bd92 [PATCH] create a kstrdup library function
This patch creates a new kstrdup library function and changes the "local"
implementations in several places to use this function.

Most of the changes come from the sound and net subsystems.  The sound part
had already been acknowledged by Takashi Iwai and the net part by David S.
Miller.

I left UML alone for now because I would need more time to read the code
carefully before making changes there.

Signed-off-by: Paulo Marques <pmarques@grupopie.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-23 09:45:18 -07:00
James Courtier-Dutton
2b6b22f381 [ALSA] emu10k1: Add more card identification entries.
EMU10K1/EMU10K2 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-06-22 12:29:11 +02:00
Takashi Iwai
b3e28ce98a [ALSA] Add dxs_support for Soltek SL-K8Tpro-939
VIA82xx driver
Added dxs_support entry for  Soltek SL-K8Tpro-939.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-06-22 12:29:08 +02:00
Matt
dabbed6f72 [ALSA] SigmaTel HDA SPDIF and input mux updates
HDA Codec driver
Adds SPDIF in/out support to the SigmaTel HDA codecs. Now builds
the input mux control element names from the defcfg regs.

Signed-off-by: Matt <matt@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-06-22 12:29:05 +02:00
Takashi Iwai
ee3b4c60f4 [ALSA] via82xx - Fix info text about dxs_support option
VIA82xx driver
Fixed the info text about dxs_support option (suggest dxs_support=5).

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-06-22 12:29:03 +02:00
Takashi Iwai
e9edcee061 [ALSA] hda-codec - More fix of ALC880 codec support
Documentation,HDA Codec driver,HDA generic driver,HDA Intel driver
- Fix some invalid configurations, typos in the last patch
- Make init_verbs chainable, so that different configs can share the same
  init_verbs
- Reorder and clean up the source codes in patch_realtek.c
- Add the pin default configuration parser, used commonly in cmedia
  and realtek patch codes.
- Add 'auto' model to ALC880 for auto-configuration from BIOS
  Use this model as default, and 3-stack as fallback

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-06-22 12:28:59 +02:00
Takashi Iwai
b636a71d9b [ALSA] Add const prefix
Control Midlevel
Add const prefix to snd_kcontrol_new_t pointer for better protection.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-06-22 12:28:54 +02:00
Takashi Iwai
16ded52538 [ALSA] hda-codec - Add support of more models with ALC codecs
HDA Codec driver,HDA Intel driver
Merged the work of pshou <pshou@realtek.com.tw> for the support of
more models with ALC codecs: ALC880 ASUS, Uniwill, FSC1734, generic 6-stack,
and ALC260 HP.  Tests with the real hardwares are appreciated.

The codec patch is cleaned up:  The preset configuration of codecs are
stored in the table and copied to the spec instance.

Added/fixed comments.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-06-22 12:28:51 +02:00
Takashi Iwai
5ecd7022f5 [ALSA] hda-codec - Allow sub_device=0 in board config check
HDA Codec driver
Allow sub_device=0 in board config check.  This means that every device
with the given sub vendor ID will match.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-06-22 12:28:47 +02:00
Takashi Iwai
05acb863a2 [ALSA] hda-codec - Clean up and fix ALC-codec support code
HDA Codec driver
Clean up and fix ALC-codec support code.

The last addition of bound volume is fixed now to handle correctly
the bound 'mute switches'.  The analog loopback should work better.
The init verbs are fixed together with this change.

The numbers are replaced with macros for better readability.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-06-22 12:28:44 +02:00
Takashi Iwai
4b3acaf5b5 [ALSA] hda-codec - Feed front signals to all surrounds
HDA Codec driver
Feed front signals to all surround channels if no data is given
for surround channels.

It seems that CLFE works as expected (only center outputs) even if
connected from the front line - at least on my test system.
If this change causes problems on other system (e.g. only the left
channel is transferred to the center channel), please let me know...

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-06-22 12:28:40 +02:00
Takashi Iwai
3e289f16ec [ALSA] hda-codec - Print all AMP IN values
HDA generic driver
Print all AMP IN values when multiple nodes are connected.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-06-22 12:28:36 +02:00
Takashi Iwai
1ccc67d692 [ALSA] Disable MPU401 on SIS7018
Trident driver
Disable MPU401 support on SIS7018 since it results in kernel freeze.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-06-22 12:28:33 +02:00
Takashi Iwai
41e41f1f34 [ALSA] Fix the analog loopback volumes of ALC codecs
HDA Codec driver
Fix the analog loopback volumes of ALC codecs.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-06-22 12:28:30 +02:00
Takashi Iwai
ead9b7c399 [ALSA] Fix the PCM mixer switch for AD1986A
HDA Codec driver
Fix the PCM mixer switch for AD1986a (it was a typo).

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-06-22 12:28:27 +02:00
Takashi Iwai
4a19faee63 [ALSA] Fix the handling of amp cache in hda-codec
HDA Codec driver
Fixed the handling of amp cache in hda-codec driver.
The confliction of cache values with different indices should be fixed now.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-06-22 12:28:24 +02:00
Jaroslav Kysela
96d078154b [ALSA] via82xx - fixed entry for Umax AB 595T (VIA K8N800A - VT8237)
VIA82xx driver
As the original reporter noted, the NO_VRA must be used for loud volumes.

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-06-22 12:28:21 +02:00
James Courtier-Dutton
c82bf829c0 [ALSA] ca0106: Fix 96000 Hz audio playback.
CA0106 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-06-22 12:28:18 +02:00
Takashi Iwai
763f356cd8 [ALSA] Add HDSP MADI driver
HDSPM driver,PCI drivers,RME9652 driver
Added RME Hammerfall DSP MADI driver by Winfried Ritsch.
(Moved from alsa-driver tree to mainline.)

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-06-22 12:28:11 +02:00
Christoph Schulz
375389288a [ALSA] cs4236-irq-handling-fix.patch
CS4236+ driver
Background: The card/chipset supports an external MIDI interrupt.  By
default, this interrupt isn't used (because the isapnp mechanism chooses a
configuration without an assigned interrupt).  If the user wishes to
explicitly select an interrupt via the mpu_irq parameter for such a
configured device, it doesn't work: The driver always shows:

isapnp MPU: port=0x330, irq=-1

(note the 'irq=-1')

Problem: The driver only allows to set the irq if pnp_irq_valid returns
true for this particular pnp device.  This, however, is only true if an
interrupt has already been assigned (pnp_valid_irq returns true if the flag
IORESOURCE_IRQ is set and IORESOURCE_UNSET is not set).  If no interrupt
has been assigned so far, IORESOURCE_UNSET is set and pnp_irq_valid returns
false, thereby inhibiting the selection of a valid irq.

Solution: Don't check for a valid (= already assigned) irq at the point of
calling pnp_resource_change.

Tested successfully on Linux 2.6.11.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-06-22 12:28:06 +02:00
Jaroslav Kysela
5ac0fab95c [ALSA] OSS PCM emulation - The 2nd final fix for SNDCTL_DSP_GETOPTR problem
ALSA<-OSS emulation
The problem was negative/wrong result (info.bytes) in a specific condition at
playback startup.

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-06-22 12:28:03 +02:00
Takashi Iwai
98c7f2121d [ALSA] Add FSC T3010 quirk
Intel8x0 driver
Added ac97_quirk for FSC T3010.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-06-22 12:27:59 +02:00
Jaroslav Kysela
fb4bd0adc4 [ALSA] OSS PCM emulation - The final fix for SNDCTL_DSP_GETOPTR problem
ALSA<-OSS emulation
The problem was negative result (info.bytes) in a specific condition at
playback startup.

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-06-22 12:27:57 +02:00
Takashi Iwai
21cb2a2ec5 [ALSA] Fix races between PCM drain and other ops
PCM Midlevel
Fix semaphore races between PCM drain and other ops.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-06-22 12:27:53 +02:00
Takashi Iwai
ce43fbaece [ALSA] hda-intel - Fix Oops in the error path
HDA Intel driver
Fixed Oops in the error path from probe function of snd-hda-intel driver.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-06-22 12:27:50 +02:00
Takashi Iwai
b6a969155b [ALSA] Add write support to snd-page-alloc proc file
Documentation,Memalloc module,RME HDSP driver,RME9652 driver
Add the write support to snd-page-alloc proc file for buffer pre-allocation.
Removed the pre-allocation codes via module options.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-06-22 12:27:47 +02:00
Jesper Juhl
4d572776d4 [ALSA] Remove redundant NULL checks before kfree
Timer Midlevel,ALSA sequencer,ALSA<-OSS sequencer,Digigram VX core
I2C tea6330t,GUS Library,VIA82xx driver,VIA82xx-modem driver
CA0106 driver,CS46xx driver,EMU10K1/EMU10K2 driver,YMFPCI driver
Digigram VX Pocket driver,Common EMU synth,USB generic driver,USB USX2Y
Checking a pointer for NULL before calling kfree() on it is redundant,
kfree() deals with NULL pointers just fine.
This patch removes such checks from sound/

This patch also makes another, but closely related, change.
It avoids casting pointers about to be kfree()'ed.

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-06-22 12:27:43 +02:00
James Courtier-Dutton
6fd8b87f0e [ALSA] AC97 - renamed vendor/device to subvendor/subdevice where appropriate
Intel8x0 driver
To avoid confusion, the structure members vendor/device were renamed
to subvendor/subdevice, because we compare them with PCI subsystem vendor
and subsystem device.

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-06-22 12:27:37 +02:00
Jaroslav Kysela
69ad07cf98 [ALSA] AC97 - renamed vendor/device to subvendor/subdevice where appropriate
AC97 Codec,ATIIXP driver,VIA82xx driver
To avoid confusion, the structure members vendor/device were renamed
to subvendor/subdevice, because we compare them with PCI subsystem vendor
and subsystem device.

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-06-22 12:27:34 +02:00
Jaroslav Kysela
745cac56ba [ALSA] via82xx - added 0x1071/0x8399 to while list
VIA82xx driver
- 0x1071, 0x8399 == VIA_DXS_ENABLE
- Umax AB 595T (VIA K8N800A - VT8237)
- reporter: Honza Machacek <Hloupy.Honza@centrum.cz>

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-06-22 12:27:30 +02:00
Sasha Khapyorsky
5cbff89cbc [ALSA] Modem support for ALI5451
ALI5451 driver
This patch adds modem support for ali5451. Since it is same pci device
all is done in ali5451.c.

Signed-off-by: Sasha Khapyorsky <sashak@smlink.com>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-06-22 12:27:27 +02:00
Tobias Klauser
299676b1d7 [ALSA] sound/pci/ca0106: Use the DMA_32BIT_MASK constant
CA0106 driver
Use the DMA_32BIT_MASK constant from dma-mapping.h
when calling pci_set_dma_mask() or pci_set_consistent_dma_mask()
See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-06-22 12:27:24 +02:00
Sasha Khapyorsky
83a5b72ad7 [ALSA] PCI modem drivers update
ATIIXP-modem driver,Intel8x0-modem driver,VIA82xx-modem driver
Modem drivers (atiixp-modem, intel8x0m, via82xx-modem) migration
for using MC97 generic modem mixer for off-hook operation.

Signed-off-by: Sasha Khapyorsky <sashak@smlink.com>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-06-22 12:27:21 +02:00
Sasha Khapyorsky
87d61c290b [ALSA] MC97 modem mixer in sound/pci/ac97
AC97 Codec
Simple MC97 modem mixer with two common controls: Off-hook and CID,
and Si3056 MC specific control: Modem Speaker.

Signed-off-by: Sasha Khapyorsky <sashak@smlink.com>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-06-22 12:27:18 +02:00
James Courtier-Dutton
8fabab15dc [ALSA] Be more specific with which I2C channel to use.
CA0106 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-06-22 12:27:14 +02:00
James Courtier-Dutton
883130b476 [ALSA] Implement S32_LE(24bit) and 96000 capture rates etc.
CA0106 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-06-22 12:27:12 +02:00