diff options
| author | Tom Rini <trini@konsulko.com> | 2016-02-21 07:56:16 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-02-21 07:56:16 -0500 |
| commit | 595af9db2422fa5ae734cfe615415b17a5098f34 (patch) | |
| tree | 21a9287dd2998798c2dbb1613eefc7d5f5a58159 /board/freescale | |
| parent | 03bfc78359a2d749252b7dfdbff33898f6da0385 (diff) | |
| parent | 35c4ce5e20d3d10d1089ba336a248896faed284c (diff) | |
| download | u-boot-imx-595af9db2422fa5ae734cfe615415b17a5098f34.zip u-boot-imx-595af9db2422fa5ae734cfe615415b17a5098f34.tar.gz u-boot-imx-595af9db2422fa5ae734cfe615415b17a5098f34.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'board/freescale')
| -rw-r--r-- | board/freescale/mx7dsabresd/MAINTAINERS | 2 | ||||
| -rw-r--r-- | board/freescale/mx7dsabresd/mx7dsabresd.c | 41 |
2 files changed, 19 insertions, 24 deletions
diff --git a/board/freescale/mx7dsabresd/MAINTAINERS b/board/freescale/mx7dsabresd/MAINTAINERS index 3910ee4..b96642a 100644 --- a/board/freescale/mx7dsabresd/MAINTAINERS +++ b/board/freescale/mx7dsabresd/MAINTAINERS @@ -1,5 +1,5 @@ MX7DSABRESD BOARD -M: Adrian Alonso <aalonso@freescale.com> +M: Adrian Alonso <adrian.alonso@nxp.com> S: Maintained F: board/freescale/mx7dsabresd F: include/configs/mx7dsabresd.h diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/freescale/mx7dsabresd/mx7dsabresd.c index fee24e2..4d0b195 100644 --- a/board/freescale/mx7dsabresd/mx7dsabresd.c +++ b/board/freescale/mx7dsabresd/mx7dsabresd.c @@ -23,6 +23,7 @@ #include <i2c.h> #include <asm/imx-common/mxc_i2c.h> #include <asm/arch/crm_regs.h> +#include <usb.h> #include <usb/ehci-fsl.h> DECLARE_GLOBAL_DATA_PTR; @@ -111,6 +112,14 @@ static iomux_v3_cfg_t const usdhc3_emmc_pads[] = { MX7D_PAD_SD3_RESET_B__GPIO6_IO11 | MUX_PAD_CTRL(USDHC_PAD_CTRL), }; +static iomux_v3_cfg_t const usb_otg1_pads[] = { + MX7D_PAD_GPIO1_IO05__USB_OTG1_PWR | MUX_PAD_CTRL(NO_PAD_CTRL), +}; + +static iomux_v3_cfg_t const usb_otg2_pads[] = { + MX7D_PAD_UART3_CTS_B__USB_OTG2_PWR | MUX_PAD_CTRL(NO_PAD_CTRL), +}; + #define IOX_SDI IMX_GPIO_NR(1, 9) #define IOX_STCP IMX_GPIO_NR(1, 12) #define IOX_SHCP IMX_GPIO_NR(1, 13) @@ -511,6 +520,10 @@ int board_early_init_f(void) setup_iomux_uart(); setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1); + imx_iomux_v3_setup_multiple_pads(usb_otg1_pads, + ARRAY_SIZE(usb_otg1_pads)); + imx_iomux_v3_setup_multiple_pads(usb_otg2_pads, + ARRAY_SIZE(usb_otg2_pads)); return 0; } @@ -602,29 +615,11 @@ int checkboard(void) } #ifdef CONFIG_USB_EHCI_MX7 -static iomux_v3_cfg_t const usb_otg1_pads[] = { - MX7D_PAD_GPIO1_IO05__USB_OTG1_PWR | MUX_PAD_CTRL(NO_PAD_CTRL), -}; - -static iomux_v3_cfg_t const usb_otg2_pads[] = { - MX7D_PAD_UART3_CTS_B__USB_OTG2_PWR | MUX_PAD_CTRL(NO_PAD_CTRL), -}; - -int board_ehci_hcd_init(int port) +int board_usb_phy_mode(int port) { - switch (port) { - case 0: - imx_iomux_v3_setup_multiple_pads(usb_otg1_pads, - ARRAY_SIZE(usb_otg1_pads)); - break; - case 1: - imx_iomux_v3_setup_multiple_pads(usb_otg2_pads, - ARRAY_SIZE(usb_otg2_pads)); - break; - default: - printf("MXC USB port %d not yet supported\n", port); - return -EINVAL; - } - return 0; + if (port == 0) + return USB_INIT_DEVICE; + else + return USB_INIT_HOST; } #endif |