e879c862fb
We only need to set the system up for a soft-restart if we're going to be doing a soft-restart. Provide a new function (soft_restart()) which does the setup and final call for this, and make platforms use it. Eliminate the call to setup_restart() from the default handler. This means that platforms arch_reset() function is no longer called with the page tables prepared for a soft-restart, and caches will still be enabled. Acked-by: Nicolas Pitre <nico@linaro.org> Acked-by: Will Deacon <will.deacon@arm.com> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Acked-by: Kukjin Kim <kgene.kim@samsung.com> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Viresh Kumar <viresh.kumar@st.com> Acked-by: Krzysztof Ha■asa <khc@pm.waw.pl> Acked-by: Paul Mundt <lethal@linux-sh.org> Acked-by: Richard Purdie <richard.purdie@linuxfoundation.org> Acked-by: Wan ZongShun <mcuos.com@gmail.com> Acked-by: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
48 lines
1 KiB
C
48 lines
1 KiB
C
/*
|
|
* arch/arm/mach-s3c2410/include/mach/system.h
|
|
*
|
|
* Copyright (C) 2006 Simtec Electronics
|
|
* Ben Dooks <ben@simtec.co.uk>
|
|
*
|
|
* KS8695 - System function defines and includes
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#ifndef __ASM_ARCH_SYSTEM_H
|
|
#define __ASM_ARCH_SYSTEM_H
|
|
|
|
#include <linux/io.h>
|
|
#include <mach/regs-timer.h>
|
|
|
|
static void arch_idle(void)
|
|
{
|
|
/*
|
|
* This should do all the clock switching
|
|
* and wait for interrupt tricks,
|
|
*/
|
|
cpu_do_idle();
|
|
|
|
}
|
|
|
|
static void arch_reset(char mode, const char *cmd)
|
|
{
|
|
unsigned int reg;
|
|
|
|
if (mode == 's')
|
|
soft_restart(0);
|
|
|
|
/* disable timer0 */
|
|
reg = __raw_readl(KS8695_TMR_VA + KS8695_TMCON);
|
|
__raw_writel(reg & ~TMCON_T0EN, KS8695_TMR_VA + KS8695_TMCON);
|
|
|
|
/* enable watchdog mode */
|
|
__raw_writel((10 << 8) | T0TC_WATCHDOG, KS8695_TMR_VA + KS8695_T0TC);
|
|
|
|
/* re-enable timer0 */
|
|
__raw_writel(reg | TMCON_T0EN, KS8695_TMR_VA + KS8695_TMCON);
|
|
}
|
|
|
|
#endif
|