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

Commit 92ac4c50 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: z2: Automatically disconnect non-connected pins 



Most DAPM input and output pins of the wm8750 are either used in the card's
DAPM routing table or are marked as not connected. The only exceptions are
the LINPUT1, RINPUT1, LINPUT2 input pins. Lets assume that those were
simply overlooked and that the routing table is complete.

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 c02e723f

sound/soc/pxa/z2.c

+1 −8
Original line number Diff line number Diff line
@@ -132,16 +132,8 @@ static const struct snd_soc_dapm_route z2_audio_map[] = { 
 */

static int z2_wm8750_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	int ret;



	/* NC codec pins */

	snd_soc_dapm_disable_pin(dapm, "LINPUT3");

	snd_soc_dapm_disable_pin(dapm, "RINPUT3");

	snd_soc_dapm_disable_pin(dapm, "OUT3");

	snd_soc_dapm_disable_pin(dapm, "MONO1");



	/* Jack detection API stuff */

	ret = snd_soc_card_jack_new(rtd->card, "Headset Jack", SND_JACK_HEADSET,

				    &hs_jack, hs_jack_pins,
@@ -189,6 +181,7 @@ static struct snd_soc_card snd_soc_z2 = { 
	.num_dapm_widgets = ARRAY_SIZE(wm8750_dapm_widgets),

	.dapm_routes = z2_audio_map,

	.num_dapm_routes = ARRAY_SIZE(z2_audio_map),

	.fully_routed = true,

};



static struct platform_device *z2_snd_device;