Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ac8f3fe authored by jinjiawu's avatar jinjiawu Committed by Bharath
Browse files

Add audio drivers for FP3 [3/4] and [4/4] 

This is a squash and cleanup of the commits below. TODO for future
porting: Add FP3 logic to existing code, rather than replacing it.

Add audio drivers for FP3 [3/4]

For aw8898 codec.

Issue: FP3-A11#35
Change-Id: Id346f772c0aa28f5e252b02dfb81b20189410649
(cherry picked from commit d00244be2238c109d779bb9c83ce38a5970177ea)
(cherry picked from commit 70d0e74c7f51157109dff8461b61398e3c98397a)

Add Audio drivers for FP3 [4/4]

Configure dai_link for smart amp TAS2557.

Issue: FP3-A11#35
Change-Id: I4053051660b4943667e1300a10c52117f594dab8
(cherry picked from commit a0a2846ea9bf4aa6547dc26d20e7ab7a1668b3c5)
(cherry picked from commit b3071f313f1ddc9356b4ca9c49d3caf415d7c9e8)
(cherry picked from commit a290d61ec45354ff3502171cf87fb2473b461358)

Issue: FP3-A11#202
Change-Id: I66138fcce64f6f737eee0e05567121bed166fac9
parent f5473d22

techpack/audio/asoc/msm8952-dai-links.c

100644 → 100755
+60 −13
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 */



#include <linux/of.h>

#include <linux/gpio.h>

#include <sound/core.h>

#include <sound/soc.h>

#include <sound/soc-dapm.h>
@@ -21,6 +22,10 @@ 


#define DEV_NAME_STR_LEN            32



#define PSTAGE_0 97

#define PSTAGE_1 98

#define PSTAGE_2 99



/* dummy definition of below deprecated FE DAI's*/

enum {

	MSM_FRONTEND_DAI_CS_VOICE = 39,
@@ -1289,14 +1294,15 @@ static struct snd_soc_dai_link msm8952_common_be_dai[] = { 
	},

};



static struct snd_soc_dai_link msm8952_hdmi_dba_dai_link[] = {

static struct snd_soc_dai_link msm8952_quin_dai_link[] = {

	{

		.name = LPASS_BE_QUIN_MI2S_RX,

		.stream_name = "Quinary MI2S Playback",

		.cpu_dai_name = "msm-dai-q6-mi2s.5",

		.platform_name = "msm-pcm-routing",

		.codec_dai_name = "msm_hdmi_dba_codec_rx_dai",

		.codec_name = "msm-hdmi-dba-codec-rx",

		.codec_dai_name = "aw8898-aif",

		.codec_name = "aw8898_smartpa",

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS,

		.no_pcm = 1,

		.dpcm_playback = 1,

		.id = MSM_BACKEND_DAI_QUINARY_MI2S_RX,
@@ -1307,14 +1313,14 @@ static struct snd_soc_dai_link msm8952_hdmi_dba_dai_link[] = { 
	},

};



static struct snd_soc_dai_link msm8952_quin_dai_link[] = {

static struct snd_soc_dai_link msm8952_quin_dai_link_tas2557[] = {

	{

		.name = LPASS_BE_QUIN_MI2S_RX,

		.stream_name = "Quinary MI2S Playback",

		.cpu_dai_name = "msm-dai-q6-mi2s.5",

		.platform_name = "msm-pcm-routing",

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.codec_dai_name = "tas2557 ASI1",

		.codec_name = "tas2557.6-004c",

		.no_pcm = 1,

		.dpcm_playback = 1,

