From d3f131866419d8876e9048c4fe967889cf548cc5 Mon Sep 17 00:00:00 2001
From: Andrew Victor <andrew@sanpeople.com>
Date: Tue, 9 Jan 2007 12:47:51 +0100
Subject: [PATCH] --- yaml --- r: 45917 b: refs/heads/master c:
 e9d10a16ea76f42ea9ce58508e4af7c52acf1e40 h: refs/heads/master i:   45915:
 7b82f54c9361b9c4908494aaa854b3f11b5eaffd v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/arm/mach-at91rm9200/at91sam9260.c | 3 ++-
 trunk/arch/arm/mach-at91rm9200/at91sam9261.c | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 787e9c76131c..e7ec862fa17e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a14d527306dc7dbc38e4607c3cc3a50a600fc98b
+refs/heads/master: e9d10a16ea76f42ea9ce58508e4af7c52acf1e40
diff --git a/trunk/arch/arm/mach-at91rm9200/at91sam9260.c b/trunk/arch/arm/mach-at91rm9200/at91sam9260.c
index 203f073a53e6..b14871adc300 100644
--- a/trunk/arch/arm/mach-at91rm9200/at91sam9260.c
+++ b/trunk/arch/arm/mach-at91rm9200/at91sam9260.c
@@ -16,6 +16,7 @@
 #include <asm/mach/map.h>
 #include <asm/arch/at91sam9260.h>
 #include <asm/arch/at91_pmc.h>
+#include <asm/arch/at91_rstc.h>
 
 #include "generic.h"
 #include "clock.h"
@@ -212,7 +213,7 @@ static struct at91_gpio_bank at91sam9260_gpio[] = {
 
 static void at91sam9260_reset(void)
 {
-#warning "Implement CPU reset"
+	at91_sys_write(AT91_RSTC_CR, (0xA5 << 24) | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);
 }
 
 
diff --git a/trunk/arch/arm/mach-at91rm9200/at91sam9261.c b/trunk/arch/arm/mach-at91rm9200/at91sam9261.c
index 5a82f35da2e9..d242bb885c6d 100644
--- a/trunk/arch/arm/mach-at91rm9200/at91sam9261.c
+++ b/trunk/arch/arm/mach-at91rm9200/at91sam9261.c
@@ -16,6 +16,7 @@
 #include <asm/mach/map.h>
 #include <asm/arch/at91sam9261.h>
 #include <asm/arch/at91_pmc.h>
+#include <asm/arch/at91_rstc.h>
 
 #include "generic.h"
 #include "clock.h"
@@ -207,7 +208,7 @@ static struct at91_gpio_bank at91sam9261_gpio[] = {
 
 static void at91sam9261_reset(void)
 {
-#warning "Implement CPU reset"
+	at91_sys_write(AT91_RSTC_CR, (0xA5 << 24) | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);
 }