aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2014-11-07 12:08:01 -0200
committerAlex Shi <alex.shi@linaro.org>2015-11-13 14:02:35 +0800
commit8e38a38b69cc8f297ebdb8110c26927accec1e18 (patch)
treec35e6b8705b797353474ebea51be8da35ed27460
parent0d4bc7e1fd85838d6d7423cf94db04b30ea70d60 (diff)
ARM: dts: imx6qdl-sabresd: Fix the microphone route
Since commit e409dfbfccf9a49 ("ASoC: dapm: Add a few supply widget sanity checks") the following error is seen: imx-wm8962 sound: wm8962 <-> 202c000.ssi mapping ok imx-wm8962 sound: Connecting non-supply widget to supply widget is not supported (AMIC -> MICBIAS) imx-wm8962 sound: ASoC: no dapm match for AMIC --> (null) --> MICBIAS imx-wm8962 sound: ASoC: Failed to add route AMIC -> direct -> MICBIAS Invert the route between the microphone and the bias in order to fix it. While at it, align the audio routing with imx6sl-evk and imx6sx-sdb, which have the same wm8962 circuitry. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> (cherry picked from commit 76e68684ff8b3e8b07bbf9e38a99600e891774f5) Signed-off-by: Alex Shi <alex.shi@linaro.org>
-rw-r--r--arch/arm/boot/dts/imx6qdl-sabresd.dtsi6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index b2aad20d398d..0565921877ab 100644
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -109,10 +109,8 @@
"Headphone Jack", "HPOUTR",
"Ext Spk", "SPKOUTL",
"Ext Spk", "SPKOUTR",
- "MICBIAS", "AMIC",
- "IN3R", "MICBIAS",
- "DMIC", "MICBIAS",
- "DMICDAT", "DMIC";
+ "AMIC", "MICBIAS",
+ "IN3R", "AMIC";
mux-int-port = <2>;
mux-ext-port = <3>;
};