leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests 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
commit fee626c449
8 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
board/compulab/cl-som-am57x/cl-som-am57x.c
View File

@ -16,6 +16,7 @@
#include <asm/arch/sys_proto.h>
#include "../common/common.h"
#include "../common/eeprom.h"
#include <asm/omap_common.h>
DECLARE_GLOBAL_DATA_PTR;
@ -64,3 +65,15 @@ u32 get_board_rev(void)
{
return cl_eeprom_get_board_rev(CONFIG_SYS_I2C_EEPROM_BUS);
}
int board_usb_init(int index, enum usb_init_type init)
{
enable_usb_clocks(index);
return 0;
}
int board_usb_cleanup(int index, enum usb_init_type init)
{
disable_usb_clocks(index);
return 0;
}

14
board/compulab/cm_t43/cm_t43.c
View File

@ -14,6 +14,8 @@
#include <power/pmic.h>
#include <power/tps65218.h>
#include "board.h"
#include <usb.h>
#include <asm/omap_common.h>
DECLARE_GLOBAL_DATA_PTR;
@ -50,6 +52,18 @@ int board_init(void)
return 0;
}
int board_usb_init(int index, enum usb_init_type init)
{
enable_usb_clocks(index);
return 0;
}
int board_usb_cleanup(int index, enum usb_init_type init)
{
disable_usb_clocks(index);
return 0;
}
#ifdef CONFIG_DRIVER_TI_CPSW
static void cpsw_control(int enabled)

4
board/ti/am43xx/board.c
View File

@ -687,7 +687,7 @@ int usb_gadget_handle_interrupts(int index)
#endif /* CONFIG_USB_DWC3 */
#if defined(CONFIG_USB_DWC3) || defined(CONFIG_USB_XHCI_OMAP)
int omap_xhci_board_usb_init(int index, enum usb_init_type init)
int board_usb_init(int index, enum usb_init_type init)
{
enable_usb_clocks(index);
#ifdef CONFIG_USB_DWC3
@ -718,7 +718,7 @@ int omap_xhci_board_usb_init(int index, enum usb_init_type init)
return 0;
}
int omap_xhci_board_usb_cleanup(int index, enum usb_init_type init)
int board_usb_cleanup(int index, enum usb_init_type init)
{
#ifdef CONFIG_USB_DWC3
switch (index) {

4
board/ti/am57xx/board.c
View File

@ -867,7 +867,7 @@ int usb_gadget_handle_interrupts(int index)
#endif /* CONFIG_USB_DWC3 */
#if defined(CONFIG_USB_DWC3) || defined(CONFIG_USB_XHCI_OMAP)
int omap_xhci_board_usb_init(int index, enum usb_init_type init)
int board_usb_init(int index, enum usb_init_type init)
{
enable_usb_clocks(index);
switch (index) {
@ -901,7 +901,7 @@ int omap_xhci_board_usb_init(int index, enum usb_init_type init)
return 0;
}
int omap_xhci_board_usb_cleanup(int index, enum usb_init_type init)
int board_usb_cleanup(int index, enum usb_init_type init)
{
#ifdef CONFIG_USB_DWC3
switch (index) {

4
board/ti/dra7xx/evm.c
View File

@ -907,7 +907,7 @@ static struct ti_usb_phy_device usb_phy2_device = {
.index = 1,
};
int omap_xhci_board_usb_init(int index, enum usb_init_type init)
int board_usb_init(int index, enum usb_init_type init)
{
enable_usb_clocks(index);
switch (index) {
@ -944,7 +944,7 @@ int omap_xhci_board_usb_init(int index, enum usb_init_type init)
return 0;
}
int omap_xhci_board_usb_cleanup(int index, enum usb_init_type init)
int board_usb_cleanup(int index, enum usb_init_type init)
{
switch (index) {
case 0:

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;