diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-04 18:15:53 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 16:57:17 +0400 |
| commit | 271a74fc875210d3dfcc03d557fb5d86d3990a0f (patch) | |
| tree | f428c434f573180885c4c2404b706f4bf4c550bb /arch/arm/mach-pxa/reset.c | |
| parent | 125c4033f0187d7264f08d7cf1474252df4f4c17 (diff) | |
| download | linux-271a74fc875210d3dfcc03d557fb5d86d3990a0f.tar.xz | |
ARM: restart: pxa: use new restart hook
Hook these platforms restart code into the new restart hook rather
than using arch_reset().
Acked-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/reset.c')
| -rw-r--r-- | arch/arm/mach-pxa/reset.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/reset.c b/arch/arm/mach-pxa/reset.c index b8bcda15da81..c8497b00cdfe 100644 --- a/arch/arm/mach-pxa/reset.c +++ b/arch/arm/mach-pxa/reset.c @@ -81,8 +81,11 @@ static void do_hw_reset(void) OSMR3 = OSCR + 368640; /* ... in 100 ms */ } -void arch_reset(char mode, const char *cmd) +void pxa_restart(char mode, const char *cmd) { + local_irq_disable(); + local_fiq_disable(); + clear_reset_status(RESET_STATUS_ALL); switch (mode) { |