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

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

diff --git a/arch/arm/dts/socfpga_cyclone5_de1_soc.dts b/arch/arm/dts/socfpga_cyclone5_de1_soc.dts
index e6fadb4fc92bc0e693aee7e2a900af7f82f956a7..ff1e61e0cbe9ed87b1231137deb6595af987ea36 100644 (file)
--- a/arch/arm/dts/socfpga_cyclone5_de1_soc.dts
+++ b/arch/arm/dts/socfpga_cyclone5_de1_soc.dts
@@ -4,6 +4,7 @@
  */
 
 #include "socfpga_cyclone5.dtsi"
+#include "socfpga-common-u-boot.dtsi"
 
 / {
        model = "Terasic DE1-SoC";
@@ -11,6 +12,7 @@
 
        chosen {
                bootargs = "console=ttyS0,115200";
+               stdout-path = "serial0:115200n8";
        };
 
        aliases {
@@ -23,10 +25,6 @@
                device_type = "memory";
                reg = <0x0 0x40000000>; /* 1GB */
        };
-
-       soc {
-               u-boot,dm-pre-reloc;
-       };
 };
 
 &gmac1 {
@@ -55,6 +53,18 @@
        status = "okay";
 };
 
+&porta {
+       bank-name = "porta";
+};
+
+&portb {
+       bank-name = "portb";
+};
+
+&portc {
+       bank-name = "portc";
+};
+
 &mmc0 {
        status = "okay";
        u-boot,dm-pre-reloc;
@@ -63,3 +73,11 @@
 &usb1 {
        status = "okay";
 };
+
+&uart0 {
+       u-boot,dm-pre-reloc;
+};
+
+&watchdog0 {
+       status = "disabled";
+};