dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-27 08:33:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-usb

Browse Source
This commit is contained in:
Tom Rini
2016-07-01 22:35:20 -04:00
parent 2f6b47061d 57de41e9c9
commit 68f7289b4f
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/usb/host/ehci-fsl.c
View File

@@ -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:

10
drivers/usb/host/ehci-mx6.c
View File

@@ -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)