]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
15 years agoMerge branch 'topic/beep-rename' into for-next
Takashi Iwai [Thu, 5 Nov 2009 08:01:18 +0000 (09:01 +0100)]
Merge branch 'topic/beep-rename' into for-next

15 years agoALSA: rename "PC Speaker" controls to "Speaker"
Jaroslav Kysela [Wed, 4 Nov 2009 13:30:36 +0000 (14:30 +0100)]
ALSA: rename "PC Speaker" controls to "Speaker"

To unify control names, rename "PC Speaker" to "Speaker" for PPC ALSA drivers.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: rename "PC Speaker" and "PC Beep" controls to "Beep"
Jaroslav Kysela [Tue, 3 Nov 2009 14:47:25 +0000 (15:47 +0100)]
ALSA: rename "PC Speaker" and "PC Beep" controls to "Beep"

To avoid confusion in control names for the standard analog PC Beep generator
using a small Internal PC Speaker, rename all related "PC Speaker" and "PC
Beep" controls to "Beep" only. This name is more universal and can be also
used on more platforms without confusion.

Introduce also "Internal Speaker" in ControlNames.txt for systems with
full-featured build-in internal speaker.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Thu, 5 Nov 2009 07:11:24 +0000 (08:11 +0100)]
Merge branch 'fix/misc' into for-next

15 years agoALSA: intel8x0: Mute External Amplifier by default for another Sony model
Daniel T Chen [Thu, 5 Nov 2009 02:03:46 +0000 (21:03 -0500)]
ALSA: intel8x0: Mute External Amplifier by default for another Sony model

BugLink: https://bugs.launchpad.net/bugs/474972
This Sony model needs External Amplifier muted for audible playback, so
make sure we set the inv_eapd quirk.

Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Wed, 4 Nov 2009 11:19:19 +0000 (12:19 +0100)]
Merge branch 'fix/hda' into for-next

15 years agoALSA: hda - Add OLPC XO-1.5 PCI ID
Daniel Drake [Wed, 4 Nov 2009 10:11:07 +0000 (10:11 +0000)]
ALSA: hda - Add OLPC XO-1.5 PCI ID

The XO-1.5 laptop now has a unique subvendor/subproduct ID, which can
be used to automatically select the correct CXT5066 configuration.

Signed-off-by: Daniel Drake <dsd@laptop.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Wed, 4 Nov 2009 08:18:07 +0000 (09:18 +0100)]
Merge branch 'topic/misc' into for-next

15 years agoALSA: sh: add SuperH DAC audio driver for ALSA V4
Rafael Ignacio Zurita [Tue, 3 Nov 2009 20:16:27 +0000 (17:16 -0300)]
ALSA: sh: add SuperH DAC audio driver for ALSA V4

This is a port of the sound/oss/sh_dac_audio.c driver.
The driver uses an on-chip 8-bit D/A converter, which has a speaker connected
to one of its channels, found in several ancient HP machines.
For interrupts it uses a high-resolution timer (hrtimer).
Tested on SH7709 based hp6xx (HP Jornada 680/690 and HP Palmtop 620lx/660lx).

Also, since OSS Emulation works, the old OSS sound/oss/sh_dac_audio.c driver
would be obsolete soon, and it could be removed.

Signed-off-by: Rafael Ignacio Zurita <rizurita@yahoo.com>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Wed, 4 Nov 2009 07:00:27 +0000 (08:00 +0100)]
Merge branch 'fix/hda' into for-next

15 years agoALSA: hda - Enable GPIO control for mute LED on HP systems
Vitaliy Kulikov [Wed, 4 Nov 2009 06:57:45 +0000 (07:57 +0100)]
ALSA: hda - Enable GPIO control for mute LED on HP systems

This patch enables GPIO to control mute LED indicator on the HP systems
with the special string in BIOS and applies it with the correct polarity on
HP B-series systems.

It also restores configuration of the pin intended as the second Headphone
on HP B-series systems but configured as something else in the BIOS to
pass MS DTM.

Signed-off-by: Vitaliy Kulikov <Vitaliy.Kulikov@idt.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Tue, 3 Nov 2009 06:45:21 +0000 (07:45 +0100)]
Merge branch 'topic/asoc' into for-next

15 years agoASoC: TWL4030: Make sure, that the codec is powered on startup
Peter Ujfalusi [Mon, 2 Nov 2009 12:34:54 +0000 (14:34 +0200)]
ASoC: TWL4030: Make sure, that the codec is powered on startup

