Commit 0a90d4d6 authored by Tomasz Figa's avatar Tomasz Figa Committed by Kukjin Kim

ARM: S5PV210: Untie PM support from legacy code

This patch makes S5PV210 not rely on legacy suspend helpers in
plat-samsung and implements platform suspend logic locally, similarly to
Exynos.
Signed-off-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 28c8331d
...@@ -14,8 +14,6 @@ config CPU_S5PV210 ...@@ -14,8 +14,6 @@ config CPU_S5PV210
select ARM_AMBA select ARM_AMBA
select PL330_DMA if DMADEVICES select PL330_DMA if DMADEVICES
select S5P_EXT_INT select S5P_EXT_INT
select S5P_PM if PM
select S5P_SLEEP if PM
help help
Enable S5PV210 CPU support Enable S5PV210 CPU support
......
...@@ -12,7 +12,7 @@ obj- := ...@@ -12,7 +12,7 @@ obj- :=
# Core # Core
obj-$(CONFIG_PM) += pm.o obj-$(CONFIG_PM_SLEEP) += pm.o sleep.o
# machine support # machine support
......
...@@ -12,5 +12,12 @@ ...@@ -12,5 +12,12 @@
#ifndef __ARCH_ARM_MACH_S5PV210_COMMON_H #ifndef __ARCH_ARM_MACH_S5PV210_COMMON_H
#define __ARCH_ARM_MACH_S5PV210_COMMON_H #define __ARCH_ARM_MACH_S5PV210_COMMON_H
#ifdef CONFIG_PM_SLEEP
u32 exynos_get_eint_wake_mask(void);
void s5pv210_cpu_resume(void);
void s5pv210_pm_init(void);
#else
static inline void s5pv210_pm_init(void) {}
#endif
#endif /* __ARCH_ARM_MACH_S5PV210_COMMON_H */ #endif /* __ARCH_ARM_MACH_S5PV210_COMMON_H */
/* linux/arch/arm/mach-s5pv210/pm.c /* linux/arch/arm/mach-s5pv210/pm.c
* *
* Copyright (c) 2010 Samsung Electronics Co., Ltd. * Copyright (c) 2010-2014 Samsung Electronics Co., Ltd.
* http://www.samsung.com * http://www.samsung.com
* *
* S5PV210 - Power Management support * S5PV210 - Power Management support
...@@ -19,17 +19,28 @@ ...@@ -19,17 +19,28 @@
#include <linux/syscore_ops.h> #include <linux/syscore_ops.h>
#include <linux/io.h> #include <linux/io.h>
#include <plat/cpu.h> #include <asm/cacheflush.h>
#include <plat/pm.h> #include <asm/suspend.h>
#include <plat/pm-common.h>
#include <mach/regs-irq.h>
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
#include "common.h"
static struct sleep_save s5pv210_core_save[] = { static struct sleep_save s5pv210_core_save[] = {
/* Clock ETC */ /* Clock ETC */
SAVE_ITEM(S5P_MDNIE_SEL), SAVE_ITEM(S5P_MDNIE_SEL),
}; };
/*
* VIC wake-up support (TODO)
*/
static u32 s5pv210_irqwake_intmask = 0xffffffff;
/*
* Suspend helpers.
*/
static int s5pv210_cpu_suspend(unsigned long arg) static int s5pv210_cpu_suspend(unsigned long arg)
{ {
unsigned long tmp; unsigned long tmp;
...@@ -54,8 +65,12 @@ static void s5pv210_pm_prepare(void) ...@@ -54,8 +65,12 @@ static void s5pv210_pm_prepare(void)
{ {
unsigned int tmp; unsigned int tmp;
/* Set wake-up mask registers */
__raw_writel(exynos_get_eint_wake_mask(), S5P_EINT_WAKEUP_MASK);
__raw_writel(s5pv210_irqwake_intmask, S5P_WAKEUP_MASK);
/* ensure at least INFORM0 has the resume address */ /* ensure at least INFORM0 has the resume address */
__raw_writel(virt_to_phys(s3c_cpu_resume), S5P_INFORM0); __raw_writel(virt_to_phys(s5pv210_cpu_resume), S5P_INFORM0);
tmp = __raw_readl(S5P_SLEEP_CFG); tmp = __raw_readl(S5P_SLEEP_CFG);
tmp &= ~(S5P_SLEEP_CFG_OSC_EN | S5P_SLEEP_CFG_USBOSC_EN); tmp &= ~(S5P_SLEEP_CFG_OSC_EN | S5P_SLEEP_CFG_USBOSC_EN);
...@@ -75,6 +90,70 @@ static void s5pv210_pm_prepare(void) ...@@ -75,6 +90,70 @@ static void s5pv210_pm_prepare(void)
s3c_pm_do_save(s5pv210_core_save, ARRAY_SIZE(s5pv210_core_save)); s3c_pm_do_save(s5pv210_core_save, ARRAY_SIZE(s5pv210_core_save));
} }
/*
* Suspend operations.
*/
static int s5pv210_suspend_enter(suspend_state_t state)
{
int ret;
s3c_pm_debug_init();
S3C_PMDBG("%s: suspending the system...\n", __func__);
S3C_PMDBG("%s: wakeup masks: %08x,%08x\n", __func__,
s5pv210_irqwake_intmask, exynos_get_eint_wake_mask());
if (s5pv210_irqwake_intmask == -1U
&& exynos_get_eint_wake_mask() == -1U) {
pr_err("%s: No wake-up sources!\n", __func__);
pr_err("%s: Aborting sleep\n", __func__);
return -EINVAL;
}
s3c_pm_save_uarts();
s5pv210_pm_prepare();
flush_cache_all();
s3c_pm_check_store();
ret = cpu_suspend(0, s5pv210_cpu_suspend);
if (ret)
return ret;
s3c_pm_restore_uarts();
S3C_PMDBG("%s: wakeup stat: %08x\n", __func__,
__raw_readl(S5P_WAKEUP_STAT));
s3c_pm_check_restore();
S3C_PMDBG("%s: resuming the system...\n", __func__);
return 0;
}
static int s5pv210_suspend_prepare(void)
{
s3c_pm_check_prepare();
return 0;
}
static void s5pv210_suspend_finish(void)
{
s3c_pm_check_cleanup();
}
static const struct platform_suspend_ops s5pv210_suspend_ops = {
.enter = s5pv210_suspend_enter,
.prepare = s5pv210_suspend_prepare,
.finish = s5pv210_suspend_finish,
.valid = suspend_valid_only_mem,
};
/*
* Syscore operations used to delay restore of certain registers.
*/
static void s5pv210_pm_resume(void) static void s5pv210_pm_resume(void)
{ {
u32 tmp; u32 tmp;
...@@ -91,13 +170,11 @@ static struct syscore_ops s5pv210_pm_syscore_ops = { ...@@ -91,13 +170,11 @@ static struct syscore_ops s5pv210_pm_syscore_ops = {
.resume = s5pv210_pm_resume, .resume = s5pv210_pm_resume,
}; };
static __init int s5pv210_pm_syscore_init(void) /*
* Initialization entry point.
*/
void __init s5pv210_pm_init(void)
{ {
register_syscore_ops(&s5pv210_pm_syscore_ops); register_syscore_ops(&s5pv210_pm_syscore_ops);
suspend_set_ops(&s5pv210_suspend_ops);
pm_cpu_prep = s5pv210_pm_prepare;
pm_cpu_sleep = s5pv210_cpu_suspend;
return 0;
} }
arch_initcall(s5pv210_pm_syscore_init);
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
#include <plat/map-base.h> #include <plat/map-base.h>
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
#include "common.h"
static int __init s5pv210_fdt_map_sys(unsigned long node, const char *uname, static int __init s5pv210_fdt_map_sys(unsigned long node, const char *uname,
int depth, void *data) int depth, void *data)
{ {
...@@ -55,6 +57,11 @@ static void s5pv210_dt_restart(enum reboot_mode mode, const char *cmd) ...@@ -55,6 +57,11 @@ static void s5pv210_dt_restart(enum reboot_mode mode, const char *cmd)
__raw_writel(0x1, S5P_SWRESET); __raw_writel(0x1, S5P_SWRESET);
} }
static void __init s5pv210_dt_init_late(void)
{
s5pv210_pm_init();
}
static char const *s5pv210_dt_compat[] __initconst = { static char const *s5pv210_dt_compat[] __initconst = {
"samsung,s5pc110", "samsung,s5pc110",
"samsung,s5pv210", "samsung,s5pv210",
...@@ -65,4 +72,5 @@ DT_MACHINE_START(S5PV210_DT, "Samsung S5PC110/S5PV210-based board") ...@@ -65,4 +72,5 @@ DT_MACHINE_START(S5PV210_DT, "Samsung S5PC110/S5PV210-based board")
.dt_compat = s5pv210_dt_compat, .dt_compat = s5pv210_dt_compat,
.map_io = s5pv210_dt_map_io, .map_io = s5pv210_dt_map_io,
.restart = s5pv210_dt_restart, .restart = s5pv210_dt_restart,
.init_late = s5pv210_dt_init_late,
MACHINE_END MACHINE_END
/*
* Copyright (c) 2011-2014 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
* S5PV210 Sleep Code
* Based on S3C64XX sleep code by:
* Ben Dooks, (c) 2008 Simtec Electronics
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*/
#include <linux/linkage.h>
.data
.align
/*
* sleep magic, to allow the bootloader to check for an valid
* image to resume to. Must be the first word before the
* s3c_cpu_resume entry.
*/
.word 0x2bedf00d
/*
* s3c_cpu_resume
*
* resume code entry for bootloader to call
*/
ENTRY(s5pv210_cpu_resume)
b cpu_resume
ENDPROC(s5pv210_cpu_resume)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment