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

Commit 3cfaaaa0 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: magician: Automatically disconnect non-connected pins 



All DAPM input and output pins of the uda1380 are either used in the card's
DAPM routing table or are marked as not connected.

Set the fully_routed flag of the card instead of manually marking the unused
inputs and outputs as not connected. This makes the code a bit shorter and
cleaner.

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

sound/soc/pxa/magician.c

+1 −20
Original line number Diff line number Diff line
@@ -391,25 +391,6 @@ static const struct snd_kcontrol_new uda1380_magician_controls[] = { 
			magician_get_input, magician_set_input),

};



/*

 * Logic for a uda1380 as connected on a HTC Magician

 */

static int magician_uda1380_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;



	/* NC codec pins */

	snd_soc_dapm_nc_pin(dapm, "VOUTLHP");

	snd_soc_dapm_nc_pin(dapm, "VOUTRHP");



	/* FIXME: is anything connected here? */

	snd_soc_dapm_nc_pin(dapm, "VINL");

	snd_soc_dapm_nc_pin(dapm, "VINR");



	return 0;

}



/* magician digital audio interface glue - connects codec <--> CPU */

static struct snd_soc_dai_link magician_dai[] = {

{
@@ -419,7 +400,6 @@ static struct snd_soc_dai_link magician_dai[] = { 
	.codec_dai_name = "uda1380-hifi-playback",

	.platform_name = "pxa-pcm-audio",

	.codec_name = "uda1380-codec.0-0018",

	.init = magician_uda1380_init,

	.ops = &magician_playback_ops,

},

{
@@ -446,6 +426,7 @@ static struct snd_soc_card snd_soc_card_magician = { 
	.num_dapm_widgets = ARRAY_SIZE(uda1380_dapm_widgets),

	.dapm_routes = audio_map,

	.num_dapm_routes = ARRAY_SIZE(audio_map),

	.fully_routed = true,

};



static struct platform_device *magician_snd_device;