]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Sat, 12 Dec 2009 09:42:53 +0000 (10:42 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Overwrite pin config on intel DG45ID board.
Alexey Fisher [Sat, 12 Dec 2009 09:16:41 +0000 (11:16 +0200)]
ALSA: hda - Overwrite pin config on intel DG45ID board.

The pin config provided by BIOS have some problems:
0x0221401f: [Jack] HP Out at Ext Front  <-- other association and sequence
0x02a19020: [Jack] Mic at Ext Front     <-- other association
0x01113014: [Jack] Speaker at Ext Rear  <-- line out (not speaker)
0x01114010: [Jack] Speaker at Ext Rear  <-- line out
0x01a19030: [Jack] Mic at Ext Rear      <-- other association
0x01111012: [Jack] Speaker at Ext Rear  <-- line out
0x01116011: [Jack] Speaker at Ext Rear  <-- line out
0x40f000f0: [N/A] Other at Ext N/A
0x40f000f0: [N/A] Other at Ext N/A
0x40f000f0: [N/A] Other at Ext N/A
0x40f000f0: [N/A] Other at Ext N/A
0x40f000f0: [N/A] Other at Ext N/A
0x01451140: [Jack] SPDIF Out at Ext Rear
0x40f000f0: [N/A] Other at Ext N/A

just overwrite it.

Signed-off-by: Alexey Fisher <bug-track@fisher-privat.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Fri, 11 Dec 2009 13:39:56 +0000 (14:39 +0100)]
Merge branch 'topic/hda' into for-next

14 years agointelhdmi - dont power off HDA link
Wu Fengguang [Fri, 11 Dec 2009 12:15:11 +0000 (20:15 +0800)]
intelhdmi - dont power off HDA link

For codecs without EPSS support (G45/IbexPeak), the hotplug event will
be lost if the HDA is powered off during the time. After that the pin
presence detection verb returns inaccurate info.

So always power-on HDA link for !EPSS codecs.

KarL offers the fact and Takashi recommends to flag hda_bus. Thanks!

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Fri, 11 Dec 2009 12:10:12 +0000 (13:10 +0100)]
Merge branch 'topic/misc' into for-next

14 years agoALSA: hrtimer - Fix lock-up
Takashi Iwai [Fri, 11 Dec 2009 11:51:05 +0000 (12:51 +0100)]
ALSA: hrtimer - Fix lock-up

The timer stop callback can be called from snd_timer_interrupt(), which
is called from the hrtimer callback.  Since hrtimer_cancel() waits for
the callback completion, this eventually results in a lock-up.

This patch fixes the problem by just toggling a flag at stop callback
and call hrtimer_cancel() later.

Reported-and-tested-by: Wojtek Zabolotny <W.Zabolotny@elka.pw.edu.pl>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Fri, 11 Dec 2009 10:25:25 +0000 (11:25 +0100)]
Merge branch 'topic/asoc' into for-next

