Commit 86a3fdfc authored by Lee Jones's avatar Lee Jones Committed by Mark Brown

ASoC: ux500_pcm: Differentiate between pdata and DT initialisation

If booting with full DT support (i.e. DMA too, the last piece of the
puzzle), then we don't need to use the compatible_request_channel call
back or require some of the historical bumph which probably isn't
required by a platform data start-up now either. This will also be
ripped out in upcoming commits.
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent ead20611
...@@ -145,15 +145,25 @@ static const struct snd_dmaengine_pcm_config ux500_dmaengine_pcm_config = { ...@@ -145,15 +145,25 @@ static const struct snd_dmaengine_pcm_config ux500_dmaengine_pcm_config = {
.prepare_slave_config = ux500_pcm_prepare_slave_config, .prepare_slave_config = ux500_pcm_prepare_slave_config,
}; };
static const struct snd_dmaengine_pcm_config ux500_dmaengine_of_pcm_config = {
.compat_request_channel = ux500_pcm_request_chan,
.prepare_slave_config = ux500_pcm_prepare_slave_config,
};
int ux500_pcm_register_platform(struct platform_device *pdev) int ux500_pcm_register_platform(struct platform_device *pdev)
{ {
const struct snd_dmaengine_pcm_config *pcm_config;
struct device_node *np = pdev->dev.of_node;
int ret; int ret;
ret = snd_dmaengine_pcm_register(&pdev->dev, if (np)
&ux500_dmaengine_pcm_config, pcm_config = &ux500_dmaengine_of_pcm_config;
SND_DMAENGINE_PCM_FLAG_NO_RESIDUE | else
SND_DMAENGINE_PCM_FLAG_COMPAT | pcm_config = &ux500_dmaengine_pcm_config;
SND_DMAENGINE_PCM_FLAG_NO_DT);
ret = snd_dmaengine_pcm_register(&pdev->dev, pcm_config,
SND_DMAENGINE_PCM_FLAG_NO_RESIDUE |
SND_DMAENGINE_PCM_FLAG_COMPAT);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"%s: ERROR: Failed to register platform '%s' (%d)!\n", "%s: ERROR: Failed to register platform '%s' (%d)!\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment