8 years agoASoC: Change WM9081 speaker output enable to _OUT_DRV
Mark Brown [Fri, 24 Jun 2011 11:44:45 +0000]
ASoC: Change WM9081 speaker output enable to _OUT_DRV

More for neatness than any actual performance improvement.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Correct left/right swap in wm_hubs DC offset correction
Mark Brown [Tue, 7 Jun 2011 22:28:45 +0000]
ASoC: Correct left/right swap in wm_hubs DC offset correction

It was consistently wrong for everything except WM8993 so should be no
functional change.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.comm>

8 years agoASoC: Blackfin: Add machine driver for EVAL-ADAV80X boards
Lars-Peter Clausen [Mon, 27 Jun 2011 15:04:02 +0000]
ASoC: Blackfin: Add machine driver for EVAL-ADAV80X boards

Add a machine driver to support the EVAL-ADAV801 and EVAL-ADAV803 boards
connected to a Analog Devices BF5XX evaluation board.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Add ADAV80x codec driver
Lars-Peter Clausen [Mon, 27 Jun 2011 15:04:01 +0000]
ASoC: Add ADAV80x codec driver

This patch adds support for the Analog Devices ADAV801 and ADAV803 audio codec.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: SAMSUNG: Add idma related register definition
Sangbeom Kim [Mon, 20 Jun 2011 07:36:19 +0000]
ASoC: SAMSUNG: Add idma related register definition

This patch add idma related register definitions to support idma.

Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>
Acked-by: Jassi Brar <jaswinder.singh@linaro.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: SAMSUNG: Move I2S common register definition
Sangbeom Kim [Mon, 20 Jun 2011 07:36:18 +0000]
ASoC: SAMSUNG: Move I2S common register definition

I2S registers can be used for control idma.
Previously, register is defined in i2s.c.
For sharing the registers, It is moved to i2s-regs.h

Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>
Acked-by: Jassi Brar <jaswinder.singh@linaro.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: SAMSUNG: Add WM8994 PCM Machine driver
Sangbeom Kim [Mon, 20 Jun 2011 08:29:29 +0000]
ASoC: SAMSUNG: Add WM8994 PCM Machine driver

This patch add WM8994 PCM machine driver to support PCM audio
on SMDKV310, SMDKC210 boards.
Playback and Capture supports 8kHz sampling rates.
and It is tested on SMDKV310, SMDKC210.

Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>
Acked-by: Jassi Brar <jaswinder.singh@linaro.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoMerge branch 'for-3.0' into for-3.1
Mark Brown [Thu, 23 Jun 2011 19:10:28 +0000]
Merge branch 'for-3.0' into for-3.1

8 years agoASoC: pxa-ssp: Correct check for stream presence
Daniel Mack [Wed, 22 Jun 2011 18:48:25 +0000]
ASoC: pxa-ssp: Correct check for stream presence

Don't rely on the codec's channels_min information to decide wheter or
not allocate a substream's DMA buffer. Rather check if the substream
itself was allocated previously.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org

8 years agoASoC: imx: add missing module informations
Arnaud Patard (Rtp) [Wed, 22 Jun 2011 20:21:49 +0000]
ASoC: imx: add missing module informations

- add some modules aliases
- add module license to avoid tainted kernel when loading the imx-pcm-audio
  driver

Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: imx: Remove unused Kconfig SND_MXC_SOC_SSI entry
Arnaud Patard (Rtp) [Wed, 22 Jun 2011 20:21:48 +0000]
ASoC: imx: Remove unused Kconfig SND_MXC_SOC_SSI entry

SND_MXC_SOC_SSI looks to be unused, so kill it.

Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Add basic WM8918 support
Mark Brown [Wed, 22 Jun 2011 19:07:24 +0000]
ASoC: Add basic WM8918 support

The WM8918 is register compatible with the WM8904 with a subset of the
functionality. Add the device ID, a subsequent patch will ensure that only
the relevant functionality is exported to userspace.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Allow suppression of series updates on wm_hubs devices
Mark Brown [Tue, 7 Jun 2011 22:32:46 +0000]
ASoC: Allow suppression of series updates on wm_hubs devices

