spi: zynqmp_qspi: Determine stacked mode using is-stacked

Determine stacked configuration using is-stacked property in dts
Incase if is-stacked is not defined in dts, default to single
mode. This change was done in order to be aligned with kernel.
Modified the required dts files as well.

Signed-off-by: Vipul Kumar <vipulk@xilinx.com>
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/zynqmp-mini-qspi-stacked.dts b/arch/arm/dts/zynqmp-mini-qspi-stacked.dts
index d4204f72a5a41a307e8516bca01311f5bd401a68..1f3ac3ee6cba6b18d537c320f33c31223b26fdb1 100644 (file)
--- a/arch/arm/dts/zynqmp-mini-qspi-stacked.dts
+++ b/arch/arm/dts/zynqmp-mini-qspi-stacked.dts
@@ -10,5 +10,6 @@
 
 &qspi {
        is-dual = <0>;
+       is-stacked = <1>;
        spi-rx-bus-width = <4>;
 };

diff --git a/arch/arm/dts/zynqmp-mini-qspi-x1-stacked.dts b/arch/arm/dts/zynqmp-mini-qspi-x1-stacked.dts
index 7498c73931901f5df4fbcf4222efa53a664de3c7..ce3f803b807e0eeccaf1f821a704cf2a1fc17ef3 100644 (file)
--- a/arch/arm/dts/zynqmp-mini-qspi-x1-stacked.dts
+++ b/arch/arm/dts/zynqmp-mini-qspi-x1-stacked.dts
@@ -10,5 +10,6 @@
 
 &qspi {
        is-dual = <0>;
+       is-stacked = <1>;
        spi-rx-bus-width = <1>;
 };

diff --git a/arch/arm/dts/zynqmp-mini-qspi-x2-stacked.dts b/arch/arm/dts/zynqmp-mini-qspi-x2-stacked.dts
index 61d66423892a5cce625ed692ae01663625f3ffd0..692a488cbc7bc8fea163c0ffbffdffce0549c007 100644 (file)
--- a/arch/arm/dts/zynqmp-mini-qspi-x2-stacked.dts
+++ b/arch/arm/dts/zynqmp-mini-qspi-x2-stacked.dts
@@ -10,5 +10,6 @@
 
 &qspi {
        is-dual = <0>;
+       is-stacked = <1>;
        spi-rx-bus-width = <2>;
 };

diff --git a/drivers/spi/zynqmp_qspi.c b/drivers/spi/zynqmp_qspi.c
index eef4ba940dd95df18db4ba11509524fae05146cf..e01a3c79b05968e8c912c5cfc99c9e1794c6c38e 100644 (file)
--- a/drivers/spi/zynqmp_qspi.c
+++ b/drivers/spi/zynqmp_qspi.c
@@ -213,7 +213,11 @@ static int zynqmp_qspi_ofdata_to_platdata(struct udevice *bus)
        else if (is_dual == 1)
                plat->is_dual = SF_DUAL_PARALLEL_FLASH;
        else
-               plat->is_dual = SF_DUAL_STACKED_FLASH;
+               if (fdtdec_get_int(gd->fdt_blob, bus->of_offset,
+                                  "is-stacked", -1) < 0)
+                       plat->is_dual = SF_SINGLE_FLASH;
+               else
+                       plat->is_dual = SF_DUAL_STACKED_FLASH;
 
        offset = fdt_first_subnode(gd->fdt_blob, bus->of_offset);