random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 12:56:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

usb: ehci-omap: Drop non-DM_USB legacy code

Browse Source 
Now that DM_USB is always enabled, we can drop some legacy code.

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2021-09-12 20:32:27 -04:00
parent 425c121d7a
commit fb1d1778f9
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/usb/host/ehci-omap.c
View File

@ -183,17 +183,8 @@ int omap_ehci_hcd_stop(void)
* Based on "drivers/usb/host/ehci-omap.c" from Linux 3.1 * Based on "drivers/usb/host/ehci-omap.c" from Linux 3.1
* See there for additional Copyrights. * See there for additional Copyrights.
*/ */
#if !CONFIG_IS_ENABLED(DM_USB) || !CONFIG_IS_ENABLED(OF_CONTROL)
int omap_ehci_hcd_init(int index, struct omap_usbhs_board_data *usbhs_pdata,
struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{
*hccr = (struct ehci_hccr *)(OMAP_EHCI_BASE);
*hcor = (struct ehci_hcor *)(OMAP_EHCI_BASE + 0x10);
#else
int omap_ehci_hcd_init(int index, struct omap_usbhs_board_data *usbhs_pdata) int omap_ehci_hcd_init(int index, struct omap_usbhs_board_data *usbhs_pdata)
{ {
#endif
int ret; int ret;
unsigned int i, reg = 0, rev = 0; unsigned int i, reg = 0, rev = 0;
@ -304,8 +295,6 @@ int omap_ehci_hcd_init(int index, struct omap_usbhs_board_data *usbhs_pdata)
return 0; return 0;
} }
#if CONFIG_IS_ENABLED(DM_USB)
static struct omap_usbhs_board_data usbhs_bdata = { static struct omap_usbhs_board_data usbhs_bdata = {
.port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED,
.port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED, .port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED,
@ -409,5 +398,3 @@ U_BOOT_DRIVER(usb_omap_ehci) = {
.ops = &ehci_usb_ops, .ops = &ehci_usb_ops,
.flags = DM_FLAG_ALLOC_PRIV_DMA, .flags = DM_FLAG_ALLOC_PRIV_DMA,
}; };
#endif