MLK-12897: ARM: dts: add one more dts for all qspi chip support on i.MX6ULL

change the qspi dts for default one qspi scenario and add one more for
all four qspi chip support.

Signed-off-by: Han Xu <han.xu@nxp.com>

3 files changed, 19 insertions, 9 deletions

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 10045c27e1d0..95841a806dfb 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -387,6 +387,7 @@ dtb-$(CONFIG_SOC_IMX6ULL) += \
 	imx6ull-14x14-ddr3-arm2-lcdif.dtb \
 	imx6ull-14x14-ddr3-arm2-ldo.dtb \
 	imx6ull-14x14-ddr3-arm2-qspi.dtb \
+	imx6ull-14x14-ddr3-arm2-qspi-all.dtb \
 	imx6ull-14x14-ddr3-arm2-tsc.dtb \
 	imx6ull-14x14-ddr3-arm2-uart2.dtb \
 	imx6ull-14x14-ddr3-arm2-usb.dtb \
diff --git a/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-qspi-all.dts b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-qspi-all.dts
new file mode 100644
index 000000000000..a4cdbe588d83
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-qspi-all.dts
@@ -0,0 +1,18 @@
+/*
+ * 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.
+ */
+
+#define REWORKED_ENABLE_ALL_QSPI
+#include "imx6ull-14x14-ddr3-arm2.dts"
+
+&gpmi {
+	status ="disabled";
+};
+
+&usdhc2{
+	status ="disabled";
+};
diff --git a/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-qspi.dts b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-qspi.dts
index a4cdbe588d83..2155c7af1b77 100644
--- a/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-qspi.dts
+++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-qspi.dts
@@ -6,13 +6,4 @@
  * published by the Free Software Foundation.
  */
 
-#define REWORKED_ENABLE_ALL_QSPI
 #include "imx6ull-14x14-ddr3-arm2.dts"
-
-&gpmi {
-	status ="disabled";
-};
-
-&usdhc2{
-	status ="disabled";
-};