From 077c2c317bee62f8823093f40e5587acbd2cf4c8 Mon Sep 17 00:00:00 2001 From: Sorgelig Date: Fri, 20 Aug 2021 02:23:36 +0800 Subject: [PATCH] Disable USB overcurrent signaling. --- arch/arm/boot/dts/socfpga_cyclone5_de10_nano.dts | 2 ++ drivers/usb/dwc2/core.c | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/socfpga_cyclone5_de10_nano.dts b/arch/arm/boot/dts/socfpga_cyclone5_de10_nano.dts index cdff9e0c6..d1248f43d 100644 --- a/arch/arm/boot/dts/socfpga_cyclone5_de10_nano.dts +++ b/arch/arm/boot/dts/socfpga_cyclone5_de10_nano.dts @@ -120,5 +120,7 @@ }; &usb1 { + disable-over-current; + dr_mode = "host"; status = "okay"; }; diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c index cf0bcd0dc..ac3e25023 100644 --- a/drivers/usb/dwc2/core.c +++ b/drivers/usb/dwc2/core.c @@ -1100,10 +1100,8 @@ static int dwc2_hs_phy_init(struct dwc2_hsotg *hsotg, bool select_phy) if (hsotg->params.phy_ulpi_ddr) usbcfg |= GUSBCFG_DDRSEL; - /* Set external VBUS indicator as needed. */ - if (hsotg->params.oc_disable) - usbcfg |= (GUSBCFG_ULPI_INT_VBUS_IND | - GUSBCFG_INDICATORPASSTHROUGH); + usbcfg |= (GUSBCFG_ULPI_INT_VBUS_IND | + GUSBCFG_INDICATORPASSTHROUGH); break; case DWC2_PHY_TYPE_PARAM_UTMI: /* UTMI+ interface */