diff options
| author | Ching-Kang Yen <chingkang@chromium.org> | 2020-04-16 23:57:17 +0800 |
|---|---|---|
| committer | Ching-Kang Yen <chingkang@chromium.org> | 2020-04-23 13:43:16 +0000 |
| commit | 557dafbacbc61cd4c5dec9f27ead4ea17b67aac6 (patch) | |
| tree | 1b4e36d70a7c426371dc173a58f751012cd3977d /board/poppy | |
| parent | 86be30f5c4220112c6303c176f12096151285515 (diff) | |
| download | chrome-ec-557dafbacbc61cd4c5dec9f27ead4ea17b67aac6.tar.gz | |
driver: Replace BMI160 to BMI in board config
Replace some macro of BMI160 to BMI version for common function of
BMI series.
Make board config include the accelgyro_bmi_common.h instead of
accel_gyro_bmi160.h.
BRANCH=None
BUG=b:146144827
TEST=make buildall -j
Change-Id: I043ff8a92f15295ead3fa5c1e292319e2b4fa21a
Signed-off-by: Ching-Kang Yen <chingkang@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2156525
Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
Diffstat (limited to 'board/poppy')
| -rw-r--r-- | board/poppy/board.c | 12 | ||||
| -rw-r--r-- | board/poppy/board.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/board/poppy/board.c b/board/poppy/board.c index 80bcf98433..ddd0721591 100644 --- a/board/poppy/board.c +++ b/board/poppy/board.c @@ -17,7 +17,7 @@ #include "charger.h" #include "chipset.h" #include "console.h" -#include "driver/accelgyro_bmi160.h" +#include "driver/accelgyro_bmi_common.h" #include "driver/als_opt3001.h" #include "driver/baro_bmp280.h" #include "driver/charger/isl923x.h" @@ -717,7 +717,7 @@ int board_get_version(void) /* Lid Sensor mutex */ static struct mutex g_lid_mutex; -static struct bmi160_drv_data_t g_bmi160_data; +static struct bmi_drv_data_t g_bmi160_data; static struct opt3001_drv_data_t g_opt3001_data = { .scale = 1, .uscale = 0, @@ -766,8 +766,8 @@ struct motion_sensor_t motion_sensors[] = { .i2c_spi_addr_flags = BMI160_ADDR0_FLAGS, .rot_standard_ref = &lid_standard_ref, .default_range = 4, /* g, to meet CDD 7.3.1/C-1-4 reqs */ - .min_frequency = BMI160_ACCEL_MIN_FREQ, - .max_frequency = BMI160_ACCEL_MAX_FREQ, + .min_frequency = BMI_ACCEL_MIN_FREQ, + .max_frequency = BMI_ACCEL_MAX_FREQ, .config = { /* EC use accel for angle detection */ [SENSOR_CONFIG_EC_S0] = { @@ -790,8 +790,8 @@ struct motion_sensor_t motion_sensors[] = { .i2c_spi_addr_flags = BMI160_ADDR0_FLAGS, .default_range = 1000, /* dps */ .rot_standard_ref = &lid_standard_ref, - .min_frequency = BMI160_GYRO_MIN_FREQ, - .max_frequency = BMI160_GYRO_MAX_FREQ, + .min_frequency = BMI_GYRO_MIN_FREQ, + .max_frequency = BMI_GYRO_MAX_FREQ, }, [LID_MAG] = { diff --git a/board/poppy/board.h b/board/poppy/board.h index e1f839b65b..d9f8cbc6e1 100644 --- a/board/poppy/board.h +++ b/board/poppy/board.h @@ -124,7 +124,7 @@ #define CONFIG_MKBP_EVENT #define CONFIG_MKBP_USE_HOST_EVENT #define CONFIG_ACCELGYRO_BMI160 -#define CONFIG_MAG_BMI160_BMM150 +#define CONFIG_MAG_BMI_BMM150 #define CONFIG_ACCEL_INTERRUPTS #define CONFIG_ACCELGYRO_BMI160_INT_EVENT \ TASK_EVENT_MOTION_SENSOR_INTERRUPT(LID_ACCEL) |