[PATCH] ASoC: Update Freescale i.MX SSI driver

[PATCH] ASoC: Update Freescale i.MX SSI driver

[Stuart Longland]

[-- Attachment #1: Type: text/plain, Size: 670 bytes --]

Hi all,
	Attached is a patch that corrects the i.MX SSI driver so that it
compiles against the latest ASoC tree.  I'm able to compile the driver
with this patch, but haven't done any testing beyond this point... the
update is quite naïve, based on changes I had seen to other drivers.

	I hope to give it a try on Monday, but in the meantime, here's
the patch for others to try.
-- 
Stuart Longland (aka Redhatter, VK4MSL)      .'''.
Gentoo Linux/MIPS Cobalt and Docs Developer  '.'` :
. . . . . . . . . . . . . . . . . . . . . .   .'.'
http://dev.gentoo.org/~redhatter             :.'

I haven't lost my mind...
  ...it's backed up on a tape somewhere.

[-- Attachment #2: 0001-ASoC-Update-Freescale-i.MX-SSI-driver-DMA-parameter-.patch --]
[-- Type: text/plain, Size: 2029 bytes --]

>From 138287fab450440726d6497d2d9ffd3645a0469b Mon Sep 17 00:00:00 2001
From: Stuart Longland <redhatter@gentoo.org>
Date: Sat, 22 May 2010 21:10:02 +1000
Subject: [PATCH] ASoC: Update Freescale i.MX SSI driver DMA parameter handling

This updates the i.MX SSI driver to make it compatible with the ASoC tree
following the move of DMA parameters from the DAI to the audio substream
object.

Signed-off-by: Stuart Longland <redhatter@gentoo.org>
---
 sound/soc/imx/imx-pcm-dma-mx2.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sound/soc/imx/imx-pcm-dma-mx2.c b/sound/soc/imx/imx-pcm-dma-mx2.c
index 2b31ac6..05f19c9 100644
--- a/sound/soc/imx/imx-pcm-dma-mx2.c
+++ b/sound/soc/imx/imx-pcm-dma-mx2.c
@@ -73,7 +73,8 @@ static void snd_imx_dma_err_callback(int channel, void *data, int err)
 {
 	struct snd_pcm_substream *substream = data;
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct imx_pcm_dma_params *dma_params = rtd->dai->cpu_dai->dma_data;
+	struct imx_pcm_dma_params *dma_params = 
+		snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream);
 	struct snd_pcm_runtime *runtime = substream->runtime;
 	struct imx_pcm_runtime_data *iprtd = runtime->private_data;
 	int ret;
@@ -102,7 +103,7 @@ static int imx_ssi_dma_alloc(struct snd_pcm_substream *substream)
 	struct imx_pcm_runtime_data *iprtd = runtime->private_data;
 	int ret;
 
-	dma_params = snd_soc_get_dma_data(rtd->dai->cpu_dai, substream);
+	dma_params = snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream);
 
 	iprtd->dma = imx_dma_request_by_prio(DRV_NAME, DMA_PRIO_HIGH);
 	if (iprtd->dma < 0) {
@@ -212,7 +213,7 @@ static int snd_imx_pcm_prepare(struct snd_pcm_substream *substream)
 	struct imx_pcm_runtime_data *iprtd = runtime->private_data;
 	int err;
 
-	dma_params = snd_soc_get_dma_data(rtd->dai->cpu_dai, substream);
+	dma_params = snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream);
 
 	iprtd->substream = substream;
 	iprtd->buf = (unsigned int *)substream->dma_buffer.area;
-- 
1.6.4


[-- Attachment #3: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH] ASoC: Update Freescale i.MX SSI driver

[Liam Girdwood]

On Sat, 2010-05-22 at 22:01 +1000, Stuart Longland wrote:
> Hi all,
> 	Attached is a patch that corrects the i.MX SSI driver so that it
> compiles against the latest ASoC tree.  I'm able to compile the driver
> with this patch, but haven't done any testing beyond this point... the
> update is quite naïve, based on changes I had seen to other drivers.
> 
> 	I hope to give it a try on Monday, but in the meantime, here's
> the patch for others to try.

Thanks, this looks like it was missed from an earlier series.

Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
-- 
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH] ASoC: Update Freescale i.MX SSI driver

[Mark Brown]

On Sat, May 22, 2010 at 10:01:25PM +1000, Stuart Longland wrote:

> 	Attached is a patch that corrects the i.MX SSI driver so that it
> compiles against the latest ASoC tree.  I'm able to compile the driver
> with this patch, but haven't done any testing beyond this point... the
> update is quite na?ve, based on changes I had seen to other drivers.
> 
> 	I hope to give it a try on Monday, but in the meantime, here's
> the patch for others to try.

Applied, thanks, but please read and follow the instructions for
submitting patches in Documentation/SubmittingPatches - in particular,
please CC maintainers on patches and don't send patches as attachments
to messages especially with non-changelog stuff in the body of the
message.  This ensures your patch doesn't get buried in the mailing list
and makes it much easier to apply changes with tools such as git am.

> -- 
> Stuart Longland (aka Redhatter, VK4MSL)      .'''.
> Gentoo Linux/MIPS Cobalt and Docs Developer  '.'` :
> . . . . . . . . . . . . . . . . . . . . . .   .'.'
> http://dev.gentoo.org/~redhatter             :.'
> 
> I haven't lost my mind...
>   ...it's backed up on a tape somewhere.

> From 138287fab450440726d6497d2d9ffd3645a0469b Mon Sep 17 00:00:00 2001
> From: Stuart Longland <redhatter@gentoo.org>
> Date: Sat, 22 May 2010 21:10:02 +1000
> Subject: [PATCH] ASoC: Update Freescale i.MX SSI driver DMA parameter handling
> 
> This updates the i.MX SSI driver to make it compatible with the ASoC tree
> following the move of DMA parameters from the DAI to the audio substream
> object.
> 
> Signed-off-by: Stuart Longland <redhatter@gentoo.org>
> ---
>  sound/soc/imx/imx-pcm-dma-mx2.c |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/sound/soc/imx/imx-pcm-dma-mx2.c b/sound/soc/imx/imx-pcm-dma-mx2.c
> index 2b31ac6..05f19c9 100644
> --- a/sound/soc/imx/imx-pcm-dma-mx2.c
> +++ b/sound/soc/imx/imx-pcm-dma-mx2.c
> @@ -73,7 +73,8 @@ static void snd_imx_dma_err_callback(int channel, void *data, int err)
>  {
>  	struct snd_pcm_substream *substream = data;
>  	struct snd_soc_pcm_runtime *rtd = substream->private_data;
> -	struct imx_pcm_dma_params *dma_params = rtd->dai->cpu_dai->dma_data;
> +	struct imx_pcm_dma_params *dma_params = 
> +		snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream);
>  	struct snd_pcm_runtime *runtime = substream->runtime;
>  	struct imx_pcm_runtime_data *iprtd = runtime->private_data;
>  	int ret;
> @@ -102,7 +103,7 @@ static int imx_ssi_dma_alloc(struct snd_pcm_substream *substream)
>  	struct imx_pcm_runtime_data *iprtd = runtime->private_data;
>  	int ret;
>  
> -	dma_params = snd_soc_get_dma_data(rtd->dai->cpu_dai, substream);
> +	dma_params = snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream);
>  
>  	iprtd->dma = imx_dma_request_by_prio(DRV_NAME, DMA_PRIO_HIGH);
>  	if (iprtd->dma < 0) {
> @@ -212,7 +213,7 @@ static int snd_imx_pcm_prepare(struct snd_pcm_substream *substream)
>  	struct imx_pcm_runtime_data *iprtd = runtime->private_data;
>  	int err;
>  
> -	dma_params = snd_soc_get_dma_data(rtd->dai->cpu_dai, substream);
> +	dma_params = snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream);
>  
>  	iprtd->substream = substream;
>  	iprtd->buf = (unsigned int *)substream->dma_buffer.area;
> -- 
> 1.6.4
> 

> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel


-- 
"You grabbed my hand and we fell into it, like a daydream - or a fever."