diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:25:15 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:25:27 -0500 |
commit | 7b9dd47136c07ffd883aff6926c7b281e4c1eea4 (patch) | |
tree | b835312e76fe323de3e1cbbb0d15fca5a3f7ef9c /arch/arm/mach-kirkwood/common.c | |
parent | 2e0e943436912ffe0848ece58167edfe754edb96 (diff) | |
parent | 0575fb754dbfc32a01f297e778533340a533ec68 (diff) |
Merge branch 'restart' into for-linus
Conflicts:
arch/arm/mach-exynos/cpu.c
The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.
Diffstat (limited to 'arch/arm/mach-kirkwood/common.c')
-rw-r--r-- | arch/arm/mach-kirkwood/common.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index f3248cfbe51d..0bff4a916231 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c | |||
@@ -534,3 +534,19 @@ static int __init kirkwood_clock_gate(void) | |||
534 | return 0; | 534 | return 0; |
535 | } | 535 | } |
536 | late_initcall(kirkwood_clock_gate); | 536 | late_initcall(kirkwood_clock_gate); |
537 | |||
538 | void kirkwood_restart(char mode, const char *cmd) | ||
539 | { | ||
540 | /* | ||
541 | * Enable soft reset to assert RSTOUTn. | ||
542 | */ | ||
543 | writel(SOFT_RESET_OUT_EN, RSTOUTn_MASK); | ||
544 | |||
545 | /* | ||
546 | * Assert soft reset. | ||
547 | */ | ||
548 | writel(SOFT_RESET, SYSTEM_SOFT_RESET); | ||
549 | |||
550 | while (1) | ||
551 | ; | ||
552 | } | ||