]> 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 [Wed, 7 Apr 2010 12:58:05 +0000 (14:58 +0200)]
Merge branch 'topic/hda' into for-next

14 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Wed, 7 Apr 2010 12:58:03 +0000 (14:58 +0200)]
Merge branch 'fix/hda' into for-next

14 years agoALSA: hda: Add support for Medion WIM2160
Maurus Cuelenaere [Tue, 6 Apr 2010 16:12:52 +0000 (18:12 +0200)]
ALSA: hda: Add support for Medion WIM2160

This adds support for the Medion WIM2160 soundcard.
There's no PCI quirk added because it has the same PCI id as the
Medion MD2.

Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - Remove left-over debug printk in patch_realtek.c
Takashi Iwai [Wed, 7 Apr 2010 12:53:00 +0000 (14:53 +0200)]
ALSA: hda - Remove left-over debug printk in patch_realtek.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Wed, 7 Apr 2010 07:07:50 +0000 (09:07 +0200)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Fix ALC882 DAC connections in auto mode
Takashi Iwai [Wed, 7 Apr 2010 07:06:00 +0000 (09:06 +0200)]
ALSA: hda - Fix ALC882 DAC connections in auto mode

Assign DACs properly to each output.  Currently, the front output is bound
to HP/speaker outputs blindly, but they should be assigned to individual
DACs.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'fix/hda' into topic/hda
Takashi Iwai [Wed, 7 Apr 2010 06:38:47 +0000 (08:38 +0200)]
Merge branch 'fix/hda' into topic/hda

14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Wed, 7 Apr 2010 06:05:24 +0000 (08:05 +0200)]
Merge branch 'topic/misc' into for-next

14 years agoALSA: powermac - Fix obsoleted machine_is_compatible()
Takashi Iwai [Wed, 7 Apr 2010 05:45:46 +0000 (07:45 +0200)]
ALSA: powermac - Fix obsoleted machine_is_compatible()

machine_is_compatible() was renamed to of_machine_is_compatible().

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Tue, 6 Apr 2010 16:53:02 +0000 (18:53 +0200)]
Merge branch 'fix/misc' into for-next

14 years agoALSA: mixart: range checking proc file
Dan Carpenter [Tue, 6 Apr 2010 16:31:26 +0000 (19:31 +0300)]
ALSA: mixart: range checking proc file

The original code doesn't take into consideration that the value of
MIXART_BA0_SIZE - pos can be less than zero which would lead to a large
unsigned value for "count".

Also I moved the check that read size is a multiple of 4 bytes below
the code that adjusts "count".

Signed-off-by: Dan Carpenter <error27@gmail.com>
Cc: <stable@kernel.org>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Mon, 5 Apr 2010 21:37:26 +0000 (23:37 +0200)]
Merge branch 'fix/hda' into for-next

14 years agoALSA: hda - Fix a wrong array range check in patch_realtek.c
Takashi Iwai [Mon, 5 Apr 2010 21:25:13 +0000 (23:25 +0200)]
ALSA: hda - Fix a wrong array range check in patch_realtek.c

The commit 6a4f2ccb467e00281470cde2dee08fe5ecde62d1 introduced a wrong
comparision for the array range check, which effectively skips the whole
initialization of DAC connections.  Fixed now.

Reference: bko#15689
https://bugzilla.kernel.org/show_bug.cgi?id=15689

Reported-by: Adrian Ulrich <kernel@blinkenlights.ch>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Mon, 5 Apr 2010 19:28:12 +0000 (21:28 +0200)]
Merge branch 'topic/asoc' into for-next

14 years agoMerge branch 'for-2.6.34' into for-2.6.35
Mark Brown [Mon, 5 Apr 2010 18:19:32 +0000 (19:19 +0100)]
Merge branch 'for-2.6.34' into for-2.6.35

Conflicts due to context changes next to the backported DMA data change:
include/sound/soc.h