Some devices do not support manual updates of the DC servo.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Trigger wm_hubs series update startup off a separate flag
Mark Brown [Tue, 7 Jun 2011 22:23:52 +0000]
ASoC: Trigger wm_hubs series update startup off a separate flag

Allowing the two to be used independently.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: add WM8782 ADC Codec Driver
Johannes Stezenbach [Wed, 22 Jun 2011 12:59:25 +0000]
ASoC: add WM8782 ADC Codec Driver

Signed-off-by: Johannes Stezenbach <js@sig21.net>
[zonque@gmail.com: transform to new ASoC structure]
Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: add STA32X codec driver
Johannes Stezenbach [Wed, 22 Jun 2011 12:59:24 +0000]
ASoC: add STA32X codec driver

Signed-off-by: Johannes Stezenbach <js@sig21.net>
[zonque@gmail.com: transform to new ASoC structure]
Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: codecs: Max98095: Fix logging of hardware revision.
Taylor Hutt [Mon, 20 Jun 2011 18:54:32 +0000]
ASoC: codecs: Max98095: Fix logging of hardware revision.

The base hardware revision of the Maxim 98095 part is 0x40; the code
which outputs the revision of the hardware has been updated to
properly use uppercase alphabetic values for the revision numbers.

Also, the use of a constant for the length 'max98095_dai' has been
replaced with ARRAY_SIZE().

Signed-off-by: Taylor Hutt <thutt@chromium.org>
Acked-by: Peter Hsiang <peter.hsiang@maxim-ic.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: adau1701: signedness bug in adau1701_write()
Dan Carpenter [Mon, 20 Jun 2011 07:11:25 +0000]
ASoC: adau1701: signedness bug in adau1701_write()

"ret" is supposed to be signed here.  The current code will only
return -EIO on error, instead of a more appropriate error code such
as -EAGAIN etc.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Fix DAPM sequence run for per-widget I/O methods
Mark Brown [Sun, 19 Jun 2011 12:49:28 +0000]
ASoC: Fix DAPM sequence run for per-widget I/O methods

Previously we were using the DAPM context rather than a widget as the
argument for update_bits() so we didn't need to care that our list walk
of widgets left us one beyond the end of the list. Now we're using them
for the register update we need to make sure we're pointing at an actual
widget not the list_head.

Fix originally suggested by Liam on IM.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Remove adau1701 from SND_SOC_ALL_CODECS due to Sigma dependency
Mark Brown [Sat, 18 Jun 2011 14:31:38 +0000]
ASoC: Remove adau1701 from SND_SOC_ALL_CODECS due to Sigma dependency

The Sigma code is in drivers/firmware which is only included on a very
small subset of architectures and so ends up breaking the build on
others.  There's a pending patch to make the directory build as standard
but it's not merged yet.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Add adau* drivers to the Analog Devices file patterns
Mark Brown [Fri, 17 Jun 2011 10:22:27 +0000]
ASoC: Add adau* drivers to the Analog Devices file patterns

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>

8 years agoASoC: Blackfin: allow SPI for SSM2602 parts
Mike Frysinger [Fri, 17 Jun 2011 02:24:15 +0000]
ASoC: Blackfin: allow SPI for SSM2602 parts

This board has hardware switches for selecting SPI or I2C, so don't
require I2C for this driver.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: AD1836: rename suspend/resume funcs
Barry Song [Wed, 15 Jun 2011 19:29:22 +0000]
ASoC: AD1836: rename suspend/resume funcs

Use less specific names for suspend/resume to match the probe/remove funcs
where these are now used.

Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Scott Jiang <scott.jiang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: AD1836: fix codec name
Mike Frysinger [Wed, 15 Jun 2011 19:29:21 +0000]
ASoC: AD1836: fix codec name

The codec name should not have a "-codec" suffix since this is not part of
a MFD.  This was incorrectly changed during the multi-component updated.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: AD1836: fix intermixed tab/space indentation
Mike Frysinger [Wed, 15 Jun 2011 19:29:20 +0000]
ASoC: AD1836: fix intermixed tab/space indentation

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: AD1836: drop unnecessary spi register check
Mike Frysinger [Wed, 15 Jun 2011 19:29:19 +0000]
ASoC: AD1836: drop unnecessary spi register check

