diff options
| author | Randall Spangler <rspangler@chromium.org> | 2013-03-19 13:11:17 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-03-19 14:59:32 -0700 |
| commit | 24f0d888dd8110f7f0448b9dbeb47c13f5b1e298 (patch) | |
| tree | c981f177484f8c80cb37b5c2798178d5449b01a8 /board/daisy/board.c | |
| parent | a3c2a73226dd558d4c9f0b5827b7db946885f395 (diff) | |
| download | chrome-ec-24f0d888dd8110f7f0448b9dbeb47c13f5b1e298.tar.gz | |
Use common declaration of keyboard_scan_interrupt()
Code cleanup: declare keyboard_scan_interrupt() once, not per board;
the implementation is common anyway.
No functional changes; just renaming.
BUG=none
BRANCH=none
TEST=build daisy,snow,spring,mccrosskey
Change-Id: I1e33cbe2c868bc47b641d36d26f07c3b5a7ba3c7
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/45874
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'board/daisy/board.c')
| -rw-r--r-- | board/daisy/board.c | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/board/daisy/board.c b/board/daisy/board.c index f66f276b92..5bf79de277 100644 --- a/board/daisy/board.c +++ b/board/daisy/board.c @@ -9,6 +9,7 @@ #include "extpower.h" #include "gpio.h" #include "i2c.h" +#include "keyboard_scan.h" #include "pmu_tpschrome.h" #include "registers.h" #include "spi.h" @@ -42,9 +43,6 @@ void gaia_lid_event(enum gpio_signal signal); #define gaia_suspend_event NULL #define gaia_lid_event NULL #endif -#ifndef CONFIG_TASK_KEYSCAN -#define matrix_interrupt NULL -#endif /* GPIO signal list. Must match order from enum gpio_signal. */ const struct gpio_info gpio_list[GPIO_COUNT] = { @@ -55,14 +53,22 @@ const struct gpio_info gpio_list[GPIO_COUNT] = { {"CHARGER_INT", GPIO_C, (1<<4), GPIO_INT_RISING, NULL}, {"LID_OPEN", GPIO_C, (1<<13), GPIO_INT_RISING, gaia_lid_event}, {"SUSPEND_L", GPIO_A, (1<<7), GPIO_INT_BOTH, gaia_suspend_event}, - {"KB_IN00", GPIO_C, (1<<8), GPIO_KB_INPUT, matrix_interrupt}, - {"KB_IN01", GPIO_C, (1<<9), GPIO_KB_INPUT, matrix_interrupt}, - {"KB_IN02", GPIO_C, (1<<10), GPIO_KB_INPUT, matrix_interrupt}, - {"KB_IN03", GPIO_C, (1<<11), GPIO_KB_INPUT, matrix_interrupt}, - {"KB_IN04", GPIO_C, (1<<12), GPIO_KB_INPUT, matrix_interrupt}, - {"KB_IN05", GPIO_C, (1<<14), GPIO_KB_INPUT, matrix_interrupt}, - {"KB_IN06", GPIO_C, (1<<15), GPIO_KB_INPUT, matrix_interrupt}, - {"KB_IN07", GPIO_D, (1<<2), GPIO_KB_INPUT, matrix_interrupt}, + {"KB_IN00", GPIO_C, (1<<8), GPIO_KB_INPUT, + keyboard_scan_interrupt}, + {"KB_IN01", GPIO_C, (1<<9), GPIO_KB_INPUT, + keyboard_scan_interrupt}, + {"KB_IN02", GPIO_C, (1<<10), GPIO_KB_INPUT, + keyboard_scan_interrupt}, + {"KB_IN03", GPIO_C, (1<<11), GPIO_KB_INPUT, + keyboard_scan_interrupt}, + {"KB_IN04", GPIO_C, (1<<12), GPIO_KB_INPUT, + keyboard_scan_interrupt}, + {"KB_IN05", GPIO_C, (1<<14), GPIO_KB_INPUT, + keyboard_scan_interrupt}, + {"KB_IN06", GPIO_C, (1<<15), GPIO_KB_INPUT, + keyboard_scan_interrupt}, + {"KB_IN07", GPIO_D, (1<<2), GPIO_KB_INPUT, + keyboard_scan_interrupt}, /* Other inputs */ {"AC_PWRBTN_L", GPIO_A, (1<<0), GPIO_INT_BOTH, NULL}, {"SPI1_NSS", GPIO_A, (1<<4), GPIO_PULL_UP, NULL}, |