diff --git a/arch/arm/dts/zynqmp-mini-qspi-parallel.dts b/arch/arm/dts/zynqmp-mini-qspi-parallel.dts
index b2fde11644..68c0e5c2e6 100644
--- a/arch/arm/dts/zynqmp-mini-qspi-parallel.dts
+++ b/arch/arm/dts/zynqmp-mini-qspi-parallel.dts
@@ -5,7 +5,7 @@
  * Copyright (C) 2015 - 2017 Xilinx, Inc.
  */
 
-#include "zynqmp-mini-qspi.dtsi"
+#include "zynqmp-mini-qspi.dts"
 
 &qspi {
 	is-dual = <1>;
diff --git a/arch/arm/dts/zynqmp-mini-qspi-single.dts b/arch/arm/dts/zynqmp-mini-qspi-single.dts
index 6e35bc675f..552c790f50 100644
--- a/arch/arm/dts/zynqmp-mini-qspi-single.dts
+++ b/arch/arm/dts/zynqmp-mini-qspi-single.dts
@@ -5,7 +5,7 @@
  * Copyright (C) 2015 - 2017 Xilinx, Inc.
  */
 
-#include "zynqmp-mini-qspi.dtsi"
+#include "zynqmp-mini-qspi.dts"
 
 &flash0 {
 	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
index aaf0a188f2..73d06e6a4b 100644
--- a/arch/arm/dts/zynqmp-mini-qspi-stacked.dts
+++ b/arch/arm/dts/zynqmp-mini-qspi-stacked.dts
@@ -5,7 +5,7 @@
  * Copyright (C) 2015 - 2017 Xilinx, Inc.
  */
 
-#include "zynqmp-mini-qspi.dtsi"
+#include "zynqmp-mini-qspi.dts"
 
 &qspi {
 	is-dual = <0>;
diff --git a/arch/arm/dts/zynqmp-mini-qspi-x1-single.dts b/arch/arm/dts/zynqmp-mini-qspi-x1-single.dts
index 368abd5a8d..eb4cabb2e6 100644
--- a/arch/arm/dts/zynqmp-mini-qspi-x1-single.dts
+++ b/arch/arm/dts/zynqmp-mini-qspi-x1-single.dts
@@ -5,7 +5,7 @@
  * Copyright (C) 2015 - 2017 Xilinx, Inc.
  */
 
-#include "zynqmp-mini-qspi.dtsi"
+#include "zynqmp-mini-qspi.dts"
 
 &flash0 {
 	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
index 4f44dda6f0..8ba20990b7 100644
--- a/arch/arm/dts/zynqmp-mini-qspi-x1-stacked.dts
+++ b/arch/arm/dts/zynqmp-mini-qspi-x1-stacked.dts
@@ -5,7 +5,7 @@
  * Copyright (C) 2015 - 2017 Xilinx, Inc.
  */
 
-#include "zynqmp-mini-qspi.dtsi"
+#include "zynqmp-mini-qspi.dts"
 
 &qspi {
 	is-dual = <0>;
diff --git a/arch/arm/dts/zynqmp-mini-qspi-x2-single.dts b/arch/arm/dts/zynqmp-mini-qspi-x2-single.dts
index 37b9d6063a..b642ffe3e2 100644
--- a/arch/arm/dts/zynqmp-mini-qspi-x2-single.dts
+++ b/arch/arm/dts/zynqmp-mini-qspi-x2-single.dts
@@ -5,7 +5,7 @@
  * Copyright (C) 2015 - 2017 Xilinx, Inc.
  */
 
-#include "zynqmp-mini-qspi.dtsi"
+#include "zynqmp-mini-qspi.dts"
 
 &flash0 {
 	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
index 7d4607f64a..a28c8ec612 100644
--- a/arch/arm/dts/zynqmp-mini-qspi-x2-stacked.dts
+++ b/arch/arm/dts/zynqmp-mini-qspi-x2-stacked.dts
@@ -5,7 +5,7 @@
  * Copyright (C) 2015 - 2017 Xilinx, Inc.
  */
 
-#include "zynqmp-mini-qspi.dtsi"
+#include "zynqmp-mini-qspi.dts"
 
 &qspi {
 	is-dual = <0>;
diff --git a/arch/arm/dts/zynqmp-mini-qspi.dtsi b/arch/arm/dts/zynqmp-mini-qspi.dtsi
deleted file mode 100644
index e68803b43a..0000000000
--- a/arch/arm/dts/zynqmp-mini-qspi.dtsi
+++ /dev/null
@@ -1,95 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * dts file for Xilinx ZynqMP Mini Configuration
- *
- * (C) Copyright 2015, Xilinx, Inc.
- *
- * Siva Durga Prasad <siva.durga.paladugu@xilinx.com>
- * Michal Simek <michal.simek@xilinx.com>
- */
-
-/dts-v1/;
-
-/ {
-	model = "ZynqMP MINI QSPI";
-	compatible = "xlnx,zynqmp";
-	#address-cells = <2>;
-	#size-cells = <1>;
-
-	aliases {
-		serial0 = &dcc;
-		spi0 = &qspi;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
-	memory@0 {
-		device_type = "memory";
-		reg = <0x0 0x0 0x40000000>;
-	};
-
-	dcc: dcc {
-		compatible = "arm,dcc";
-		status = "disabled";
-		u-boot,dm-pre-reloc;
-	};
-
-	amba: amba {
-		compatible = "simple-bus";
-		#address-cells = <2>;
-		#size-cells = <1>;
-		ranges;
-
-		qspi: spi@ff0f0000 {
-			compatible = "xlnx,zynqmp-qspi-1.0";
-			status = "disabled";
-			clock-names = "ref_clk", "pclk";
-			clocks = <&misc_clk &misc_clk>;
-			num-cs = <1>;
-			reg = <0x0 0xff0f0000 0x1000 0x0 0xc0000000 0x8000000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-		};
-
-		misc_clk: misc_clk {
-			compatible = "fixed-clock";
-			#clock-cells = <0>;
-			clock-frequency = <125000000>;
-		};
-	};
-};
-
-&qspi {
-	status = "okay";
-	flash0: flash@0 {
-		compatible = "n25q512a11";
-		#address-cells = <1>;
-		#size-cells = <1>;
-		reg = <0x0>;
-		spi-tx-bus-width = <1>;
-		spi-rx-bus-width = <4>;
-		spi-max-frequency = <10000000>;
-		partition@qspi-fsbl-uboot { /* for testing purpose */
-			label = "qspi-fsbl-uboot";
-			reg = <0x0 0x100000>;
-		};
-		partition@qspi-linux { /* for testing purpose */
-			label = "qspi-linux";
-			reg = <0x100000 0x500000>;
-		};
-		partition@qspi-device-tree { /* for testing purpose */
-			label = "qspi-device-tree";
-			reg = <0x600000 0x20000>;
-		};
-		partition@qspi-rootfs { /* for testing purpose */
-			label = "qspi-rootfs";
-			reg = <0x620000 0x5E0000>;
-		};
-	};
-};
-
-&dcc {
-	status = "okay";
-};