The only thing the init func does is register a spi driver, so if that
fails, we return the value back up to the caller who will display an
error message for us.  So drop the redundant checking/message.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: AD1836: clean up comment headers
Mike Frysinger [Wed, 15 Jun 2011 19:29:23 +0000]
ASoC: AD1836: clean up comment headers

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Blackfin: Add bf5xx-adau1701 machine driver
Lars-Peter Clausen [Mon, 13 Jun 2011 13:26:21 +0000]
ASoC: Blackfin: Add bf5xx-adau1701 machine driver

Add a machine driver to support the ADAU1701 SigmaDSP processors on
Analog Devices BF5XX evaluation boards.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Add ADAU1701 codec driver
Lars-Peter Clausen [Mon, 13 Jun 2011 13:26:20 +0000]
ASoC: Add ADAU1701 codec driver

This patch adds support for the Analog Devices ADAU1701 SigmaDSP.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Clean up some coding style nits in the bf5xx-i2s-pcm driver
Mark Brown [Mon, 13 Jun 2011 16:50:18 +0000]
ASoC: Clean up some coding style nits in the bf5xx-i2s-pcm driver

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: dapm - Refactor widget IO functions in preparation for platform widgets.
Liam Girdwood [Mon, 13 Jun 2011 18:37:36 +0000]
ASoC: dapm - Refactor widget IO functions in preparation for platform widgets.

This time with soc_widget_update_bits reflecting recent soc_update_bits changes.

Currently widget IO is tightly coupled to the CODEC drivers. Future platform DSP
devices have mixer components that can alter power usage and hence require full
DAPM support.

This provides a generic widget IO operation wrapper in preparation for
future patches that implement platform driver DAPM.

Signed-off-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Fix mismerge with release branch
Mark Brown [Tue, 14 Jun 2011 08:51:50 +0000]
ASoC: Fix mismerge with release branch

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoMerge branch 'for-3.0' into for-3.1
Mark Brown [Mon, 13 Jun 2011 18:21:09 +0000]
Merge branch 'for-3.0' into for-3.1

Trival fixup for move of I/O code into separate file.

Conflicts:
sound/soc/soc-cache.c

8 years agoASoC: Remove unused and about to be broken SND_SOC_CUSTOM I/O bus
Mark Brown [Mon, 13 Jun 2011 18:05:58 +0000]
ASoC: Remove unused and about to be broken SND_SOC_CUSTOM I/O bus

This will be removed in -next so let's drop it from mainline as soon as
we can in order to minimise surprises.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Don't use codec->control_data in bulk write
Mark Brown [Mon, 13 Jun 2011 17:44:52 +0000]
ASoC: Don't use codec->control_data in bulk write

In order to facilitate merging with the register map I/O replace the use
of control_data for the bulk writes with direct lookup of the client data
from the device.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Add weak routes for sidetone style paths
Mark Brown [Mon, 13 Jun 2011 15:42:29 +0000]
ASoC: Add weak routes for sidetone style paths

Normally DAPM will power up any connected audio path. This is not ideal
for sidetone paths as with sidetone paths the audio path is not wanted in
itself, it is only desired if the two paths it provides a sidetone between
are both active. If the sidetone path causes a power up then it can be
hard to minimise pops as we first power up either the sidetone or the main
output path and then power the other, with the second power up potentially
introducing a DC offset.

Address this by introducing the concept of a weak path. If a path is marked
as weak then DAPM will ignore that path when walking the graph, though all
the relevant controls are still available to the application layer to allow
these paths to be configured.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Move register I/O code into a separate file
Mark Brown [Mon, 13 Jun 2011 16:49:55 +0000]
ASoC: Move register I/O code into a separate file

For clarity and to help ongoing refactoring in this area create a new file
to contain the physical I/O functions, separating them out from the cache
operations.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Factor out redundant read() functions
Mark Brown [Fri, 10 Jun 2011 18:42:56 +0000]
ASoC: Factor out redundant read() functions

