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

Commit 54f96532 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: Add 16 bit PCM as default format for backend"

parents 39893717 c6b6f644

sound/soc/msm/msm8974.c

+2 −0
Original line number Diff line number Diff line
@@ -1314,6 +1314,8 @@ static int msm_slim_0_tx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
			SNDRV_PCM_HW_PARAM_CHANNELS);



	pr_debug("%s()\n", __func__);

	param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,

				   slim0_rx_bit_format);

	rate->min = rate->max = 48000;

	channels->min = channels->max = msm_slim_0_tx_ch;

sound/soc/msm/msm8x10.c

+2 −0
Original line number Diff line number Diff line
@@ -284,6 +284,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_pri_mi2s_tx_ch);

	param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,

					msm_sec_mi2s_rx_bit_format);

	rate->min = rate->max = 48000;

	channels->min = channels->max = msm_pri_mi2s_tx_ch;