diff options
| author | Tom Rini <trini@konsulko.com> | 2019-05-03 14:22:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-05-03 14:22:38 -0400 |
| commit | c767b6ac98c8cee866954f5260734e8291d5c4ee (patch) | |
| tree | 71d622284901f877e3747069b8801523441d2f35 | |
| parent | 90c2ebd2156982eee1af6faa00f6740e9f79b3c5 (diff) | |
| parent | ff83e4c368f0155617e813d275d88192f05131e1 (diff) | |
Merge git://git.denx.de/u-boot-usb
- DaVinci updates
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/da8xx-usb.h | 3 | ||||
| -rw-r--r-- | drivers/usb/host/ohci-hcd.c | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-davinci/include/mach/da8xx-usb.h b/arch/arm/mach-davinci/include/mach/da8xx-usb.h index 42e1258225..215706e172 100644 --- a/arch/arm/mach-davinci/include/mach/da8xx-usb.h +++ b/arch/arm/mach-davinci/include/mach/da8xx-usb.h @@ -86,7 +86,4 @@ struct da8xx_usb_regs { #define DA8XX_USB_VBUS_GPIO (1 << 15) -int usb_phy_on(void); -void usb_phy_off(void); - #endif /* __DA8XX_MUSB_H__ */ diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 3b6f889f7b..2b0df88f49 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c @@ -1545,10 +1545,8 @@ static int submit_common_msg(ohci_t *ohci, struct usb_device *dev, return -1; } -#if 0 mdelay(10); /* ohci_dump_status(ohci); */ -#endif timeout = USB_TIMEOUT_MS(pipe); |