arm64: zynqmp: Remove zynqmp-mini-qspi.dtsi file

This patch removes zynqmp-mini-qspi.dtsi files as it has
same content as zynqmp-mini-qspi.dts file and there is no
need to maintain two, if .dts can be included in all files
instead of .dtsi. So, this patch removes .dtsi inclusion with
.dts in all files.

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

diff --git a/arch/arm/dts/zynqmp-mini-qspi-parallel.dts b/arch/arm/dts/zynqmp-mini-qspi-parallel.dts
index b2fde116444824303ccdc491b0c0ce57d09e29ac..68c0e5c2e60d1bea7b4a489190da698b6df52224 100644 (file)
--- 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 6e35bc675f23939a59a130b0d0afbb58199af850..552c790f50a46aa976620968fb1c5d3015485ec0 100644 (file)
--- 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 aaf0a188f2f19544d70b2c377879fda88d92d8ec..73d06e6a4b3c2e878cbfef54dfb2571a215a7bfb 100644 (file)
--- 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 368abd5a8dc6ba2df4a73defc12cba9298590e52..eb4cabb2e6511f1726b2ba86fc4139b1d2dcc61f 100644 (file)
--- 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 4f44dda6f0f103c6ae783d2f561b3129c1be6c11..8ba20990b792b4376a417a00768c48e40241b801 100644 (file)
--- 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 37b9d6063aaa5c8a014d8c8835de37b74220fc8e..b642ffe3e2512b0d339d96f70a4e661c0b678968 100644 (file)
--- 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 7d4607f64a1918b5994c5b04fb49ed1082628118..a28c8ec61297f6357e07e5bdd02db5e28aa12015 100644 (file)
--- 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 (file)
index e68803b..0000000
--- 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";
-};