projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
usb: ehci-atmel: Remove unnecessary clock calling
[oweals/u-boot.git]
/
drivers
/
usb
/
host
/
ehci-mpc512x.c
diff --git
a/drivers/usb/host/ehci-mpc512x.c
b/drivers/usb/host/ehci-mpc512x.c
index bb6e7ac97fd555bb1b437568a66a1ac21ff37719..bb4f4616133bdeb560b06e170b91cf3c8f6e8f9b 100644
(file)
--- a/
drivers/usb/host/ehci-mpc512x.c
+++ b/
drivers/usb/host/ehci-mpc512x.c
@@
-17,7
+17,7
@@
#include <pci.h>
#include <usb.h>
#include <asm/io.h>
#include <pci.h>
#include <usb.h>
#include <asm/io.h>
-#include <usb/ehci-
fsl
.h>
+#include <usb/ehci-
ci
.h>
#include "ehci.h"
#include "ehci.h"
@@
-32,12
+32,13
@@
static void usb_platform_dr_init(volatile struct usb_ehci *ehci);
* This code is derived from EHCI FSL USB Linux driver for MPC5121
*
*/
* This code is derived from EHCI FSL USB Linux driver for MPC5121
*
*/
-int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
+int ehci_hcd_init(int index, enum usb_init_type init,
+ struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{
volatile struct usb_ehci *ehci;
/* Hook the memory mapped registers for EHCI-Controller */
{
volatile struct usb_ehci *ehci;
/* Hook the memory mapped registers for EHCI-Controller */
- ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB_ADDR;
+ ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB
1
_ADDR;
*hccr = (struct ehci_hccr *)((uint32_t)&(ehci->caplength));
*hcor = (struct ehci_hcor *)((uint32_t) *hccr +
HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
*hccr = (struct ehci_hccr *)((uint32_t)&(ehci->caplength));
*hcor = (struct ehci_hcor *)((uint32_t) *hccr +
HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
@@
-81,7
+82,7
@@
int ehci_hcd_stop(int index)
int exit_status = 0;
/* Reset the USB controller */
int exit_status = 0;
/* Reset the USB controller */
- ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB_ADDR;
+ ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB
1
_ADDR;
exit_status = reset_usb_controller(ehci);
return exit_status;
exit_status = reset_usb_controller(ehci);
return exit_status;
@@
-92,7
+93,7
@@
static int reset_usb_controller(volatile struct usb_ehci *ehci)
unsigned int i;
/* Command a reset of the USB Controller */
unsigned int i;
/* Command a reset of the USB Controller */
- out_be32(&(ehci->usbcmd),
EHCI_FSL_USBCMD_RS
T);
+ out_be32(&(ehci->usbcmd),
CMD_RESE
T);
/* Wait for the reset process to finish */
for (i = 65535 ; i > 0 ; i--) {
/* Wait for the reset process to finish */
for (i = 65535 ; i > 0 ; i--) {
@@
-100,7
+101,7
@@
static int reset_usb_controller(volatile struct usb_ehci *ehci)
* The host will set this bit to zero once the
* reset process is complete
*/
* The host will set this bit to zero once the
* reset process is complete
*/
- if ((in_be32(&(ehci->usbcmd)) &
EHCI_FSL_USBCMD_RS
T) == 0)
+ if ((in_be32(&(ehci->usbcmd)) &
CMD_RESE
T) == 0)
return 0;
}
return 0;
}