Set the codec->bias_level to SND_SOC_BIAS_OFF before changing
the initial bias level to STANDBY.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoASoC: Add support for the WM8727 DAC.
Neil Jones [Mon, 2 Nov 2009 15:14:17 +0000 (15:14 +0000)]
ASoC: Add support for the WM8727 DAC.

Add support for the Wolfson Microelectronics WM8727 DAC, this is a simple
non-configurable DAC.

Signed-off-by: Neil Jones <neil.jones@imgtec.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Mon, 2 Nov 2009 13:25:16 +0000 (14:25 +0100)]
Merge branch 'fix/hda' into for-next

15 years agoALSA: hda - Don't check invalid HP pin
Takashi Iwai [Mon, 2 Nov 2009 13:23:15 +0000 (14:23 +0100)]
ALSA: hda - Don't check invalid HP pin

alc_automute_pin() might be called even if any HP pin is defined, and
it will result in verbs with NID=0.

This patch adds a check for the validity of HP widget before issuing
any verbs.

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

15 years agoALSA: dummy - Fix descriptions of pcm_substreams parameter
Takashi Iwai [Mon, 2 Nov 2009 13:10:59 +0000 (14:10 +0100)]
ALSA: dummy - Fix descriptions of pcm_substreams parameter

Now up to 128 substreams are supported.

Reported-by: Adrian Bridgett <adrian@smop.co.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoASoC: au1x: convert to platform drivers.
Manuel Lauss [Sat, 31 Oct 2009 19:15:08 +0000 (20:15 +0100)]
ASoC: au1x: convert to platform drivers.

Convert psc-ac97,i2s to platform drivers similar to the davinci ones.

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Mon, 2 Nov 2009 10:42:25 +0000 (11:42 +0100)]
Merge branch 'fix/misc' into for-next

15 years agoALSA: pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (sound)
Dominik Brodowski [Sat, 24 Oct 2009 19:43:03 +0000 (21:43 +0200)]
ALSA: pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (sound)

Convert PCMCIA drivers to use the dynamic debug infrastructure, instead of
requiring manual settings of PCMCIA_DEBUG.

Also, remove all usages of the CS_CHECK macro and replace them with proper
Linux style calling and return value checking. The extra error reporting may
be dropped, as the PCMCIA core already complains about any (non-driver-author)
errors.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Mon, 2 Nov 2009 10:24:53 +0000 (11:24 +0100)]
Merge branch 'fix/hda' into for-next

15 years agoALSA: hda: Use quirk mask for Dell Inspiron Mini9/Vostro A90 using ALC268
Daniel T Chen [Sun, 1 Nov 2009 23:32:29 +0000 (18:32 -0500)]
ALSA: hda: Use quirk mask for Dell Inspiron Mini9/Vostro A90 using ALC268

BugLink: https://bugs.launchpad.net/bugs/368629
We should use a quirk mask for these Dell Inspiron Mini9s and Vostro
A90s, as the model=dell quirk appears to enable audio on them.

Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Sun, 1 Nov 2009 10:14:25 +0000 (11:14 +0100)]
Merge branch 'topic/misc' into for-next

15 years agoALSA: snd-pcsp: add nopcm mode
Stas Sergeev [Sun, 1 Nov 2009 10:13:19 +0000 (11:13 +0100)]
ALSA: snd-pcsp: add nopcm mode

Currently, if the high-res timers are unavailable, snd-pcsp does not
initialize. People who choose it over pcspkr, loose their console beeps
in that case and get annoyed.
With this patch, the console beeps remain regardless of the high-res
timers. Additionally, the "nopcm" modparam is added to forcibly
disable the PCM capabilities of the driver.

Signed-off-by: Stas Sergeev <stsp@aknet.ru>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'fix/misc' into topic/misc
Takashi Iwai [Sun, 1 Nov 2009 10:11:07 +0000 (11:11 +0100)]
Merge branch 'fix/misc' into topic/misc

15 years agoASoC: refactor snd_soc_update_bits()
Eero Nurkkala [Fri, 30 Oct 2009 11:34:03 +0000 (13:34 +0200)]
ASoC: refactor snd_soc_update_bits()

Introduce a wrapper call snd_soc_update_bits_locked()
that will take the codec mutex. This call is used
when the codec mutex is not already taken.

Drivers calling snd_soc_update_bits() may wish to
make sure the codec mutex is taken from the driver.

