Commit Graph

336149 Commits

Author SHA1 Message Date
Mark Brown
897074d89b Merge remote-tracking branch 'asoc/topic/rt5631' into asoc-next 2012-12-02 13:35:12 +09:00
Mark Brown
6a441c5c60 Merge remote-tracking branch 'asoc/topic/omap' into asoc-next 2012-12-02 13:35:11 +09:00
Mark Brown
d0f3ea4252 Merge remote-tracking branch 'asoc/topic/max98090' into asoc-next 2012-12-02 13:35:10 +09:00
Mark Brown
6058868543 Merge remote-tracking branch 'asoc/topic/max9768' into asoc-next 2012-12-02 13:35:10 +09:00
Mark Brown
674b366350 Merge remote-tracking branch 'asoc/topic/log' into asoc-next 2012-12-02 13:35:09 +09:00
Mark Brown
ca7e5cb223 Merge remote-tracking branch 'asoc/topic/lm49453' into asoc-next 2012-12-02 13:35:09 +09:00
Mark Brown
686378497f Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-next 2012-12-02 13:35:08 +09:00
Mark Brown
81e2c0da11 Merge remote-tracking branch 'asoc/topic/jz4740' into asoc-next 2012-12-02 13:35:07 +09:00
Mark Brown
81467c3325 Merge remote-tracking branch 'asoc/topic/jack' into asoc-next 2012-12-02 13:35:06 +09:00
Mark Brown
d7174db6d1 Merge remote-tracking branch 'asoc/topic/hotplug' into asoc-next 2012-12-02 13:35:06 +09:00
Mark Brown
723b4cb5d1 Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next 2012-12-02 13:35:05 +09:00
Mark Brown
546694bc42 Merge remote-tracking branch 'asoc/topic/fsi' into asoc-next 2012-12-02 13:35:04 +09:00
Mark Brown
9557656200 Merge remote-tracking branch 'asoc/topic/dmaengine' into asoc-next 2012-12-02 13:35:03 +09:00
Mark Brown
22849e45ff Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next 2012-12-02 13:35:02 +09:00
Mark Brown
994f2f9ed6 Merge remote-tracking branch 'asoc/topic/da9055' into asoc-next 2012-12-02 13:35:01 +09:00
Mark Brown
5d1aab9687 Merge remote-tracking branch 'asoc/topic/da7210' into asoc-next 2012-12-02 13:35:01 +09:00
Mark Brown
0998deb561 Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-next 2012-12-02 13:35:00 +09:00
Mark Brown
3bc3249226 Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next 2012-12-02 13:34:58 +09:00
Mark Brown
9d3493e84d Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next 2012-12-02 13:34:56 +09:00
Mark Brown
b72ea212ae Merge remote-tracking branch 'asoc/topic/ak4642' into asoc-next 2012-12-02 13:34:55 +09:00
Mark Brown
c298d18503 Merge remote-tracking branch 'asoc/topic/ak4535' into asoc-next 2012-12-02 13:34:54 +09:00
Mark Brown
0c1c73376b Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-next 2012-12-02 13:34:54 +09:00
Mark Brown
0bfbbc001a Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next 2012-12-02 13:34:50 +09:00
Mark Brown
f4edd00dfa Merge remote-tracking branch 'asoc/topic/ab8500' into asoc-next 2012-12-02 13:34:49 +09:00
Bo Shen
3951e4aae2 ASoC: atmel-pcm: dma support based on pcm dmaengine
Specify overrun bit in interrupt mask
Add dmaengine specific routines

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
[voice.shen@atmel.com: adapt to soc dmaengine framework]
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-02 13:29:19 +09:00
Bo Shen
92dfa61986 ASoC: atmel-pcm: split into two file
This patch is split original atmel-pcm.c into new atmel-pcm.c and
atmel-pcm-pdc.c two files. The new atmel-pcm.c is the share routine
while will be used for pdc or dma transfer.

Using SND_ATMEL_SOC_PDC to select using PDC for audio transfer

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-02 13:27:44 +09:00
Mark Brown
e436cadd65 ASoC: wm5102: Correct base address for Y region
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-02 13:23:47 +09:00
Sachin Kamat
8f255e7ba3 ASoC: max9768: Use devm_regmap_init_i2c()
devm_regmap_init_i2c() is device managed and makes error
handling and code cleanup simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-02 13:08:32 +09:00
Mark Brown
25c6fdb040 ASoC: arizona: Add parentheses
Some compiler versions complain.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-29 15:18:29 +00:00
Mark Brown
a7f9be7ec5 ASoC: wm_adsp: Set the core enable as well as start bit for ADSP2
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-28 20:29:20 +00:00
Peter Ujfalusi
1c08e7e3b2 ASoC: omap-abe-twl6040: Use "ti,jack-detection" DT property as boolean
Handle the jack detection inforamtion as bool from devicetree.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-28 19:13:18 +00:00
Mark Brown
cac27cff06 ASoC: wm5102: Enable DVFS support for the DSP
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-28 17:46:12 +00:00
Mark Brown
0644128556 Merge branch 'topic/adsp' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-arizona 2012-11-28 17:45:57 +00:00
Sachin Kamat
2fadf6a861 ASoC: lm49453: Use devm_regmap_init_i2c()
devm_regmap_init_i2c() is device managed and makes error
handling and code cleanup simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-28 17:44:34 +00:00
Sachin Kamat
4e75955d8f ASoC: da7210: Use devm_regmap_init_i2c()
devm_regmap_init_i2c() is device managed and makes error
handling and code cleanup simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-28 17:43:02 +00:00
Sachin Kamat
77d19b10a4 ASoC: ak4535: Use devm_regmap_init_i2c()
devm_regmap_init_i2c() is device managed and makes error
handling and code cleanup simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-28 17:41:54 +00:00
Mark Brown
973838a030 ASoC: wm_adsp: Enable DVFS for ADSP2
Some ADSP devices can make use of DVFS to optimise power consumption
depending on the operating frequency of the DSP core. Implement
support for this in the generic ADSP code.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-28 17:36:23 +00:00
Mark Brown
503b1cac5c mfd: arizona: Register haptics devices
Both WM5102 and WM5110 support haptics, register the device.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-28 13:44:46 +00:00
Mark Brown
2f76e6855f ASoC: wm5110: Implement haptics support
Provide a haptics widget for use by the haptics driver and expose the DAPM
context for it.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-28 13:44:00 +00:00
Mark Brown
3f41e3d2e8 ASoC: wm5102: Implement haptics support
Provide a haptics widget for use by the haptics driver and expose the DAPM
context for it.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-28 13:43:57 +00:00
Mark Brown
9dd555e2f4 Input - arizona-haptics: Add driver haptics module on Arizona CODECs
The Arizona CODECs contain a haptics module providing vibration feedback
support. Implement basic support for this, providing simple start/stop and
signal magnitude control.

