From 267fb8e3662347d12054514da44956535553b557 Mon Sep 17 00:00:00 2001
From: Fei Tong <ftong@codeaurora.org>
Date: Tue, 6 Apr 2021 14:48:47 +0800
Subject: [PATCH] ASoC: keep align of the FE pcm id

Fix concurrent playback issue on multi container, there is mismatch with
audio_platform_info config file.

Change-Id: I8b42424dd0e1f299fe90c0b835b41a788e910208
---
 asoc/sa6155.c | 14 +++++++-------
 asoc/sa8155.c | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)
 mode change 100644 => 100755 asoc/sa6155.c
 mode change 100644 => 100755 asoc/sa8155.c

diff --git a/asoc/sa6155.c b/asoc/sa6155.c
old mode 100644
new mode 100755
index 9bd249f43feb..e956a6b05a83
--- a/asoc/sa6155.c
+++ b/asoc/sa6155.c
@@ -5892,6 +5892,13 @@ static struct snd_soc_dai_link msm_auto_fe_dai_links[] = {
 		.id = MSM_FRONTEND_DAI_MULTIMEDIA25,
 		SND_SOC_DAILINK_REG(multimedia25),
 	},
+	{
+		.name = "MSM AFE-PCM TX1",
+		.stream_name = "AFE-PROXY TX1",
+		.dpcm_capture = 1,
+		.ignore_suspend = 1,
+		SND_SOC_DAILINK_REG(afepcm_tx1),
+	},
 	{
 		.name = MSM_DAILINK_NAME(Media31),
 		.stream_name = "MultiMedia31",
@@ -5956,13 +5963,6 @@ static struct snd_soc_dai_link msm_auto_fe_dai_links[] = {
 		.id = MSM_FRONTEND_DAI_MULTIMEDIA34,
 		SND_SOC_DAILINK_REG(multimedia34),
 	},
-	{
-		.name = "MSM AFE-PCM TX1",
-		.stream_name = "AFE-PROXY TX1",
-		.dpcm_capture = 1,
-		.ignore_suspend = 1,
-		SND_SOC_DAILINK_REG(afepcm_tx1),
-	},
 };
 
 static struct snd_soc_dai_link msm_custom_fe_dai_links[] = {
diff --git a/asoc/sa8155.c b/asoc/sa8155.c
old mode 100644
new mode 100755
index 167cd963d7e5..93a208a6ce09
--- a/asoc/sa8155.c
+++ b/asoc/sa8155.c
@@ -5797,6 +5797,13 @@ static struct snd_soc_dai_link msm_auto_fe_dai_links[] = {
 		.id = MSM_FRONTEND_DAI_MULTIMEDIA25,
 		SND_SOC_DAILINK_REG(multimedia25),
 	},
+	{
+		.name = "MSM AFE-PCM TX1",
+		.stream_name = "AFE-PROXY TX1",
+		.dpcm_capture = 1,
+		.ignore_suspend = 1,
+		SND_SOC_DAILINK_REG(afepcm_tx1),
+	},
 	{
 		.name = MSM_DAILINK_NAME(Media31),
 		.stream_name = "MultiMedia31",
@@ -5861,13 +5868,6 @@ static struct snd_soc_dai_link msm_auto_fe_dai_links[] = {
 		.id = MSM_FRONTEND_DAI_MULTIMEDIA34,
 		SND_SOC_DAILINK_REG(multimedia34),
 	},
-	{
-		.name = "MSM AFE-PCM TX1",
-		.stream_name = "AFE-PROXY TX1",
-		.dpcm_capture = 1,
-		.ignore_suspend = 1,
-		SND_SOC_DAILINK_REG(afepcm_tx1),
-	},
 };
 
 static struct snd_soc_dai_link msm_custom_fe_dai_links[] = {