Signed-off-by: Eero Nurkkala <ext-eero.nurkkala@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoASoC: remove io_mutex
Eero Nurkkala [Fri, 30 Oct 2009 11:34:02 +0000 (13:34 +0200)]
ASoC: remove io_mutex

Remove the io_mutex. It has a drawback of serializing
all accesses to snd_soc_update_bits() even when multiple
codecs are in use. In addition, it fails to actually do
its task - during snd_soc_update_bits(), dapm_update_bits()
may also be accessing the same register which may result in
an outdated register value.

Signed-off-by: Eero Nurkkala <ext-eero.nurkkala@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Fri, 30 Oct 2009 12:23:01 +0000 (13:23 +0100)]
Merge branch 'topic/hda' into for-next

15 years agoALSA: hda - Switch to polling mode before disabling MSI
Takashi Iwai [Fri, 30 Oct 2009 12:21:49 +0000 (13:21 +0100)]
ALSA: hda - Switch to polling mode before disabling MSI

When any codec communication error happens, try to switch to the polling
mode first before turning off MSI.  MSI gets more stable nowadays, thus
we should keep it on as much as possible.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Fri, 30 Oct 2009 11:46:58 +0000 (12:46 +0100)]
Merge branch 'topic/misc' into for-next

15 years agoALSA: es18xx: remove snd_audiodrive structure
Krzysztof Helt [Sun, 25 Oct 2009 10:10:01 +0000 (11:10 +0100)]
ALSA: es18xx: remove snd_audiodrive structure

Remove intermediate snd_audiodrive structure between
snd_card structure and snd_es18xx. This reduces size of
source code and binary driver.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: es18xx: remove snd_card pointer from snd_es18xx structure
Krzysztof Helt [Sun, 25 Oct 2009 10:05:19 +0000 (11:05 +0100)]
ALSA: es18xx: remove snd_card pointer from snd_es18xx structure

The snd_card pointer is redundant and code can be easily
changed to work without it.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agosound: remove OSS Ensoniq SoundScape driver
Krzysztof Helt [Sat, 24 Oct 2009 15:47:33 +0000 (17:47 +0200)]
sound: remove OSS Ensoniq SoundScape driver

The OSS driver for Ensoniq SoundScape cards is broken after conversion
to mutexes and a new ALSA snd-sscape driver handles all devices handled
by the OSS one.

The ALSA driver was tested with these cards:
Spea V7 MediaFX
Ensoniq Soundscape Elite
Ensoniq Soundscape VIVO (this card is not handled by the OSS driver)

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'topic/usb' into for-next
Takashi Iwai [Fri, 30 Oct 2009 11:42:04 +0000 (12:42 +0100)]
Merge branch 'topic/usb' into for-next

15 years agosound: usb-audio: allow switching altsetting on Roland USB MIDI devices
Clemens Ladisch [Thu, 22 Oct 2009 07:06:19 +0000 (09:06 +0200)]
sound: usb-audio: allow switching altsetting on Roland USB MIDI devices

Add a mixer control to select between the two altsettings on Roland USB
MIDI devices where the input endpoint is either bulk or interrupt.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agosound: via82xx: deactivate DXS controls of inactive streams
Clemens Ladisch [Thu, 22 Oct 2009 07:04:09 +0000 (09:04 +0200)]
sound: via82xx: deactivate DXS controls of inactive streams

Activate the DXS volume controls only when the corresponding stream is
being used.  This makes the behaviour consistent with the other drivers
that have per-stream volume controls.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Fri, 30 Oct 2009 11:32:52 +0000 (12:32 +0100)]
Merge branch 'topic/hda' into for-next

15 years agoALSA: hda - Add a proper ifdef to a debug code
Takashi Iwai [Fri, 30 Oct 2009 11:31:39 +0000 (12:31 +0100)]
ALSA: hda - Add a proper ifdef to a debug code

Added a proper ifdef CONFIG_SND_DEBUG_VERBOSE to avoid a compile warning:
  sound/pci/hda/patch_intelhdmi.c:406: warning: ‘hdmi_get_channel_count’ defined but not used

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Fri, 30 Oct 2009 11:30:52 +0000 (12:30 +0100)]
Merge branch 'fix/misc' into for-next

15 years agoALSA: snd-usb-caiaq: Bump version number to 1.3.20
Mark Hills [Sat, 24 Oct 2009 11:59:37 +0000 (12:59 +0100)]
ALSA: snd-usb-caiaq: Bump version number to 1.3.20