14 years agoASoC: Implement interrupt based WM8994 microphone detection
Mark Brown [Mon, 29 Mar 2010 19:57:12 +0000 (20:57 +0100)]
ASoC: Implement interrupt based WM8994 microphone detection

Support interrupt based microphone bias detection. The WM8994 has two
microphone bias supplies, with detection supported on both. Detection
using GPIOs together with the standard GPIO based jack framework is
already supported via the platform data for the WM8994 core driver.

Note that as well as the microphone bias itself the system clock and
whichever AIF clock is supplying the system clock will need to be
enabled for detection to function.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agogpiolib: Implement gpio_to_irq for WM8994 GPIO controller
Mark Brown [Fri, 2 Apr 2010 13:51:59 +0000 (14:51 +0100)]
gpiolib: Implement gpio_to_irq for WM8994 GPIO controller

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agomfd: Add WM8994 interrupt controller support
Mark Brown [Fri, 26 Mar 2010 16:49:15 +0000 (16:49 +0000)]
mfd: Add WM8994 interrupt controller support

The WM8994 has an interrupt controller which supports interrupts for
both CODEC and GPIO portions of the chip. Support this using genirq,
while allowing for systems that do not have an interrupt hooked up.

Wrapper functions are provided for the IRQ request and free to simplify
the code in consumer drivers when handling cases where IRQs are not
set up.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
14 years agoALSA: ASoC: move dma_data from snd_soc_dai to snd_soc_pcm_stream
Daniel Mack [Mon, 22 Mar 2010 09:11:15 +0000 (10:11 +0100)]
ALSA: ASoC: move dma_data from snd_soc_dai to snd_soc_pcm_stream

This fixes a memory corruption when ASoC devices are used in
full-duplex mode. Specifically for pxa-ssp code, where this pointer
is dynamically allocated for each direction and destroyed upon each
stream start.

All other platforms are fixed blindly, I couldn't even compile-test
them. Sorry for any breakage I may have caused.

[Note that this is a backported version for 2.6.34.
 Upstream commit is fd23b7dee]

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Reported-by: Sven Neumann <s.neumann@raumfeld.com>
Reported-by: Michael Hirsch <m.hirsch@raumfeld.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Mon, 5 Apr 2010 16:30:17 +0000 (18:30 +0200)]
Merge branch 'fix/hda' into for-next

14 years agoALSA: hda - Enable amplifiers on Acer Inspire 6530G
Tony Vroon [Mon, 5 Apr 2010 15:30:43 +0000 (16:30 +0100)]
ALSA: hda - Enable amplifiers on Acer Inspire 6530G

After more tests it appears that EAPD needs to be enabled
on both the 0x14 and 0x15 NIDs to enable the main speaker
and headphone amplifiers. The maximum volume setting is
now equal to what the machine achieves under other operating
systems.
Disabling Front or LFE playback triggers EAPD and disables
the amplifier. As such, these two playback switches have
been removed from the mixer.

Signed-off-by: Tony Vroon <tony@linx.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoASoC: Only do WM8994 bias off transition from standby
Mark Brown [Tue, 30 Mar 2010 13:29:14 +0000 (14:29 +0100)]
ASoC: Only do WM8994 bias off transition from standby

Otherwise we may try to power down multiple times when the using
idle bias off and the driver is removed.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
14 years agoASoC: Don't use DCS_DATAPATH_BUSY for WM hubs devices
Mark Brown [Mon, 29 Mar 2010 16:18:41 +0000 (17:18 +0100)]
ASoC: Don't use DCS_DATAPATH_BUSY for WM hubs devices

The DCS_DATAPATH_BUSY bit used to monitor the completion of DC servo
operations has been deprecated and with some more recente revisions
may perform incorrectly, especially when only analogue bypass paths
are in use. Switch to using readback from the DC servo command
register instead, which is supported for all devices. Without this
unacceptably long timeouts may be observed in some circumstances.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
14 years agoASoC: Don't do runtime wm_hubs DC servo updates if using offset correction
Mark Brown [Mon, 29 Mar 2010 15:34:42 +0000 (16:34 +0100)]
ASoC: Don't do runtime wm_hubs DC servo updates if using offset correction

