projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'buildman' of git://git.denx.de/u-boot-x86
[oweals/u-boot.git]
/
drivers
/
usb
/
host
/
ehci-atmel.c
diff --git
a/drivers/usb/host/ehci-atmel.c
b/drivers/usb/host/ehci-atmel.c
index 9ffe5010be959270f6e483d8572bff4141a0d475..9a8f004ecebc99fbcf6278ba6d2b716484ebb00c 100644
(file)
--- a/
drivers/usb/host/ehci-atmel.c
+++ b/
drivers/usb/host/ehci-atmel.c
@@
-40,7
+40,11
@@
int ehci_hcd_init(int index, enum usb_init_type init,
}
/* Enable USB Host clock */
}
/* Enable USB Host clock */
+#ifdef CPU_HAS_PCR
+ at91_periph_clk_enable(ATMEL_ID_UHPHS);
+#else
writel(1 << ATMEL_ID_UHPHS, &pmc->pcer);
writel(1 << ATMEL_ID_UHPHS, &pmc->pcer);
+#endif
*hccr = (struct ehci_hccr *)ATMEL_BASE_EHCI;
*hcor = (struct ehci_hcor *)((uint32_t)*hccr +
*hccr = (struct ehci_hccr *)ATMEL_BASE_EHCI;
*hcor = (struct ehci_hcor *)((uint32_t)*hccr +
@@
-55,7
+59,11
@@
int ehci_hcd_stop(int index)
ulong start_time, tmp_time;
/* Disable USB Host Clock */
ulong start_time, tmp_time;
/* Disable USB Host Clock */
+#ifdef CPU_HAS_PCR
+ at91_periph_clk_disable(ATMEL_ID_UHPHS);
+#else
writel(1 << ATMEL_ID_UHPHS, &pmc->pcdr);
writel(1 << ATMEL_ID_UHPHS, &pmc->pcdr);
+#endif
start_time = get_timer(0);
/* Disable UTMI PLL */
start_time = get_timer(0);
/* Disable UTMI PLL */