We've got a whole bunch of functions which just call straight through to
do_hw_read(). Simplify this situation by removing them and using hw_read()
directly.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: SMDKV310: Enable SPDIF device
Naveen Krishna Chatradhi [Fri, 10 Jun 2011 06:34:27 +0000]
ASoC: SMDKV310: Enable SPDIF device

Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoMerge branch 'for-3.0' into for-3.1
Mark Brown [Fri, 10 Jun 2011 10:03:54 +0000]
Merge branch 'for-3.0' into for-3.1

8 years agosound/atmel_ssc_dai: add a missing space to an error message
Uwe Kleine-König [Thu, 9 Jun 2011 22:41:48 +0000]
sound/atmel_ssc_dai: add a missing space to an error message

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: SAMSUNG: Fix the incorrect referencing of I2SCON register
Sangbeom Kim [Fri, 10 Jun 2011 01:36:54 +0000]
ASoC: SAMSUNG: Fix the incorrect referencing of I2SCON register

If DMA active status should be checked, I2SCON register should be referenced.
In this patch, Fix the incorrect referencing of I2SCON register.

Reported-by : Lakkyung Jung <lakkyung.jung@samsung.com>
Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>
Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org

8 years agoASoC: pcm - rename snd_codec_close() to snd_pcm_close().
Liam Girdwood [Thu, 9 Jun 2011 16:04:59 +0000]
ASoC: pcm - rename snd_codec_close() to snd_pcm_close().

Make sure we follow naming convention for all PCM ops.

Signed-off-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: core - PCM mutex per rtd
Liam Girdwood [Thu, 9 Jun 2011 16:04:39 +0000]
ASoC: core - PCM mutex per rtd

In preparation for the new ASoC Dynamic PCM support (AKA DSP support).

The new ASoC Dynamic PCM core allows DAIs to be dynamically re-routed
at runtime between the PCM device end (or Frontend - FE) and the physical DAI
(Backend - BE) using regular kcontrols (just like a hardware CODEC routes
audio in the analog domain). The Dynamic PCM core therefore must be
able to call PCM operations for both the Frontend and Backend(s) DAIs at
the same time.

Currently we have a global pcm_mutex that is used to serialise
the ASoC PCM operations. This patch removes the global mutex
and adds a mutex per RTD allowing the PCM operations to be reentrant and
allow control of more than one DAI at at time. e.g. a frontend PCM hw_params()
could configure multiple backend DAI hw_params() with similar or different
hw parameters at the same time.

Signed-off-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoMerge branch 'for-3.0' into for-3.1
Mark Brown [Thu, 9 Jun 2011 14:07:42 +0000]
Merge branch 'for-3.0' into for-3.1

8 years agoASoC: core - Separate out PCM operations into new file.
Liam Girdwood [Thu, 9 Jun 2011 13:45:53 +0000]
ASoC: core - Separate out PCM operations into new file.

In preparation for Dynamic PCM support (AKA DSP support).

There will be future patches that add support to allow PCMs to be dynamically
routed to multiple DAIs at startup and also during stream runtime. This patch
moves the ASoC core PCM operaitions into a new file called soc-pcm.c.  This will
in simplify the ASoC core features into distinct files.

Signed-off-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: snd_soc_new_{mixer,mux,pga} make sure to use right DAPM context
Lars-Peter Clausen [Thu, 9 Jun 2011 11:22:36 +0000]
ASoC: snd_soc_new_{mixer,mux,pga} make sure to use right DAPM context

Currently it is possible that snd_soc_new_{mixer,mux,pga} is called with a
DAPM context not matching the widgets context. This can lead to a wrong
prefix_len calculation, which will result in undefined behaviour. To avoid
this always use the DAPM context from the widget itself.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org

8 years agoMerge branch 'for-3.0' into for-3.1
Mark Brown [Thu, 9 Jun 2011 11:02:26 +0000]
Merge branch 'for-3.0' into for-3.1

8 years agoASoC: p1022ds: fix incorrect referencing of device tree properties
Timur Tabi [Wed, 8 Jun 2011 20:02:55 +0000]
ASoC: p1022ds: fix incorrect referencing of device tree properties

