diff options
| author | Ye.Li <B37916@freescale.com> | 2014-01-13 16:55:31 +0800 |
|---|---|---|
| committer | Ye.Li <B37916@freescale.com> | 2014-01-17 11:45:51 +0800 |
| commit | 0d94d256b1604cdbcbfee67b849b88e4cb973491 (patch) | |
| tree | 9c03b1f6d60798c801c546a7a827cf9f64cbdfc6 /include/configs | |
| parent | 2e7884d1addd60675717ffc5efd4c0eefcb1ec76 (diff) | |
| download | u-boot-imx-0d94d256b1604cdbcbfee67b849b88e4cb973491.zip u-boot-imx-0d94d256b1604cdbcbfee67b849b88e4cb973491.tar.gz u-boot-imx-0d94d256b1604cdbcbfee67b849b88e4cb973491.tar.bz2 | |
ENGR00294905 ARM:imx6:EHCI Update OTG support from mainline
Update the ehci-mx6 driver from mainline. Drop the changes
related with usb_init_type because we don't upgrade the whole
driver framework.
The OTG controller is forced to host mode in ehci_hcd_init.
The signal on OTG ID is ignored.
Set Power polarity in CTRL register to active-high to control
the off-chip power switch.
Update USB base address to support imx6sl.
Original:
usb: ehci-mx6: add support for otg port
Previously, only host1 was supported using an index of 0.
Now, otg has index 0, host1 is 1, host2 is 2, host3 is 3.
Since OTG requires usbmode to be set after reset, I added
CONFIG_EHCI_HCD_INIT_AFTER_RESET to nitrogen6x.h and
mx6qsabreauto.h.
I also added a weak function board_ehci_power to handle
turning power on/off for otg.
Type is type of device connected (USB stick vs Host.)
Init is type of device desired.
Only power up port if type == init == USB_INIT_HOST.
Only return error if type != init.
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
(cherry picked from commit d1a5286099a1ccb43fa8599e2c806ca039783e2f)
Conflicts:
drivers/usb/host/ehci-mx6.c
(cherry picked from commit b013a5d31a2cf523b300bc38f1f1548f7ecdfe29)
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/mx6qsabreauto.h | 3 | ||||
| -rw-r--r-- | include/configs/nitrogen6x.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h index 7f21c64..b56f93e 100644 --- a/include/configs/mx6qsabreauto.h +++ b/include/configs/mx6qsabreauto.h @@ -24,7 +24,8 @@ #define CONFIG_USB_STORAGE #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX -#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 diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 5afe00d..f8672d7 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -127,7 +127,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 |