forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: 7262/1: restart: EXYNOS: use new restart hook

Browse source 
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>
This commit is contained in:
Russell King 2012-01-03 11:56:53 +01:00
commit 9eb4859564
8 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
arch/arm/mach-exynos/common.c
View file

@ -32,7 +32,6 @@
#include <plat/clock.h>
#include <plat/devs.h>
#include <plat/pm.h>
#include <plat/reset.h>
#include <plat/sdhci.h>
#include <plat/gpio-cfg.h>
#include <plat/adc-core.h>
@ -214,7 +213,7 @@ static void exynos_idle(void)
local_irq_enable();
}
static void exynos4_sw_reset(void)
void exynos4_restart(char mode, const char *cmd)
{
__raw_writel(0x1, S5P_SWRESET);
}
@ -476,10 +475,6 @@ int __init exynos_init(void)
/* set idle function */
pm_idle = exynos_idle;
/* set sw_reset function */
if (soc_is_exynos4210() || soc_is_exynos4212() || soc_is_exynos4412())
s5p_reset_hook = exynos4_sw_reset;
return sysdev_register(&exynos4_sysdev);
}

2
arch/arm/mach-exynos/common.h
View file

@ -21,6 +21,8 @@ void exynos4_setup_clocks(void);
void exynos4210_register_clocks(void);
void exynos4212_register_clocks(void);
void exynos4_restart(char mode, const char *cmd);
extern struct sys_timer exynos4_timer;
#ifdef CONFIG_ARCH_EXYNOS

1
arch/arm/mach-exynos/mach-armlex4210.c
View file

@ -213,4 +213,5 @@ MACHINE_START(ARMLEX4210, "ARMLEX4210")
.map_io = armlex4210_map_io,
.init_machine = armlex4210_machine_init,
.timer = &exynos4_timer,
.restart = exynos4_restart,
MACHINE_END

1
arch/arm/mach-exynos/mach-nuri.c
View file

@ -1337,4 +1337,5 @@ MACHINE_START(NURI, "NURI")
.init_machine = nuri_machine_init,
.timer = &exynos4_timer,
.reserve = &nuri_reserve,
.restart = exynos4_restart,
MACHINE_END

1
arch/arm/mach-exynos/mach-origen.c
View file

@ -698,4 +698,5 @@ MACHINE_START(ORIGEN, "ORIGEN")
.init_machine = origen_machine_init,
.timer = &exynos4_timer,
.reserve = &origen_reserve,
.restart = exynos4_restart,
MACHINE_END

2
arch/arm/mach-exynos/mach-smdk4x12.c
View file

@ -290,6 +290,7 @@ MACHINE_START(SMDK4212, "SMDK4212")
.map_io = smdk4x12_map_io,
.init_machine = smdk4x12_machine_init,
.timer = &exynos4_timer,
.restart = exynos4_restart,
MACHINE_END
MACHINE_START(SMDK4412, "SMDK4412")
@ -300,4 +301,5 @@ MACHINE_START(SMDK4412, "SMDK4412")
.map_io = smdk4x12_map_io,
.init_machine = smdk4x12_machine_init,
.timer = &exynos4_timer,
.restart = exynos4_restart,
MACHINE_END

2
arch/arm/mach-exynos/mach-smdkv310.c
View file

@ -379,6 +379,7 @@ MACHINE_START(SMDKV310, "SMDKV310")
.init_machine = smdkv310_machine_init,
.timer = &exynos4_timer,
.reserve = &smdkv310_reserve,
.restart = exynos4_restart,
MACHINE_END
MACHINE_START(SMDKC210, "SMDKC210")
@ -388,4 +389,5 @@ MACHINE_START(SMDKC210, "SMDKC210")
.map_io = smdkv310_map_io,
.init_machine = smdkv310_machine_init,
.timer = &exynos4_timer,
.restart = exynos4_restart,
MACHINE_END

1
arch/arm/mach-exynos/mach-universal_c210.c
View file

@ -1062,4 +1062,5 @@ MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210")
.init_machine = universal_machine_init,
.timer = &exynos4_timer,
.reserve = &universal_reserve,
.restart = exynos4_restart,
MACHINE_END