]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
14 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Thu, 4 Feb 2010 13:22:23 +0000 (14:22 +0100)]
Merge branch 'topic/asoc' into for-next

14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Thu, 4 Feb 2010 13:19:43 +0000 (14:19 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Add support of ALC665
Kailang Yang [Thu, 4 Feb 2010 13:18:18 +0000 (14:18 +0100)]
ALSA: hda - Add support of ALC665

- Add support for ALC665
- Add more ASUS model
- Modify common patch for ALC272 ALC273 ALC661 ALC662 ALC663 ALC665

Signed-off-by: Kailang Yang <kailang@realtek.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - Add ALC269VB support
Kailang Yang [Thu, 4 Feb 2010 13:16:14 +0000 (14:16 +0100)]
ALSA: hda - Add ALC269VB support

- Add new models ALC269VB_AMIC ALC269VB_DMIC
- Add alc269vb_laptop_dmic_setup
       The record source index Dmic is 0x6 for ALC269VB.
- Change eeepc words for ALC269
- Modify init_verb tables of patch_alc269 patch_alc662 patch_alc882
- Modify common patch for ALC270 ALC269VB ALC275

Signed-off-by: Kailang Yang <kailang@realtek.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - Remove superfluous init verb entries for ALC88[235]
Kailang Yang [Thu, 4 Feb 2010 13:12:58 +0000 (14:12 +0100)]
ALSA: hda - Remove superfluous init verb entries for ALC88[235]

The default values are no need to be set in init_verbs.

Signed-off-by: Kailang Yang <kailang@realtek.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoASoC: TWL4030: Module unloading fix
Peter Ujfalusi [Thu, 4 Feb 2010 07:10:10 +0000 (09:10 +0200)]
ASoC: TWL4030: Module unloading fix

The module unloading path had several problems:
- it freed up the private structure twice
- it freed up the codec structure, which was allocated as part
  of the private structure
- it did not freed up the reg_cache
- it did not unregistered the dais and the codec

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: Add WM8912 DAC support
Mark Brown [Wed, 3 Feb 2010 19:33:49 +0000 (19:33 +0000)]
ASoC: Add WM8912 DAC support

The WM8912 is a DAC only device register compatible with the WM8904
CODEC with ADC portions omitted.  Support it within the WM8904 driver
based on the configured I2C device name.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
14 years agoASoC: Optimise WM8904 output stage power control
Mark Brown [Wed, 3 Feb 2010 19:51:33 +0000 (19:51 +0000)]
ASoC: Optimise WM8904 output stage power control

Handle the output PGAs as part of the output powerup since they can
never be powered separately and reorder things so that we remove the
output shorts after both line and headphone outputs have been brought
up, minimising the opportunity for any issues.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
14 years agoASoC: Add support for BIAS_OFF when idle to WM8904
Mark Brown [Tue, 26 Jan 2010 22:37:11 +0000 (22:37 +0000)]
ASoC: Add support for BIAS_OFF when idle to WM8904

As well as disabling the biases of the CODEC the drop into BIAS_OFF will
also disable all the regulators powering the CODEC, allowing even greater
power savings on appropriately configured systems.

Since the regulator API does not currently provide notification when
regulators are disabled we assume that this always happens when we stop
using the regulators. Once 2.6.34 is merged this code can be optimised
to only sync the cache when power was actually removed.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
14 years agoASoC: Disable WM8993 regulators when turning bias off
Mark Brown [Wed, 3 Feb 2010 17:55:55 +0000 (17:55 +0000)]
ASoC: Disable WM8993 regulators when turning bias off

While the regulators are disabled we cache all register writes.
Currently we assume that the regulator disable actually takes
effect, after the merge with the regulator tree in 2.6.34 the
regulator API will be able to notify us if the power is actually
removed (due to constraints or regulator sharing it may not be).

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
14 years agoASoC: Initial WM8993 regulator API hookup
Mark Brown [Wed, 3 Feb 2010 11:51:42 +0000 (11:51 +0000)]
ASoC: Initial WM8993 regulator API hookup

At the minute the regulators are simply enabled for the entire
lifetime of the device.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
14 years agoASoC: Convert WM8993 to use shared cache I/O code
Mark Brown [Mon, 1 Feb 2010 19:05:09 +0000 (19:05 +0000)]
ASoC: Convert WM8993 to use shared cache I/O code

Saves a little bit of code duplication.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
14 years agoASoC: Add a cache_sync bit to the CODEC structure
Mark Brown [Mon, 1 Feb 2010 18:48:03 +0000 (18:48 +0000)]
ASoC: Add a cache_sync bit to the CODEC structure

Add a bit to the CODEC structure indicating if a cache sync is required.
By default this will be set if a cache only write is done to a soc-cache
register cache.  This allows us to avoid syncing the cache back after
using cache only writes if there were no changes.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Thu, 4 Feb 2010 09:31:05 +0000 (10:31 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Fix docking output for IDT 92HD8xx codecs
Charles Chin [Thu, 4 Feb 2010 09:28:02 +0000 (10:28 +0100)]
ALSA: hda - Fix docking output for IDT 92HD8xx codecs

This patch fixes docking output support for IDT 92HD81/83/88 family codecs.
Typically one of ports 0xE or 0xF is used for docking output, while only
port 0xF is common on all the three codec families.  We don't want the
pin to select the analog mixer here.

Signed-off-by: Charles Chin <Charles.Chin@idt.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Thu, 4 Feb 2010 08:06:13 +0000 (09:06 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Adding support for another IDT 92HD83XXX codec
Vitaliy Kulikov [Thu, 4 Feb 2010 07:58:23 +0000 (08:58 +0100)]
ALSA: hda - Adding support for another IDT 92HD83XXX codec

Signed-off-by: Vitaliy Kulikov <Vitaliy.Kulikov@idt.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoASoC: Allow CODECs to ask soc-cache to suppress physical writes
Mark Brown [Mon, 1 Feb 2010 18:46:10 +0000 (18:46 +0000)]
ASoC: Allow CODECs to ask soc-cache to suppress physical writes

Currently the soc-cache code will always write to the device, meaning
that we need the device to be powered and active at pretty much all
times the system is active.  Allowing cache only writes lays some
groundwork for future enhancements to allow devices to be put into a
full off state when the audio subsystem is idle.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
14 years agoASoC: fix compilation breakage in sound/soc/sh/fsi.c
Guennadi Liakhovetski [Wed, 3 Feb 2010 16:37:23 +0000 (17:37 +0100)]
ASoC: fix compilation breakage in sound/soc/sh/fsi.c

ctrl_outl() has become void at some point, which breaks compilation of fsi.c.
Make writing functions void, as their output is anyway not evaluated, and use
__raw_writel and __raw_readl instead of deprecated ctrl_outl and ctrl_inl
respectively.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
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 [Tue, 2 Feb 2010 14:36:48 +0000 (15:36 +0100)]
Merge branch 'topic/asoc' into for-next

14 years agoASoC: fix PXA SSP port resume
Daniel Mack [Tue, 2 Feb 2010 10:45:27 +0000 (18:45 +0800)]
ASoC: fix PXA SSP port resume

Unconditionally save the register states when suspending and restore
them again at resume time. Register contents were not preserved over
suspend, and hence the driver takes false assumptions about them.

The clock must be enabled to access the register block.

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: Fix continuation line formats
Joe Perches [Tue, 2 Feb 2010 07:22:16 +0000 (23:22 -0800)]
ASoC: Fix continuation line formats

String constants that are continued on subsequent lines with \
are not good.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: Fix BCLK calculation of WM8994
Joonyoung Shim [Tue, 2 Feb 2010 09:53:19 +0000 (18:53 +0900)]
ASoC: Fix BCLK calculation of WM8994

This fixes BCLK calculation and removes unnecessary check code.

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 agoASoC: Fix WM8994 dependency
Mark Brown [Tue, 2 Feb 2010 10:06:55 +0000 (10:06 +0000)]
ASoC: Fix WM8994 dependency

The dependency on MFD_WM8994 rather than I2C went awry.

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 [Mon, 1 Feb 2010 23:28:37 +0000 (00:28 +0100)]
Merge branch 'topic/misc' into for-next

14 years agoALSA: trivial: sound seq ioctl dbg: print hexadecimal value padded with 0s
Thadeu Lima de Souza Cascardo [Mon, 1 Feb 2010 18:17:01 +0000 (16:17 -0200)]
ALSA: trivial: sound seq ioctl dbg: print hexadecimal value padded with 0s

Instead of padding with blanks and printing "number=0x a", print
"number=0x0a".

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Mon, 1 Feb 2010 23:19:54 +0000 (00:19 +0100)]
Merge branch 'topic/asoc' into for-next

14 years agoASoC: Add WM8994 CODEC driver
Mark Brown [Fri, 29 Jan 2010 17:47:12 +0000 (17:47 +0000)]
ASoC: Add WM8994 CODEC driver

The WM8994 is a highly integrated ultra-low power hi-fi audio subsystem
designed for smartphones and other portable devices rich in multimedia
features.  It provides advanced digital mixing facilities enabling low
power high quality interconnection of CPU, baseband and other audio
sources through flexible digital and analogue routing, and integrates
a class W headphone driver and stereo class D speaker drivers.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: Activate DCS correction for WM8993
Mark Brown [Mon, 1 Feb 2010 18:31:06 +0000 (18:31 +0000)]
ASoC: Activate DCS correction for WM8993

Use a two code correction for optimal performance.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
14 years agoASoC: Improved wm_hubs headphone handling
Mark Brown [Wed, 20 Jan 2010 17:39:45 +0000 (17:39 +0000)]
ASoC: Improved wm_hubs headphone handling

Perform DC servo offset calibration using a series update sequence
rather than startup update sequence, tuning the configuration of the
WM8993 DC servo to make best use of this.

Also introduce currently unused data allowing us to correct for
any systematic errors in the DC servo calibration results and an
alternative startup path for the headphone output which performs
better with some chip revisions.  The alternative setup sequence is
enabled for WM8993.

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 [Mon, 1 Feb 2010 14:46:44 +0000 (15:46 +0100)]
Merge branch 'topic/misc' into for-next

14 years agoMerge remote branch 'alsa/devel' into topic/misc
Takashi Iwai [Mon, 1 Feb 2010 14:46:00 +0000 (15:46 +0100)]
Merge remote branch 'alsa/devel' into topic/misc

14 years agoASoC: Fix continuation line formats
Joe Perches [Sun, 31 Jan 2010 20:02:12 +0000 (12:02 -0800)]
ASoC: Fix continuation line formats

String constants that are continued on subsequent lines with \
are not good.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: improve MCLKDIV calculation in wm8978, when OPCLK is not used
Guennadi Liakhovetski [Fri, 29 Jan 2010 13:51:26 +0000 (14:51 +0100)]
ASoC: improve MCLKDIV calculation in wm8978, when OPCLK is not used

In case, if OPCLK is not used, and PLL is used for driving the codec, the
choice of PLL output frequency could result in a needlessly imprecise
system clock frequency. Use an iterative process to select a precise
configuration.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agosound: control: fix minimum TLV length
Clemens Ladisch [Mon, 1 Feb 2010 12:30:56 +0000 (13:30 +0100)]
sound: control: fix minimum TLV length

Allow TLV blocks that do not have any values; the smallest possible TLV
is an empty container or one where the information is only in the tag.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
14 years agosound: control: actually allow TLV command access
Clemens Ladisch [Mon, 1 Feb 2010 12:29:50 +0000 (13:29 +0100)]
sound: control: actually allow TLV command access

Creating a control with TLV_COMMAND access was not possible because
snd_ctl_new1() forgot to include it in the mask of allowable access
bits.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
14 years agoMerge branch 'fix/asoc' into for-next
Takashi Iwai [Fri, 29 Jan 2010 16:36:17 +0000 (17:36 +0100)]
Merge branch 'fix/asoc' into for-next

14 years agoASoC: clean up wm8974 and wm8978 clock divider handling
Guennadi Liakhovetski [Fri, 29 Jan 2010 14:31:06 +0000 (15:31 +0100)]
ASoC: clean up wm8974 and wm8978 clock divider handling

wm8974 and wm8978 codec drivers control DAC and ADC oversampling rates in their
.set_clkdiv() methods, which is wrong, because these are simple boolean
switches and not clock dividers. Move these bits to sound controls. Also remove
manual configuration of the MCLK divider in wm8978, since it is configured
automatically.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoMerge branch 'for-2.6.33' into for-2.6.34
Mark Brown [Fri, 29 Jan 2010 14:31:06 +0000 (14:31 +0000)]
Merge branch 'for-2.6.33' into for-2.6.34

14 years agoASoC: remove bogus SLEEP mode from wm8978 driver
Guennadi Liakhovetski [Thu, 28 Jan 2010 15:28:55 +0000 (16:28 +0100)]
ASoC: remove bogus SLEEP mode from wm8978 driver

Tests showed, that bit 6 of the WM8978_POWER_MANAGEMENT_2 register of wm8978
affects codec clocks. Being useless for suspend / resume, it cannot be used in
bias-level control either. Remove this bit handling.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: add support for the sh7722 Migo-R board
Guennadi Liakhovetski [Wed, 27 Jan 2010 11:15:00 +0000 (12:15 +0100)]
ASoC: add support for the sh7722 Migo-R board

Add support for audio on sh7722-based Migo-R boards, using SIU and wm8978
codec, recording via external microphone and playback via headphones are
implemented.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: AC97: SMDK-WM9713: Convert notes from cset to sset
Jassi Brar [Fri, 29 Jan 2010 01:57:07 +0000 (10:57 +0900)]
ASoC: AC97: SMDK-WM9713: Convert notes from cset to sset

It's more robust when references are provided in control names
rather than numid.

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: AM3517: ASoC driver not getting compiled
Anuj Aggarwal [Fri, 29 Jan 2010 10:19:22 +0000 (15:49 +0530)]
ASoC: AM3517: ASoC driver not getting compiled

Commit 761c9d45 (ASoC: Fix build of OMAP sound drivers) changes
CONFIG_MACH_OMAP3517EVM -> CONFIG_SND_OMAP_SOC_OMAP3517EVM in the
Makefile. Whereas the config option defined in Kconfig is
SND_OMAP_SOC_AM3517EVM. Because of this, ASoC driver for AM3517
was not getting compiled.

Signed-off-by: Anuj Aggarwal <anuj.aggarwal@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: AIC23: Fixing writes to non-existing registers in resume function
Anuj Aggarwal [Fri, 29 Jan 2010 08:28:55 +0000 (13:58 +0530)]
ASoC: AIC23: Fixing writes to non-existing registers in resume function

Commit e9ff5eb2 (Fixing infinite loop in resume path) uses wrong AIC23
register in resume function because of which register writes happen
on some non-existing registers.

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/hda' into for-next
Takashi Iwai [Fri, 29 Jan 2010 11:06:27 +0000 (12:06 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Add support for IDT 92HD88 family codecs
Charles Chin [Fri, 29 Jan 2010 11:05:51 +0000 (12:05 +0100)]
ALSA: hda - Add support for IDT 92HD88 family codecs

Signed-off-by: Charles Chin <Charles.Chin@idt.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Thu, 28 Jan 2010 18:22:07 +0000 (19:22 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Add mute LED check for HP laptops with IDT 92HD83xxx codec
Vitaliy Kulikov [Thu, 28 Jan 2010 18:21:07 +0000 (19:21 +0100)]
ALSA: hda - Add mute LED check for HP laptops with IDT 92HD83xxx codec

This patch adds HP mute LED support for IDT 92HD81/3 family of the codecs.

Signed-off-by: Vitaliy Kulikov <Vitaliy.Kulikov@idt.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Thu, 28 Jan 2010 16:16:05 +0000 (17:16 +0100)]
Merge branch 'topic/asoc' into for-next

14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Thu, 28 Jan 2010 16:15:58 +0000 (17:15 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Fix index of HP Compaq F700 mic amp
Takashi Iwai [Thu, 28 Jan 2010 16:11:45 +0000 (17:11 +0100)]
ALSA: hda - Fix index of HP Compaq F700 mic amp

The amp used for the mic input on HP Compaq F700 with Cxt5051 codec
has no multiple inputs, thus its index should be 0 instead of 1.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - Define max number of PCM devices in hda_codec.h
Takashi Iwai [Thu, 28 Jan 2010 16:08:53 +0000 (17:08 +0100)]
ALSA: hda - Define max number of PCM devices in hda_codec.h

Define the constant rather in the common header file.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - Change the AZX_MAX_PCMS to 10
Wei Ni [Thu, 28 Jan 2010 08:13:07 +0000 (16:13 +0800)]
ALSA: hda - Change the AZX_MAX_PCMS to 10

In hda_codec.c, it has define
"[HDA_PCM_TYPE_HDMI]  = { 3, 7, 8, 9, -1 },",
it support up to device 9 for HDMI.
But in hda_intel.c, it only define AZX_MAX_PCMS as 8.
So if it have 4 hdmi codecs, when run azx_attach_pcm_stream(),
it will show error "Invalid PCM device number 8", and "... number 9",
and return "-EINVAL".
We should change the AZX_MAX_PCMS to 10.

Signed-off-by: Wei Ni <wni@nvidia.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoASoC: Set codec->dev for AC97 devices
Mark Brown [Thu, 28 Jan 2010 12:36:29 +0000 (12:36 +0000)]
ASoC: Set codec->dev for AC97 devices

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
14 years agoASoC: Add TLV information and additional volumes to WM9713
Mark Brown [Thu, 28 Jan 2010 12:36:07 +0000 (12:36 +0000)]
ASoC: Add TLV information and additional volumes to WM9713

Also renames a few things to make volumes and switches match up in
alsamixer.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
14 years agoASoC: Remove version display from WM9713
Mark Brown [Thu, 28 Jan 2010 10:22:45 +0000 (10:22 +0000)]
ASoC: Remove version display from WM9713

The version isn't being updated or used, the kernel revision
tracking is enough.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
14 years agoASoC: TWL4030: Modify codec default settings
Peter Ujfalusi [Thu, 28 Jan 2010 13:57:04 +0000 (15:57 +0200)]
ASoC: TWL4030: Modify codec default settings

Change the legacy default register configuration, which left some
internal components on.
Now we have either DAPM, or other ways to control these bits,
so there is no need to enable them by default.

The affected parts:
Disable ADCL and ADCR
Disable ARXL2 and ARXR2 analog PGA (playback)
Disable APLL by default

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: fsi: Add spin lock operation for accessing shared area
Kuninori Morimoto [Thu, 28 Jan 2010 04:46:16 +0000 (13:46 +0900)]
ASoC: fsi: Add spin lock operation for accessing shared area

fsi_master_xxx function should be protected by spin lock,
because it are used from both FSI-A and FSI-B.

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 agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Wed, 27 Jan 2010 23:25:44 +0000 (00:25 +0100)]
Merge branch 'topic/asoc' into for-next

14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Wed, 27 Jan 2010 23:04:54 +0000 (00:04 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Allow override more fields via patch loader
Takashi Iwai [Wed, 27 Jan 2010 23:01:53 +0000 (00:01 +0100)]
ALSA: hda - Allow override more fields via patch loader

Allow the override of vendor-id, subsystem-id, revision-id and chip name
via patch loading.  Updated the document, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoASoC: add a WM8978 codec driver
Guennadi Liakhovetski [Wed, 27 Jan 2010 17:56:23 +0000 (18:56 +0100)]
ASoC: add a WM8978 codec driver

The WM8978 codec from Wolfson Microelectronics is very similar to
wm8974, but is stereo and also has some differences in pin configuration
and internal signal routing. This driver is based on wm8974 and takes
the differences into account.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: Note jumper settings for smdk_wm9713 driver on SMDK6410
Mark Brown [Wed, 27 Jan 2010 20:54:13 +0000 (20:54 +0000)]
ASoC: Note jumper settings for smdk_wm9713 driver on SMDK6410

The board supports both GPIO sets for the AC97 bus and the analogue
outputs can be switched between this and the WM8580 so add some
comments saying what the setup the standard kernel expects is.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: AC97: S3C2443: Remove unused driver
Jassi Brar [Wed, 27 Jan 2010 06:04:36 +0000 (15:04 +0900)]
ASoC: AC97: S3C2443: Remove unused driver

Since, we have generic AC97 controller driver and all the machines
have moved to that, there is no need for old s3c2443-ac97.c to exist.

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: AC97: LN2440SBC: Switch to s3c-ac97.c
Jassi Brar [Wed, 27 Jan 2010 06:02:04 +0000 (15:02 +0900)]
ASoC: AC97: LN2440SBC: Switch to s3c-ac97.c

Switch to use s3c-ac97.c AC97 controller driver.

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: AC97: SMDK2443: Switch to s3c-ac97.c
Jassi Brar [Wed, 27 Jan 2010 06:01:03 +0000 (15:01 +0900)]
ASoC: AC97: SMDK2443: Switch to s3c-ac97.c

Switch to use s3c-ac97.c AC97 controller driver.

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: AC97: SMDK: Add wm9713 machine driver
Jassi Brar [Wed, 27 Jan 2010 05:59:19 +0000 (14:59 +0900)]
ASoC: AC97: SMDK: Add wm9713 machine driver

This patch adds the common machine driver for SMDKs that
have a WM9713 codec attched to the AC97 controller.

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: AC97: S3C: Add controller driver
Jassi Brar [Wed, 27 Jan 2010 05:59:08 +0000 (14:59 +0900)]
ASoC: AC97: S3C: Add controller driver

Add the AC97 controller driver for Samsung SoCs that have one.

Signed-off-by: Jassi Brar <jassi.brar@samsung.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 [Wed, 27 Jan 2010 19:28:14 +0000 (20:28 +0100)]
Merge branch 'fix/hda' into for-next

14 years agoALSA: hda - Add an ASUS mobo to MSI blacklist
Takashi Iwai [Wed, 27 Jan 2010 19:26:08 +0000 (20:26 +0100)]
ALSA: hda - Add an ASUS mobo to MSI blacklist

Sid Boyce reported that his machine locks up without enable_msi=0 option.
This looks like another ASUS mobo with Nvidia combo.

Reported-by: Sid Boyce <sboyce@blueyonder.co.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: pcm_native - fix runtime->boundary calculation
Jaroslav Kysela [Wed, 27 Jan 2010 17:10:13 +0000 (18:10 +0100)]
ALSA: pcm_native - fix runtime->boundary calculation

The code in pcm_lib updating runtime->hw_ptr_interrupt expects
that runtime->boundary is divisible with runtime->period_size.
Thanks are going to Clemens Ladisch for the notice.

Fix the runtime->boundary calculation using buffer_size * period_size
as base and find a least common multiple for 32bit platforms when
the expression might overflow.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
14 years agoASoC: ad1938: use soc-cache framework for codec registers access
Barry Song [Wed, 27 Jan 2010 03:46:18 +0000 (11:46 +0800)]
ASoC: ad1938: use soc-cache framework for codec registers access

Signed-off-by: Barry Song <Barry.Song@analog.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: ad1836: use soc-cache framework for codec registers access
Barry Song [Wed, 27 Jan 2010 03:46:17 +0000 (11:46 +0800)]
ASoC: ad1836: use soc-cache framework for codec registers access

Signed-off-by: Barry Song <Barry.Song@analog.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 [Tue, 26 Jan 2010 17:13:17 +0000 (18:13 +0100)]
Merge branch 'topic/misc' into for-next

14 years agoMerge remote branch 'alsa/devel' into topic/misc
Takashi Iwai [Tue, 26 Jan 2010 17:13:04 +0000 (18:13 +0100)]
Merge remote branch 'alsa/devel' into topic/misc

14 years agoALSA: pcm_lib - return back hw_ptr_interrupt
Jaroslav Kysela [Tue, 26 Jan 2010 16:08:24 +0000 (17:08 +0100)]
ALSA: pcm_lib - return back hw_ptr_interrupt

Clemens Ladisch noted for hw_ptr_removal in "cleanup & merge hw_ptr
update functions" commit:

"It is possible for the status/delay ioctls to be called when the sound
card's pointer register alreay shows a position at the beginning of the
new period, but immediately before the interrupt is actually executed.
(This happens regularly on a SMP machine with mplayer.)  When that
happens, the code thinks that the position must be at least one period
ahead of the current position and drops an entire buffer of data."

Return back the hw_ptr_interrupt variable. The last interrupt pointer
is always computed from the latest hw_ptr instead of tracking it
separately (in this case all hw_ptr checks and modifications might
influence also hw_ptr_interrupt and it is difficult to keep it
consistent).

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
14 years agoASoC: DaVinci: Fix stream restart error
Chaithrika U S [Wed, 20 Jan 2010 11:36:33 +0000 (17:06 +0530)]
ASoC: DaVinci: Fix stream restart error

Sometimes after a suspend-resume cycle, the ALSA application
restarts the stream when resume fails and McASP fails to work
as the clock is not enabled. This patch corrects this bug.

Testes on TI DA850/OMAP-L138 EVM.

Signed-off-by: Chaithrika U S <chaithrika@ti.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, 26 Jan 2010 09:40:21 +0000 (10:40 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Add support for more the 8 streams
Wei Ni [Tue, 26 Jan 2010 07:59:33 +0000 (15:59 +0800)]
ALSA: hda - Add support for more the 8 streams

In azx_stream_start() and azx_stream_stop(),
it use azx_readb/azx_writeb to read/write SIE,
it just enable/disable 8 streams.
But according to the HDA spec, it support 30 streams,
and the new HDA controller will support more then 8
streams. So we should use azx_readl/azx_writel to
read/write SIE.

Signed-off-by: Wei Ni <wni@nvidia.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Tue, 26 Jan 2010 08:07:37 +0000 (09:07 +0100)]
Merge branch 'topic/misc' into for-next

14 years agoALSA: cs46xx: Fix cpu idling with resume
Florian Zumbiehl [Tue, 26 Jan 2010 08:06:14 +0000 (09:06 +0100)]
ALSA: cs46xx: Fix cpu idling with resume

Make sure that capture DMA doesn't stay enabled after system resume
as that potentially prevents the processor from entering deep sleep
states.

Signed-off-by: Florian Zumbiehl <florz@florz.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Mon, 25 Jan 2010 19:40:10 +0000 (20:40 +0100)]
Merge branch 'topic/asoc' into for-next

14 years agoMerge branch 'fix/asoc' into for-next
Takashi Iwai [Mon, 25 Jan 2010 15:29:50 +0000 (16:29 +0100)]
Merge branch 'fix/asoc' into for-next

14 years agoMerge branch 'for-2.6.33' into for-2.6.34
Mark Brown [Mon, 25 Jan 2010 14:52:48 +0000 (14:52 +0000)]
Merge branch 'for-2.6.33' into for-2.6.34

14 years agoASoC: ad1836: reset and restore clock control mode in suspend/resume entry
Barry Song [Mon, 25 Jan 2010 08:42:25 +0000 (16:42 +0800)]
ASoC: ad1836: reset and restore clock control mode in suspend/resume entry

tests show frequent suspend/resume(frequent poweroff/on ad1836 internal
components) maybe make ad1836 clock mode wrong sometimes after wakeup.
This patch reset/restore ad1836 clock mode while executing PM, then
ad1836 can always resume to right clock status.

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: add DAI and platform / DMA drivers for SH SIU
Guennadi Liakhovetski [Fri, 22 Jan 2010 18:09:03 +0000 (19:09 +0100)]
ASoC: add DAI and platform / DMA drivers for SH SIU

Several SuperH platforms, including sh7722, sh7343, sh7354, sh7367 include
a Sound Interface Unit (SIU). This patch adds DAI and platform / DMA
drivers for this interface.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: add helper macros to declare struct soc_enum instances
Guennadi Liakhovetski [Thu, 21 Jan 2010 21:04:03 +0000 (22:04 +0100)]
ASoC: add helper macros to declare struct soc_enum instances

Several shortcuts for popular uses of some of SOC_ENUM_* and
SOC_VALUE_ENUM_* macros.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: add simplified versions of widget macros
Guennadi Liakhovetski [Thu, 21 Jan 2010 20:10:47 +0000 (21:10 +0100)]
ASoC: add simplified versions of widget macros

Many macros from include/sound/soc-dapm.h take an array and a number of
elements in it as arguments, whereas most users use static arrays and use
"x, ARRAY_SIZE(x)" as arguments. This patch adds simplified versions of
those macros, calling ARRAY_SIZE() internally.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Liam Girdwood <lrg@slimlogic.oc.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Mon, 25 Jan 2010 14:46:15 +0000 (15:46 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Remove the COEF setup for ALC267/ALC268
Takashi Iwai [Mon, 25 Jan 2010 14:44:11 +0000 (15:44 +0100)]
ALSA: hda - Remove the COEF setup for ALC267/ALC268

The COEF setup for model=auto seems problematic on some laptops,
resulting in the silent speaker output.  Better to disable it for now.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - Remove coef output in Realtek proc files
Takashi Iwai [Mon, 25 Jan 2010 14:41:11 +0000 (15:41 +0100)]
ALSA: hda - Remove coef output in Realtek proc files

The output of COEF index/value in the proc file for Realtek codecs is
rather useless since the value varies together with the index.
Let's get rid of it again.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoASoC: fix a memory-leak in wm8903
Guennadi Liakhovetski [Fri, 22 Jan 2010 17:00:03 +0000 (18:00 +0100)]
ASoC: fix a memory-leak in wm8903

Remember to free the temporary register-cache.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
14 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Mon, 25 Jan 2010 07:00:36 +0000 (08:00 +0100)]
Merge branch 'fix/hda' into for-next

14 years agoALSA: hda - add possibility to choose speakers configuration for 4930g
Łukasz Wojniłowicz [Sun, 24 Jan 2010 13:12:37 +0000 (14:12 +0100)]
ALSA: hda - add possibility to choose speakers configuration for 4930g

Now one can choose speaker configuration in e.g. PulseAudio mixer

Signed-off-by: Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Sun, 24 Jan 2010 10:21:53 +0000 (11:21 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Change headphone pin control with master volume on cx5051
Takashi Iwai [Sun, 24 Jan 2010 10:19:27 +0000 (11:19 +0100)]
ALSA: hda - Change headphone pin control with master volume on cx5051

The HP pin (0x16) control has to be changed dynamically depending on
the master volume switch as well as the speaker pin (0x1a).  Otherwise
the headphone still sounds with master off.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - Fix SPDIF output widget for Cxt5051 codec
Takashi Iwai [Sun, 24 Jan 2010 10:14:36 +0000 (11:14 +0100)]
ALSA: hda - Fix SPDIF output widget for Cxt5051 codec

Fixed the wrongly set up for SPDIF output on Conexant 5051 codec.
It must point to the audio out widget instead of a pin.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - initialize mic port on cxt5051 codec dynamically
Takashi Iwai [Sun, 24 Jan 2010 10:00:27 +0000 (11:00 +0100)]
ALSA: hda - initialize mic port on cxt5051 codec dynamically

Initialize the mic ports B & C on Conexant 5051 codec dynamically
according to the mic jack detection, instead of static init arrays.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - Merge playback controls for Cx5051 codec models
Takashi Iwai [Sun, 24 Jan 2010 09:47:02 +0000 (10:47 +0100)]
ALSA: hda - Merge playback controls for Cx5051 codec models

All cx5051 codec models have the same Master playback mixer definitions.
Merge them together.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - Add support for Toshiba Satellite M300
Takashi Iwai [Sat, 23 Jan 2010 21:31:36 +0000 (22:31 +0100)]
ALSA: hda - Add support for Toshiba Satellite M300

Added the support for Toshiba Satellite M300 with Conexant 5051 codec.
Since the laptop has no port C connection and the pin reports always
the jack sense true, we need to ignore port-C unsol event.

Signed-off-by: Takashi Iwai <tiwai@suse.de>