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

[u-boot] / arch / arm / dts / ls1021a.dtsi

diff --git a/arch/arm/dts/ls1021a.dtsi b/arch/arm/dts/ls1021a.dtsi
index 8b3c55776df19327ae80422ec7dcd8977c2525a1..ee0e55461d2c920235df708d07a306580cca4e4c 100644 (file)
--- a/arch/arm/dts/ls1021a.dtsi
+++ b/arch/arm/dts/ls1021a.dtsi
@@ -170,6 +170,17 @@
                        status = "disabled";
                };
 
+               qspi: quadspi@1550000 {
+                       compatible = "fsl,vf610-qspi";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x1550000 0x10000>,
+                               <0x40000000 0x4000000>;
+                       num-cs = <2>;
+                       big-endian;
+                       status = "disabled";
+               };
+
                i2c0: i2c@2180000 {
                        compatible = "fsl,vf610-i2c";
                        #address-cells = <1>;
@@ -207,7 +218,6 @@
                        compatible = "fsl,16550-FIFO64", "ns16550a";
                        reg = <0x21c0500 0x100>;
                        interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
-                       clock-frequency = <0>;
                        fifo-size = <15>;
                        status = "disabled";
                };
@@ -216,7 +226,6 @@
                        compatible = "fsl,16550-FIFO64", "ns16550a";
                        reg = <0x21c0600 0x100>;
                        interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
-                       clock-frequency = <0>;
                        fifo-size = <15>;
                        status = "disabled";
                };
@@ -225,7 +234,6 @@
                        compatible = "fsl,16550-FIFO64", "ns16550a";
                        reg = <0x21d0500 0x100>;
                        interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
-                       clock-frequency = <0>;
                        fifo-size = <15>;
                        status = "disabled";
                };
@@ -234,7 +242,6 @@
                        compatible = "fsl,16550-FIFO64", "ns16550a";
                        reg = <0x21d0600 0x100>;
                        interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
-                       clock-frequency = <0>;
                        fifo-size = <15>;
                        status = "disabled";
                };