Device tree integer properties are encoded in big-endian format, but some of
the Freescale ASoC drivers were assuming that the host is in big-endian format
as well.  Although this is true, it's better to use endian-safe accessors.

Also add a check for a failed ioremap() call in the SSI driver.

Signed-off-by: Timur Tabi <timur@freescale.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: fsl: fix initialization of DMA buffers
Timur Tabi [Wed, 8 Jun 2011 20:02:56 +0000]
ASoC: fsl: fix initialization of DMA buffers

The DMA (PCM) driver used by some Freescale PowerPC supports separate DAIs
for playback and capture, so DMA buffers should be allocated only for the
initialized streams.  Instead of checking for the number of active channels,
which apparently is not reliable, check to see if the actual stream object
exists.

Also provide a better name for the DMA interrupt.

Signed-off-by: Timur Tabi <timur@freescale.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: WM8804 does not support sample rates below 32kHz
Mark Brown [Wed, 8 Jun 2011 17:07:49 +0000]
ASoC: WM8804 does not support sample rates below 32kHz

Reported-by: Kieran O'Leary <Kieran.O'Leary@wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Cc: stable@kernel.org

8 years agoASoC: Fix mismerge of Speyside set_bias_level_post()
Mark Brown [Wed, 8 Jun 2011 15:11:18 +0000]
ASoC: Fix mismerge of Speyside set_bias_level_post()

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoMerge branch 'for-3.0' into for-3.1
Mark Brown [Wed, 8 Jun 2011 14:25:07 +0000]
Merge branch 'for-3.0' into for-3.1

8 years agoASoC: Support Speyside build variants with WM8962 fitted
Mark Brown [Mon, 25 Apr 2011 17:30:45 +0000]
ASoC: Support Speyside build variants with WM8962 fitted

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Defer all WM8962 clocking configuration until power up
Mark Brown [Wed, 8 Jun 2011 13:44:06 +0000]
ASoC: Defer all WM8962 clocking configuration until power up

Don't require an audio rate SYSCLK in hw_params() in order to better
support microphone detection use cases.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Implement base 5 band EQ control for WM8962
Mark Brown [Tue, 7 Jun 2011 22:14:37 +0000]
ASoC: Implement base 5 band EQ control for WM8962

ReTune Mobile modes are not currently supported.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Report errors when we have a WM8962 IRQ and don't get FLL lock
Mark Brown [Tue, 7 Jun 2011 22:16:29 +0000]
ASoC: Report errors when we have a WM8962 IRQ and don't get FLL lock

We really should be getting the interrupt - if we don't get one it's very
likely that the configuration is incorrect and audio will fail. Also
increase the timeout substantially in this case for safety.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Factor out I2C usage in WM8962 driver
Mark Brown [Tue, 7 Jun 2011 22:13:53 +0000]
ASoC: Factor out I2C usage in WM8962 driver

The chip can actually support SPI so we shouldn't assume we've got an I2C
device even though that's the most common configuration.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Suppress restore of default register values for rbtree cache sync
Mark Brown [Fri, 3 Jun 2011 15:36:30 +0000]
ASoC: Suppress restore of default register values for rbtree cache sync

Currently the rbtree code will write out the entire register map when
doing a cache sync which is wasteful and will slow things down. Check
to see if the value we're about to write is the default and don't bother
restoring it if it is, either the value will have been retained or the
device will have been reset and holds the value already.

We should really store the defaults in the nodes but this resolves the
immediate issue.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Fix WM8962 headphone volume update for use of advanced caches
Mark Brown [Tue, 7 Jun 2011 22:42:04 +0000]
ASoC: Fix WM8962 headphone volume update for use of advanced caches

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Cc: stable@kernel.org

8 years agoASoC: core - Allow components to probe/remove in sequence.
Liam Girdwood [Tue, 7 Jun 2011 15:08:05 +0000]
ASoC: core - Allow components to probe/remove in sequence.

Some ASoC components depend on other ASoC components to provide clocks and
power resources in order to probe() and vice versa for remove().

Allow components to be ordered so that components can be probed() and removed()
in sequences that conform to their dependencies.

