diff options
| author | Thomas Reitmayr | 2009-06-01 13:38:33 +0200 |
|---|---|---|
| committer | Nicolas Pitre | 2009-06-08 13:04:59 -0400 |
| commit | 6462c6160af557c310d5941f4700ea2c7f6c67b2 (patch) | |
| tree | d43913472c3f77a50eaf26072beceba43b532870 /arch/arm/mach-orion5x/mss2-setup.c | |
| parent | e8b2b7ba1200de8e50788e358e2d945a0c0fcfad (diff) | |
[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/mss2-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/mss2-setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-orion5x/mss2-setup.c b/arch/arm/mach-orion5x/mss2-setup.c index 41e6d5033d54..61c086b66723 100644 --- a/arch/arm/mach-orion5x/mss2-setup.c +++ b/arch/arm/mach-orion5x/mss2-setup.c @@ -181,9 +181,9 @@ static void mss2_power_off(void) /* * Enable and issue soft reset */ - reg = readl(CPU_RESET_MASK); + reg = readl(RSTOUTn_MASK); reg |= 1 << 2; - writel(reg, CPU_RESET_MASK); + writel(reg, RSTOUTn_MASK); reg = readl(CPU_SOFT_RESET); reg |= 1; |