Skip to content

Commit 9211009

Browse files
Enric Balletbo i Serrabroonie
authored andcommitted
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 <[email protected]> Signed-off-by: Mark Brown <[email protected]>
1 parent ec0d23b commit 9211009

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

sound/soc/rockchip/rockchip_max98090.c

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,18 @@
3434
#define DRV_NAME "rockchip-snd-max98090"
3535

3636
static struct snd_soc_jack headset_jack;
37+
38+
/* Headset jack detection DAPM pins */
3739
static struct snd_soc_jack_pin headset_jack_pins[] = {
3840
{
39-
.pin = "Headset Jack",
40-
.mask = SND_JACK_HEADPHONE | SND_JACK_MICROPHONE |
41-
SND_JACK_BTN_0 | SND_JACK_BTN_1 |
42-
SND_JACK_BTN_2 | SND_JACK_BTN_3,
41+
.pin = "Headphone",
42+
.mask = SND_JACK_HEADPHONE,
43+
},
44+
{
45+
.pin = "Headset Mic",
46+
.mask = SND_JACK_MICROPHONE,
4347
},
48+
4449
};
4550

4651
static const struct snd_soc_dapm_widget rk_dapm_widgets[] = {

0 commit comments

Comments
 (0)