Signed-off-by: Mark Hills <mark@pogo.org.uk>
Acked-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: snd-usb-caiaq: Lock on stream start/unpause
Mark Hills [Sat, 24 Oct 2009 11:59:36 +0000 (12:59 +0100)]
ALSA: snd-usb-caiaq: Lock on stream start/unpause

Fix a bug which can result in white noise from the driver after stream
start or unpause.

Signed-off-by: Mark Hills <mark@pogo.org.uk>
Acked-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: snd-usb-caiaq: Missing lock around use of buffer positions
Mark Hills [Sat, 24 Oct 2009 11:59:35 +0000 (12:59 +0100)]
ALSA: snd-usb-caiaq: Missing lock around use of buffer positions

Fix a race which causes snd_pcm_update_hw_ptr_pos() to report a bug.

Signed-off-by: Mark Hills <mark@pogo.org.uk>
Acked-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Fri, 30 Oct 2009 11:26:00 +0000 (12:26 +0100)]
Merge branch 'topic/misc' into for-next

15 years agoALSA: Cleanup redundant tests on unsigned
Roel Kluin [Fri, 23 Oct 2009 14:03:08 +0000 (16:03 +0200)]
ALSA: Cleanup redundant tests on unsigned

The variables are unsigned so the test `>= 0' is always true,
the `< 0' test always fails. In these cases the other part of
the test catches wrapped values.

In dac_audio_write() there does not occur a test for wrapped
values, but the test appears redundant.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Fri, 30 Oct 2009 11:09:11 +0000 (12:09 +0100)]
Merge branch 'fix/hda' into for-next

15 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Fri, 30 Oct 2009 11:09:08 +0000 (12:09 +0100)]
Merge branch 'topic/hda' into for-next

15 years agoALSA: VIA HDA: Add support for VT1818S.
Lydia Wang [Tue, 20 Oct 2009 05:18:04 +0000 (13:18 +0800)]
ALSA: VIA HDA: Add support for VT1818S.

Add support for VT1818S codec, which is similiar with VT1708S.

Signed-off-by: Lydia Wang <lydiawang@viatech.com.cn>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Fri, 30 Oct 2009 11:08:05 +0000 (12:08 +0100)]
Merge branch 'fix/misc' into for-next

15 years agoALSA: sound/parisc: Move dereference after NULL test
Julia Lawall [Sat, 17 Oct 2009 06:33:47 +0000 (08:33 +0200)]
ALSA: sound/parisc: Move dereference after NULL test

If the NULL test on h is needed in snd_harmony_mixer_init, then the
dereference should be after the NULL test.

Actually, there is a sequence of calls: snd_harmony_create, then
snd_harmony_pcm_init, and then snd_harmony_mixer_init.  snd_harmony_create
initializes h, but may indeed leave it as NULL.  There was no NULL test at
the beginning of snd_harmony_pcm_init, so I have added one.  The NULL test
in snd_harmony_mixer_init is then not necessary, but in case the ordering
of the calls changes, I have left it, and moved the dereference after it.

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

// <smpl>
@match exists@
expression x, E;
identifier fld;
@@

* x->fld
  ... when != \(x = E\|&x\)
* x == NULL
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: sound: Move dereference after NULL test and drop unnecessary NULL tests
Julia Lawall [Sat, 17 Oct 2009 06:33:22 +0000 (08:33 +0200)]
ALSA: sound: Move dereference after NULL test and drop unnecessary NULL tests

In pcm.c, if the NULL test on pcm is needed, then the dereference should be
after the NULL test.

In dummy.c and ali5451.c, the context of the calls to
snd_card_dummy_new_mixer and snd_ali_free_voice show that dummy and pvoice,
respectively cannot be NULL.

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

// <smpl>
@match exists@
expression x, E;
identifier fld;
@@

* x->fld
  ... when != \(x = E\|&x\)
* x == NULL
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda_intel: Add the Linux device ID for NVIDIA HDA controller
peer chen [Thu, 15 Oct 2009 08:37:47 +0000 (16:37 +0800)]
ALSA: hda_intel: Add the Linux device ID for NVIDIA HDA controller

Add the generic device ID for NVIDIA HDA controller.

Signed-off-by: Peer Chen <peerchen@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Fri, 30 Oct 2009 10:56:35 +0000 (11:56 +0100)]
Merge branch 'fix/misc' into for-next

15 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Fri, 30 Oct 2009 10:56:33 +0000 (11:56 +0100)]
Merge branch 'topic/asoc' into for-next

