diff options
| author | Jonghwan Choi | 2012-06-27 02:47:35 +0200 |
|---|---|---|
| committer | Kukjin Kim | 2012-07-12 09:15:08 +0200 |
| commit | 7d896aaceb0ac361abf581b3b21de20f52da0ce9 (patch) | |
| tree | 2fd0f659cea96bfc71eefb83a253b6939cb57d68 /arch/arm/mach-exynos/pmu.c | |
| parent | Linux 3.5-rc3 (diff) | |
| download | kernel-qcow2-linux-7d896aaceb0ac361abf581b3b21de20f52da0ce9.tar.gz kernel-qcow2-linux-7d896aaceb0ac361abf581b3b21de20f52da0ce9.tar.xz kernel-qcow2-linux-7d896aaceb0ac361abf581b3b21de20f52da0ce9.zip | |
ARM: EXYNOS: Clear SYS_WDTRESET bit to use watchdog reset
When SYS_WDTRESET is set, watchdog timer reset request
is ignored by power management unit.
Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-exynos/pmu.c')
| -rw-r--r-- | arch/arm/mach-exynos/pmu.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/pmu.c b/arch/arm/mach-exynos/pmu.c index 4aacb66f7161..bb4c522f8e05 100644 --- a/arch/arm/mach-exynos/pmu.c +++ b/arch/arm/mach-exynos/pmu.c @@ -390,6 +390,8 @@ void exynos_sys_powerdown_conf(enum sys_powerdown mode) static int __init exynos_pmu_init(void) { + unsigned int value; + exynos_pmu_config = exynos4210_pmu_config; if (soc_is_exynos4210()) { @@ -399,6 +401,18 @@ static int __init exynos_pmu_init(void) exynos_pmu_config = exynos4x12_pmu_config; pr_info("EXYNOS4x12 PMU Initialize\n"); } else if (soc_is_exynos5250()) { + /* + * When SYS_WDTRESET is set, watchdog timer reset request + * is ignored by power management unit. + */ + value = __raw_readl(EXYNOS5_AUTO_WDTRESET_DISABLE); + value &= ~EXYNOS5_SYS_WDTRESET; + __raw_writel(value, EXYNOS5_AUTO_WDTRESET_DISABLE); + + value = __raw_readl(EXYNOS5_MASK_WDTRESET_REQUEST); + value &= ~EXYNOS5_SYS_WDTRESET; + __raw_writel(value, EXYNOS5_MASK_WDTRESET_REQUEST); + exynos_pmu_config = exynos5250_pmu_config; pr_info("EXYNOS5250 PMU Initialize\n"); } else { |