If we need to offset correct the DC servo then don't use runtime
recalibration since that is likely to introduce further offsets
which will be evident on powerdown.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
14 years agoASoC: Support second DC servo readback method for wm_hubs
Mark Brown [Mon, 29 Mar 2010 16:09:45 +0000 (17:09 +0100)]
ASoC: Support second DC servo readback method for wm_hubs

More recent Wolfson hubs devices add the ability to read back the DC
servo calibration information from the register used to write offsets,
and later still ones remove the old readback registers. Add support
for the new scheme, and use it for WM8994 device revisions that
support it.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
14 years agoASoC: Avoid wraparound in wm_hubs DC servo correction
Mark Brown [Mon, 29 Mar 2010 14:24:40 +0000 (15:24 +0100)]
ASoC: Avoid wraparound in wm_hubs DC servo correction

If the correction wraps around then a substantial offset would be
introduced.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Sun, 4 Apr 2010 10:28:13 +0000 (12:28 +0200)]
Merge branch 'topic/misc' into for-next

14 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Sun, 4 Apr 2010 10:28:11 +0000 (12:28 +0200)]
Merge branch 'fix/misc' into for-next

14 years agoALSA: powermac - Add debug log
Risto Suominen [Sun, 4 Apr 2010 05:00:29 +0000 (08:00 +0300)]
ALSA: powermac - Add debug log

Add some debug log in tumbler.c.

Signed-off-by: Risto Suominen <Risto.Suominen@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: powermac - Lineout detection on G4 DA
Risto Suominen [Sun, 4 Apr 2010 05:00:00 +0000 (08:00 +0300)]
ALSA: powermac - Lineout detection on G4 DA

Lineout (Pro Speaker) detection on PowerMac G4 Digital Audio (Tumbler).

Signed-off-by: Risto Suominen <Risto.Suominen@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: powermac - Reverse HP detection on G4 DA
Risto Suominen [Sun, 4 Apr 2010 04:59:30 +0000 (07:59 +0300)]
ALSA: powermac - Reverse HP detection on G4 DA

Reverse headphone detection bit on PowerMac G4 Digital Audio (Tumbler).

Signed-off-by: Risto Suominen <Risto.Suominen@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: echoaudio - Eliminate use after free
Julia Lawall [Fri, 2 Apr 2010 12:47:59 +0000 (14:47 +0200)]
ALSA: echoaudio - Eliminate use after free

Use the call to snd_card_free in the error handling code at the end of the
function, as in the other error cases.

A simplified version of the semantic patch that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
expression E,E2;
@@

snd_card_free(E)
...
(
  E = E2
|
* E
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: i2c: cleanup: change parameter to pointer
Dan Carpenter [Fri, 2 Apr 2010 11:29:23 +0000 (14:29 +0300)]
ALSA: i2c: cleanup: change parameter to pointer

We actually pass an array of 7 chars not 5.
This silences a smatch warning.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Sun, 4 Apr 2010 10:16:31 +0000 (12:16 +0200)]
Merge branch 'fix/hda' into for-next

14 years agoALSA: hda - Add MSI blacklist for Aopen MZ915-M
Takashi Iwai [Sun, 4 Apr 2010 10:14:03 +0000 (12:14 +0200)]
ALSA: hda - Add MSI blacklist for Aopen MZ915-M

The device needs MSI disablement.  Added to the quirk list.

Reported-by: Harald Dunkel <harri@afaics.de>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoASoC: OMAP: Fix capture pointer handling for OMAP1510 to work correctly with recent...
Janusz Krzysztofik [Sun, 28 Mar 2010 20:29:29 +0000 (22:29 +0200)]
ASoC: OMAP: Fix capture pointer handling for OMAP1510 to work correctly with recent ALSA PCM code

