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

Commit 518b178a authored by Xiaoyu Ye's avatar Xiaoyu Ye Committed by Gerrit - the friendly Code Review server
Browse files

ASoC: sdm845: Add mixer controls for AUX PCM bit format 



AUX PCM ports supports multiple bit formats for Rx and Tx paths.
Add new mixer controls for supporting bit format for Rx and
Tx paths of all 4 AUX PCM ports in SDM845 target. The bit format
for the AUX PCM ports will be used to setup Backend DAI configuration
through fixup function.

Change-Id: I70372c8ba3443972b74dc3f05a2289c4e27bb11c
Signed-off-by: default avatarXiaoyu Ye <benyxy@codeaurora.org>
parent e19174d2

sound/soc/msm/sdm845.c

+112 −6
Original line number Diff line number Diff line
@@ -495,6 +495,8 @@ static SOC_ENUM_SINGLE_EXT_DECL(quat_mi2s_rx_chs, mi2s_ch_text); 
static SOC_ENUM_SINGLE_EXT_DECL(quat_mi2s_tx_chs, mi2s_ch_text);

static SOC_ENUM_SINGLE_EXT_DECL(mi2s_rx_format, bit_format_text);

static SOC_ENUM_SINGLE_EXT_DECL(mi2s_tx_format, bit_format_text);

static SOC_ENUM_SINGLE_EXT_DECL(aux_pcm_rx_format, bit_format_text);

static SOC_ENUM_SINGLE_EXT_DECL(aux_pcm_tx_format, bit_format_text);

static SOC_ENUM_SINGLE_EXT_DECL(hifi_function, hifi_text);



static struct platform_device *spdev;
@@ -2252,7 +2254,7 @@ static int mi2s_get_sample_rate(int value) 
	return sample_rate;

}



static int mi2s_get_format(int value)

static int mi2s_auxpcm_get_format(int value)

{

	int format;
@@ -2276,7 +2278,7 @@ static int mi2s_get_format(int value) 
	return format;

}



static int mi2s_get_format_value(int format)

static int mi2s_auxpcm_get_format_value(int format)

