Unverified Commit 077a403d authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: davinci-mcasp: Convert to use the sdma-pcm instead of omap-pcm 



Use the new platform driver in case of sDMA.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6a7c05e5

sound/soc/davinci/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ config SND_DAVINCI_SOC_I2S 


config SND_DAVINCI_SOC_MCASP

	tristate "Multichannel Audio Serial Port (McASP) support"

	depends on SND_OMAP_SOC || SND_EDMA_SOC

	depends on SND_SDMA_SOC || SND_EDMA_SOC

	help

	  Say Y or M here if you want to have support for McASP IP found in

	  various Texas Instruments SoCs like:

sound/soc/davinci/davinci-mcasp.c

+4 −4
Original line number Diff line number Diff line
@@ -36,9 +36,9 @@ 
#include <sound/initval.h>

#include <sound/soc.h>

#include <sound/dmaengine_pcm.h>

#include <sound/omap-pcm.h>



#include "edma-pcm.h"

#include "../omap/sdma-pcm.h"

#include "davinci-mcasp.h"



#define MCASP_MAX_AFIFO_DEPTH	64
@@ -2048,10 +2048,10 @@ static int davinci_mcasp_probe(struct platform_device *pdev) 
#endif

		break;

	case PCM_SDMA:

#if IS_BUILTIN(CONFIG_SND_OMAP_SOC) || \

#if IS_BUILTIN(CONFIG_SND_SDMA_SOC) || \

	(IS_MODULE(CONFIG_SND_DAVINCI_SOC_MCASP) && \

	 IS_MODULE(CONFIG_SND_OMAP_SOC))

		ret = omap_pcm_platform_register(&pdev->dev);

	 IS_MODULE(CONFIG_SND_SDMA_SOC))

		ret = sdma_pcm_platform_register(&pdev->dev, NULL, NULL);

#else

		dev_err(&pdev->dev, "Missing SND_SDMA_SOC\n");

		ret = -EINVAL;