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

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

Merge "ASoC: msm: update quin tdm slot for single lane"

parents 7f2fb6f8 7ca2abd7

asoc/sa6155.c

+2 −3
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ static struct dev_config tdm_tx_cfg[TDM_INTERFACE_MAX][TDM_PORT_MAX] = { 
		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 1}, /* TX_7 */

	},

	{ /* QUAT TDM */

		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 16}, /* TX_0 */

		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 8}, /* TX_0 */

		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 1}, /* TX_1 */

		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 1}, /* TX_2 */

		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 1}, /* TX_3 */
@@ -460,8 +460,7 @@ static unsigned int tdm_tx_slot_offset 
		{28, 0xFFFF},

	},

	{/* QUAT TDM */

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

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

		{0, 8, 16, 24, 4, 12, 20, 28, 0xFFFF}, /*8 CH MIC ARR*/

		{0xFFFF}, /* not used */

		{0xFFFF}, /* not used */

		{0xFFFF}, /* not used */

asoc/sa8155.c

+6 −8
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static struct dev_config tdm_tx_cfg[TDM_INTERFACE_MAX][TDM_PORT_MAX] = { 
		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 1}, /* TX_7 */

	},

	{ /* QUAT TDM */

		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 16}, /* TX_0 */

		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 8}, /* TX_0 */

		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 1}, /* TX_1 */

		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 1}, /* TX_2 */

		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 1}, /* TX_3 */
@@ -269,7 +269,7 @@ static struct dev_config tdm_tx_cfg[TDM_INTERFACE_MAX][TDM_PORT_MAX] = { 
		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 1}, /* TX_7 */

	},

	{ /* QUIN TDM */

		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 16}, /* TX_0 */

		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 8}, /* TX_0 */

		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 1}, /* TX_1 */

		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 1}, /* TX_2 */

		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 1}, /* TX_3 */
@@ -418,8 +418,8 @@ static unsigned int tdm_rx_slot_offset 
		{60,0xFFFF},

	},

	{/* QUIN TDM */

		{0, 8, 16, 24, 32, 40, 48, 56,

			4, 12, 20, 28, 36, 44, 52, 60, 0xFFFF}, /*16 CH SPKR*/

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

			32, 36, 40, 44, 48, 52, 56, 60, 0xFFFF}, /*16 CH SPKR*/

		{0xFFFF}, /* not used */

		{0xFFFF}, /* not used */

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

	},

	{/* QUAT TDM */

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

			32, 36, 40, 44, 48, 52, 56, 60, 0xFFFF},/*16 CH MIC ARR1*/

		{0, 8, 16, 24, 4, 12, 20, 28, 0xFFFF}, /*8 CH MIC ARR1*/

		{0xFFFF}, /* not used */

		{0xFFFF}, /* not used */

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

	},

	{/* QUIN TDM */

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

			32, 36, 40, 44, 48, 52, 56, 60, 0xFFFF},/*16 CH MIC ARR2*/

		{0, 4, 8, 12, 16, 20, 24, 28, 0xFFFF}, /*8 CH MIC ARR2*/

		{0xFFFF}, /* not used */

		{0xFFFF}, /* not used */

		{0xFFFF}, /* not used */