summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@chromium.org>2013-09-30 14:29:24 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2013-10-02 00:09:39 +0000
commit159867844af5c1860c5b6f49f61f8b9893f57c64 (patch)
tree56753ac605b37f401ef01d2917ade2953fb56fb7
parent92df4552d527746d108c0937c42a3a7c9b013193 (diff)
downloadchrome-ec-159867844af5c1860c5b6f49f61f8b9893f57c64.tar.gz
bolt: Fix panel power passthru
The Bolt board does not use the standard CHIPSET_HASWELL and with a recent commit that meant haswell_interrupt() was defined to NULL and it would not turn on the panel power. BUG=chrome-os-partner:20372 BRANCH=bolt TEST=build and boot on bolt and see magic working panel Change-Id: I6174e2b4a8337acc2f395b8b2b18a00107661af1 Signed-off-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/171112 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org> Commit-Queue: Randall Spangler <rspangler@chromium.org>
-rw-r--r--board/bolt/board.c2
-rw-r--r--board/bolt/board.h2
-rw-r--r--board/bolt/power_sequence.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/board/bolt/board.c b/board/bolt/board.c
index 1b302fb363..bf59da6254 100644
--- a/board/bolt/board.c
+++ b/board/bolt/board.c
@@ -61,7 +61,7 @@ const struct gpio_info gpio_list[] = {
{"VCORE_PGOOD", LM4_GPIO_C, (1<<6), GPIO_INT_BOTH,
x86_interrupt},
{"PCH_EDP_VDD_EN", LM4_GPIO_J, (1<<1), GPIO_INT_BOTH,
- haswell_interrupt},
+ bolt_interrupt},
{"RECOVERY_L", LM4_GPIO_A, (1<<5), GPIO_PULL_UP|GPIO_INT_BOTH,
switch_interrupt},
{"WP", LM4_GPIO_A, (1<<4), GPIO_INT_BOTH,
diff --git a/board/bolt/board.h b/board/bolt/board.h
index 3f6f8b4891..eaa935ba8d 100644
--- a/board/bolt/board.h
+++ b/board/bolt/board.h
@@ -219,6 +219,8 @@ enum board_version {
#define WIRELESS_GPIO_WWAN GPIO_PP3300_LTE_EN
#define WIRELESS_GPIO_WLAN_POWER GPIO_PP3300_WLAN_EN
+void bolt_interrupt(enum gpio_signal signal);
+
#endif /* !__ASSEMBLER__ */
#endif /* __BOARD_H */
diff --git a/board/bolt/power_sequence.c b/board/bolt/power_sequence.c
index 606e5434cb..a778f26700 100644
--- a/board/bolt/power_sequence.c
+++ b/board/bolt/power_sequence.c
@@ -383,7 +383,7 @@ enum x86_state x86_handle_state(enum x86_state state)
return state;
}
-void haswell_interrupt(enum gpio_signal signal)
+void bolt_interrupt(enum gpio_signal signal)
{
/* Pass through eDP VDD enable from PCH */
gpio_set_level(GPIO_EC_EDP_VDD_EN, gpio_get_level(GPIO_PCH_EDP_VDD_EN));