From d73230ca2ca1fa1c7d75b47e12b418ba91f3eb4c Mon Sep 17 00:00:00 2001
From: Shiv Maliyappanahalli <smaliyap@codeaurora.org>
Date: Thu, 14 Apr 2016 15:15:41 -0700
Subject: [PATCH] ASoC: msm: Enable APR over Glink on msmcobalt

Glink serves as a replacement of SMD. Add the support to
enable Glink on msmcobalt.

Change-Id: I49668889c6c983a3782f90b5871a69a8b12a2fba
Signed-off-by: Shiv Maliyappanahalli <smaliyap@codeaurora.org>
---
 drivers/soc/qcom/Kconfig | 22 +++++++++++++++++++++-
 sound/soc/msm/Kconfig    |  8 ++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig
index ba135e354ace..dde61db03ab7 100644
--- a/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig
@@ -495,10 +495,30 @@ config MSM_QDSP6_APRV3
 	  used by audio driver to configure QDSP6v2's
 	  ASM, ADM and AFE.
 
+config MSM_QDSP6_APRV2_GLINK
+	bool "Audio QDSP6 APRv2 over Glink support"
+	depends on MSM_GLINK
+	help
+	  Enable APRv2 IPC protocol support over
+	  Glink between application processor and
+	  QDSP6. APR is used by audio driver to
+	  configure QDSP6's ASM, ADM and AFE.
+
+config MSM_QDSP6_APRV3_GLINK
+	bool "Audio QDSP6 APRv3 over Glink support"
+	depends on MSM_GLINK
+	help
+	  Enable APRv3 IPC protocol support over
+	  Glink between application processor and
+	  QDSP6. APR is used by audio driver to
+	  configure QDSP6v2's ASM, ADM and AFE.
+
+
 config MSM_ADSP_LOADER
 	tristate "ADSP loader support"
 	select SND_SOC_MSM_APRV2_INTF
-	depends on MSM_QDSP6_APRV2 || MSM_QDSP6_APRV3
+	depends on MSM_QDSP6_APRV2 || MSM_QDSP6_APRV3 || \
+		MSM_QDSP6_APRV2_GLINK || MSM_QDSP6_APRV3_GLINK
 	help
 	  Enable ADSP image loader.
 	  The ADSP loader brings ADSP out of reset
diff --git a/sound/soc/msm/Kconfig b/sound/soc/msm/Kconfig
index e8fc5f622c3e..9ff235d11f8e 100644
--- a/sound/soc/msm/Kconfig
+++ b/sound/soc/msm/Kconfig
@@ -4,10 +4,10 @@ config SND_SOC_MSM_HOSTLESS_PCM
 	tristate
 
 config SND_SOC_MSM_QDSP6V2_INTF
-	bool "SoC Q6 audio driver for APQ8084"
-	depends on MSM_QDSP6_APRV2
+	bool "SoC Q6 audio driver for MSM/APQ"
+	depends on MSM_QDSP6_APRV2_GLINK
 	help
-	 To add support for SoC audio on APQ8084.
+	 To add support for SoC audio on MSM/APQ.
 	 This will enable all the platform specific
 	 interactions towards DSP. It includes asm,
 	 adm and afe interfaces on the DSP.
@@ -122,7 +122,7 @@ config SND_SOC_MSMCOBALT
 	select SND_SOC_MSM_STUB
 	select SND_SOC_MSM_HOSTLESS_PCM
 	select SND_DYNAMIC_MINORS
-	select MSM_QDSP6_APRV2
+	select MSM_QDSP6_APRV2_GLINK
 	select MSM_QDSP6V2_CODECS
 	select SND_SOC_WCD9335
 	select SND_SOC_WSA881X