diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2018-05-07 04:49:58 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-05-09 05:22:00 -0400 |
commit | 31d2f5db92a7a64737e329370b45489ffc686f54 (patch) | |
tree | 8a66d5ab30a3ffd4a3d8f71169721b4e219c67fa | |
parent | 87dbec537b6bf7adeb79232285441fc4503f8f02 (diff) |
ASoC: omap-mcpdm: Convert to use the sdma-pcm instead of omap-pcm
Use the new platform driver.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/omap/Kconfig | 2 | ||||
-rw-r--r-- | sound/soc/omap/omap-mcpdm.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 9ecc1d336396..292e53cfc02b 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig | |||
@@ -105,7 +105,7 @@ config SND_OMAP_SOC_OMAP_TWL4030 | |||
105 | 105 | ||
106 | config SND_OMAP_SOC_OMAP_ABE_TWL6040 | 106 | config SND_OMAP_SOC_OMAP_ABE_TWL6040 |
107 | tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec" | 107 | tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec" |
108 | depends on TWL6040_CORE && SND_OMAP_SOC && SND_SDMA_SOC && COMMON_CLK | 108 | depends on TWL6040_CORE && SND_SDMA_SOC && COMMON_CLK |
109 | depends on ARCH_OMAP4 || (SOC_OMAP5 && MFD_PALMAS) || COMPILE_TEST | 109 | depends on ARCH_OMAP4 || (SOC_OMAP5 && MFD_PALMAS) || COMPILE_TEST |
110 | select SND_OMAP_SOC_DMIC | 110 | select SND_OMAP_SOC_DMIC |
111 | select SND_OMAP_SOC_MCPDM | 111 | select SND_OMAP_SOC_MCPDM |
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c index 64609c77a79d..0e97360f9890 100644 --- a/sound/soc/omap/omap-mcpdm.c +++ b/sound/soc/omap/omap-mcpdm.c | |||
@@ -40,9 +40,9 @@ | |||
40 | #include <sound/pcm_params.h> | 40 | #include <sound/pcm_params.h> |
41 | #include <sound/soc.h> | 41 | #include <sound/soc.h> |
42 | #include <sound/dmaengine_pcm.h> | 42 | #include <sound/dmaengine_pcm.h> |
43 | #include <sound/omap-pcm.h> | ||
44 | 43 | ||
45 | #include "omap-mcpdm.h" | 44 | #include "omap-mcpdm.h" |
45 | #include "sdma-pcm.h" | ||
46 | 46 | ||
47 | struct mcpdm_link_config { | 47 | struct mcpdm_link_config { |
48 | u32 link_mask; /* channel mask for the direction */ | 48 | u32 link_mask; /* channel mask for the direction */ |
@@ -548,7 +548,7 @@ static int asoc_mcpdm_probe(struct platform_device *pdev) | |||
548 | if (ret) | 548 | if (ret) |
549 | return ret; | 549 | return ret; |
550 | 550 | ||
551 | return omap_pcm_platform_register(&pdev->dev); | 551 | return sdma_pcm_platform_register(&pdev->dev, "dn_link", "up_link"); |
552 | } | 552 | } |
553 | 553 | ||
554 | static const struct of_device_id omap_mcpdm_of_match[] = { | 554 | static const struct of_device_id omap_mcpdm_of_match[] = { |