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

[platform/kernel/u-boot.git] / arch / arm / dts / socfpga_cyclone5_is1.dts

diff --git a/arch/arm/dts/socfpga_cyclone5_is1.dts b/arch/arm/dts/socfpga_cyclone5_is1.dts
index aa1ce2c..b7054bf 100644 (file)
--- a/arch/arm/dts/socfpga_cyclone5_is1.dts
+++ b/arch/arm/dts/socfpga_cyclone5_is1.dts
@@ -11,6 +11,7 @@
 
        chosen {
                bootargs = "console=ttyS0,115200";
+               stdout-path = "serial0:115200n8";
        };
 
        memory {
@@ -54,6 +55,10 @@
        status = "okay";
 };
 
+&porta {
+       bank-name = "porta";
+};
+
 &i2c0 {
        status = "okay";
 
@@ -102,3 +107,11 @@
 &usb1 {
        status = "okay";
 };
+
+&uart0 {
+       u-boot,dm-pre-reloc;
+};
+
+&watchdog0 {
+       status = "disabled";
+};