From e16605855d58803fe0608417150c7a618b4f8243 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 21 Mar 2012 13:22:40 +0000 Subject: [PATCH 1/3] ASoC: wm8994: Update WM8994 DCS calibration Based on latest production information. Signed-off-by: Mark Brown Cc: stable@vger.kernel.org --- sound/soc/codecs/wm8994.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 9685dff44dd8..10d27890eed5 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -3652,7 +3652,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) case 2: case 3: wm8994->hubs.dcs_codes_l = -9; - wm8994->hubs.dcs_codes_r = -5; + wm8994->hubs.dcs_codes_r = -7; break; default: break; From 4a163c82d600e554ef79e931db6315026e1fc819 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 22 Mar 2012 10:19:03 -0300 Subject: [PATCH 2/3] ASoC: Add extra parameter to device_prep_dma_cyclic Since commit 185ecb5 (dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic) prep_dma_cyclic() got an extra context parameter. Add this new parameter in order to fix the following build error (mxs_defconfig and imx_v4_v5_defconfig): sound/soc/soc-dmaengine-pcm.c:149:3: error: too few arguments to function 'chan->device->device_prep_dma_cyclic' Signed-off-by: Fabio Estevam Signed-off-by: Mark Brown --- sound/soc/soc-dmaengine-pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-dmaengine-pcm.c b/sound/soc/soc-dmaengine-pcm.c index 4420b7030c83..76c038b4a970 100644 --- a/sound/soc/soc-dmaengine-pcm.c +++ b/sound/soc/soc-dmaengine-pcm.c @@ -146,7 +146,7 @@ static int dmaengine_pcm_prepare_and_submit(struct snd_pcm_substream *substream) desc = chan->device->device_prep_dma_cyclic(chan, substream->runtime->dma_addr, snd_pcm_lib_buffer_bytes(substream), - snd_pcm_lib_period_bytes(substream), direction); + snd_pcm_lib_period_bytes(substream), direction, NULL); if (!desc) return -ENOMEM; From 41ba6b711a40b83a877ae8242a4b3e692de91f97 Mon Sep 17 00:00:00 2001 From: Vinod Koul Date: Mon, 26 Mar 2012 17:28:08 +0530 Subject: [PATCH 3/3] ASoC: dmaengine_pcm: use dmaengine cyclic wrapper commit 4a163c82 added extra parameter to device_prep_dma_cyclic this is not required if we use the wrapper over cyclic API. This is split from Alexedre's patch Signed-off-by: Vinod Koul Signed-off-by: Mark Brown --- sound/soc/soc-dmaengine-pcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-dmaengine-pcm.c b/sound/soc/soc-dmaengine-pcm.c index 76c038b4a970..475695234b3d 100644 --- a/sound/soc/soc-dmaengine-pcm.c +++ b/sound/soc/soc-dmaengine-pcm.c @@ -143,10 +143,10 @@ static int dmaengine_pcm_prepare_and_submit(struct snd_pcm_substream *substream) direction = snd_pcm_substream_to_dma_direction(substream); prtd->pos = 0; - desc = chan->device->device_prep_dma_cyclic(chan, + desc = dmaengine_prep_dma_cyclic(chan, substream->runtime->dma_addr, snd_pcm_lib_buffer_bytes(substream), - snd_pcm_lib_period_bytes(substream), direction, NULL); + snd_pcm_lib_period_bytes(substream), direction); if (!desc) return -ENOMEM;