summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-05-06 22:12:29 -0400
committerTom Rini <trini@konsulko.com>2016-05-06 22:12:29 -0400
commit15e8cb70b4ebe79aced432323eaafcd176341017 (patch)
tree6ffb2830190be08c9b0b2b3bd06d1f89e4edf287 /arch
parent7b4f17bf3653ffff0d5d7b76bb8c2d8c293db4ce (diff)
parent5289c5fa5371dada10e9cbdcdbf3fb010905ea2d (diff)
downloadu-boot-imx-15e8cb70b4ebe79aced432323eaafcd176341017.zip
u-boot-imx-15e8cb70b4ebe79aced432323eaafcd176341017.tar.gz
u-boot-imx-15e8cb70b4ebe79aced432323eaafcd176341017.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/dts/socfpga_cyclone5_socrates.dts1
-rw-r--r--arch/arm/mach-socfpga/misc.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/dts/socfpga_cyclone5_socrates.dts b/arch/arm/dts/socfpga_cyclone5_socrates.dts
index d2ab3b3..bdd9324 100644
--- 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";
};
diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c
index dd05e14..5cbd8a4 100644
--- 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