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

Commit e3fdedaa authored by Laxminath Kasam's avatar Laxminath Kasam
Browse files

ASoC: msm: add dailinks for hdmi support on 8937 



Add dailink for hdmi audio playback support using
dba over quinary interface.

Change-Id: Idad58bd54ff40b67c677fd3b9fd48bcbe8b554f2
Signed-off-by: default avatarLaxminath Kasam <lkasam@codeaurora.org>
parent a89ddcbd

sound/soc/msm/msm8952-dai-links.c

+40 −4
Original line number Diff line number Diff line
@@ -1233,6 +1233,26 @@ static struct snd_soc_dai_link msm8952_common_be_dai[] = { 
		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.ignore_suspend = 1,

	},

};



static struct snd_soc_dai_link msm8952_hdmi_dba_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",

		.no_pcm = 1,

		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_QUINARY_MI2S_RX,

		.be_hw_params_fixup = msm_quin_be_hw_params_fixup,

		.ops = &msm8952_quin_mi2s_be_ops,

		.ignore_pmdown_time = 1, /* dai link has playback support */

		.ignore_suspend = 1,

	},

};

static struct snd_soc_dai_link msm8952_quin_dai_link[] = {

	{

		.name = LPASS_BE_QUIN_MI2S_RX,

		.stream_name = "Quinary MI2S Playback",
@@ -1262,13 +1282,15 @@ static struct snd_soc_dai_link msm8952_tomtom_dai_links[ 
ARRAY_SIZE(msm8952_common_fe_dai) +

ARRAY_SIZE(msm8952_tomtom_fe_dai) +

ARRAY_SIZE(msm8952_common_be_dai) +

ARRAY_SIZE(msm8952_tomtom_be_dai)];

ARRAY_SIZE(msm8952_tomtom_be_dai) +

ARRAY_SIZE(msm8952_quin_dai_link)];



static struct snd_soc_dai_link msm8952_tasha_dai_links[

ARRAY_SIZE(msm8952_common_fe_dai) +

ARRAY_SIZE(msm8952_tasha_fe_dai) +

ARRAY_SIZE(msm8952_common_be_dai) +

ARRAY_SIZE(msm8952_tasha_be_dai)];

ARRAY_SIZE(msm8952_tasha_be_dai) +

ARRAY_SIZE(msm8952_hdmi_dba_dai_link)];



int msm8952_init_wsa_dev(struct platform_device *pdev,

			struct snd_soc_card *card)
@@ -1437,7 +1459,7 @@ 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;

	int num_links, ret, len1, len2, len3, len4;

	enum codec_variant codec_ver = 0;

	const char *tasha_lite = "msm8952-tashalite-snd-card";
@@ -1485,9 +1507,23 @@ struct snd_soc_card *populate_snd_card_dailinks(struct device *dev) 
		memcpy(msm8952_tasha_dai_links + len3,

			msm8952_tasha_be_dai, sizeof(msm8952_tasha_be_dai));

		msm8952_dai_links = msm8952_tasha_dai_links;

		len4 = len3 + ARRAY_SIZE(msm8952_tasha_be_dai);

	}

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

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

				__func__);

		memcpy(msm8952_dai_links + len4, msm8952_hdmi_dba_dai_link,

			sizeof(msm8952_hdmi_dba_dai_link));

		len4 += ARRAY_SIZE(msm8952_hdmi_dba_dai_link);

	} else {

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

				__func__);

		memcpy(msm8952_dai_links + len4, msm8952_quin_dai_link,

			sizeof(msm8952_quin_dai_link));

		len4 += ARRAY_SIZE(msm8952_quin_dai_link);

	}

	card->dai_link = msm8952_dai_links;

	card->num_links = num_links;

	card->num_links = len4;

	card->dev = dev;



	return card;

sound/soc/msm/msm8952-slimbus.c

+50 −31
Original line number Diff line number Diff line
@@ -256,23 +256,21 @@ static void *def_codec_mbhc_cal(void) 
	return codec_cal;

}



static struct afe_clk_cfg mi2s_rx_clk = {

static struct afe_clk_set mi2s_tx_clk = {

	AFE_API_VERSION_I2S_CONFIG,

	Q6AFE_LPASS_CLK_ID_TER_MI2S_IBIT,

	Q6AFE_LPASS_IBIT_CLK_1_P536_MHZ,

	Q6AFE_LPASS_OSR_CLK_12_P288_MHZ,

	Q6AFE_LPASS_CLK_SRC_INTERNAL,

	Q6AFE_LPASS_CLK_ATTRIBUTE_COUPLE_NO,

	Q6AFE_LPASS_CLK_ROOT_DEFAULT,

	Q6AFE_LPASS_MODE_BOTH_VALID,

	0,

};



static struct afe_clk_cfg mi2s_tx_clk = {

static struct afe_clk_set mi2s_rx_clk = {

	AFE_API_VERSION_I2S_CONFIG,

	Q6AFE_LPASS_CLK_ID_PRI_MI2S_IBIT,

	Q6AFE_LPASS_IBIT_CLK_1_P536_MHZ,

