Merge tag LA.UM.8.4.r1-04600-8x98.0 into 10

"LA.UM.8.4.r1-04600-8x98.0"

 Conflicts:
	drivers/android/binder.c
	fs/f2fs/super.c
	include/soc/qcom/qseecomi.h

diff --cc drivers/android/binder.c
Simple merge

diff --cc drivers/gpu/msm/adreno_dispatch.c
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c
Simple merge

diff --cc drivers/pci/host/pci-msm.c
Simple merge

diff --cc drivers/power/supply/qcom/battery.c
Simple merge

diff --cc fs/f2fs/super.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge

diff --cc sound/soc/msm/qdsp6v2/msm-pcm-q6-noirq.c
Simple merge

diff --cc sound/soc/msm/qdsp6v2/msm-pcm-q6-v2.c
Simple merge

diff --cc sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
index f35191d,ed3ee03..cf2e8a7
--- 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
@@@ -4118,77 -4081,94 +4119,99 @@@ static const struct snd_kcontrol_new vo
        SOC_DAPM_ENUM_EXT("VOC_EXT_EC MUX Mux", msm_route_ext_ec_ref_rx_enum[0],
                          msm_routing_ext_ec_get, msm_routing_ext_ec_put);
  
 +#ifdef CONFIG_MACH_XIAOMI_MSM8998
 +static const struct snd_kcontrol_new voip_ext_ec_mux =
 +      SOC_DAPM_ENUM_EXT("VOIP_EXT_EC MUX Mux", msm_route_ext_ec_ref_rx_enum[0],
 +                        msm_routing_ext_ec_get, msm_routing_ext_ec_put);
 +#endif
  
  static const struct snd_kcontrol_new pri_i2s_rx_mixer_controls[] = {
-       SOC_SINGLE_EXT("MultiMedia1", MSM_BACKEND_DAI_PRI_I2S_RX ,
+       SOC_DOUBLE_EXT("MultiMedia1", SND_SOC_NOPM,
+       MSM_BACKEND_DAI_PRI_I2S_RX,
        MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer,
        msm_routing_put_audio_mixer),
-       SOC_SINGLE_EXT("MultiMedia2", MSM_BACKEND_DAI_PRI_I2S_RX,
+       SOC_DOUBLE_EXT("MultiMedia2", SND_SOC_NOPM,
+       MSM_BACKEND_DAI_PRI_I2S_RX,
        MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer,
        msm_routing_put_audio_mixer),
-       SOC_SINGLE_EXT("MultiMedia3", MSM_BACKEND_DAI_PRI_I2S_RX,
+       SOC_DOUBLE_EXT("MultiMedia3", SND_SOC_NOPM,
+       MSM_BACKEND_DAI_PRI_I2S_RX,
        MSM_FRONTEND_DAI_MULTIMEDIA3, 1, 0, msm_routing_get_audio_mixer,
        msm_routing_put_audio_mixer),
-       SOC_SINGLE_EXT("MultiMedia4", MSM_BACKEND_DAI_PRI_I2S_RX,
+       SOC_DOUBLE_EXT("MultiMedia4", SND_SOC_NOPM,
+       MSM_BACKEND_DAI_PRI_I2S_RX,
        MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer,
        msm_routing_put_audio_mixer),
-       SOC_SINGLE_EXT("MultiMedia5", MSM_BACKEND_DAI_PRI_I2S_RX,
+       SOC_DOUBLE_EXT("MultiMedia5", SND_SOC_NOPM,
+       MSM_BACKEND_DAI_PRI_I2S_RX,
        MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,
        msm_routing_put_audio_mixer),
-       SOC_SINGLE_EXT("MultiMedia6", MSM_BACKEND_DAI_PRI_I2S_RX,
+       SOC_DOUBLE_EXT("MultiMedia6", SND_SOC_NOPM,
+       MSM_BACKEND_DAI_PRI_I2S_RX,
        MSM_FRONTEND_DAI_MULTIMEDIA6, 1, 0, msm_routing_get_audio_mixer,
        msm_routing_put_audio_mixer),
-       SOC_SINGLE_EXT("MultiMedia7", MSM_BACKEND_DAI_PRI_I2S_RX,
+       SOC_DOUBLE_EXT("MultiMedia7", SND_SOC_NOPM,
+       MSM_BACKEND_DAI_PRI_I2S_RX,
        MSM_FRONTEND_DAI_MULTIMEDIA7, 1, 0, msm_routing_get_audio_mixer,
        msm_routing_put_audio_mixer),
-       SOC_SINGLE_EXT("MultiMedia8", MSM_BACKEND_DAI_PRI_I2S_RX,
+       SOC_DOUBLE_EXT("MultiMedia8", SND_SOC_NOPM,
+       MSM_BACKEND_DAI_PRI_I2S_RX,
        MSM_FRONTEND_DAI_MULTIMEDIA8, 1, 0, msm_routing_get_audio_mixer,
        msm_routing_put_audio_mixer),
-       SOC_SINGLE_EXT("MultiMedia9", MSM_BACKEND_DAI_PRI_I2S_RX,
+       SOC_DOUBLE_EXT("MultiMedia9", SND_SOC_NOPM,
+       MSM_BACKEND_DAI_PRI_I2S_RX,
        MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,
        msm_routing_put_audio_mixer),
-       SOC_SINGLE_EXT("MultiMedia10", MSM_BACKEND_DAI_PRI_I2S_RX,
+       SOC_DOUBLE_EXT("MultiMedia10", SND_SOC_NOPM,
+       MSM_BACKEND_DAI_PRI_I2S_RX,
        MSM_FRONTEND_DAI_MULTIMEDIA10, 1, 0, msm_routing_get_audio_mixer,
        msm_routing_put_audio_mixer),
-       SOC_SINGLE_EXT("MultiMedia11", MSM_BACKEND_DAI_PRI_I2S_RX,
+       SOC_DOUBLE_EXT("MultiMedia11", SND_SOC_NOPM,
+       MSM_BACKEND_DAI_PRI_I2S_RX,
        MSM_FRONTEND_DAI_MULTIMEDIA11, 1, 0, msm_routing_get_audio_mixer,
        msm_routing_put_audio_mixer),
-       SOC_SINGLE_EXT("MultiMedia12", MSM_BACKEND_DAI_PRI_I2S_RX,
+       SOC_DOUBLE_EXT("MultiMedia12", SND_SOC_NOPM,
+       MSM_BACKEND_DAI_PRI_I2S_RX,
        MSM_FRONTEND_DAI_MULTIMEDIA12, 1, 0, msm_routing_get_audio_mixer,
        msm_routing_put_audio_mixer),
-       SOC_SINGLE_EXT("MultiMedia13", MSM_BACKEND_DAI_PRI_I2S_RX,
+       SOC_DOUBLE_EXT("MultiMedia13", SND_SOC_NOPM,
+       MSM_BACKEND_DAI_PRI_I2S_RX,
        MSM_FRONTEND_DAI_MULTIMEDIA13, 1, 0, msm_routing_get_audio_mixer,
        msm_routing_put_audio_mixer),
-       SOC_SINGLE_EXT("MultiMedia14", MSM_BACKEND_DAI_PRI_I2S_RX,
+       SOC_DOUBLE_EXT("MultiMedia14", SND_SOC_NOPM,
+       MSM_BACKEND_DAI_PRI_I2S_RX,
        MSM_FRONTEND_DAI_MULTIMEDIA14, 1, 0, msm_routing_get_audio_mixer,
        msm_routing_put_audio_mixer),
-       SOC_SINGLE_EXT("MultiMedia15", MSM_BACKEND_DAI_PRI_I2S_RX,
+       SOC_DOUBLE_EXT("MultiMedia15", SND_SOC_NOPM,
+       MSM_BACKEND_DAI_PRI_I2S_RX,
        MSM_FRONTEND_DAI_MULTIMEDIA15, 1, 0, msm_routing_get_audio_mixer,
        msm_routing_put_audio_mixer),
-       SOC_SINGLE_EXT("MultiMedia16", MSM_BACKEND_DAI_PRI_I2S_RX,
+       SOC_DOUBLE_EXT("MultiMedia16", SND_SOC_NOPM,
+       MSM_BACKEND_DAI_PRI_I2S_RX,
        MSM_FRONTEND_DAI_MULTIMEDIA16, 1, 0, msm_routing_get_audio_mixer,
        msm_routing_put_audio_mixer),
-       SOC_SINGLE_EXT("MultiMedia17", MSM_BACKEND_DAI_PRI_I2S_RX,
+       SOC_DOUBLE_EXT("MultiMedia17", SND_SOC_NOPM,
+       MSM_BACKEND_DAI_PRI_I2S_RX,
        MSM_FRONTEND_DAI_MULTIMEDIA17, 1, 0, msm_routing_get_audio_mixer,
        msm_routing_put_audio_mixer),
-       SOC_SINGLE_EXT("MultiMedia18", MSM_BACKEND_DAI_PRI_I2S_RX,
+       SOC_DOUBLE_EXT("MultiMedia18", SND_SOC_NOPM,
+       MSM_BACKEND_DAI_PRI_I2S_RX,
        MSM_FRONTEND_DAI_MULTIMEDIA18, 1, 0, msm_routing_get_audio_mixer,
        msm_routing_put_audio_mixer),
-       SOC_SINGLE_EXT("MultiMedia19", MSM_BACKEND_DAI_PRI_I2S_RX,
+       SOC_DOUBLE_EXT("MultiMedia19", SND_SOC_NOPM,
+       MSM_BACKEND_DAI_PRI_I2S_RX,
        MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
        msm_routing_put_audio_mixer),
-       SOC_SINGLE_EXT("MultiMedia26", MSM_BACKEND_DAI_PRI_I2S_RX,
+       SOC_DOUBLE_EXT("MultiMedia26", SND_SOC_NOPM,
+       MSM_BACKEND_DAI_PRI_I2S_RX,
        MSM_FRONTEND_DAI_MULTIMEDIA26, 1, 0, msm_routing_get_audio_mixer,
        msm_routing_put_audio_mixer),
-       SOC_SINGLE_EXT("MultiMedia28", MSM_BACKEND_DAI_PRI_I2S_RX,
+       SOC_DOUBLE_EXT("MultiMedia28", SND_SOC_NOPM,
+       MSM_BACKEND_DAI_PRI_I2S_RX,
        MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
        msm_routing_put_audio_mixer),
-       SOC_SINGLE_EXT("MultiMedia29", MSM_BACKEND_DAI_PRI_I2S_RX,
+       SOC_DOUBLE_EXT("MultiMedia29", SND_SOC_NOPM,
+       MSM_BACKEND_DAI_PRI_I2S_RX,
        MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
        msm_routing_put_audio_mixer),
  };