From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
jarkko.nikula@bitmer.com
Cc: alsa-devel@alsa-project.org, linux-omap@vger.kernel.org,
aaro.koskinen@iki.fi
Subject: [PATCH v4 5/7] ASoC: omap-mcpdm: Convert to use the sdma-pcm instead of omap-pcm
Date: Mon, 7 May 2018 11:49:58 +0300 [thread overview]
Message-ID: <20180507085000.6414-6-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <20180507085000.6414-1-peter.ujfalusi@ti.com>
Use the new platform driver.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
---
sound/soc/omap/Kconfig | 2 +-
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
config SND_OMAP_SOC_OMAP_ABE_TWL6040
tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec"
- depends on TWL6040_CORE && SND_OMAP_SOC && SND_SDMA_SOC && COMMON_CLK
+ depends on TWL6040_CORE && SND_SDMA_SOC && COMMON_CLK
depends on ARCH_OMAP4 || (SOC_OMAP5 && MFD_PALMAS) || COMPILE_TEST
select SND_OMAP_SOC_DMIC
select SND_OMAP_SOC_MCPDM
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index 04f4f3cb0f46..3f3e7c4ee175 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -41,9 +41,9 @@
#include <sound/pcm_params.h>
#include <sound/soc.h>
#include <sound/dmaengine_pcm.h>
-#include <sound/omap-pcm.h>
#include "omap-mcpdm.h"
+#include "sdma-pcm.h"
struct mcpdm_link_config {
u32 link_mask; /* channel mask for the direction */
@@ -565,7 +565,7 @@ static int asoc_mcpdm_probe(struct platform_device *pdev)
if (ret)
return ret;
- return omap_pcm_platform_register(&pdev->dev);
+ return sdma_pcm_platform_register(&pdev->dev, "dn_link", "up_link");
}
static const struct of_device_id omap_mcpdm_of_match[] = {
--
Peter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
next prev parent reply other threads:[~2018-05-07 8:49 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-07 8:49 [PATCH v4 0/7] ASoC: omap: Deprecate omap-pcm for sdma-pcm Peter Ujfalusi
2018-05-07 8:49 ` [PATCH v4 1/7] ASoC: omap: Introduce the generic_dmaengine_pcm based sdma-pcm Peter Ujfalusi
2018-05-09 9:31 ` Applied "ASoC: omap: Introduce the generic_dmaengine_pcm based sdma-pcm" to the asoc tree Mark Brown
2018-05-09 9:47 ` Mark Brown
2018-05-07 8:49 ` [PATCH v4 2/7] ASoC: davinci-mcasp: Convert to use the sdma-pcm instead of omap-pcm Peter Ujfalusi
2018-05-07 8:49 ` [PATCH v4 3/7] ASoC: omap-hdmi-audio: " Peter Ujfalusi
2018-05-07 8:49 ` [PATCH v4 4/7] ASoC: omap-dmic: " Peter Ujfalusi
2018-05-09 9:31 ` Applied "ASoC: omap-dmic: Convert to use the sdma-pcm instead of omap-pcm" to the asoc tree Mark Brown
2018-05-09 9:46 ` Mark Brown
2018-05-07 8:49 ` Peter Ujfalusi [this message]
2018-05-09 9:30 ` Applied "ASoC: omap-mcpdm: " Mark Brown
2018-05-09 9:46 ` Mark Brown
2018-05-07 8:49 ` [PATCH v4 6/7] ASoC: omap-mcbsp: Convert to use the sdma-pcm instead of omap-pcm Peter Ujfalusi
2018-05-09 8:53 ` Applied "ASoC: omap-mcbsp: Convert to use the sdma-pcm instead of omap-pcm" to the asoc tree Mark Brown
2018-05-09 9:18 ` Peter Ujfalusi
2018-05-09 9:39 ` Mark Brown
2018-05-09 9:11 ` Mark Brown
2018-05-09 9:30 ` Mark Brown
2018-05-09 9:45 ` Mark Brown
2018-05-07 8:50 ` [PATCH v4 7/7] ASoC: omap: Delete the obsolete omap-pcm Peter Ujfalusi
2018-05-11 2:38 ` Applied "ASoC: omap: Delete the obsolete omap-pcm" to the asoc tree Mark Brown
2018-05-09 8:26 ` [PATCH v4 0/7] ASoC: omap: Deprecate omap-pcm for sdma-pcm Mark Brown
2018-05-09 9:36 ` Peter Ujfalusi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180507085000.6414-6-peter.ujfalusi@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=aaro.koskinen@iki.fi \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=jarkko.nikula@bitmer.com \
--cc=lgirdwood@gmail.com \
--cc=linux-omap@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox