MLK-11415: ARM: dts: fix the pinctrl conflict on i.MX7D 12x12 lpddr3 ARM2 board

fix the pin conflict between ECSPI with MIPI and EPDC on i.MX7D 12x12 lpddr3 ARM2 board.

Signed-off-by: Han Xu <b45815@freescale.com>

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 f1d36ce..9b0d635 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,9 +21,7 @@
 };
 
 &iomuxc {
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&pinctrl_hog_1 &pinctrl_hog_headphone_det>;
-       pinctrl-1 = <&pinctrl_hog_1 &pinctrl_hog_sd2_vselect>;
+       pinctrl-0 = <&pinctrl_hog_1>;
 };
 
 &sai1 {

diff --git a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
index f569433..d8d6897 100644 (file)
--- a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
+++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
@@ -427,8 +427,8 @@
 
 &iomuxc {
        pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&pinctrl_hog_1 &pinctrl_hog &pinctrl_hog_sd2_vselect &pinctrl_hog_mipi>;
-       pinctrl-1 = <&pinctrl_hog_1 &pinctrl_hog &pinctrl_hog_sd2_vselect &pinctrl_hog_mipi>;
+       pinctrl-0 = <&pinctrl_hog_1 &pinctrl_hog_sd2_vselect &pinctrl_hog_mipi>;
+       pinctrl-1 = <&pinctrl_hog_1 &pinctrl_hog_sd2_vselect &pinctrl_hog_mipi>;
 
        imx7d-12x12-lpddr3-arm2 {