fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / asm-arm / arch-ixp2000 / system.h

diff --git a/include/asm-arm/arch-ixp2000/system.h b/include/asm-arm/arch-ixp2000/system.h
index ec72ba4..3cc9a04 100644 (file)
--- a/include/asm-arm/arch-ixp2000/system.h
+++ b/include/asm-arm/arch-ixp2000/system.h
@@ -1,7 +1,8 @@
 /*
- * linux/include/asm-arm/arch-ixp2400/system.h
+ * linux/include/asm-arm/arch-ixp2000/system.h
  *
  * Copyright (C) 2002 Intel Corp.
+ * Copyricht (C) 2003-2005 MontaVista Software, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -18,18 +19,31 @@ static inline void arch_idle(void)
 
 static inline void arch_reset(char mode)
 {
-       cli();
+       local_irq_disable();
 
-       if (machine_is_ixdp2401() || machine_is_ixdp2801()) {
-               *IXDP2X01_CPLD_FLASH_REG = ((0 >> IXDP2X01_FLASH_WINDOW_BITS) | IXDP2X01_CPLD_FLASH_INTERN);
-               *IXDP2X01_CPLD_RESET_REG = 0xffffffff;
+       /*
+        * Reset flash banking register so that we are pointing at
+        * RedBoot bank.
+        */
+       if (machine_is_ixdp2401()) {
+               ixp2000_reg_write(IXDP2X01_CPLD_FLASH_REG,
+                                       ((0 >> IXDP2X01_FLASH_WINDOW_BITS)
+                                               | IXDP2X01_CPLD_FLASH_INTERN));
+               ixp2000_reg_wrb(IXDP2X01_CPLD_RESET_REG, 0xffffffff);
        }
 
        /*
-        * We do a reset all if we are PCI master. We could be a slave and we
-        * don't want to do anything funky on the PCI bus.
+        * On IXDP2801 we need to write this magic sequence to the CPLD
+        * to cause a complete reset of the CPU and all external devices
+        * and move the flash bank register back to 0.
         */
-       if (*IXP2000_STRAP_OPTIONS & CFG_PCI_BOOT_HOST) {
-               *(IXP2000_RESET0) |= (RSTALL);
+       if (machine_is_ixdp2801() || machine_is_ixdp28x5()) {
+               unsigned long reset_reg = *IXDP2X01_CPLD_RESET_REG;
+
+               reset_reg = 0x55AA0000 | (reset_reg & 0x0000FFFF);
+               ixp2000_reg_write(IXDP2X01_CPLD_RESET_REG, reset_reg);
+               ixp2000_reg_wrb(IXDP2X01_CPLD_RESET_REG, 0x80000000);
        }
+
+       ixp2000_reg_wrb(IXP2000_RESET0, RSTALL);
 }