summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaesar Wang <wxt@rock-chips.com>2016-09-05 22:00:40 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2016-10-26 22:01:44 +0000
commited3ff076bbcd8f15c81ac5f97f496ba017bc5d74 (patch)
treee377e5cbab1f41acb247c058959e128f1edc0390
parent09691a0e8dd93383fa76b74332d89707bfe16001 (diff)
downloadchrome-ec-ed3ff076bbcd8f15c81ac5f97f496ba017bc5d74.tar.gz
power: rk3399: turn off the center logic in s3
CQ-DEPEND=CL:386537, CL:401930 BUG=chrome-os-partner:54291 TEST=turn off the center-logic BRANCH=None Change-Id: I73577e15cc0a8474d8eb2ed1a48f5aba59e54c6a Signed-off-by: Caesar Wang <wxt@rock-chips.com> Reviewed-on: https://chromium-review.googlesource.com/397399 Reviewed-by: Douglas Anderson <dianders@chromium.org> Commit-Queue: Shawn N <shawnn@chromium.org> Tested-by: Shawn N <shawnn@chromium.org>
-rw-r--r--power/rk3399.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/power/rk3399.c b/power/rk3399.c
index 79d225a908..eb0080f083 100644
--- a/power/rk3399.c
+++ b/power/rk3399.c
@@ -210,9 +210,6 @@ enum power_state power_handle_state(enum power_state state)
gpio_set_level(GPIO_PP1800_PMU_EN_L, 0);
msleep(2);
- /* TODO(crosbug.com/p/55981): De-power CLOGIC in S3 */
- gpio_set_level(GPIO_PPVAR_CLOGIC_EN, 1);
- msleep(2);
gpio_set_level(GPIO_LPDDR_PWR_EN, 1);
msleep(2);
gpio_set_level(GPIO_PP1800_USB_EN_L, 0);
@@ -239,6 +236,8 @@ enum power_state power_handle_state(enum power_state state)
return POWER_S3;
case POWER_S3S0:
+ gpio_set_level(GPIO_PPVAR_CLOGIC_EN, 1);
+ msleep(2);
gpio_set_level(GPIO_PP900_DDRPLL_EN, 1);
msleep(2);
gpio_set_level(GPIO_PP1800_AP_AVDD_EN_L, 0);
@@ -308,6 +307,10 @@ enum power_state power_handle_state(enum power_state state)
msleep(10);
CHECK_ABORTED_SUSPEND();
+ gpio_set_level(GPIO_PPVAR_CLOGIC_EN, 0);
+ msleep(10);
+ CHECK_ABORTED_SUSPEND();
+
/*
* Enable idle task deep sleep. Allow the low power idle task
* to go into deep sleep in S3 or lower.
@@ -338,8 +341,6 @@ enum power_state power_handle_state(enum power_state state)
msleep(2);
gpio_set_level(GPIO_LPDDR_PWR_EN, 0);
msleep(2);
- gpio_set_level(GPIO_PPVAR_CLOGIC_EN, 0);
- msleep(10);
gpio_set_level(GPIO_PP1800_PMU_EN_L, 1);
msleep(2);
gpio_set_level(GPIO_PP900_USB_EN, 0);