diff options
| -rw-r--r-- | board/poppy/board.c | 38 | ||||
| -rw-r--r-- | board/poppy/board.h | 9 |
2 files changed, 0 insertions, 47 deletions
diff --git a/board/poppy/board.c b/board/poppy/board.c index 2ec9323f7d..2a4c17c788 100644 --- a/board/poppy/board.c +++ b/board/poppy/board.c @@ -741,7 +741,6 @@ int board_get_version(void) static struct mutex g_lid_mutex; static struct bmi160_drv_data_t g_bmi160_data; -static struct bmp280_drv_data_t bmp280_drv_data; /* Matrix to rotate accelrator into standard reference frame */ const matrix_3x3_t mag_standard_ref = { @@ -873,43 +872,6 @@ struct motion_sensor_t motion_sensors[] = { }, }, }, - - [LID_BARO] = { - .name = "Base Baro", - .active_mask = SENSOR_ACTIVE_S0, - .chip = MOTIONSENSE_CHIP_BMP280, - .type = MOTIONSENSE_TYPE_BARO, - .location = MOTIONSENSE_LOC_LID, - .drv = &bmp280_drv, - .drv_data = &bmp280_drv_data, - .port = I2C_PORT_BARO, - .addr = BMP280_I2C_ADDRESS1, - .default_range = 1 << 18, /* 1bit = 4 Pa, 16bit ~= 2600 hPa */ - .min_frequency = BMP280_BARO_MIN_FREQ, - .max_frequency = BMP280_BARO_MAX_FREQ, - .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); diff --git a/board/poppy/board.h b/board/poppy/board.h index a274796d5d..daf3cf41b2 100644 --- a/board/poppy/board.h +++ b/board/poppy/board.h @@ -124,8 +124,6 @@ #define BMM150_I2C_ADDRESS BMM150_ADDR0 /* 8-bit address */ #define CONFIG_MAG_CALIBRATE -#define CONFIG_BARO_BMP280 - /* FIFO size is in power of 2. */ #define CONFIG_ACCEL_FIFO 1024 @@ -226,15 +224,11 @@ enum als_id { * When reading through IO memory is set up for sensors (LPC is used), * the first 2 entries must be accelerometers, then gyroscope. * For BMI160, accel, gyro and compass sensors must be next to each other. - * - * TODO(crosbug.com/p/61098): Understand how the statement above applies - * since we only have one accelerometer. */ enum sensor_id { LID_ACCEL = 0, LID_GYRO, LID_MAG, - LID_BARO, }; enum adc_channel { @@ -272,9 +266,6 @@ int board_get_version(void); void board_reset_pd_mcu(void); void board_set_tcpc_power_mode(int port, int mode); -/* Sensors without hardware FIFO are in forced mode */ -#define CONFIG_ACCEL_FORCE_MODE_MASK (1 << LID_BARO) - #endif /* !__ASSEMBLER__ */ #endif /* __CROS_EC_BOARD_H */ |