Merge "ASoC: msm: Add HFP routing for SLIM-I2S bridge" (6214ba0f) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/msm/msm-dai-fe.c

+27 −0

Original line number	Diff line number	Diff line
		@@ -446,6 +446,33 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
		.name = "SLIMBUS1_HOSTLESS",
		.probe = fe_dai_probe,
		},
		{
		.playback = {
		.stream_name = "SLIMBUS2_HOSTLESS Playback",
		.aif_name = "SLIM2_DL_HL",
		.rates = SNDRV_PCM_RATE_8000_192000,
		.formats = (SNDRV_PCM_FMTBIT_S16_LE \|
		SNDRV_PCM_FMTBIT_S24_LE),
		.channels_min = 1,
		.channels_max = 2,
		.rate_min = 8000,
		.rate_max = 192000,
		},
		.capture = {
		.stream_name = "SLIMBUS2_HOSTLESS Capture",
		.aif_name = "SLIM2_UL_HL",
		.rates = SNDRV_PCM_RATE_8000_48000,
		.formats = (SNDRV_PCM_FMTBIT_S16_LE \|
		SNDRV_PCM_FMTBIT_S24_LE),
		.channels_min = 1,
		.channels_max = 2,
		.rate_min = 8000,
		.rate_max = 48000,
		},
		.ops = &msm_fe_dai_ops,
		.name = "SLIMBUS2_HOSTLESS",
		.probe = fe_dai_probe,
		},
		{
		.playback = {
		.stream_name = "SLIMBUS3_HOSTLESS Playback",

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

+15 −0

Original line number	Diff line number	Diff line
		@@ -714,6 +714,21 @@ static struct snd_soc_dai_link msm8952_common_fe_dai[] = {
		.codec_dai_name = "snd-soc-dummy-dai",
		.codec_name = "snd-soc-dummy",
		},
		{
		.name = "SLIMBUS_2 Hostless",
		.stream_name = "SLIMBUS_2 Hostless",
		.cpu_dai_name = "SLIMBUS2_HOSTLESS",
		.platform_name = "msm-pcm-hostless",
		.dynamic = 1,
		.dpcm_capture = 1,
		.trigger = {SND_SOC_DPCM_TRIGGER_POST,
		SND_SOC_DPCM_TRIGGER_POST},
		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,
		.ignore_suspend = 1,
		.ignore_pmdown_time = 1,
		.codec_dai_name = "snd-soc-dummy-dai",
		.codec_name = "snd-soc-dummy",
		},
		{/* hw:x,12 */
		.name = "MSM8952 LowLatency",
		.stream_name = "MultiMedia5",

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -4127,6 +4127,9 @@ static const struct snd_kcontrol_new slimbus_4_rx_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia5", MSM_BACKEND_DAI_SLIMBUS_4_RX,
		MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia6", MSM_BACKEND_DAI_SLIMBUS_4_RX,
		MSM_FRONTEND_DAI_MULTIMEDIA6, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia9", MSM_BACKEND_DAI_SLIMBUS_4_RX,
		MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -10183,6 +10186,10 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {
		0, 0, 0, 0),
		SND_SOC_DAPM_AIF_OUT("SLIM1_UL_HL", "SLIMBUS1_HOSTLESS Capture",
		0, 0, 0, 0),
		SND_SOC_DAPM_AIF_IN("SLIM2_DL_HL", "SLIMBUS2_HOSTLESS Playback",
		0, 0, 0, 0),
		SND_SOC_DAPM_AIF_OUT("SLIM2_UL_HL", "SLIMBUS2_HOSTLESS Capture",
		0, 0, 0, 0),
		SND_SOC_DAPM_AIF_IN("SLIM3_DL_HL", "SLIMBUS3_HOSTLESS Playback",
		0, 0, 0, 0),
		SND_SOC_DAPM_AIF_OUT("SLIM3_UL_HL", "SLIMBUS3_HOSTLESS Capture",
		@@ -11239,6 +11246,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"SLIMBUS_4_RX Audio Mixer", "MultiMedia1", "MM_DL1"},
		{"SLIMBUS_4_RX Audio Mixer", "MultiMedia2", "MM_DL2"},
		{"SLIMBUS_4_RX Audio Mixer", "MultiMedia5", "MM_DL5"},
		{"SLIMBUS_4_RX Audio Mixer", "MultiMedia6", "MM_DL6"},
		{"SLIMBUS_4_RX Audio Mixer", "MultiMedia9", "MM_DL9"},
		{"SLIMBUS_4_RX", NULL, "SLIMBUS_4_RX Audio Mixer"},

		@@ -12573,6 +12581,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"SLIMBUS_6_RX", NULL, "SLIMBUS6_DL_HL"},
		{"SLIM0_UL_HL", NULL, "SLIMBUS_0_TX"},
		{"SLIM1_UL_HL", NULL, "SLIMBUS_1_TX"},
		{"SLIM2_UL_HL", NULL, "SLIMBUS_2_TX"},
		{"SLIM3_UL_HL", NULL, "SLIMBUS_3_TX"},
		{"SLIM4_UL_HL", NULL, "SLIMBUS_4_TX"},

		@@ -13040,6 +13049,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"SLIMBUS_0_RX Port Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},
		{"SLIMBUS_0_RX Port Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
		{"SLIMBUS_0_RX Port Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
		{"SLIMBUS_0_RX Port Mixer", "SLIM_2_TX", "SLIMBUS_2_TX"},
		{"SLIMBUS_0_RX Port Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},
		{"SLIMBUS_0_RX Port Mixer", "SEC_AUX_PCM_UL_TX", "SEC_AUX_PCM_TX"},
		{"SLIMBUS_0_RX Port Mixer", "MI2S_TX", "MI2S_TX"},