14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Fri, 11 Dec 2009 06:57:25 +0000 (07:57 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: intelhdmi - add channel mapping for typical configurations
Wu Fengguang [Fri, 11 Dec 2009 04:28:36 +0000 (12:28 +0800)]
ALSA: intelhdmi - add channel mapping for typical configurations

IbexPeak is the first Intel HDMI audio codec to support channel mapping.

Currently the outstanding problem is, the HDMI channel order do not
agree with that of ALSA.  This patch presents workaround for some
typical use cases. It gives priority to the typical ALSA surround
configurations, and defines channel mapping for them.

We may need better kernel+userspace interactive channel mapping scheme.
For example, in current scheme if user plays with the surround50 device,
the kernel is unaware of this and will still select the surround41
channel allocation and channel mapping..

Thanks to Marcin for offering good tips!

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: intelhdmi - channel mapping applies to Pin
Wu Fengguang [Fri, 11 Dec 2009 04:28:35 +0000 (12:28 +0800)]
ALSA: intelhdmi - channel mapping applies to Pin

HDA036-A specifies that the Audio Sample Packet (ASP) Channel Mapping
verbs apply to Digital Display Pin Complex instead of Converter.

With this fix, channel mapping is working as expected for IbexPeak.

Thanks to Marcin for pointing this out!

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: intelhdmi - accept DisplayPort pin
Wu Fengguang [Fri, 11 Dec 2009 04:28:34 +0000 (12:28 +0800)]
ALSA: intelhdmi - accept DisplayPort pin

HDA036 spec states:
  DP (Display Port) indicates whether the Pin Complex Widget supports
  connection to a Display Port sink.  Supported if set to 1. Note that
  it is possible for the pin widget to support more than one digital
  display connection type, e.g. HDMI and DP bit are both set to 1.

Also export the DP pin cap in procfs.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - show HBR(High Bit Rate) pin cap in procfs
Wu Fengguang [Fri, 11 Dec 2009 04:28:33 +0000 (12:28 +0800)]
ALSA: hda - show HBR(High Bit Rate) pin cap in procfs

Note that the HBR capability only applies to HDMI pin.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - Fix LED GPIO setup for HP laptops with IDT codecs
Vitaliy Kulikov [Fri, 11 Dec 2009 06:51:54 +0000 (07:51 +0100)]
ALSA: hda - Fix LED GPIO setup for HP laptops with IDT codecs

This patch fixes an error in processing of the HP BIOS configuration to enable
GPIO based mute LED indicator control. That error causes driver to enable
such control on all HP systems with the 92HD75 IDT codecs and results in
unnecessary toggling of the GPIO on mute control manipulation.

It also adds support of the future HP BIOS configuration extension for the
named control. New configuration string has a format HP_Mute_LED_P_G
where P can be 0 or 1 and defines mute LED GPIO control state (low/high)
that corresponds to the NOT muted state of the master volume
and G is the index of the GPIO to use (0..9)

Lastly, it adds more systems to the support of the audio implementation
as found on HP B-series systems

Signed-off-by: Vitaliy Kulikov <Vitaliy.Kulikov@idt.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoASoC: Fix build of OMAP sound drivers
Olof Johansson [Thu, 10 Dec 2009 17:15:55 +0000 (11:15 -0600)]
ASoC: Fix build of OMAP sound drivers

There are build errors when building for some of the omap2/3 boards without
enabling sound:

sound/built-in.o:(.data+0x43bc): undefined reference to `soc_codec_dev_tlv320aic23'
sound/built-in.o:(.data+0x43cc): undefined reference to `tlv320aic23_dai'

Confused me quite a bit since the drivers that had references to the
codec weren't enabled. Turns out the Makefile was using the wrong
config option to enable them. Patch below.

Reported-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Thu, 10 Dec 2009 10:47:43 +0000 (11:47 +0100)]
Merge branch 'topic/misc' into for-next

14 years agoALSA: opti93x: fix irq releasing if the irq cannot be allocated
Krzysztof Helt [Wed, 9 Dec 2009 19:12:43 +0000 (20:12 +0100)]
ALSA: opti93x: fix irq releasing if the irq cannot be allocated

Use the chip->irq to check if the irq should be released so the irq is not released
if it has not been allocated.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/asoc' into for-linus
Takashi Iwai [Wed, 9 Dec 2009 17:16:15 +0000 (18:16 +0100)]
Merge branch 'topic/asoc' into for-linus

14 years agoMerge branch 'topic/hda' into for-linus
Takashi Iwai [Wed, 9 Dec 2009 17:16:11 +0000 (18:16 +0100)]
Merge branch 'topic/hda' into for-linus

14 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Wed, 9 Dec 2009 13:10:02 +0000 (14:10 +0100)]
Merge branch 'topic/asoc' into for-next

14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Wed, 9 Dec 2009 13:09:27 +0000 (14:09 +0100)]
Merge branch 'topic/misc' into for-next

14 years agoALSA: ice1724 - aureon - modify WM8770 Master & DAC volume
Jaroslav Kysela [Wed, 9 Dec 2009 11:43:44 +0000 (12:43 +0100)]
ALSA: ice1724 - aureon - modify WM8770 Master & DAC volume

The volume levels in original implementation are incorrect and does
not match the dB scale. The real range is linear (in the sense of
the dB scale) from 0dB to -100dB. Remove logaritmic table and make
all volumes from range 0dB..100dB.

The tests are in RedHat's bugzilla #540817.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Wed, 9 Dec 2009 11:34:51 +0000 (12:34 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda/realtek: quirk for D945GCLF2 mainboard
David Santinoli [Wed, 9 Dec 2009 11:34:26 +0000 (12:34 +0100)]
ALSA: hda/realtek: quirk for D945GCLF2 mainboard

Quirk for the ALC662 found on the Intel D945GCLF2 (and possibly other)
mainboards.

