diff options
| author | Derald D. Woods <woods.technical@gmail.com> | 2019-05-28 05:20:50 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-13 18:11:27 +0300 |
| commit | e74e9f620a6e413cca2649b2d5e3f483187735c5 (patch) | |
| tree | 7d09d5b75df93c1dd41923d49cde86c4d73f0e57 | |
| parent | 5579e73c8cc516572b3f3e224f45836f74c37360 (diff) | |
| download | u-boot-e74e9f620a6e413cca2649b2d5e3f483187735c5.tar.xz | |
ARM: omap3: evm: Enable DM_USB in defconfig
This addresses the following warning message:
===================== WARNING ======================
This board does not use CONFIG_DM_USB. Please update
the board to use CONFIG_DM_USB before the v2019.07 release.
Failure to update by the deadline may result in board removal.
See doc/driver-model/MIGRATION.txt for more info.
====================================================
As USB support for older OMAP3 SoC's improves, OMAP3 EVM can be
readily adapted. There is some additional 'gpio-hog' support
needed to fully setup USB in a similar manner to Linux.
Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
| -rw-r--r-- | board/ti/evm/evm.c | 31 | ||||
| -rw-r--r-- | configs/omap3_evm_defconfig | 3 | ||||
| -rw-r--r-- | include/configs/omap3_evm.h | 3 |
3 files changed, 3 insertions, 34 deletions
diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c index daecb4af3e..93408047b2 100644 --- a/board/ti/evm/evm.c +++ b/board/ti/evm/evm.c @@ -30,11 +30,6 @@ #include <linux/usb/musb.h> #include "evm.h" -#ifdef CONFIG_USB_EHCI_HCD -#include <usb.h> -#include <asm/ehci-omap.h> -#endif - #define OMAP3EVM_GPIO_ETH_RST_GEN1 64 #define OMAP3EVM_GPIO_ETH_RST_GEN2 7 @@ -307,32 +302,6 @@ void board_mmc_power_init(void) } #endif /* CONFIG_MMC */ -#if defined(CONFIG_USB_EHCI_HCD) && !defined(CONFIG_SPL_BUILD) -/* Call usb_stop() before starting the kernel */ -void show_boot_progress(int val) -{ - if (val == BOOTSTAGE_ID_RUN_OS) - usb_stop(); -} - -static struct omap_usbhs_board_data usbhs_bdata = { - .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, - .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY, - .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED -}; - -int ehci_hcd_init(int index, enum usb_init_type init, - struct ehci_hccr **hccr, struct ehci_hcor **hcor) -{ - return omap_ehci_hcd_init(index, &usbhs_bdata, hccr, hcor); -} - -int ehci_hcd_stop(int index) -{ - return omap_ehci_hcd_stop(); -} -#endif /* CONFIG_USB_EHCI_HCD */ - #if defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET) && !defined(CONFIG_CMD_NET) int board_eth_init(bd_t *bis) { diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index a3b662db2b..26d0e65589 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -66,7 +66,10 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_USB=y +CONFIG_DM_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_EHCI_HCD=y +CONFIG_USB_OMAP3=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_OMAP2PLUS=y CONFIG_USB_GADGET=y diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 4ab172c06d..8e98977de8 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -52,9 +52,6 @@ #endif /* CONFIG_SPL_OS_BOOT */ #endif /* CONFIG_NAND */ -/* Environment */ -#define CONFIG_PREBOOT "usb start" - #define MEM_LAYOUT_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV |