dts: zynqmp_mini: Add dts files for all mini u-boot qspi configurations

This patch adds dts files for all qspi configurations of ZynqMP mini
u-boot. This lets user to compile the required qspi configuration
image by specifying the DEVICE_TREE=<dts filename> along with make.

This patch renames zynqmp-mini-qspi dts to dtsi so that
it will be used in respective dts files. This also
needs to update defconfig and make files respectively

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index d68690e04fd3d3080c030a86507f94e4870f0214..52379e000378425539e1cb01f7b984d2d9810e4f 100644 (file)
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -131,7 +131,13 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += \
        zynqmp-zc1751-xm017-dc3.dtb             \
        zynqmp-zc1751-xm018-dc4.dtb             \
        zynqmp-zc1751-xm019-dc5.dtb             \
-       zynqmp-mini-qspi.dtb                    \
+       zynqmp-mini-qspi-parallel.dtb           \
+       zynqmp-mini-qspi-single.dtb             \
+       zynqmp-mini-qspi-stacked.dtb            \
+       zynqmp-mini-qspi-x1-single.dtb          \
+       zynqmp-mini-qspi-x1-stacked.dtb         \
+       zynqmp-mini-qspi-x2-single.dtb          \
+       zynqmp-mini-qspi-x2-stacked.dtb         \
        zynqmp-mini-nand.dtb                    \
        zynqmp-mini-emmc.dtb
 dtb-$(CONFIG_AM33XX) += am335x-boneblack.dtb am335x-bone.dtb \

diff --git a/arch/arm/dts/zynqmp-mini-qspi-parallel.dts b/arch/arm/dts/zynqmp-mini-qspi-parallel.dts
new file mode 100644 (file)
index 0000000..8152195
--- /dev/null
+++ b/arch/arm/dts/zynqmp-mini-qspi-parallel.dts
@@ -0,0 +1,14 @@
+/*
+ * Xilinx ZynqMP QSPI Quad Parallel DTS
+ *
+ * Copyright (C) 2015 - 2017 Xilinx, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include "zynqmp-mini-qspi.dtsi"
+
+&qspi {
+       is-dual = <1>;
+       spi-rx-bus-width = <4>;
+};

diff --git a/arch/arm/dts/zynqmp-mini-qspi-single.dts b/arch/arm/dts/zynqmp-mini-qspi-single.dts
new file mode 100644 (file)
index 0000000..7fde288
--- /dev/null
+++ b/arch/arm/dts/zynqmp-mini-qspi-single.dts
@@ -0,0 +1,13 @@
+/*
+ * Xilinx ZynqMP QSPI single DTS
+ *
+ * Copyright (C) 2015 - 2017 Xilinx, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include "zynqmp-mini-qspi.dtsi"
+
+&qspi {
+       spi-rx-bus-width = <4>;
+};

diff --git a/arch/arm/dts/zynqmp-mini-qspi-stacked.dts b/arch/arm/dts/zynqmp-mini-qspi-stacked.dts
new file mode 100644 (file)
index 0000000..d4204f7
--- /dev/null
+++ b/arch/arm/dts/zynqmp-mini-qspi-stacked.dts
@@ -0,0 +1,14 @@
+/*
+ * Xilinx ZynqMP QSPI Quad Stacked DTS
+ *
+ * Copyright (C) 2015 - 2017 Xilinx, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include "zynqmp-mini-qspi.dtsi"
+
+&qspi {
+       is-dual = <0>;
+       spi-rx-bus-width = <4>;
+};

diff --git a/arch/arm/dts/zynqmp-mini-qspi-x1-single.dts b/arch/arm/dts/zynqmp-mini-qspi-x1-single.dts
new file mode 100644 (file)
index 0000000..5a6338b
--- /dev/null
+++ b/arch/arm/dts/zynqmp-mini-qspi-x1-single.dts
@@ -0,0 +1,13 @@
+/*
+ * Xilinx ZynqMP QSPI x1 Single DTS
+ *
+ * Copyright (C) 2015 - 2017 Xilinx, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include "zynqmp-mini-qspi.dtsi"
+
+&qspi {
+       spi-rx-bus-width = <1>;
+};

diff --git a/arch/arm/dts/zynqmp-mini-qspi-x1-stacked.dts b/arch/arm/dts/zynqmp-mini-qspi-x1-stacked.dts
new file mode 100644 (file)
index 0000000..7498c73
--- /dev/null
+++ b/arch/arm/dts/zynqmp-mini-qspi-x1-stacked.dts
@@ -0,0 +1,14 @@
+/*
+ * Xilinx ZynqMP QSPI x1 Stacked DTS
+ *
+ * Copyright (C) 2015 - 2017 Xilinx, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include "zynqmp-mini-qspi.dtsi"
+
+&qspi {
+       is-dual = <0>;
+       spi-rx-bus-width = <1>;
+};

diff --git a/arch/arm/dts/zynqmp-mini-qspi-x2-single.dts b/arch/arm/dts/zynqmp-mini-qspi-x2-single.dts
new file mode 100644 (file)
index 0000000..9f644d9
--- /dev/null
+++ b/arch/arm/dts/zynqmp-mini-qspi-x2-single.dts
@@ -0,0 +1,13 @@
+/*
+ * Xilinx CSE QSPI x2 Single DTS
+ *
+ * Copyright (C) 2015 - 2017 Xilinx, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include "zynqmp-mini-qspi.dtsi"
+
+&qspi {
+       spi-rx-bus-width = <2>;
+};

diff --git a/arch/arm/dts/zynqmp-mini-qspi-x2-stacked.dts b/arch/arm/dts/zynqmp-mini-qspi-x2-stacked.dts
new file mode 100644 (file)
index 0000000..61d6642
--- /dev/null
+++ b/arch/arm/dts/zynqmp-mini-qspi-x2-stacked.dts
@@ -0,0 +1,14 @@
+/*
+ * Xilinx ZynqMP QSPI x2 Stacked DTS
+ *
+ * Copyright (C) 2015 - 2017 Xilinx, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include "zynqmp-mini-qspi.dtsi"
+
+&qspi {
+       is-dual = <0>;
+       spi-rx-bus-width = <2>;
+};

diff --git a/arch/arm/dts/zynqmp-mini-qspi.dts b/arch/arm/dts/zynqmp-mini-qspi.dtsi
similarity index 100%
rename from arch/arm/dts/zynqmp-mini-qspi.dts
rename to arch/arm/dts/zynqmp-mini-qspi.dtsi

diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig
index 4855cef3a0872ad509f4001d22630c1e92231e20..3191395be6511ba25828d359d5139ebd3c7235f1 100644 (file)
--- a/configs/xilinx_zynqmp_mini_qspi_defconfig
+++ b/configs/xilinx_zynqmp_mini_qspi_defconfig
@@ -4,7 +4,7 @@ CONFIG_ARCH_ZYNQMP=y
 CONFIG_ZYNQMP_QSPI=y
 # CONFIG_MMC is not set
 CONFIG_SYS_TEXT_BASE=0xFFFC0000
-CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-qspi"
+CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-qspi-single"
 CONFIG_SYS_EXTRA_OPTIONS="MINI_QSPI"
 CONFIG_BOOTDELAY=-1
 # CONFIG_DISPLAY_CPUINFO is not set