Commit 9eb4859564d6e104f78abde15e7f0ca996b71236
1 parent
3275166e03
Exists in
master
and in
6 other branches
ARM: 7262/1: restart: EXYNOS: use new restart hook
Hook these platforms restart code into the new restart hook rather than using arch_reset(). [kgene.kim@samsung.com: according to local header, updated] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Showing 8 changed files with 11 additions and 6 deletions Side-by-side Diff
arch/arm/mach-exynos/common.c
| ... | ... | @@ -32,7 +32,6 @@ |
| 32 | 32 | #include <plat/clock.h> |
| 33 | 33 | #include <plat/devs.h> |
| 34 | 34 | #include <plat/pm.h> |
| 35 | -#include <plat/reset.h> | |
| 36 | 35 | #include <plat/sdhci.h> |
| 37 | 36 | #include <plat/gpio-cfg.h> |
| 38 | 37 | #include <plat/adc-core.h> |
| ... | ... | @@ -214,7 +213,7 @@ |
| 214 | 213 | local_irq_enable(); |
| 215 | 214 | } |
| 216 | 215 | |
| 217 | -static void exynos4_sw_reset(void) | |
| 216 | +void exynos4_restart(char mode, const char *cmd) | |
| 218 | 217 | { |
| 219 | 218 | __raw_writel(0x1, S5P_SWRESET); |
| 220 | 219 | } |
| ... | ... | @@ -475,10 +474,6 @@ |
| 475 | 474 | |
| 476 | 475 | /* set idle function */ |
| 477 | 476 | pm_idle = exynos_idle; |
| 478 | - | |
| 479 | - /* set sw_reset function */ | |
| 480 | - if (soc_is_exynos4210() || soc_is_exynos4212() || soc_is_exynos4412()) | |
| 481 | - s5p_reset_hook = exynos4_sw_reset; | |
| 482 | 477 | |
| 483 | 478 | return sysdev_register(&exynos4_sysdev); |
| 484 | 479 | } |
arch/arm/mach-exynos/common.h
arch/arm/mach-exynos/mach-armlex4210.c
arch/arm/mach-exynos/mach-nuri.c
arch/arm/mach-exynos/mach-origen.c
arch/arm/mach-exynos/mach-smdk4x12.c
| ... | ... | @@ -290,6 +290,7 @@ |
| 290 | 290 | .map_io = smdk4x12_map_io, |
| 291 | 291 | .init_machine = smdk4x12_machine_init, |
| 292 | 292 | .timer = &exynos4_timer, |
| 293 | + .restart = exynos4_restart, | |
| 293 | 294 | MACHINE_END |
| 294 | 295 | |
| 295 | 296 | MACHINE_START(SMDK4412, "SMDK4412") |
| ... | ... | @@ -300,5 +301,6 @@ |
| 300 | 301 | .map_io = smdk4x12_map_io, |
| 301 | 302 | .init_machine = smdk4x12_machine_init, |
| 302 | 303 | .timer = &exynos4_timer, |
| 304 | + .restart = exynos4_restart, | |
| 303 | 305 | MACHINE_END |
arch/arm/mach-exynos/mach-smdkv310.c
| ... | ... | @@ -379,6 +379,7 @@ |
| 379 | 379 | .init_machine = smdkv310_machine_init, |
| 380 | 380 | .timer = &exynos4_timer, |
| 381 | 381 | .reserve = &smdkv310_reserve, |
| 382 | + .restart = exynos4_restart, | |
| 382 | 383 | MACHINE_END |
| 383 | 384 | |
| 384 | 385 | MACHINE_START(SMDKC210, "SMDKC210") |
| ... | ... | @@ -388,5 +389,6 @@ |
| 388 | 389 | .map_io = smdkv310_map_io, |
| 389 | 390 | .init_machine = smdkv310_machine_init, |
| 390 | 391 | .timer = &exynos4_timer, |
| 392 | + .restart = exynos4_restart, | |
| 391 | 393 | MACHINE_END |