Merge https://gitlab.denx.de/u-boot/custodians/u-boot-clk

[oweals/u-boot.git] / 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 e3ae8a820795d17cbabdbf564ed95313fccd76df..8d5d3996f6f27122412d68072767d621fa11ae8f 100644 (file)
--- a/arch/arm/dts/socfpga_cyclone5_socrates.dts
+++ b/arch/arm/dts/socfpga_cyclone5_socrates.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- *  Copyright (C) 2014 Steffen Trumtrar <s.trumtrar@pengutronix.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
+ * Copyright (C) 2014 Steffen Trumtrar <s.trumtrar@pengutronix.de>
  */
 
 #include "socfpga_cyclone5.dtsi"
@@ -10,78 +9,86 @@
        model = "EBV SOCrates";
        compatible = "ebv,socrates", "altr,socfpga-cyclone5", "altr,socfpga";
 
-       chosen {
-               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 {
+       chosen {
+               bootargs = "earlyprintk";
+               stdout-path = "serial0:115200n8";
+       };
+
+       memory@0 {
                name = "memory";
                device_type = "memory";
                reg = <0x0 0x40000000>; /* 1GB */
        };
 
-       soc {
-               u-boot,dm-pre-reloc;
+       leds: gpio-leds {
        };
 };
 
 &gmac1 {
-       status = "okay";
        phy-mode = "rgmii";
+       status = "okay";
+};
+
+&gpio0 {
+       status = "okay";
+};
 
-       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>;
+&gpio1 {
+       status = "okay";
 };
 
 &i2c0 {
        status = "okay";
 
        rtc: rtc@68 {
-               compatible = "stm,m41t82";
+               compatible = "st,m41t82";
                reg = <0x68>;
        };
 };
 
-&mmc0 {
+&leds {
+       compatible = "gpio-leds";
+
+       led0 {
+               label = "led:green:heartbeat";
+               gpios = <&porta 28 1>;
+               linux,default-trigger = "heartbeat";
+       };
+
+       led1 {
+               label = "led:green:D7";
+               gpios = <&portb 19 1>;
+       };
+
+       led2 {
+               label = "led:green:D8";
+               gpios = <&portb 25 1>;
+       };
+};
+
+&mmc {
        status = "okay";
-       u-boot,dm-pre-reloc;
 };
 
 &qspi {
        status = "okay";
 
-       flash0: n25q00@0 {
+       flash: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "n25q00";
-               reg = <0>;      /* chip select */
-               spi-max-frequency = <50000000>;
+               compatible = "n25q256a";
+               reg = <0>;
+               spi-max-frequency = <100000000>;
                m25p,fast-read;
-               page-size = <256>;
-               block-size = <16>; /* 2^16, 64KB */
+               cdns,read-delay = <4>;
                cdns,tshsl-ns = <50>;
                cdns,tsd2d-ns = <50>;
                cdns,tchsh-ns = <4>;
                cdns,tslch-ns = <4>;
+               status = "okay";
        };
 };
-
-&usb1 {
-       disable-over-current;
-       status = "okay";
-};