ASoC: msm: qdsp6v2: Remove unused FE DAIs

Clean up unused FE DAIs and remove duplicate
routings from dapm routing map for MI2S_RX_VOICE
Mixer.

CRs-Fixed: 2001153
Change-Id: I2c9bd1255331d83b1901915259fe61d287f682fc
Signed-off-by: kunleiz <[email protected]>

asoc/msm-dai-fe.c

@@ -154,31 +154,6 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
 		.name = "MultiMedia2",
 		.probe = fe_dai_probe,
 	},
-	{
-		.playback = {
-			.stream_name = "CS-VOICE Playback",
-			.aif_name = "CS-VOICE_DL1",
-			.rates = SNDRV_PCM_RATE_8000_48000,
-			.formats = SNDRV_PCM_FMTBIT_S16_LE,
-			.channels_min = 1,
-			.channels_max = 2,
-			.rate_min =     8000,
-			.rate_max =     48000,
-		},
-		.capture = {
-			.stream_name = "CS-VOICE Capture",
-			.aif_name = "CS-VOICE_UL1",
-			.rates = SNDRV_PCM_RATE_8000_48000,
-			.formats = SNDRV_PCM_FMTBIT_S16_LE,
-			.channels_min = 1,
-			.channels_max = 2,
-			.rate_min =     8000,
-			.rate_max =     48000,
-		},
-		.ops = &msm_fe_dai_ops,
-		.name = "CS-VOICE",
-		.probe = fe_dai_probe,
-	},
 	{
 		.playback = {
 			.stream_name = "VoIP Playback",
@@ -746,31 +721,6 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
 		.name = "VOICE_STUB",
 		.probe = fe_dai_probe,
 	},
-	{
-		.playback = {
-			.stream_name = "VoLTE Playback",
-			.aif_name = "VoLTE_DL",
-			.rates = SNDRV_PCM_RATE_8000_48000,
-			.formats = SNDRV_PCM_FMTBIT_S16_LE,
-			.channels_min = 1,
-			.channels_max = 2,
-			.rate_min =     8000,
-			.rate_max =     48000,
-		},
-		.capture = {
-			.stream_name = "VoLTE Capture",
-			.aif_name = "VoLTE_UL",
-			.rates = SNDRV_PCM_RATE_8000_48000,
-			.formats = SNDRV_PCM_FMTBIT_S16_LE,
-			.channels_min = 1,
-			.channels_max = 2,
-			.rate_min =     8000,
-			.rate_max =     48000,
-		},
-		.ops = &msm_fe_dai_ops,
-		.name = "VoLTE",
-		.probe = fe_dai_probe,
-	},
 	{
 		.playback = {
 			.stream_name = "MI2S_RX_HOSTLESS Playback",
@@ -2013,58 +1963,6 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
 		.name = "QUAT_TDM_RX_7_HOSTLESS",
 		.probe = fe_dai_probe,
 	},
-	{
-		.playback = {
-			.stream_name = "Voice2 Playback",
-			.aif_name = "VOICE2_DL",
-			.rates = SNDRV_PCM_RATE_8000_48000,
-			.formats = SNDRV_PCM_FMTBIT_S16_LE,
-			.channels_min = 1,
-			.channels_max = 2,
-			.rate_min =     8000,
-			.rate_max =     48000,
-		},
-		.capture = {
-			.stream_name = "Voice2 Capture",
-			.aif_name = "VOICE2_UL",
-			.rates = SNDRV_PCM_RATE_8000_48000,
-			.formats = SNDRV_PCM_FMTBIT_S16_LE,
-			.channels_min = 1,
-			.channels_max = 2,
-			.rate_min =     8000,
-			.rate_max =     48000,
-		},
-		.ops = &msm_fe_dai_ops,
-		.name = "Voice2",
-		.probe = fe_dai_probe,
-	},
-	{
-		.playback = {
-			.stream_name = "Pseudo Playback",
-			.aif_name = "MM_DL9",
-			.rates = (SNDRV_PCM_RATE_8000_48000 |
-					SNDRV_PCM_RATE_KNOT),
-			.formats = SNDRV_PCM_FMTBIT_S16_LE,
-			.channels_min = 1,
-			.channels_max = 8,
-			.rate_min =	8000,
-			.rate_max = 48000,
-		},
-		.capture = {
-			.stream_name = "Pseudo Capture",
-			.aif_name = "MM_UL9",
-			.rates = (SNDRV_PCM_RATE_8000_48000|
-					SNDRV_PCM_RATE_KNOT),
-			.formats = SNDRV_PCM_FMTBIT_S16_LE,
-			.channels_min = 1,
-			.channels_max = 8,
-			.rate_min =     8000,
-			.rate_max =	48000,
-		},
-		.ops = &msm_fe_Multimedia_dai_ops,
-		.name = "Pseudo",
-		.probe = fe_dai_probe,
-	},
 	{
 		.playback = {
 			.stream_name = "DTMF_RX_HOSTLESS Playback",
@@ -2335,31 +2233,6 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
 		.name = "LSM8",
 		.probe = fe_dai_probe,
 	},
-	{
-		.playback = {
-			.stream_name = "VoWLAN Playback",
-			.aif_name = "VoWLAN_DL",
-			.rates = SNDRV_PCM_RATE_8000_48000,
-			.formats = SNDRV_PCM_FMTBIT_S16_LE,
-			.channels_min = 1,
-			.channels_max = 2,
-			.rate_min = 8000,
-			.rate_max = 48000,
-		},
-		.capture = {
-			.stream_name = "VoWLAN Capture",
-			.aif_name = "VoWLAN_UL",
-			.rates = SNDRV_PCM_RATE_8000_48000,
-			.formats = SNDRV_PCM_FMTBIT_S16_LE,
-			.channels_min = 1,
-			.channels_max = 2,
-			.rate_min = 8000,
-			.rate_max = 48000,
-		},
-		.ops = &msm_fe_dai_ops,
-		.name = "VoWLAN",
-		.probe = fe_dai_probe,
-	},
 	/* FE DAIs created for multiple instances of offload playback */
 	{
 		.playback = {

asoc/msm-pcm-routing-v2.h

@@ -211,14 +211,11 @@ enum {
 	MSM_FRONTEND_DAI_MULTIMEDIA18,
 	MSM_FRONTEND_DAI_MULTIMEDIA19,
 	MSM_FRONTEND_DAI_MULTIMEDIA20,
-	MSM_FRONTEND_DAI_CS_VOICE,
 	MSM_FRONTEND_DAI_VOIP,
 	MSM_FRONTEND_DAI_AFE_RX,
 	MSM_FRONTEND_DAI_AFE_TX,
 	MSM_FRONTEND_DAI_VOICE_STUB,
-	MSM_FRONTEND_DAI_VOLTE,
 	MSM_FRONTEND_DAI_DTMF_RX,
-	MSM_FRONTEND_DAI_VOICE2,
 	MSM_FRONTEND_DAI_QCHAT,
 	MSM_FRONTEND_DAI_VOLTE_STUB,
 	MSM_FRONTEND_DAI_LSM1,
@@ -230,7 +227,6 @@ enum {
 	MSM_FRONTEND_DAI_LSM7,
 	MSM_FRONTEND_DAI_LSM8,
 	MSM_FRONTEND_DAI_VOICE2_STUB,
-	MSM_FRONTEND_DAI_VOWLAN,
 	MSM_FRONTEND_DAI_VOICEMMODE1,
 	MSM_FRONTEND_DAI_VOICEMMODE2,
 	MSM_FRONTEND_DAI_MAX,

asoc/msm-qti-pp-config.c

@@ -27,7 +27,7 @@
 
 /* EQUALIZER */
 /* Equal to Frontend after last of the MULTIMEDIA SESSIONS */
-#define MAX_EQ_SESSIONS		MSM_FRONTEND_DAI_CS_VOICE
+#define MAX_EQ_SESSIONS		(MSM_FRONTEND_DAI_MULTIMEDIA20 + 1)
 
 enum {
 	EQ_BAND1 = 0,