With recent (2.6.34) chnages in PCM handling, capture stopped working on my
OMAP1510 based Amstrad Delta videophone.

Using 2.6.34-rc2, I was able to correct the problem in 3 different ways:

1. reverting commit 7b3a177b0d4f92b3431b8dca777313a07533a710,
2. enabling additional jiffies check with
echo 4 >/proc/asound/card0/pcm0c0/xrun_debug
3. applying the patch below.

Since I wasn't able to reproduce the problem on my i686 PC, I guess the
problem is probably machine specific.

The patch reuses the method for software emulation of missing hardware
pointer, already implemented for playback on OMAP1510. It's possible that
event if a hardware pointer is available for capture on this machine, its
behaviour may be not compatible with what upper layer expects.

If you think the problem may be more general and should be solved differently,
on a higher level, I can try to work more on it if you give me a hint.

If the patch gets accepted, I suggest it goes as a fix in the current release
cycle.

Created and tested against linux-2.6.34-rc2.

Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Acked-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agomfd: update gfp/slab.h includes
Tejun Heo [Mon, 29 Mar 2010 17:52:40 +0000 (02:52 +0900)]
mfd: update gfp/slab.h includes

Implicit slab.h inclusion via percpu.h is about to go away.  Make sure
gfp.h or slab.h is included as necessary.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Thu, 1 Apr 2010 16:09:52 +0000 (18:09 +0200)]
Merge branch 'fix/hda' into for-next

14 years agoALSA: hda - Update document about MSI and interrupts
Takashi Iwai [Thu, 1 Apr 2010 16:08:29 +0000 (18:08 +0200)]
ALSA: hda - Update document about MSI and interrupts

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Thu, 1 Apr 2010 14:05:22 +0000 (16:05 +0200)]
Merge branch 'topic/hda' into for-next

14 years agoMerge branch 'topic/hda-alc-mute' into topic/hda
Takashi Iwai [Thu, 1 Apr 2010 14:04:28 +0000 (16:04 +0200)]
Merge branch 'topic/hda-alc-mute' into topic/hda

14 years agoMerge branch 'fix/hda' into topic/hda
Takashi Iwai [Thu, 1 Apr 2010 14:04:13 +0000 (16:04 +0200)]
Merge branch 'fix/hda' into topic/hda

14 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Wed, 31 Mar 2010 09:47:30 +0000 (11:47 +0200)]
Merge branch 'fix/hda' into for-next

14 years agoALSA: hda: Fix 0 dB offset for Lenovo Thinkpad models using AD1981
Daniel T Chen [Tue, 30 Mar 2010 17:29:28 +0000 (13:29 -0400)]
ALSA: hda: Fix 0 dB offset for Lenovo Thinkpad models using AD1981

BugLink: https://launchpad.net/bugs/551606
The OR's hardware distorts at PCM 100% because it does not correspond to
0 dB. Fix this in patch_ad1981() for all models using the Thinkpad
quirk.

Reported-by: Jane Silber
Cc: <stable@kernel.org>
Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - introduce snd_hda_codec_update_cache()
Takashi Iwai [Tue, 30 Mar 2010 16:03:44 +0000 (18:03 +0200)]
ALSA: hda - introduce snd_hda_codec_update_cache()

Add a new helper, snd_hda_codec_update_cache(), for reducing the unneeded
verbs.  This function checks the cached value and skips if it's identical
with the given one.  Otherwise it works like snd_hda_codec_write_cache().

The alc269 code uses this function as an example.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - Add mute LED support for HP laptop with ALC269
Takashi Iwai [Tue, 30 Mar 2010 16:00:59 +0000 (18:00 +0200)]
ALSA: hda - Add mute LED support for HP laptop with ALC269

Some HP laptops have a mute LED that is controlled over the unused
MIC2 VREF pin.  Implement the LED updater like patch_sigmatel.c for this
model.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'fix/hda' into topic/hda
Takashi Iwai [Tue, 30 Mar 2010 16:00:42 +0000 (18:00 +0200)]
Merge branch 'fix/hda' into topic/hda

