Skip to content

Commit

Permalink
ASoC: rockchip-max98090: Fix jack detection and event reporting.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Enric Balletbo i Serra authored and Mark Brown committed May 30, 2016
1 parent ec0d23b commit 9211009
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions sound/soc/rockchip/rockchip_max98090.c
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = {
Expand Down

0 comments on commit 9211009

Please sign in to comment.