	Q6AFE_LPASS_OSR_CLK_12_P288_MHZ,

	Q6AFE_LPASS_CLK_SRC_INTERNAL,

	Q6AFE_LPASS_CLK_ATTRIBUTE_COUPLE_NO,

	Q6AFE_LPASS_CLK_ROOT_DEFAULT,

	Q6AFE_LPASS_MODE_BOTH_VALID,

	0,

};
@@ -1453,18 +1451,25 @@ static int quat_mi2s_clk_ctl(struct snd_pcm_substream *substream, bool enable) 


	if (enable) {

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {

			mi2s_rx_clk.enable = enable;

			mi2s_rx_clk.clk_id =

				Q6AFE_LPASS_CLK_ID_QUAD_MI2S_IBIT;

			if (mi2s_rx_bit_format == SNDRV_PCM_FORMAT_S24_LE)

				mi2s_rx_clk.clk_val1 =

				mi2s_rx_clk.clk_freq_in_hz =

					Q6AFE_LPASS_IBIT_CLK_3_P072_MHZ;

			else

				mi2s_rx_clk.clk_val1 =

				mi2s_rx_clk.clk_freq_in_hz =

					Q6AFE_LPASS_IBIT_CLK_1_P536_MHZ;

			ret = afe_set_lpass_clock(

			ret = afe_set_lpass_clock_v2(

					AFE_PORT_ID_QUATERNARY_MI2S_RX,

					&mi2s_rx_clk);

		} else if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {

			mi2s_tx_clk.clk_val1 = Q6AFE_LPASS_IBIT_CLK_1_P536_MHZ;

			ret = afe_set_lpass_clock(

			mi2s_tx_clk.enable = enable;

			mi2s_tx_clk.clk_id =

				Q6AFE_LPASS_CLK_ID_QUAD_MI2S_IBIT;

			mi2s_tx_clk.clk_freq_in_hz =

					Q6AFE_LPASS_IBIT_CLK_1_P536_MHZ;

			ret = afe_set_lpass_clock_v2(

					AFE_PORT_ID_QUATERNARY_MI2S_TX,

					&mi2s_tx_clk);

		} else {
@@ -1476,13 +1481,17 @@ static int quat_mi2s_clk_ctl(struct snd_pcm_substream *substream, bool enable) 
					__func__, ret);

	} else {

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {

			mi2s_rx_clk.clk_val1 = Q6AFE_LPASS_IBIT_CLK_DISABLE;

			ret = afe_set_lpass_clock(

			mi2s_rx_clk.enable = enable;

			mi2s_rx_clk.clk_id =

				Q6AFE_LPASS_CLK_ID_QUAD_MI2S_IBIT;

			ret = afe_set_lpass_clock_v2(

					AFE_PORT_ID_QUATERNARY_MI2S_RX,

					&mi2s_rx_clk);

		} else if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {

			mi2s_tx_clk.clk_val1 = Q6AFE_LPASS_IBIT_CLK_DISABLE;

			ret = afe_set_lpass_clock(

			mi2s_tx_clk.enable = enable;

			mi2s_tx_clk.clk_id =

				Q6AFE_LPASS_CLK_ID_QUAD_MI2S_IBIT;

			ret = afe_set_lpass_clock_v2(

					AFE_PORT_ID_QUATERNARY_MI2S_TX,

					&mi2s_tx_clk);

		} else
@@ -1502,18 +1511,25 @@ static int quin_mi2s_sclk_ctl(struct snd_pcm_substream *substream, bool enable) 


	if (enable) {

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {

			mi2s_rx_clk.enable = enable;

			mi2s_rx_clk.clk_id =

				Q6AFE_LPASS_CLK_ID_QUI_MI2S_IBIT;

			if (mi2s_rx_bit_format == SNDRV_PCM_FORMAT_S24_LE)

				mi2s_rx_clk.clk_val1 =

				mi2s_rx_clk.clk_freq_in_hz =

					Q6AFE_LPASS_IBIT_CLK_3_P072_MHZ;

			else

				mi2s_rx_clk.clk_val1 =

				mi2s_rx_clk.clk_freq_in_hz =

					Q6AFE_LPASS_IBIT_CLK_1_P536_MHZ;

			ret = afe_set_lpass_clock(

			ret = afe_set_lpass_clock_v2(

					AFE_PORT_ID_QUINARY_MI2S_RX,

					&mi2s_rx_clk);

		} else if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {

			mi2s_tx_clk.clk_val1 = Q6AFE_LPASS_IBIT_CLK_1_P536_MHZ;

			ret = afe_set_lpass_clock(

			mi2s_tx_clk.enable = enable;

			mi2s_tx_clk.clk_id =

				Q6AFE_LPASS_CLK_ID_QUI_MI2S_IBIT;

			mi2s_tx_clk.clk_freq_in_hz =

				Q6AFE_LPASS_IBIT_CLK_1_P536_MHZ;

			ret = afe_set_lpass_clock_v2(

					AFE_PORT_ID_QUINARY_MI2S_TX,

					&mi2s_tx_clk);

		} else {
@@ -1522,16 +1538,19 @@ static int quin_mi2s_sclk_ctl(struct snd_pcm_substream *substream, bool enable) 


		if (ret < 0)

			pr_err("%s:afe_set_lpass_clock failed\n", __func__);



	} else {

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {

			mi2s_rx_clk.clk_val1 = Q6AFE_LPASS_IBIT_CLK_DISABLE;

			ret = afe_set_lpass_clock(

			mi2s_rx_clk.enable = enable;

			mi2s_rx_clk.clk_id =

				Q6AFE_LPASS_CLK_ID_QUI_MI2S_IBIT;

			ret = afe_set_lpass_clock_v2(

					AFE_PORT_ID_QUINARY_MI2S_RX,

					&mi2s_rx_clk);

		} else if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {

			mi2s_tx_clk.clk_val1 = Q6AFE_LPASS_IBIT_CLK_DISABLE;

			ret = afe_set_lpass_clock(

			mi2s_tx_clk.enable = enable;

			mi2s_tx_clk.clk_id =

				Q6AFE_LPASS_CLK_ID_QUI_MI2S_IBIT;

			ret = afe_set_lpass_clock_v2(

					AFE_PORT_ID_QUINARY_MI2S_TX,

					&mi2s_tx_clk);

		} else

sound/soc/msm/msm8952.c

+62 −9
Original line number Diff line number Diff line
@@ -2379,14 +2379,31 @@ static struct snd_soc_dai_link msm8952_dai[] = { 
		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.ignore_suspend = 1,

	},



	{

		.name = LPASS_BE_QUIN_MI2S_RX,

		.stream_name = "Quinary MI2S Playback",

		.name = LPASS_BE_QUIN_MI2S_TX,

		.stream_name = "Quinary MI2S Capture",

		.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",

		.no_pcm = 1,

		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_QUINARY_MI2S_TX,

		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.ops = &msm8952_quin_mi2s_be_ops,

		.ignore_suspend = 1,

	},

};

static struct snd_soc_dai_link msm8952_hdmi_dba_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",

		.no_pcm = 1,

		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_QUINARY_MI2S_RX,

		.be_hw_params_fixup = msm_be_hw_params_fixup,
@@ -2394,22 +2411,30 @@ static struct snd_soc_dai_link msm8952_dai[] = { 
		.ignore_pmdown_time = 1, /* dai link has playback support */

		.ignore_suspend = 1,

	},

};



static struct snd_soc_dai_link msm8952_quin_dai_link[] = {

	{

		.name = LPASS_BE_QUIN_MI2S_TX,

		.stream_name = "Quinary MI2S Capture",

		.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",

		.no_pcm = 1,

		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_QUINARY_MI2S_TX,

		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_QUINARY_MI2S_RX,

		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.ops = &msm8952_quin_mi2s_be_ops,

		.ignore_pmdown_time = 1, /* dai link has playback support */

		.ignore_suspend = 1,

	},

};



static struct snd_soc_dai_link msm8952_dai_links[

ARRAY_SIZE(msm8952_dai) +

ARRAY_SIZE(msm8952_hdmi_dba_dai_link)];



static int msm8952_wsa881x_init(struct snd_soc_component *component)

{

	return 0;
@@ -2677,6 +2702,36 @@ int msm8952_init_wsa_switch_supply(struct platform_device *pdev, 
	return ret;

}



static struct snd_soc_card *msm8952_populate_sndcard_dailinks(

						struct device *dev)

{

	struct snd_soc_card *card = &bear_card;

	struct snd_soc_dai_link *dailink;

	int len1;



	card->name = dev_name(dev);

	len1 = ARRAY_SIZE(msm8952_dai);

	memcpy(msm8952_dai_links, msm8952_dai, sizeof(msm8952_dai));

	dailink = msm8952_dai_links;

	if (of_property_read_bool(dev->of_node,

				"qcom,hdmi-dba-codec-rx")) {

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

				__func__);

		memcpy(dailink + len1, msm8952_hdmi_dba_dai_link,

				sizeof(msm8952_hdmi_dba_dai_link));

		len1 += ARRAY_SIZE(msm8952_hdmi_dba_dai_link);

	} else {

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

				__func__);

		memcpy(dailink + len1, msm8952_quin_dai_link,

				sizeof(msm8952_quin_dai_link));

		len1 += ARRAY_SIZE(msm8952_quin_dai_link);

	}

	card->dai_link = dailink;

	card->num_links = len1;

	return card;

}



static int msm8952_asoc_machine_probe(struct platform_device *pdev)

{

	struct snd_soc_card *card;
@@ -2852,9 +2907,7 @@ static int msm8952_asoc_machine_probe(struct platform_device *pdev) 
		}

	}



	card = &bear_card;

	bear_card.name = dev_name(&pdev->dev);

	card = &bear_card;

	card = msm8952_populate_sndcard_dailinks(&pdev->dev);

	dev_info(&pdev->dev, "default codec configured\n");

	num_strings = of_property_count_strings(pdev->dev.of_node,

			ext_pa);