diff options
| author | Sebastien Guiriec <s-guiriec@ti.com> | 2012-06-20 10:15:45 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-06-20 11:45:05 +0800 |
| commit | e063b4f743a6b7a5e8bca9f91be275f32f9f5c48 (patch) | |
| tree | 9caa3262a8564679f56b01a457f0a02e1d3dfa3e | |
| parent | 422e621fa1d9bea27adb2d6e632ab0e76643a735 (diff) | |
ASoC: omap-abe-twl6040: Always update jack detection.tracking-topic-audio-3.4
Headset Jack detect pin need to be added for all the board in order
to get audio record working on PandaBoard. Without this patch the
BIAS of the microphone or Line IN is not set.
Signed-off-by: Sebastien Guirec <s-guiriec@ti.com>
| -rw-r--r-- | sound/soc/omap/omap-abe-twl6040.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c index 98623beeaf0..6ead75fbb29 100644 --- a/sound/soc/omap/omap-abe-twl6040.c +++ b/sound/soc/omap/omap-abe-twl6040.c @@ -469,19 +469,17 @@ static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd) } /* Headset jack detection only if it is supported */ - if (pdata->jack_detection) { - ret = snd_soc_jack_new(codec, "Headset Jack", - SND_JACK_HEADSET, &hs_jack); - if (ret) - return ret; + ret = snd_soc_jack_new(codec, "Headset Jack", + SND_JACK_HEADSET, &hs_jack); + if (ret) + return ret; - ret = snd_soc_jack_add_pins(&hs_jack, ARRAY_SIZE(hs_jack_pins), - hs_jack_pins); - if (machine_is_omap_4430sdp()) - twl6040_hs_jack_detect(codec, &hs_jack, SND_JACK_HEADSET); - else - snd_soc_jack_report(&hs_jack, SND_JACK_HEADSET, SND_JACK_HEADSET); - } + ret = snd_soc_jack_add_pins(&hs_jack, ARRAY_SIZE(hs_jack_pins), + hs_jack_pins); + if (pdata->jack_detection) + twl6040_hs_jack_detect(codec, &hs_jack, SND_JACK_HEADSET); + else + snd_soc_jack_report(&hs_jack, SND_JACK_HEADSET, SND_JACK_HEADSET); /* Only configure the TPS6130x on SDP4430 */ if (machine_is_omap_4430sdp()) { |