ARM: zynq: Wire smcc with nand/nor memories on zc770 platform

Describe nor child flash node under smcc and enable it for xm012 extension
card. And also describe nand flash memory for xm011 card.

Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/12e697975a1d026e811c2f63aa8bbbd0b9ff4f70.1733920873.git.michal.simek@amd.com

diff --git a/arch/arm/boot/dts/xilinx/zynq-7000.dtsi b/arch/arm/boot/dts/xilinx/zynq-7000.dtsi
index 0dfe2ddd0b5fca6f10c8e6efeb0191b07f8aced2..82741c837e4333f2c065b568deeb00a0486885fe 100644 (file)
--- a/arch/arm/boot/dts/xilinx/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/xilinx/zynq-7000.dtsi
@@ -289,6 +289,8 @@
                                  0x2 0x0 0xe4000000 0x2000000>; /* SRAM/NOR CS1 region */
                        #address-cells = <2>;
                        #size-cells = <1>;
+                       interrupt-parent = <&intc>;
+                       interrupts = <0 18 4>;
 
                        nfc0: nand-controller@0,0 {
                                compatible = "arm,pl353-nand-r2p1";
@@ -297,6 +299,11 @@
                                #address-cells = <1>;
                                #size-cells = <0>;
                        };
+                       nor0: flash@1,0 {
+                               status = "disabled";
+                               compatible = "cfi-flash";
+                               reg = <1 0 0x2000000>;
+                       };
                };
 
                sdhci0: mmc@e0100000 {

diff --git a/arch/arm/boot/dts/xilinx/zynq-zc770-xm011.dts b/arch/arm/boot/dts/xilinx/zynq-zc770-xm011.dts
index ba040743e10d620c0269168d0ed68bca54e1a703..f9a086fe66d3edd131de94eb2dfcf16d95537a91 100644 (file)
--- a/arch/arm/boot/dts/xilinx/zynq-zc770-xm011.dts
+++ b/arch/arm/boot/dts/xilinx/zynq-zc770-xm011.dts
@@ -47,6 +47,36 @@
        };
 };
 
+&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>;
+                       };
+               };
+       };
+};
+
+&smcc {
+       status = "okay";
+};
+
 &spi0 {
        status = "okay";
        num-cs = <4>;

diff --git a/arch/arm/boot/dts/xilinx/zynq-zc770-xm012.dts b/arch/arm/boot/dts/xilinx/zynq-zc770-xm012.dts
index d6392d4ece9c72b05cc8eeb0da958653d4a70b29..24520e7d3965dba7de731ef988f9ca52b7df896b 100644 (file)
--- a/arch/arm/boot/dts/xilinx/zynq-zc770-xm012.dts
+++ b/arch/arm/boot/dts/xilinx/zynq-zc770-xm012.dts
@@ -53,6 +53,40 @@
        };
 };
 
+&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 {
+       status = "okay";
+};
+
 &spi1 {
        status = "okay";
        num-cs = <4>;