15 years agoALSA: pcsp - Fix nforce workaround
Stas Sergeev [Fri, 30 Oct 2009 10:51:24 +0000 (11:51 +0100)]
ALSA: pcsp - Fix nforce workaround

The attached patch fixes the problems introduced in this commit:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=eea0579fc85e64e9f05361d5aacf496fe7a151aa

- Fix nForce workaround by honouring the pointer_update var
- Revert "ns" to u64, as per the hrtimer API
- Revert to the zero-delay timer startup, since I can't reproduce any
  problem with it (please, give me the hint!)

Signed-off-by: Stas Sergeev <stsp@aknet.ru>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Fri, 30 Oct 2009 10:46:55 +0000 (11:46 +0100)]
Merge branch 'topic/hda' into for-next

15 years agoALSA: hda - remove static intelhdmi configurations
Wu Fengguang [Fri, 30 Oct 2009 10:46:22 +0000 (11:46 +0100)]
ALSA: hda - remove static intelhdmi configurations

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - auto parse intelhdmi cvt/pin configurations
Wu Fengguang [Fri, 30 Oct 2009 10:45:35 +0000 (11:45 +0100)]
ALSA: hda - auto parse intelhdmi cvt/pin configurations

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - get intelhdmi max channels from widget caps
Wu Fengguang [Fri, 30 Oct 2009 10:45:04 +0000 (11:45 +0100)]
ALSA: hda - get intelhdmi max channels from widget caps

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - vectorize intelhdmi
Wu Fengguang [Fri, 30 Oct 2009 10:44:26 +0000 (11:44 +0100)]
ALSA: hda - vectorize intelhdmi

The Intel IbexPeak HDMI codec supports 2 converters and 3 pins,
which requires converting the cvt_nid/pin_nid to arrays.

The active pin number (the one connected with a live HDMI monitor/sink)
will be dynamically identified on hotplug events.

It exports two HDMI devices, so that user space can choose the A/V pipe
for sending the audio samples.

It's still undefined behavior when there are two active monitors
connected and routed to the same audio converter.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - reorder intelhdmi prepare/cleanup callbacks
Wu Fengguang [Fri, 30 Oct 2009 10:43:03 +0000 (11:43 +0100)]
ALSA: hda - reorder intelhdmi prepare/cleanup callbacks

No behavior change.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - use pcm prepare/cleanup callbacks for intelhdmi
Wu Fengguang [Fri, 30 Oct 2009 10:42:18 +0000 (11:42 +0100)]
ALSA: hda - use pcm prepare/cleanup callbacks for intelhdmi

Remove pcm callbacks open/close in favor of the prepare/cleanup.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - remove intelhdmi dependency on multiout
Wu Fengguang [Fri, 30 Oct 2009 10:41:44 +0000 (11:41 +0100)]
ALSA: hda - remove intelhdmi dependency on multiout

We'll be managing multiple HDMI audio sources/sinks on our own.
So remove multiout dependency from intelhdmi.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - convert intelhdmi global references to local parameters
Wu Fengguang [Fri, 30 Oct 2009 10:40:40 +0000 (11:40 +0100)]
ALSA: hda - convert intelhdmi global references to local parameters

No behavior change.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - allow up to 4 HDMI devices
Wu Fengguang [Fri, 30 Oct 2009 10:40:03 +0000 (11:40 +0100)]
ALSA: hda - allow up to 4 HDMI devices

The new Intel HDMI codec supports 2 independant HDMI/DisplayPort pipes.
We'll be exporting them as 2 pcm devices. So bump up the allowed number
of HDMI devices.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - vectorize get_empty_pcm_device()
Wu Fengguang [Fri, 30 Oct 2009 10:38:26 +0000 (11:38 +0100)]
ALSA: hda - vectorize get_empty_pcm_device()

This unifies the code and data structure,
and makes it easy to add more HDMI devices.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'for-2.6.32' into for-2.6.33
Mark Brown [Fri, 30 Oct 2009 10:36:23 +0000 (10:36 +0000)]
Merge branch 'for-2.6.32' into for-2.6.33

15 years agoASoC: sh: FSI: Add capture support
Kuninori Morimoto [Fri, 30 Oct 2009 03:02:44 +0000 (12:02 +0900)]
ASoC: sh: FSI: Add capture support

Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoASoC: sh: FSI: Remove DMA support
Kuninori Morimoto [Fri, 30 Oct 2009 03:02:39 +0000 (12:02 +0900)]
ASoC: sh: FSI: Remove DMA support