Since the output path for haptics is routed through the CODEC audio routing
it is modelled as a signal generator within ASoC, the haptics driver calls
DAPM to start and stop the output drivers. An appropriate output path must
be configured via ALSA to connect the haptics source to the correct output.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-28 13:43:52 +00:00
Mark Brown
b951b523ea mfd: arizona: Allow the CODEC DAPM context to be accessed elsewhere
Some other device functions need to integrate with signal sources in the
audio portion (primarily for haptics) so allow CODEC to export the DAPM
context by pointing to it from the core driver.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-28 13:43:04 +00:00
Mark Brown
50fcfe45d7 ASoC: arizona: Record FLL setting when disabling
Otherwise we skip reenables.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-28 13:42:39 +00:00
Tony Lindgren
e650794ae8 ASoC: OMAP: mcbsp fixes for enabling ARM multiplatform support
We cannot include any plat or mach headers for the multiplatform
support.

Fix the issue by defining local mcbsp_omap1().

Signed-off-by: Tony Lindgren <tony@atomide.com>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-27 19:42:19 +00:00
Lothar Waßmann
f2818d07af ASoC: fsl: fix miscompilation of snd-soc-imx-pcm
Hi Mark,

thanks your insisting on a better description for the patch, I found a
more appropriate solution for the problem:

Compiling the SoC Audio driver for Freescale i.MX as a module
(CONFIG_SND_SOC_IMX_PCM=m) results in a non-functional sound driver
indicated by the error message:
| imx-sgtl5000 sound.1: platform imx-pcm-audio not registered
| imx-sgtl5000 sound.1: snd_soc_register_card failed (-517)
| platform sound.1: Driver imx-sgtl5000 requests probe deferral
instead of the message:
| imx-sgtl5000 sound.1:  sgtl5000 <-> 63fcc000.ssi mapping ok
that is to be expected upon loading the snd-soc-imx-pcm.ko module.

The build log reveals, that the file imx-pcm-dma.o (or imx-pcm-fiq.o
depending on the kernel configuration), which should be linked
together with imx-pcm.o into snd-imx-pcm.ko, is not being compiled in
this case.

The make rules for these files shows that the target object imx-pcm.o
is assigned to the variable snd-soc-imx-pcm-y while
imx-pcm-{dma,fiq}.o are added to to
snd-soc-imx-pcm-$(CONFIG_SND_SOC_IMX_PCM_DMA) and
snd-soc-imx-pcm-$(CONFIG_SND_SOC_IMX_PCM_FIQ) which resolve to
snd-soc-imx-pcm-m in this case.

According to Documentation/kbuild/modules.txt:
|When the module is built from multiple sources, an additional line is
|needed listing the files:
|
|        <module_name>-y := <src1>.o <src2>.o ...
Thus the type of the config variables CONFIG_SND_SOC_IMX_PCM_DMA and
CONFIG_SND_SOC_IMX_PCM_FIQ should be 'bool' instead of 'tristate' to
resolve to 'y' when selected.

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-27 19:37:35 +00:00
Lothar Waßmann
cf7d0f09ba ASoC: mxs-saif: export mxs_saif_put_mclk,mxs_saif_get_mclk
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-27 19:37:35 +00:00
Lothar Waßmann
20dd9e5ed6 ASoC: fsl: fix miscompilation of snd-soc-imx-pcm
Due to a broken make rule, sound/soc/fsl/imx-pcm-dma.c or
sound/soc/fsl/imx-pcm-fiq.c (whatever is selected via Kconfig) will
not be compiled into imx-pcm.o when building as module, i.e.:
CONFIG_SND_SOC_IMX_PCM=m
CONFIG_SND_SOC_IMX_PCM_DMA=m
resulting in a non-functional sound driver.

This gives the error messages:
| imx-sgtl5000 sound.1: platform imx-pcm-audio not registered
| imx-sgtl5000 sound.1: snd_soc_register_card failed (-517)
| platform sound.1: Driver imx-sgtl5000 requests probe deferral
when loading the driver instead of what's to be expected:
| imx-sgtl5000 sound.1:  sgtl5000 <-> 63fcc000.ssi mapping ok

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-27 19:36:36 +00:00
Mark Brown
b1bc7b3c9c ASoC: pcm: Report error code when we fail to init platform
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-27 19:35:59 +00:00
Mark Brown
1cbe4bcae3 ASoC: arizona: Suppress noop FLL updates
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-27 19:30:56 +00:00
Mark Brown
ba6b047ab9 ASoC: wm5102: Add missing routes for ASRC inputs
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-11-27 19:30:25 +00:00