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

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

Merge "asoc: Add asm loopback MultiMedia24 and MultiMedia25"

parents c4833618 d35af03d

asoc/msm-dai-fe.c

+66 −0
Original line number Diff line number Diff line
@@ -2757,6 +2757,72 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
		.name = "MultiMedia23",

		.probe = fe_dai_probe,

	},

	{

		.playback = {

			.stream_name = "MultiMedia24 Playback",

			.aif_name = "MM_DL24",

			.rates = (SNDRV_PCM_RATE_8000_384000 |

					SNDRV_PCM_RATE_KNOT),

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min = 8000,

			.rate_max = 384000,

		},

		.capture = {

			.stream_name = "MultiMedia24 Capture",

			.aif_name = "MM_UL24",

			.rates = (SNDRV_PCM_RATE_8000_48000|

					SNDRV_PCM_RATE_KNOT),

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,

			.rate_max =     48000,

		},

		.ops = &msm_fe_Multimedia_dai_ops,

		.name = "MultiMedia24",

		.probe = fe_dai_probe,

	},

	{

		.playback = {

			.stream_name = "MultiMedia25 Playback",

			.aif_name = "MM_DL25",

			.rates = (SNDRV_PCM_RATE_8000_384000 |

					SNDRV_PCM_RATE_KNOT),

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min = 8000,

			.rate_max = 384000,

		},

		.capture = {

			.stream_name = "MultiMedia25 Capture",

			.aif_name = "MM_UL25",

			.rates = (SNDRV_PCM_RATE_8000_48000|

					SNDRV_PCM_RATE_KNOT),

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,

			.rate_max =     48000,

		},

		.ops = &msm_fe_Multimedia_dai_ops,

		.name = "MultiMedia25",

		.probe = fe_dai_probe,

	},

	{

		.playback = {

			.stream_name = "MultiMedia26 Playback",

asoc/msm-pcm-routing-v2.c

+484 −0

File changed.

Preview size limit exceeded, changes collapsed.

asoc/msm-pcm-routing-v2.h

+2 −0
Original line number Diff line number Diff line
@@ -261,6 +261,8 @@ enum { 
	MSM_FRONTEND_DAI_MULTIMEDIA21,

	MSM_FRONTEND_DAI_MULTIMEDIA22,

	MSM_FRONTEND_DAI_MULTIMEDIA23,

	MSM_FRONTEND_DAI_MULTIMEDIA24,

	MSM_FRONTEND_DAI_MULTIMEDIA25,

	MSM_FRONTEND_DAI_MULTIMEDIA26,

	MSM_FRONTEND_DAI_MULTIMEDIA27,

	MSM_FRONTEND_DAI_MULTIMEDIA28,

asoc/sa8155.c

+61 −27
Original line number Diff line number Diff line
@@ -174,14 +174,14 @@ struct tdm_conf { 
/* TDM default config */

static struct dev_config tdm_rx_cfg[TDM_INTERFACE_MAX][TDM_PORT_MAX] = {

	{ /* PRI TDM */

		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 2}, /* RX_0 */

		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 2}, /* RX_1 */

		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 2}, /* RX_2 */

		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 2}, /* RX_3 */

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

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

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

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

		{SAMPLING_RATE_8KHZ, SNDRV_PCM_FORMAT_S16_LE, 1}, /* RX_0 */

		{SAMPLING_RATE_8KHZ, SNDRV_PCM_FORMAT_S16_LE, 1}, /* RX_1 */

		{SAMPLING_RATE_8KHZ, SNDRV_PCM_FORMAT_S16_LE, 2}, /* RX_2 */

		{SAMPLING_RATE_8KHZ, SNDRV_PCM_FORMAT_S16_LE, 2}, /* RX_3 */

		{SAMPLING_RATE_8KHZ, SNDRV_PCM_FORMAT_S16_LE, 1}, /* RX_4 */

		{SAMPLING_RATE_8KHZ, SNDRV_PCM_FORMAT_S16_LE, 1}, /* RX_5 */

		{SAMPLING_RATE_8KHZ, SNDRV_PCM_FORMAT_S16_LE, 1}, /* RX_6 */

		{SAMPLING_RATE_8KHZ, SNDRV_PCM_FORMAT_S16_LE, 1}, /* RX_7 */

	},

	{ /* SEC TDM */

		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 2}, /* RX_0 */
@@ -228,14 +228,14 @@ static struct dev_config tdm_rx_cfg[TDM_INTERFACE_MAX][TDM_PORT_MAX] = { 
/* TDM default config */

static struct dev_config tdm_tx_cfg[TDM_INTERFACE_MAX][TDM_PORT_MAX] = {

	{ /* PRI TDM */

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

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

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

		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 2}, /* TX_3 */

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

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

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

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

		{SAMPLING_RATE_8KHZ, SNDRV_PCM_FORMAT_S16_LE, 1}, /* TX_0 */

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

		{SAMPLING_RATE_8KHZ, SNDRV_PCM_FORMAT_S16_LE, 2}, /* TX_2 */

		{SAMPLING_RATE_8KHZ, SNDRV_PCM_FORMAT_S16_LE, 2}, /* TX_3 */

		{SAMPLING_RATE_8KHZ, SNDRV_PCM_FORMAT_S16_LE, 1}, /* TX_4 */

		{SAMPLING_RATE_8KHZ, SNDRV_PCM_FORMAT_S16_LE, 1}, /* TX_5 */

		{SAMPLING_RATE_8KHZ, SNDRV_PCM_FORMAT_S16_LE, 1}, /* TX_6 */

		{SAMPLING_RATE_8KHZ, SNDRV_PCM_FORMAT_S16_LE, 1}, /* TX_7 */

	},

	{ /* SEC TDM */

		{SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 6}, /* TX_0 */
@@ -343,7 +343,7 @@ struct tdm_slot_cfg { 


static struct tdm_slot_cfg tdm_slot[TDM_INTERFACE_MAX] = {

	/* PRI TDM */

	{32, 8},

	{16, 16},

	/* SEC TDM */

	{32, 8},

	/* TERT TDM */
@@ -377,11 +377,11 @@ static struct tdm_slot_cfg tdm_slot_custom[TDM_INTERFACE_MAX] = { 
static unsigned int tdm_rx_slot_offset

	[TDM_INTERFACE_MAX][TDM_PORT_MAX][TDM_SLOT_OFFSET_MAX] = {

	{/* PRI TDM */

		{0, 4, 0xFFFF},

		{8, 12, 0xFFFF},

		{16, 20, 0xFFFF},

		{24, 28, 0xFFFF},

		{0xFFFF}, /* not used */

		{0, 0xFFFF},

		{2, 0xFFFF},

		{4, 6, 0xFFFF},

		{8, 10, 0xFFFF},

		{12, 14, 0xFFFF},

		{0xFFFF}, /* not used */

		{0xFFFF}, /* not used */

		{0xFFFF}, /* not used */
@@ -432,11 +432,11 @@ static unsigned int tdm_rx_slot_offset 
static unsigned int tdm_tx_slot_offset

	[TDM_INTERFACE_MAX][TDM_PORT_MAX][TDM_SLOT_OFFSET_MAX] = {

	{/* PRI TDM */

		{0, 4, 0xFFFF},

		{8, 12, 0xFFFF},

		{16, 20, 0xFFFF},

		{24, 28, 0xFFFF},

		{0xFFFF}, /* not used */

		{0, 0xFFFF},

		{2, 0xFFFF},

		{4, 6, 0xFFFF},

		{8, 10, 0xFFFF},

		{12, 14, 0xFFFF},

		{0xFFFF}, /* not used */

		{0xFFFF}, /* not used */

		{0xFFFF}, /* not used */
@@ -5896,6 +5896,40 @@ static struct snd_soc_dai_link msm_auto_fe_dai_links[] = { 
		.ignore_pmdown_time = 1,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA23

	},

	{

		.name = MSM_DAILINK_NAME(Media24),

		.stream_name = "MultiMedia24",

		.cpu_dai_name = "MultiMedia24",

		.platform_name = "msm-pcm-loopback",

		.dynamic = 1,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			SND_SOC_DPCM_TRIGGER_POST},

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

		.codec_name = "snd-soc-dummy",

		.ignore_suspend = 1,

		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		.ignore_pmdown_time = 1,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA24

	},

	{

		.name = MSM_DAILINK_NAME(Media25),

		.stream_name = "MultiMedia25",

		.cpu_dai_name = "MultiMedia25",

		.platform_name = "msm-pcm-loopback",

		.dynamic = 1,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			SND_SOC_DPCM_TRIGGER_POST},

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

		.codec_name = "snd-soc-dummy",

		.ignore_suspend = 1,

		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		.ignore_pmdown_time = 1,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA25

	},

};



static struct snd_soc_dai_link msm_custom_fe_dai_links[] = {