commit e68e94fd2e66b8c10efb2fd3b91942f5b2bb691f
author Laxminath Kasam <lkasam@codeaurora.org> Fri Dec 09 12:08:00 2016 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Mar 31 03:32:09 2017 -0700
tree 47eb34daa13b0d427c5321e3980f10f7b75d4da9
parent 2d20bc9dfd00c71de2426e05127f7248138f947e

ASoC: codecs: Update internal codec as split codecs

Internal codec variant has digital codec in
MSM and analog codec in PMIC, add respective
split codecs support to register two separate codecs.
Add digital codec as a child to analog codec and
handle inter-dependencies like sequences, SSR,
version info.

Change-Id: I6ead859ed0ad5c926d439a3985a5c4904ff757b5
Signed-off-by: Divya Ojha <dojha@codeaurora.org>
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
Signed-off-by: Banajit Goswami <bgoswami@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 baf6a4f..4b49656 100644
--- a/sound/soc/msm/msmfalcon-common.c
+++ b/sound/soc/msm/msmfalcon-common.c
@@ -20,11 +20,14 @@
 #include "msmfalcon-common.h"
 #include "msmfalcon-internal.h"
 #include "msmfalcon-external.h"
-#include "../codecs/msm8x16/msm8x16-wcd.h"
+#include "../codecs/msmfalcon_cdc/msm-analog-cdc.h"
 #include "../codecs/wsa881x.h"
 
 #define DRV_NAME "msmfalcon-asoc-snd"
 
+#define MSM_INT_DIGITAL_CODEC "msm-dig-codec"
+#define PMIC_INT_ANALOG_CODEC "analog-codec"
+
 #define DEV_NAME_STR_LEN  32
 #define DEFAULT_MCLK_RATE 9600000
 
@@ -189,7 +192,7 @@
 	.detect_extn_cable = true,
 	.mono_stero_detection = false,
 	.swap_gnd_mic = NULL,
-	.hs_ext_micbias = false,
+	.hs_ext_micbias = true,
 	.key_code[0] = KEY_MEDIA,
 	.key_code[1] = KEY_VOICECOMMAND,
 	.key_code[2] = KEY_VOLUMEUP,
@@ -2233,6 +2236,7 @@
 }
 
 static int msm_populate_dai_link_component_of_node(
+		struct msm_asoc_mach_data *pdata,
 		struct snd_soc_card *card)
 {
 	int i, index, ret = 0;
@@ -2312,6 +2316,31 @@
 			dai_link[i].codec_of_node = phandle;
 			dai_link[i].codec_name = NULL;
 		}
+		if (pdata->int_codec) {
+			if ((dai_link[i].be_id ==
+					MSM_BACKEND_DAI_INT0_MI2S_RX) ||
+			    (dai_link[i].be_id ==
+					MSM_BACKEND_DAI_INT1_MI2S_RX) ||
+			    (dai_link[i].be_id ==
+					MSM_BACKEND_DAI_INT2_MI2S_TX) ||
+			    (dai_link[i].be_id ==
+					MSM_BACKEND_DAI_INT3_MI2S_TX)) {
+				index = of_property_match_string(cdev->of_node,
+							"asoc-codec-names",
+							MSM_INT_DIGITAL_CODEC);
+				phandle = of_parse_phandle(cdev->of_node,
+							   "asoc-codec",
+							   index);
+				dai_link[i].codecs[DIG_CDC].of_node = phandle;
+				index = of_property_match_string(cdev->of_node,
+							"asoc-codec-names",
+							PMIC_INT_ANALOG_CODEC);
+				phandle = of_parse_phandle(cdev->of_node,
+							   "asoc-codec",
+							   index);
+				dai_link[i].codecs[ANA_CDC].of_node = phandle;
+			}
+		}
 	}
 err:
 	return ret;
@@ -2730,7 +2759,7 @@
 	if (ret)
 		goto err;
 
-	ret = msm_populate_dai_link_component_of_node(card);
+	ret = msm_populate_dai_link_component_of_node(pdata, card);
 	if (ret) {
 		ret = -EPROBE_DEFER;
 		goto err;