summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-22Merge remote-tracking branch 'asoc/topic/samsung' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/s6000' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/rcar' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/pxa' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/pcm3008' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/omap' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/nuc900' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/new-pcm' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/mxs' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/mc13783' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/max9877' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/max98090' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/max9768' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/lm4857' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/hdmi' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/fsl' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/dma' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/dapm' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/cs4270' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/core' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/compress' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/bt' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/blackfin' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/au1x' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/atmel' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/arizona' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/ak5386' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/ak4554' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/adsp' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/ads711x' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/adav80x' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/adau1701' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/ad73311' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/ad1980' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/ac97' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/fix/wm8960' into asoc-linusMark Brown
2013-08-22ASoC: samsung: Fix build error with dma function renameTushar Behera
commit 85ff3c29d720 ("ASoC: samsung: Rename DMA platform registration functions") renames the DMA registration functions. Fix the places where it was left out. Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-22ASoC: fsl: disable ssi irq for imxMichael Grzeschik
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 Grzeschik
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 Trumtrar
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 Pargmann
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 Brown
2013-08-22ALSA: rme96: Check the return value of pci_enable_device() in resume callbackTakashi Iwai
Fixing warning message: sound/pci/rme96.c: In function ‘snd_rme96_resume’: sound/pci/rme96.c:2418:19: warning: ignoring return value of ‘pci_enable_device’, declared with attribute warn_unused_result [-Wunused-result] Signed-off-by: Takashi Iwai <tiwai@suse.de>