ASOC: Intel: sof_sdw: fix playback failure on max98373

Prepare, trigger and hw_free functions were moved from sdw component
driver to sdw dai link ops for each sdw codec, but max98373 overrode
this ops and was not updated. This patch moves the setting of dai link
ops to sof_sdw.c to make all the dai setting in one place to avoid
this kind of bug.

Fixes: 7eec07f ('ASOC: Intel: sof_sdw: add dailink .trigger callback')
Fixes: 5595f95 ('ASOC: Intel: sof_sdw: add dailink .prepare and .hw_free
callback').

Signed-off-by: Rander Wang <rander.wang@intel.com>

Author: RanderWang

sound/soc/intel/boards/sof_sdw.c

@@ -220,7 +220,7 @@ static struct snd_soc_dai_link_component platform_component[] = {
 };
 
 /* these wrappers are only needed to avoid typecast compilation errors */
-int sdw_startup(struct snd_pcm_substream *substream)
+static int sdw_startup(struct snd_pcm_substream *substream)
 {
 	return sdw_startup_stream(substream);
 }
@@ -244,7 +244,7 @@ static int sdw_prepare(struct snd_pcm_substream *substream)
 	return sdw_prepare_stream(sdw_stream);
 }
 
-static int sdw_trigger(struct snd_pcm_substream *substream, int cmd)
+int sdw_trigger(struct snd_pcm_substream *substream, int cmd)
 {
 	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
 	struct sdw_stream_runtime *sdw_stream;
@@ -303,7 +303,7 @@ static int sdw_hw_free(struct snd_pcm_substream *substream)
 	return sdw_deprepare_stream(sdw_stream);
 }
 
-void sdw_shutdown(struct snd_pcm_substream *substream)
+static void sdw_shutdown(struct snd_pcm_substream *substream)
 {
 	sdw_shutdown_stream(substream);
 }
@@ -316,18 +316,28 @@ static const struct snd_soc_ops sdw_ops = {
 	.shutdown = sdw_shutdown,
 };
 
+static const struct snd_soc_ops max_98373_sdw_ops = {
+	.startup = sdw_startup,
+	.prepare = sdw_prepare,
+	.trigger = max98373_sdw_trigger,
+	.hw_free = sdw_hw_free,
+	.shutdown = sdw_shutdown,
+};
+
 static struct sof_sdw_codec_info codec_info_list[] = {
 	{
 		.part_id = 0x700,
 		.direction = {true, true},
 		.dai_name = "rt700-aif1",
+		.ops = &sdw_ops,
 		.init = sof_sdw_rt700_init,
 	},
 	{
 		.part_id = 0x711,
 		.version_id = 3,
 		.direction = {true, true},
 		.dai_name = "rt711-sdca-aif1",
+		.ops = &sdw_ops,
 		.init = sof_sdw_rt711_sdca_init,
 		.exit = sof_sdw_rt711_sdca_exit,
 	},
@@ -336,6 +346,7 @@ static struct sof_sdw_codec_info codec_info_list[] = {
 		.version_id = 2,
 		.direction = {true, true},
 		.dai_name = "rt711-aif1",
+		.ops = &sdw_ops,
 		.init = sof_sdw_rt711_init,
 		.exit = sof_sdw_rt711_exit,
 	},
@@ -352,31 +363,36 @@ static struct sof_sdw_codec_info codec_info_list[] = {
 		.direction = {true, true},
 		.dai_name = "rt1316-aif",
 		.init = sof_sdw_rt1316_init,
+		.ops = &sdw_ops,
 	},
 	{
 		.part_id = 0x714,
 		.direction = {false, true},
 		.dai_name = "rt715-aif2",
 		.init = sof_sdw_rt715_sdca_init,
+		.ops = &sdw_ops,
 	},
 	{
 		.part_id = 0x715,
 		.direction = {false, true},
 		.dai_name = "rt715-aif2",
 		.init = sof_sdw_rt715_init,
+		.ops = &sdw_ops,
 	},
 	{
 		.part_id = 0x8373,
 		.direction = {true, true},
 		.dai_name = "max98373-aif1",
 		.init = sof_sdw_mx8373_init,
+		.ops = &max_98373_sdw_ops,
 		.codec_card_late_probe = sof_sdw_mx8373_late_probe,
 	},
 	{
 		.part_id = 0x5682,
 		.direction = {true, true},
 		.dai_name = "rt5682-sdw",
 		.init = sof_sdw_rt5682_init,
+		.ops = &sdw_ops,
 	},
 };
 
@@ -807,7 +823,7 @@ static int create_sdw_dailink(struct device *dev, int *be_index,
 			      playback, capture,
 			      cpus + *cpu_id, cpu_dai_num,
 			      codecs, codec_num,
-			      NULL, &sdw_ops);
+			      NULL, codec_info_list[codec_index].ops);
 
 		ret = set_codec_init_func(link, dai_links + (*be_index)++,
 					  playback, group_id);

sound/soc/intel/boards/sof_sdw_common.h

@@ -78,8 +78,7 @@ struct mc_private {
 
 extern unsigned long sof_sdw_quirk;
 
-int sdw_startup(struct snd_pcm_substream *substream);
-void sdw_shutdown(struct snd_pcm_substream *substream);
+int sdw_trigger(struct snd_pcm_substream *substream, int cmd);
 
 /* generic HDMI support */
 int sof_sdw_hdmi_init(struct snd_soc_pcm_runtime *rtd);
@@ -141,6 +140,8 @@ int sof_sdw_mx8373_init(const struct snd_soc_acpi_link_adr *link,
 			struct sof_sdw_codec_info *info,
 			bool playback);
 
+int max98373_sdw_trigger(struct snd_pcm_substream *substream, int cmd);
+
 int sof_sdw_mx8373_late_probe(struct snd_soc_card *card);
 
 /* RT5682 support */

sound/soc/intel/boards/sof_sdw_max98373.c

@@ -55,11 +55,34 @@ static int spk_init(struct snd_soc_pcm_runtime *rtd)
 	return ret;
 }
 
-static const struct snd_soc_ops max_98373_sdw_ops = {
-	.startup = sdw_startup,
-	.trigger = max98373_trigger,
-	.shutdown = sdw_shutdown,
-};
+int max98373_sdw_trigger(struct snd_pcm_substream *substream, int cmd)
+{
+	int ret;
+
+	switch (cmd) {
+	case SNDRV_PCM_TRIGGER_START:
+	case SNDRV_PCM_TRIGGER_RESUME:
+	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+		/* enable max98373 first */
+		ret = max98373_trigger(substream, cmd);
+		if (ret < 0)
+			break;
+
+		ret = sdw_trigger(substream, cmd);
+		break;
+	case SNDRV_PCM_TRIGGER_STOP:
+	case SNDRV_PCM_TRIGGER_SUSPEND:
+	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+		ret = sdw_trigger(substream, cmd);
+		if (ret < 0)
+			break;
+
+		ret = max98373_trigger(substream, cmd);
+		break;
+	}
+
+	return ret;
+}
 
 int sof_sdw_mx8373_init(const struct snd_soc_acpi_link_adr *link,
 			struct snd_soc_dai_link *dai_links,
@@ -72,8 +95,6 @@ int sof_sdw_mx8373_init(const struct snd_soc_acpi_link_adr *link,
 
 	info->late_probe = true;
 
-	dai_links->ops = &max_98373_sdw_ops;
-
 	return 0;
 }