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

Commit 079942ab authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: pxa: tosa: Convert to table based DAPM and control setup 



Use table based setup to register the controls and DAPM widgets and routes. This
on one hand makes the code a bit shorter and cleaner and on the other hand the
board level DAPM elements get registered in the card's DAPM context rather than
in the CODEC's DAPM context.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 0fbd44ab

sound/soc/pxa/tosa.c

+13 −22
Original line number Diff line number Diff line
@@ -44,9 +44,8 @@ 
static int tosa_jack_func;

static int tosa_spk_func;



static void tosa_ext_control(struct snd_soc_codec *codec)

static void tosa_ext_control(struct snd_soc_dapm_context *dapm)

{

	struct snd_soc_dapm_context *dapm = &codec->dapm;



	snd_soc_dapm_mutex_lock(dapm);
@@ -82,10 +81,9 @@ static void tosa_ext_control(struct snd_soc_codec *codec) 
static int tosa_startup(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_codec *codec = rtd->codec;



	/* check the jack status at stream startup */

	tosa_ext_control(codec);

	tosa_ext_control(&rtd->card->dapm);



	return 0;

}
@@ -104,13 +102,13 @@ static int tosa_get_jack(struct snd_kcontrol *kcontrol, 
static int tosa_set_jack(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec =  snd_kcontrol_chip(kcontrol);

	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);



	if (tosa_jack_func == ucontrol->value.integer.value[0])

		return 0;



	tosa_jack_func = ucontrol->value.integer.value[0];

	tosa_ext_control(codec);

	tosa_ext_control(&card->dapm);

	return 1;

}
@@ -124,13 +122,13 @@ static int tosa_get_spk(struct snd_kcontrol *kcontrol, 
static int tosa_set_spk(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec =  snd_kcontrol_chip(kcontrol);

	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);



	if (tosa_spk_func == ucontrol->value.integer.value[0])

		return 0;



	tosa_spk_func = ucontrol->value.integer.value[0];

	tosa_ext_control(codec);

	tosa_ext_control(&card->dapm);

	return 1;

}
@@ -191,24 +189,10 @@ static int tosa_ac97_init(struct snd_soc_pcm_runtime *rtd) 
{

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	int err;



	snd_soc_dapm_nc_pin(dapm, "OUT3");

	snd_soc_dapm_nc_pin(dapm, "MONOOUT");



	/* add tosa specific controls */

	err = snd_soc_add_codec_controls(codec, tosa_controls,

				ARRAY_SIZE(tosa_controls));

	if (err < 0)

		return err;



	/* add tosa specific widgets */

	snd_soc_dapm_new_controls(dapm, tosa_dapm_widgets,

				  ARRAY_SIZE(tosa_dapm_widgets));



	/* set up tosa specific audio path audio_map */

	snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));



	return 0;

}
@@ -239,6 +223,13 @@ static struct snd_soc_card tosa = { 
	.owner = THIS_MODULE,

	.dai_link = tosa_dai,

	.num_links = ARRAY_SIZE(tosa_dai),



	.controls = tosa_controls,

	.num_controls = ARRAY_SIZE(tosa_controls),

	.dapm_widgets = tosa_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(tosa_dapm_widgets),

	.dapm_routes = audio_map,

	.num_dapm_routes = ARRAY_SIZE(audio_map),

};



static int tosa_probe(struct platform_device *pdev)