Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f40d1e5 authored by Santosh Mardi's avatar Santosh Mardi
Browse files

ASoC: msm: update routing driver for host less. 



Update primary mi2s port mixer control with the internal
FM Tx and tertiary MI2S Tx interface.
Remove redundant entries for primary mi2s hostless FE.

Change-Id: Iad04e136f7c4f5a422053954f4a92197fb4a7f16
Signed-off-by: default avatarSantosh Mardi <gsantosh@codeaurora.org>
parent 62dd061b

sound/soc/msm/msm-dai-fe.c

+0 −15
Original line number Diff line number Diff line
@@ -713,21 +713,6 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
		.name = "SEC_MI2S_RX_HOSTLESS",

		.probe = fe_dai_probe,

	},

	{

		.playback = {

			.stream_name = "Primary MI2S_RX Hostless Playback",

			.aif_name = "PRI_MI2S_DL_HL",

			.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 = "PRI_MI2S_RX_HOSTLESS",

		.probe = fe_dai_probe,

	},

	{

		.playback = {

			.stream_name = "Voice2 Playback",

sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c

+6 −4
Original line number Diff line number Diff line
@@ -2598,6 +2598,12 @@ static const struct snd_kcontrol_new primary_mi2s_rx_port_mixer_controls[] = { 
	SOC_SINGLE_EXT("SEC_MI2S_TX", MSM_BACKEND_DAI_PRI_MI2S_RX,

	MSM_BACKEND_DAI_SECONDARY_MI2S_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("TERT_MI2S_TX", MSM_BACKEND_DAI_PRI_MI2S_RX,

	MSM_BACKEND_DAI_TERTIARY_MI2S_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("INTERNAL_FM_TX", MSM_BACKEND_DAI_PRI_MI2S_RX,

	MSM_BACKEND_DAI_INT_FM_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("QUAT_MI2S_TX", MSM_BACKEND_DAI_PRI_MI2S_RX,

	MSM_BACKEND_DAI_QUATERNARY_MI2S_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),
@@ -2998,10 +3004,6 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { 
	SND_SOC_DAPM_AIF_OUT("PRI_MI2S_UL_HL",

		"Primary MI2S_TX Hostless Capture",

		0, 0, 0, 0),

	SND_SOC_DAPM_AIF_IN("PRI_MI2S_DL_HL",

		"Primary MI2S_RX Hostless Playback",

		0, 0, 0, 0),



	SND_SOC_DAPM_AIF_OUT("MI2S_DL_HL", "MI2S_RX_HOSTLESS Playback",

		0, 0, 0, 0),

	SND_SOC_DAPM_AIF_IN("DTMF_DL_HL", "DTMF_RX_HOSTLESS Playback",