diff options
| author | Randall Spangler <rspangler@chromium.org> | 2013-04-19 17:05:08 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-04-22 09:55:49 -0700 |
| commit | dcb2425f45ce69b149e19467ed412842f440894a (patch) | |
| tree | 7ab19303c471365bfdf4588ba5fd58a888675ff1 | |
| parent | 8f00a3beee8cae1da4c56714bb9693e1ea3178db (diff) | |
| download | chrome-ec-dcb2425f45ce69b149e19467ed412842f440894a.tar.gz | |
Turn on 3.3V rail earlier in power sequence for pit
The 3.3V rails powers some of the buck supplies, so must be turned on
1ms after the 5V rail.
BUG=chrome-os-partner:18657
BRANCH=none
TEST=build pit, snow
Change-Id: I18a165744352ae375080824fecfeb56f6ac81a9c
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/48729
Reviewed-by: Vic Yang <victoryang@chromium.org>
| -rw-r--r-- | common/gaia_power.c | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/common/gaia_power.c b/common/gaia_power.c index d5c6492e70..f161f2dca6 100644 --- a/common/gaia_power.c +++ b/common/gaia_power.c @@ -42,8 +42,11 @@ #define CPUTS(outstr) cputs(CC_CHIPSET, outstr) #define CPRINTF(format, args...) cprintf(CC_CHIPSET, format, ## args) -/* Time necessary for the 5v regulator output to stabilize */ -#define DELAY_5V_SETUP MSEC /* 1ms */ +/* Time necessary for the 5V and 3.3V regulator outputs to stabilize */ +#define DELAY_5V_SETUP MSEC +#ifdef BOARD_pit +#define DELAY_3V_SETUP MSEC +#endif /* Delay between 1.35v and 3.3v rails startup */ #define DELAY_RAIL_STAGGERING 100 /* 100us */ @@ -352,6 +355,7 @@ void chipset_force_shutdown(void) static int check_for_power_on_event(void) { /* the system is already ON */ + /* TODO: this isn't the right check for pit */ if (gpio_get_level(GPIO_EN_PP3300)) { CPRINTF("[%T system is on, thus clear auto_power_on]\n"); auto_power_on = 0; /* no need to arrange another power on */ @@ -397,9 +401,18 @@ static int power_on(void) { /* Enable 5v power rail */ gpio_set_level(GPIO_EN_PP5000, 1); - /* wait to have stable power */ + /* Wait for it to stabilize */ usleep(DELAY_5V_SETUP); +#ifdef BOARD_pit + /* + * 3.3V rail must come up right after 5V, because it sources power to + * various buck supplies. + */ + gpio_set_level(GPIO_EN_PP3300, 1); + usleep(DELAY_3V_SETUP); +#endif + if (gpio_get_level(GPIO_SOC1V8_XPSHOLD) == 0) { /* Initialize non-AP components */ hook_notify(HOOK_CHIPSET_PRE_INIT); @@ -416,10 +429,11 @@ static int power_on(void) /* * If PP1800_LDO2 did not come up (e.g. PMIC_TIMEOUT was reached), - * turn off 5v rail and start over. + * turn off 5V rail (and 3.3V, if turned on above) and start over. */ if (gpio_get_level(GPIO_PP1800_LDO2) == 0) { gpio_set_level(GPIO_EN_PP5000, 0); + gpio_set_level(GPIO_EN_PP3300, 0); usleep(DELAY_5V_SETUP); CPUTS("Fatal error: PMIC failed to enable\n"); return -1; @@ -427,10 +441,12 @@ static int power_on(void) /* Enable DDR 1.35v power rail */ gpio_set_level(GPIO_EN_PP1350, 1); - /* wait to avoid large inrush current */ + /* Wait to avoid large inrush current */ usleep(DELAY_RAIL_STAGGERING); - /* Enable 3.3v power rail */ + + /* Enable 3.3v power rail, if it's not already on */ gpio_set_level(GPIO_EN_PP3300, 1); + ap_on = 1; disable_sleep(SLEEP_MASK_AP_RUN); powerled_set_state(POWERLED_STATE_ON); |