14 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Tue, 30 Mar 2010 06:05:49 +0000 (08:05 +0200)]
Merge branch 'topic/asoc' into for-next

14 years agoMerge branch 'fix/asoc' into for-next
Takashi Iwai [Tue, 30 Mar 2010 06:05:47 +0000 (08:05 +0200)]
Merge branch 'fix/asoc' into for-next

14 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Tue, 30 Mar 2010 06:05:44 +0000 (08:05 +0200)]
Merge branch 'fix/hda' into for-next

14 years agoALSA: hda - Add missing printk argument in previous patch
Takashi Iwai [Tue, 30 Mar 2010 05:48:05 +0000 (07:48 +0200)]
ALSA: hda - Add missing printk argument in previous patch

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'for-2.6.34' into for-2.6.35
Mark Brown [Mon, 29 Mar 2010 20:03:20 +0000 (21:03 +0100)]
Merge branch 'for-2.6.34' into for-2.6.35

14 years agoASoC: ad193x: move codec register/unregister to bus probe/remove
Barry Song [Mon, 29 Mar 2010 03:16:00 +0000 (11:16 +0800)]
ASoC: ad193x: move codec register/unregister to bus probe/remove

The way i've factored out the bus probe and removal functions so
that there's no code in the individual I2C and SPI functions means
that the register() and unregister() functions could just be squashed
into the bus_probe() and bus_remove() functions.

Signed-off-by: Barry Song <21cnbao@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: Fix passing platform_data to ac97 bus users and fix a leak
Graham Gower [Thu, 25 Mar 2010 00:22:12 +0000 (10:52 +1030)]
ASoC: Fix passing platform_data to ac97 bus users and fix a leak

[The issue is an attempt to write the pdata without the AC97 device
allocated when using ac97.c - also added a comment in soc-core.c for the
special case for ac97. -- broonie]

Signed-off-by: Graham Gower <graham.gower@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' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
Mark Brown [Mon, 29 Mar 2010 20:00:04 +0000 (21:00 +0100)]
Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.35

14 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Mon, 29 Mar 2010 19:29:26 +0000 (21:29 +0200)]
Merge branch 'topic/asoc' into for-next

14 years agoMerge branch 'topic/usb' into for-next
Takashi Iwai [Mon, 29 Mar 2010 19:29:22 +0000 (21:29 +0200)]
Merge branch 'topic/usb' into for-next

14 years agoALSA: usb - update gfp/slab.h includes
Tejun Heo [Mon, 29 Mar 2010 17:52:29 +0000 (02:52 +0900)]
ALSA: usb - update gfp/slab.h includes

Implicit slab.h inclusion via percpu.h is about to go away.  Make sure
gfp.h or slab.h is included as necessary.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoASoC: update gfp/slab.h includes
Tejun Heo [Mon, 29 Mar 2010 17:52:29 +0000 (02:52 +0900)]
ASoC: update gfp/slab.h includes

Implicit slab.h inclusion via percpu.h is about to go away.  Make sure
gfp.h or slab.h is included as necessary.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Mon, 29 Mar 2010 15:28:05 +0000 (17:28 +0200)]
Merge branch 'fix/hda' into for-next

14 years agoALSA: hda - Fix ADC/MUX assignment of ALC269 codec
Takashi Iwai [Mon, 29 Mar 2010 15:21:45 +0000 (17:21 +0200)]
ALSA: hda - Fix ADC/MUX assignment of ALC269 codec

ALC269 codec has a few different variants, and each of them may have
different ADC and MUX widgets.  For example, one model has ADC 0x08
with MUX 0x23 while others has ADC 0x09 or ADC 0x07 with MUX 022 or
0x24.  The difference of ADC appears usually as the capability of
the digital mic pin (0x12), and the current driver sometimes misses
the internal mic pin due to the mismatching ADC.

