tegra: add enterrcm command

[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 83022e2e563aa64b4fde2e0074c07f048cb06f46..6c7e496db78bed4d9785dfd9c95d084a9971fc01 100644 (file)
--- a/arch/arm/cpu/pxa/usb.c
+++ b/arch/arm/cpu/pxa/usb.c
@@ -48,14 +48,14 @@ int usb_cpu_init(void)
 #endif
 
        writel(readl(UHCHR) | UHCHR_FHR, UHCHR);
-       wait_ms(11);
+       mdelay(11);
        writel(readl(UHCHR) & ~UHCHR_FHR, UHCHR);
 
        writel(readl(UHCHR) | UHCHR_FSBIR, UHCHR);
        while (readl(UHCHR) & UHCHR_FSBIR)
                udelay(1);
 
-#if defined(CONFIG_CPU_MONAHANS)
+#if defined(CONFIG_CPU_MONAHANS) || defined(CONFIG_PXA27X)
        writel(readl(UHCHR) & ~UHCHR_SSEP0, UHCHR);
 #endif
 #if defined(CONFIG_CPU_PXA27X)
@@ -72,10 +72,10 @@ int usb_cpu_stop(void)
        udelay(11);
        writel(readl(UHCHR) & ~UHCHR_FHR, UHCHR);
 
-       writel(readl(UHCCOMS) | UHCHR_FHR, UHCCOMS);
+       writel(readl(UHCCOMS) | UHCCOMS_HCR, UHCCOMS);
        udelay(10);
 
-#if defined(CONFIG_CPU_MONAHANS)
+#if defined(CONFIG_CPU_MONAHANS) || defined(CONFIG_PXA27X)
        writel(readl(UHCHR) | UHCHR_SSEP0, UHCHR);
 #endif
 #if defined(CONFIG_CPU_PXA27X)