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

[u-boot] / drivers / usb / host / ehci-fsl.c

diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index bf148c4e2429e588641739edd6a4518f46260ba6..6e0043a50250e24df5763fa433f9740b4174ff71 100644 (file)
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -40,16 +40,16 @@ int ehci_hcd_init(void)
 {
        struct usb_ehci *ehci;
 
-       ehci = (struct usb_ehci *)CONFIG_SYS_MPC8xxx_USB_ADDR;
-       hccr = (struct ehci_hccr *)((uint32_t)ehci->caplength);
+       ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB_ADDR;
+       hccr = (struct ehci_hccr *)((uint32_t)&ehci->caplength);
        hcor = (struct ehci_hcor *)((uint32_t) hccr +
                        HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
 
        /* Set to Host mode */
-       setbits_le32((void *)ehci->usbmode, CM_HOST);
+       setbits_le32(&ehci->usbmode, CM_HOST);
 
-       out_be32((void *)ehci->snoop1, SNOOP_SIZE_2GB);
-       out_be32((void *)ehci->snoop2, 0x80000000 | SNOOP_SIZE_2GB);
+       out_be32(&ehci->snoop1, SNOOP_SIZE_2GB);
+       out_be32(&ehci->snoop2, 0x80000000 | SNOOP_SIZE_2GB);
 
        /* Init phy */
        if (!strcmp(getenv("usb_phy_type"), "utmi"))
@@ -58,13 +58,13 @@ int ehci_hcd_init(void)
                out_le32(&(hcor->or_portsc[0]), PORT_PTS_ULPI);
 
        /* Enable interface. */
-       setbits_be32((void *)ehci->control, USB_EN);
+       setbits_be32(&ehci->control, USB_EN);
 
-       out_be32((void *)ehci->prictrl, 0x0000000c);
-       out_be32((void *)ehci->age_cnt_limit, 0x00000040);
-       out_be32((void *)ehci->sictrl, 0x00000001);
+       out_be32(&ehci->prictrl, 0x0000000c);
+       out_be32(&ehci->age_cnt_limit, 0x00000040);
+       out_be32(&ehci->sictrl, 0x00000001);
 
-       in_le32((void *)ehci->usbmode);
+       in_le32(&ehci->usbmode);
 
        return 0;
 }