commit ad0f69680f5bb996cb1a3ed1ad38bbf2317c9999
author Laxminath Kasam <lkasam@codeaurora.org> Wed Dec 14 20:00:35 2016 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Mar 31 03:32:13 2017 -0700
tree 29ae534fb2b6afe8285e36872091e86151dc66a3
parent e68e94fd2e66b8c10efb2fd3b91942f5b2bb691f

ASoC: msm: migrate to cdc pinctrl functions

For audio pinctrl settings in internal codec,
use cdc pinctrl functions to activate and
suspend gpios.

Change-Id: Ib0de01379a02636d35b49770aa82ea53de7c2768
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>

sound/soc/msm/msmfalcon-common.c

diff --git a/sound/soc/msm/msmfalcon-common.c b/sound/soc/msm/msmfalcon-common.c
index 4b49656..56452d4 100644
--- a/sound/soc/msm/msmfalcon-common.c
+++ b/sound/soc/msm/msmfalcon-common.c
@@ -16,7 +16,6 @@
 #include <sound/pcm_params.h>
 #include <sound/q6afe-v2.h>
 #include "qdsp6v2/msm-pcm-routing-v2.h"
-#include "msm-audio-pinctrl.h"
 #include "msmfalcon-common.h"
 #include "msmfalcon-internal.h"
 #include "msmfalcon-external.h"
@@ -2316,7 +2315,7 @@
 			dai_link[i].codec_of_node = phandle;
 			dai_link[i].codec_name = NULL;
 		}
-		if (pdata->int_codec) {
+		if (pdata->snd_card_val == INT_SND_CARD) {
 			if ((dai_link[i].be_id ==
 					MSM_BACKEND_DAI_INT0_MI2S_RX) ||
 			    (dai_link[i].be_id ==
@@ -2720,13 +2719,16 @@
 
 	if (pdata->snd_card_val == INT_SND_CARD) {
 		/*reading the gpio configurations from dtsi file*/
-		ret = msm_gpioset_initialize(CLIENT_WCD, &pdev->dev);
-		if (ret < 0) {
-			dev_err(&pdev->dev,
-				"%s: error reading dtsi files%d\n",
-				__func__, ret);
-			goto err;
-		}
+		pdata->pdm_gpio_p = of_parse_phandle(pdev->dev.of_node,
+					"qcom,cdc-pdm-gpios", 0);
+		pdata->comp_gpio_p = of_parse_phandle(pdev->dev.of_node,
+					"qcom,cdc-comp-gpios", 0);
+		pdata->sdw_gpio_p = of_parse_phandle(pdev->dev.of_node,
+					"qcom,cdc-sdw-gpios", 0);
+		pdata->dmic_gpio_p = of_parse_phandle(pdev->dev.of_node,
+					"qcom,cdc-dmic-gpios", 0);
+		pdata->ext_spk_gpio_p = of_parse_phandle(pdev->dev.of_node,
+					"qcom,cdc-ext-spk-gpios", 0);
 	}
 
 	/*