aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/at91sam9260.c
diff options
context:
space:
mode:
authorJan Altenberg <jan@linutronix.de>2007-02-16 04:37:10 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-02-16 08:06:01 -0500
commitdd1d2f4439af3bc80c047a13a8a2be60df1953cd (patch)
tree565d2855c75e745f648615b8ff3236f358dd7c4f /arch/arm/mach-at91/at91sam9260.c
parentf1e1398654eb97269590a5a76f0aedb607fe5d0f (diff)
[ARM] at91: correct value for AT91_RSTC_KEY
- Remove a duplicated define for AT91_RSTC_KEY - Set AT91_RSTC_KEY to the correct value - Replace the hardcoded keys in at91sam9620.c and at91sam9261.c by AT91_RSTC_KEY Signed-off-by: Jan Altenberg <jan@linutronix.de> Acked-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-at91/at91sam9260.c')
-rw-r--r--arch/arm/mach-at91/at91sam9260.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index 003c27c2ef65..6ea41d8266cb 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -259,7 +259,7 @@ static struct at91_gpio_bank at91sam9260_gpio[] = {
259 259
260static void at91sam9260_reset(void) 260static void at91sam9260_reset(void)
261{ 261{
262 at91_sys_write(AT91_RSTC_CR, (0xA5 << 24) | AT91_RSTC_PROCRST | AT91_RSTC_PERRST); 262 at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);
263} 263}
264 264
265 265