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

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

Merge "ASoC: msm: Fixup number of channels for FM transmitter"

parents a435d142 c427131f

sound/soc/msm/msm8226.c

+17 −1
Original line number Diff line number Diff line
@@ -448,6 +448,22 @@ static int msm_btsco_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
	return 0;

}



static int msm_be_fm_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,

				struct snd_pcm_hw_params *params)

{

	struct snd_interval *rate = hw_param_interval(params,

					SNDRV_PCM_HW_PARAM_RATE);



	struct snd_interval *channels = hw_param_interval(params,

			SNDRV_PCM_HW_PARAM_CHANNELS);



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

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

	channels->min = channels->max = 2;



	return 0;

}



static int msm8226_auxpcm_rate_get(struct snd_kcontrol *kcontrol,

				struct snd_ctl_elem_value *ucontrol)

{
@@ -1366,7 +1382,7 @@ static struct snd_soc_dai_link msm8226_common_dai[] = { 
		.codec_dai_name = "msm-stub-rx",

		.no_pcm = 1,

		.be_id = MSM_BACKEND_DAI_INT_FM_RX,

		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.be_hw_params_fixup = msm_be_fm_hw_params_fixup,

		/* this dainlink has playback support */

		.ignore_pmdown_time = 1,

		.ignore_suspend = 1,

sound/soc/msm/msm8974.c

+17 −1
Original line number Diff line number Diff line
@@ -1375,6 +1375,22 @@ static int msm_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
	return 0;

}



static int msm_be_fm_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,

				struct snd_pcm_hw_params *params)

{

	struct snd_interval *rate = hw_param_interval(params,

					SNDRV_PCM_HW_PARAM_RATE);



	struct snd_interval *channels =

	    hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);



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

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

	channels->min = channels->max = 2;



	return 0;

}



static const struct soc_enum msm_snd_enum[] = {

	SOC_ENUM_SINGLE_EXT(2, spk_function),

	SOC_ENUM_SINGLE_EXT(2, slim0_rx_ch_text),
@@ -2274,7 +2290,7 @@ static struct snd_soc_dai_link msm8974_common_dai_links[] = { 
		.codec_dai_name = "msm-stub-rx",

		.no_pcm = 1,

		.be_id = MSM_BACKEND_DAI_INT_FM_RX,

		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.be_hw_params_fixup = msm_be_fm_hw_params_fixup,

		/* this dainlink has playback support */

		.ignore_pmdown_time = 1,

		.ignore_suspend = 1,

sound/soc/msm/msm8x10.c

+17 −1
Original line number Diff line number Diff line
@@ -213,6 +213,22 @@ static int msm_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
	return 0;

}



static int msm_be_fm_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,

				struct snd_pcm_hw_params *params)

{

	struct snd_interval *rate = hw_param_interval(params,

					SNDRV_PCM_HW_PARAM_RATE);



	struct snd_interval *channels =

	    hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);



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

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

	channels->min = channels->max = 2;



	return 0;

}



static int msm_rx_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,

				struct snd_pcm_hw_params *params)

{
@@ -933,7 +949,7 @@ static struct snd_soc_dai_link msm8x10_dai[] = { 
		.codec_dai_name = "msm-stub-rx",

		.no_pcm = 1,

		.be_id = MSM_BACKEND_DAI_INT_FM_RX,

		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.be_hw_params_fixup = msm_be_fm_hw_params_fixup,

		/* this dainlink has playback support */

		.ignore_pmdown_time = 1,

		.ignore_suspend = 1,