projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2a10aec)
MLK-13724: ARM: dts: fix audio error log in kernel boot up
authorShengjiu Wang <shengjiu.wang@freescale.com>
Wed, 11 Jan 2017 07:48:46 +0000 (15:48 +0800)
committerNitin Garg <nitin.garg@nxp.com>
Mon, 19 Mar 2018 19:58:21 +0000 (14:58 -0500)
Below error happen when boot up imx6ul/imx6ull 9x9 board. which is caused by
that dts is not updated in commit 0a4c5844f91de8 ("MLK-12059 ARM: dts:
imx6ul-14x14-evk: add mic detect gpio to support headset Jack")

[    1.871240] imx-wm8960 sound: ASoC: Failed to add route HP_L -> direct -> Headset Jack
[    1.884002] imx-wm8960 sound: ASoC: Failed to add route HP_R -> direct -> Headset Jack
[    1.896532] imx-wm8960 sound: ASoC: Failed to add route Hp MIC -> direct -> LINPUT2
[    1.909936] imx-wm8960 sound: ASoC: Failed to add route Hp MIC -> direct -> LINPUT3
[    1.923511] imx-wm8960 sound: ASoC: Failed to add route MICB -> direct -> Hp MIC

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
arch/arm/boot/dts/imx6ul-9x9-evk.dts patch | blob | history
arch/arm/boot/dts/imx6ull-9x9-evk.dts patch | blob | history

diff --git a/arch/arm/boot/dts/imx6ul-9x9-evk.dts b/arch/arm/boot/dts/imx6ul-9x9-evk.dts
index 8fefe99..874a3f8 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-9x9-evk.dts
+++ b/arch/arm/boot/dts/imx6ul-9x9-evk.dts
@@ -102,18 +102,19 @@
                 */
                hp-det = <3 0>;
                hp-det-gpios = <&gpio5 4 0>;
+               mic-det-gpios = <&gpio5 4 0>;
                audio-routing =
-                       "Headset Jack", "HP_L",
-                       "Headset Jack", "HP_R",
+                       "Headphone Jack", "HP_L",
+                       "Headphone Jack", "HP_R",
                        "Ext Spk", "SPK_LP",
                        "Ext Spk", "SPK_LN",
                        "Ext Spk", "SPK_RP",
                        "Ext Spk", "SPK_RN",
-                       "LINPUT2", "Hp MIC",
-                       "LINPUT3", "Hp MIC",
+                       "LINPUT2", "Mic Jack",
+                       "LINPUT3", "Mic Jack",
                        "RINPUT1", "Main MIC",
                        "RINPUT2", "Main MIC",
-                       "Hp MIC", "MICB",
+                       "Mic Jack", "MICB",
                        "Main MIC", "MICB",
                        "CPU-Playback", "ASRC-Playback",
                        "Playback", "CPU-Playback",
diff --git a/arch/arm/boot/dts/imx6ull-9x9-evk.dts b/arch/arm/boot/dts/imx6ull-9x9-evk.dts
index 8990293..a091f8e 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-9x9-evk.dts
+++ b/arch/arm/boot/dts/imx6ull-9x9-evk.dts
@@ -102,18 +102,19 @@
                 */
                hp-det = <3 0>;
                hp-det-gpios = <&gpio5 4 0>;
+               mic-det-gpios = <&gpio5 4 0>;
                audio-routing =
-                       "Headset Jack", "HP_L",
-                       "Headset Jack", "HP_R",
+                       "Headphone Jack", "HP_L",
+                       "Headphone Jack", "HP_R",
                        "Ext Spk", "SPK_LP",
                        "Ext Spk", "SPK_LN",
                        "Ext Spk", "SPK_RP",
                        "Ext Spk", "SPK_RN",
-                       "LINPUT2", "Hp MIC",
-                       "LINPUT3", "Hp MIC",
+                       "LINPUT2", "Mic Jack",
+                       "LINPUT3", "Mic Jack",
                        "RINPUT1", "Main MIC",
                        "RINPUT2", "Main MIC",
-                       "Hp MIC", "MICB",
+                       "Mic Jack", "MICB",
                        "Main MIC", "MICB",
                        "CPU-Playback", "ASRC-Playback",
                        "Playback", "CPU-Playback",