summaryrefslogtreecommitdiff
path: root/arch/arm/mach-orion5x/include/mach/system.h
diff options
context:
space:
mode:
authorThomas Reitmayr <treitmayr@devbase.at>2009-06-01 15:38:33 +0400
committerNicolas Pitre <nico@cam.org>2009-06-08 21:04:59 +0400
commit6462c6160af557c310d5941f4700ea2c7f6c67b2 (patch)
treed43913472c3f77a50eaf26072beceba43b532870 /arch/arm/mach-orion5x/include/mach/system.h
parente8b2b7ba1200de8e50788e358e2d945a0c0fcfad (diff)
downloadlinux-6462c6160af557c310d5941f4700ea2c7f6c67b2.tar.xz
[ARM] orion5x: Change names of defines for Reset-Out-Mask register
The name of the define for the Reset-Out-Mask register as well as its bit for the watchdog reset are changed to match the names used for Kirkwood (which in turn match the processor specification more closely). There is no functional change. This patch prepares for adding orion5x_wdt as a platform device to Kirkwood. Signed-off-by: Thomas Reitmayr <treitmayr@devbase.at> Signed-off-by: Nicolas Pitre <nico@marvell.com>
Diffstat (limited to 'arch/arm/mach-orion5x/include/mach/system.h')
-rw-r--r--arch/arm/mach-orion5x/include/mach/system.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/include/mach/system.h b/arch/arm/mach-orion5x/include/mach/system.h
index e912490fff23..60e734c10458 100644
--- a/arch/arm/mach-orion5x/include/mach/system.h
+++ b/arch/arm/mach-orion5x/include/mach/system.h
@@ -23,7 +23,7 @@ static inline void arch_reset(char mode, const char *cmd)
/*
* Enable and issue soft reset
*/
- orion5x_setbits(CPU_RESET_MASK, (1 << 2));
+ orion5x_setbits(RSTOUTn_MASK, (1 << 2));
orion5x_setbits(CPU_SOFT_RESET, 1);
}