Signed-off-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: core - Optimise and refactor pcm_new() to pass only rtd
Liam Girdwood [Tue, 7 Jun 2011 15:08:33 +0000]
ASoC: core - Optimise and refactor pcm_new() to pass only rtd

Currently pcm_new() passes in 3 arguments :- card, pcm and DAI.

Refactor this to only pass in 1 argument (i.e. the rtd) since struct rtd contains
card, pcm and DAI along with other members too that are useful too.

Signed-off-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoMerge branch 'for-3.0' into for-3.1
Mark Brown [Tue, 7 Jun 2011 08:49:47 +0000]
Merge branch 'for-3.0' into for-3.1

8 years agoASoC: Blackfin: bf5xx-ad1836: Fix codec device name
Lars-Peter Clausen [Tue, 7 Jun 2011 08:24:46 +0000]
ASoC: Blackfin: bf5xx-ad1836: Fix codec device name

Fix the codec_name field of the dai_link to match the actual device name
of the codec. Otherwise the card won't be instantiated.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org

8 years agoASoC: AD1836: Fix build error
Lars-Peter Clausen [Tue, 7 Jun 2011 05:02:59 +0000]
ASoC: AD1836: Fix build error

Commit f97d0c6d5f94 ("ASoC: AD1836: Add input gain control for ADC2") contained
a typo in the register name, causing a build error. This patch fixes it.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: wm8940: remove unnecessary if statements
Greg Dietsche [Mon, 6 Jun 2011 20:53:01 +0000]
ASoC: wm8940: remove unnecessary if statements

removing unnecessary if(ret) checks

This updated patch corrects a minor spelling problem in the commit message
and resolves two other (similar) issues found in wm8940.c by Jonathan Cameron.

Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoMerge branch 'for-3.0' into for-3.1
Mark Brown [Mon, 6 Jun 2011 20:57:54 +0000]
Merge branch 'for-3.0' into for-3.1

8 years agoASoC: AD1836: Fix setting the PCM format
Lars-Peter Clausen [Mon, 6 Jun 2011 11:38:35 +0000]
ASoC: AD1836: Fix setting the PCM format

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org

8 years agoASoC: AD1836: Add input gain control for ADC2
Lars-Peter Clausen [Mon, 6 Jun 2011 11:38:40 +0000]
ASoC: AD1836: Add input gain control for ADC2

The AD1836 has a PGA for its second ADC. This patch adds a control for
adjusting the the gain of the PGA.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: AD1836: Remove unused fields from private struct
Lars-Peter Clausen [Mon, 6 Jun 2011 11:38:39 +0000]
ASoC: AD1836: Remove unused fields from private struct

The control_type field is never used, so it can be removed.  The
control_data field is used to initialize the codec's control_data field,
but since this is also done by the snd-soc-cache core, the redundant
assignment can be removed and the field can be dropped.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: AD1836: Add AD1835/AD1837/AD1838/AD1839 support
Lars-Peter Clausen [Mon, 6 Jun 2011 11:38:38 +0000]
ASoC: AD1836: Add AD1835/AD1837/AD1838/AD1839 support

The AD183X codec devices are mostly register compatible and can easily be
supported by the same driver.  The main difference between those devices
is the number of DACs and ADCs.

This patch adjusts the driver to allocate the controls, DAPM widgets and
routes for the DACs and ADCs dynamically based on the chip type.

The AD1836 is a bit special in that it supports different modes for its second
ADC, so it needs some special handling. Right now the driver hardcodes the mode
to the differential PGA mode.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: AD1836: Use snd_soc_update_bits for read-modify-write
Lars-Peter Clausen [Mon, 6 Jun 2011 11:38:37 +0000]
ASoC: AD1836: Use snd_soc_update_bits for read-modify-write

Use snd_soc_update_bits for read-modify-write register access instead of
open-coding it using snd_soc_read and snd_soc_write.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: AD1836: Add ADC/DAC controls helper macros
Lars-Peter Clausen [Mon, 6 Jun 2011 11:38:36 +0000]
ASoC: AD1836: Add ADC/DAC controls helper macros

