From: Fabio Estevam festevam@denx.de
With CONFIG_DM_USB, there is no longer the need for any USB board code anymore.
Remove the unneeded USB board code.
While at it, also remove the uneeeded CONFIG_USB_MAX_CONTROLLER_COUNT option.
Signed-off-by: Fabio Estevam festevam@denx.de --- .../mx6ul_14x14_evk/mx6ul_14x14_evk.c | 51 ------------------- configs/mx6ul_14x14_evk_defconfig | 1 - 2 files changed, 52 deletions(-)
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c index c4ab59da78c7..fbb5a12212d7 100644 --- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c @@ -31,8 +31,6 @@ #include <power/pmic.h> #include <power/pfuze3000_pmic.h> #include "../common/pfuze.h" -#include <usb.h> -#include <usb/ehci-ci.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -155,49 +153,6 @@ int board_mmc_init(struct bd_info *bis) } #endif
-#ifdef CONFIG_USB_EHCI_MX6 -#ifndef CONFIG_DM_USB - -#define USB_OTHERREGS_OFFSET 0x800 -#define UCTRL_PWR_POL (1 << 9) - -static iomux_v3_cfg_t const usb_otg_pads[] = { - MX6_PAD_GPIO1_IO00__ANATOP_OTG1_ID | MUX_PAD_CTRL(OTG_ID_PAD_CTRL), -}; - -/* At default the 3v3 enables the MIC2026 for VBUS power */ -static void setup_usb(void) -{ - imx_iomux_v3_setup_multiple_pads(usb_otg_pads, - ARRAY_SIZE(usb_otg_pads)); -} - -int board_usb_phy_mode(int port) -{ - if (port == 1) - return USB_INIT_HOST; - else - return usb_phy_mode(port); -} - -int board_ehci_hcd_init(int port) -{ - u32 *usbnc_usb_ctrl; - - if (port > 1) - return -EINVAL; - - usbnc_usb_ctrl = (u32 *)(USB_BASE_ADDR + USB_OTHERREGS_OFFSET + - port * 4); - - /* Set Power polarity */ - setbits_le32(usbnc_usb_ctrl, UCTRL_PWR_POL); - - return 0; -} -#endif -#endif - #ifdef CONFIG_FEC_MXC static int setup_fec(int fec_id) { @@ -284,12 +239,6 @@ int board_init(void) setup_fec(CFG_FEC_ENET_DEV); #endif
-#ifdef CONFIG_USB_EHCI_MX6 -#ifndef CONFIG_DM_USB - setup_usb(); -#endif -#endif - #ifdef CONFIG_FSL_QSPI board_qspi_init(); #endif diff --git a/configs/mx6ul_14x14_evk_defconfig b/configs/mx6ul_14x14_evk_defconfig index bbeb364e256c..522c5660d72c 100644 --- a/configs/mx6ul_14x14_evk_defconfig +++ b/configs/mx6ul_14x14_evk_defconfig @@ -92,7 +92,6 @@ CONFIG_SOFT_SPI=y CONFIG_IMX_THERMAL=y CONFIG_USB=y CONFIG_SPL_USB_HOST=y -CONFIG_USB_MAX_CONTROLLER_COUNT=2 CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_SPL_USB_GADGET=y