eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge git://git.denx.de/u-boot-usb

Browse Source
This commit is contained in:
Tom Rini
2018-02-16 13:55:41 -05:00
parent b2cdef4861 b16c129c22
commit fee626c449
8 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -375,7 +375,7 @@ static void dwc_otg_core_init(struct dwc2_priv *priv)
usbcfg &= ~DWC2_GUSBCFG_DDRSEL;
#endif
} else { /* UTMI+ interface */
#if (CONFIG_DWC2_UTMI_PHY_WIDTH == 16)
#if (CONFIG_DWC2_UTMI_WIDTH == 16)
usbcfg |= DWC2_GUSBCFG_PHYIF;
#endif
}

2
drivers/usb/host/dwc2.h
View File

@@ -775,7 +775,9 @@ struct dwc2_core_regs {
#define DWC2_PHY_TYPE_UTMI 1
#define DWC2_PHY_TYPE_ULPI 2
#define CONFIG_DWC2_PHY_TYPE DWC2_PHY_TYPE_UTMI /* PHY type */
#ifndef CONFIG_DWC2_UTMI_WIDTH
#define CONFIG_DWC2_UTMI_WIDTH 8 /* UTMI bus width (8/16) */
#endif
#undef CONFIG_DWC2_PHY_ULPI_DDR /* ULPI PHY uses DDR mode */
#define CONFIG_DWC2_PHY_ULPI_EXT_VBUS /* ULPI PHY controls VBUS */

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

@@ -27,28 +27,6 @@ DECLARE_GLOBAL_DATA_PTR;
static struct omap_xhci omap;
__weak int omap_xhci_board_usb_init(int index, enum usb_init_type init)
{
enable_usb_clocks(index);
return 0;
}
int board_usb_init(int index, enum usb_init_type init)
{
return omap_xhci_board_usb_init(index, init);
}
__weak int omap_xhci_board_usb_cleanup(int index, enum usb_init_type init)
{
disable_usb_clocks(index);
return 0;
}
int board_usb_cleanup(int index, enum usb_init_type init)
{
return omap_xhci_board_usb_cleanup(index, init);
}
static int omap_xhci_core_init(struct omap_xhci *omap)
{
int ret = 0;