summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGwendal Grignou <gwendal@chromium.org>2022-09-14 09:03:54 -0700
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-09-19 21:45:00 +0000
commite779adf2bd526847a96bccbe435eb5e4ad0ea6da (patch)
tree7c39999189e3430cb5c99a58d7983b07bfed3956
parent3032d3d30c2239d8c9526e64266ca6886b108f43 (diff)
downloadchrome-ec-firmware-reef-9042.B.tar.gz
board/snappy: Remove magnetometerfirmware-reef-9042.B
To pass CVS test and prevent RVCVXCheckTestActivity to be checked. BUG=b:237639683 BRANCH=reef TEST=compile but no link on ToT. Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Change-Id: I2ae9e10b3af34e2c3e2e175314d4d976516ef412 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3894377 Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
-rw-r--r--board/snappy/board.c39
-rw-r--r--board/snappy/board.h4
2 files changed, 1 insertions, 42 deletions
diff --git a/board/snappy/board.c b/board/snappy/board.c
index eb33c058ab..307cc7feb0 100644
--- a/board/snappy/board.c
+++ b/board/snappy/board.c
@@ -955,43 +955,6 @@ struct motion_sensor_t motion_sensors[] = {
},
},
},
-
- [BASE_MAG] = {
- .name = "Base Mag",
- .active_mask = SENSOR_ACTIVE_S0_S3,
- .chip = MOTIONSENSE_CHIP_BMI160,
- .type = MOTIONSENSE_TYPE_MAG,
- .location = MOTIONSENSE_LOC_BASE,
- .drv = &bmi160_drv,
- .mutex = &g_base_mutex,
- .drv_data = &g_bmi160_data,
- .port = I2C_PORT_GYRO,
- .addr = BMI160_ADDR0,
- .default_range = 1 << 11, /* 16LSB / uT, fixed */
- .rot_standard_ref = NULL,
- .config = {
- /* AP: by default shutdown all sensors */
- [SENSOR_CONFIG_AP] = {
- .odr = 0,
- .ec_rate = 0,
- },
- /* EC does not need in S0 */
- [SENSOR_CONFIG_EC_S0] = {
- .odr = 0,
- .ec_rate = 0,
- },
- /* Sensor off in S3/S5 */
- [SENSOR_CONFIG_EC_S3] = {
- .odr = 0,
- .ec_rate = 0,
- },
- /* Sensor off in S3/S5 */
- [SENSOR_CONFIG_EC_S5] = {
- .odr = 0,
- .ec_rate = 0,
- },
- },
- },
};
const unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors);
@@ -1109,7 +1072,7 @@ static void board_init_late(void)
if (version <= BOARD_VERSION_4) {
int i;
- for (i = BASE_ACCEL; i <= BASE_MAG; ++i)
+ for (i = BASE_ACCEL; i <= BASE_GYRO; ++i)
motion_sensors[i].active_mask = SENSOR_ACTIVE_S0;
}
diff --git a/board/snappy/board.h b/board/snappy/board.h
index d0aad15de7..6329f53b8a 100644
--- a/board/snappy/board.h
+++ b/board/snappy/board.h
@@ -202,9 +202,6 @@
#define CONFIG_ACCELGYRO_BMI160
#define CONFIG_ACCEL_INTERRUPTS
#define CONFIG_ACCELGYRO_BMI160_INT_EVENT TASK_EVENT_CUSTOM(4)
-#define CONFIG_MAG_BMI160_BMM150
-#define BMM150_I2C_ADDRESS BMM150_ADDR0 /* 8-bit address */
-#define CONFIG_MAG_CALIBRATE
#define CONFIG_ACCEL_KX022
#define OPT3001_I2C_ADDR OPT3001_I2C_ADDR1
#define CONFIG_LID_ANGLE
@@ -269,7 +266,6 @@ enum sensor_id {
LID_ACCEL = 0,
BASE_ACCEL,
BASE_GYRO,
- BASE_MAG,
};
#define CONFIG_HOSTCMD_AP_SET_SKUID