spi: zynq_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/zynq-cse-qspi-stacked.dts b/arch/arm/dts/zynq-cse-qspi-stacked.dts
index e19bf3eae96e9e980638f14f0690610d4ccc7176..68bba697e370d30ea1a87a16f0b1221bc3eb5c0c 100644 (file)
--- a/arch/arm/dts/zynq-cse-qspi-stacked.dts
+++ b/arch/arm/dts/zynq-cse-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/zynq-cse-qspi-x1-stacked.dts b/arch/arm/dts/zynq-cse-qspi-x1-stacked.dts
index cf97fc44c1d0c4d0e251a268c5e21851be74cab5..885f034773684ad321a8579d5c04e3acb8ee1250 100644 (file)
--- a/arch/arm/dts/zynq-cse-qspi-x1-stacked.dts
+++ b/arch/arm/dts/zynq-cse-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/zynq-cse-qspi-x2-stacked.dts b/arch/arm/dts/zynq-cse-qspi-x2-stacked.dts
index 796449f2fefcfc0a8d82605865faae52441b7d80..9d2113e59272f63a309264c9a94935a982634bca 100644 (file)
--- a/arch/arm/dts/zynq-cse-qspi-x2-stacked.dts
+++ b/arch/arm/dts/zynq-cse-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/zynq_qspi.c b/drivers/spi/zynq_qspi.c
index a68afc84e682faf0b64d9734068cbfeb1414e777..6af2316a75c71c85595faf416815935ea9871878 100644 (file)
--- a/drivers/spi/zynq_qspi.c
+++ b/drivers/spi/zynq_qspi.c
@@ -166,7 +166,11 @@ static int zynq_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);