summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Parker <dparker@chromium.org>2014-04-03 14:30:55 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-04-24 01:35:03 +0000
commitc350386dd99268432db68b5f0d0220c71d2b61db (patch)
treed9da974cedfb78e1ef670d92a46dab72949875c0
parent37062dd4377eb35d2261015729ef867e936833ea (diff)
downloadchrome-ec-c350386dd99268432db68b5f0d0220c71d2b61db.tar.gz
Glimmer: 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:27577 BRANCH=None TEST=Manual. Run on glimmer. Verify accelerometers work and are polled at the correct rate in S0 and S3 with console 'lidangle on' command. Change-Id: I619deffe6b5d1edb35c022cd0071310e2c2f1e3d Signed-off-by: Dave Parker <dparker@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/194901
-rw-r--r--board/glimmer/board.c5
-rw-r--r--board/glimmer/board.h4
2 files changed, 4 insertions, 5 deletions
diff --git a/board/glimmer/board.c b/board/glimmer/board.c
index bee25d15af..09ed3e2375 100644
--- a/board/glimmer/board.c
+++ b/board/glimmer/board.c
@@ -89,10 +89,8 @@ const struct gpio_info gpio_list[] = {
{"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", 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 */
@@ -145,6 +143,7 @@ const struct gpio_info gpio_list[] = {
{"I2C2_SCL", LM4_GPIO_F, (1<<6), GPIO_ODR_HIGH, NULL},
{"I2C2_SDA", LM4_GPIO_F, (1<<7), GPIO_ODR_HIGH, NULL},
{"ADAPTER_ID", LM4_GPIO_E, (1<<1), GPIO_OUT_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/glimmer/board.h b/board/glimmer/board.h
index 9cbe8eb3ab..717eabebd1 100644
--- a/board/glimmer/board.h
+++ b/board/glimmer/board.h
@@ -98,8 +98,7 @@ enum gpio_signal {
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 */
+ GPIO_ACCEL_INT, /* Accelerometer interrupt */
#endif
/* Other inputs */
@@ -150,6 +149,7 @@ enum gpio_signal {
GPIO_I2C2_SCL, /* I2C port 2, SCL pin */
GPIO_I2C2_SDA, /* I2C port 2, SDA pin */
GPIO_ADAPTER_ID, /* Adapter ID pin */
+ GPIO_ACCEL_EN, /* Enable accelerometer power */
/* Number of GPIOs; not an actual GPIO */
GPIO_COUNT