diff options
| author | Ye Li <ye.li@nxp.com> | 2017-05-09 00:43:05 -0500 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2017-05-09 03:22:11 -0500 |
| commit | 32d4060f845d189308d3431a7df4931ab4bd8f01 (patch) | |
| tree | c908a415b9fe96796a74f3900ffdd5bf8bd1a8e0 /board/freescale/mx6sabresd | |
| parent | 6b0d709df65a3aa1438cd6081569012030f81b88 (diff) | |
| download | u-boot-imx-32d4060f845d189308d3431a7df4931ab4bd8f01.zip u-boot-imx-32d4060f845d189308d3431a7df4931ab4bd8f01.tar.gz u-boot-imx-32d4060f845d189308d3431a7df4931ab4bd8f01.tar.bz2 | |
MLK-14845 mx6/mx7: Not call usb setup functions used by non-DM driver
Use CONFIG_DM_USB to comment out USB setup functions used by non-DM driver. So
they won't be executed when using DM driver.
These USB setup functions may setup power control pins to USB_PWR function not GPIO,
which is different as the GPIO function used by USB vbus-supply. And cause the power control
not work.
Signed-off-by: Ye Li <ye.li@nxp.com>
Diffstat (limited to 'board/freescale/mx6sabresd')
| -rw-r--r-- | board/freescale/mx6sabresd/mx6sabresd.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c index 9f11f36..b655347 100644 --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -827,6 +827,8 @@ int board_eth_init(bd_t *bis) } #ifdef CONFIG_USB_EHCI_MX6 +#ifndef CONFIG_DM_USB + #define USB_OTHERREGS_OFFSET 0x800 #define UCTRL_PWR_POL (1 << 9) @@ -889,6 +891,7 @@ int board_ehci_power(int port, int on) return 0; } #endif +#endif int board_early_init_f(void) { @@ -914,7 +917,15 @@ int board_init(void) #endif #ifdef CONFIG_USB_EHCI_MX6 +#ifndef CONFIG_DM_USB setup_usb(); +#else + /* + * set daisy chain for otg_pin_id on 6q. + * for 6dl, this bit is reserved + */ + imx_iomux_set_gpr_register(1, 13, 1, 0); +#endif #endif #ifdef CONFIG_PCIE_IMX |