Unverified Commit 0198d7bb authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

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



Use the new platform driver.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 31d2f5db

sound/soc/omap/Kconfig

+7 −7
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ config SND_OMAP_SOC_HDMI_AUDIO 




config SND_OMAP_SOC_N810

config SND_OMAP_SOC_N810

	tristate "SoC Audio support for Nokia N810"

	tristate "SoC Audio support for Nokia N810"

	depends on SND_OMAP_SOC && MACH_NOKIA_N810 && I2C

	depends on SND_SDMA_SOC && MACH_NOKIA_N810 && I2C

	select SND_OMAP_SOC_MCBSP

	select SND_OMAP_SOC_MCBSP

	select SND_SOC_TLV320AIC3X

	select SND_SOC_TLV320AIC3X

	help

	help
@@ -43,7 +43,7 @@ config SND_OMAP_SOC_N810 




config SND_OMAP_SOC_RX51

config SND_OMAP_SOC_RX51

	tristate "SoC Audio support for Nokia N900 (RX-51)"

	tristate "SoC Audio support for Nokia N900 (RX-51)"

	depends on SND_OMAP_SOC && ARM && I2C

	depends on SND_SDMA_SOC && ARM && I2C

	select SND_OMAP_SOC_MCBSP

	select SND_OMAP_SOC_MCBSP

	select SND_SOC_TLV320AIC3X

	select SND_SOC_TLV320AIC3X

	select SND_SOC_TPA6130A2

	select SND_SOC_TPA6130A2
@@ -54,7 +54,7 @@ config SND_OMAP_SOC_RX51 




config SND_OMAP_SOC_AMS_DELTA

config SND_OMAP_SOC_AMS_DELTA

	tristate "SoC Audio support for Amstrad E3 (Delta) videophone"

	tristate "SoC Audio support for Amstrad E3 (Delta) videophone"

	depends on SND_OMAP_SOC && MACH_AMS_DELTA && TTY

	depends on SND_SDMA_SOC && MACH_AMS_DELTA && TTY

	select SND_OMAP_SOC_MCBSP

	select SND_OMAP_SOC_MCBSP

	select SND_SOC_CX20442

	select SND_SOC_CX20442

	help

	help
@@ -73,7 +73,7 @@ config SND_OMAP_SOC_AMS_DELTA 




config SND_OMAP_SOC_OSK5912

config SND_OMAP_SOC_OSK5912

	tristate "SoC Audio support for omap osk5912"

	tristate "SoC Audio support for omap osk5912"

	depends on SND_OMAP_SOC && MACH_OMAP_OSK && I2C

	depends on SND_SDMA_SOC && MACH_OMAP_OSK && I2C

	select SND_OMAP_SOC_MCBSP

	select SND_OMAP_SOC_MCBSP

	select SND_SOC_TLV320AIC23_I2C

	select SND_SOC_TLV320AIC23_I2C

	help

	help
@@ -81,7 +81,7 @@ config SND_OMAP_SOC_OSK5912 




config SND_OMAP_SOC_AM3517EVM

config SND_OMAP_SOC_AM3517EVM

	tristate "SoC Audio support for OMAP3517 / AM3517 EVM"

	tristate "SoC Audio support for OMAP3517 / AM3517 EVM"

	depends on SND_OMAP_SOC && MACH_OMAP3517EVM && I2C

	depends on SND_SDMA_SOC && MACH_OMAP3517EVM && I2C

	select SND_OMAP_SOC_MCBSP

	select SND_OMAP_SOC_MCBSP

	select SND_SOC_TLV320AIC23_I2C

	select SND_SOC_TLV320AIC23_I2C

	help

	help
@@ -90,7 +90,7 @@ config SND_OMAP_SOC_AM3517EVM 




config SND_OMAP_SOC_OMAP_TWL4030

config SND_OMAP_SOC_OMAP_TWL4030

	tristate "SoC Audio support for TI SoC based boards with twl4030 codec"

	tristate "SoC Audio support for TI SoC based boards with twl4030 codec"

	depends on TWL4030_CORE && SND_OMAP_SOC

	depends on TWL4030_CORE && SND_SDMA_SOC

	select SND_OMAP_SOC_MCBSP

	select SND_OMAP_SOC_MCBSP

	select SND_SOC_TWL4030

	select SND_SOC_TWL4030

	help

	help
@@ -123,7 +123,7 @@ config SND_OMAP_SOC_OMAP_ABE_TWL6040 




config SND_OMAP_SOC_OMAP3_PANDORA

config SND_OMAP_SOC_OMAP3_PANDORA

	tristate "SoC Audio support for OMAP3 Pandora"

	tristate "SoC Audio support for OMAP3 Pandora"

	depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP3_PANDORA

	depends on TWL4030_CORE && SND_SDMA_SOC && MACH_OMAP3_PANDORA

	select SND_OMAP_SOC_MCBSP

	select SND_OMAP_SOC_MCBSP

	select SND_SOC_TWL4030

	select SND_SOC_TWL4030

	help

	help

sound/soc/omap/omap-mcbsp.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -34,11 +34,11 @@ 
#include <sound/initval.h>

#include <sound/initval.h>

#include <sound/soc.h>

#include <sound/soc.h>

#include <sound/dmaengine_pcm.h>

#include <sound/dmaengine_pcm.h>

#include <sound/omap-pcm.h>





#include <linux/platform_data/asoc-ti-mcbsp.h>

#include <linux/platform_data/asoc-ti-mcbsp.h>

#include "mcbsp.h"

#include "mcbsp.h"

#include "omap-mcbsp.h"

#include "omap-mcbsp.h"

#include "sdma-pcm.h"





#define OMAP_MCBSP_RATES	(SNDRV_PCM_RATE_8000_96000)

#define OMAP_MCBSP_RATES	(SNDRV_PCM_RATE_8000_96000)
@@ -868,7 +868,7 @@ static int asoc_mcbsp_probe(struct platform_device *pdev) 
	if (ret)

	if (ret)

		return ret;

		return ret;





	return omap_pcm_platform_register(&pdev->dev);

	return sdma_pcm_platform_register(&pdev->dev, NULL, NULL);

}

}





static int asoc_mcbsp_remove(struct platform_device *pdev)

static int asoc_mcbsp_remove(struct platform_device *pdev)