summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2013-05-15 14:04:36 -0700
committerChromeBot <chrome-bot@google.com>2013-05-15 15:28:06 -0700
commit6b814ddf5251ef21827251a6b8d9e6525c22554b (patch)
treece4a600d4073552dbc376995bf7cb726d4d4c902 /board
parent4bbf6f5d1ac06ae3064e9fad8ad90254be839c2a (diff)
downloadchrome-ec-6b814ddf5251ef21827251a6b8d9e6525c22554b.tar.gz
haswell: fix S3 resume path
The PROCPWRGD signal is not well documented. It's not known if it is an input or an output. Emperically it was discovered that driving this pin during the resume path causes resume to fail. Therefore, ignore the pin by setting it to an input. BUG=chrome-os-partner:19398 BRANCH=none TEST=successful state transition from S0 to S3 and back to S0 Change-Id: I55dc16c75c286af06806e2513197f0bb2c7b9d04 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/51358 Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Diffstat (limited to 'board')
-rw-r--r--board/slippy/board.c2
-rw-r--r--board/slippy/board.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/board/slippy/board.c b/board/slippy/board.c
index 8f775670aa..5d8016423f 100644
--- a/board/slippy/board.c
+++ b/board/slippy/board.c
@@ -66,6 +66,7 @@ const struct gpio_info gpio_list[GPIO_COUNT] = {
{"BOARD_VERSION1", LM4_GPIO_Q, (1<<5), GPIO_INPUT, NULL},
{"BOARD_VERSION2", LM4_GPIO_Q, (1<<6), GPIO_INPUT, NULL},
{"BOARD_VERSION3", LM4_GPIO_Q, (1<<7), GPIO_INPUT, NULL},
+ {"CPU_PGOOD", LM4_GPIO_C, (1<<4), GPIO_INPUT, NULL},
/* Outputs; all unasserted by default except for reset signals */
{"CPU_PROCHOT", LM4_GPIO_B, (1<<1), GPIO_OUT_LOW, NULL},
@@ -80,7 +81,6 @@ const struct gpio_info gpio_list[GPIO_COUNT] = {
{"SYS_PWROK", LM4_GPIO_H, (1<<2), GPIO_OUT_LOW, NULL},
{"WLAN_OFF_L", LM4_GPIO_J, (1<<4), GPIO_OUT_LOW, NULL},
{"CHARGE_L", LM4_GPIO_E, (1<<6), GPIO_OUT_LOW, NULL},
- {"CPU_PGOOD", LM4_GPIO_C, (1<<4), GPIO_OUT_LOW, NULL},
{"ENABLE_BACKLIGHT", LM4_GPIO_M, (1<<7), GPIO_OUT_LOW, NULL},
{"ENABLE_TOUCHPAD", LM4_GPIO_N, (1<<1), GPIO_OUT_LOW, NULL},
diff --git a/board/slippy/board.h b/board/slippy/board.h
index 2d9680c2e6..883d6fcb7f 100644
--- a/board/slippy/board.h
+++ b/board/slippy/board.h
@@ -89,6 +89,7 @@ enum gpio_signal {
GPIO_BOARD_VERSION1, /* Board version stuffing resistor 1 */
GPIO_BOARD_VERSION2, /* Board version stuffing resistor 2 */
GPIO_BOARD_VERSION3, /* Board version stuffing resistor 3 */
+ GPIO_CPU_PGOOD, /* Power good to the CPU */
/* Outputs */
GPIO_CPU_PROCHOT, /* Force CPU to think it's overheated */
@@ -103,7 +104,6 @@ enum gpio_signal {
GPIO_SYS_PWROK, /* EC thinks everything is up and ready */
GPIO_WLAN_OFF_L, /* Disable WiFi chip? Or just the radio? */
GPIO_CHARGE_L, /* Allow battery to charge when on AC */
- GPIO_CPU_PGOOD, /* Power good to the CPU */
GPIO_ENABLE_BACKLIGHT, /* Enable backlight power */
GPIO_ENABLE_TOUCHPAD, /* Enable touchpad power */