ARM: zynq: Add partition description

Xilinx is using standard mtd partition layout for quite a long time. It is
used for testing purpose on evaluation boards.
Also #address/size-cells shouldn't be present without nodes which should
use them that's why move them from zynq-7000.dtsi to nand/nor nodes
directly.

The patch was tested on zc706 and zedboard(with also increasing max
frequency and rx bus width).

Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/4c3348981bba32d3892194420d78fe8621c47534.1698837725.git.michal.simek@amd.com

diff --git a/arch/arm/dts/bitmain-antminer-s9.dts b/arch/arm/dts/bitmain-antminer-s9.dts
index 0228b4b30e5ba95ce834360f79a638485b500161..f5ad95a276b6135daa8f7ea2cc9464085a4460f5 100644 (file)
--- a/arch/arm/dts/bitmain-antminer-s9.dts
+++ b/arch/arm/dts/bitmain-antminer-s9.dts
@@ -52,6 +52,8 @@
 
 &nfc0 {
        status = "okay";
+       #address-cells = <1>;
+       #size-cells = <0>;
        nand@0 {
                reg = <0>;
        };

diff --git a/arch/arm/dts/zynq-7000.dtsi b/arch/arm/dts/zynq-7000.dtsi
index fb61fe98e3dead2abe2998f9ef69da2e904215f8..f8c786ab0b7b99ef65cf42a38b15044b43ce0681 100644 (file)
--- a/arch/arm/dts/zynq-7000.dtsi
+++ b/arch/arm/dts/zynq-7000.dtsi
@@ -306,15 +306,11 @@
                                compatible = "arm,pl353-nand-r2p1";
                                reg = <0 0 0x1000000>;
                                status = "disabled";
-                               #address-cells = <1>;
-                               #size-cells = <0>;
                        };
                        nor0: flash@1,0 {
                                status = "disabled";
                                compatible = "cfi-flash";
                                reg = <1 0 0x2000000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                        };
                };
 

diff --git a/arch/arm/dts/zynq-zc702.dts b/arch/arm/dts/zynq-zc702.dts
index 8d47f24b757b50fe17dc9b3c3d85f906a462b9cf..0106d7bb177878764a634f03c4d6263505f6a8c3 100644 (file)
--- a/arch/arm/dts/zynq-zc702.dts
+++ b/arch/arm/dts/zynq-zc702.dts
@@ -406,6 +406,31 @@
                spi-tx-bus-width = <1>;
                spi-rx-bus-width = <4>;
                spi-max-frequency = <50000000>;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       partition@0 {
+                               label = "qspi-fsbl-uboot";
+                               reg = <0x0 0x100000>;
+                       };
+                       partition@100000 {
+                               label = "qspi-linux";
+                               reg = <0x100000 0x500000>;
+                       };
+                       partition@600000 {
+                               label = "qspi-device-tree";
+                               reg = <0x600000 0x20000>;
+                       };
+                       partition@620000 {
+                               label = "qspi-rootfs";
+                               reg = <0x620000 0x5e0000>;
+                       };
+                       partition@c00000 {
+                               label = "qspi-bitstream";
+                               reg = <0xc00000 0x400000>;
+                       };
+               };
        };
 };
 

diff --git a/arch/arm/dts/zynq-zc706.dts b/arch/arm/dts/zynq-zc706.dts
index 18963a395156cc417e68e2ebb473068ac966b6f9..ceea982546e8c0ed173d38d23b8cae261c6b7a17 100644 (file)
--- a/arch/arm/dts/zynq-zc706.dts
+++ b/arch/arm/dts/zynq-zc706.dts
@@ -317,6 +317,31 @@
                spi-tx-bus-width = <1>;
                spi-rx-bus-width = <4>;
                spi-max-frequency = <50000000>;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       partition@0 {
+                               label = "qspi-fsbl-uboot";
+                               reg = <0x0 0x100000>;
+                       };
+                       partition@100000 {
+                               label = "qspi-linux";
+                               reg = <0x100000 0x500000>;
+                       };
+                       partition@600000 {
+                               label = "qspi-device-tree";
+                               reg = <0x600000 0x20000>;
+                       };
+                       partition@620000 {
+                               label = "qspi-rootfs";
+                               reg = <0x620000 0x5e0000>;
+                       };
+                       partition@c00000 {
+                               label = "qspi-bitstream";
+                               reg = <0xc00000 0x400000>;
+                       };
+               };
        };
 };
 

diff --git a/arch/arm/dts/zynq-zc770-xm010.dts b/arch/arm/dts/zynq-zc770-xm010.dts
index 17680d7f8ec80fa6155b024272e9972dc8e5f64e..199384bec9674a8bd3ebe334ad42322f5f5a850f 100644 (file)
--- a/arch/arm/dts/zynq-zc770-xm010.dts
+++ b/arch/arm/dts/zynq-zc770-xm010.dts
@@ -69,6 +69,31 @@
                spi-tx-bus-width = <1>;
                spi-rx-bus-width = <4>;
                spi-max-frequency = <50000000>;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       partition@0 {
+                               label = "qspi-fsbl-uboot";
+                               reg = <0x0 0x100000>;
+                       };
+                       partition@100000 {
+                               label = "qspi-linux";
+                               reg = <0x100000 0x500000>;
+                       };
+                       partition@600000 {
+                               label = "qspi-device-tree";
+                               reg = <0x600000 0x20000>;
+                       };
+                       partition@620000 {
+                               label = "qspi-rootfs";
+                               reg = <0x620000 0x5e0000>;
+                       };
+                       partition@c00000 {
+                               label = "qspi-bitstream";
+                               reg = <0xc00000 0x400000>;
+                       };
+               };
        };
 };
 

