Coding style cleanup, update CHANGELOG, prepare release

[u-boot] / cpu / arm926ejs / at91sam9 / usb.c

diff --git a/cpu/arm926ejs/at91sam9/usb.c b/cpu/arm926ejs/at91sam9/usb.c
index 09292a6bed006e1e6c2dd880486c4e514b4dc7f2..2a92f734ddc7579463c687d3adaf4eb5f0d7f762 100644 (file)
--- a/cpu/arm926ejs/at91sam9/usb.c
+++ b/cpu/arm926ejs/at91sam9/usb.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2006
- * DENX Software Engineering <mk <at> denx.de>
+ * DENX Software Engineering <mk@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -26,12 +26,18 @@
 #if defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT)
 
 #include <asm/arch/hardware.h>
+#include <asm/arch/io.h>
+#include <asm/arch/at91_pmc.h>
 
 int usb_cpu_init(void)
 {
        /* Enable USB host clock. */
-       AT91C_BASE_PMC->PMC_SCER = AT91C_PMC_UHP;
-       AT91C_BASE_PMC->PMC_PCER = 1 << AT91C_ID_UHP;
+       at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_UHP);
+#ifdef CONFIG_AT91SAM9261
+       at91_sys_write(AT91_PMC_SCER, AT91_PMC_UHP | AT91_PMC_HCK0);
+#else
+       at91_sys_write(AT91_PMC_SCER, AT91_PMC_UHP);
+#endif
 
        return 0;
 }
@@ -39,8 +45,12 @@ int usb_cpu_init(void)
 int usb_cpu_stop(void)
 {
        /* Disable USB host clock. */
-       AT91C_BASE_PMC->PMC_PCDR = 1 << AT91C_ID_UHP;
-       AT91C_BASE_PMC->PMC_SCDR = AT91C_PMC_UHP;
+       at91_sys_write(AT91_PMC_PCDR, 1 << AT91_ID_UHP);
+#ifdef CONFIG_AT91SAM9261
+       at91_sys_write(AT91_PMC_SCDR, AT91_PMC_UHP | AT91_PMC_HCK0);
+#else
+       at91_sys_write(AT91_PMC_SCDR, AT91_PMC_UHP);
+#endif
        return 0;
 }