diff options
| author | Mike Lee <mike5@huaqin.corp-partner.google.com> | 2021-06-29 22:50:46 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-06-29 18:29:43 +0000 |
| commit | 400f2560bf37f92c94ab090d0223685785eae3cd (patch) | |
| tree | 7ef5a004cccbc9db198396426f2e44fd2d8a14cc /board/storo | |
| parent | 7276c5d5839b15c8006171e7402895fc0d209275 (diff) | |
| download | chrome-ec-400f2560bf37f92c94ab090d0223685785eae3cd.tar.gz | |
storo: change icm-42607 sensor config
change icm-42607 sensor location from lid to base
BUG=b:192334282
BRANCH=dedede
TEST=make BOARD=storo pass, and use 'ectool motionsense info 1'
can show correct location.
Signed-off-by: Mike Lee <mike5@huaqin.corp-partner.google.com>
Change-Id: Ie733f6b08fb28599bd31a81cd071437862350324
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2994744
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Commit-Queue: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'board/storo')
| -rw-r--r-- | board/storo/board.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/board/storo/board.c b/board/storo/board.c index 207d312a17..664e731013 100644 --- a/board/storo/board.c +++ b/board/storo/board.c @@ -668,14 +668,14 @@ const mat33_fp_t based_ref_icm42607 = { { 0, FLOAT_TO_FP(1), 0}, { 0, 0, FLOAT_TO_FP(1)} }; -struct motion_sensor_t icm42607_lid_accel = { - .name = "Accel", +struct motion_sensor_t icm42607_base_accel = { + .name = "Base Accel", .active_mask = SENSOR_ACTIVE_S0_S3, .chip = MOTIONSENSE_CHIP_ICM42607, .type = MOTIONSENSE_TYPE_ACCEL, - .location = MOTIONSENSE_LOC_LID, + .location = MOTIONSENSE_LOC_BASE, .drv = &icm42607_drv, - .mutex = &g_lid_mutex, + .mutex = &g_base_mutex, .drv_data = &g_icm42607_data, .port = I2C_PORT_ACCEL, .i2c_spi_addr_flags = ICM42607_ADDR0_FLAGS, @@ -684,22 +684,25 @@ struct motion_sensor_t icm42607_lid_accel = { .min_frequency = ICM42607_ACCEL_MIN_FREQ, .max_frequency = ICM42607_ACCEL_MAX_FREQ, .config = { - /* Enable accel in S0 */ - [SENSOR_CONFIG_EC_S0] = { + /* EC use accel for angle detection */ + [SENSOR_CONFIG_EC_S0] = { .odr = 10000 | ROUND_UP_FLAG, - .ec_rate = 100 * MSEC, - }, + }, + /* EC use accel for angle detection */ + [SENSOR_CONFIG_EC_S3] = { + .odr = 10000 | ROUND_UP_FLAG, + }, }, }; -struct motion_sensor_t icm42607_lid_gyro = { - .name = "Gyro", +struct motion_sensor_t icm42607_base_gyro = { + .name = "Base Gyro", .active_mask = SENSOR_ACTIVE_S0_S3, .chip = MOTIONSENSE_CHIP_ICM42607, .type = MOTIONSENSE_TYPE_GYRO, - .location = MOTIONSENSE_LOC_LID, + .location = MOTIONSENSE_LOC_BASE, .drv = &icm42607_drv, - .mutex = &g_lid_mutex, + .mutex = &g_base_mutex, .drv_data = &g_icm42607_data, .port = I2C_PORT_ACCEL, .i2c_spi_addr_flags = ICM42607_ADDR0_FLAGS, @@ -740,8 +743,8 @@ void board_init(void) gpio_set_level(GPIO_EN_PP3300_PEN, 1); if (get_cbi_ssfc_base_sensor() == SSFC_SENSOR_ICM42607) { - motion_sensors[BASE_ACCEL] = icm42607_lid_accel; - motion_sensors[BASE_GYRO] = icm42607_lid_gyro; + motion_sensors[BASE_ACCEL] = icm42607_base_accel; + motion_sensors[BASE_GYRO] = icm42607_base_gyro; ccprints("BASE GYRO is ICM42607"); } else { ccprints("BASE GYRO is BMI160"); |