projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2da8a15)
MLK-11849: ARM: dts: fix the iomux issue in sai dts
authorHan Xu <b45815@freescale.com>
Tue, 10 Nov 2015 20:19:53 +0000 (14:19 -0600)
committerNitin Garg <nitin.garg@nxp.com>
Mon, 19 Mar 2018 19:49:13 +0000 (14:49 -0500)
some issue was involved when merging the commit to kernel 4.1

Signed-off-by: Han Xu <b45815@freescale.com>
arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts patch | blob | history

diff --git a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts
index 9b0d635..f1d36ce 100644 (file)
--- a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts
+++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts
@@ -21,7 +21,9 @@
 };
 
 &iomuxc {
-       pinctrl-0 = <&pinctrl_hog_1>;
+       pinctrl-names = "default", "sleep";
+       pinctrl-0 = <&pinctrl_hog_1 &pinctrl_hog_headphone_det>;
+       pinctrl-1 = <&pinctrl_hog_1 &pinctrl_hog_sd2_vselect>;
 };
 
 &sai1 {