summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-08-22Merge remote-tracking branch 'asoc/topic/omap' into asoc-nextMark Brown6-153/+52
2013-08-22Merge remote-tracking branch 'asoc/topic/nuc900' into asoc-nextMark Brown1-3/+0
2013-08-22Merge remote-tracking branch 'asoc/topic/new-pcm' into asoc-nextMark Brown7-0/+629
2013-08-22Merge remote-tracking branch 'asoc/topic/mxs' into asoc-nextMark Brown3-9/+25
2013-08-22Merge remote-tracking branch 'asoc/topic/mc13783' into asoc-nextMark Brown1-1/+0
2013-08-22Merge remote-tracking branch 'asoc/topic/max9877' into asoc-nextMark Brown1-202/+92
2013-08-22Merge remote-tracking branch 'asoc/topic/max98090' into asoc-nextMark Brown1-4/+6
2013-08-22Merge remote-tracking branch 'asoc/topic/max9768' into asoc-nextMark Brown1-0/+16
2013-08-22Merge remote-tracking branch 'asoc/topic/lm4857' into asoc-nextMark Brown1-76/+31
2013-08-22Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-nextMark Brown9-155/+86
2013-08-22Merge remote-tracking branch 'asoc/topic/hdmi' into asoc-nextMark Brown1-1/+29
2013-08-22Merge remote-tracking branch 'asoc/topic/fsl' into asoc-nextMark Brown19-211/+2062
2013-08-22Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-nextMark Brown2-6/+0
2013-08-22Merge remote-tracking branch 'asoc/topic/dma' into asoc-nextMark Brown8-11/+10
2013-08-22Merge remote-tracking branch 'asoc/topic/dapm' into asoc-nextMark Brown11-490/+625
2013-08-22Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-nextMark Brown1-2/+28
2013-08-22Merge remote-tracking branch 'asoc/topic/cs4270' into asoc-nextMark Brown1-0/+20
2013-08-22Merge remote-tracking branch 'asoc/topic/core' into asoc-nextMark Brown7-93/+19
2013-08-22Merge remote-tracking branch 'asoc/topic/compress' into asoc-nextMark Brown1-6/+7
2013-08-22Merge remote-tracking branch 'asoc/topic/bt' into asoc-nextMark Brown1-1/+21
2013-08-22Merge remote-tracking branch 'asoc/topic/blackfin' into asoc-nextMark Brown1-1/+0
2013-08-22Merge remote-tracking branch 'asoc/topic/au1x' into asoc-nextMark Brown2-3/+4
2013-08-22Merge remote-tracking branch 'asoc/topic/atmel' into asoc-nextMark Brown11-121/+644
2013-08-22Merge remote-tracking branch 'asoc/topic/arizona' into asoc-nextMark Brown9-51/+1413
2013-08-22Merge remote-tracking branch 'asoc/topic/ak5386' into asoc-nextMark Brown1-1/+16
2013-08-22Merge remote-tracking branch 'asoc/topic/ak4554' into asoc-nextMark Brown4-0/+122
2013-08-22Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-nextMark Brown1-18/+16
2013-08-22Merge remote-tracking branch 'asoc/topic/adsp' into asoc-nextMark Brown4-83/+62
2013-08-22Merge remote-tracking branch 'asoc/topic/ads711x' into asoc-nextMark Brown1-1/+28
2013-08-22Merge remote-tracking branch 'asoc/topic/adav80x' into asoc-nextMark Brown1-3/+10
2013-08-22Merge remote-tracking branch 'asoc/topic/adau1701' into asoc-nextMark Brown2-11/+15
2013-08-22Merge remote-tracking branch 'asoc/topic/ad73311' into asoc-nextMark Brown2-1/+22
2013-08-22Merge remote-tracking branch 'asoc/topic/ad1980' into asoc-nextMark Brown1-0/+43
2013-08-22Merge remote-tracking branch 'asoc/topic/ac97' into asoc-nextMark Brown4-0/+198
2013-08-22Merge remote-tracking branch 'asoc/fix/wm8960' into asoc-linusMark Brown1-3/+3
2013-08-22ASoC: fsl: disable ssi irq for imxMichael Grzeschik1-12/+10
We have to disable the ssi irq, as it is not safe for all platforms to write back into the status register. It also runs into non-linefetch aborts. Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-22ASoC: fsl-ssi: imx-pcm-fiq bugfixMichael Grzeschik1-20/+24
imx-pcm-fiq is checking for TE RE bits, so enable them only if necessary. Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-22ASoC: fsl-ssi: add SSIEN errata work aroundSteffen Trumtrar1-7/+4
The chip errata for the i.MX35, Rev.2 has the following errata: ENGcm06222: SSI:Transmission does not take place in bit length early frame sync configuration The workaround states, that TX_EN and SSI_EN bits should be set in the same register write. As the next errata in the document (ENGcm06532) says to always write RX_EN and TX_EN in the same register write in network mode. Therefore include the whole write to CCSR_SSI_SCR_TE and CCSR_SSI_SCR_RE into the write to CCSR_SSI_SCR_SSIEN Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-22ASoC: fsl-ssi: ac97-slave supportMarkus Pargmann2-70/+280
This patch adds ac97-slave support. For ac97, the registers have to be setup earlier than for other ssi modes because there is some communication with the external device before streaming. So this patch introduces a fsl_ssi_setup function to setup the registers for different ssi operation modes seperately. This patch was tested with imx27-pca100. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Tested-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-22Merge remote-tracking branch 'asoc/topic/ac97' into asoc-fslMark Brown1603-102449/+17686
2013-08-22ASoC: fsl: Add S/PDIF CPU DAI driverNicolin Chen5-0/+1486
This patch implements a device-tree-only CPU DAI driver for Freescale S/PDIF controller that supports stereo playback and record feature. Signed-off-by: Nicolin Chen <b42378@freescale.com> Acked-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-20ASoC: omap: simplify platform_get_resource_byname/devm_ioremap_resourceJulia Lawall2-9/+3
Remove unneeded error handling on the result of a call to platform_get_resource_byname when the value is passed to devm_ioremap_resource. In the case of omap-dmic.c, the error-handling code of devm_ioremap_resource is also corrected to include releasing the clock. A simplified version of the semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression pdev,res,e,e1; expression ret != 0; identifier l; @@ res = platform_get_resource_byname(...); - if (res == NULL) { ... \(goto l;\|return ret;\) } e = devm_ioremap_resource(e1, res); // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-20ASoC: fsl: fsl_ssi: Fix the order of resources removalFabio Estevam1-4/+4
In fsl_ssi_remove() we need to remove the resources in the opposite order that they were acquired in probe. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-20ASoC: core: Generic ac97 link reset functionsMarkus Pargmann3-0/+183
This patch adds generic ac97 reset functions using pincontrol and gpio parsed from devicetree. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-19ASoC: imx: Add MODULE_LICENSE to DMA driversMark Brown2-0/+5
Reported-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-19ASoC: bt-sco: Provide stub DAPM integrationMark Brown1-1/+18
Ensure continued operation with DAPM being mandatory. Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-19ASoC: bt-sco: Add generic compatible stringMark Brown1-0/+3
Provide a common compatible string for device trees to list as a fallback for simplicity. We don't currently have a binding document but let's not fix that right now... Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-19ASoC: hdmi: Provide stub DAPM integrationMark Brown1-1/+18
Ensure continued operation with DAPM being mandatory. Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-19ASoC: ac97: Provide stub DAPM integrationMark Brown1-0/+15
Ensure continued operation with DAPM being mandatory. Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-19ASoC: wm8997: Add inputs for noise and mic mixersMark Brown1-3/+3
The noise and mic mixer inputs were not connected, do so. Signed-off-by: Mark Brown <broonie@linaro.org>