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/mx7d_19x19_ddr3_arm2 | |
| 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/mx7d_19x19_ddr3_arm2')
| -rw-r--r-- | board/freescale/mx7d_19x19_ddr3_arm2/mx7d_19x19_ddr3_arm2.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/board/freescale/mx7d_19x19_ddr3_arm2/mx7d_19x19_ddr3_arm2.c b/board/freescale/mx7d_19x19_ddr3_arm2/mx7d_19x19_ddr3_arm2.c index b3d4621..50b566c 100644 --- a/board/freescale/mx7d_19x19_ddr3_arm2/mx7d_19x19_ddr3_arm2.c +++ b/board/freescale/mx7d_19x19_ddr3_arm2/mx7d_19x19_ddr3_arm2.c @@ -456,6 +456,7 @@ int board_spi_cs_gpio(unsigned bus, unsigned cs) #endif #ifdef CONFIG_USB_EHCI_MX7 +#ifndef CONFIG_DM_USB iomux_v3_cfg_t const usb_otg1_pads[] = { MX7D_PAD_GPIO1_IO05__USB_OTG1_PWR | MUX_PAD_CTRL(NO_PAD_CTRL), }; @@ -470,6 +471,7 @@ static void setup_usb(void) imx_iomux_v3_setup_multiple_pads(usb_otg2_pads, ARRAY_SIZE(usb_otg2_pads)); } #endif +#endif int board_early_init_f(void) { @@ -481,8 +483,10 @@ int board_early_init_f(void) #endif #ifdef CONFIG_USB_EHCI_MX7 +#ifndef CONFIG_DM_USB setup_usb(); #endif +#endif return 0; } |