asoc: Enable VAD in QCS405 (2d84e4ae) · Commits · e / devices / android_kernel_xiaomi_nabu

asoc/msm-dai-q6-v2.c

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1127,7 +1127,6 @@ static int msm_dai_q6_dai_auxpcm_remove(struct snd_soc_dai *dai)
	return 0;		return 0;
	}		}


	static int msm_dai_q6_island_mode_put(struct snd_kcontrol *kcontrol,		static int msm_dai_q6_island_mode_put(struct snd_kcontrol *kcontrol,
	struct snd_ctl_elem_value *ucontrol)		struct snd_ctl_elem_value *ucontrol)
	{		{
	@@ -1155,6 +1154,7 @@ static struct snd_kcontrol_new island_config_controls[] = {
	{		{
	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
	.name = "?",		.name = "?",
			.info = snd_ctl_boolean_mono_info,
	.get = msm_dai_q6_island_mode_get,		.get = msm_dai_q6_island_mode_get,
	.put = msm_dai_q6_island_mode_put,		.put = msm_dai_q6_island_mode_put,
	.private_value = SOC_SINGLE_VALUE(0, 0, 1, 0, 0)		.private_value = SOC_SINGLE_VALUE(0, 0, 1, 0, 0)
	@@ -1178,8 +1178,7 @@ static int msm_dai_q6_add_island_mx_ctls(struct snd_card *card,
	if (!mixer_str)		if (!mixer_str)
	return -ENOMEM;		return -ENOMEM;

	snprintf(mixer_str, ctl_len + strlen(mx_ctl_name) + 1,		snprintf(mixer_str, ctl_len, "%s %s", dai_name, mx_ctl_name);
	"%s %s", dai_name, mx_ctl_name);
	island_config_controls[0].name = mixer_str;		island_config_controls[0].name = mixer_str;
	((struct soc_enum *) island_config_controls[0].private_value)->reg		((struct soc_enum *) island_config_controls[0].private_value)->reg
	= dai_id;		= dai_id;

asoc/qcs405.c

+31 −1

Original line number	Original line	Diff line number	Diff line
	@@ -462,7 +462,8 @@ static const char *const cdc_dma_rx_ch_text[] = {"One", "Two"};
	static const char *const cdc_dma_tx_ch_text[] = {"One", "Two", "Three", "Four",		static const char *const cdc_dma_tx_ch_text[] = {"One", "Two", "Three", "Four",
	"Five", "Six", "Seven",		"Five", "Six", "Seven",
	"Eight"};		"Eight"};
	static char const *cdc_dma_sample_rate_text[] = {"KHZ_8", "KHZ_16",		static char const *cdc_dma_sample_rate_text[] = {"KHZ_8", "KHZ_11P025",
			"KHZ_16", "KHZ_22P05",
	"KHZ_32", "KHZ_44P1", "KHZ_48",		"KHZ_32", "KHZ_44P1", "KHZ_48",
	"KHZ_88P2", "KHZ_96", "KHZ_176P4",		"KHZ_88P2", "KHZ_96", "KHZ_176P4",
	"KHZ_192", "KHZ_352P8", "KHZ_384"};		"KHZ_192", "KHZ_352P8", "KHZ_384"};
	@@ -6034,6 +6035,35 @@ static struct snd_soc_dai_link msm_common_be_dai_links[] = {
	.ops = &qcs405_tdm_be_ops,		.ops = &qcs405_tdm_be_ops,
	.ignore_suspend = 1,		.ignore_suspend = 1,
	},		},
			{
			.name = LPASS_BE_QUIN_TDM_RX_0,
			.stream_name = "Quinary TDM0 Playback",
			.cpu_dai_name = "msm-dai-q6-tdm.36928",
			.platform_name = "msm-pcm-routing",
			.codec_name = "msm-stub-codec.1",
			.codec_dai_name = "msm-stub-rx",
			.no_pcm = 1,
			.dpcm_playback = 1,
			.id = MSM_BACKEND_DAI_QUIN_TDM_RX_0,
			.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,
			.ops = &qcs405_tdm_be_ops,
			.ignore_suspend = 1,
			.ignore_pmdown_time = 1,
			},
			{
			.name = LPASS_BE_QUIN_TDM_TX_0,
			.stream_name = "Quinary TDM0 Capture",
			.cpu_dai_name = "msm-dai-q6-tdm.36929",
			.platform_name = "msm-pcm-routing",
			.codec_name = "msm-stub-codec.1",
			.codec_dai_name = "msm-stub-tx",
			.no_pcm = 1,
			.dpcm_capture = 1,
			.id = MSM_BACKEND_DAI_QUIN_TDM_TX_0,
			.be_hw_params_fixup = msm_be_hw_params_fixup,
			.ops = &qcs405_tdm_be_ops,
			.ignore_suspend = 1,
			},
	};		};

	static struct snd_soc_dai_link msm_tasha_be_dai_links[] = {		static struct snd_soc_dai_link msm_tasha_be_dai_links[] = {

config/qcs405auto.conf

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,7 @@ CONFIG_SND_SOC_WCD_MBHC_LEGACY=m
	CONFIG_SND_SOC_QDSP6V2=m		CONFIG_SND_SOC_QDSP6V2=m
	CONFIG_QTI_PP=m		CONFIG_QTI_PP=m
	CONFIG_SND_HWDEP_ROUTING=m		CONFIG_SND_HWDEP_ROUTING=m
			CONFIG_AFE_HWDEP=m
	CONFIG_DTS_EAGLE=m		CONFIG_DTS_EAGLE=m
	CONFIG_DOLBY_DS2=m		CONFIG_DOLBY_DS2=m
	CONFIG_DOLBY_LICENSE=m		CONFIG_DOLBY_LICENSE=m

config/qcs405autoconf.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -38,6 +38,7 @@
	#define CONFIG_SND_SOC_QDSP6V2 1		#define CONFIG_SND_SOC_QDSP6V2 1
	#define CONFIG_QTI_PP 1		#define CONFIG_QTI_PP 1
	#define CONFIG_SND_HWDEP_ROUTING 1		#define CONFIG_SND_HWDEP_ROUTING 1
			#define CONFIG_AFE_HWDEP 1
	#define CONFIG_DTS_EAGLE 1		#define CONFIG_DTS_EAGLE 1
	#define CONFIG_DOLBY_DS2 1		#define CONFIG_DOLBY_DS2 1
	#define CONFIG_DOLBY_LICENSE 1		#define CONFIG_DOLBY_LICENSE 1

dsp/q6afe.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3513,12 +3513,13 @@ static int __afe_port_start(u16 port_id, union afe_port_config *afe_config,
	/* send VAD configuration if is enabled */		/* send VAD configuration if is enabled */
	if (this_afe.vad_cfg[port_index].is_enable) {		if (this_afe.vad_cfg[port_index].is_enable) {
	ret = afe_send_port_vad_cfg_params(port_id);		ret = afe_send_port_vad_cfg_params(port_id);
	if (ret)		if (ret) {
	pr_err("%s: afe send VAD config failed %d\n",		pr_err("%s: afe send VAD config failed %d\n",
	__func__, ret);		__func__, ret);
	goto fail_cmd;		goto fail_cmd;
	}		}
	}		}
			}

	/* Also send the topology id here: */		/* Also send the topology id here: */
	if (!(this_afe.afe_cal_mode[port_index] == AFE_CAL_MODE_NONE)) {		if (!(this_afe.afe_cal_mode[port_index] == AFE_CAL_MODE_NONE)) {