From 268da813c7f963c8318778de99be382d6b51055d Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Wed, 27 Apr 2016 15:07:03 +0200 Subject: ARM: socfpga: Disable USB OC protection on SoCrates This is mandatory, otherwise the USB does not work. Signed-off-by: Marek Vasut Cc: Stefan Roese Cc: Dinh Nguyen --- arch/arm/dts/socfpga_cyclone5_socrates.dts | 1 + 1 file changed, 1 insertion(+) (limited to 'arch') 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"; }; -- cgit v1.1 From 5289c5fa5371dada10e9cbdcdbf3fb010905ea2d Mon Sep 17 00:00:00 2001 From: Anatolij Gustschin Date: Fri, 6 May 2016 17:16:31 +0200 Subject: socfpga: fix broken build if CONFIG_ETH_DESIGNWARE disabled Building without ethernet driver doesn't work. Fix it. Signed-off-by: Anatolij Gustschin Cc: Marek Vasut --- arch/arm/mach-socfpga/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch') 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 -- cgit v1.1