[PATCH 10/15] ASoC: rt700: wait codec init in hw_params

[Bard Liao]

Move regmap sync to rt700_update_status() when unattach_request
is set, and only do regmap sync in resume when no reattach needed.
And move waiting codec init to hw_params when the codec really need to
be initialized. The change can shorten the resume time.

Signed-off-by: Bard Liao <yung-chuan.liao@xxxxxxxxxxxxxxx>
Reviewed-by: Shuming Fan <shumingf@xxxxxxxxxxx>
Reviewed-by: Charles Keepax <ckeepax@xxxxxxxxxxxxxxxxxxxxx>
---
 sound/soc/codecs/rt700-sdw.c | 27 +++++++++++++++------------
 sound/soc/codecs/rt700.c     |  6 ++++++
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/sound/soc/codecs/rt700-sdw.c b/sound/soc/codecs/rt700-sdw.c
index 44543c0da177..dd775788c2ee 100644
--- a/sound/soc/codecs/rt700-sdw.c
+++ b/sound/soc/codecs/rt700-sdw.c
@@ -314,6 +314,7 @@ static int rt700_update_status(struct sdw_slave *slave,
 					enum sdw_slave_status status)
 {
 	struct rt700_priv *rt700 = dev_get_drvdata(&slave->dev);
+	int ret;
 
 	if (status == SDW_SLAVE_UNATTACHED)
 		rt700->hw_init = false;
@@ -326,7 +327,19 @@ static int rt700_update_status(struct sdw_slave *slave,
 		return 0;
 
 	/* perform I/O transfers required for Slave initialization */
-	return rt700_io_init(&slave->dev, slave);
+	ret = rt700_io_init(&slave->dev, slave);
+	if (ret < 0) {
+		dev_err(&slave->dev, "I/O init failed: %d\n", ret);
+		return ret;
+	}
+
+	if (slave->unattach_request) {
+		regcache_cache_only(rt700->regmap, false);
+		regcache_sync_region(rt700->regmap, 0x3000, 0x8fff);
+		regcache_sync_region(rt700->regmap, 0x752010, 0x75206b);
+	}
+
+	return ret;
 }
 
 static int rt700_read_prop(struct sdw_slave *slave)
@@ -518,13 +531,10 @@ static int rt700_dev_system_suspend(struct device *dev)
 	return rt700_dev_suspend(dev);
 }
 
-#define RT700_PROBE_TIMEOUT 5000
-
 static int rt700_dev_resume(struct device *dev)
 {
 	struct sdw_slave *slave = dev_to_sdw_dev(dev);
 	struct rt700_priv *rt700 = dev_get_drvdata(dev);
-	unsigned long time;
 
 	if (!rt700->first_hw_init)
 		return 0;
@@ -532,14 +542,7 @@ static int rt700_dev_resume(struct device *dev)
 	if (!slave->unattach_request)
 		goto regmap_sync;
 
-	time = wait_for_completion_timeout(&slave->initialization_complete,
-				msecs_to_jiffies(RT700_PROBE_TIMEOUT));
-	if (!time) {
-		dev_err(&slave->dev, "Initialization not complete, timed out\n");
-		sdw_show_ping_status(slave->bus, true);
-
-		return -ETIMEDOUT;
-	}
+	return 0;
 
 regmap_sync:
 	slave->unattach_request = 0;
diff --git a/sound/soc/codecs/rt700.c b/sound/soc/codecs/rt700.c
index 434b926f96c8..4a5338f7ad92 100644
--- a/sound/soc/codecs/rt700.c
+++ b/sound/soc/codecs/rt700.c
@@ -893,6 +893,8 @@ static void rt700_shutdown(struct snd_pcm_substream *substream,
 	snd_soc_dai_set_dma_data(dai, substream, NULL);
 }
 
+#define RT700_PROBE_TIMEOUT 5000
+
 static int rt700_pcm_hw_params(struct snd_pcm_substream *substream,
 					struct snd_pcm_hw_params *params,
 					struct snd_soc_dai *dai)
@@ -934,6 +936,10 @@ static int rt700_pcm_hw_params(struct snd_pcm_substream *substream,
 		return -EINVAL;
 	}
 
+	retval = sdw_slave_wait_for_initialization(rt700->slave, RT700_PROBE_TIMEOUT);
+	if (retval < 0)
+		return retval;
+
 	retval = sdw_stream_add_slave(rt700->slave, &stream_config,
 					&port_config, 1, sdw_stream);
 	if (retval) {
-- 
2.43.0