This patch adds a bit more clever way to find the matching ADC instead
of the static list.  Now the driver checks all active input pins and
fills only the ADC/MUX's that contain all of them.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/usb' into for-next
Takashi Iwai [Mon, 29 Mar 2010 08:04:31 +0000 (10:04 +0200)]
Merge branch 'topic/usb' into for-next

14 years agoALSA: usb pcm: use of kmalloc requires the include of slab.h
Stephen Rothwell [Mon, 29 Mar 2010 08:01:48 +0000 (19:01 +1100)]
ALSA: usb pcm: use of kmalloc requires the include of slab.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Mon, 29 Mar 2010 07:33:40 +0000 (09:33 +0200)]
Merge branch 'topic/asoc' into for-next

14 years agoASoC: Fix file permission of soc/codecs/twl6040.c
Takashi Iwai [Mon, 29 Mar 2010 07:31:57 +0000 (09:31 +0200)]
ASoC: Fix file permission of soc/codecs/twl6040.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoASoC: TWL6040: use of kzalloc/kfree requires the include of slab.h
Stephen Rothwell [Mon, 29 Mar 2010 06:55:51 +0000 (17:55 +1100)]
ASoC: TWL6040: use of kzalloc/kfree requires the include of slab.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Mon, 29 Mar 2010 07:21:22 +0000 (09:21 +0200)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Report errors when invalid values are passed to snd_hda_amp_*()
Takashi Iwai [Mon, 29 Mar 2010 07:19:38 +0000 (09:19 +0200)]
ALSA: hda - Report errors when invalid values are passed to snd_hda_amp_*()

The values should be in 8 bits.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'fix/hda' into topic/hda
Takashi Iwai [Mon, 29 Mar 2010 07:20:32 +0000 (09:20 +0200)]
Merge branch 'fix/hda' into topic/hda

14 years agoALSA: hda - Fix invalid bit values passed to snd_hda_codec_amp_stereo()
Takashi Iwai [Mon, 29 Mar 2010 07:16:24 +0000 (09:16 +0200)]
ALSA: hda - Fix invalid bit values passed to snd_hda_codec_amp_stereo()

The mask and value parameters passed to snd_hda_codec_amp_stereo()
should be 8-bit values for mute and volume.  Passing AMP_IN_MUTE() is
wrong, which is found in many places in patch_realtek.c as a left-over
from the conversion to snd_hda_codec_amp_stereo().

Reported-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Mon, 29 Mar 2010 06:30:38 +0000 (08:30 +0200)]
Merge branch 'topic/asoc' into for-next

14 years agoASoC: update for removeal of slab.h from percpu.h
Stephen Rothwell [Mon, 29 Mar 2010 04:32:18 +0000 (15:32 +1100)]
ASoC: update for removeal of slab.h from percpu.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Mon, 29 Mar 2010 06:26:39 +0000 (08:26 +0200)]
Merge branch 'fix/hda' into for-next

14 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Mon, 29 Mar 2010 06:26:37 +0000 (08:26 +0200)]
Merge branch 'fix/misc' into for-next

14 years agoMerge branch 'topic/usb' into for-next
Takashi Iwai [Mon, 29 Mar 2010 06:26:31 +0000 (08:26 +0200)]
Merge branch 'topic/usb' into for-next

14 years agoALSA: hda: Use LPIB for ga-ma770-ud3 board
Daniel T Chen [Sun, 28 Mar 2010 06:34:40 +0000 (02:34 -0400)]
ALSA: hda: Use LPIB for ga-ma770-ud3 board

BugLink: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=575669
The OR states that position_fix=1 is necessary to work around glitching
during volume adjustments using PulseAudio.

Reported-by: Carlos Laviola <claviola@debian.org>
Tested-by: Carlos Laviola <claviola@debian.org>
Cc: <stable@kernel.org>
Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: ac97: Add Toshiba P500 to ac97 jack sense blacklist
Daniel Chen [Sun, 28 Mar 2010 20:32:34 +0000 (13:32 -0700)]
ALSA: ac97: Add Toshiba P500 to ac97 jack sense blacklist

