linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

usb: xhci: omap: Remove common dwc3 drv functions calls

Browse Source 
Remove all redundant dwc3 driver function calls that
are defined by dwc3 driver

Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
This commit is contained in:
Ramneek Mehresh
2015-05-29 14:47:17 +05:30
committed by Marek Vasut
parent 552d60cc22
commit 2770448c8c
5 changed files with 3 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
drivers/usb/host/xhci-omap.c
View File

@ -34,66 +34,6 @@ inline int __board_usb_init(int index, enum usb_init_type init)
int board_usb_init(int index, enum usb_init_type init) int board_usb_init(int index, enum usb_init_type init)
__attribute__((weak, alias("__board_usb_init"))); __attribute__((weak, alias("__board_usb_init")));
static void dwc3_set_mode(struct dwc3 *dwc3_reg, u32 mode)
{
clrsetbits_le32(&dwc3_reg->g_ctl,
DWC3_GCTL_PRTCAPDIR(DWC3_GCTL_PRTCAP_OTG),
DWC3_GCTL_PRTCAPDIR(mode));
}
static void dwc3_core_soft_reset(struct dwc3 *dwc3_reg)
{
/* Before Resetting PHY, put Core in Reset */
setbits_le32(&dwc3_reg->g_ctl, DWC3_GCTL_CORESOFTRESET);
omap_reset_usb_phy(dwc3_reg);
/* After PHYs are stable we can take Core out of reset state */
clrbits_le32(&dwc3_reg->g_ctl, DWC3_GCTL_CORESOFTRESET);
}
static int dwc3_core_init(struct dwc3 *dwc3_reg)
{
u32 reg;
u32 revision;
unsigned int dwc3_hwparams1;
revision = readl(&dwc3_reg->g_snpsid);
/* This should read as U3 followed by revision number */
if ((revision & DWC3_GSNPSID_MASK) != 0x55330000) {
puts("this is not a DesignWare USB3 DRD Core\n");
return -1;
}
dwc3_core_soft_reset(dwc3_reg);
dwc3_hwparams1 = readl(&dwc3_reg->g_hwparams1);
reg = readl(&dwc3_reg->g_ctl);
reg &= ~DWC3_GCTL_SCALEDOWN_MASK;
reg &= ~DWC3_GCTL_DISSCRAMBLE;
switch (DWC3_GHWPARAMS1_EN_PWROPT(dwc3_hwparams1)) {
case DWC3_GHWPARAMS1_EN_PWROPT_CLK:
reg &= ~DWC3_GCTL_DSBLCLKGTNG;
break;
default:
debug("No power optimization available\n");
}
/*
* WORKAROUND: DWC3 revisions <1.90a have a bug
* where the device can fail to connect at SuperSpeed
* and falls back to high-speed mode which causes
* the device to enter a Connect/Disconnect loop
*/
if ((revision & DWC3_REVISION_MASK) < 0x190a)
reg |= DWC3_GCTL_U2RSTECN;
writel(reg, &dwc3_reg->g_ctl);
return 0;
}
static int omap_xhci_core_init(struct omap_xhci *omap) static int omap_xhci_core_init(struct omap_xhci *omap)
{ {
int ret = 0; int ret = 0;

18
drivers/usb/phy/omap_usb_phy.c
View File

@ -223,24 +223,6 @@ void usb_phy_power(int on)
} }
#endif /* CONFIG_AM437X_USB2PHY2_HOST */ #endif /* CONFIG_AM437X_USB2PHY2_HOST */
void omap_reset_usb_phy(struct dwc3 *dwc3_reg)
{
/* Assert USB3 PHY reset */
setbits_le32(&dwc3_reg->g_usb3pipectl[0], DWC3_GUSB3PIPECTL_PHYSOFTRST);
/* Assert USB2 PHY reset */
setbits_le32(&dwc3_reg->g_usb2phycfg, DWC3_GUSB2PHYCFG_PHYSOFTRST);
mdelay(100);
/* Clear USB3 PHY reset */
clrbits_le32(&dwc3_reg->g_usb3pipectl[0], DWC3_GUSB3PIPECTL_PHYSOFTRST);
/* Clear USB2 PHY reset */
clrbits_le32(&dwc3_reg->g_usb2phycfg, DWC3_GUSB2PHYCFG_PHYSOFTRST);
}
void omap_enable_phy(struct omap_xhci *omap) void omap_enable_phy(struct omap_xhci *omap)
{ {
#ifdef CONFIG_OMAP_USB2PHY2_HOST #ifdef CONFIG_OMAP_USB2PHY2_HOST

1
include/configs/am43xx_evm.h
View File

@ -110,6 +110,7 @@
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#define CONFIG_USB_HOST #define CONFIG_USB_HOST
#define CONFIG_USB_XHCI #define CONFIG_USB_XHCI
#define CONFIG_USB_XHCI_DWC3
#define CONFIG_USB_XHCI_OMAP #define CONFIG_USB_XHCI_OMAP
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2

1
include/configs/beagle_x15.h
View File

@ -68,6 +68,7 @@
/* USB xHCI HOST */ /* USB xHCI HOST */
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#define CONFIG_USB_HOST #define CONFIG_USB_HOST
#define CONFIG_USB_XHCI_DWC3
#define CONFIG_USB_XHCI #define CONFIG_USB_XHCI
#define CONFIG_USB_XHCI_OMAP #define CONFIG_USB_XHCI_OMAP
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE

1
include/configs/dra7xx_evm.h
View File

@ -175,6 +175,7 @@
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#define CONFIG_USB_HOST #define CONFIG_USB_HOST
#define CONFIG_USB_XHCI #define CONFIG_USB_XHCI
#define CONFIG_USB_XHCI_DWC3
#define CONFIG_USB_XHCI_OMAP #define CONFIG_USB_XHCI_OMAP
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2