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 2e2b71f..b7054bf 100644 (file)
--- a/arch/arm/dts/socfpga_cyclone5_is1.dts
+++ b/arch/arm/dts/socfpga_cyclone5_is1.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *  Copyright (C) 2012 Altera Corporation <www.altera.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include "socfpga_cyclone5.dtsi"
@@ -12,6 +11,7 @@
 
        chosen {
                bootargs = "console=ttyS0,115200";
+               stdout-path = "serial0:115200n8";
        };
 
        memory {
@@ -55,6 +55,10 @@
        status = "okay";
 };
 
+&porta {
+       bank-name = "porta";
+};
+
 &i2c0 {
        status = "okay";
 
@@ -87,7 +91,7 @@
                u-boot,dm-pre-reloc;
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "n25q00";
+               compatible = "n25q00", "spi-flash";
                reg = <0>;      /* chip select */
                spi-max-frequency = <100000000>;
                m25p,fast-read;
@@ -103,3 +107,11 @@
 &usb1 {
        status = "okay";
 };
+
+&uart0 {
+       u-boot,dm-pre-reloc;
+};
+
+&watchdog0 {
+       status = "disabled";
+};