BugLink: https://launchpad.net/bugs/481058
The OR has verified that both 'Headphone Jack Sense' and 'Line Jack Sense'
need to be muted for sound to be audible, so just add the machine's SSID
to the ac97 jack sense blacklist.

Reported-by: Richard Gagne
Tested-by: Richard Gagne
Cc: <stable@kernel.org>
Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: usb - use of kmalloc/kfree requires the include of slab.h
Stephen Rothwell [Mon, 29 Mar 2010 05:02:50 +0000 (16:02 +1100)]
ALSA: usb - use of kmalloc/kfree requires the include of slab.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Fri, 26 Mar 2010 14:29:33 +0000 (15:29 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoMerge remote branch 'alsa/devel' into topic/hda
Takashi Iwai [Fri, 26 Mar 2010 14:28:41 +0000 (15:28 +0100)]
Merge remote branch 'alsa/devel' into topic/hda

14 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Fri, 26 Mar 2010 14:27:18 +0000 (15:27 +0100)]
Merge branch 'fix/misc' into for-next

14 years agoALSA: pcm_lib - fix xrun functionality
Jarkko Nikula [Fri, 26 Mar 2010 14:07:25 +0000 (16:07 +0200)]
ALSA: pcm_lib - fix xrun functionality

The commit 4d96eb255c53ab5e39b37fd4d484ea3dc39ab456 broke the interrupt
time xrun functionality (stream stop etc.) if the CONFIG_SND_PCM_XRUN_DEBUG
is not set. This is because the xrun() is null defined without it.

Fix this by letting the function xrun() to be always defined as it was
before.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoASoC: fsi: Add FSI2 device support
Kuninori Morimoto [Thu, 25 Mar 2010 10:15:53 +0000 (19:15 +0900)]
ASoC: fsi: Add FSI2 device support

ARM-SHMOBILE series have FIFO-buffered serial interface 2 (FSI2)
device which is advanced version of FSI.
This patch add simple support for it.

Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: fsi: Add FIFO size calculate
Kuninori Morimoto [Thu, 25 Mar 2010 10:15:51 +0000 (19:15 +0900)]
ASoC: fsi: Add FIFO size calculate

Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoALSA: hda-intel - probe_only module option is int type now
Jaroslav Kysela [Fri, 26 Mar 2010 10:16:59 +0000 (11:16 +0100)]
ALSA: hda-intel - probe_only module option is int type now

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
14 years agoALSA: hda-intel - remove model=hwio from documentation
Jaroslav Kysela [Fri, 26 Mar 2010 10:14:55 +0000 (11:14 +0100)]
ALSA: hda-intel - remove model=hwio from documentation

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
14 years agoALSA: hda-intel - remove model=hwio , use probe_only=3 instead
Jaroslav Kysela [Fri, 26 Mar 2010 10:04:38 +0000 (11:04 +0100)]
ALSA: hda-intel - remove model=hwio , use probe_only=3 instead

The probe_only module parameter skips the codec initialization, too.
Remove the model=hwio code and use second bit in probe_only to
skip the HDA codec reset procedure.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
14 years agoALSA: hda-intel - AD1984 thinkpad - add analog beep input control
Jaroslav Kysela [Fri, 26 Mar 2010 09:33:18 +0000 (10:33 +0100)]
ALSA: hda-intel - AD1984 thinkpad - add analog beep input control

For Lenovo Thinkpad T61/X61, the analog beep input is connected
to node 0x20, index 3. Move the digital beep mute/volume controls
as "Digital Beep" and create analog beep controls for mentioned node.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
14 years agoALSA: hda-intel - add special 'hwio' model to bypass initialization
Jaroslav Kysela [Fri, 26 Mar 2010 09:28:46 +0000 (10:28 +0100)]
ALSA: hda-intel - add special 'hwio' model to bypass initialization

