Merge "ASoc: msm: qdsp6v2: Add support for compress capture"

diff --cc sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
index 9164475,8cfcef6..a456cc2
--- 1/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
--- 2/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
+++ b/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
@@@ -2927,8 -3021,26 +3033,17 @@@ static const struct snd_kcontrol_new se
        SOC_SINGLE_EXT("MultiMedia16", MSM_BACKEND_DAI_SECONDARY_MI2S_RX,
        MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
        msm_routing_put_audio_mixer),
+       SOC_SINGLE_EXT("MultiMedia17", MSM_BACKEND_DAI_SECONDARY_MI2S_RX,
+       MSM_FRONTEND_DAI_MULTIMEDIA17, 1, 0, msm_routing_get_audio_mixer,
+       msm_routing_put_audio_mixer),
+       SOC_SINGLE_EXT("MultiMedia18", MSM_BACKEND_DAI_SECONDARY_MI2S_RX,
+       MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,
+       msm_routing_put_audio_mixer),
+       SOC_SINGLE_EXT("MultiMedia19", MSM_BACKEND_DAI_SECONDARY_MI2S_RX,
+       MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
+       msm_routing_put_audio_mixer),
  };
  
 -static const struct snd_kcontrol_new mi2s_hl_mixer_controls[] = {
 -      SOC_SINGLE_EXT("PRI_MI2S_TX", MSM_BACKEND_DAI_SECONDARY_MI2S_RX,
 -      MSM_BACKEND_DAI_PRI_MI2S_TX, 1, 0, msm_routing_get_port_mixer,
 -      msm_routing_put_port_mixer),
 -      SOC_SINGLE_EXT("INTERNAL_FM_TX", MSM_BACKEND_DAI_SECONDARY_MI2S_RX,
 -      MSM_BACKEND_DAI_INT_FM_TX, 1, 0, msm_routing_get_port_mixer,
 -      msm_routing_put_port_mixer),
 -};
 -
  static const struct snd_kcontrol_new primary_mi2s_rx_mixer_controls[] = {
        SOC_SINGLE_EXT("MultiMedia1", MSM_BACKEND_DAI_PRI_MI2S_RX ,
        MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer,

diff --cc sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.h
Simple merge