summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-11-08Merge remote-tracking branch 'asoc/topic/tegra' into asoc-nextMark Brown6-28/+186
2013-11-08Merge remote-tracking branch 'asoc/topic/tas5086' into asoc-nextMark Brown1-62/+109
2013-11-08Merge remote-tracking branch 'asoc/topic/spear' into asoc-nextMark Brown2-22/+4
2013-11-08Merge remote-tracking branch 'asoc/topic/sn95031' into asoc-nextMark Brown1-15/+20
2013-11-08Merge remote-tracking branch 'asoc/topic/simple' into asoc-nextMark Brown1-0/+5
2013-11-08Merge remote-tracking branch 'asoc/topic/si476x' into asoc-nextMark Brown1-48/+16
2013-11-08Merge remote-tracking branch 'asoc/topic/samsung' into asoc-nextMark Brown3-19/+12
2013-11-08Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-nextMark Brown1-6/+25
2013-11-08Merge remote-tracking branch 'asoc/topic/rcar' into asoc-nextMark Brown11-197/+346
2013-11-08Merge remote-tracking branch 'asoc/topic/pxa' into asoc-nextMark Brown13-48/+46
2013-11-08Merge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-nextMark Brown1-0/+1
2013-11-08Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-nextMark Brown1-0/+1
2013-11-08Merge remote-tracking branch 'asoc/topic/mxs' into asoc-nextMark Brown4-22/+40
2013-11-08Merge remote-tracking branch 'asoc/topic/ml26124' into asoc-nextMark Brown1-0/+2
2013-11-08Merge remote-tracking branch 'asoc/topic/mc13783' into asoc-nextMark Brown4-61/+91
2013-11-08Merge remote-tracking branch 'asoc/topic/max9850' into asoc-nextMark Brown1-10/+29
2013-11-08Merge remote-tracking branch 'asoc/topic/max98095' into asoc-nextMark Brown1-296/+170
2013-11-08Merge remote-tracking branch 'asoc/topic/max98088' into asoc-nextMark Brown1-351/+273
2013-11-08Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-nextMark Brown5-28/+94
2013-11-08Merge remote-tracking branch 'asoc/topic/fsl' into asoc-nextMark Brown8-36/+28
2013-11-08Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-nextMark Brown1-1/+1
2013-11-08Merge remote-tracking branch 'asoc/topic/doc' into asoc-nextMark Brown5-66/+456
2013-11-08Merge remote-tracking branch 'asoc/topic/devm' into asoc-nextMark Brown12-52/+108
2013-11-08Merge remote-tracking branch 'asoc/topic/davinci' into asoc-nextMark Brown8-91/+382
2013-11-08Merge remote-tracking branch 'asoc/topic/cs42l73' into asoc-nextMark Brown4-90/+173
2013-11-08Merge remote-tracking branch 'asoc/topic/cs42l52' into asoc-nextMark Brown3-40/+57
2013-11-08Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-nextMark Brown1-0/+1
2013-11-08Merge remote-tracking branch 'asoc/topic/cq93vc' into asoc-nextMark Brown1-32/+14
2013-11-08Merge remote-tracking branch 'asoc/topic/core' into asoc-nextMark Brown7-381/+177
2013-11-08Merge remote-tracking branch 'asoc/topic/component' into asoc-nextMark Brown2-104/+174
2013-11-08Merge remote-tracking branch 'asoc/topic/bclk' into asoc-nextMark Brown2-0/+19
2013-11-08Merge remote-tracking branch 'asoc/topic/atmel' into asoc-nextMark Brown3-9/+2
2013-11-08Merge remote-tracking branch 'asoc/topic/arizona' into asoc-nextMark Brown2-9/+26
2013-11-08Merge remote-tracking branch 'asoc/topic/ak4642' into asoc-nextMark Brown1-2/+0
2013-11-08Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-nextMark Brown1-3/+8
2013-11-08Merge remote-tracking branch 'asoc/topic/adsp' into asoc-nextMark Brown1-7/+20
2013-11-08Merge remote-tracking branch 'asoc/topic/adav80x' into asoc-nextMark Brown1-45/+102
2013-11-08Merge remote-tracking branch 'asoc/topic/adau1373' into asoc-nextMark Brown1-61/+237
2013-11-08Merge remote-tracking branch 'asoc/topic/ab8500' into asoc-nextMark Brown1-47/+45
2013-11-08Merge remote-tracking branch 'asoc/topic/88pm860x' into asoc-nextMark Brown2-121/+71
2013-11-08Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linusMark Brown1-20/+2
2013-11-08Merge remote-tracking branch 'asoc/fix/dma' into asoc-linusMark Brown7-29/+118
2013-11-08Merge remote-tracking branch 'asoc/fix/ak4642' into asoc-linusMark Brown1-1/+1
2013-11-08ASoC: fsl: imx-wm8962: remove an unneeded checkDan Carpenter1-2/+1
"data->codec_clk" can't be an ERR_PTR here so I have removed the superflous check. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-11-08ASoC: fsl: imx-pcm-fiq: Remove unused 'runtime' variableFabio Estevam1-1/+0
Commit 68f9672b (ASoC: fsl: imx-pcm-fiq: remove bogus period delta calculation) introduced the following build warning: sound/soc/fsl/imx-pcm-fiq.c:53:26: warning: unused variable 'runtime' [-Wunused-variable] Remove the unused 'runtime' variable. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Oskar Schirmer <oskar@scara.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-11-07ASoC: generic-dmaengine-pcm: Clear slave_config memoryLee Jones1-0/+2
We currently assume that the DMA Slave Config will be fully populated by the platform, however some DMA Engines make decisions based on zero (default) flags such as DMA_SLAVE_BUSWIDTH_UNDEFINED and as this is a static declaration we need to memset it to clear the data area. Signed-off-by: Lee Jones <lee.jones@linaro.org> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-11-06ASoC: rcar: remove un-needed select from KconfigKuninori Morimoto1-1/+0
config RCAR_CLK_ADG is not exist Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-11-06ASoC: fsl: imx-pcm-fiq: remove bogus period delta calculationOskar Schirmer1-19/+2
Originally snd_hrtimer_callback() used iprtd->period_time for some jiffies based estimation to determine the right moment to call snd_pcm_period_elapsed(). As timer drifts may well be a problem, this was changed in commit b4e82b5b785670b6 to be based on buffer transmission progress, using iprtd->offset and runtime->buffer_size to calculate the amount of data since last period had elapsed. Unfortunately, iprtd->offset counts in bytes, while runtime->buffer_size counts frames, so adding these to find some delta is like comparing apples and oranges, and eventually results in negative delta values every now and then. This is no big harm, because it simply causes snd_pcm_period_elapsed() being called more often than necessary, as negative delta is taken for a large unsigned value by implicit conversion rule. Nonetheless, the calculation is broken, so one would replace the runtime->buffer_size by its equivalent in bytes. But then, there are chances snd_pcm_period_elapsed() is called late, because calculating the moment for the elapsed period into delta is based against the iprtd->last_offset, which is not necessarily the first byte of the period in question, but some random byte which the FIQ handler left us with in r8/r9 by accident. Again, negative impact is low, as there are plenty of periods already prefilled with data, and snd_pcm_period_elapsed() will probably be called latest when the following period is reached. However, the calculation is conceptually broken, and we are best off removing the clever stuff altogether. snd_pcm_period_elapsed() is now simply called once everytime snd_hrtimer_callback() is run, which may not be most accurate, but at least this way we are quite sure we dont miss an end of period. There is not much extra effort wasted by superfluous calls to snd_pcm_period_elapsed(), as the timer frequency closely matches the period size anyway. Signed-off-by: Oskar Schirmer <oskar@scara.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-11-04ASoC: Add pinctrl PM to components of active DAIsNicolin Chen2-0/+44
It's quite popular that more drivers are using pinctrl PM, for example: (Documentation/devicetree/bindings/arm/primecell.txt). Just like what runtime PM does, it would deactivate and activate pin group depending on whether it's being used or not. And this pinctrl PM might be also beneficial to cpu dai drivers because they might have actual pinctrl so as to sleep their pins and wake them up as needed. To achieve this goal, this patch sets pins to the default state during resume or startup; While during suspend and shutdown, it would set pins to the sleep state. As pinctrl PM would return zero if there is no such pinctrl sleep state settings, this patch would not break current ASoC subsystem directly. [ However, there is still an exception that the patch can not handle, that is, when cpu dai driver does not have pinctrl property but another device has it. (The AUDMUX <-> SSI on Freescale i.MX6 series for example. SSI as a cpu dai doesn't contain pinctrl property while AUDMUX, an Audio Multiplexer, has it). In this case, this kind of cpu dai driver needs to find a way to obtain the pinctrl property as its own, by moving property from AUDMUX to SSI, or creating a pins link/dependency between these two devices, or using a more decent way after we figure it out. ] Signed-off-by: Nicolin Chen <b42378@freescale.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-11-04ASoC: fsl: fsl_spdif: No need to check the return value of ↵Fabio Estevam1-5/+0
platform_get_resource() When using devm_ioremap_resource(), we do not need to check the return value of platform_get_resource(), so just remove it. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Mark Brown <broonie@linaro.org>