diff options
| author | David Hendricks <dhendrix@chromium.org> | 2012-04-05 16:50:49 -0700 |
|---|---|---|
| committer | David Hendricks <dhendrix@chromium.org> | 2012-04-27 17:58:27 -0700 |
| commit | 9a3e056af5840733d6082da67d42b784b205ad57 (patch) | |
| tree | e5beb540d0c50fa2b886c64ace1a0926feb589a8 /board/daisy/board.c | |
| parent | 2f7b0116a4d14dad70a88fe1219a5589163586b1 (diff) | |
| download | chrome-ec-9a3e056af5840733d6082da67d42b784b205ad57.tar.gz | |
daisy v1.02: power sequencing updates
Note: This will not work on older (0.94 boards).
- Use power button (KB_PWR_ON) to drive power sequencing events and
disable EC_PWRON. This is because EC_PWRON and KB_PWR_ON shared an
external interrupt line. Daisy v2.x will fix this so that both can
be enabled. Note: KB_PWR_ON is active low, wihle EC_PWRON is active
high.
- Relay power button state to PMIC. Also, since we are driving
PMIC_PWRON instead of PMIC_ACOK now, so updated the naming.
- Add a keyboard power button debounce period to avoid accidentally powering
the system back on after keyboard power-off.
Signed-off-by: David Hendricks <dhendrix@chromium.org>
BUG=None
TEST=tested on daisy (frh@ verified behavior using a scope)
Change-Id: I5338eebe42c9b43a07af371a450db23276b2a574
Diffstat (limited to 'board/daisy/board.c')
| -rw-r--r-- | board/daisy/board.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/daisy/board.c b/board/daisy/board.c index 3923fc3104..d16a9535c6 100644 --- a/board/daisy/board.c +++ b/board/daisy/board.c @@ -42,7 +42,7 @@ void gaia_power_event(enum gpio_signal signal); /* GPIO signal list. Must match order from enum gpio_signal. */ const struct gpio_info gpio_list[GPIO_COUNT] = { /* Inputs with interrupt handlers are first for efficiency */ - {"EC_PWRON", GPIO_A, (1<<0), GPIO_INT_BOTH, gaia_power_event}, + {"KB_PWR_ON", GPIO_H, (1<<0), GPIO_INT_BOTH, gaia_power_event}, {"PP1800_LDO2", GPIO_A, (1<<1), GPIO_INT_BOTH, gaia_power_event}, {"XPSHOLD", GPIO_A, (1<<11), GPIO_INT_RISING, gaia_power_event}, {"CHARGER_INT", GPIO_B, (1<<0), GPIO_INT_RISING, NULL}, @@ -62,7 +62,7 @@ const struct gpio_info gpio_list[GPIO_COUNT] = { {"EN_PP1350", GPIO_A, (1<<2), GPIO_OUT_LOW, NULL}, {"EN_PP5000", GPIO_A, (1<<3), GPIO_OUT_LOW, NULL}, {"EN_PP3300", GPIO_A, (1<<8), GPIO_OUT_LOW, NULL}, - {"PMIC_ACOK", GPIO_A, (1<<12), GPIO_OUT_HIGH, NULL}, + {"PMIC_PWRON", GPIO_A, (1<<12), GPIO_OUT_HIGH, NULL}, {"ENTERING_RW", GPIO_B, (1<<1), GPIO_OUT_LOW, NULL}, {"CHARGER_EN", GPIO_B, (1<<2), GPIO_OUT_LOW, NULL}, {"EC_INT", GPIO_B, (1<<9), GPIO_HI_Z, NULL}, |