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

Commit 35e16581 authored by Vinod Koul's avatar Vinod Koul
Browse files

sound-soc: move to dma_transfer_direction 



fixup usage of dma direction by introducing dma_transfer_direction,
this patch moves asoc drivers to use new enum

Signed-off-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
Cc: Liam Girdwood <lrg@ti.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent a485df4b

sound/atmel/abdac.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static int atmel_abdac_prepare_dma(struct atmel_abdac *dac, 
	period_len = frames_to_bytes(runtime, runtime->period_size);



	cdesc = dw_dma_cyclic_prep(chan, runtime->dma_addr, buffer_len,

			period_len, DMA_TO_DEVICE);

			period_len, DMA_MEM_TO_DEV);

	if (IS_ERR(cdesc)) {

		dev_dbg(&dac->pdev->dev, "could not prepare cyclic DMA\n");

		return PTR_ERR(cdesc);

sound/atmel/ac97c.c

+5 −5
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static void atmel_ac97c_dma_capture_period_done(void *arg) 


static int atmel_ac97c_prepare_dma(struct atmel_ac97c *chip,

		struct snd_pcm_substream *substream,

		enum dma_data_direction direction)

		enum dma_transfer_direction direction)

{

	struct dma_chan			*chan;

	struct dw_cyclic_desc		*cdesc;
@@ -118,7 +118,7 @@ static int atmel_ac97c_prepare_dma(struct atmel_ac97c *chip, 
		return -EINVAL;

	}



	if (direction == DMA_TO_DEVICE)

	if (direction == DMA_MEM_TO_DEV)

		chan = chip->dma.tx_chan;

	else

		chan = chip->dma.rx_chan;
@@ -133,7 +133,7 @@ static int atmel_ac97c_prepare_dma(struct atmel_ac97c *chip, 
		return PTR_ERR(cdesc);

	}



	if (direction == DMA_TO_DEVICE) {

	if (direction == DMA_MEM_TO_DEV) {

		cdesc->period_callback = atmel_ac97c_dma_playback_period_done;

		set_bit(DMA_TX_READY, &chip->flags);

	} else {
@@ -393,7 +393,7 @@ static int atmel_ac97c_playback_prepare(struct snd_pcm_substream *substream) 
	if (cpu_is_at32ap7000()) {

		if (!test_bit(DMA_TX_READY, &chip->flags))

			retval = atmel_ac97c_prepare_dma(chip, substream,

					DMA_TO_DEVICE);

					DMA_MEM_TO_DEV);

	} else {

		/* Initialize and start the PDC */

		writel(runtime->dma_addr, chip->regs + ATMEL_PDC_TPR);
@@ -484,7 +484,7 @@ static int atmel_ac97c_capture_prepare(struct snd_pcm_substream *substream) 
	if (cpu_is_at32ap7000()) {

		if (!test_bit(DMA_RX_READY, &chip->flags))

			retval = atmel_ac97c_prepare_dma(chip, substream,

					DMA_FROM_DEVICE);

					DMA_DEV_TO_MEM);

	} else {

		/* Initialize and start the PDC */

		writel(runtime->dma_addr, chip->regs + ATMEL_PDC_RPR);

sound/soc/ep93xx/ep93xx-pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -113,9 +113,9 @@ static int ep93xx_pcm_open(struct snd_pcm_substream *substream) 
	rtd->dma_data.name = dma_params->name;



	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)

		rtd->dma_data.direction = DMA_TO_DEVICE;

		rtd->dma_data.direction = DMA_MEM_TO_DEV;

	else

		rtd->dma_data.direction = DMA_FROM_DEVICE;

		rtd->dma_data.direction = DMA_DEV_TO_MEM;



	rtd->dma_chan = dma_request_channel(mask, ep93xx_pcm_dma_filter,

					    &rtd->dma_data);

sound/soc/imx/imx-pcm-dma-mx2.c

+3 −3
Original line number Diff line number Diff line
@@ -107,12 +107,12 @@ static int imx_ssi_dma_alloc(struct snd_pcm_substream *substream, 
	}



	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {

		slave_config.direction = DMA_TO_DEVICE;

		slave_config.direction = DMA_MEM_TO_DEV;

		slave_config.dst_addr = dma_params->dma_addr;

		slave_config.dst_addr_width = buswidth;

		slave_config.dst_maxburst = dma_params->burstsize;

	} else {

		slave_config.direction = DMA_FROM_DEVICE;

		slave_config.direction = DMA_DEV_TO_MEM;

		slave_config.src_addr = dma_params->dma_addr;

		slave_config.src_addr_width = buswidth;

		slave_config.src_maxburst = dma_params->burstsize;
@@ -159,7 +159,7 @@ static int snd_imx_pcm_hw_params(struct snd_pcm_substream *substream, 
			iprtd->period_bytes * iprtd->periods,

			iprtd->period_bytes,

			substream->stream == SNDRV_PCM_STREAM_PLAYBACK ?

			DMA_TO_DEVICE : DMA_FROM_DEVICE);

			DMA_MEM_TO_DEV : DMA_DEV_TO_MEM);

	if (!iprtd->desc) {

		dev_err(&chan->dev->device, "cannot prepare slave dma\n");

		return -EINVAL;

sound/soc/samsung/dma.c

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static void dma_enqueue(struct snd_pcm_substream *substream) 
	dma_info.cap = (samsung_dma_has_circular() ? DMA_CYCLIC : DMA_SLAVE);

	dma_info.direction =

		(substream->stream == SNDRV_PCM_STREAM_PLAYBACK

		? DMA_TO_DEVICE : DMA_FROM_DEVICE);

		? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM);

	dma_info.fp = audio_buffdone;

	dma_info.fp_param = substream;

	dma_info.period = prtd->dma_period;
@@ -170,7 +170,7 @@ static int dma_hw_params(struct snd_pcm_substream *substream, 
		dma_info.client = prtd->params->client;

		dma_info.direction =

			(substream->stream == SNDRV_PCM_STREAM_PLAYBACK

			? DMA_TO_DEVICE : DMA_FROM_DEVICE);

			? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM);

		dma_info.width = prtd->params->dma_size;

		dma_info.fifo = prtd->params->dma_addr;

		prtd->params->ch = prtd->params->ops->request(