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

2016-05-06 22:12:29 -04:00
parent 7b4f17bf36 5289c5fa53
commit 15e8cb70b4
4 changed files with 90 additions and 168 deletions
--- a/arch/arm/dts/socfpga_cyclone5_socrates.dts
+++ b/arch/arm/dts/socfpga_cyclone5_socrates.dts
@@ -83,5 +83,6 @@
 };

 &usb1 {
+	disable-over-current;
 	status = "okay";
 };
--- a/arch/arm/mach-socfpga/misc.c
+++ b/arch/arm/mach-socfpga/misc.c
@@ -172,7 +172,7 @@ static int socfpga_eth_reset(void)
 #else
 static int socfpga_eth_reset(void)
 {
-	return 0
+	return 0;
 };
 #endif