Pull kvm-patches into release branch

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-iop32x / system.h

diff --git a/include/asm-arm/arch-iop32x/system.h b/include/asm-arm/arch-iop32x/system.h
index d4c8d691e1b077cf99095265124f04af74ce8077..17b7eb7e9c0d523cdcb4a70d5dc3d63b70bdf451 100644 (file)
--- a/include/asm-arm/arch-iop32x/system.h
+++ b/include/asm-arm/arch-iop32x/system.h
@@ -1,29 +1,33 @@
 /*
- * linux/include/asm-arm/arch-iop32x/system.h
+ * include/asm-arm/arch-iop32x/system.h
  *
- *  Copyright (C) 2001 MontaVista Software, Inc.
+ * Copyright (C) 2001 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
  * published by the Free Software Foundation.
  */
 
+#include <asm/mach-types.h>
+
 static inline void arch_idle(void)
 {
        cpu_do_idle();
 }
 
-
 static inline void arch_reset(char mode)
 {
-    *IOP321_PCSR = 0x30;
+       local_irq_disable();
 
-       if ( 1 && mode == 's') {
-               /* Jump into ROM at address 0 */
-               cpu_reset(0);
-       } else {
-               /* No on-chip reset capability */
-               cpu_reset(0);
+       if (machine_is_n2100()) {
+               gpio_line_set(N2100_HARDWARE_RESET, GPIO_LOW);
+               gpio_line_config(N2100_HARDWARE_RESET, GPIO_OUT);
+               while (1)
+                       ;
        }
-}
 
+       *IOP3XX_PCSR = 0x30;
+
+       /* Jump into ROM at address 0 */
+       cpu_reset(0);
+}