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

Commit e0793545 authored by Kuirong Wang's avatar Kuirong Wang Committed by Gerrit - the friendly Code Review server
Browse files

ASoC: msm: add tertiary and quaternary audio PCM support 



Add support for tertiary and quaternary audio PCM interface
to msm platform.

Change-Id: I985200bbff55583ac09bf7444ecbc5cf6ab7eb41
Signed-off-by: default avatarKuirong Wang <kuirongw@codeaurora.org>
parent 9e2d528d

include/sound/apr_audio-v2.h

+10 −6
Original line number Diff line number Diff line
@@ -904,6 +904,10 @@ struct adm_cmd_connect_afe_port_v5 { 
#define AFE_PORT_ID_SECONDARY_PCM_TX        0x100D

#define AFE_PORT_ID_MULTICHAN_HDMI_RX       0x100E

#define AFE_PORT_ID_SECONDARY_MI2S_RX_SD1   0x1010

#define AFE_PORT_ID_TERTIARY_PCM_RX         0x1012

#define AFE_PORT_ID_TERTIARY_PCM_TX         0x1013

#define AFE_PORT_ID_QUATERNARY_PCM_RX       0x1014

#define AFE_PORT_ID_QUATERNARY_PCM_TX       0x1015

#define AFE_PORT_ID_QUINARY_MI2S_RX         0x1016

#define AFE_PORT_ID_QUINARY_MI2S_TX         0x1017

/* ID of the senary MI2S Rx port. */

include/sound/q6afe-v2.h

+4 −0
Original line number Diff line number Diff line
@@ -183,6 +183,10 @@ enum { 
	IDX_AFE_PORT_ID_USB_TX,

	/* IDX 124 */

	IDX_DISPLAY_PORT_RX,

	IDX_AFE_PORT_ID_TERTIARY_PCM_RX,

	IDX_AFE_PORT_ID_TERTIARY_PCM_TX,

	IDX_AFE_PORT_ID_QUATERNARY_PCM_RX,

	IDX_AFE_PORT_ID_QUATERNARY_PCM_TX,

	AFE_MAX_PORTS

};

sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c

+130 −27
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ 


#define MSM_DAI_PRI_AUXPCM_DT_DEV_ID 1

#define MSM_DAI_SEC_AUXPCM_DT_DEV_ID 2

#define MSM_DAI_TERT_AUXPCM_DT_DEV_ID 3

#define MSM_DAI_QUAT_AUXPCM_DT_DEV_ID 4





#define spdif_clock_value(rate) (2*rate*32*2)

#define CHANNEL_STATUS_SIZE 24
@@ -873,6 +876,22 @@ static int msm_dai_q6_auxpcm_prepare(struct snd_pcm_substream *substream, 
				aux_dai_data->clk_set.clk_id =

					Q6AFE_LPASS_CLK_ID_SEC_PCM_EBIT;

			break;

		case MSM_DAI_TERT_AUXPCM_DT_DEV_ID:

			if (pcm_clk_rate)

				aux_dai_data->clk_set.clk_id =

					Q6AFE_LPASS_CLK_ID_TER_PCM_IBIT;

			else

				aux_dai_data->clk_set.clk_id =

					Q6AFE_LPASS_CLK_ID_TER_PCM_EBIT;

			break;

		case MSM_DAI_QUAT_AUXPCM_DT_DEV_ID:

			if (pcm_clk_rate)

				aux_dai_data->clk_set.clk_id =

					Q6AFE_LPASS_CLK_ID_QUAD_PCM_IBIT;

			else

				aux_dai_data->clk_set.clk_id =

					Q6AFE_LPASS_CLK_ID_QUAD_PCM_EBIT;

			break;

		default:

			dev_err(dai->dev, "%s: AUXPCM id: %d not supported\n",

				__func__, dai->id);
@@ -1058,7 +1077,59 @@ static struct snd_soc_dai_driver msm_dai_q6_aux_pcm_dai[] = { 
		.ops = &msm_dai_q6_auxpcm_ops,

		.probe = msm_dai_q6_aux_pcm_probe,

		.remove = msm_dai_q6_dai_auxpcm_remove,

	}

	},

	{

		.playback = {

			.stream_name = "Tert AUX PCM Playback",

			.aif_name = "TERT_AUX_PCM_RX",

			.rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000),

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.channels_min = 1,

			.channels_max = 1,

			.rate_max = 16000,

			.rate_min = 8000,

		},

		.capture = {

			.stream_name = "Tert AUX PCM Capture",

			.aif_name = "TERT_AUX_PCM_TX",

			.rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000),

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.channels_min = 1,

			.channels_max = 1,

			.rate_max = 16000,

			.rate_min = 8000,

		},

		.id = MSM_DAI_TERT_AUXPCM_DT_DEV_ID,

		.ops = &msm_dai_q6_auxpcm_ops,

		.probe = msm_dai_q6_aux_pcm_probe,

		.remove = msm_dai_q6_dai_auxpcm_remove,

	},

	{

		.playback = {

			.stream_name = "Quat AUX PCM Playback",

			.aif_name = "QUAT_AUX_PCM_RX",

			.rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000),

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.channels_min = 1,

			.channels_max = 1,

			.rate_max = 16000,

			.rate_min = 8000,

		},

		.capture = {

			.stream_name = "Quat AUX PCM Capture",

			.aif_name = "QUAT_AUX_PCM_TX",

			.rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000),

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.channels_min = 1,

			.channels_max = 1,

			.rate_max = 16000,

			.rate_min = 8000,

		},

		.id = MSM_DAI_QUAT_AUXPCM_DT_DEV_ID,

		.ops = &msm_dai_q6_auxpcm_ops,

		.probe = msm_dai_q6_aux_pcm_probe,

		.remove = msm_dai_q6_dai_auxpcm_remove,

	},

};



