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

Commit f3d6f393 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: msm: routing: Add support for LSM routings for codec dma... 

Merge "asoc: msm: routing: Add support for LSM routings for codec dma interfaces" into audio-drivers.lnx.3.0
parents 74104df8 637d612f

asoc/msm-pcm-routing-v2.c

+89 −1
Original line number Diff line number Diff line
@@ -110,6 +110,8 @@ enum { 
#define QUAT_MI2S_TX_TEXT "QUAT_MI2S_TX"

#define ADM_LSM_TX_TEXT "ADM_LSM_TX"

#define INT3_MI2S_TX_TEXT "INT3_MI2S_TX"

#define VA_CDC_DMA_TX_0_TEXT "VA_CDC_DMA_TX_0"

#define VA_CDC_DMA_TX_1_TEXT "VA_CDC_DMA_TX_1"















#define LSM_FUNCTION_TEXT "LSM Function"















static const char * const lsm_port_text[] = {









@@ -117,7 +119,7 @@ static const char * const lsm_port_text[] = {













	SLIMBUS_0_TX_TEXT, SLIMBUS_1_TX_TEXT, SLIMBUS_2_TX_TEXT,















	SLIMBUS_3_TX_TEXT, SLIMBUS_4_TX_TEXT, SLIMBUS_5_TX_TEXT,















	TERT_MI2S_TX_TEXT, QUAT_MI2S_TX_TEXT, ADM_LSM_TX_TEXT,













	INT3_MI2S_TX_TEXT













	INT3_MI2S_TX_TEXT, VA_CDC_DMA_TX_0_TEXT, VA_CDC_DMA_TX_1_TEXT















};





























struct msm_pcm_route_bdai_pp_params {










@@ -2515,6 +2517,12 @@ static int msm_routing_lsm_port_put(struct snd_kcontrol *kcontrol,













	case 10:















		lsm_port = AFE_PORT_ID_INT3_MI2S_TX;















		break;













	case 11:













		lsm_port = AFE_PORT_ID_VA_CODEC_DMA_TX_0;













		break;













	case 12:













		lsm_port = AFE_PORT_ID_VA_CODEC_DMA_TX_1;













		break;















	default:















		pr_err("Default lsm port");















		break;










@@ -14035,6 +14043,14 @@ static const struct snd_kcontrol_new lsm1_mixer_controls[] = {













		MSM_BACKEND_DAI_INT3_MI2S_TX,















		MSM_FRONTEND_DAI_LSM1, 1, 0, msm_routing_get_listen_mixer,















		msm_routing_put_listen_mixer),













	SOC_DOUBLE_EXT("VA_CDC_DMA_TX_0", SND_SOC_NOPM,













		MSM_BACKEND_DAI_VA_CDC_DMA_TX_0,













		MSM_FRONTEND_DAI_LSM1, 1, 0, msm_routing_get_listen_mixer,













		msm_routing_put_listen_mixer),













	SOC_DOUBLE_EXT("VA_CDC_DMA_TX_1", SND_SOC_NOPM,













		MSM_BACKEND_DAI_VA_CDC_DMA_TX_1,













		MSM_FRONTEND_DAI_LSM1, 1, 0, msm_routing_get_listen_mixer,













		msm_routing_put_listen_mixer),















};





























static const struct snd_kcontrol_new lsm2_mixer_controls[] = {










@@ -14071,6 +14087,14 @@ static const struct snd_kcontrol_new lsm2_mixer_controls[] = {













		MSM_BACKEND_DAI_INT3_MI2S_TX,















		MSM_FRONTEND_DAI_LSM2, 1, 0, msm_routing_get_listen_mixer,















		msm_routing_put_listen_mixer),













	SOC_DOUBLE_EXT("VA_CDC_DMA_TX_0", SND_SOC_NOPM,













		MSM_BACKEND_DAI_VA_CDC_DMA_TX_0,













		MSM_FRONTEND_DAI_LSM2, 1, 0, msm_routing_get_listen_mixer,













		msm_routing_put_listen_mixer),













	SOC_DOUBLE_EXT("VA_CDC_DMA_TX_1", SND_SOC_NOPM,













		MSM_BACKEND_DAI_VA_CDC_DMA_TX_1,













		MSM_FRONTEND_DAI_LSM2, 1, 0, msm_routing_get_listen_mixer,













		msm_routing_put_listen_mixer),















};





























static const struct snd_kcontrol_new lsm3_mixer_controls[] = {










@@ -14106,6 +14130,14 @@ static const struct snd_kcontrol_new lsm3_mixer_controls[] = {













		MSM_BACKEND_DAI_INT3_MI2S_TX,















		MSM_FRONTEND_DAI_LSM3, 1, 0, msm_routing_get_listen_mixer,















		msm_routing_put_listen_mixer),













	SOC_DOUBLE_EXT("VA_CDC_DMA_TX_0", SND_SOC_NOPM,













		MSM_BACKEND_DAI_VA_CDC_DMA_TX_0,













		MSM_FRONTEND_DAI_LSM3, 1, 0, msm_routing_get_listen_mixer,













		msm_routing_put_listen_mixer),













	SOC_DOUBLE_EXT("VA_CDC_DMA_TX_1", SND_SOC_NOPM,













		MSM_BACKEND_DAI_VA_CDC_DMA_TX_1,













		MSM_FRONTEND_DAI_LSM3, 1, 0, msm_routing_get_listen_mixer,













		msm_routing_put_listen_mixer),















};





























static const struct snd_kcontrol_new lsm4_mixer_controls[] = {










@@ -14141,6 +14173,14 @@ static const struct snd_kcontrol_new lsm4_mixer_controls[] = {













		MSM_BACKEND_DAI_INT3_MI2S_TX,















		MSM_FRONTEND_DAI_LSM4, 1, 0, msm_routing_get_listen_mixer,















		msm_routing_put_listen_mixer),













	SOC_DOUBLE_EXT("VA_CDC_DMA_TX_0", SND_SOC_NOPM,













		MSM_BACKEND_DAI_VA_CDC_DMA_TX_0,













		MSM_FRONTEND_DAI_LSM4, 1, 0, msm_routing_get_listen_mixer,













		msm_routing_put_listen_mixer),













	SOC_DOUBLE_EXT("VA_CDC_DMA_TX_1", SND_SOC_NOPM,













		MSM_BACKEND_DAI_VA_CDC_DMA_TX_1,













		MSM_FRONTEND_DAI_LSM4, 1, 0, msm_routing_get_listen_mixer,













		msm_routing_put_listen_mixer),















};





























static const struct snd_kcontrol_new lsm5_mixer_controls[] = {










@@ -14176,6 +14216,14 @@ static const struct snd_kcontrol_new lsm5_mixer_controls[] = {













		MSM_BACKEND_DAI_INT3_MI2S_TX,















		MSM_FRONTEND_DAI_LSM5, 1, 0, msm_routing_get_listen_mixer,















		msm_routing_put_listen_mixer),













	SOC_DOUBLE_EXT("VA_CDC_DMA_TX_0", SND_SOC_NOPM,













		MSM_BACKEND_DAI_VA_CDC_DMA_TX_0,













		MSM_FRONTEND_DAI_LSM5, 1, 0, msm_routing_get_listen_mixer,













		msm_routing_put_listen_mixer),













	SOC_DOUBLE_EXT("VA_CDC_DMA_TX_1", SND_SOC_NOPM,













		MSM_BACKEND_DAI_VA_CDC_DMA_TX_1,













		MSM_FRONTEND_DAI_LSM5, 1, 0, msm_routing_get_listen_mixer,













		msm_routing_put_listen_mixer),















};





























static const struct snd_kcontrol_new lsm6_mixer_controls[] = {










@@ -14211,6 +14259,14 @@ static const struct snd_kcontrol_new lsm6_mixer_controls[] = {













		MSM_BACKEND_DAI_INT3_MI2S_TX,















		MSM_FRONTEND_DAI_LSM6, 1, 0, msm_routing_get_listen_mixer,















		msm_routing_put_listen_mixer),













	SOC_DOUBLE_EXT("VA_CDC_DMA_TX_0", SND_SOC_NOPM,













		MSM_BACKEND_DAI_VA_CDC_DMA_TX_0,













		MSM_FRONTEND_DAI_LSM6, 1, 0, msm_routing_get_listen_mixer,













		msm_routing_put_listen_mixer),













	SOC_DOUBLE_EXT("VA_CDC_DMA_TX_1", SND_SOC_NOPM,













		MSM_BACKEND_DAI_VA_CDC_DMA_TX_1,













		MSM_FRONTEND_DAI_LSM6, 1, 0, msm_routing_get_listen_mixer,













		msm_routing_put_listen_mixer),















};





























static const struct snd_kcontrol_new lsm7_mixer_controls[] = {










@@ -14246,6 +14302,14 @@ static const struct snd_kcontrol_new lsm7_mixer_controls[] = {













		MSM_BACKEND_DAI_INT3_MI2S_TX,















		MSM_FRONTEND_DAI_LSM7, 1, 0, msm_routing_get_listen_mixer,















		msm_routing_put_listen_mixer),













	SOC_DOUBLE_EXT("VA_CDC_DMA_TX_0", SND_SOC_NOPM,













		MSM_BACKEND_DAI_VA_CDC_DMA_TX_0,













		MSM_FRONTEND_DAI_LSM7, 1, 0, msm_routing_get_listen_mixer,













		msm_routing_put_listen_mixer),













	SOC_DOUBLE_EXT("VA_CDC_DMA_TX_1", SND_SOC_NOPM,













		MSM_BACKEND_DAI_VA_CDC_DMA_TX_1,













		MSM_FRONTEND_DAI_LSM7, 1, 0, msm_routing_get_listen_mixer,













		msm_routing_put_listen_mixer),















};





























static const struct snd_kcontrol_new lsm8_mixer_controls[] = {










@@ -14281,6 +14345,14 @@ static const struct snd_kcontrol_new lsm8_mixer_controls[] = {













		MSM_BACKEND_DAI_INT3_MI2S_TX,















		MSM_FRONTEND_DAI_LSM8, 1, 0, msm_routing_get_listen_mixer,















		msm_routing_put_listen_mixer),













	SOC_DOUBLE_EXT("VA_CDC_DMA_TX_0", SND_SOC_NOPM,













		MSM_BACKEND_DAI_VA_CDC_DMA_TX_0,













		MSM_FRONTEND_DAI_LSM8, 1, 0, msm_routing_get_listen_mixer,













		msm_routing_put_listen_mixer),













	SOC_DOUBLE_EXT("VA_CDC_DMA_TX_1", SND_SOC_NOPM,













		MSM_BACKEND_DAI_VA_CDC_DMA_TX_1,













		MSM_FRONTEND_DAI_LSM8, 1, 0, msm_routing_get_listen_mixer,













		msm_routing_put_listen_mixer),















};





























static const struct snd_kcontrol_new slim_fm_switch_mixer_controls =










@@ -18633,6 +18705,8 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"LSM1 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},















	{"LSM1 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},















	{"LSM1 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},













	{"LSM1 Mixer", "VA_CDC_DMA_TX_0", "VA_CDC_DMA_TX_0"},













	{"LSM1 Mixer", "VA_CDC_DMA_TX_1", "VA_CDC_DMA_TX_1"},















	{"LSM1_UL_HL", NULL, "LSM1 Mixer"},





























	{"LSM2 Mixer", "SLIMBUS_0_TX", "SLIMBUS_0_TX"},









@@ -18643,6 +18717,8 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"LSM2 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},















	{"LSM2 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},















	{"LSM2 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},













	{"LSM2 Mixer", "VA_CDC_DMA_TX_0", "VA_CDC_DMA_TX_0"},













	{"LSM2 Mixer", "VA_CDC_DMA_TX_1", "VA_CDC_DMA_TX_1"},















	{"LSM2_UL_HL", NULL, "LSM2 Mixer"},





































@@ -18654,6 +18730,8 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"LSM3 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},















	{"LSM3 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},















	{"LSM3 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},













	{"LSM3 Mixer", "VA_CDC_DMA_TX_0", "VA_CDC_DMA_TX_0"},













	{"LSM3 Mixer", "VA_CDC_DMA_TX_1", "VA_CDC_DMA_TX_1"},















	{"LSM3_UL_HL", NULL, "LSM3 Mixer"},





































@@ -18665,6 +18743,8 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"LSM4 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},















	{"LSM4 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},















	{"LSM4 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},













	{"LSM4 Mixer", "VA_CDC_DMA_TX_0", "VA_CDC_DMA_TX_0"},













	{"LSM4 Mixer", "VA_CDC_DMA_TX_1", "VA_CDC_DMA_TX_1"},















	{"LSM4_UL_HL", NULL, "LSM4 Mixer"},





























	{"LSM5 Mixer", "SLIMBUS_0_TX", "SLIMBUS_0_TX"},









@@ -18675,6 +18755,8 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"LSM5 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},















	{"LSM5 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},















	{"LSM5 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},













	{"LSM5 Mixer", "VA_CDC_DMA_TX_0", "VA_CDC_DMA_TX_0"},













	{"LSM5 Mixer", "VA_CDC_DMA_TX_1", "VA_CDC_DMA_TX_1"},















	{"LSM5_UL_HL", NULL, "LSM5 Mixer"},





























	{"LSM6 Mixer", "SLIMBUS_0_TX", "SLIMBUS_0_TX"},









@@ -18683,6 +18765,8 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"LSM6 Mixer", "SLIMBUS_4_TX", "SLIMBUS_4_TX"},















	{"LSM6 Mixer", "SLIMBUS_5_TX", "SLIMBUS_5_TX"},















	{"LSM6 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},













	{"LSM6 Mixer", "VA_CDC_DMA_TX_0", "VA_CDC_DMA_TX_0"},













	{"LSM6 Mixer", "VA_CDC_DMA_TX_1", "VA_CDC_DMA_TX_1"},















	{"LSM6_UL_HL", NULL, "LSM6 Mixer"},





























	{"LSM7 Mixer", "SLIMBUS_0_TX", "SLIMBUS_0_TX"},









@@ -18691,6 +18775,8 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"LSM7 Mixer", "SLIMBUS_4_TX", "SLIMBUS_4_TX"},















	{"LSM7 Mixer", "SLIMBUS_5_TX", "SLIMBUS_5_TX"},















	{"LSM7 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},













	{"LSM7 Mixer", "VA_CDC_DMA_TX_0", "VA_CDC_DMA_TX_0"},













	{"LSM7 Mixer", "VA_CDC_DMA_TX_1", "VA_CDC_DMA_TX_1"},















	{"LSM7_UL_HL", NULL, "LSM7 Mixer"},





























	{"LSM8 Mixer", "SLIMBUS_0_TX", "SLIMBUS_0_TX"},









@@ -18699,6 +18785,8 @@ static const struct snd_soc_dapm_route intercon[] = {













	{"LSM8 Mixer", "SLIMBUS_4_TX", "SLIMBUS_4_TX"},















	{"LSM8 Mixer", "SLIMBUS_5_TX", "SLIMBUS_5_TX"},















	{"LSM8 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},













	{"LSM8 Mixer", "VA_CDC_DMA_TX_0", "VA_CDC_DMA_TX_0"},













	{"LSM8 Mixer", "VA_CDC_DMA_TX_1", "VA_CDC_DMA_TX_1"},















	{"LSM8_UL_HL", NULL, "LSM8 Mixer"},