arm: socfpga: fix qspi flash compatible (add "spi-flash")

[u-boot] / arch / arm / dts / socfpga_cyclone5_socrates.dts

diff --git a/arch/arm/dts/socfpga_cyclone5_socrates.dts b/arch/arm/dts/socfpga_cyclone5_socrates.dts
index 05b935da0a080986d66a3952c0fa1fc509df4761..e612eeed4ffc787246d4f676c5ac6c418395bd92 100644 (file)
--- a/arch/arm/dts/socfpga_cyclone5_socrates.dts
+++ b/arch/arm/dts/socfpga_cyclone5_socrates.dts
@@ -14,6 +14,15 @@
                bootargs = "console=ttyS0,115200";
        };
 
+       aliases {
+               /*
+                * This allows the ethaddr uboot environment variable
+                * contents to be added to the gmac1 device tree blob.
+                */
+               ethernet0 = &gmac1;
+               udc0 = &usb1;
+       };
+
        memory {
                name = "memory";
                device_type = "memory";
@@ -28,6 +37,15 @@
 &gmac1 {
        status = "okay";
        phy-mode = "rgmii";
+
+       rxd0-skew-ps = <0>;
+       rxd1-skew-ps = <0>;
+       rxd2-skew-ps = <0>;
+       rxd3-skew-ps = <0>;
+       txen-skew-ps = <0>;
+       txc-skew-ps = <2600>;
+       rxdv-skew-ps = <0>;
+       rxc-skew-ps = <2000>;
 };
 
 &i2c0 {
@@ -50,16 +68,20 @@
        flash0: n25q00@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "n25q00";
+               compatible = "n25q00", "spi-flash";
                reg = <0>;      /* chip select */
                spi-max-frequency = <50000000>;
                m25p,fast-read;
                page-size = <256>;
                block-size = <16>; /* 2^16, 64KB */
-               read-delay = <4>;  /* delay value in read data capture register */
-               tshsl-ns = <50>;
-               tsd2d-ns = <50>;
-               tchsh-ns = <4>;
-               tslch-ns = <4>;
+               cdns,tshsl-ns = <50>;
+               cdns,tsd2d-ns = <50>;
+               cdns,tchsh-ns = <4>;
+               cdns,tslch-ns = <4>;
        };
 };
+
+&usb1 {
+       disable-over-current;
+       status = "okay";
+};