diff options
| author | Nicolas Boichat <drinkcat@chromium.org> | 2017-11-12 18:01:58 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-11-20 04:53:20 -0800 |
| commit | 4cb524de67477df6a1a55daaf7ffbf3c60276242 (patch) | |
| tree | 3cc557cc7e508f9d816d353b54c045fd29d2b09a /board/hammer | |
| parent | 3b80b4e827f9bb2e82656fa74748954a06050b48 (diff) | |
| download | chrome-ec-4cb524de67477df6a1a55daaf7ffbf3c60276242.tar.gz | |
touchpad_elan: Rename task/interrupts functions
Change the names to generic touchpad_* functions, instead of
vendor-specific names. Makes it a little easier to add drivers
for other touchpads.
Also fix console_channel.inc to add the channel whenever any
touchpad is used.
BRANCH=none
BUG=b:68934906
TEST=make buildall -j
Change-Id: I6d268db5ebd53db272fb2ee7bbf06bbe80845734
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/778750
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'board/hammer')
| -rw-r--r-- | board/hammer/board.c | 2 | ||||
| -rw-r--r-- | board/hammer/ec.tasklist | 2 | ||||
| -rw-r--r-- | board/hammer/gpio.inc | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/board/hammer/board.c b/board/hammer/board.c index f3b693e93a..c6b5fa778b 100644 --- a/board/hammer/board.c +++ b/board/hammer/board.c @@ -6,7 +6,7 @@ #include "common.h" #include "ec_version.h" -#include "touchpad_elan.h" +#include "touchpad.h" #include "gpio.h" #include "hooks.h" #include "hwtimer.h" diff --git a/board/hammer/ec.tasklist b/board/hammer/ec.tasklist index 71ecd36606..b1675e37e2 100644 --- a/board/hammer/ec.tasklist +++ b/board/hammer/ec.tasklist @@ -19,6 +19,6 @@ #define CONFIG_TASK_LIST \ TASK_ALWAYS_RO(RWSIG, rwsig_task, NULL, 1280) \ TASK_ALWAYS (HOOKS, hook_task, NULL, 2048) \ - TASK_ALWAYS_RW(TOUCHPAD, elan_tp_task, NULL, LARGER_TASK_STACK_SIZE) \ + TASK_ALWAYS_RW(TOUCHPAD, touchpad_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_ALWAYS (CONSOLE, console_task, NULL, 1024) \ TASK_NOTEST_RW(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) diff --git a/board/hammer/gpio.inc b/board/hammer/gpio.inc index 305a9f95b7..1fdf46fa9b 100644 --- a/board/hammer/gpio.inc +++ b/board/hammer/gpio.inc @@ -8,11 +8,13 @@ /* Declare symbolic names for all the GPIOs that we care about. * Note: Those with interrupt handlers must be declared first. */ +#ifdef SECTION_IS_RW #ifdef BOARD_WHISKERS -GPIO_INT(TOUCHPAD_INT, PIN(B, 9), GPIO_INT_FALLING, elan_tp_interrupt) +GPIO_INT(TOUCHPAD_INT, PIN(B, 9), GPIO_INT_FALLING, touchpad_interrupt) #else -GPIO_INT(TOUCHPAD_INT, PIN(B, 8), GPIO_INT_FALLING, elan_tp_interrupt) +GPIO_INT(TOUCHPAD_INT, PIN(B, 8), GPIO_INT_FALLING, touchpad_interrupt) #endif +#endif /* SECTION_IS_RW */ /* Keyboard inputs */ #define GPIO_KB_INPUT (GPIO_INPUT | GPIO_PULL_UP | GPIO_INT_BOTH) |