The different ADC and DAC controls follow the same scheme, so add some helper
macros for declaring them.
This should make the code a bit more readable and also decreases the code size
a bit.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Manage Speyside system clocking only in bias management
Mark Brown [Mon, 6 Jun 2011 18:12:44 +0000]
ASoC: Manage Speyside system clocking only in bias management

Now that the CODEC driver supports it defer configuration of the system
clock until bias management which is a much more idiomatic place to do
system power control and makes things a lot more happy when we're using
both interfaces.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Only provide a default bias level update for CODEC contexts
Mark Brown [Mon, 6 Jun 2011 18:03:34 +0000]
ASoC: Only provide a default bias level update for CODEC contexts

This allows the card driver to use the bias level variable more easily in
multi component systems.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Add context parameter to card DAPM callbacks
Mark Brown [Mon, 6 Jun 2011 18:13:23 +0000]
ASoC: Add context parameter to card DAPM callbacks

The card callback will get called for each DAPM context in the card so it
can be useful for it to know which device is currently undergoing a
transition.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Simplify logic in snd_soc_dapm_set_bias_level()
Mark Brown [Mon, 6 Jun 2011 17:15:19 +0000]
ASoC: Simplify logic in snd_soc_dapm_set_bias_level()

No functional changes but much less indentation.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Remove trace for DAPM bias level logging
Mark Brown [Mon, 6 Jun 2011 15:15:53 +0000]
ASoC: Remove trace for DAPM bias level logging

It's redundant now thanks to the use of the generic trace infrastructure.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Indentation fix for null loop operation
Mark Brown [Mon, 6 Jun 2011 15:16:34 +0000]
ASoC: Indentation fix for null loop operation

More with the legibility.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Don't bring the CODEC up to full power for supplies and biases
Mark Brown [Sat, 4 Jun 2011 10:34:43 +0000]
ASoC: Don't bring the CODEC up to full power for supplies and biases

If the only widgets active within a CODEC are supplies and micbiases we
are not passing audio, we are probably just doing microphone detection.
This will not generally require either fully accurate reference voltages
or much power so

If this turns out to be unsuitable for some systems we can provide a
facility to override this decision.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Specify target bias state directly as a bias state
Mark Brown [Sat, 4 Jun 2011 10:25:10 +0000]
ASoC: Specify target bias state directly as a bias state

Rather than a simple flag to say if we want the DAPM context to be at full
power specify the target bias state. This should have no current effect
but is a bit more direct and so makes it easier to change our decisions
about the which bias state to go into in future.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Allow WM8915 BCLK calculation outside hw_params()
Mark Brown [Mon, 6 Jun 2011 15:05:13 +0000]
ASoC: Allow WM8915 BCLK calculation outside hw_params()

Allow more dynamic management of the device clocking by allowing BCLK to
be calculated when we set SYSCLK. This means that if the system is idle
when hw_params() runs then we don't try to use the SYSCLK used in that case
to set up the BCLK dividers, we can instead wait until a later point such
as bias level configuration. This makes it easier to manage low power modes.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoMerge branch 'for-3.0' into for-3.1
Mark Brown [Mon, 6 Jun 2011 18:34:58 +0000]
Merge branch 'for-3.0' into for-3.1

8 years agoASoC: Check for NULL register bank in snd_soc_get_cache_val()
Mark Brown [Mon, 6 Jun 2011 10:26:15 +0000]
ASoC: Check for NULL register bank in snd_soc_get_cache_val()

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Enforce the mask in snd_soc_update_bits()
Mark Brown [Fri, 3 Jun 2011 16:09:14 +0000]
ASoC: Enforce the mask in snd_soc_update_bits()

Avoids issues if someone does a read followed by restore and doesn't mask
out only the bits being updated.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Error out when FLL lock interrupt is not delivered on WM8915
Mark Brown [Fri, 3 Jun 2011 16:49:46 +0000]
ASoC: Error out when FLL lock interrupt is not delivered on WM8915

