From 16c33884cc8a18f40d8e2807f16d193bf1d262e5 Mon Sep 17 00:00:00 2001 From: Devin Lu Date: Thu, 30 Jun 2022 08:57:34 +0000 Subject: Revert "burnet: Replace 2nd source base accel sensor" This reverts commit d2206be4f40f4d8e567b5b3999d3c49b9cf72e69. Reason for revert: deprecate ICM-42607 and resume ICM-40608 Original change's description: > burnet: Replace 2nd source base accel sensor > > This patch replaces 2nd source base accelerometer to ICM-42607. > > BUG=b:230553688 > BRANCH=firmware-kukui-12573.B > TEST=On Burnet. Sensor works. > > Signed-off-by: Devin Lu > Change-Id: Ia5456f2f87d644821371ac0ffdea16c07a5c3fff > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3508936 > Reviewed-by: Eric Yilun Lin > (cherry picked from commit 2d90081520b78e1124688c914cd03b26aa543d8c) > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3611264 > Commit-Queue: Eric Yilun Lin Bug: b:230553688 Change-Id: I0aeb0a5fe9c86029e0e22da1a87123da3b99816f Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3737696 Tested-by: Devin Lu Reviewed-by: Ting Shen Commit-Queue: Devin Lu --- board/burnet/board.c | 48 ++++++++++++++++++++++++------------------------ board/burnet/board.h | 6 +++--- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/board/burnet/board.c b/board/burnet/board.c index 4e0473e28e..2ece6977e2 100644 --- a/board/burnet/board.c +++ b/board/burnet/board.c @@ -18,7 +18,7 @@ #include "driver/accel_kionix.h" #include "driver/accelgyro_bmi_common.h" #include "driver/accelgyro_icm_common.h" -#include "driver/accelgyro_icm42607.h" +#include "driver/accelgyro_icm426xx.h" #include "driver/battery/max17055.h" #include "driver/bc12/pi3usb9201.h" #include "driver/charger/isl923x.h" @@ -315,7 +315,7 @@ static const mat33_fp_t base_bmi160_ref = { {0, 0, FLOAT_TO_FP(-1)} }; -static const mat33_fp_t base_icm42607_ref = { +static const mat33_fp_t base_icm426xx_ref = { {0, FLOAT_TO_FP(-1), 0}, {FLOAT_TO_FP(-1), 0, 0}, {0, 0, FLOAT_TO_FP(-1)} @@ -325,7 +325,7 @@ static const mat33_fp_t base_icm42607_ref = { static struct accelgyro_saved_data_t g_bma253_data; static struct kionix_accel_data g_kx022_data; static struct bmi_drv_data_t g_bmi160_data; -static struct icm_drv_data_t g_icm42607_data; +static struct icm_drv_data_t g_icm426xx_data; struct motion_sensor_t lid_accel_kx022 = { .name = "Lid Accel", @@ -350,21 +350,21 @@ struct motion_sensor_t lid_accel_kx022 = { }, }; -struct motion_sensor_t base_accel_icm42607 = { +struct motion_sensor_t base_accel_icm426xx = { .name = "Base Accel", .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_ICM42607, + .chip = MOTIONSENSE_CHIP_ICM426XX, .type = MOTIONSENSE_TYPE_ACCEL, .location = MOTIONSENSE_LOC_BASE, - .drv = &icm42607_drv, + .drv = &icm426xx_drv, .mutex = &g_base_mutex, - .drv_data = &g_icm42607_data, + .drv_data = &g_icm426xx_data, .port = CONFIG_SPI_ACCEL_PORT, .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .default_range = 2, - .rot_standard_ref = &base_icm42607_ref, - .min_frequency = ICM42607_ACCEL_MIN_FREQ, - .max_frequency = ICM42607_ACCEL_MAX_FREQ, + .rot_standard_ref = &base_icm426xx_ref, + .min_frequency = ICM426XX_ACCEL_MIN_FREQ, + .max_frequency = ICM426XX_ACCEL_MAX_FREQ, .config = { /* EC use accel for angle detection */ [SENSOR_CONFIG_EC_S0] = { @@ -377,21 +377,21 @@ struct motion_sensor_t base_accel_icm42607 = { }, }; -struct motion_sensor_t base_gyro_icm42607 = { +struct motion_sensor_t base_gyro_icm426xx = { .name = "Base Gyro", .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_ICM42607, + .chip = MOTIONSENSE_CHIP_ICM426XX, .type = MOTIONSENSE_TYPE_GYRO, .location = MOTIONSENSE_LOC_BASE, - .drv = &icm42607_drv, + .drv = &icm426xx_drv, .mutex = &g_base_mutex, - .drv_data = &g_icm42607_data, + .drv_data = &g_icm426xx_data, .port = CONFIG_SPI_ACCEL_PORT, .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .default_range = 1000, /* dps */ - .rot_standard_ref = &base_icm42607_ref, - .min_frequency = ICM42607_GYRO_MIN_FREQ, - .max_frequency = ICM42607_GYRO_MAX_FREQ, + .rot_standard_ref = &base_icm426xx_ref, + .min_frequency = ICM426XX_GYRO_MIN_FREQ, + .max_frequency = ICM426XX_GYRO_MAX_FREQ, }; struct motion_sensor_t motion_sensors[] = { @@ -474,8 +474,8 @@ unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); void sensor_interrupt(enum gpio_signal signal) { switch (motion_sensors[BASE_ACCEL].chip) { - case MOTIONSENSE_CHIP_ICM42607: - icm42607_interrupt(signal); + case MOTIONSENSE_CHIP_ICM426XX: + icm426xx_interrupt(signal); break; case MOTIONSENSE_CHIP_BMI160: default: @@ -496,12 +496,12 @@ static void board_update_config(void) if (rv == EC_SUCCESS) motion_sensors[LID_ACCEL] = lid_accel_kx022; - /* Read icm-42607 chip content */ - rv = icm_read8(&base_accel_icm42607, ICM42607_REG_WHO_AM_I, &val); + /* Read icm-40608 chip content */ + rv = icm_read8(&base_accel_icm426xx, ICM426XX_REG_WHO_AM_I, &val); - if (rv == EC_SUCCESS && val == ICM42607_CHIP_ICM42607P) { - motion_sensors[BASE_ACCEL] = base_accel_icm42607; - motion_sensors[BASE_GYRO] = base_gyro_icm42607; + if (rv == EC_SUCCESS && val == ICM426XX_CHIP_ICM40608) { + motion_sensors[BASE_ACCEL] = base_accel_icm426xx; + motion_sensors[BASE_GYRO] = base_gyro_icm426xx; } CPRINTS("Lid Accel Chip: %d", motion_sensors[LID_ACCEL].chip); diff --git a/board/burnet/board.h b/board/burnet/board.h index 3aadd8d9fe..6330520eeb 100644 --- a/board/burnet/board.h +++ b/board/burnet/board.h @@ -53,9 +53,9 @@ #define CONFIG_ACCEL_INTERRUPTS #define CONFIG_ACCELGYRO_BMI160_INT_EVENT \ TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL) -/* ICM42607 Base accel/gyro */ -#define CONFIG_ACCELGYRO_ICM42607 -#define CONFIG_ACCELGYRO_ICM42607_INT_EVENT \ +/* ICM426XX Base accel/gyro */ +#define CONFIG_ACCELGYRO_ICM426XX +#define CONFIG_ACCELGYRO_ICM426XX_INT_EVENT \ TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL) #define CONFIG_ALS #define CONFIG_CMD_ACCEL_INFO -- cgit v1.2.1