Unverified Commit 96f06cde authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mark Brown
Browse files

ASoC: samsung: dmaengine: Allow to specify custom DMA device 



The additional function argument will allow to select proper DMA device
for requesting DMA channel for the secondary CPU DAI.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 10cbf350

sound/soc/samsung/dma.h

+2 −1
Original line number Diff line number Diff line
@@ -17,5 +17,6 @@ 
 * otherwise actual DMA channel names must be passed to this function.

 */

int samsung_asoc_dma_platform_register(struct device *dev, dma_filter_fn filter,

				       const char *tx, const char *rx);

				       const char *tx, const char *rx,

				       struct device *dma_dev);

#endif /* _SAMSUNG_DMA_H */

sound/soc/samsung/dmaengine.c

+3 −1
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ 
#include "dma.h"



int samsung_asoc_dma_platform_register(struct device *dev, dma_filter_fn filter,

				       const char *tx, const char *rx)

				       const char *tx, const char *rx,

				       struct device *dma_dev)

{

	unsigned int flags = SND_DMAENGINE_PCM_FLAG_COMPAT;

	struct snd_dmaengine_pcm_config *pcm_conf;
@@ -36,6 +37,7 @@ int samsung_asoc_dma_platform_register(struct device *dev, dma_filter_fn filter, 


	pcm_conf->prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config;

	pcm_conf->compat_filter_fn = filter;

	pcm_conf->dma_dev = dma_dev;



	if (dev->of_node) {

		pcm_conf->chan_names[SNDRV_PCM_STREAM_PLAYBACK] = tx;

sound/soc/samsung/i2s.c

+2 −2
Original line number Diff line number Diff line
@@ -1345,7 +1345,7 @@ static int samsung_i2s_probe(struct platform_device *pdev) 
		pri_dai->i2s_dai_drv.playback.channels_max = 6;



	ret = samsung_asoc_dma_platform_register(&pdev->dev, pri_dai->filter,

						 NULL, NULL);

						 NULL, NULL, NULL);

	if (ret < 0)

		goto err_disable_clk;
@@ -1382,7 +1382,7 @@ static int samsung_i2s_probe(struct platform_device *pdev) 
		pri_dai->sec_dai = sec_dai;



		ret = samsung_asoc_dma_platform_register(&pdev->dev,

					sec_dai->filter, "tx-sec", NULL);

					sec_dai->filter, "tx-sec", NULL, NULL);

		if (ret < 0)

			goto err_disable_clk;

sound/soc/samsung/pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev) 
	pcm->dma_playback = &s3c_pcm_stereo_out[pdev->id];



	ret = samsung_asoc_dma_platform_register(&pdev->dev, filter,

						 NULL, NULL);

						 NULL, NULL, NULL);

	if (ret) {

		dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret);

		goto err_dis_pclk;

sound/soc/samsung/s3c2412-i2s.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static int s3c2412_iis_dev_probe(struct platform_device *pdev) 


	ret = samsung_asoc_dma_platform_register(&pdev->dev,

						 pdata->dma_filter,

						 NULL, NULL);

						 NULL, NULL, NULL);

	if (ret) {

		pr_err("failed to register the DMA: %d\n", ret);

		return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE