shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: rockchip: sai: Register PCM before DAI component

Browse Source 
API snd_soc_register_component will try to rebind card per
each component register. and the ASoC allow no-pcm card instance.

  devm_snd_soc_register_component
      snd_soc_try_rebind_card
          snd_soc_bind_card
              snd_soc_add_pcm_runtime
  devm_snd_dmaengine_pcm_register

So, we should register PCM before DAI component.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Iff41cd4151a5dedb0ae5a45897a86dcccaffb62b
This commit is contained in:
Sugar Zhang
2024-07-19 16:09:42 +08:00
committed by Tao Huang
parent e171dd2bc2
commit 59d3b7b3d7
1 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
sound/soc/rockchip/rockchip_sai.c
View File

@@ -1849,6 +1849,23 @@ static int rockchip_sai_wait_time_init(struct rk_sai_dev *sai)
return 0;
}
static int rockchip_sai_register_platform(struct device *dev)
{
int ret = 0;
if (device_property_read_bool(dev, "rockchip,no-dmaengine")) {
dev_info(dev, "Used for Multi-DAI\n");
return 0;
}
if (device_property_read_bool(dev, "rockchip,digital-loopback"))
ret = devm_snd_dmaengine_dlp_register(dev, &dconfig);
else
ret = devm_snd_dmaengine_pcm_register(dev, NULL, 0);
return ret;
}
static int rockchip_sai_probe(struct platform_device *pdev)
{
struct device_node *node = pdev->dev.of_node;
@@ -1959,23 +1976,13 @@ static int rockchip_sai_probe(struct platform_device *pdev)
goto err_runtime_disable;
}
ret = devm_snd_soc_register_component(&pdev->dev,
&rockchip_sai_component,
dai, 1);
ret = rockchip_sai_register_platform(&pdev->dev);
if (ret)
goto err_runtime_suspend;
if (device_property_read_bool(&pdev->dev, "rockchip,no-dmaengine")) {
clk_disable_unprepare(sai->hclk);
dev_info(&pdev->dev, "Used for Multi-DAI\n");
return 0;
}
if (device_property_read_bool(&pdev->dev, "rockchip,digital-loopback"))
ret = devm_snd_dmaengine_dlp_register(&pdev->dev, &dconfig);
else
ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
ret = devm_snd_soc_register_component(&pdev->dev,
&rockchip_sai_component,
dai, 1);
if (ret)
goto err_runtime_suspend;