SuperH FSI device have the hardware limitation to use DMA.
If DMA is used, LCD output will be broken.
Maybe there are some solution. But I don't know how to do it now.
This patch remove DMA support and use soft transfer.

Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoALSA: hda - select IbexPeak handler for Calpella
Wu Fengguang [Fri, 30 Oct 2009 10:34:19 +0000 (11:34 +0100)]
ALSA: hda - select IbexPeak handler for Calpella

An earlier patch merely adds id for 0x80862804.
It has 2/3 cvt/pin nodes and shall be tied to the IbexPeak handler.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: SND_CS5535AUDIO: Remove the X86 platform dependency
Wu Zhangjin [Thu, 15 Oct 2009 02:22:54 +0000 (10:22 +0800)]
ALSA: SND_CS5535AUDIO: Remove the X86 platform dependency

SND_CS5535AUDIO is available on Loongson(MIPS compatible) family
machines, and checked it with ARCH=x86_64, no relative compiling
warnings & errors, so, remove the platform dependency directly.

Reported-by: rixed@happyleptic.org
Acked-by: Andres Salomon <dilinger@collabora.co.uk>
Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Fri, 30 Oct 2009 10:26:24 +0000 (11:26 +0100)]
Merge branch 'topic/asoc' into for-next

15 years agoMerge branch 'fix/asoc' into for-next
Takashi Iwai [Fri, 30 Oct 2009 10:26:23 +0000 (11:26 +0100)]
Merge branch 'fix/asoc' into for-next

15 years agoASoC: Modifying Kconfig/Makefile for AM3517 EVM
Anuj Aggarwal [Thu, 29 Oct 2009 18:52:39 +0000 (00:22 +0530)]
ASoC: Modifying Kconfig/Makefile for AM3517 EVM

Modifying the Kconfig and Makefile in sound/soc/omap folder
to add support for OMAP3517 / AM3517 EVM in Alsa SoC.

Signed-off-by: Anuj Aggarwal <anuj.aggarwal@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoASoC: Adding OMAP3517 / AM3517 EVM support in ASOC
Anuj Aggarwal [Thu, 29 Oct 2009 18:52:30 +0000 (00:22 +0530)]
ASoC: Adding OMAP3517 / AM3517 EVM support in ASOC

Adding support for OMAP3517 / AM3517 EVM in Alsa SoC.

Signed-off-by: Anuj Aggarwal <anuj.aggarwal@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoASoC: OMAP3EVM: Use the twl4030_setup_data for headset pop-removal
Anuj Aggarwal [Wed, 23 Sep 2009 07:10:31 +0000 (12:40 +0530)]
ASoC: OMAP3EVM: Use the twl4030_setup_data for headset pop-removal

The pop-removal specific values are configured for TWL4030 codec
for OMAP3EVM through this patch.

Signed-off-by: Anuj Aggarwal <anuj.aggarwal@ti.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoASoC: TWL4030: Add APLL supply for the capture path
Peter Ujfalusi [Thu, 29 Oct 2009 11:05:52 +0000 (13:05 +0200)]
ASoC: TWL4030: Add APLL supply for the capture path

Capture path also need the APLL enabled, adding DAPM_SUPPLY
for the Virtual ADCs.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoASoC: TWL4030: Change APLL powering sequence
Peter Ujfalusi [Thu, 29 Oct 2009 09:58:10 +0000 (11:58 +0200)]
ASoC: TWL4030: Change APLL powering sequence

It seams that certain part of the twl4030 codec needs the APLL
enabled before they are enabled.
Paths which has any digital processing needs need the APLL
enabled before they can function.
For example the vibra output will have some random data after
it is enabled and before the APLL also enabled.

If only analog components are in use (analog bypass), than it
seams, that the APLL does not need to be enabled. This lowers
the power consumption with around ~0.005A.

Adding DAPM_SUPPLY to the Digital playback route and also
to the capture route to enable and disable the APLL.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoASoC: TWL4030: Vibra motor stop fix when it is driven with audio
Jari Vanhala [Thu, 29 Oct 2009 09:58:09 +0000 (11:58 +0200)]
ASoC: TWL4030: Vibra motor stop fix when it is driven with audio

This patch fixes vibrator playing incoherently, when driven
with audio. There is something wrong in switch 3 at
H-bridge and VIBRA_SET still affects PWM generator.
Slowest value fixes things.

