MLK-13013: arm: dts: new dts for gpmi nand support on i.MX6ULL EVK reworked board

Enable NAND for i.MX6ULL EVK board which need to be reworked due to the
pin conflict with QSPI and SD2.

Signed-off-by: Han Xu <han.xu@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index b59df75..1ac360e 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -635,7 +635,8 @@ dtb-$(CONFIG_SOC_IMX6ULL) += \
        imx6ull-14x14-ddr3-arm2-usb.dtb \
        imx6ull-14x14-ddr3-arm2-wm8958.dtb \
        imx6ull-14x14-evk.dtb \
-       imx6ull-14x14-evk-btwifi.dtb
+       imx6ull-14x14-evk-btwifi.dtb \
+       imx6ull-14x14-evk-gpmi-weim.dtb
 dtb-$(CONFIG_SOC_IMX7D) += \
        imx7d-cl-som-imx7.dtb \
        imx7d-colibri-emmc-eval-v3.dtb \

diff --git a/arch/arm/boot/dts/imx6ull-14x14-evk-gpmi-weim.dts b/arch/arm/boot/dts/imx6ull-14x14-evk-gpmi-weim.dts
new file mode 100644 (file)
index 0000000..924696e
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ull-14x14-evk-gpmi-weim.dts
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2016 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "imx6ull-14x14-evk.dts"
+
+&gpmi {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_gpmi_nand_1>;
+       status = "okay";
+       nand-on-flash-bbt;
+};
+
+&iomuxc {
+       imx6ull-evk-gpmi-rework {
+               pinctrl_gpmi_nand_1: gpmi-nand-1 {
+                       fsl,pins = <
+                               MX6UL_PAD_NAND_CLE__RAWNAND_CLE         0xb0b1
+                               MX6UL_PAD_NAND_ALE__RAWNAND_ALE         0xb0b1
+                               MX6UL_PAD_NAND_WP_B__RAWNAND_WP_B       0xb0b1
+                               MX6UL_PAD_NAND_READY_B__RAWNAND_READY_B 0xb000
+                               MX6UL_PAD_NAND_CE0_B__RAWNAND_CE0_B     0xb0b1
+                               MX6UL_PAD_NAND_CE1_B__RAWNAND_CE1_B     0xb0b1
+                               MX6UL_PAD_NAND_RE_B__RAWNAND_RE_B       0xb0b1
+                               MX6UL_PAD_NAND_WE_B__RAWNAND_WE_B       0xb0b1
+                               MX6UL_PAD_NAND_DATA00__RAWNAND_DATA00   0xb0b1
+                               MX6UL_PAD_NAND_DATA01__RAWNAND_DATA01   0xb0b1
+                               MX6UL_PAD_NAND_DATA02__RAWNAND_DATA02   0xb0b1
+                               MX6UL_PAD_NAND_DATA03__RAWNAND_DATA03   0xb0b1
+                               MX6UL_PAD_NAND_DATA04__RAWNAND_DATA04   0xb0b1
+                               MX6UL_PAD_NAND_DATA05__RAWNAND_DATA05   0xb0b1
+                               MX6UL_PAD_NAND_DATA06__RAWNAND_DATA06   0xb0b1
+                               MX6UL_PAD_NAND_DATA07__RAWNAND_DATA07   0xb0b1
+                       >;
+               };
+       };
+};
+
+&qspi {
+       status = "disabled";
+};
+
+&usdhc2 {
+       status = "disabled";
+};