Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9eb48595 authored by Russell King's avatar Russell King
Browse files

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: default avatarKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 3275166e

arch/arm/mach-exynos/common.c

+1 −6
Original line number Diff line number Diff line
@@ -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);

}

arch/arm/mach-exynos/common.h

+2 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-exynos/mach-armlex4210.c

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-exynos/mach-nuri.c

+1 −0
Original line number Diff line number Diff line
@@ -1337,4 +1337,5 @@ MACHINE_START(NURI, "NURI") 
	.init_machine	= nuri_machine_init,

	.timer		= &exynos4_timer,

	.reserve        = &nuri_reserve,

	.restart	= exynos4_restart,

MACHINE_END

arch/arm/mach-exynos/mach-origen.c

+1 −0
Original line number Diff line number Diff line
@@ -698,4 +698,5 @@ MACHINE_START(ORIGEN, "ORIGEN") 
	.init_machine	= origen_machine_init,

	.timer		= &exynos4_timer,

	.reserve	= &origen_reserve,

	.restart	= exynos4_restart,

MACHINE_END