diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-05-07 21:27:49 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-05-08 12:05:07 +0100 |
| commit | 92ac4c5012a6505858c28be2dd5bf1c6f0dd26cf (patch) | |
| tree | 2dbdfa87314a5e579b61d763b0392f5fc625f89a /sound/soc/pxa | |
| parent | c02e723f3e27f3bd32f24de473af69f0e39e8f79 (diff) | |
| download | linux-stable-92ac4c5012a6505858c28be2dd5bf1c6f0dd26cf.tar.gz linux-stable-92ac4c5012a6505858c28be2dd5bf1c6f0dd26cf.tar.bz2 linux-stable-92ac4c5012a6505858c28be2dd5bf1c6f0dd26cf.zip | |
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: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/pxa')
| -rw-r--r-- | sound/soc/pxa/z2.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c index bcbfbe8303f7..990b1aa6d7f6 100644 --- a/sound/soc/pxa/z2.c +++ b/sound/soc/pxa/z2.c @@ -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; |