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

[oweals/u-boot.git] / arch / arm / dts / socfpga_cyclone5_mcvevk.dts

diff --git a/arch/arm/dts/socfpga_cyclone5_mcvevk.dts b/arch/arm/dts/socfpga_cyclone5_mcvevk.dts
index e1e3d738bc40de41074ca7c29cbbf828bf85fa93..ceaec29770c6ee19b26b7aa002b346fdbe9bdb34 100644 (file)
--- a/arch/arm/dts/socfpga_cyclone5_mcvevk.dts
+++ b/arch/arm/dts/socfpga_cyclone5_mcvevk.dts
@@ -1,53 +1,81 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2015 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#include "socfpga_cyclone5.dtsi"
+#include "socfpga_cyclone5_mcv.dtsi"
 
 / {
-       model = "DENX MCVEVK";
-       compatible = "altr,socfpga-cyclone5", "altr,socfpga";
-
-       chosen {
-               bootargs = "console=ttyS0,115200";
-       };
+       model = "Aries/DENX MCV EVK";
+       compatible = "denx,mcvevk", "altr,socfpga-cyclone5", "altr,socfpga";
 
        aliases {
                ethernet0 = &gmac0;
+               stmpe-i2c0 = &stmpe1;
        };
 
-       memory {
-               name = "memory";
-               device_type = "memory";
-               reg = <0x0 0x40000000>; /* 1GB */
+       chosen {
+               stdout-path = "serial0:115200n8";
        };
+};
 
-       soc {
-               u-boot,dm-pre-reloc;
-       };
+&can0 {
+       status = "okay";
 };
 
-&gmac0 {
+&can1 {
        status = "okay";
+};
+
+&gmac0 {
        phy-mode = "rgmii";
+       status = "okay";
+};
+
+&gpio0 {       /* GPIO  0 ... 28 */
+       status = "okay";
+};
+
+&gpio1 {       /* GPIO 29 ... 57 */
+       status = "okay";
 };
 
-&gpio0 {
+&gpio2 {       /* GPIO 58..66 (HLGPI 0..13 at offset 13) */
        status = "okay";
 };
 
-&gpio1 {
+&i2c0 {
        status = "okay";
+       clock-frequency = <100000>;
+
+       stmpe1: stmpe811@41 {
+               compatible = "st,stmpe811";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               reg = <0x41>;
+               id = <0>;
+               blocks = <0x5>;
+               irq-gpio = <&portb 28 0x4>;     /* GPIO 57, trig. level HI */
+
+               stmpe_touchscreen {
+                       compatible = "st,stmpe-ts";
+                       ts,sample-time = <4>;
+                       ts,mod-12b = <1>;
+                       ts,ref-sel = <0>;
+                       ts,adc-freq = <1>;
+                       ts,ave-ctrl = <1>;
+                       ts,touch-det-delay = <3>;
+                       ts,settling = <4>;
+                       ts,fraction-z = <7>;
+                       ts,i-drive = <1>;
+               };
+       };
 };
 
-&gpio2 {
+&uart0 {
        status = "okay";
 };
 
-&mmc0 {
+&usb1 {
        status = "okay";
-       bus-width = <8>;
-       u-boot,dm-pre-reloc;
 };