Commit b46b373f authored by Shawn Guo's avatar Shawn Guo Committed by Mark Brown
Browse files

ASoC: fsl: assign dma peripheral type according to bus topology 



The dma peripheral_type for SSI should be IMX_DMATYPE_SSI_SP if the SSI
is on SPBA bus.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent ff9062c6

sound/soc/fsl/fsl_ssi.c

+6 −0
Original line number Diff line number Diff line
@@ -746,6 +746,12 @@ static int __devinit fsl_ssi_probe(struct platform_device *pdev) 
		}

		ssi_private->dma_params_tx.dma = dma_events[0];

		ssi_private->dma_params_rx.dma = dma_events[1];



		ssi_private->dma_params_tx.shared_peripheral =

				of_device_is_compatible(of_get_parent(np),

							"fsl,spba-bus");

		ssi_private->dma_params_rx.shared_peripheral =

				ssi_private->dma_params_tx.shared_peripheral;

	}



	/* Initialize the the device_attribute structure */

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

+2 −1
Original line number Diff line number Diff line
@@ -109,7 +109,8 @@ static int snd_imx_open(struct snd_pcm_substream *substream) 
	dma_params = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);



	dma_data = kzalloc(sizeof(*dma_data), GFP_KERNEL);

	dma_data->peripheral_type = IMX_DMATYPE_SSI;

	dma_data->peripheral_type = dma_params->shared_peripheral ?

					IMX_DMATYPE_SSI_SP : IMX_DMATYPE_SSI;

	dma_data->priority = DMA_PRIO_HIGH;

	dma_data->dma_request = dma_params->dma;

sound/soc/fsl/imx-pcm.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ struct imx_pcm_dma_params { 
	int dma;

	unsigned long dma_addr;

	int burstsize;

	bool shared_peripheral;	/* The peripheral is on SPBA bus */

};



int snd_imx_pcm_mmap(struct snd_pcm_substream *substream,