diff options
| author | ChromeOS Developer <dparker@chromium.org> | 2014-03-21 09:58:14 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-03-21 17:14:21 +0000 |
| commit | 9ad01119c5ea4b4af39221f1478d266bda061c86 (patch) | |
| tree | f40e558ddd1859bc2ffd8298b9788cdc56480337 | |
| parent | 083721e0170867a80f357608ffe7be04fc36efe2 (diff) | |
| download | chrome-ec-9ad01119c5ea4b4af39221f1478d266bda061c86.tar.gz | |
Conditionally define accelerometer interrupt GPIOs
motion_sense.c is only included for the MOTIONSENSE
task which is set as a 'NOTEST' task.
BUG=None
BRANCH=None
TEST=Run the following:
make -j buildall
make -j BOARD=clapper tests
make -j BOARD=glimmer tests
Change-Id: Ia6cc4452e60aedecd68ada76214a3b6f4251956e
Signed-off-by: Dave Parker <dparker@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/191069
Reviewed-by: Bernie Thompson <bhthompson@chromium.org>
Reviewed-by: Alec Berg <alecaberg@chromium.org>
Commit-Queue: Alec Berg <alecaberg@chromium.org>
Tested-by: Alec Berg <alecaberg@chromium.org>
| -rw-r--r-- | board/clapper/board.c | 2 | ||||
| -rw-r--r-- | board/clapper/board.h | 2 | ||||
| -rw-r--r-- | board/glimmer/board.c | 2 | ||||
| -rw-r--r-- | board/glimmer/board.h | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/board/clapper/board.c b/board/clapper/board.c index 7b73cddbe2..90672917d8 100644 --- a/board/clapper/board.c +++ b/board/clapper/board.c @@ -72,10 +72,12 @@ const struct gpio_info gpio_list[] = { button_interrupt}, {"BUTTON_VOLUME_UP_L", LM4_GPIO_B, (1<<0), GPIO_INT_BOTH, button_interrupt}, +#ifdef HAS_TASK_MOTIONSENSE {"ACCEL_INT_LID", LM4_GPIO_F, (1<<2), GPIO_INT_RISING, accel_int_lid}, {"ACCEL_INT_BASE", LM4_GPIO_N, (1<<5), GPIO_INT_RISING, accel_int_base}, +#endif /* Other inputs */ {"BOARD_VERSION1", LM4_GPIO_Q, (1<<5), GPIO_INPUT, NULL}, diff --git a/board/clapper/board.h b/board/clapper/board.h index 58ea892eb0..4e69719b6d 100644 --- a/board/clapper/board.h +++ b/board/clapper/board.h @@ -89,8 +89,10 @@ enum gpio_signal { GPIO_UART0_RX, /* UART0 RX input */ GPIO_BUTTON_VOLUME_DOWN_L, /* Volume down button */ GPIO_BUTTON_VOLUME_UP_L, /* Volume up button */ +#ifdef HAS_TASK_MOTIONSENSE GPIO_ACCEL_INT_LID, /* Accelerometer interrupt lid */ GPIO_ACCEL_INT_BASE, /* Accelerometer interrupt base */ +#endif /* Other inputs */ GPIO_BOARD_VERSION1, /* Board version stuffing resistor 1 */ diff --git a/board/glimmer/board.c b/board/glimmer/board.c index 6aa36cb277..5971a7fe6e 100644 --- a/board/glimmer/board.c +++ b/board/glimmer/board.c @@ -88,10 +88,12 @@ const struct gpio_info gpio_list[] = { button_interrupt}, {"BUTTON_VOLUME_UP_L", LM4_GPIO_B, (1<<0), GPIO_INT_BOTH, button_interrupt}, +#ifdef HAS_TASK_MOTIONSENSE {"ACCEL_INT_LID", LM4_GPIO_F, (1<<2), GPIO_INT_RISING, accel_int_lid}, {"ACCEL_INT_BASE", LM4_GPIO_N, (1<<5), GPIO_INT_RISING, accel_int_base}, +#endif /* Other inputs */ {"BOARD_VERSION1", LM4_GPIO_Q, (1<<5), GPIO_INPUT, NULL}, diff --git a/board/glimmer/board.h b/board/glimmer/board.h index 9e10dfba5c..ddd69615f2 100644 --- a/board/glimmer/board.h +++ b/board/glimmer/board.h @@ -93,8 +93,10 @@ enum gpio_signal { GPIO_UART0_RX, /* UART0 RX input */ GPIO_BUTTON_VOLUME_DOWN_L, /* Volume down button */ GPIO_BUTTON_VOLUME_UP_L, /* Volume up button */ +#ifdef HAS_TASK_MOTIONSENSE GPIO_ACCEL_INT_LID, /* Accelerometer interrupt lid */ GPIO_ACCEL_INT_BASE, /* Accelerometer interrupt base */ +#endif /* Other inputs */ GPIO_BOARD_VERSION1, /* Board version stuffing resistor 1 */ |