diff options
| author | Gwendal Grignou <gwendal@chromium.org> | 2016-10-05 14:17:49 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-10-07 21:51:22 -0700 |
| commit | 0ea4603143984a70f895a0c83df4eab3e2b4aa58 (patch) | |
| tree | 457b445dd20b3e7adf0514f6b14bcc13174f06eb /driver/accelgyro_bmi160.c | |
| parent | afcfb4b99844ea79db732dfcad222c32550477ed (diff) | |
| download | chrome-ec-0ea4603143984a70f895a0c83df4eab3e2b4aa58.tar.gz | |
driver: bmi160: Add config variable for INT2 setting
BMI INT2 can be input or output.
It is not used currently, but configure it properly nevertheless.
BUG=none
BRANCH=none
TEST=On cave, (int2 is output), ensure FIFO headers are free of
interrupt information.
Change-Id: I9c058689a8676593aad542e33601cc11da105838
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/394066
Diffstat (limited to 'driver/accelgyro_bmi160.c')
| -rw-r--r-- | driver/accelgyro_bmi160.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/driver/accelgyro_bmi160.c b/driver/accelgyro_bmi160.c index 2ecc27fe4c..3a6ee8b86f 100644 --- a/driver/accelgyro_bmi160.c +++ b/driver/accelgyro_bmi160.c @@ -793,12 +793,16 @@ static int config_interrupt(const struct motion_sensor_t *s) BMI160_TAP_TH(s, CONFIG_GESTURE_TAP_THRES_MG)); #endif /* - * configure int2 as an external input. * Set a 5ms latch to be sure the EC can read the interrupt register * properly, even when it is running more slowly. */ +#ifdef CONFIG_ACCELGYRO_BMI160_INT2_OUTPUT + ret = raw_write8(s->port, s->addr, BMI160_INT_LATCH, BMI160_LATCH_5MS); +#else + /* Also, configure int2 as an external input. */ ret = raw_write8(s->port, s->addr, BMI160_INT_LATCH, BMI160_INT2_INPUT_EN | BMI160_LATCH_5MS); +#endif /* configure int1 as an interupt */ ret = raw_write8(s->port, s->addr, BMI160_INT_OUT_CTRL, @@ -823,10 +827,14 @@ static int config_interrupt(const struct motion_sensor_t *s) /* configure fifo watermark at 50% */ ret = raw_write8(s->port, s->addr, BMI160_FIFO_CONFIG_0, 512 / sizeof(uint32_t)); +#ifdef CONFIG_ACCELGYRO_BMI160_INT2_OUTPUT + ret = raw_write8(s->port, s->addr, BMI160_FIFO_CONFIG_1, + BMI160_FIFO_HEADER_EN); +#else ret = raw_write8(s->port, s->addr, BMI160_FIFO_CONFIG_1, - BMI160_FIFO_TAG_INT1_EN | BMI160_FIFO_TAG_INT2_EN | BMI160_FIFO_HEADER_EN); +#endif /* Set fifo*/ ret = raw_read8(s->port, s->addr, BMI160_INT_EN_1, &tmp); @@ -932,12 +940,6 @@ static int bmi160_decode_header(struct motion_sensor_t *s, *bp += (i == MOTIONSENSE_TYPE_MAG ? 8 : 6); } } -#if 0 - if (hdr & BMI160_FH_EXT_MASK) - CPRINTF("%s%s\n", - (hdr & 0x1 ? "INT1" : ""), - (hdr & 0x2 ? "INT2" : "")); -#endif return 1; } else { return 0; |