1c496784a0
Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
...
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (149 commits)
arm: omap: Add omap3_defconfig
AM35xx: Defconfig for AM3517 EVM board
AM35xx: Add support for AM3517 EVM board
omap: 3630sdp: defconfig creation
omap: 3630sdp: introduce 3630 sdp board support
omap3: Add defconfig for IGEP v2 board
omap3: Add minimal IGEP v2 support
omap3: Add CompuLab CM-T35 defconfig
omap3: Add CompuLab CM-T35 board support
omap3: rx51: Add wl1251 wlan driver support
omap3: rx51: Add SDRAM init
omap1: Add default kernel configuration for Herald
omap1: Add board support and LCD for HTC Herald
omap: zoom2: update defconfig for LL_DEBUG_NONE
omap: zoom3: defconfig creation
omap3: zoom: Introduce zoom3 board support
omap3: zoom: Drop i2c-1 speed to 2400
omap3: zoom: rename zoom2 name to generic zoom
omap3: zoom: split board file for software reuse
omap3evm: MIgrate to smsc911x ethernet driver
...
Fix trivial conflict (two unrelated config options added next to each
other) in arch/arm/mach-omap2/Makefile
2009-12-08 08:15:29 -08:00
a421018e8c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
...
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (294 commits)
S3C64XX: Staticise platform data for PCM devices
ASoC: Rename controls with a / in wm_hubs
snd-fm801: autodetect SF64-PCR (tuner-only) card
ALSA: tea575x-tuner: fix mute
ASoC: au1x: dbdma2: plug memleak in pcm device creation error path
ASoC: au1x: dbdma2: fix oops on soc device removal.
ALSA: hda - Fix memory leaks in the previous patch
ALSA: hda - Add ALC661/259, ALC892/888VD support
ALSA: opti9xx: remove snd_opti9xx fields
ALSA: aaci - Clean up duplicate code
ALSA: usb - Fix mixer map for Hercules Gamesurround Muse Pocket LT
ALSA: hda - Add position_fix quirk for HP dv3
ALSA: hda - Add a pin-fix for FSC Amilo Pi1505
ALSA: hda - Fix Cxt5047 test mode
ASoC: pxa/raumfeld: adopt new snd_soc_dai_set_pll() API
ASoC: sh: fsi: Add runtime PM support
sh: ms7724se: Add runtime PM support for FSI
ALSA: hda - Add a position_fix quirk for MSI Wind U115
ALSA: opti-miro: add PnP detection
ALSA: opti-miro: separate comon probing code
...
2009-12-08 07:47:46 -08:00
d9b2c4d0b0
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
...
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (50 commits)
pcmcia: rework the irq_req_t typedef
pcmcia: remove deprecated handle_to_dev() macro
pcmcia: pcmcia_request_window() doesn't need a pointer to a pointer
pcmcia: remove unused "window_t" typedef
pcmcia: move some window-related code to pcmcia_ioctl.c
pcmcia: Change window_handle_t logic to unsigned long
pcmcia: Pass struct pcmcia_socket to pcmcia_get_mem_page()
pcmcia: Pass struct pcmcia_device to pcmcia_map_mem_page()
pcmcia: Pass struct pcmcia_device to pcmcia_release_window()
drivers/pcmcia: remove unnecessary kzalloc
pcmcia: correct handling for Zoomed Video registers in topic.h
pcmcia: fix printk formats
pcmcia: autoload module pcmcia
pcmcia/staging: update comedi drivers
PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket
PCMCIA: ss: allow PCI IRQs > 255
PCMCIA: soc_common: remove 'dev' member from soc_pcmcia_socket
PCMCIA: soc_common: constify soc_pcmcia_socket ops member
PCMCIA: sa1111: remove duplicated initializers
PCMCIA: sa1111: wrap soc_pcmcia_socket to contain sa1111 specific data
...
2009-12-05 09:42:59 -08:00
86e1d57e4f
Merge branch 'topic/hda' into for-linus
2009-12-04 16:22:45 +01:00
baf9226667
Merge branch 'topic/asoc' into for-linus
2009-12-04 16:22:41 +01:00
57648cd52b
Merge branch 'topic/misc' into for-linus
2009-12-04 16:22:37 +01:00
7959832483
Merge branch 'topic/core-change' into for-linus
2009-12-04 16:22:32 +01:00
3482594802
ASoC: Rename controls with a / in wm_hubs
...
This renames from a character / to : of controls. A / occurs below error
messages.
ASoC: Failed to create IN2RP/VXRP debugfs file
ASoC: Failed to create IN2LP/VXRN debugfs file
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com >
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk >
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2009-12-04 10:39:03 +00:00
fb716c0b7b
snd-fm801: autodetect SF64-PCR (tuner-only) card
...
When primary AC97 is not found, don't fail with tons of AC97 errors.
Assume that the card is SF64-PCR (tuner-only).
This makes the SF64-PCR radio card work "out of the box".
Also fixes a bug that can cause an oops here:
if (tea575x_tuner > 0 && (tea575x_tuner & 0x000f) < 4) {
when tea575x_tuner == 16, it passes this check and causes problems
a couple lines below:
chip->tea.ops = &snd_fm801_tea_ops[(tea575x_tuner & 0x000f) - 1];
Tested with SF64-PCR, but I don't have any of those sound or sound+radio cards
to test if I didn't break anything.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org >
Signed-off-by: Takashi Iwai <tiwai@suse.de >
2009-12-03 18:25:40 +01:00
1233faa891
ALSA: tea575x-tuner: fix mute
...
Fix mute state reporting in tea575x-tuner.
This fixes mute function in kradio on SF64-PCR radio card.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org >
Signed-off-by: Takashi Iwai <tiwai@suse.de >
2009-12-03 18:23:20 +01:00
efd9eb96d5
ASoC: au1x: dbdma2: plug memleak in pcm device creation error path
...
free the allocated pcm platform device in the error path.
Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com >
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk >
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2009-12-03 10:49:55 +00:00
1bc8079879
ASoC: au1x: dbdma2: fix oops on soc device removal.
...
platform_device_unregister() frees resources for us, no need to
do it explicitly. Fixes an oops when machine code removes the
soc-audio device.
Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com >
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk >
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2009-12-03 10:49:55 +00:00
ac2c92e0cd
ALSA: hda - Fix memory leaks in the previous patch
...
The previous hack for replacing the codec name give memory leaks at
error paths. This patch fixes them.
Signed-off-by: Takashi Iwai <tiwai@suse.de >
2009-12-03 10:14:10 +01:00
274693f370
ALSA: hda - Add ALC661/259, ALC892/888VD support
...
Fixed List:
1. Add alc_read_coef_idx function
2. Add ALC661 ALC259
3. Add ALC892 ALC888VD
Signed-off-by: Kailang Yang <kailang@realtek.com.tw >
Signed-off-by: Takashi Iwai <tiwai@suse.de >
2009-12-03 10:07:50 +01:00
d8ea23931c
ALSA: opti9xx: remove snd_opti9xx fields
...
Remove snd_opti9xx fields which are indirect arguments to
the snd_opti9xx_configure(). Pass these values as function
arguments.
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl >
Signed-off-by: Takashi Iwai <tiwai@suse.de >
2009-12-02 23:56:10 +01:00
cf5bd652c3
ALSA: aaci - Clean up duplicate code
...
Now snd_ac97_pcm_open() is called with the exactly same arguments
for both playback and capture directions. Remove the unneeded check.
Signed-off-by: Takashi Iwai <tiwai@suse.de >
2009-12-01 16:36:56 +01:00
e0feefc70c
ALSA: usb - Fix mixer map for Hercules Gamesurround Muse Pocket LT
...
Muse Pocket use brocken mixer names, so alsamixer and PA can't use it correctly
This patch add quirk to overwirte default mixers.
Signed-off-by: Alexey Fisher <bug-track@fisher-privat.net >
Signed-off-by: Takashi Iwai <tiwai@suse.de >
2009-12-01 16:00:08 +01:00
b00615d163
Merge branch 'topic/pcm-dma-fix' into topic/core-change
2009-12-01 15:58:15 +01:00
75639e7ee1
Merge branch 'topic/beep-rename' into topic/core-change
2009-12-01 15:58:10 +01:00
980f31c46b
Merge branch 'topic/ice1724-quartet' into topic/hda
2009-12-01 15:57:01 +01:00
9e298f449e
Merge branch 'topic/oxygen' into topic/hda
2009-12-01 15:56:52 +01:00
2f703e7a2e
ALSA: hda - Add position_fix quirk for HP dv3
...
HP dv3 requires position_fix=1.
Reference: Novell bnc#555935
https://bugzilla.novell.com/show_bug.cgi?id=555935
Signed-off-by: Takashi Iwai <tiwai@suse.de >
2009-12-01 14:17:37 +01:00
cfc9b06f0b
ALSA: hda - Add a pin-fix for FSC Amilo Pi1505
...
FSC Amilo Pi 1505 has a buggy BIOS and doesn't set up the HP and
speaker pins properly. Add the pinfix entry for that.
Reference: Novell bnc#557403
https://bugzilla.novell.com/show_bug.cgi?id=557403
Signed-off-by: Takashi Iwai <tiwai@suse.de >
2009-12-01 12:26:18 +01:00
ef47bf386e
Merge branch 'fix/misc' into topic/misc
2009-12-01 08:36:05 +01:00
6c49e2700f
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
...
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: AACI: fix recording bug
ALSA: AACI: fix AC97 multiple-open bug
ASoC: AIC23: Fixing infinite loop in resume path
ASoC: Fix suspend with active audio streams
2009-11-30 13:55:20 -08:00
Linus Torvalds
Takashi Iwai
Joonyoung Shim
Ondrej Zary
Manuel Lauss
Kailang Yang
Krzysztof Helt
Alexey Fisher