aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnric Balletbo i Serra <enric.balletbo@collabora.com>2016-05-09 06:46:33 -0400
committerMark Brown <broonie@kernel.org>2016-05-30 11:19:41 -0400
commit9211009306826637942c6be0fd64198aaddfd32d (patch)
tree7fee25a6e54b5aa95bd15fac80455fba45382858
parentec0d23b295b901cdfd60e9b8a65ce208acf53067 (diff)
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.c13
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 @@
34#define DRV_NAME "rockchip-snd-max98090" 34#define DRV_NAME "rockchip-snd-max98090"
35 35
36static struct snd_soc_jack headset_jack; 36static struct snd_soc_jack headset_jack;
37
38/* Headset jack detection DAPM pins */
37static struct snd_soc_jack_pin headset_jack_pins[] = { 39static struct snd_soc_jack_pin headset_jack_pins[] = {
38 { 40 {
39 .pin = "Headset Jack", 41 .pin = "Headphone",
40 .mask = SND_JACK_HEADPHONE | SND_JACK_MICROPHONE | 42 .mask = SND_JACK_HEADPHONE,
41 SND_JACK_BTN_0 | SND_JACK_BTN_1 | 43 },
42 SND_JACK_BTN_2 | SND_JACK_BTN_3, 44 {
45 .pin = "Headset Mic",
46 .mask = SND_JACK_MICROPHONE,
43 }, 47 },
48
44}; 49};
45 50
46static const struct snd_soc_dapm_widget rk_dapm_widgets[] = { 51static const struct snd_soc_dapm_widget rk_dapm_widgets[] = {