diff --git a/arch/arm/dts/zynq-zc770-xm011.dts b/arch/arm/dts/zynq-zc770-xm011.dts
index d1e971254e51b0514c3fbb2bec6b54925ffc1b90..f9a086fe66d3edd131de94eb2dfcf16d95537a91 100644 (file)
--- a/arch/arm/dts/zynq-zc770-xm011.dts
+++ b/arch/arm/dts/zynq-zc770-xm011.dts
@@ -49,8 +49,27 @@
 
 &nfc0 {
        status = "okay";
+       #address-cells = <1>;
+       #size-cells = <0>;
        nand@0 {
                reg = <0>;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       partition@0 {
+                               label = "nand-fsbl-uboot";
+                               reg = <0x0 0x1000000>;
+                       };
+                       partition@1000000 {
+                               label = "nand-linux";
+                               reg = <0x1000000 0x2000000>;
+                       };
+                       partition@3000000 {
+                               label = "nand-rootfs";
+                               reg = <0x3000000 0x200000>;
+                       };
+               };
        };
 };
 

diff --git a/arch/arm/dts/zynq-zc770-xm012.dts b/arch/arm/dts/zynq-zc770-xm012.dts
index 6e36634e3d4ebd3172da850d60b1cb2c8f979669..24520e7d3965dba7de731ef988f9ca52b7df896b 100644 (file)
--- a/arch/arm/dts/zynq-zc770-xm012.dts
+++ b/arch/arm/dts/zynq-zc770-xm012.dts
@@ -56,6 +56,31 @@
 &nor0 {
        status = "okay";
        bank-width = <1>;
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
+               partition@0 {
+                       label = "nor-fsbl-uboot";
+                       reg = <0x0 0x100000>;
+               };
+               partition@100000 {
+                       label = "nor-linux";
+                       reg = <0x100000 0x500000>;
+               };
+               partition@600000 {
+                       label = "nor-device-tree";
+                       reg = <0x600000 0x20000>;
+               };
+               partition@620000 {
+                       label = "nor-rootfs";
+                       reg = <0x620000 0x5e0000>;
+               };
+               partition@c00000 {
+                       label = "nor-bitstream";
+                       reg = <0xc00000 0x400000>;
+               };
+       };
 };
 
 &smcc {

diff --git a/arch/arm/dts/zynq-zc770-xm013.dts b/arch/arm/dts/zynq-zc770-xm013.dts
index 582aa1f1b873a36bc61b01cec8dea43c931d74c5..add75999f47a614a2f25aabfe1cd05edd55c01c6 100644 (file)
--- a/arch/arm/dts/zynq-zc770-xm013.dts
+++ b/arch/arm/dts/zynq-zc770-xm013.dts
@@ -69,6 +69,31 @@
                spi-tx-bus-width = <1>;
                spi-rx-bus-width = <4>;
                spi-max-frequency = <50000000>;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       partition@0 {
+                               label = "qspi-fsbl-uboot";
+                               reg = <0x0 0x100000>;
+                       };
+                       partition@100000 {
+                               label = "qspi-linux";
+                               reg = <0x100000 0x500000>;
+                       };
+                       partition@600000 {
+                               label = "qspi-device-tree";
+                               reg = <0x600000 0x20000>;
+                       };
+                       partition@620000 {
+                               label = "qspi-rootfs";
+                               reg = <0x620000 0x5e0000>;
+                       };
+                       partition@c00000 {
+                               label = "qspi-bitstream";
+                               reg = <0xc00000 0x400000>;
+                       };
+               };
        };
 };
 

diff --git a/arch/arm/dts/zynq-zed.dts b/arch/arm/dts/zynq-zed.dts
index 5320b4b233aea97144e520905a3c0f8db4e85cb8..70bc41822e3604590100ba1e941ec59caf939713 100644 (file)
--- a/arch/arm/dts/zynq-zed.dts
+++ b/arch/arm/dts/zynq-zed.dts
@@ -55,8 +55,35 @@
        flash@0 {
                compatible = "spansion,s25fl256s1", "jedec,spi-nor";
                reg = <0>;
-               spi-max-frequency = <30000000>;
+               spi-tx-bus-width = <1>;
+               spi-rx-bus-width = <4>;
+               spi-max-frequency = <50000000>;
                m25p,fast-read;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       partition@0 {
+                               label = "qspi-fsbl-uboot";
+                               reg = <0x0 0x100000>;
+                       };
+                       partition@100000 {
+                               label = "qspi-linux";
+                               reg = <0x100000 0x500000>;
+                       };
+                       partition@600000 {
+                               label = "qspi-device-tree";
+                               reg = <0x600000 0x20000>;
+                       };
+                       partition@620000 {
+                               label = "qspi-rootfs";
+                               reg = <0x620000 0x5e0000>;
+                       };
+                       partition@c00000 {
+                               label = "qspi-bitstream";
+                               reg = <0xc00000 0x400000>;
+                       };
+               };
        };
 };