Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 344190
b: refs/heads/master
c: 86ffb0e
h: refs/heads/master
v: v3
  • Loading branch information
Abhilash Kesavan authored and Kukjin Kim committed Nov 20, 2012
1 parent fc4a2ac commit 2ddaf27
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b9fa3e7b31928c0d767bf8e13ffbc6f35c20cac0
refs/heads/master: 86ffb0e83a55aef81e96a9cede28af576c9d5541
9 changes: 9 additions & 0 deletions trunk/arch/arm/mach-exynos/pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ static struct sleep_save exynos4_vpll_save[] = {
SAVE_ITEM(EXYNOS4_VPLL_CON1),
};

static struct sleep_save exynos5_sys_save[] = {
SAVE_ITEM(EXYNOS5_SYS_I2C_CFG),
};

static struct sleep_save exynos_core_save[] = {
/* SROM side */
SAVE_ITEM(S5P_SROM_BW),
Expand Down Expand Up @@ -98,6 +102,7 @@ static void exynos_pm_prepare(void)
s3c_pm_do_save(exynos4_epll_save, ARRAY_SIZE(exynos4_epll_save));
s3c_pm_do_save(exynos4_vpll_save, ARRAY_SIZE(exynos4_vpll_save));
} else {
s3c_pm_do_save(exynos5_sys_save, ARRAY_SIZE(exynos5_sys_save));
/* Disable USE_RETENTION of JPEG_MEM_OPTION */
tmp = __raw_readl(EXYNOS5_JPEG_MEM_OPTION);
tmp &= ~EXYNOS5_OPTION_USE_RETENTION;
Expand Down Expand Up @@ -301,6 +306,10 @@ static void exynos_pm_resume(void)
__raw_writel((1 << 28), S5P_PAD_RET_EBIA_OPTION);
__raw_writel((1 << 28), S5P_PAD_RET_EBIB_OPTION);

if (soc_is_exynos5250())
s3c_pm_do_restore(exynos5_sys_save,
ARRAY_SIZE(exynos5_sys_save));

s3c_pm_do_restore_core(exynos_core_save, ARRAY_SIZE(exynos_core_save));

if (!soc_is_exynos5250()) {
Expand Down

0 comments on commit 2ddaf27

Please sign in to comment.