Skip to content

Commit

Permalink
ARM: EXYNOS4: Add restart hook for proper reboot
Browse files Browse the repository at this point in the history
This is required to use SWRESET.

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  • Loading branch information
Kyungmin Park authored and Kukjin Kim committed Aug 19, 2011
1 parent 2b431ff commit d2edddf
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
10 changes: 10 additions & 0 deletions arch/arm/mach-exynos4/cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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
*
Expand Down Expand Up @@ -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);
}
2 changes: 2 additions & 0 deletions arch/arm/mach-exynos4/include/mach/regs-pmu.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit d2edddf

Please sign in to comment.