summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c64xx/include/mach/system.h
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-01-26 10:11:04 +0900
committerBen Dooks <ben-linux@fluff.org>2010-01-26 10:16:32 +0900
commit431107ea5b680a24a4d01fbd3a178a3eb932f378 (patch)
tree6515a616e8ed60480e169188e630936794be2c77 /arch/arm/mach-s3c64xx/include/mach/system.h
parentab5d97db1c6ced3e95c00d097931471707032b1f (diff)
ARM: S3C64XX: Merge mach-s3c6400 and mach-s3c6410
As per discussions with Russell King on linux-arm-kernel, it appears that both mach-s3c6400 and mach-s3c6410 are so close together that they should simply be merged into mach-s3c64xx. Note, this patch does not eliminate any of the bits that are still common, it is simply a move of the two directories together, any further common code will be eliminated or moved in further patches. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s3c64xx/include/mach/system.h')
-rw-r--r--arch/arm/mach-s3c64xx/include/mach/system.h30
1 files changed, 30 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/include/mach/system.h b/arch/arm/mach-s3c64xx/include/mach/system.h
new file mode 100644
index 00000000000..2e58cb7a714
--- /dev/null
+++ b/arch/arm/mach-s3c64xx/include/mach/system.h
@@ -0,0 +1,30 @@
+/* linux/arch/arm/mach-s3c6400/include/mach/system.h
+ *
+ * Copyright 2008 Openmoko, Inc.
+ * Copyright 2008 Simtec Electronics
+ * Ben Dooks <ben@simtec.co.uk>
+ * http://armlinux.simtec.co.uk/
+ *
+ * S3C6400 - system implementation
+ */
+
+#ifndef __ASM_ARCH_SYSTEM_H
+#define __ASM_ARCH_SYSTEM_H __FILE__
+
+#include <plat/watchdog-reset.h>
+
+static void arch_idle(void)
+{
+ /* nothing here yet */
+}
+
+static void arch_reset(char mode, const char *cmd)
+{
+ if (mode != 's')
+ arch_wdt_reset();
+
+ /* if all else fails, or mode was for soft, jump to 0 */
+ cpu_reset(0);
+}
+
+#endif /* __ASM_ARCH_IRQ_H */