Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / arch / powerpc / cpu / mpc83xx / cpu_init.c

diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c
index d568f889d2fc29e69c9f5587c70911d46d0c32bf..f911275b25f92e7c698dfc4c9238d816065a480a 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c
@@ -9,7 +9,7 @@
 #include <ioports.h>
 #include <asm/io.h>
 #ifdef CONFIG_USB_EHCI_FSL
-#include <usb/ehci-fsl.h>
+#include <usb/ehci-ci.h>
 #endif
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -315,7 +315,7 @@ void cpu_init_f (volatile immap_t * im)
 #endif
 #if defined(CONFIG_USB_EHCI_FSL) && defined(CONFIG_MPC831x)
        uint32_t temp;
-       struct usb_ehci *ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB_ADDR;
+       struct usb_ehci *ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB1_ADDR;
 
        /* Configure interface. */
        setbits_be32(&ehci->control, REFSEL_16MHZ | UTMI_PHY_EN);
@@ -425,15 +425,15 @@ static int print_83xx_arb_event(int force)
        };
 
        int etype = (gd->arch.arbiter_event_attributes & AEATR_EVENT)
-                   >> AEATR_EVENT_SHIFT;
+                   >> AEATR_EVENT_SHIFT;
        int mstr_id = (gd->arch.arbiter_event_attributes & AEATR_MSTR_ID)
-                     >> AEATR_MSTR_ID_SHIFT;
+                     >> AEATR_MSTR_ID_SHIFT;
        int tbst = (gd->arch.arbiter_event_attributes & AEATR_TBST)
-                  >> AEATR_TBST_SHIFT;
+                  >> AEATR_TBST_SHIFT;
        int tsize = (gd->arch.arbiter_event_attributes & AEATR_TSIZE)
-                   >> AEATR_TSIZE_SHIFT;
+                   >> AEATR_TSIZE_SHIFT;
        int ttype = (gd->arch.arbiter_event_attributes & AEATR_TTYPE)
-                   >> AEATR_TTYPE_SHIFT;
+                   >> AEATR_TTYPE_SHIFT;
 
        if (!force && !gd->arch.arbiter_event_address)
                return 0;
@@ -484,7 +484,7 @@ int prt_83xx_rsr(void)
                RSR_SRS,  "External/Internal Soft"}, {
                RSR_HRS,  "External/Internal Hard"}
        };
-       static int n = sizeof bits / sizeof bits[0];
+       static int n = ARRAY_SIZE(bits);
        ulong rsr = gd->arch.reset_status;
        int i;
        char *sep;