diff options
| author | Phoenix Wu <wujing6@huaqin.corp-partner.google.com> | 2019-02-19 10:09:47 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-04-03 18:14:03 -0700 |
| commit | 77af7f0ad210a9c1eef47ecaf0151c6df2054e94 (patch) | |
| tree | d6cdd6f75c7fcf0f85e9a22879ab0f3d4b23a1e6 | |
| parent | 0f06fdbcdbf422149d7f5bb9ef969fa119505fbc (diff) | |
| download | chrome-ec-77af7f0ad210a9c1eef47ecaf0151c6df2054e94.tar.gz | |
flapjack: Enable hall_interrupt via lid_switch
BUG=b:124344730
BRANCH=None
TEST=Invoke hall interrupt by a magnet and see that EC console will output a lid close/open event
Change-Id: I78290ba4240a494674f2f9e8c7deaa365969319f
Reviewed-on: https://chromium-review.googlesource.com/1475104
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Phoenix Wu <wujing6@huaqin.corp-partner.google.com>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
| -rw-r--r-- | board/flapjack/board.c | 6 | ||||
| -rw-r--r-- | board/flapjack/board.h | 1 | ||||
| -rw-r--r-- | board/flapjack/gpio.inc | 4 |
3 files changed, 3 insertions, 8 deletions
diff --git a/board/flapjack/board.c b/board/flapjack/board.c index 9c32886ffb..23f42c1cd4 100644 --- a/board/flapjack/board.c +++ b/board/flapjack/board.c @@ -29,6 +29,7 @@ #include "i2c.h" #include "power.h" #include "power_button.h" +#include "lid_switch.h" #include "pwm.h" #include "pwm_chip.h" #include "registers.h" @@ -95,11 +96,6 @@ static void tcpc_alert_event(enum gpio_signal signal) schedule_deferred_pd_interrupt(0 /* port */); } -static void hall_interrupt(enum gpio_signal signal) -{ - /* TODO(b/111378000): Implement hall_interrupt */ -} - static void gauge_interrupt(enum gpio_signal signal) { task_wake(TASK_ID_CHARGER); diff --git a/board/flapjack/board.h b/board/flapjack/board.h index 8eaf824575..d916f5c438 100644 --- a/board/flapjack/board.h +++ b/board/flapjack/board.h @@ -58,7 +58,6 @@ /* By default, set hcdebug to off */ #undef CONFIG_HOSTCMD_DEBUG_MODE #define CONFIG_HOSTCMD_DEBUG_MODE HCDEBUG_OFF -#undef CONFIG_LID_SWITCH #undef CONFIG_LTO #define CONFIG_POWER_BUTTON #define CONFIG_POWER_BUTTON_IGNORE_LID diff --git a/board/flapjack/gpio.inc b/board/flapjack/gpio.inc index 4846e0c44c..1a2ae7c72e 100644 --- a/board/flapjack/gpio.inc +++ b/board/flapjack/gpio.inc @@ -39,8 +39,8 @@ GPIO_INT(SPI1_NSS, PIN(A, 15), GPIO_INT_BOTH, spi_event) GPIO_INT_RW(SYNC_INT, PIN(A, 8), GPIO_INT_RISING | GPIO_PULL_DOWN, sync_interrupt) -GPIO_INT(HALL_INT_L, PIN(C, 5), GPIO_INT_FALLING, - hall_interrupt) +GPIO_INT(LID_OPEN, PIN(C, 5), GPIO_INT_BOTH, + lid_interrupt) /* HALL_INT_L */ GPIO_INT(GAUGE_INT_ODL, PIN(C, 9), GPIO_INT_FALLING | GPIO_PULL_UP, gauge_interrupt) |