From 59d3b7b3d78f3820d4ef03cc31397bbb1dfc3f5a Mon Sep 17 00:00:00 2001
From: Sugar Zhang <sugar.zhang@rock-chips.com>
Date: Fri, 19 Jul 2024 16:09:42 +0800
Subject: [PATCH] ASoC: rockchip: sai: Register PCM before DAI component

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
---
 sound/soc/rockchip/rockchip_sai.c | 35 ++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/sound/soc/rockchip/rockchip_sai.c b/sound/soc/rockchip/rockchip_sai.c
index 95c18974184e..cf53f0e647d4 100644
--- a/sound/soc/rockchip/rockchip_sai.c
+++ b/sound/soc/rockchip/rockchip_sai.c
@@ -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;