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

Commit 3ca4cb7d authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: add slot offset for QUAT and QUIN TDM"

parents 8ee9beda 51181d07

asoc/sa6155.c

+37 −7
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ static unsigned int tdm_rx_slot_offset 
		{0xFFFF}, /* not used */

	},

	{/* QUAT TDM */

		{0xFFFF}, /* not used */

		{0, 4, 8, 12, 16, 20, 24, 28, 0xFFFF},/*AMP OUT*/

		{0xFFFF}, /* not used */

		{0xFFFF}, /* not used */

		{0xFFFF}, /* not used */
@@ -420,10 +420,10 @@ static unsigned int tdm_rx_slot_offset 
		{0xFFFF}, /* not used */

	},

	{/* QUIN TDM */

		{0xFFFF}, /* not used */

		{0xFFFF}, /* not used */

		{0xFFFF}, /* not used */

		{0xFFFF}, /* not used */

		{0, 4, 0xFFFF}, /* not used */

		{8, 12, 0xFFFF}, /* not used */

		{16, 20, 0xFFFF}, /* not used */

		{24, 28, 0xFFFF}, /* not used */

		{0xFFFF}, /* not used */

		{0xFFFF}, /* not used */

		{0xFFFF}, /* not used */
@@ -464,7 +464,8 @@ static unsigned int tdm_tx_slot_offset 
		{0xFFFF}, /* not used */

	},

	{/* QUAT TDM */

		{0xFFFF}, /* not used */

		{0, 4, 8, 12, 16, 20, 24, 28,

                32, 36, 40, 44, 48, 52, 56, 60, 0xFFFF},/*MIC ARR*/

		{0xFFFF}, /* not used */

		{0xFFFF}, /* not used */

		{0xFFFF}, /* not used */
@@ -474,7 +475,7 @@ static unsigned int tdm_tx_slot_offset 
		{0xFFFF}, /* not used */

	},

	{/* QUIN TDM */

		{0xFFFF}, /* not used */

		{0, 4, 8, 12, 16, 20, 0xFFFF}, /* not used */

		{0xFFFF}, /* not used */

		{0xFFFF}, /* not used */

		{0xFFFF}, /* not used */
@@ -5987,6 +5988,35 @@ static struct snd_soc_dai_link msm_common_be_dai_links[] = { 
		.ops = &sa6155_tdm_be_ops,

		.ignore_suspend = 1,

	},

	{

		.name = LPASS_BE_QUIN_TDM_RX_0,

		.stream_name = "Quinary TDM0 Playback",

		.cpu_dai_name = "msm-dai-q6-tdm.36928",

		.platform_name = "msm-pcm-routing",

		.codec_name = "msm-stub-codec.1",

		.codec_dai_name = "msm-stub-rx",

		.no_pcm = 1,

		.dpcm_playback = 1,

		.id = MSM_BACKEND_DAI_QUIN_TDM_RX_0,

		.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,

		.ops = &sa6155_tdm_be_ops,

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

	},

	{

		.name = LPASS_BE_QUIN_TDM_TX_0,

		.stream_name = "Quinary TDM0 Capture",

		.cpu_dai_name = "msm-dai-q6-tdm.36929",

		.platform_name = "msm-pcm-routing",

		.codec_name = "msm-stub-codec.1",

		.codec_dai_name = "msm-stub-tx",

		.no_pcm = 1,

		.dpcm_capture = 1,

		.id = MSM_BACKEND_DAI_QUIN_TDM_TX_0,

		.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,

		.ops = &sa6155_tdm_be_ops,

		.ignore_suspend = 1,

	},

};



static struct snd_soc_dai_link msm_auto_be_dai_links[] = {