Merge branch 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / aspeed-bmc-opp-vesnin.dts

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts b/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts
index 0b9e29c3212ebfd763965d414725d417a410827c..a27c88d23056c45da25641beb612ef0829b3dff3 100644 (file)
--- a/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts
@@ -81,6 +81,12 @@
         label = "bmc";
 #include "openbmc-flash-layout.dtsi"
        };
+
+       flash@1 {
+               status = "okay";
+               m25p,fast-read;
+               label = "alt";
+       };
 };
 
 &spi {
@@ -222,3 +228,7 @@
 &vuart {
        status = "okay";
 };
+
+&wdt2 {
+       aspeed,alt-boot;
+};