Merge "ASoC: msm: Add switch for primary mi2s hostless playback" (14ac57d5) · Commits · e / devices / android_kernel_sony_msm8994

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -2439,6 +2439,11 @@ static const struct snd_kcontrol_new pcm_rx_switch_mixer_controls =
		0, 1, 0, msm_routing_get_fm_pcmrx_switch_mixer,
		msm_routing_put_fm_pcmrx_switch_mixer);

		static const struct snd_kcontrol_new pri_mi2s_rx_switch_mixer_controls =
		SOC_SINGLE_EXT("Switch", SND_SOC_NOPM,
		0, 1, 0, msm_routing_get_switch_mixer,
		msm_routing_put_switch_mixer);

		static const struct soc_enum lsm_mux_enum =
		SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(mad_audio_mux_text), mad_audio_mux_text);

		@@ -2784,6 +2789,9 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {
		SND_SOC_DAPM_AIF_OUT("PRI_MI2S_UL_HL",
		"Primary MI2S_TX Hostless Capture",
		0, 0, 0, 0),
		SND_SOC_DAPM_AIF_IN("PRI_MI2S_DL_HL",
		"Primary MI2S_RX Hostless Playback",
		0, 0, 0, 0),

		SND_SOC_DAPM_AIF_OUT("MI2S_DL_HL", "MI2S_RX_HOSTLESS Playback",
		0, 0, 0, 0),
		@@ -2896,6 +2904,8 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {
		&slim4_fm_switch_mixer_controls),
		SND_SOC_DAPM_SWITCH("PCM_RX_DL_HL", SND_SOC_NOPM, 0, 0,
		&pcm_rx_switch_mixer_controls),
		SND_SOC_DAPM_SWITCH("PRI_MI2S_RX_DL_HL", SND_SOC_NOPM, 0, 0,
		&pri_mi2s_rx_switch_mixer_controls),

		/* Mux Definitions */
		SND_SOC_DAPM_MUX("LSM1 MUX", SND_SOC_NOPM, 0, 0, &lsm1_mux),
		@@ -3550,6 +3560,8 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"MI2S_UL_HL", NULL, "MI2S_TX"},
		{"PCM_RX_DL_HL", "Switch", "SLIM0_DL_HL"},
		{"PCM_RX", NULL, "PCM_RX_DL_HL"},
		{"PRI_MI2S_RX_DL_HL", "Switch", "PRI_MI2S_DL_HL"},
		{"PRI_MI2S_RX", NULL, "PRI_MI2S_RX_DL_HL"},
		{"MI2S_UL_HL", NULL, "TERT_MI2S_TX"},
		{"SEC_I2S_RX", NULL, "SEC_I2S_DL_HL"},
		{"PRI_MI2S_UL_HL", NULL, "PRI_MI2S_TX"},