summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHan Xu <han.xu@nxp.com>2017-11-27 15:17:41 -0600
committerHan Xu <han.xu@nxp.com>2017-11-27 16:25:29 -0600
commitb3ec68c82b28cacd86291cf7210b0c5d19f16c44 (patch)
tree5abc3cc813315db18b1583a4075f1f2cf5186c01
parentc4e7ffe25d82af411c5e9cfc24e531c220fabfae (diff)
MLK-17006: arm64: dts: fix the imx8qxp nand pin conflict with usdhc1
fix the pin conflict between nand and usdhc1 on imx8qxp validation board. BuildInfo: - SCFW daea284c, IMX-MKIMAGE 90fbac1a, ATF - U-Boot 2017.03-00713-g345bcc2 Signed-off-by: Han Xu <han.xu@nxp.com> (cherry picked from commit a966a9c4ceca41e604b7896d1689b2608afe5683)
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-imx8qxp-lpddr4-arm2-gpmi-nand.dts6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-lpddr4-arm2-gpmi-nand.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-lpddr4-arm2-gpmi-nand.dts
index b85c69df7527..3169b617d102 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-lpddr4-arm2-gpmi-nand.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-lpddr4-arm2-gpmi-nand.dts
@@ -56,7 +56,11 @@
nand-on-flash-bbt;
};
-/* Disabled the usdhc2 since pin conflict */
+/* Disabled the usdhc1/usdhc2 since pin conflict */
+&usdhc1 {
+ status = "disabled";
+};
+
&usdhc2 {
status = "disabled";
};