Merge "ASoC: msm: Add support for audio over Display Port for sdm660"

diff --cc sound/soc/msm/Kconfig
index 337fc15,9fb5035..eb650d1
--- 1/sound/soc/msm/Kconfig
--- 2/sound/soc/msm/Kconfig
+++ b/sound/soc/msm/Kconfig
@@@ -112,9 -122,10 +112,10 @@@ config SND_SOC_INT_CODE
        select MSM_CDC_PINCTRL
        select SND_SOC_MSM_SDW
        select SND_SOC_SDM660_CDC
+       select SND_SOC_MSM_HDMI_CODEC_RX
        select QTI_PP
        select DTS_SRS_TM
 -      select DOLBY_DS2
 +      select DOLBY_LICENSE
        select SND_HWDEP
        select MSM_ULTRASOUND
        select DTS_EAGLE

diff --cc sound/soc/msm/sdm660-common.c
Simple merge