Revert "ASoC: rt715-sdca: wait codec init in hw_params"

This reverts commit 47f6c5d.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

Author: bardliao

sound/soc/codecs/rt715-sdca-sdw.c

@@ -120,7 +120,6 @@ static int rt715_sdca_update_status(struct sdw_slave *slave,
 				enum sdw_slave_status status)
 {
 	struct rt715_sdca_priv *rt715 = dev_get_drvdata(&slave->dev);
-	int ret;
 
 	/*
 	 * Perform initialization only if slave status is present and
@@ -130,29 +129,7 @@ static int rt715_sdca_update_status(struct sdw_slave *slave,
 		return 0;
 
 	/* perform I/O transfers required for Slave initialization */
-	ret = rt715_sdca_io_init(&slave->dev, slave);
-	if (ret < 0) {
-		dev_err(&slave->dev, "IO init failed: %d\n", ret);
-		return ret;
-	}
-
-	if (slave->unattach_request) {
-		regcache_cache_only(rt715->regmap, false);
-		regcache_sync_region(rt715->regmap,
-			SDW_SDCA_CTL(FUN_JACK_CODEC, RT715_SDCA_ST_EN, RT715_SDCA_ST_CTRL,
-				CH_00),
-			SDW_SDCA_CTL(FUN_MIC_ARRAY, RT715_SDCA_SMPU_TRIG_ST_EN,
-				RT715_SDCA_SMPU_TRIG_ST_CTRL, CH_00));
-		regcache_cache_only(rt715->mbq_regmap, false);
-		regcache_sync_region(rt715->mbq_regmap, 0x2000000, 0x61020ff);
-		regcache_sync_region(rt715->mbq_regmap,
-			SDW_SDCA_CTL(FUN_JACK_CODEC, RT715_SDCA_ST_EN, RT715_SDCA_ST_CTRL,
-				CH_00),
-			SDW_SDCA_CTL(FUN_MIC_ARRAY, RT715_SDCA_SMPU_TRIG_ST_EN,
-				RT715_SDCA_SMPU_TRIG_ST_CTRL, CH_00));
-	}
-
-	return ret;
+	return rt715_sdca_io_init(&slave->dev, slave);
 }
 
 static int rt715_sdca_read_prop(struct sdw_slave *slave)
@@ -243,18 +220,28 @@ static int rt715_dev_suspend(struct device *dev)
 	return 0;
 }
 
+#define RT715_PROBE_TIMEOUT 5000
+
 static int rt715_dev_resume(struct device *dev)
 {
 	struct sdw_slave *slave = dev_to_sdw_dev(dev);
 	struct rt715_sdca_priv *rt715 = dev_get_drvdata(dev);
+	unsigned long time;
 
 	if (!rt715->first_hw_init)
 		return 0;
 
 	if (!slave->unattach_request)
 		goto regmap_sync;
 
-	return 0;
+	time = wait_for_completion_timeout(&slave->initialization_complete,
+					   msecs_to_jiffies(RT715_PROBE_TIMEOUT));
+	if (!time) {
+		dev_err(&slave->dev, "%s: Initialization not complete, timed out\n", __func__);
+		sdw_show_ping_status(slave->bus, true);
+
+		return -ETIMEDOUT;
+	}
 
 regmap_sync:
 	slave->unattach_request = 0;

sound/soc/codecs/rt715-sdca.c

@@ -792,8 +792,6 @@ static void rt715_sdca_shutdown(struct snd_pcm_substream *substream,
 	snd_soc_dai_set_dma_data(dai, substream, NULL);
 }
 
-#define RT715_PROBE_TIMEOUT 5000
-
 static int rt715_sdca_pcm_hw_params(struct snd_pcm_substream *substream,
 				struct snd_pcm_hw_params *params,
 				struct snd_soc_dai *dai)
@@ -832,10 +830,6 @@ static int rt715_sdca_pcm_hw_params(struct snd_pcm_substream *substream,
 		return -EINVAL;
 	}
 
-	retval = sdw_slave_wait_for_initialization(rt715->slave, RT715_PROBE_TIMEOUT);
-	if (retval < 0)
-		return retval;
-
 	retval = sdw_stream_add_slave(rt715->slave, &stream_config,
 					&port_config, 1, sdw_stream);
 	if (retval) {