ARM: 7252/1: restart: S5PV210: 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>
This commit is contained in:
parent
5497d2e1d6
commit
1f34f0e2fb
|
@ -35,7 +35,6 @@
|
|||
#include <plat/cpu.h>
|
||||
#include <plat/clock.h>
|
||||
#include <plat/devs.h>
|
||||
#include <plat/reset.h>
|
||||
#include <plat/sdhci.h>
|
||||
#include <plat/adc-core.h>
|
||||
#include <plat/ata-core.h>
|
||||
|
@ -151,7 +150,7 @@ static void s5pv210_idle(void)
|
|||
local_irq_enable();
|
||||
}
|
||||
|
||||
static void s5pv210_sw_reset(void)
|
||||
void s5pv210_restart(char mode, const char *cmd)
|
||||
{
|
||||
__raw_writel(0x1, S5P_SWRESET);
|
||||
}
|
||||
|
@ -251,9 +250,6 @@ int __init s5pv210_init(void)
|
|||
/* set idle function */
|
||||
pm_idle = s5pv210_idle;
|
||||
|
||||
/* set sw_reset function */
|
||||
s5p_reset_hook = s5pv210_sw_reset;
|
||||
|
||||
return sysdev_register(&s5pv210_sysdev);
|
||||
}
|
||||
|
||||
|
|
|
@ -18,6 +18,8 @@ void s5pv210_init_irq(void);
|
|||
void s5pv210_register_clocks(void);
|
||||
void s5pv210_setup_clocks(void);
|
||||
|
||||
void s5pv210_restart(char mode, const char *cmd);
|
||||
|
||||
#ifdef CONFIG_CPU_S5PV210
|
||||
|
||||
extern int s5pv210_init(void);
|
||||
|
|
|
@ -684,4 +684,5 @@ MACHINE_START(AQUILA, "Aquila")
|
|||
.map_io = aquila_map_io,
|
||||
.init_machine = aquila_machine_init,
|
||||
.timer = &s5p_timer,
|
||||
.restart = s5pv210_restart,
|
||||
MACHINE_END
|
||||
|
|
|
@ -961,4 +961,5 @@ MACHINE_START(GONI, "GONI")
|
|||
.init_machine = goni_machine_init,
|
||||
.timer = &s5p_timer,
|
||||
.reserve = &goni_reserve,
|
||||
.restart = s5pv210_restart,
|
||||
MACHINE_END
|
||||
|
|
|
@ -142,4 +142,5 @@ MACHINE_START(SMDKC110, "SMDKC110")
|
|||
.map_io = smdkc110_map_io,
|
||||
.init_machine = smdkc110_machine_init,
|
||||
.timer = &s5p_timer,
|
||||
.restart = s5pv210_restart,
|
||||
MACHINE_END
|
||||
|
|
|
@ -320,4 +320,5 @@ MACHINE_START(SMDKV210, "SMDKV210")
|
|||
.map_io = smdkv210_map_io,
|
||||
.init_machine = smdkv210_machine_init,
|
||||
.timer = &s5p_timer,
|
||||
.restart = s5pv210_restart,
|
||||
MACHINE_END
|
||||
|
|
|
@ -131,4 +131,5 @@ MACHINE_START(TORBRECK, "TORBRECK")
|
|||
.map_io = torbreck_map_io,
|
||||
.init_machine = torbreck_machine_init,
|
||||
.timer = &s5p_timer,
|
||||
.restart = s5pv210_restart,
|
||||
MACHINE_END
|
||||
|
|
Loading…
Reference in New Issue