diff options
| author | Enric Balletbo i Serra | 2016-05-09 12:46:33 +0200 |
|---|---|---|
| committer | Mark Brown | 2016-05-30 17:19:41 +0200 |
| commit | 9211009306826637942c6be0fd64198aaddfd32d (patch) | |
| tree | 7fee25a6e54b5aa95bd15fac80455fba45382858 | |
| parent | ASoC: rockchip-max98090: Fix the Headset Mic route. (diff) | |
| download | kernel-qcow2-linux-9211009306826637942c6be0fd64198aaddfd32d.tar.gz kernel-qcow2-linux-9211009306826637942c6be0fd64198aaddfd32d.tar.xz kernel-qcow2-linux-9211009306826637942c6be0fd64198aaddfd32d.zip | |
ASoC: rockchip-max98090: Fix jack detection and event reporting.
Physically there is a jackset which includes a Headphone and a Jackset
Mic pin. The patch add thw two pins with the correct pin name so the
DAPM management can find the pin and make the jack detection and event
reporting work again.
The patch also shut up the following error:
rockchip-snd-max98090 sound: ASoC: DAPM unknown pin Headset Jack
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/rockchip/rockchip_max98090.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c index 3da7891b7dfb..e70ffad07184 100644 --- a/sound/soc/rockchip/rockchip_max98090.c +++ b/sound/soc/rockchip/rockchip_max98090.c @@ -34,13 +34,18 @@ #define DRV_NAME "rockchip-snd-max98090" static struct snd_soc_jack headset_jack; + +/* Headset jack detection DAPM pins */ static struct snd_soc_jack_pin headset_jack_pins[] = { { - .pin = "Headset Jack", - .mask = SND_JACK_HEADPHONE | SND_JACK_MICROPHONE | - SND_JACK_BTN_0 | SND_JACK_BTN_1 | - SND_JACK_BTN_2 | SND_JACK_BTN_3, + .pin = "Headphone", + .mask = SND_JACK_HEADPHONE, + }, + { + .pin = "Headset Mic", + .mask = SND_JACK_MICROPHONE, }, + }; static const struct snd_soc_dapm_widget rk_dapm_widgets[] = { |