aboutsummaryrefslogtreecommitdiff
path: root/sound/soc
AgeCommit message (Collapse)Author
2013-02-19Merge tag 'omap-for-v3.9/usb-signed' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc These changes contain the OMAP USB related platform data changes that were dropped from linux next because of the merge conflicts as requested by me and Olof. The reason was that at this point we really should be able to do the arch/arm related changes separately from driver changes to avoid dependencies between branches. These patches were initially part of the USB related MFD patches. Based on our comments, Roger Quadros quickly reworked these patches into a shared branch between ARM SoC tree and the MFD tree, then separate patches for the OMAP platform data and MFD driver. Note that this branch will conflict with c1d1cd597fc7 ("ARM: OMAP2+: omap_device: remove obsolete pm_lats and early_device code"). Please see http://lkml.org/lkml/2013/2/11/16 for the merge resolution. [arnd - resolved the merge conflict] Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2013-02-19Merge remote-tracking branch 'regulator/topic/arizona' into regulator-nextMark Brown
2013-02-16Merge tag 'asoc-3.9-updates' of ↵Takashi Iwai
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next ASoC: Final updates for v3.9 A few more updates from the past week - a new driver from Dialog and some small fixes and tweaks.
2013-02-14Merge remote-tracking branch 'asoc/topic/da7213' into asoc-nextMark Brown
2013-02-14ASoC: codecs: Add da7213 codecAdam Thomson
This patch adds support for the Dialog DA7213 audio codec. Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-02-12Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-nextMark Brown
2013-02-12Merge remote-tracking branch 'asoc/topic/omap' into asoc-nextMark Brown
2013-02-12Merge remote-tracking branch 'asoc/topic/fsl' into asoc-nextMark Brown
2013-02-12ASoC: arizona: Automatically manage input mutesMark Brown
For optimal performance the inputs should be kept muted until after power up. Since there are few use cases for muting inputs during capture move the mutes to automatic control. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-02-11ASoC: omap-mcpdm: Remove useless ressource get.Sebastien Guiriec
Remove unused memory ressource get from McPDM driver. Signed-off-by: Sebastien Guiriec <s-guiriec@ti.com> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-02-11ASoC: fsl: imx-audmux: Fix sparse warningFabio Estevam
Fix the following sparse warning: sound/soc/fsl/imx-audmux.c:182:3: warning: symbol 'audmux_type' was not declared. Should it be static? Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-02-11Merge tag 'asoc-3.9' of ↵Takashi Iwai
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next ASoC: Updates for v3.9 A fairly quiet release for ASoC: - Support for a wider range of hardware in the compressed stream code. - The ability to mute capture streams as well as playback streams while inactive. - DT support for AK4642, FSI, Samsung I2S and WM8962. - AC'97 support for Tegra. - New driver for max98090, replacing the stub which was there. Due to dependencies we've also got support for asynchronous I/O in regmap and DTification of DMA support for Samsung platforms (used only by the I2S driver and SPI) merged here as well.
2013-02-11Merge remote-tracking branch 'asoc/topic/wm8993' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/wm8985' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/wm8804' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/wm8350' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/wm5100' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/wm2200' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/wm2000' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/twl' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/tlv320dac33' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/tlv320aic3x' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/tegra' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/simple-card' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/samsung' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/pxa' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/omap' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/of' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/mxs' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/max98090' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/fsi' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/cs42l52' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/core' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/compress' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/atmel' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/arizona' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/ak4642' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/topic/adsp' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/fix/wm2200' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/fix/wm2000' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/fix/ux500' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/fix/samsung' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/fix/dwc' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/fix/davinci' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/fix/arizona' into asoc-nextMark Brown
2013-02-11Merge remote-tracking branch 'asoc/fix/adsp' into asoc-nextMark Brown
2013-02-11ASoC: wm_adsp: round to 4-byte boundary for coeff file blocksChris Rattray
Signed-off-by: Chris Rattray <crattray@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>