diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-23 05:58:50 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-23 05:58:50 +0300 |
| commit | 9c5fef577494769e3ff07952a85f9b7125ef765b (patch) | |
| tree | 15d2ebcabd76b0644b931da010983f917e43c7f9 /arch/arm | |
| parent | 5b6b2c6bf8ad14af32f489acaaba0d44ddfc41f3 (diff) | |
| parent | 2cff87f7abf060dda00302680f051d5e9ce60ab9 (diff) | |
| download | u-boot-9c5fef577494769e3ff07952a85f9b7125ef765b.tar.xz | |
Merge git://git.denx.de/u-boot-usb
- DM support for OMAP
- DWC3 fix
- Typo fix in eth/r8152
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/include/asm/ehci-omap.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/ehci-omap.h b/arch/arm/include/asm/ehci-omap.h index 1549f7bf21..f970bba937 100644 --- a/arch/arm/include/asm/ehci-omap.h +++ b/arch/arm/include/asm/ehci-omap.h @@ -123,6 +123,7 @@ struct omap_ehci { u32 insreg08; /* 0xb0 */ }; +#if !CONFIG_IS_ENABLED(DM_USB) || !CONFIG_IS_ENABLED(OF_CONTROL) /* * FIXME: forward declaration of this structs needed because omap got the * ehci implementation backwards. move out ehci_hcd_x from board files @@ -133,5 +134,6 @@ struct ehci_hcor; int omap_ehci_hcd_init(int index, struct omap_usbhs_board_data *usbhs_pdata, struct ehci_hccr **hccr, struct ehci_hcor **hcor); int omap_ehci_hcd_stop(void); +#endif #endif /* _OMAP_COMMON_EHCI_H_ */ |