Merge branch 'master' of git://git.denx.de/u-boot

[oweals/u-boot.git] / arch / arm / dts / zynq-cse-nand.dts

diff --git a/arch/arm/dts/zynq-cse-nand.dts b/arch/arm/dts/zynq-cse-nand.dts
index 9b1dd19a85df4e96b4f1961050f23b8e3317dd7d..32cb3bffcb948e6700a4e53101cbdf5d39dd1fe4 100644 (file)
--- a/arch/arm/dts/zynq-cse-nand.dts
+++ b/arch/arm/dts/zynq-cse-nand.dts
@@ -38,7 +38,22 @@
                #size-cells = <1>;
                ranges;
 
-                       slcr: slcr@f8000000 {
+               smcc: memory-controller@e000e000 {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       clock-names = "memclk", "apb_pclk";
+                       clocks = <&clkc 11>, <&clkc 44>;
+                       compatible = "arm,pl353-smc-r2p1", "arm,primecell";
+                       ranges;
+                       reg = <0xe000e000 0x1000>;
+
+                       nand0: flash@e1000000 {
+                               compatible = "arm,pl353-nand-r2p1";
+                               reg = <0xe1000000 0x1000000>;
+                       };
+               };
+
+               slcr: slcr@f8000000 {
                        u-boot,dm-pre-reloc;
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -72,7 +87,6 @@
                        };
                };
        };
-
 };
 
 &dcc {