diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-01 22:35:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-01 22:35:20 -0400 |
| commit | 68f7289b4ff6daf8c7e9898d5f0eb8f0aaad7bba (patch) | |
| tree | 83bfb78d564f18179741f99e8957ffebc905daa2 /drivers | |
| parent | 2f6b47061d1979d241930843ff154c6f1f1ece58 (diff) | |
| parent | 57de41e9c944af8d2c7bfcc2358414c5dd8c39df (diff) | |
| download | talos-obmc-uboot-68f7289b4ff6daf8c7e9898d5f0eb8f0aaad7bba.tar.gz talos-obmc-uboot-68f7289b4ff6daf8c7e9898d5f0eb8f0aaad7bba.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/host/ehci-fsl.c | 3 | ||||
| -rw-r--r-- | drivers/usb/host/ehci-mx6.c | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index a43d37de0b..fa916ed77f 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c @@ -65,7 +65,8 @@ int ehci_hcd_init(int index, enum usb_init_type init, mdelay(5); } memset(current_usb_controller, '\0', 5); - snprintf(current_usb_controller, 4, "usb%d", index+1); + snprintf(current_usb_controller, sizeof(current_usb_controller), + "usb%d", index+1); switch (index) { case 0: diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index bb48d0dea0..069f116ed2 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -194,8 +194,9 @@ struct usbnc_regs { u32 reserve1[10]; u32 phy_cfg1; u32 phy_cfg2; + u32 reserve2; u32 phy_status; - u32 reserve2[4]; + u32 reserve3[4]; u32 adp_cfg1; u32 adp_cfg2; u32 adp_status; @@ -207,8 +208,11 @@ static void usb_power_config(int index) (0x10000 * index) + USBNC_OFFSET); void __iomem *phy_cfg2 = (void __iomem *)(&usbnc->phy_cfg2); - /* Enable usb_otg_id detection */ - setbits_le32(phy_cfg2, USBNC_PHYCFG2_ACAENB); + /* + * Clear the ACAENB to enable usb_otg_id detection, + * otherwise it is the ACA detection enabled. + */ + clrbits_le32(phy_cfg2, USBNC_PHYCFG2_ACAENB); } int usb_phy_mode(int port) |
