zynqmp: mini_qspi: Fix overwriting spi-rx-bus-width property

spi-rx-bus-width property is part of flash, so it should be moved
to flash node from qspi node. This patch fixes the incorrect read
of spi-rx-bus-width property by moving it to flash node.

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 81521954680a3877f679c22d6f8e75cd9d96cbf4..5076f859d4b9d54129497c81b80b2757b73223ae 100644 (file)
--- a/arch/arm/dts/zynqmp-mini-qspi-parallel.dts
+++ b/arch/arm/dts/zynqmp-mini-qspi-parallel.dts
@@ -10,5 +10,8 @@
 
 &qspi {
        is-dual = <1>;
+};
+
+&flash0 {
        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
index 7fde288b9032add1ddd4c6651e37ed48a4e15efc..0707b4f71e8737757cd3abeff6aaf9633f822d1d 100644 (file)
--- a/arch/arm/dts/zynqmp-mini-qspi-single.dts
+++ b/arch/arm/dts/zynqmp-mini-qspi-single.dts
@@ -8,6 +8,6 @@
 
 #include "zynqmp-mini-qspi.dtsi"
 
-&qspi {
+&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 1f3ac3ee6cba6b18d537c320f33c31223b26fdb1..e3e84df96ad8aa5bd725c7a90de0f5553f1247e6 100644 (file)
--- a/arch/arm/dts/zynqmp-mini-qspi-stacked.dts
+++ b/arch/arm/dts/zynqmp-mini-qspi-stacked.dts
@@ -11,5 +11,8 @@
 &qspi {
        is-dual = <0>;
        is-stacked = <1>;
+};
+
+&flash0 {
        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
index 5a6338bf3a469225508591a7c4d1b05dcc3b7a5a..759d2d0e2e72ce02fa039d766748f11adfa845f3 100644 (file)
--- a/arch/arm/dts/zynqmp-mini-qspi-x1-single.dts
+++ b/arch/arm/dts/zynqmp-mini-qspi-x1-single.dts
@@ -8,6 +8,6 @@
 
 #include "zynqmp-mini-qspi.dtsi"
 
-&qspi {
+&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 ce3f803b807e0eeccaf1f821a704cf2a1fc17ef3..3a581dfb661745145bbd59bd31968eb1f0e5d1f0 100644 (file)
--- a/arch/arm/dts/zynqmp-mini-qspi-x1-stacked.dts
+++ b/arch/arm/dts/zynqmp-mini-qspi-x1-stacked.dts
@@ -11,5 +11,8 @@
 &qspi {
        is-dual = <0>;
        is-stacked = <1>;
+};
+
+&flash0 {
        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
index 9f644d9f4ef731a01c4d8b1d03fb443c17c13b39..b939b43553ff86676c4866f7476ec2647dfb7c24 100644 (file)
--- a/arch/arm/dts/zynqmp-mini-qspi-x2-single.dts
+++ b/arch/arm/dts/zynqmp-mini-qspi-x2-single.dts
@@ -8,6 +8,6 @@
 
 #include "zynqmp-mini-qspi.dtsi"
 
-&qspi {
+&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 692a488cbc7bc8fea163c0ffbffdffce0549c007..d8abf3faf398ff87faac3d1d1978cde666aed1c1 100644 (file)
--- a/arch/arm/dts/zynqmp-mini-qspi-x2-stacked.dts
+++ b/arch/arm/dts/zynqmp-mini-qspi-x2-stacked.dts
@@ -11,5 +11,8 @@
 &qspi {
        is-dual = <0>;
        is-stacked = <1>;
+};
+
+&flash0 {
        spi-rx-bus-width = <2>;
 };

diff --git a/arch/arm/dts/zynqmp-mini-qspi.dtsi b/arch/arm/dts/zynqmp-mini-qspi.dtsi
index 17187bb966aeea188a5c56b43902e50319d3f82b..f3da86fdb356f0419f44f9edc2fde03f7a3e1e41 100644 (file)
--- a/arch/arm/dts/zynqmp-mini-qspi.dtsi
+++ b/arch/arm/dts/zynqmp-mini-qspi.dtsi
@@ -64,7 +64,7 @@
 
 &qspi {
        status = "okay";
-       flash@0 {
+       flash0: flash@0 {
                compatible = "n25q512a11";
                #address-cells = <1>;
                #size-cells = <1>;