diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2022-09-29 12:20:50 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2022-09-29 12:20:50 +0200 |
| commit | a1ebcd59430236b336428bbf8e1da16fb87d56e4 (patch) | |
| tree | 126b999f1eae9b7ecf1045eec425a6dbcdcb4351 /sound/soc/fsl/fsl_aud2htx.c | |
| parent | cce6a2d7e0e494c453ad73e1e78bd50684f20cca (diff) | |
| parent | f76349cf41451c5c42a99f18a9163377e4b364ff (diff) | |
Merge branch 'v6.0-rc7'
Merge upstream to get RAPTORLAKE_S
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'sound/soc/fsl/fsl_aud2htx.c')
| -rw-r--r-- | sound/soc/fsl/fsl_aud2htx.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sound/soc/fsl/fsl_aud2htx.c b/sound/soc/fsl/fsl_aud2htx.c index 873295f59ad7..1e421d9a03fb 100644 --- a/sound/soc/fsl/fsl_aud2htx.c +++ b/sound/soc/fsl/fsl_aud2htx.c @@ -234,18 +234,26 @@ static int fsl_aud2htx_probe(struct platform_device *pdev) regcache_cache_only(aud2htx->regmap, true); + /* + * Register platform component before registering cpu dai for there + * is not defer probe for platform component in snd_soc_add_pcm_runtime(). + */ + ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); + if (ret) { + dev_err(&pdev->dev, "failed to pcm register\n"); + pm_runtime_disable(&pdev->dev); + return ret; + } + ret = devm_snd_soc_register_component(&pdev->dev, &fsl_aud2htx_component, &fsl_aud2htx_dai, 1); if (ret) { dev_err(&pdev->dev, "failed to register ASoC DAI\n"); + pm_runtime_disable(&pdev->dev); return ret; } - ret = imx_pcm_dma_init(pdev); - if (ret) - dev_err(&pdev->dev, "failed to init imx pcm dma: %d\n", ret); - return ret; } |