diff options
| author | Ko_Ko <Ko_Ko@compal.corp-partner.google.com> | 2020-08-11 17:34:54 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-08-12 01:33:38 +0000 |
| commit | b59dcfba4a1afc72d91f1262bf4a6a332b31cf7d (patch) | |
| tree | fa49aadf89669f0f47d5a0e4e4b08fee0e79af19 /board/madoo/board.c | |
| parent | 567805662a770911495a16b91a0d62c14f94591f (diff) | |
| download | chrome-ec-b59dcfba4a1afc72d91f1262bf4a6a332b31cf7d.tar.gz | |
Project Madoo: change Gyro & Accel Sensor
Change Gyro & Accel Sensor from BMI160 to LSM6DSL.
BUG=b:163437341
BRANCH=none
TEST=none
Signed-off-by: Ko_Ko <Ko_Ko@compal.corp-partner.google.com>
Change-Id: I676878b8e11ef2c8ff8b502066f2c355d720f7b1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2348736
Reviewed-by: Diana Z <dzigterman@chromium.org>
Commit-Queue: Justin TerAvest <teravest@chromium.org>
Tested-by: Justin TerAvest <teravest@chromium.org>
Diffstat (limited to 'board/madoo/board.c')
| -rw-r--r-- | board/madoo/board.c | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/board/madoo/board.c b/board/madoo/board.c index 9e1766bc97..d39e6de7dd 100644 --- a/board/madoo/board.c +++ b/board/madoo/board.c @@ -16,6 +16,7 @@ #include "compile_time_macros.h" #include "driver/accel_bma2x2.h" #include "driver/accelgyro_bmi_common.h" +#include "driver/accelgyro_lsm6dsm.h" #include "driver/bc12/pi3usb9201.h" #include "driver/charger/isl923x.h" #include "driver/retimer/nb7v904m.h" @@ -360,14 +361,8 @@ static const mat33_fp_t lid_standard_ref = { { 0, 0, FLOAT_TO_FP(1)} }; -static const mat33_fp_t base_standard_ref = { - { 0, FLOAT_TO_FP(1), 0}, - { FLOAT_TO_FP(-1), 0, 0}, - { 0, 0, FLOAT_TO_FP(1)} -}; - static struct accelgyro_saved_data_t g_bma253_data; -static struct bmi_drv_data_t g_bmi160_data; +static struct lsm6dsm_data lsm6dsm_data = LSM6DSM_DATA; struct motion_sensor_t motion_sensors[] = { [LID_ACCEL] = { @@ -397,18 +392,21 @@ struct motion_sensor_t motion_sensors[] = { [BASE_ACCEL] = { .name = "Base Accel", .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_BMI160, + .chip = MOTIONSENSE_CHIP_LSM6DSM, .type = MOTIONSENSE_TYPE_ACCEL, .location = MOTIONSENSE_LOC_BASE, - .drv = &bmi160_drv, + .drv = &lsm6dsm_drv, .mutex = &g_base_mutex, - .drv_data = &g_bmi160_data, + .drv_data = LSM6DSM_ST_DATA(lsm6dsm_data, + MOTIONSENSE_TYPE_ACCEL), + .int_signal = GPIO_BASE_SIXAXIS_INT_L, + .flags = MOTIONSENSE_FLAG_INT_SIGNAL, .port = I2C_PORT_SENSOR, - .i2c_spi_addr_flags = BMI160_ADDR0_FLAGS, - .rot_standard_ref = &base_standard_ref, - .default_range = 4, - .min_frequency = BMI_ACCEL_MIN_FREQ, - .max_frequency = BMI_ACCEL_MAX_FREQ, + .i2c_spi_addr_flags = LSM6DSM_ADDR0_FLAGS, + .rot_standard_ref = NULL, + .default_range = 4, /* g */ + .min_frequency = LSM6DSM_ODR_MIN_VAL, + .max_frequency = LSM6DSM_ODR_MAX_VAL, .config = { [SENSOR_CONFIG_EC_S0] = { .odr = 13000 | ROUND_UP_FLAG, @@ -423,18 +421,21 @@ struct motion_sensor_t motion_sensors[] = { [BASE_GYRO] = { .name = "Base Gyro", .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_BMI160, + .chip = MOTIONSENSE_CHIP_LSM6DSM, .type = MOTIONSENSE_TYPE_GYRO, .location = MOTIONSENSE_LOC_BASE, - .drv = &bmi160_drv, + .drv = &lsm6dsm_drv, .mutex = &g_base_mutex, - .drv_data = &g_bmi160_data, + .drv_data = LSM6DSM_ST_DATA(lsm6dsm_data, + MOTIONSENSE_TYPE_GYRO), + .int_signal = GPIO_BASE_SIXAXIS_INT_L, + .flags = MOTIONSENSE_FLAG_INT_SIGNAL, .port = I2C_PORT_SENSOR, - .i2c_spi_addr_flags = BMI160_ADDR0_FLAGS, - .default_range = 1000, /* dps */ - .rot_standard_ref = &base_standard_ref, - .min_frequency = BMI_GYRO_MIN_FREQ, - .max_frequency = BMI_GYRO_MAX_FREQ, + .i2c_spi_addr_flags = LSM6DSM_ADDR0_FLAGS, + .default_range = 1000 | ROUND_UP_FLAG, /* dps */ + .rot_standard_ref = NULL, + .min_frequency = LSM6DSM_ODR_MIN_VAL, + .max_frequency = LSM6DSM_ODR_MAX_VAL, }, [VSYNC] = { .name = "Camera VSYNC", |