diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2014-06-16 15:06:16 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2014-07-15 16:42:39 +0200 |
| commit | 07407aeb034ff86d2609cec6bbf073492db6a9bf (patch) | |
| tree | 9a429f5ea6bc04a1449bf226c0559d2f9905f356 | |
| parent | e823f307e9df2af3d1e94440619d1fafe405c358 (diff) | |
apalis_imx6: update config to changed USB stack
| -rw-r--r-- | board/toradex/apalis_imx6/apalis_imx6.c | 13 | ||||
| -rw-r--r-- | include/configs/apalis-imx6.h | 3 |
2 files changed, 15 insertions, 1 deletions
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index 305783badc..223af1f4c8 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -255,6 +255,10 @@ iomux_v3_cfg_t const usb_pads[] = { MX6_PAD_GPIO_0__GPIO1_IO00 | MUX_PAD_CTRL(NO_PAD_CTRL), /* USB_VBUS_DET */ MX6_PAD_EIM_D28__GPIO3_IO28 | MUX_PAD_CTRL(NO_PAD_CTRL), + /* USBO1_ID */ + MX6_PAD_ENET_RX_ER__USB_OTG_ID | MUX_PAD_CTRL(WEAK_PULLUP), + /* USBO1_EN */ + MX6_PAD_EIM_D22__GPIO3_IO22 | MUX_PAD_CTRL(NO_PAD_CTRL), }; /* if UARTs are used in DTE mode, so switch the mode on all UARTs before @@ -294,6 +298,15 @@ int board_ehci_hcd_init(int port) return 0; } + +int board_ehci_power(int port, int on) +{ + if (port != 0) + return 0; + /* control OTG power */ + gpio_set_value(IMX_GPIO_NR(3, 22), on); + return 0; +} #endif #ifdef CONFIG_FSL_ESDHC diff --git a/include/configs/apalis-imx6.h b/include/configs/apalis-imx6.h index d3d909ab1a..7ebd2941bf 100644 --- a/include/configs/apalis-imx6.h +++ b/include/configs/apalis-imx6.h @@ -117,7 +117,8 @@ #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX #define CONFIG_USB_ETHER_SMSC95XX -#define CONFIG_MXC_USB_PORT 1 +#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 +#define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_KEYBOARD |