When the FLL locks on the WM8915 an interrupt is generated.  For safety
error out if we don't get that interrupt when the IRQ output of the
WM8915 is hooked up.  Since we *really* expect an interrupt but the
threaded IRQ handler may take a bit longer than expected to get
scheduled also dramatically increase the delay in this case.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Suppress noop SYSCLK updates in WM8915
Mark Brown [Fri, 3 Jun 2011 16:09:49 +0000]
ASoC: Suppress noop SYSCLK updates in WM8915

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoMerge branch 'for-3.0' into for-3.1
Mark Brown [Mon, 6 Jun 2011 11:47:06 +0000]
Merge branch 'for-3.0' into for-3.1

8 years agoASoC: Add missing break in WM8915 FLL source selection
Mark Brown [Fri, 3 Jun 2011 17:20:50 +0000]
ASoC: Add missing break in WM8915 FLL source selection

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Only update SYSCLK_ENA when pausing WM8915 SYSCLK
Mark Brown [Fri, 3 Jun 2011 16:13:57 +0000]
ASoC: Only update SYSCLK_ENA when pausing WM8915 SYSCLK

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoMerge branch 'for-3.0' into for-3.1
Mark Brown [Mon, 6 Jun 2011 11:26:02 +0000]
Merge branch 'for-3.0' into for-3.1

8 years agoMerge branch 'for-3.0' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...
Mark Brown [Mon, 6 Jun 2011 09:38:23 +0000]
Merge branch 'for-3.0' of git://git./linux/kernel/git/broonie/sound-2.6 into for-3.0

8 years agoASoC: atmel_ssc: Don't try to free ssc if request failed
Joachim Eastwood [Wed, 1 Jun 2011 21:59:10 +0000]
ASoC: atmel_ssc: Don't try to free ssc if request failed

We should only call ssc_free() when ssc_request() succeeds or bad
things will happen.

Signed-off-by: Joachim Eastwood <joachim.eastwood@jotron.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Use a lower detection rate when monitoring headphones on WM8915
Mark Brown [Wed, 1 Jun 2011 19:16:40 +0000]
ASoC: Use a lower detection rate when monitoring headphones on WM8915

We only need to increase the detection rate to maximum if we're monitoring
for button presses as the response times needed for user interaction there
are much lower.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Update speyside audio driver for hardware revision 2
Mark Brown [Wed, 1 Jun 2011 18:32:22 +0000]
ASoC: Update speyside audio driver for hardware revision 2

Revision 2 of the Speyside platform supplies a 32kHz clock on MCLK2 rather
than MCLK1.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Remove internally generated WM8915 supplies
Mark Brown [Wed, 1 Jun 2011 18:17:02 +0000]
ASoC: Remove internally generated WM8915 supplies

DCVDD and MICVDD are intended to be (and almost always are) generated by
on-board LDOs which are transparently controlled by the driver so we
shouldn't really be requesting them from the regulator API. If the driver
is updated to support external supply of these then we will need to change
the way we handle this.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: add missing clk_put to nuc900-ac97
Julia Lawall [Wed, 1 Jun 2011 17:10:05 +0000]
ASoC: add missing clk_put to nuc900-ac97

This goto is after the call to clk_get, so it should go to the label that
includes a call to clk_put.

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

// <smpl>
@r exists@
expression e1,e2;
statement S;
@@

e1 = clk_get@p1(...);
... when != e1 = e2
    when != clk_put(e1)
    when any
if (...) { ... when != clk_put(e1)
               when != if (...) { ... clk_put(e1) ... }
* return@p3 ...;
 } else S
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

8 years agoASoC: Support edge triggered IRQs for WM8915
Mark Brown [Wed, 1 Jun 2011 13:45:58 +0000]
ASoC: Support edge triggered IRQs for WM8915

Really this should be something the IRQ core can cope with for us but since
it doesn't currently do so (at least for threaded interrupts like this) do
so in the driver. This allows us to run with interrupt controllers that
only support edge triggered interrupts.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoASoC: Staticize ak4641_dai
Mark Brown [Wed, 1 Jun 2011 09:10:50 +0000]
ASoC: Staticize ak4641_dai

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

8 years agoMerge branch 'for-2.6.40' into for-2.6.41
Mark Brown [Mon, 30 May 2011 02:54:18 +0000]
Merge branch 'for-2.6.40' into for-2.6.41