Using the 'model=hwio' option, the driver bypasses any codec
initialization and the reset procedure for codecs is also
bypassed. This mode is usefull to enable direct access using
hwdep interface (using hdaverb or hda-analyzer tools) and
retain codec setup from BIOS.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
14 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Fri, 26 Mar 2010 07:41:06 +0000 (08:41 +0100)]
Merge branch 'fix/misc' into for-next

14 years agoALSA: ac97: Add IBM ThinkPad R40e to Headphone/Line Jack Sense blacklist
Daniel T Chen [Fri, 26 Mar 2010 05:38:15 +0000 (22:38 -0700)]
ALSA: ac97: Add IBM ThinkPad R40e to Headphone/Line Jack Sense blacklist

BugLink: https://launchpad.net/bugs/303789
This model needs both 'Headphone Jack Sense' and 'Line Jack Sense'
muted for audible audio, so just add its SSID to the blacklist and
don't enumerate the controls.

Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Thu, 25 Mar 2010 19:23:09 +0000 (20:23 +0100)]
Merge branch 'topic/misc' into for-next

14 years agoALSA: AC97: add full duplex support for atmel AT91 and AVR.
Sedji Gaouaou [Thu, 25 Feb 2010 17:59:40 +0000 (18:59 +0100)]
ALSA: AC97: add full duplex support for atmel AT91 and AVR.

This patch add full duplex support on AT91 and AVR.
It was a bug: we needed to check first if there are some chips opened so we
could enable both reception and sending of the data.

Signed-off-by: Sedji Gaouaou <sedji.gaouaou@atmel.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: AC97: add AC97 support for AT91.
Sedji Gaouaou [Mon, 1 Mar 2010 11:19:18 +0000 (12:19 +0100)]
ALSA: AC97: add AC97 support for AT91.

This patch add AC97 support for ATMEL AT91, using the AVR32 code.
While AVR is using a DMA, the AT91 chips are using a Peripheral Data
Controller.

Signed-off-by: Sedji Gaouaou <sedji.gaouaou@atmel.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Thu, 25 Mar 2010 14:07:14 +0000 (15:07 +0100)]
Merge branch 'fix/hda' into for-next

14 years agoMerge branch 'fix/hda' into topic/hda
Takashi Iwai [Thu, 25 Mar 2010 14:06:58 +0000 (15:06 +0100)]
Merge branch 'fix/hda' into topic/hda

14 years agoALSA: hda - Don't set invalid connection index in Realtek initialiaiton
Takashi Iwai [Thu, 25 Mar 2010 14:00:15 +0000 (15:00 +0100)]
ALSA: hda - Don't set invalid connection index in Realtek initialiaiton

Skip initialization of connections of DAC widgets that aren't used,
which resulted in invalid verb parameters.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/usb' into for-next
Takashi Iwai [Thu, 25 Mar 2010 11:27:41 +0000 (12:27 +0100)]
Merge branch 'topic/usb' into for-next

14 years agoALSA: usbaudio: Add basic support for M-Audio Fast Track Ultra series
Felix Homann [Thu, 25 Mar 2010 10:29:14 +0000 (11:29 +0100)]
ALSA: usbaudio: Add basic support for M-Audio Fast Track Ultra series

This adds basic support for M-Audio's Fast Track Ultra series of USB
audio interfaces. It is a refactored version of the patch Clemens
Ladisch posted some time ago. Neither playback nor capturing work
properly at 44100 Hz (don't know why).
The other sampling rates work properly. There's no support for the DSP
mixer, yet.

Signed-off-by: Felix Homann <fexpop@web.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoASoC: wm8994: playback => capture
Dan Carpenter [Wed, 24 Mar 2010 11:58:34 +0000 (14:58 +0300)]
ASoC: wm8994: playback => capture

Sparse caught that initialize "playback" two times instead of
initializing "capture".

Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>