patch-2.4.2 linux/include/asm-arm/arch-sa1100/system.h

Next file: linux/include/asm-arm/arch-sa1100/thinclient.h
Previous file: linux/include/asm-arm/arch-sa1100/processor.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.1/linux/include/asm-arm/arch-sa1100/system.h linux/include/asm-arm/arch-sa1100/system.h
@@ -24,13 +24,9 @@
 		/* Jump into ROM at address 0 */
 		cpu_reset(0);
 	} else {
-		/* Activate SA1100 watchdog and wait for the trigger... */
-		OSMR3 = OSCR + 3686400/2;	/* in 1/2 sec */
-		OWER |= OWER_WME;
-		OIER |= OIER_E3;
+		/* Use on-chip reset capability */
+		RSRR = RSRR_SWR;
 	}
 }
-
-#define arch_power_off()	do { } while (0)
 
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)