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>

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 b85c69d..3169b61 100644 (file)
--- 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";
 };