Merge "msm8952: set recording format to 16 bit" (d559d74f) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/msm/msm8952.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -313,6 +313,8 @@ static int msm_tx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
		SNDRV_PCM_HW_PARAM_CHANNELS);

		pr_debug("%s(), channel:%d\n", __func__, msm_ter_mi2s_tx_ch);
		param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,
		SNDRV_PCM_FORMAT_S16_LE);
		rate->min = rate->max = 48000;
		channels->min = channels->max = msm_ter_mi2s_tx_ch;

		@@ -398,7 +400,12 @@ static int msm_mi2s_snd_hw_params(struct snd_pcm_substream *substream,
		{
		pr_debug("%s(): substream = %s stream = %d\n", __func__,
		substream->name, substream->stream);
		param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT, mi2s_rx_bit_format);
		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
		param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,
		mi2s_rx_bit_format);
		else
		param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,
		SNDRV_PCM_FORMAT_S16_LE);
		return 0;
		}