diff options
| author | Pierre-Jean Texier <[email protected]> | 2019-04-19 20:34:12 +0200 |
|---|---|---|
| committer | Stefano Babic <[email protected]> | 2019-04-25 19:21:00 +0200 |
| commit | 6b503f9e6549e9bdcdb227a77897492584e4a307 (patch) | |
| tree | 50493641ae7ba85d3f86aaadc3ca9e601c6baf9b | |
| parent | 0710726d047f559b17a64d8cce860639c635adfd (diff) | |
warp7: Switch to DM USB
This commit switches to DM USB for warp7 and warp7_bl33 defconfigs.
Signed-off-by: Pierre-Jean Texier <[email protected]>
Signed-off-by: Joris Offouga <[email protected]>
Reviewed-by: Fabio Estevam <[email protected]>
| -rw-r--r-- | arch/arm/dts/imx7s-warp.dts | 1 | ||||
| -rw-r--r-- | board/warp7/warp7.c | 6 | ||||
| -rw-r--r-- | configs/warp7_bl33_defconfig | 1 | ||||
| -rw-r--r-- | configs/warp7_defconfig | 1 |
4 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/dts/imx7s-warp.dts b/arch/arm/dts/imx7s-warp.dts index 4d87348f643..db5ef67eb13 100644 --- a/arch/arm/dts/imx7s-warp.dts +++ b/arch/arm/dts/imx7s-warp.dts @@ -19,6 +19,7 @@ aliases { mmc0 = &usdhc3; + usb0 = &usbotg1; }; chosen { diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c index 2882dc98707..134a6c99d74 100644 --- a/board/warp7/warp7.c +++ b/board/warp7/warp7.c @@ -14,7 +14,6 @@ #include <asm/io.h> #include <common.h> #include <asm/arch/crm_regs.h> -#include <usb.h> #include <netdev.h> #include <power/pmic.h> #include <power/pfuze3000_pmic.h> @@ -128,11 +127,6 @@ int checkboard(void) return 0; } -int board_usb_phy_mode(int port) -{ - return USB_INIT_DEVICE; -} - int board_late_init(void) { struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR; diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig index d34f76b3e83..300dc3805af 100644 --- a/configs/warp7_bl33_defconfig +++ b/configs/warp7_bl33_defconfig @@ -41,6 +41,7 @@ CONFIG_DM_REGULATOR_GPIO=y CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_DM_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_MXC_USB_OTG_HACTIVE=y CONFIG_USB_GADGET=y diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index ae424ab7a0b..cabddad7fcb 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -51,6 +51,7 @@ CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_DM_SERIAL=y CONFIG_OPTEE=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_MXC_USB_OTG_HACTIVE=y CONFIG_USB_GADGET=y |