Signed-off-by: David Santinoli <david@santinoli.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Wed, 9 Dec 2009 11:30:48 +0000 (12:30 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Terradici HDA controllers does not support 64-bit mode
Jaroslav Kysela [Wed, 9 Dec 2009 09:44:47 +0000 (10:44 +0100)]
ALSA: hda - Terradici HDA controllers does not support 64-bit mode

Confirmed from vendor and tests in RedHat bugzilla #536782 .

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: document: Add direct git link to grub hda-analyzer
Alexey Fisher [Wed, 9 Dec 2009 08:42:07 +0000 (09:42 +0100)]
ALSA: document: Add direct git link to grub hda-analyzer

Just to save some time, add direct git link to grub hda-analyzer

Signed-off-by: Alexey Fisher <bug-track@fisher-privat.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Tue, 8 Dec 2009 17:18:23 +0000 (18:18 +0100)]
Merge branch 'topic/misc' into for-next

14 years agoALSA: radio/sound/miro: fix build, cleanup depends/selects
Randy Dunlap [Tue, 8 Dec 2009 17:13:07 +0000 (09:13 -0800)]
ALSA: radio/sound/miro: fix build, cleanup depends/selects

miropcm20 uses ALSA (snd_) interfaces from the SND_MIRO
driver, so it should depend on SND.
(selecting SND_MIRO when CONFIG_SND is not enabled is a
problem.)

