V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

usb: dwc2: Make OC protection configurable 

Introduce a new flag in the controller private data, which allows selectively
disabling the OC protection. Use the standard 'disable-over-current' OF prop
to set this flag. This OC protection must be disabled on EBV SoCrates rev 1.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Dinh Nguyen <dinguyen@kernel.org>
This commit is contained in:
Marek Vasut 2016-04-27 14:58:49 +02:00
parent 618da5630b
commit b4fbd089e4
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/usb/host/dwc2.c
View File

@ -18,6 +18,8 @@
#include "dwc2.h" #include "dwc2.h"
DECLARE_GLOBAL_DATA_PTR;
/* Use only HC channel 0. */ /* Use only HC channel 0. */
#define DWC2_HC_CHANNEL 0 #define DWC2_HC_CHANNEL 0
@ -40,6 +42,7 @@ struct dwc2_priv {
struct dwc2_core_regs *regs; struct dwc2_core_regs *regs;
int root_hub_devnum; int root_hub_devnum;
bool ext_vbus; bool ext_vbus;
bool oc_disable;
}; };
#ifndef CONFIG_DM_USB #ifndef CONFIG_DM_USB
@ -265,9 +268,11 @@ static void dwc_otg_core_init(struct dwc2_priv *priv)
/* Program the ULPI External VBUS bit if needed */ /* Program the ULPI External VBUS bit if needed */
if (priv->ext_vbus) { if (priv->ext_vbus) {
usbcfg |= (DWC2_GUSBCFG_ULPI_EXT_VBUS_DRV | usbcfg |= DWC2_GUSBCFG_ULPI_EXT_VBUS_DRV;
DWC2_GUSBCFG_ULPI_INT_VBUS_INDICATOR | if (!priv->oc_disable) {
DWC2_GUSBCFG_INDICATOR_PASSTHROUGH); usbcfg |= DWC2_GUSBCFG_ULPI_INT_VBUS_INDICATOR |
DWC2_GUSBCFG_INDICATOR_PASSTHROUGH;
}
} else { } else {
usbcfg &= ~DWC2_GUSBCFG_ULPI_EXT_VBUS_DRV; usbcfg &= ~DWC2_GUSBCFG_ULPI_EXT_VBUS_DRV;
} }
@ -1177,6 +1182,7 @@ static int dwc2_submit_int_msg(struct udevice *dev, struct usb_device *udev,
static int dwc2_usb_ofdata_to_platdata(struct udevice *dev) static int dwc2_usb_ofdata_to_platdata(struct udevice *dev)
{ {
struct dwc2_priv *priv = dev_get_priv(dev); struct dwc2_priv *priv = dev_get_priv(dev);
const void *prop;
fdt_addr_t addr; fdt_addr_t addr;
addr = dev_get_addr(dev); addr = dev_get_addr(dev);
@ -1184,6 +1190,11 @@ static int dwc2_usb_ofdata_to_platdata(struct udevice *dev)
return -EINVAL; return -EINVAL;
priv->regs = (struct dwc2_core_regs *)addr; priv->regs = (struct dwc2_core_regs *)addr;
prop = fdt_getprop(gd->fdt_blob, dev->of_offset, "disable-over-current",
NULL);
if (prop)
priv->oc_disable = true;
return 0; return 0;
} }