Signed-off-by: Jari Vanhala <ext-jari.vanhala@nokia.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoASoC: CS4270: export de-emphasis filter as ALSA control
Daniel Mack [Thu, 29 Oct 2009 01:24:32 +0000 (02:24 +0100)]
ASoC: CS4270: export de-emphasis filter as ALSA control

The CS4270 codec features an de-emphasis filter for compensation of
audio material filtered by an 50/15 uS algorithm. Not sure whether we
should always enable it for 44100Hz sampling frequency, but it should at
least be configurable by the user.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Acked-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoASoC: Minor SMDK64xx WM8580 cleanups
Mark Brown [Wed, 28 Oct 2009 15:47:48 +0000 (15:47 +0000)]
ASoC: Minor SMDK64xx WM8580 cleanups

Fix up some comments, remove all enable_pin() calls (edge widgets
are all enabled by default) and mark the microphone as disabled by
default since it requires a resistor fit to connect it.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoASoC: TWL4030: Change codec_muted to apll_enabled
Peter Ujfalusi [Wed, 28 Oct 2009 08:57:05 +0000 (10:57 +0200)]
ASoC: TWL4030: Change codec_muted to apll_enabled

codec_muted is missleading, change it to apll_enabled,
which is what it is doing: enabing and disabling the APLL.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoASoC: TWL4030: Remove bypass tracking
Peter Ujfalusi [Wed, 28 Oct 2009 08:57:04 +0000 (10:57 +0200)]
ASoC: TWL4030: Remove bypass tracking

Since ASoC core now handling the codec bias differently
there is no need to do the tracking of bypass switch states
anymore.

Handling of the common bit for analog loopbacks is done with
DAPM_SUPPLY for the bypass paths.

Now this bit is only enabled when there is a complete analog
bypass path, compared to the previous implementation, when the
global switch was enabled if there were any of the analog
bypass switch was on (regardless if there were complete path or
not)

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoASoC: Add regulator support for WM8731
Mark Brown [Mon, 26 Oct 2009 15:20:17 +0000 (15:20 +0000)]
ASoC: Add regulator support for WM8731

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoASoC: TWL4030: Driver registration via twl4030_codec MFD
Peter Ujfalusi [Thu, 22 Oct 2009 10:26:48 +0000 (13:26 +0300)]
ASoC: TWL4030: Driver registration via twl4030_codec MFD

Change the way how the twl4030 soc codec driver is
loaded/probed.
Use the device probing via tlw4030_codec MFD device.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoASoC: TWL4030: use the twl4030-codec.h for register descriptions
Peter Ujfalusi [Thu, 22 Oct 2009 10:26:47 +0000 (13:26 +0300)]
ASoC: TWL4030: use the twl4030-codec.h for register descriptions

Remove the register descriptions from the twl4030.h file and use
the linux/mfd/twl4030-codec.h instead, which has the codec
related register descriptions also.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoOMAP: Platform support for twl4030_codec MFD
Peter Ujfalusi [Thu, 22 Oct 2009 10:26:46 +0000 (13:26 +0300)]
OMAP: Platform support for twl4030_codec MFD

Add needed platform data for the twl4030_codec MFD on boards,
where the audio part of the twl4030 codec is used.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoMFD: twl4030: add twl4030_codec MFD as a new child to the core
Peter Ujfalusi [Thu, 22 Oct 2009 10:26:45 +0000 (13:26 +0300)]
MFD: twl4030: add twl4030_codec MFD as a new child to the core

New MFD child to twl4030 MFD device.

Reason for the twl4030_codec MFD: the vibra control is actually in the codec
part of the twl4030. If both the vibra and the audio functionality is needed
from the twl4030 at the same time, than they need to control the codec power
and APLL at the same time without breaking the other driver.
Also these two has to be able to work without the need for the other driver.

This MFD device will be used by the drivers, which needs resources
from the twl4030 codec like audio and vibra.

The platform specific configuration data is passed along to the
child drivers (audio, vibra).

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoASoC: Amstrad Delta: add info about the line discipline requirement to Kconfig help...
Janusz Krzysztofik [Fri, 23 Oct 2009 22:06:48 +0000 (00:06 +0200)]
ASoC: Amstrad Delta: add info about the line discipline requirement to Kconfig help text