drivers/built-in.o: In function `vidioc_s_ctrl':
radio-miropcm20.c:(.text+0x227499): undefined reference to `snd_aci_cmd'
drivers/built-in.o: In function `vidioc_s_frequency':
radio-miropcm20.c:(.text+0x227574): undefined reference to `snd_aci_cmd'
radio-miropcm20.c:(.text+0x227588): undefined reference to `snd_aci_cmd'
drivers/built-in.o: In function `pcm20_init':
radio-miropcm20.c:(.init.text+0x2a784): undefined reference to `snd_aci_get_aci'

miropcm20 selects SND_MIRO but SND_ISA may be not enabled, so
also select SND_ISA so that the snd-miro driver will be built.
Otherwise there are missing symbols:

ERROR: "snd_opl4_create" [sound/isa/opti9xx/snd-miro.ko] undefined!
ERROR: "snd_wss_pcm" [sound/isa/opti9xx/snd-miro.ko] undefined!
ERROR: "snd_wss_timer" [sound/isa/opti9xx/snd-miro.ko] undefined!
ERROR: "snd_wss_create" [sound/isa/opti9xx/snd-miro.ko] undefined!
ERROR: "snd_wss_mixer" [sound/isa/opti9xx/snd-miro.ko] undefined!

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Tue, 8 Dec 2009 16:25:13 +0000 (17:25 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Generalize EAPD inversion check in patch_analog.c
Takashi Iwai [Tue, 8 Dec 2009 16:23:33 +0000 (17:23 +0100)]
ALSA: hda - Generalize EAPD inversion check in patch_analog.c

Add a flag to spec field so that the EAPD inversion can be checked
outside the relevant control callbacks.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoASoC: Wrong variable returned on error
Roel Kluin [Tue, 8 Dec 2009 00:34:22 +0000 (01:34 +0100)]
ASoC: Wrong variable returned on error

The wrong variable was returned in the case of an error

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Tue, 8 Dec 2009 11:58:31 +0000 (12:58 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Tue, 8 Dec 2009 11:58:22 +0000 (12:58 +0100)]
Merge branch 'topic/misc' into for-next

14 years agoALSA: snd-usb-us122l: add product IDs of US-122MKII and US-144MKII
Tobias Hansen [Mon, 7 Dec 2009 18:08:19 +0000 (19:08 +0100)]
ALSA: snd-usb-us122l: add product IDs of US-122MKII and US-144MKII

I added the product IDs of the new revisions of the devices, so owners
can test whether this suffices to make them work. Patched against ALSA
snapshot 20091207.

Signed-off-by: Tobias Hansen <Tobias.Hansen at physik.uni-hamburg.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - Exclude unusable ADCs for ALC88x
Takashi Iwai [Tue, 8 Dec 2009 11:52:47 +0000 (12:52 +0100)]
ALSA: hda - Exclude unusable ADCs for ALC88x

On Realtek codecs, a digital mic pin is connected often only to a single
ADC.  But the parser tries to set up all ADCs no matter whether the
digital mic is available, and results in non-selectable input source.

This patch adds a check of input-source availability of each ADC, and
excludes ones that don't support all input sources.

Reference: Novell bnc#561235
http://bugzilla.novell.com/show_bug.cgi?id=561235

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - Add missing Line-Out and PCM switches as slave
Takashi Iwai [Tue, 8 Dec 2009 11:36:52 +0000 (12:36 +0100)]
ALSA: hda - Add missing Line-Out and PCM switches as slave

Realtek codecs may have "PCM" and "Line-Out" playback switches, and
they can be slaves for vmaster.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - iMac 9,1 sound patch.
Justin P. Mattock [Mon, 7 Dec 2009 23:07:46 +0000 (15:07 -0800)]
ALSA: hda - iMac 9,1 sound patch.

This is an updated patch for the Apple iMac 9,1 model to add sound.
Original patch posted here:
http://article.gmane.org/gmane.linux.alsa.devel/61361/match=

I have been using this patch for a while now
and have to say it works vary well, except for a few minor
things:

With the iMac 24-inch 3.06GHz Intel Core 2 Duo
everything seems to be working as it should,
        although I have not looked into the microphone
(never really use one, nor have any apps to test,
my guess is it doesn't work, or I never figured out how
to get it to work).

With the iMac 24-inch 2.66GHz Intel Core 2 Duo
everything is the same as with the above machine
except I'm hearing a light scratchy/distortion noise
come out of the speakers when using headphones(above machine
does not do this).

Other than that the sound level is great(especially with good Dj headphones).

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Tested-by: Justin P. Mattock <justinmattock@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: opti93x: set MC indirect registers base from PnP data
Krzysztof Helt [Fri, 4 Dec 2009 17:30:18 +0000 (18:30 +0100)]
ALSA: opti93x: set MC indirect registers base from PnP data

The PnP data on the OPTI931 and OPTI933 contains io port
range for the MC indirect registers. Use the PnP range
instead of hardwired value 0xE0E.

Also, request region of MC indirect registers so it is
marked as used to other drivers (this was missing previously).

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-linus
Takashi Iwai [Fri, 4 Dec 2009 15:22:45 +0000 (16:22 +0100)]
Merge branch 'topic/hda' into for-linus

14 years agoMerge branch 'topic/asoc' into for-linus
Takashi Iwai [Fri, 4 Dec 2009 15:22:41 +0000 (16:22 +0100)]
Merge branch 'topic/asoc' into for-linus

14 years agoMerge branch 'topic/misc' into for-linus
Takashi Iwai [Fri, 4 Dec 2009 15:22:37 +0000 (16:22 +0100)]
Merge branch 'topic/misc' into for-linus

14 years agoMerge branch 'topic/core-change' into for-linus
Takashi Iwai [Fri, 4 Dec 2009 15:22:32 +0000 (16:22 +0100)]
Merge branch 'topic/core-change' into for-linus

14 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Fri, 4 Dec 2009 11:07:05 +0000 (12:07 +0100)]
Merge branch 'topic/asoc' into for-next

14 years agoS3C64XX: Staticise platform data for PCM devices
Mark Brown [Fri, 27 Nov 2009 16:43:53 +0000 (16:43 +0000)]
S3C64XX: Staticise platform data for PCM devices

The symbols aren't declared and don't need to be exported, they go
along with the device structure.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Ben Dooks <ben-linux@fluff.org>
14 years agoASoC: Rename controls with a / in wm_hubs
Joonyoung Shim [Fri, 4 Dec 2009 06:12:10 +0000 (15:12 +0900)]
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>
14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Thu, 3 Dec 2009 17:26:12 +0000 (18:26 +0100)]
Merge branch 'topic/misc' into for-next

14 years agosnd-fm801: autodetect SF64-PCR (tuner-only) card
Ondrej Zary [Fri, 27 Nov 2009 17:18:33 +0000 (18:18 +0100)]
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>
14 years agoALSA: tea575x-tuner: fix mute
Ondrej Zary [Fri, 27 Nov 2009 17:19:28 +0000 (18:19 +0100)]
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>
14 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Thu, 3 Dec 2009 13:13:43 +0000 (14:13 +0100)]
Merge branch 'topic/asoc' into for-next

14 years agoASoC: au1x: dbdma2: plug memleak in pcm device creation error path
Manuel Lauss [Tue, 1 Dec 2009 17:10:35 +0000 (18:10 +0100)]
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>
14 years agoASoC: au1x: dbdma2: fix oops on soc device removal.
Manuel Lauss [Tue, 1 Dec 2009 17:10:34 +0000 (18:10 +0100)]
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>
14 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Thu, 3 Dec 2009 10:21:56 +0000 (11:21 +0100)]
Merge branch 'topic/asoc' into for-next

14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Thu, 3 Dec 2009 09:18:24 +0000 (10:18 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Fix memory leaks in the previous patch
Takashi Iwai [Thu, 3 Dec 2009 09:14:10 +0000 (10:14 +0100)]
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>
14 years agoALSA: hda - Add ALC661/259, ALC892/888VD support
Kailang Yang [Thu, 3 Dec 2009 09:07:50 +0000 (10:07 +0100)]
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>
14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Wed, 2 Dec 2009 22:56:21 +0000 (23:56 +0100)]
Merge branch 'topic/misc' into for-next

14 years agoALSA: opti9xx: remove snd_opti9xx fields
Krzysztof Helt [Wed, 2 Dec 2009 22:27:12 +0000 (23:27 +0100)]
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>
14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Tue, 1 Dec 2009 15:38:51 +0000 (16:38 +0100)]
Merge branch 'topic/misc' into for-next

14 years agoALSA: aaci - Clean up duplicate code
Takashi Iwai [Tue, 1 Dec 2009 15:36:56 +0000 (16:36 +0100)]
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>
14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Tue, 1 Dec 2009 15:00:28 +0000 (16:00 +0100)]
Merge branch 'topic/misc' into for-next

14 years agoALSA: usb - Fix mixer map for Hercules Gamesurround Muse Pocket LT
Alexey Fisher [Tue, 1 Dec 2009 12:40:53 +0000 (13:40 +0100)]
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>
14 years agoMerge branch 'topic/pcm-dma-fix' into topic/core-change
Takashi Iwai [Tue, 1 Dec 2009 14:58:15 +0000 (15:58 +0100)]
Merge branch 'topic/pcm-dma-fix' into topic/core-change

14 years agoMerge branch 'topic/beep-rename' into topic/core-change
Takashi Iwai [Tue, 1 Dec 2009 14:58:10 +0000 (15:58 +0100)]
Merge branch 'topic/beep-rename' into topic/core-change

14 years agoMerge branch 'topic/ice1724-quartet' into topic/hda
Takashi Iwai [Tue, 1 Dec 2009 14:57:01 +0000 (15:57 +0100)]
Merge branch 'topic/ice1724-quartet' into topic/hda

14 years agoMerge branch 'topic/oxygen' into topic/hda
Takashi Iwai [Tue, 1 Dec 2009 14:56:52 +0000 (15:56 +0100)]
Merge branch 'topic/oxygen' into topic/hda

14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Tue, 1 Dec 2009 13:18:39 +0000 (14:18 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Add position_fix quirk for HP dv3
Takashi Iwai [Tue, 1 Dec 2009 13:17:37 +0000 (14:17 +0100)]
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>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Tue, 1 Dec 2009 11:27:40 +0000 (12:27 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Add a pin-fix for FSC Amilo Pi1505
Takashi Iwai [Tue, 1 Dec 2009 11:19:37 +0000 (12:19 +0100)]
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>
14 years agoMerge branch 'fix/misc' into topic/misc
Takashi Iwai [Tue, 1 Dec 2009 07:36:05 +0000 (08:36 +0100)]
Merge branch 'fix/misc' into topic/misc

14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Mon, 30 Nov 2009 17:22:55 +0000 (18:22 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Fix Cxt5047 test mode
Takashi Iwai [Mon, 30 Nov 2009 17:22:04 +0000 (18:22 +0100)]
ALSA: hda - Fix Cxt5047 test mode

The NID 0x1a of Conexant 5047 chip is a mic boost volume only with
the output amp unlike 5045 chip.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Mon, 30 Nov 2009 14:02:26 +0000 (15:02 +0100)]
Merge branch 'fix/misc' into for-next

14 years agoALSA: AACI: fix recording bug
Russell King [Sun, 29 Nov 2009 16:39:59 +0000 (16:39 +0000)]
ALSA: AACI: fix recording bug

pcm->r[1].slots is the double rate slot information, not the
capture information.  For capture, 'pcm' will already be the
capture ac97 pcm structure.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: AACI: fix AC97 multiple-open bug
Russell King [Sun, 29 Nov 2009 16:39:52 +0000 (16:39 +0000)]
ALSA: AACI: fix AC97 multiple-open bug

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'fix/asoc' into fix/misc
Takashi Iwai [Mon, 30 Nov 2009 13:50:37 +0000 (14:50 +0100)]
Merge branch 'fix/asoc' into fix/misc

14 years agoMerge branch 'fix/asoc' into for-next
Takashi Iwai [Mon, 30 Nov 2009 13:44:47 +0000 (14:44 +0100)]
Merge branch 'fix/asoc' into for-next

14 years agoASoC: pxa/raumfeld: adopt new snd_soc_dai_set_pll() API
Daniel Mack [Mon, 30 Nov 2009 13:06:37 +0000 (14:06 +0100)]
ASoC: pxa/raumfeld: adopt new snd_soc_dai_set_pll() API

ALSA's for-2.6.33 branch has a new source argument to
snd_soc_dai_set_pll().

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: sh: fsi: Add runtime PM support
Kuninori Morimoto [Mon, 30 Nov 2009 11:24:48 +0000 (20:24 +0900)]
ASoC: sh: fsi: Add runtime PM support

This patch add support runtime PM.
Driver callbacks for Runtime PM are empty because
the device registers are always re-initialized after
pm_runtime_get_sync(). The Runtime PM functions replaces the
clock framework module stop bit handling in this driver.

Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agosh: ms7724se: Add runtime PM support for FSI
Kuninori Morimoto [Mon, 9 Nov 2009 02:12:49 +0000 (11:12 +0900)]
sh: ms7724se: Add runtime PM support for FSI

Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Mon, 30 Nov 2009 11:00:17 +0000 (12:00 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Add a position_fix quirk for MSI Wind U115
Takashi Iwai [Mon, 30 Nov 2009 10:58:30 +0000 (11:58 +0100)]
ALSA: hda - Add a position_fix quirk for MSI Wind U115

MSI Wind U115 seems to require position_fix=1 explicitly.
Otherwise it screws up PulseAudio.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Mon, 30 Nov 2009 10:46:19 +0000 (11:46 +0100)]
Merge branch 'topic/misc' into for-next

14 years agoALSA: opti-miro: add PnP detection
Krzysztof Helt [Mon, 30 Nov 2009 06:46:56 +0000 (07:46 +0100)]
ALSA: opti-miro: add PnP detection

The PCM12 and PCM20 can be set into the ISA PnP mode. The PCM12 PnP
was sold as the PnP device.
Add code to handle detection of these cards using ISA PnP framework.

Tested on the PCM20 in PnP mode. The PCM12 PnP has the same MS Windows
INF file except for a card name displayed for user.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: opti-miro: separate comon probing code
Krzysztof Helt [Mon, 30 Nov 2009 06:45:47 +0000 (07:45 +0100)]
ALSA: opti-miro: separate comon probing code

Separate common probing code in order to use it
for PnP probing.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'for-2.6.32' into for-2.6.33
Mark Brown [Fri, 27 Nov 2009 16:56:22 +0000 (16:56 +0000)]
Merge branch 'for-2.6.32' into for-2.6.33

14 years agoALSA: ARM: add Raumfeld audio support
Daniel Mack [Fri, 27 Nov 2009 12:47:10 +0000 (13:47 +0100)]
ALSA: ARM: add Raumfeld audio support

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoMerge branch 'topic/pcm-dma-fix' into for-next
Takashi Iwai [Fri, 27 Nov 2009 16:46:34 +0000 (17:46 +0100)]
Merge branch 'topic/pcm-dma-fix' into for-next

14 years agoASoC: AIC23: Fixing infinite loop in resume path
Anuj Aggarwal [Fri, 27 Nov 2009 12:10:58 +0000 (17:40 +0530)]
ASoC: AIC23: Fixing infinite loop in resume path

This patch fixes two issues:
a) Infinite loop in resume function
b) Writes to non-existing registers in resume function

Cc: stable@kernel.org
Signed-off-by: Anuj Aggarwal <anuj.aggarwal@ti.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Fri, 27 Nov 2009 14:18:12 +0000 (15:18 +0100)]
Merge branch 'topic/asoc' into for-next

14 years agoASoC: Revert missing reset_err in wm97*.c
Takashi Iwai [Fri, 27 Nov 2009 14:14:09 +0000 (15:14 +0100)]
ASoC: Revert missing reset_err in wm97*.c

The commit fe3e78e073d25308756f38019956061153267769
      ASoC: Factor out snd_soc_init_card()
removed the error paths that are still valid for wm97* codecs, causing
the compile errors like
  sound/soc/codecs/wm9705.c:399: error: label 'reset_err' used but not defined
  sound/soc/codecs/wm9712.c:687: error: label 'reset_err' used but not defined
  sound/soc/codecs/wm9713.c:1237: error: label 'reset_err' used but not defined

Revert the removed error path codes.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'next/isa' into topic/misc
Takashi Iwai [Fri, 27 Nov 2009 12:27:03 +0000 (13:27 +0100)]
Merge branch 'next/isa' into topic/misc

14 years agomedia/radio: New driver for the radio FM module on Miro PCM20 sound card
Krzysztof Helt [Fri, 27 Nov 2009 10:24:13 +0000 (11:24 +0100)]
media/radio: New driver for the radio FM module on Miro PCM20 sound card

This is recreated driver for the FM module found on Miro
PCM20 sound cards. This driver was removed around the 2.6.2x
kernels because it relied on the removed OSS module. Now, it
uses a current ALSA module (snd-miro) and is adapted to v4l2
layer.

It provides only basic functionality: frequency changing and
FM module muting.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Reviewed-by: Hans Verkuil <hverkuil@xs4all.nl>
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Fri, 27 Nov 2009 11:26:12 +0000 (12:26 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Don't trigger pin-sense for STAC/IDT codecs
Takashi Iwai [Fri, 27 Nov 2009 11:22:44 +0000 (12:22 +0100)]
ALSA: hda - Don't trigger pin-sense for STAC/IDT codecs

STAC/IDT codecs seem to behave weird when SET_PIN_SENSE verb is issued
before reading the jack-detection although the TRIG_REQ pin capability
is given by the hardware.

Since snd_hda_jack_detect() issues the SET_PIN_SENSE verb simply judging
from the pincap, we have to revert the change in the commit
  d56757abc11a21996d9839c0d4e3b2c3666cd318
    ALSA: hda - Replace the rest of jack-detections with snd_hda_jack_detect()
to plain GET_PIN_SENSE verb without triggering.

Reported-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'next/isa' into for-next
Takashi Iwai [Fri, 27 Nov 2009 10:51:23 +0000 (11:51 +0100)]
Merge branch 'next/isa' into for-next

14 years agomedia/radio: New driver for the radio FM module on Miro PCM20 sound card
Krzysztof Helt [Fri, 27 Nov 2009 10:24:13 +0000 (11:24 +0100)]
media/radio: New driver for the radio FM module on Miro PCM20 sound card

This is recreated driver for the FM module found on Miro
PCM20 sound cards. This driver was removed around the 2.6.2x
kernels because it relied on the removed OSS module. Now, it
uses a current ALSA module (snd-miro) and is adapted to v4l2
layer.

It provides only basic functionality: frequency changing and
FM module muting.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Reviewed-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: opti-miro: fix OOPS if hardware is not detected
Krzysztof Helt [Fri, 27 Nov 2009 10:20:56 +0000 (11:20 +0100)]
ALSA: opti-miro: fix OOPS if hardware is not detected

If a hardware is not detected there is a kernel crash
due to not initialized snd_miro->aci pointer. This pointer
is initialized after detection of the opti (miro) chip.

This bug was introduced by patches to expose
ACI mikser outside the snd-miro driver.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: Remove old DMA-mmap code from arm/devdma.c
Takashi Iwai [Thu, 26 Nov 2009 14:08:54 +0000 (15:08 +0100)]
ALSA: Remove old DMA-mmap code from arm/devdma.c

The call of dma_mmap_coherent() is done in the PCM core now.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: pcm - fix page conversion on non-coherent PPC arch
Takashi Iwai [Thu, 26 Nov 2009 14:04:24 +0000 (15:04 +0100)]
ALSA: pcm - fix page conversion on non-coherent PPC arch

The non-cohernet PPC arch doesn't give the correct address by a simple
virt_to_page() for pages allocated via dma_alloc_coherent().
This patch adds a hack to fix the conversion similarly like MIPS.

Note that this doesn't fix perfectly: the pages should be marked with
proper pgprot value.  This will be done in a future implementation like
the conversion to dma_mmap_coherent().

Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>