static int msm_dai_q6_spdif_format_put(struct snd_kcontrol *kcontrol,
@@ -2723,16 +2794,26 @@ static int msm_auxpcm_dev_probe(struct platform_device *pdev) 
		goto fail_nodev_intf;

	}



	if (!strncmp(intf_name, "primary", sizeof("primary"))) {

	if (!strcmp(intf_name, "primary")) {

		dai_data->rx_pid = AFE_PORT_ID_PRIMARY_PCM_RX;

		dai_data->tx_pid = AFE_PORT_ID_PRIMARY_PCM_TX;

		pdev->id = MSM_DAI_PRI_AUXPCM_DT_DEV_ID;

		i = 0;

	} else if (!strncmp(intf_name, "secondary", sizeof("secondary"))) {

	} else if (!strcmp(intf_name, "secondary")) {

		dai_data->rx_pid = AFE_PORT_ID_SECONDARY_PCM_RX;

		dai_data->tx_pid = AFE_PORT_ID_SECONDARY_PCM_TX;

		pdev->id = MSM_DAI_SEC_AUXPCM_DT_DEV_ID;

		i = 1;

	} else if (!strcmp(intf_name, "tertiary")) {

		dai_data->rx_pid = AFE_PORT_ID_TERTIARY_PCM_RX;

		dai_data->tx_pid = AFE_PORT_ID_TERTIARY_PCM_TX;

		pdev->id = MSM_DAI_TERT_AUXPCM_DT_DEV_ID;

		i = 2;

	} else if (!strcmp(intf_name, "quaternary")) {

		dai_data->rx_pid = AFE_PORT_ID_QUATERNARY_PCM_RX;

		dai_data->tx_pid = AFE_PORT_ID_QUATERNARY_PCM_TX;

		pdev->id = MSM_DAI_QUAT_AUXPCM_DT_DEV_ID;

		i = 3;

	} else {

		dev_err(&pdev->dev, "%s: invalid DT intf name %s\n",

			__func__, intf_name);
@@ -3639,22 +3720,28 @@ static struct snd_soc_dai_driver msm_dai_q6_mi2s_dai[] = { 
		.playback = {

			.stream_name = "Primary MI2S Playback",

			.aif_name = "PRI_MI2S_RX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000,

			.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |

				 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |

				 SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |

				 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |

				 SNDRV_PCM_RATE_192000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE |

				SNDRV_PCM_FMTBIT_S24_LE |

				SNDRV_PCM_FMTBIT_S24_3LE,

			.rate_min =     8000,

			.rate_max =     48000,

			.rate_max =     192000,

		},

		.capture = {

			.stream_name = "Primary MI2S Capture",

			.aif_name = "PRI_MI2S_TX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000,

			.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |

				 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |

				 SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |

				 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |

				 SNDRV_PCM_RATE_192000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.rate_min =     8000,

			.rate_max =     48000,

			.rate_max =     192000,

		},

		.ops = &msm_dai_q6_mi2s_ops,

		.id = MSM_PRIM_MI2S,
@@ -3665,8 +3752,10 @@ static struct snd_soc_dai_driver msm_dai_q6_mi2s_dai[] = { 
		.playback = {

			.stream_name = "Secondary MI2S Playback",

			.aif_name = "SEC_MI2S_RX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |

			.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |

				 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |

				 SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |

				 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |

				 SNDRV_PCM_RATE_192000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.rate_min =     8000,
@@ -3675,11 +3764,14 @@ static struct snd_soc_dai_driver msm_dai_q6_mi2s_dai[] = { 
		.capture = {

			.stream_name = "Secondary MI2S Capture",

			.aif_name = "SEC_MI2S_TX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000,

			.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |

				 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |

				 SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |

				 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |

				 SNDRV_PCM_RATE_192000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.rate_min =     8000,

			.rate_max =     48000,

			.rate_max =     192000,

		},

		.ops = &msm_dai_q6_mi2s_ops,

		.id = MSM_SEC_MI2S,
@@ -3690,20 +3782,26 @@ static struct snd_soc_dai_driver msm_dai_q6_mi2s_dai[] = { 
		.playback = {

			.stream_name = "Tertiary MI2S Playback",

			.aif_name = "TERT_MI2S_RX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000,

			.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |

				 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |

				 SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |

				 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |

				 SNDRV_PCM_RATE_192000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.rate_min =     8000,

			.rate_max =     48000,

			.rate_max =     192000,

		},

		.capture = {

			.stream_name = "Tertiary MI2S Capture",

			.aif_name = "TERT_MI2S_TX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000,

			.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |

				 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |

				 SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |

				 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |

				 SNDRV_PCM_RATE_192000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.rate_min =     8000,

			.rate_max =     48000,

			.rate_max =     192000,

		},

		.ops = &msm_dai_q6_mi2s_ops,

		.id = MSM_TERT_MI2S,
@@ -3714,8 +3812,10 @@ static struct snd_soc_dai_driver msm_dai_q6_mi2s_dai[] = { 
		.playback = {

			.stream_name = "Quaternary MI2S Playback",

			.aif_name = "QUAT_MI2S_RX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |

			.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |

				 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |

				 SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |

				 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |

				 SNDRV_PCM_RATE_192000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.rate_min =     8000,
@@ -3724,11 +3824,14 @@ static struct snd_soc_dai_driver msm_dai_q6_mi2s_dai[] = { 
		.capture = {

			.stream_name = "Quaternary MI2S Capture",

			.aif_name = "QUAT_MI2S_TX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000,

			.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |

				 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |

				 SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |

				 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |

				 SNDRV_PCM_RATE_192000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.rate_min =     8000,

			.rate_max =     48000,

			.rate_max =     192000,

		},

		.ops = &msm_dai_q6_mi2s_ops,

		.id = MSM_QUAT_MI2S,

sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c

+436 −5

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.h

+8 −0
Original line number Diff line number Diff line
@@ -30,6 +30,10 @@ 
#define LPASS_BE_AUXPCM_TX "AUX_PCM_TX"

#define LPASS_BE_SEC_AUXPCM_RX "SEC_AUX_PCM_RX"

#define LPASS_BE_SEC_AUXPCM_TX "SEC_AUX_PCM_TX"

#define LPASS_BE_TERT_AUXPCM_RX "TERT_AUX_PCM_RX"

#define LPASS_BE_TERT_AUXPCM_TX "TERT_AUX_PCM_TX"

#define LPASS_BE_QUAT_AUXPCM_RX "QUAT_AUX_PCM_RX"

#define LPASS_BE_QUAT_AUXPCM_TX "QUAT_AUX_PCM_TX"

#define LPASS_BE_VOICE_PLAYBACK_TX "VOICE_PLAYBACK_TX"

#define LPASS_BE_VOICE2_PLAYBACK_TX "VOICE2_PLAYBACK_TX"

#define LPASS_BE_INCALL_RECORD_RX "INCALL_RECORD_RX"
@@ -313,6 +317,10 @@ enum { 
	MSM_BACKEND_DAI_USB_RX,

	MSM_BACKEND_DAI_USB_TX,

	MSM_BACKEND_DAI_DISPLAY_PORT_RX,

	MSM_BACKEND_DAI_TERT_AUXPCM_RX,

	MSM_BACKEND_DAI_TERT_AUXPCM_TX,

	MSM_BACKEND_DAI_QUAT_AUXPCM_RX,

	MSM_BACKEND_DAI_QUAT_AUXPCM_TX,

	MSM_BACKEND_DAI_MAX,

};