[PATCH v2 2/5] ASoC: rockchip-max98090: Fix the Headset Mic route.

From	Enric Balletbo i Serra <enric.balletbo@collabora.com>
Newsgroups	linux.kernel
Subject	[PATCH v2 2/5] ASoC: rockchip-max98090: Fix the Headset Mic route.
Date	2016-05-09 12:50 +0200
Message-ID	<rwQVd-3Ly-23@gated-at.bofh.it> (permalink)
References	<rwQVc-3Ly-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

The path Headset Mic --> MICBIAS is wrong because connects a non-supply
widget as a source with a supply widget as a sink. It's the other way
around:

  MICBIAS (source) --> Headset Mic (sink).

This patch also shut up the following error message:

 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

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---
Changes since v1:
 - Improve log message.

 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 | 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