Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9051cba1 authored by Markus Pargmann's avatar Markus Pargmann Committed by Mark Brown
Browse files

ASoC: imx-pcm-fiq: Introduce pcm-fiq-params 



Cleaner parameter passing for imx-pcm-fiq. Create a seperated fiq-params
struct to pass all arguments.

Signed-off-by: default avatarMarkus Pargmann <mpa@pengutronix.de>
Tested-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent c364796a

sound/soc/fsl/imx-pcm-fiq.c

+10 −8
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/slab.h>



#include <sound/core.h>

#include <sound/dmaengine_pcm.h>

#include <sound/initval.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>
@@ -32,6 +33,7 @@ 
#include <linux/platform_data/asoc-imx-ssi.h>



#include "imx-ssi.h"

#include "imx-pcm.h"



struct imx_pcm_runtime_data {

	unsigned int period;
@@ -366,9 +368,9 @@ static struct snd_soc_platform_driver imx_soc_platform_fiq = { 
	.pcm_free	= imx_pcm_fiq_free,

};



int imx_pcm_fiq_init(struct platform_device *pdev)

int imx_pcm_fiq_init(struct platform_device *pdev,

		struct imx_pcm_fiq_params *params)

{

	struct imx_ssi *ssi = platform_get_drvdata(pdev);

	int ret;



	ret = claim_fiq(&fh);
@@ -377,15 +379,15 @@ int imx_pcm_fiq_init(struct platform_device *pdev) 
		return ret;

	}



	mxc_set_irq_fiq(ssi->irq, 1);

	ssi_irq = ssi->irq;

	mxc_set_irq_fiq(params->irq, 1);

	ssi_irq = params->irq;



	imx_pcm_fiq = ssi->irq;

	imx_pcm_fiq = params->irq;



	imx_ssi_fiq_base = (unsigned long)ssi->base;

	imx_ssi_fiq_base = (unsigned long)params->base;



	ssi->dma_params_tx.maxburst = 4;

	ssi->dma_params_rx.maxburst = 6;

	params->dma_params_tx->maxburst = 4;

	params->dma_params_rx->maxburst = 6;



	ret = snd_soc_register_platform(&pdev->dev, &imx_soc_platform_fiq);

	if (ret)

sound/soc/fsl/imx-pcm.h

+13 −2
Original line number Diff line number Diff line
@@ -32,6 +32,15 @@ imx_pcm_dma_params_init_data(struct imx_dma_data *dma_data, 
		dma_data->peripheral_type = IMX_DMATYPE_SSI;

}



struct imx_pcm_fiq_params {

	int irq;

	void __iomem *base;



	/* Pointer to original ssi driver to setup tx rx sizes */

	struct snd_dmaengine_dai_dma_data *dma_params_rx;

	struct snd_dmaengine_dai_dma_data *dma_params_tx;

};



#ifdef CONFIG_SND_SOC_IMX_PCM_DMA

int imx_pcm_dma_init(struct platform_device *pdev);

void imx_pcm_dma_exit(struct platform_device *pdev);
@@ -47,10 +56,12 @@ static inline void imx_pcm_dma_exit(struct platform_device *pdev) 
#endif



#ifdef CONFIG_SND_SOC_IMX_PCM_FIQ

int imx_pcm_fiq_init(struct platform_device *pdev);

int imx_pcm_fiq_init(struct platform_device *pdev,

		struct imx_pcm_fiq_params *params);

void imx_pcm_fiq_exit(struct platform_device *pdev);

#else

static inline int imx_pcm_fiq_init(struct platform_device *pdev)

static inline int imx_pcm_fiq_init(struct platform_device *pdev,

		struct imx_pcm_fiq_params *params)

{

	return -ENODEV;

}

sound/soc/fsl/imx-ssi.c

+6 −1
Original line number Diff line number Diff line
@@ -595,7 +595,12 @@ static int imx_ssi_probe(struct platform_device *pdev) 
		goto failed_register;

	}



	ret = imx_pcm_fiq_init(pdev);

	ssi->fiq_params.irq = ssi->irq;

	ssi->fiq_params.base = ssi->base;

	ssi->fiq_params.dma_params_rx = &ssi->dma_params_rx;

	ssi->fiq_params.dma_params_tx = &ssi->dma_params_tx;



	ret = imx_pcm_fiq_init(pdev, &ssi->fiq_params);

	if (ret)

		goto failed_pcm_fiq;

sound/soc/fsl/imx-ssi.h

+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ struct imx_ssi { 
	struct snd_dmaengine_dai_dma_data dma_params_tx;

	struct imx_dma_data filter_data_tx;

	struct imx_dma_data filter_data_rx;

	struct imx_pcm_fiq_params fiq_params;



	int enabled;

};