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

Commit 72379bb9 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: Register common sound controls" into msm-4.9

parents 6e18c32c 35a610ed

sound/soc/msm/sdm660-common.c

+11 −0
Original line number Diff line number Diff line
@@ -1683,6 +1683,17 @@ const struct snd_kcontrol_new msm_common_snd_controls[] = { 
			tdm_tx_ch_put),

};



/**

 * msm_common_snd_controls_size - to return controls size

 *

 * Return: returns size of common controls array

 */

int msm_common_snd_controls_size(void)

{

	return ARRAY_SIZE(msm_common_snd_controls);

}

EXPORT_SYMBOL(msm_common_snd_controls_size);



static inline int param_is_mask(int p)

{

	return (p >= SNDRV_PCM_HW_PARAM_FIRST_MASK) &&

sound/soc/msm/sdm660-common.h

+1 −0
Original line number Diff line number Diff line
@@ -113,4 +113,5 @@ int msm_aux_pcm_snd_startup(struct snd_pcm_substream *substream); 
void msm_aux_pcm_snd_shutdown(struct snd_pcm_substream *substream);

int msm_mi2s_snd_startup(struct snd_pcm_substream *substream);

void msm_mi2s_snd_shutdown(struct snd_pcm_substream *substream);

int msm_common_snd_controls_size(void);

#endif

sound/soc/msm/sdm660-external.c

+8 −0
Original line number Diff line number Diff line
@@ -1530,6 +1530,14 @@ int msm_audrx_init(struct snd_soc_pcm_runtime *rtd) 
		return ret;

	}



	ret = snd_soc_add_codec_controls(codec, msm_common_snd_controls,

					 msm_common_snd_controls_size());

	if (ret < 0) {

		pr_err("%s: add_common_snd_controls failed: %d\n",

			__func__, ret);

		return ret;

	}



	snd_soc_dapm_new_controls(dapm, msm_dapm_widgets,

			ARRAY_SIZE(msm_dapm_widgets));

sound/soc/msm/sdm660-internal.c

+13 −1
Original line number Diff line number Diff line
@@ -1300,8 +1300,20 @@ static int msm_audrx_init(struct snd_soc_pcm_runtime *rtd) 


	pr_debug("%s(),dev_name%s\n", __func__, dev_name(cpu_dai->dev));



	snd_soc_add_codec_controls(ana_cdc, msm_snd_controls,

	ret = snd_soc_add_codec_controls(ana_cdc, msm_snd_controls,

				   ARRAY_SIZE(msm_snd_controls));

	if (ret < 0) {

		pr_err("%s: add_codec_controls failed: %d\n",

			__func__, ret);

		return ret;

	}

	ret = snd_soc_add_codec_controls(ana_cdc, msm_common_snd_controls,

				   msm_common_snd_controls_size());

	if (ret < 0) {

		pr_err("%s: add common snd controls failed: %d\n",

			__func__, ret);

		return ret;

	}



	snd_soc_dapm_new_controls(dapm, msm_int_dapm_widgets,

				  ARRAY_SIZE(msm_int_dapm_widgets));