summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs/system.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-11-05 15:43:30 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 12:57:15 +0000
commit6f91c5a46cf8f083e9316ce238d1aadb629f41dc (patch)
tree3732727c82153e045b903abd243ecf6e45cd649c /arch/arm/mach-mxs/system.c
parent65ea7884bc12c45bc19424b0287aa3b24b022721 (diff)
downloadblackbird-op-linux-6f91c5a46cf8f083e9316ce238d1aadb629f41dc.tar.gz
blackbird-op-linux-6f91c5a46cf8f083e9316ce238d1aadb629f41dc.zip
ARM: restart: mxs: use new restart hook
Hook these platforms restart code into the new restart hook rather than using arch_reset(). Acked-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-mxs/system.c')
-rw-r--r--arch/arm/mach-mxs/system.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/system.c b/arch/arm/mach-mxs/system.c
index cab88364e7c1..b936633b7682 100644
--- a/arch/arm/mach-mxs/system.c
+++ b/arch/arm/mach-mxs/system.c
@@ -42,7 +42,7 @@ static void __iomem *mxs_clkctrl_reset_addr;
/*
* Reset the system. It is called by machine_restart().
*/
-void arch_reset(char mode, const char *cmd)
+void mxs_restart(char mode, const char *cmd)
{
/* reset the chip */
__mxs_setl(MXS_CLKCTRL_RESET_CHIP, mxs_clkctrl_reset_addr);
OpenPOWER on IntegriCloud