		.id = MSM_BACKEND_DAI_QUINARY_MI2S_RX,
@@ -1401,7 +1407,7 @@ ARRAY_SIZE(msm8952_tasha_fe_dai) + 
ARRAY_SIZE(msm8952_tdm_fe_dai) +

ARRAY_SIZE(msm8952_common_be_dai) +

ARRAY_SIZE(msm8952_tasha_be_dai) +

ARRAY_SIZE(msm8952_hdmi_dba_dai_link) +

ARRAY_SIZE(msm8952_quin_dai_link) +

ARRAY_SIZE(msm8952_tdm_be_dai_link)];



int msm8952_init_wsa_dev(struct platform_device *pdev,
@@ -1592,6 +1598,10 @@ struct snd_soc_card *populate_snd_card_dailinks(struct device *dev) 
	struct snd_soc_card *card = &snd_soc_card_msm_card;

	struct snd_soc_dai_link *msm8952_dai_links = NULL;

	int num_links, ret, len1, len2, len3, len4, len5 = 0;

	int pstage_0 = 0; //GPIO 97

	int pstage_1 = 0; //GPIO 98

	int pstage_2 = 0; //GPIO 99



	enum codec_variant codec_ver = 0;

	const char *tasha_lite[NUM_OF_TASHA_LITE_DEVICE] = {

		"msm8952-tashalite-snd-card",
@@ -1636,14 +1646,51 @@ struct snd_soc_card *populate_snd_card_dailinks(struct device *dev) 
			msm8952_tasha_be_dai, sizeof(msm8952_tasha_be_dai));

		msm8952_dai_links = msm8952_tasha_dai_links;

	}

	if (of_property_read_bool(dev->of_node, "qcom,hdmi-dba-codec-rx")) {

		dev_dbg(dev, "%s(): hdmi dba audio support present\n",



	//PSTAGE_0

	ret = gpio_request(PSTAGE_0,"PSTAGE_0 GPIO_97");



	if (ret<0) {

		printk("PSTAGE_0 failed to request \n");

	} else {

		gpio_direction_input(PSTAGE_0);

	}

	pstage_0 = gpio_get_value(PSTAGE_0);

	gpio_free(PSTAGE_0);



	//PSTAGE_1

	ret = gpio_request(PSTAGE_1,"PSTAGE_1 GPIO_98");



	if (ret<0) {

		printk("PSTAGE_1 failed to request \n");

	} else {

		gpio_direction_input(PSTAGE_1);

	}

	pstage_1 = gpio_get_value(PSTAGE_1);

	gpio_free(PSTAGE_1);



	//PSTAGE_2

	ret = gpio_request(PSTAGE_2,"PSTAGE_2 GPIO_99");



	if (ret<0) {

		printk("PSTAGE_2 failed to request \n");

	} else {

		gpio_direction_input(PSTAGE_2);

	}

	pstage_2 = gpio_get_value(PSTAGE_2);

	gpio_free(PSTAGE_2);



	if (pstage_2 == 1 && ((pstage_1 || pstage_0) == 1)) {

		//PCB Variant : 8903MP and newer variants (PCB Variant = HLH,HHL,HHH)



		dev_dbg(dev, "%s(): No aw8898 present, add quin dai for tas2257\n",

				__func__);

		memcpy(msm8952_dai_links + len5, msm8952_hdmi_dba_dai_link,

			sizeof(msm8952_hdmi_dba_dai_link));

		len5 += ARRAY_SIZE(msm8952_hdmi_dba_dai_link);

		memcpy(msm8952_dai_links + len5, msm8952_quin_dai_link_tas2557,

			sizeof(msm8952_quin_dai_link_tas2557));

		len5 += ARRAY_SIZE(msm8952_quin_dai_link_tas2557);

	} else {

		dev_dbg(dev, "%s(): No hdmi dba present, add quin dai\n",

		//PCB Variant : EP0 ~ 8901MP

		dev_dbg(dev, "%s(): No tas2257 present, add quin dai for aw8898\n",

				__func__);

		memcpy(msm8952_dai_links + len5, msm8952_quin_dai_link,

			sizeof(msm8952_quin_dai_link));

techpack/audio/asoc/msm8952-slimbus.c

100644 → 100755
+2 −2
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static void *def_tasha_mbhc_cal(void) 
		return NULL;



#define S(X, Y) ((WCD_MBHC_CAL_PLUG_TYPE_PTR(tasha_wcd_cal)->X) = (Y))

	S(v_hs_max, 1500);

	S(v_hs_max, 1600);

#undef S

#define S(X, Y) ((WCD_MBHC_CAL_BTN_DET_PTR(tasha_wcd_cal)->X) = (Y))

	S(num_btn, WCD_MBHC_DEF_BUTTONS);
@@ -200,7 +200,7 @@ static void *def_tasha_mbhc_cal(void) 
		(sizeof(btn_cfg->_v_btn_low[0]) * btn_cfg->num_btn);



	btn_high[0] = 75;

	btn_high[1] = 150;

	btn_high[1] = 125;

	btn_high[2] = 237;

	btn_high[3] = 450;

	btn_high[4] = 450;