Merge 'u-boot-atmel/master' into 'u-boot-arm/master'

[u-boot] / arch / arm / cpu / pxa / usb.c

diff --git a/arch/arm/cpu/pxa/usb.c b/arch/arm/cpu/pxa/usb.c
index bd718a6fff8e7c5e85eb3c194d2cb1b9e3038ab9..6c7e496db78bed4d9785dfd9c95d084a9971fc01 100644 (file)
--- a/arch/arm/cpu/pxa/usb.c
+++ b/arch/arm/cpu/pxa/usb.c
@@ -24,89 +24,82 @@
 #include <common.h>
 
 #if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT)
-# if defined(CONFIG_CPU_MONAHANS) || defined(CONFIG_PXA27X)
+# if defined(CONFIG_CPU_MONAHANS) || defined(CONFIG_CPU_PXA27X)
 
 #include <asm/arch/pxa-regs.h>
+#include <asm/io.h>
 #include <usb.h>
 
 int usb_cpu_init(void)
 {
 #if defined(CONFIG_CPU_MONAHANS)
        /* Enable USB host clock. */
-       CKENA |= (CKENA_2_USBHOST |  CKENA_20_UDC);
+       writel(readl(CKENA) | CKENA_2_USBHOST | CKENA_20_UDC, CKENA);
        udelay(100);
 #endif
-#if defined(CONFIG_PXA27X)
+#if defined(CONFIG_CPU_PXA27X)
        /* Enable USB host clock. */
-       CKEN |= CKEN10_USBHOST;
+       writel(readl(CKEN) | CKEN10_USBHOST, CKEN);
 #endif
 
 #if defined(CONFIG_CPU_MONAHANS)
        /* Configure Port 2 for Host (USB Client Registers) */
-       UP2OCR = 0x3000c;
+       writel(0x3000c, UP2OCR);
 #endif
 
-       UHCHR |= UHCHR_FHR;
-       wait_ms(11);
-       UHCHR &= ~UHCHR_FHR;
+       writel(readl(UHCHR) | UHCHR_FHR, UHCHR);
+       mdelay(11);
+       writel(readl(UHCHR) & ~UHCHR_FHR, UHCHR);
 
-       UHCHR |= UHCHR_FSBIR;
-       while (UHCHR & UHCHR_FSBIR)
+       writel(readl(UHCHR) | UHCHR_FSBIR, UHCHR);
+       while (readl(UHCHR) & UHCHR_FSBIR)
                udelay(1);
 
-#if defined(CONFIG_CPU_MONAHANS)
-       UHCHR &= ~UHCHR_SSEP0;
+#if defined(CONFIG_CPU_MONAHANS) || defined(CONFIG_PXA27X)
+       writel(readl(UHCHR) & ~UHCHR_SSEP0, UHCHR);
 #endif
-#if defined(CONFIG_PXA27X)
-       UHCHR &= ~UHCHR_SSEP2;
+#if defined(CONFIG_CPU_PXA27X)
+       writel(readl(UHCHR) & ~UHCHR_SSEP2, UHCHR);
 #endif
-       UHCHR &= ~UHCHR_SSEP1;
-       UHCHR &= ~UHCHR_SSE;
+       writel(readl(UHCHR) & ~(UHCHR_SSEP1 | UHCHR_SSE), UHCHR);
 
        return 0;
 }
 
 int usb_cpu_stop(void)
 {
-       UHCHR |= UHCHR_FHR;
+       writel(readl(UHCHR) | UHCHR_FHR, UHCHR);
        udelay(11);
-       UHCHR &= ~UHCHR_FHR;
+       writel(readl(UHCHR) & ~UHCHR_FHR, UHCHR);
 
-       UHCCOMS |= 1;
+       writel(readl(UHCCOMS) | UHCCOMS_HCR, UHCCOMS);
        udelay(10);
 
+#if defined(CONFIG_CPU_MONAHANS) || defined(CONFIG_PXA27X)
+       writel(readl(UHCHR) | UHCHR_SSEP0, UHCHR);
+#endif
+#if defined(CONFIG_CPU_PXA27X)
+       writel(readl(UHCHR) | UHCHR_SSEP2, UHCHR);
+#endif
+       writel(readl(UHCHR) | UHCHR_SSEP1 | UHCHR_SSE, UHCHR);
+
 #if defined(CONFIG_CPU_MONAHANS)
-       UHCHR |= UHCHR_SSEP0;
+       /* Disable USB host clock. */
+       writel(readl(CKENA) & ~(CKENA_2_USBHOST | CKENA_20_UDC), CKENA);
+       udelay(100);
 #endif
-#if defined(CONFIG_PXA27X)
-       UHCHR |= UHCHR_SSEP2;
+#if defined(CONFIG_CPU_PXA27X)
+       /* Disable USB host clock. */
+       writel(readl(CKEN) & ~CKEN10_USBHOST, CKEN);
 #endif
-       UHCHR |= UHCHR_SSEP1;
-       UHCHR |= UHCHR_SSE;
 
        return 0;
 }
 
 int usb_cpu_init_fail(void)
 {
-       UHCHR |= UHCHR_FHR;
-       udelay(11);
-       UHCHR &= ~UHCHR_FHR;
-
-       UHCCOMS |= 1;
-       udelay(10);
-
-#if defined(CONFIG_CPU_MONAHANS)
-       UHCHR |= UHCHR_SSEP0;
-#endif
-#if defined(CONFIG_PXA27X)
-       UHCHR |= UHCHR_SSEP2;
-#endif
-       UHCHR |= UHCHR_SSEP1;
-       UHCHR |= UHCHR_SSE;
-
-       return 0;
+       return usb_cpu_stop();
 }
 
-# endif /* defined(CONFIG_CPU_MONAHANS) || defined(CONFIG_PXA27X) */
+# endif /* defined(CONFIG_CPU_MONAHANS) || defined(CONFIG_CPU_PXA27X) */
 #endif /* defined(CONFIG_USB_OHCI) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT) */