Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1396928

[PATCH v2 3/5] ASoC: rockchip-max98090: Fix jack detection and event reporting.

Show all headers | View raw

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>
---
Changes since v1:
 - Improve log message.
 - Include Headphone and Jackset Mic pins.

 sound/soc/rockchip/rockchip_max98090.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c
index 3da7891..e70ffad 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[] = {
-- 
2.1.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/5] ASoC: rockchip: Fix audio on Veyron. Enric Balletbo i Serra <enric.balletbo@collabora.com> - 2016-05-09 12:50 +0200
  [PATCH v2 3/5] ASoC: rockchip-max98090: Fix jack detection and event reporting. Enric Balletbo i Serra <enric.balletbo@collabora.com> - 2016-05-09 12:50 +0200
    Applied "ASoC: rockchip-max98090: Fix jack detection and event reporting." to the asoc tree Mark Brown <broonie@kernel.org> - 2016-05-10 21:00 +0200
  [PATCH v2 4/5] ARM: dts: rockchip: Add shared file for audio related nodes for veyron boards Enric Balletbo i Serra <enric.balletbo@collabora.com> - 2016-05-09 12:50 +0200
  [PATCH v2 1/5] ASoC: rockchip-max98090: Fix NULL pointer dereference while accessing to jack. Enric Balletbo i Serra <enric.balletbo@collabora.com> - 2016-05-09 12:50 +0200
  [PATCH v2 5/5] ARM: dts: rockchip: veyron: Add analog audio codecs. Enric Balletbo i Serra <enric.balletbo@collabora.com> - 2016-05-09 12:50 +0200
  [PATCH v2 2/5] ASoC: rockchip-max98090: Fix the Headset Mic route. Enric Balletbo i Serra <enric.balletbo@collabora.com> - 2016-05-09 12:50 +0200

csiph-web