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

Groups > linux.kernel > #1394924

[PATCH 4/7] ASoC: rockchip-max98090: Fix the Headset Mic route.

Show all headers | View raw

Since commit e409dfbfccf9a49 ("ASoC: dapm: Add a few supply widget
sanity checks") the following error is seen:

 rockchip-snd-max98090 sound: HiFi <-> ff890000.i2s mapping ok
 rockchip-snd-max98090 sound: Connecting non-supply widget to supply widget is not supported (Headset Mic -> MICBIAS)
 rockchip-snd-max98090 sound: ASoC: no dapm match for Headset Mic --> (null) --> MICBIAS
 rockchip-snd-max98090 sound: ASoC: Failed to add route Headset Mic -> direct -> MICBIAS
 input: ROCKCHIP-I2S Headset Jack as /devices/platform/sound/sound/card0/input3

Invert the route between the Headset Mic and the bias in order to fix it.

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---
 sound/soc/rockchip/rockchip_max98090.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c
index abb64a5..3da7891 100644
--- a/sound/soc/rockchip/rockchip_max98090.c
+++ b/sound/soc/rockchip/rockchip_max98090.c
@@ -53,7 +53,7 @@ static const struct snd_soc_dapm_widget rk_dapm_widgets[] = {
 static const struct snd_soc_dapm_route rk_audio_map[] = {
 	{"IN34", NULL, "Headset Mic"},
 	{"IN34", NULL, "MICBIAS"},
-	{"MICBIAS", NULL, "Headset Mic"},
+	{"Headset Mic", NULL, "MICBIAS"},
 	{"DMICL", NULL, "Int Mic"},
 	{"Headphone", NULL, "HPL"},
 	{"Headphone", NULL, "HPR"},
-- 
2.1.0

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

Thread

[PATCH 0/7] ASoC: rockchip: Fix audio on Veyron. Enric Balletbo i Serra <enric.balletbo@collabora.com> - 2016-05-05 10:10 +0200
  [PATCH 1/7] ASoC: rockchip: Revert "ASoC: rockchip: i2s: remove unused variables" Enric Balletbo i Serra <enric.balletbo@collabora.com> - 2016-05-05 10:10 +0200
  [PATCH 7/7] ARM: dts: rockchip: veyron: Add analog audio codecs. Enric Balletbo i Serra <enric.balletbo@collabora.com> - 2016-05-05 10:10 +0200
  [PATCH 2/7] ASoC: rockchip: Revert "ASoC: rockchip: i2s: separate capture and playback" Enric Balletbo i Serra <enric.balletbo@collabora.com> - 2016-05-05 10:10 +0200
  [PATCH 5/7] ASoC: rockchip-max98090: Fix DAPM unknown pin for Headset Jack Enric Balletbo i Serra <enric.balletbo@collabora.com> - 2016-05-05 10:10 +0200
    Re: [PATCH 5/7] ASoC: rockchip-max98090: Fix DAPM unknown pin for  Headset Jack Mark Brown <broonie@kernel.org> - 2016-05-05 21:30 +0200
  [PATCH 4/7] ASoC: rockchip-max98090: Fix the Headset Mic route. Enric Balletbo i Serra <enric.balletbo@collabora.com> - 2016-05-05 10:10 +0200
    Re: [PATCH 4/7] ASoC: rockchip-max98090: Fix the Headset Mic route. Mark Brown <broonie@kernel.org> - 2016-05-05 21:20 +0200
    Applied "ASoC: rockchip-max98090: Fix the Headset Mic route." to the asoc tree Mark Brown <broonie@kernel.org> - 2016-05-10 21:00 +0200
  [PATCH 3/7] ASoC: rockchip-max98090: Fix NULL pointer de reference while accessing to jack Enric Balletbo i Serra <enric.balletbo@collabora.com> - 2016-05-05 10:10 +0200
    Applied "ASoC: rockchip-max98090: Fix NULL pointer dereference while accessing to jack." to the asoc tree Mark Brown <broonie@kernel.org> - 2016-05-10 21:00 +0200
  [PATCH 6/7] ARM: dts: rockchip: Add shared file for audio related nodes for veyron boards Enric Balletbo i Serra <enric.balletbo@collabora.com> - 2016-05-05 10:10 +0200

csiph-web