arm64: zynqmp: Aligned QSPI configuration with latest spec

Official DT binding description for dual stacked/paralllel configurations
have been merged that's why switch to it.

Link: https://lore.kernel.org/r/20220126112608.955728-3-miquel.raynal@bootlin.com
Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/2912091c231f5e945ee44601c285fe16263448da.1695378830.git.michal.simek@amd.com

diff --git a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
index 4fcb466055374c528292bf8b81e1b2a87cf26154..e72ed50b1cb214c6878c3e6b2ef2667f0c682ad7 100644 (file)
--- a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
+++ b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
@@ -354,11 +354,13 @@
 
 &qspi {
        status = "okay";
+       num-cs = <2>;
        flash@0 {
                compatible = "m25p80", "jedec,spi-nor"; /* Micron MT25QU512ABB8ESF */
                #address-cells = <1>;
                #size-cells = <1>;
-               reg = <0x0>;
+               reg = <0>, <1>;
+               parallel-memories = /bits/ 64 <0x4000000 0x4000000>; /* 64MB */
                spi-tx-bus-width = <4>;
                spi-rx-bus-width = <4>;
                spi-max-frequency = <108000000>; /* Based on DC1 spec */

diff --git a/arch/arm/dts/zynqmp-zcu102-revA.dts b/arch/arm/dts/zynqmp-zcu102-revA.dts
index 025e6519ea6aa4bb78be0fc5a01272556cebf037..be75ca6443d895fd110ddbfe1928d932d689f87e 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu102-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu102-revA.dts
@@ -972,11 +972,13 @@
 &qspi {
        status = "okay";
        is-dual = <1>;
+       num-cs = <2>;
        flash@0 {
                compatible = "m25p80", "jedec,spi-nor"; /* 32MB */
                #address-cells = <1>;
                #size-cells = <1>;
-               reg = <0x0>;
+               reg = <0>, <1>;
+               parallel-memories = /bits/ 64 <0x4000000 0x4000000>; /* 64MB */
                spi-tx-bus-width = <4>;
                spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */
                spi-max-frequency = <108000000>; /* Based on DC1 spec */

diff --git a/arch/arm/dts/zynqmp-zcu106-revA.dts b/arch/arm/dts/zynqmp-zcu106-revA.dts
index 776373d517b35949f5fdb025c61f2fcf14be6c75..6cae681dc29f0ddaa8a75ce4ec2dc82e770c5dcd 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu106-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu106-revA.dts
@@ -979,11 +979,13 @@
 &qspi {
        status = "okay";
        is-dual = <1>;
+       num-cs = <2>;
        flash@0 {
                compatible = "m25p80", "jedec,spi-nor"; /* 32MB */
                #address-cells = <1>;
                #size-cells = <1>;
-               reg = <0x0>;
+               reg = <0>, <1>;
+               parallel-memories = /bits/ 64 <0x4000000 0x4000000>; /* 64MB */
                spi-tx-bus-width = <4>;
                spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */
                spi-max-frequency = <108000000>; /* Based on DC1 spec */

diff --git a/arch/arm/dts/zynqmp-zcu111-revA.dts b/arch/arm/dts/zynqmp-zcu111-revA.dts
index 62a8be9a537f528df8253b8a48eb5104be33d49a..d08865203ecfe17aa86178d8ac421dbeef2ef437 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu111-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu111-revA.dts
@@ -790,11 +790,13 @@
 &qspi {
        status = "okay";
        is-dual = <1>;
+       num-cs = <2>;
        flash@0 {
                compatible = "m25p80", "jedec,spi-nor"; /* 32MB */
                #address-cells = <1>;
                #size-cells = <1>;
-               reg = <0x0>;
+               reg = <0>, <1>;
+               parallel-memories = /bits/ 64 <0x10000000 0x10000000>; /* 256MB */
                spi-tx-bus-width = <4>;
                spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */
                spi-max-frequency = <108000000>; /* Based on DC1 spec */

diff --git a/arch/arm/dts/zynqmp-zcu208-revA.dts b/arch/arm/dts/zynqmp-zcu208-revA.dts
index 0c1f50943ac067c17944bf11a38f90ad40cd55ad..702888177a1fe7687eebbe66c8d91ee37b02f3d7 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu208-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu208-revA.dts
@@ -644,11 +644,13 @@
 &qspi {
        status = "okay";
        is-dual = <1>;
+       num-cs = <2>;
        flash@0 {
                compatible = "m25p80", "jedec,spi-nor"; /* U11 and U12 MT25QU02GCBBE12 1Gb */
                #address-cells = <1>;
                #size-cells = <1>;
-               reg = <0>;
+               reg = <0>, <1>;
+               parallel-memories = /bits/ 64 <0x10000000 0x10000000>; /* 256MB */
                spi-tx-bus-width = <4>;
                spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */
                spi-max-frequency = <108000000>; /* Based on DC1 spec */

diff --git a/arch/arm/dts/zynqmp-zcu216-revA.dts b/arch/arm/dts/zynqmp-zcu216-revA.dts
index 8ca01f01a3ab57eee46b5f4cbab8f6d1cd8ed38b..989ac28c106b5c3e813c7209e32ee5a8f63d02ff 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu216-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu216-revA.dts
@@ -654,11 +654,13 @@
 &qspi {
        status = "okay";
        is-dual = <1>;
+       num-cs = <2>;
        flash@0 {
                compatible = "m25p80", "jedec,spi-nor"; /* U11 and U12 MT25QU02GCBBE12 1Gb */
                #address-cells = <1>;
                #size-cells = <1>;
-               reg = <0x0>;
+               reg = <0>, <1>;
+               parallel-memories = /bits/ 64 <0x10000000 0x10000000>; /* 256MB */
                spi-tx-bus-width = <4>;
                spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */
                spi-max-frequency = <108000000>; /* Based on DC1 spec */