leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: dwc2: force to host mode if not support HNP/SRP

Browse Source 
In current code, after running the command of "usb start", the controller
will keep in otg mode and can't switch to host mode if not support
SNP/SRP capability. So add the property of "hnp-srp-disable" in the DTS
to config the contrller work in force mode of host.

Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>
This commit is contained in:
Meng Dongyang 2017-06-08 15:34:20 +08:00 committed by Marek Vasut
parent b9f7d88174
commit c65a34942e
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,6 +43,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 hnp_srp_disable;
bool oc_disable; bool oc_disable;
}; };
@ -394,6 +395,9 @@ static void dwc_otg_core_init(struct dwc2_priv *priv)
usbcfg |= DWC2_GUSBCFG_ULPI_CLK_SUS_M; usbcfg |= DWC2_GUSBCFG_ULPI_CLK_SUS_M;
} }
#endif #endif
if (priv->hnp_srp_disable)
usbcfg |= DWC2_GUSBCFG_FORCEHOSTMODE;
writel(usbcfg, &regs->gusbcfg); writel(usbcfg, &regs->gusbcfg);
/* Program the GAHBCFG Register. */ /* Program the GAHBCFG Register. */
@ -422,12 +426,16 @@ static void dwc_otg_core_init(struct dwc2_priv *priv)
writel(ahbcfg, &regs->gahbcfg); writel(ahbcfg, &regs->gahbcfg);
/* Program the GUSBCFG register for HNP/SRP. */ /* Program the capabilities in GUSBCFG Register */
setbits_le32(&regs->gusbcfg, DWC2_GUSBCFG_HNPCAP | DWC2_GUSBCFG_SRPCAP); usbcfg = 0;
if (!priv->hnp_srp_disable)
usbcfg |= DWC2_GUSBCFG_HNPCAP | DWC2_GUSBCFG_SRPCAP;
#ifdef CONFIG_DWC2_IC_USB_CAP #ifdef CONFIG_DWC2_IC_USB_CAP
setbits_le32(&regs->gusbcfg, DWC2_GUSBCFG_IC_USB_CAP); usbcfg |= DWC2_GUSBCFG_IC_USB_CAP;
#endif #endif
setbits_le32(&regs->gusbcfg, usbcfg);
} }
/* /*
@ -1244,6 +1252,11 @@ static int dwc2_usb_ofdata_to_platdata(struct udevice *dev)
if (prop) if (prop)
priv->oc_disable = true; priv->oc_disable = true;
prop = fdt_getprop(gd->fdt_blob, dev_of_offset(dev),
"hnp-srp-disable", NULL);
if (prop)
priv->hnp_srp_disable = true;
return 0; return 0;
} }