{

	int value;
@@ -2441,7 +2443,7 @@ static int msm_mi2s_rx_format_get(struct snd_kcontrol *kcontrol, 
		return idx;



	ucontrol->value.enumerated.item[0] =

		mi2s_get_format_value(mi2s_rx_cfg[idx].bit_format);

		mi2s_auxpcm_get_format_value(mi2s_rx_cfg[idx].bit_format);



	pr_debug("%s: idx[%d]_rx_format = %d, item = %d\n", __func__,

		idx, mi2s_rx_cfg[idx].bit_format,
@@ -2459,7 +2461,7 @@ static int msm_mi2s_rx_format_put(struct snd_kcontrol *kcontrol, 
		return idx;



	mi2s_rx_cfg[idx].bit_format =

		mi2s_get_format(ucontrol->value.enumerated.item[0]);

		mi2s_auxpcm_get_format(ucontrol->value.enumerated.item[0]);



	pr_debug("%s: idx[%d]_rx_format = %d, item = %d\n", __func__,

		  idx, mi2s_rx_cfg[idx].bit_format,
@@ -2477,7 +2479,7 @@ static int msm_mi2s_tx_format_get(struct snd_kcontrol *kcontrol, 
		return idx;



	ucontrol->value.enumerated.item[0] =

		mi2s_get_format_value(mi2s_tx_cfg[idx].bit_format);

		mi2s_auxpcm_get_format_value(mi2s_tx_cfg[idx].bit_format);



	pr_debug("%s: idx[%d]_tx_format = %d, item = %d\n", __func__,

		idx, mi2s_tx_cfg[idx].bit_format,
@@ -2495,7 +2497,7 @@ static int msm_mi2s_tx_format_put(struct snd_kcontrol *kcontrol, 
		return idx;



	mi2s_tx_cfg[idx].bit_format =

		mi2s_get_format(ucontrol->value.enumerated.item[0]);

		mi2s_auxpcm_get_format(ucontrol->value.enumerated.item[0]);



	pr_debug("%s: idx[%d]_tx_format = %d, item = %d\n", __func__,

		  idx, mi2s_tx_cfg[idx].bit_format,
@@ -2504,6 +2506,78 @@ static int msm_mi2s_tx_format_put(struct snd_kcontrol *kcontrol, 
	return 0;

}



static int msm_aux_pcm_rx_format_get(struct snd_kcontrol *kcontrol,

				struct snd_ctl_elem_value *ucontrol)

{

	int idx = aux_pcm_get_port_idx(kcontrol);



	if (idx < 0)

		return idx;



	ucontrol->value.enumerated.item[0] =

		mi2s_auxpcm_get_format_value(aux_pcm_rx_cfg[idx].bit_format);



	pr_debug("%s: idx[%d]_rx_format = %d, item = %d\n", __func__,

		idx, aux_pcm_rx_cfg[idx].bit_format,

		ucontrol->value.enumerated.item[0]);



	return 0;

}



static int msm_aux_pcm_rx_format_put(struct snd_kcontrol *kcontrol,

				struct snd_ctl_elem_value *ucontrol)

{

	int idx = aux_pcm_get_port_idx(kcontrol);



	if (idx < 0)

		return idx;



	aux_pcm_rx_cfg[idx].bit_format =

		mi2s_auxpcm_get_format(ucontrol->value.enumerated.item[0]);



	pr_debug("%s: idx[%d]_rx_format = %d, item = %d\n", __func__,

		  idx, aux_pcm_rx_cfg[idx].bit_format,

		  ucontrol->value.enumerated.item[0]);



	return 0;

}



static int msm_aux_pcm_tx_format_get(struct snd_kcontrol *kcontrol,

				struct snd_ctl_elem_value *ucontrol)

{

	int idx = aux_pcm_get_port_idx(kcontrol);



	if (idx < 0)

		return idx;



	ucontrol->value.enumerated.item[0] =

		mi2s_auxpcm_get_format_value(aux_pcm_tx_cfg[idx].bit_format);



	pr_debug("%s: idx[%d]_tx_format = %d, item = %d\n", __func__,

		idx, aux_pcm_tx_cfg[idx].bit_format,

		ucontrol->value.enumerated.item[0]);



	return 0;

}



static int msm_aux_pcm_tx_format_put(struct snd_kcontrol *kcontrol,

				struct snd_ctl_elem_value *ucontrol)

{

	int idx = aux_pcm_get_port_idx(kcontrol);



	if (idx < 0)

		return idx;



	aux_pcm_tx_cfg[idx].bit_format =

		mi2s_auxpcm_get_format(ucontrol->value.enumerated.item[0]);



	pr_debug("%s: idx[%d]_tx_format = %d, item = %d\n", __func__,

		  idx, aux_pcm_tx_cfg[idx].bit_format,

		  ucontrol->value.enumerated.item[0]);



	return 0;

}



static int msm_hifi_ctrl(struct snd_soc_codec *codec)

{

	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
@@ -2765,6 +2839,22 @@ static const struct snd_kcontrol_new msm_snd_controls[] = { 
			msm_mi2s_rx_format_get, msm_mi2s_rx_format_put),

	SOC_ENUM_EXT("QUAT_MI2S_TX Format", mi2s_tx_format,

			msm_mi2s_tx_format_get, msm_mi2s_tx_format_put),

	SOC_ENUM_EXT("PRIM_AUX_PCM_RX Format", aux_pcm_rx_format,

			msm_aux_pcm_rx_format_get, msm_aux_pcm_rx_format_put),

	SOC_ENUM_EXT("PRIM_AUX_PCM_TX Format", aux_pcm_tx_format,

			msm_aux_pcm_tx_format_get, msm_aux_pcm_tx_format_put),

	SOC_ENUM_EXT("SEC_AUX_PCM_RX Format", aux_pcm_rx_format,

			msm_aux_pcm_rx_format_get, msm_aux_pcm_rx_format_put),

	SOC_ENUM_EXT("SEC_AUX_PCM_TX Format", aux_pcm_tx_format,

			msm_aux_pcm_tx_format_get, msm_aux_pcm_tx_format_put),

	SOC_ENUM_EXT("TERT_AUX_PCM_RX Format", aux_pcm_rx_format,

			msm_aux_pcm_rx_format_get, msm_aux_pcm_rx_format_put),

	SOC_ENUM_EXT("TERT_AUX_PCM_TX Format", aux_pcm_tx_format,

			msm_aux_pcm_tx_format_get, msm_aux_pcm_tx_format_put),

	SOC_ENUM_EXT("QUAT_AUX_PCM_RX Format", aux_pcm_rx_format,

			msm_aux_pcm_rx_format_get, msm_aux_pcm_rx_format_put),

	SOC_ENUM_EXT("QUAT_AUX_PCM_TX Format", aux_pcm_tx_format,

			msm_aux_pcm_tx_format_get, msm_aux_pcm_tx_format_put),

	SOC_ENUM_EXT("HiFi Function", hifi_function, msm_hifi_get,

			msm_hifi_put),

};
@@ -3134,6 +3224,8 @@ static int msm_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
		break;



	case MSM_BACKEND_DAI_AUXPCM_RX:

		param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,

			aux_pcm_rx_cfg[PRIM_AUX_PCM].bit_format);

		rate->min = rate->max =

			aux_pcm_rx_cfg[PRIM_AUX_PCM].sample_rate;

		channels->min = channels->max =
@@ -3141,6 +3233,8 @@ static int msm_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
		break;



	case MSM_BACKEND_DAI_AUXPCM_TX:

		param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,

			aux_pcm_tx_cfg[PRIM_AUX_PCM].bit_format);

		rate->min = rate->max =

			aux_pcm_tx_cfg[PRIM_AUX_PCM].sample_rate;

		channels->min = channels->max =
@@ -3148,6 +3242,8 @@ static int msm_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
		break;



	case MSM_BACKEND_DAI_SEC_AUXPCM_RX:

		param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,

			aux_pcm_rx_cfg[SEC_AUX_PCM].bit_format);

		rate->min = rate->max =

			aux_pcm_rx_cfg[SEC_AUX_PCM].sample_rate;

		channels->min = channels->max =
@@ -3155,6 +3251,8 @@ static int msm_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
		break;



	case MSM_BACKEND_DAI_SEC_AUXPCM_TX:

		param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,

			aux_pcm_tx_cfg[SEC_AUX_PCM].bit_format);

		rate->min = rate->max =

			aux_pcm_tx_cfg[SEC_AUX_PCM].sample_rate;

		channels->min = channels->max =
@@ -3162,6 +3260,8 @@ static int msm_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
		break;



	case MSM_BACKEND_DAI_TERT_AUXPCM_RX:

		param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,

			aux_pcm_rx_cfg[TERT_AUX_PCM].bit_format);

		rate->min = rate->max =

			aux_pcm_rx_cfg[TERT_AUX_PCM].sample_rate;

		channels->min = channels->max =
@@ -3169,6 +3269,8 @@ static int msm_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
		break;



	case MSM_BACKEND_DAI_TERT_AUXPCM_TX:

		param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,

			aux_pcm_tx_cfg[TERT_AUX_PCM].bit_format);

		rate->min = rate->max =

			aux_pcm_tx_cfg[TERT_AUX_PCM].sample_rate;

		channels->min = channels->max =
@@ -3176,6 +3278,8 @@ static int msm_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
		break;



	case MSM_BACKEND_DAI_QUAT_AUXPCM_RX:

		param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,

			aux_pcm_rx_cfg[QUAT_AUX_PCM].bit_format);

		rate->min = rate->max =

			aux_pcm_rx_cfg[QUAT_AUX_PCM].sample_rate;

		channels->min = channels->max =
@@ -3183,6 +3287,8 @@ static int msm_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
		break;



	case MSM_BACKEND_DAI_QUAT_AUXPCM_TX:

		param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,

			aux_pcm_tx_cfg[QUAT_AUX_PCM].bit_format);

		rate->min = rate->max =

			aux_pcm_tx_cfg[QUAT_AUX_PCM].sample_rate;

		channels->min = channels->max =