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

Commit a314cf82 authored by Banajit Goswami's avatar Banajit Goswami
Browse files

ASoC: msm: qdsp6v2: Add controls using snd_soc_add_platform_controls 



The elements ".control" and ".num_controls" have been
removed from snd_soc_platform_drivers. Hence add the
gapless control using snd_soc_add_platform_controls.

Change-Id: I4c7c7d4c8255018a1d60493cc0db5b9cd746bb06
Signed-off-by: default avatarBanajit Goswami <bgoswami@codeaurora.org>
parent e79eb4f8

sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c

+35 −35
Original line number Diff line number Diff line
@@ -2705,6 +2705,38 @@ static int msm_compr_channel_map_get(struct snd_kcontrol *kcontrol, 
	return rc;

}



static int msm_compr_gapless_put(struct snd_kcontrol *kcontrol,

				struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_platform *platform = snd_kcontrol_chip(kcontrol);

	struct msm_compr_pdata *pdata = (struct msm_compr_pdata *)

		snd_soc_platform_get_drvdata(platform);

	pdata->use_dsp_gapless_mode =  ucontrol->value.integer.value[0];

	pr_debug("%s: value: %ld\n", __func__,

		ucontrol->value.integer.value[0]);



	return 0;

}



static int msm_compr_gapless_get(struct snd_kcontrol *kcontrol,

				struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_platform *platform = snd_kcontrol_chip(kcontrol);

	struct msm_compr_pdata *pdata =

		snd_soc_platform_get_drvdata(platform);

	pr_debug("%s:gapless mode %d\n", __func__, pdata->use_dsp_gapless_mode);

	ucontrol->value.integer.value[0] = pdata->use_dsp_gapless_mode;



	return 0;

}



static const struct snd_kcontrol_new msm_compr_gapless_controls[] = {

	SOC_SINGLE_EXT("Compress Gapless Playback",

			0, 0, 1, 0,

			msm_compr_gapless_get,

			msm_compr_gapless_put),

};



static int msm_compr_probe(struct snd_soc_platform *platform)

{

	struct msm_compr_pdata *pdata;
@@ -2729,6 +2761,9 @@ static int msm_compr_probe(struct snd_soc_platform *platform) 
		pdata->ch_map[i] = NULL;

	}



	snd_soc_add_platform_controls(platform, msm_compr_gapless_controls,

				      ARRAY_SIZE(msm_compr_gapless_controls));



	/*

	 * use_dsp_gapless_mode part of platform data(pdata) is updated from HAL

	 * through a mixer control before compress driver is opened. The mixer
@@ -2933,38 +2968,6 @@ static int msm_compr_add_query_audio_effect_control( 
	return 0;

}



static int msm_compr_gapless_put(struct snd_kcontrol *kcontrol,

				struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_platform *platform = snd_kcontrol_chip(kcontrol);

	struct msm_compr_pdata *pdata = (struct msm_compr_pdata *)

		snd_soc_platform_get_drvdata(platform);

	pdata->use_dsp_gapless_mode =  ucontrol->value.integer.value[0];

	pr_debug("%s: value: %ld\n", __func__,

		ucontrol->value.integer.value[0]);



	return 0;

}



static int msm_compr_gapless_get(struct snd_kcontrol *kcontrol,

				struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_platform *platform = snd_kcontrol_chip(kcontrol);

	struct msm_compr_pdata *pdata =

		snd_soc_platform_get_drvdata(platform);

	pr_debug("%s:gapless mode %d\n", __func__, pdata->use_dsp_gapless_mode);

	ucontrol->value.integer.value[0] = pdata->use_dsp_gapless_mode;



	return 0;

}



static const struct snd_kcontrol_new msm_compr_gapless_controls[] = {

	SOC_SINGLE_EXT("Compress Gapless Playback",

			0, 0, 1, 0,

			msm_compr_gapless_get,

			msm_compr_gapless_put),

};



static int msm_compr_add_dec_runtime_params_control(

						struct snd_soc_pcm_runtime *rtd)

{
@@ -3167,9 +3170,6 @@ static struct snd_soc_platform_driver msm_soc_platform = { 
	.probe		= msm_compr_probe,

	.compr_ops	= &msm_compr_ops,

	.pcm_new	= msm_compr_new,

	.controls       = msm_compr_gapless_controls,

	.num_controls   = ARRAY_SIZE(msm_compr_gapless_controls),



};



static int msm_compr_dev_probe(struct platform_device *pdev)