summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Parker <dparker@chromium.org>2014-04-09 15:20:21 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-04-23 04:59:11 +0000
commitfc1b8016cec9baed8a91427c179ddba78b0f54e7 (patch)
tree3bcbbb8a9895ad47be0375a08ede720b2798ca44
parent03a4e4fdc1f7c482bc88b4b95a38a9d82ee800df (diff)
downloadchrome-ec-fc1b8016cec9baed8a91427c179ddba78b0f54e7.tar.gz
Clapper: Hard-code accelerometer power enable
This is a temporary fix to enable the accelerometers by hard-coding the power enable high until the CL to control and reset the accelerometers is landed. BUG=chrome-os-partner:24894 BRANCH=None TEST=Manual. Run on clapper. Verify accelerometers work and are polled at the correct rate in S0 and S3 with console 'lidangle on' command. Change-Id: I947d4dee5d6dece4a32c9625d828e599b3167b01 Signed-off-by: Dave Parker <dparker@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/194902
-rw-r--r--board/clapper/board.c5
-rw-r--r--board/clapper/board.h4
2 files changed, 4 insertions, 5 deletions
diff --git a/board/clapper/board.c b/board/clapper/board.c
index 230af2e3f5..148c5c2904 100644
--- a/board/clapper/board.c
+++ b/board/clapper/board.c
@@ -68,10 +68,8 @@ const struct gpio_info gpio_list[] = {
GPIO_PULL_UP,
uart_deepsleep_interrupt},
#ifdef HAS_TASK_MOTIONSENSE
- {"ACCEL_INT_LID", LM4_GPIO_F, (1<<2), GPIO_INT_RISING,
+ {"ACCEL_INT", 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 */
@@ -122,6 +120,7 @@ const struct gpio_info gpio_list[] = {
{"KBD_IRQ_L", LM4_GPIO_M, (1<<3), GPIO_ODR_HIGH, NULL},
{"I2C2_SCL", LM4_GPIO_F, (1<<6), GPIO_ODR_HIGH, NULL},
{"I2C2_SDA", LM4_GPIO_F, (1<<7), GPIO_ODR_HIGH, NULL},
+ {"ACCEL_EN", LM4_GPIO_N, (1<<5), GPIO_OUT_HIGH, NULL},
};
BUILD_ASSERT(ARRAY_SIZE(gpio_list) == GPIO_COUNT);
diff --git a/board/clapper/board.h b/board/clapper/board.h
index 8cbde47b90..6f26545a73 100644
--- a/board/clapper/board.h
+++ b/board/clapper/board.h
@@ -88,8 +88,7 @@ enum gpio_signal {
GPIO_JTAG_TCK, /* JTAG clock input */
GPIO_UART0_RX, /* UART0 RX input */
#ifdef HAS_TASK_MOTIONSENSE
- GPIO_ACCEL_INT_LID, /* Accelerometer interrupt lid */
- GPIO_ACCEL_INT_BASE, /* Accelerometer interrupt base */
+ GPIO_ACCEL_INT, /* Accelerometer interrupt */
#endif
/* Other inputs */
@@ -138,6 +137,7 @@ enum gpio_signal {
GPIO_KBD_IRQ_L, /* Negative edge triggered irq. */
GPIO_I2C2_SCL, /* I2C port 2, SCL pin */
GPIO_I2C2_SDA, /* I2C port 2, SDA pin */
+ GPIO_ACCEL_EN, /* Enable accelerometer power */
/* Number of GPIOs; not an actual GPIO */
GPIO_COUNT