I thought it could be usefull to add some information on how to get the device
fully supported by loading a line discipline on the modem line.

Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoASoC: OMAP: Don't try to set unsupported OMAP_DMA_DATA_BURST_16 on OMAP1
Janusz Krzysztofik [Wed, 21 Oct 2009 21:10:03 +0000 (23:10 +0200)]
ASoC: OMAP: Don't try to set unsupported OMAP_DMA_DATA_BURST_16 on OMAP1

After DMA burst mode has been introduced in sound/soc/omap/omap-pcm.c,
omap_pcm_prepare() unconditionally calls:

        omap_set_dma_src_burst_mode(prtd->dma_ch, OMAP_DMA_DATA_BURST_16);
        omap_set_dma_dest_burst_mode(prtd->dma_ch, OMAP_DMA_DATA_BURST_16);

Current implementation of those two functions found in
arch/arm/plat-ompa/dma.c doesn't support OMAP_DMA_DATA_BURST_16 on OMAP1 at
all, so they both end with BUG() on that machine. That results in
ASoC being completely unusable, at least on my OMAP5910 based Amstrad Delta.

The patch corrects the problem by not calling those two functions when run on
OMAP1 class based machines.

Created against linux-2.6.32-rc5.
Tested on Amstrad Delta.

Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Acked-by: Jarkko Nikula <jhnikula@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoASoC: tlv320dac33: typo fix in the header
Peter Ujfalusi [Wed, 21 Oct 2009 06:58:35 +0000 (09:58 +0300)]
ASoC: tlv320dac33: typo fix in the header

Fix the definition of DAC33_LTM field, the LTM bits in
FIFO_IRQ_MODE_B register are starting at bit 6.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoASoC: Amstrad Delta minor cleanups
Janusz Krzysztofik [Wed, 21 Oct 2009 02:40:55 +0000 (04:40 +0200)]
ASoC: Amstrad Delta minor cleanups

Hi Mark,

Here is a patch that corrects small omissions I have found in my code.

Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoMerge branch 'for-2.6.32' into for-2.6.33
Mark Brown [Mon, 19 Oct 2009 15:15:35 +0000 (16:15 +0100)]
Merge branch 'for-2.6.32' into for-2.6.33

15 years agoASoC: Fix possible codec_dai->ops NULL pointer problems
Barry Song [Fri, 16 Oct 2009 10:13:38 +0000 (18:13 +0800)]
ASoC: Fix possible codec_dai->ops NULL pointer problems

Some codec DAIs like stac9766, wm9712, wm9713, ad1980 don't register themselves
then it loses to the chance to be given a null_dai_ops in snd_soc_register_dai
if they have no ops. When functions like soc_pcm_open, soc_pcm_hw_params etc.
access the ops field in these DAIs, panic will happen.

Signed-off-by: Barry Song <21cnbao@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoASoC: Move dereference after NULL test
Julia Lawall [Sat, 17 Oct 2009 06:32:56 +0000 (08:32 +0200)]
ASoC: Move dereference after NULL test

If the NULL test on jack is needed, then the derefernce should be after the
NULL test.

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

// <smpl>
@match exists@
expression x, E;
identifier fld;
@@

* x->fld
  ... when != \(x = E\|&x\)
* x == NULL
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoASoC: au1x: psc-ac97: reorganize timeouts
Manuel Lauss [Mon, 19 Oct 2009 14:10:59 +0000 (16:10 +0200)]
ASoC: au1x: psc-ac97: reorganize timeouts

Codec read/write functions: wait 21us between the pokings of hardware.
Add timeouts to unbounded loops waiting for bits to change.

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoASoC: au1x: psc-ac97: verify correct codec register was read
Manuel Lauss [Mon, 19 Oct 2009 14:10:58 +0000 (16:10 +0200)]
ASoC: au1x: psc-ac97: verify correct codec register was read

Verify that the correct register has been received from the codec.

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoASoC: TWL4030: Only update the needed bits in *set_dai_sysclk
Peter Ujfalusi [Mon, 19 Oct 2009 12:42:19 +0000 (15:42 +0300)]
ASoC: TWL4030: Only update the needed bits in *set_dai_sysclk

Do not rewrite the whole register, but only update the needed
bits in set_dai_sysclk functions.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
15 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Mon, 19 Oct 2009 06:03:18 +0000 (08:03 +0200)]
Merge branch 'topic/asoc' into for-next

15 years agoMerge branch 'fix/asoc' into for-next
Takashi Iwai [Mon, 19 Oct 2009 06:03:16 +0000 (08:03 +0200)]
Merge branch 'fix/asoc' into for-next