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

Commit d2edddf2 authored by Kyungmin Park's avatar Kyungmin Park Committed by Kukjin Kim
Browse files

ARM: EXYNOS4: Add restart hook for proper reboot 



This is required to use SWRESET.

Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 2b431ff7

arch/arm/mach-exynos4/cpu.c

+10 −0
Original line number Diff line number Diff line
@@ -27,8 +27,10 @@ 
#include <plat/fb-core.h>

#include <plat/fimc-core.h>

#include <plat/iic-core.h>

#include <plat/reset.h>



#include <mach/regs-irq.h>

#include <mach/regs-pmu.h>



extern int combiner_init(unsigned int combiner_nr, void __iomem *base,

			 unsigned int irq_start);
@@ -127,6 +129,11 @@ static void exynos4_idle(void) 
	local_irq_enable();

}



static void exynos4_sw_reset(void)

{

	__raw_writel(0x1, S5P_SWRESET);

}



/*

 * exynos4_map_io

 *
@@ -240,5 +247,8 @@ int __init exynos4_init(void) 
	/* set idle function */

	pm_idle = exynos4_idle;



	/* set sw_reset function */

	s5p_reset_hook = exynos4_sw_reset;



	return sysdev_register(&exynos4_sysdev);

}

arch/arm/mach-exynos4/include/mach/regs-pmu.h

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 
#define S5P_USE_STANDBY_WFE1			(1 << 25)

#define S5P_USE_MASK				((0x3 << 16) | (0x3 << 24))



#define S5P_SWRESET				S5P_PMUREG(0x0400)



#define S5P_WAKEUP_STAT				S5P_PMUREG(0x0600)

#define S5P_EINT_WAKEUP_MASK			S5P_PMUREG(0x0604)

#define S5P_WAKEUP_MASK				S5P_PMUREG(0x0608)