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/reef_mchp | |
| 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/reef_mchp')
| -rw-r--r-- | board/reef_mchp/board.c | 12 | ||||
| -rw-r--r-- | board/reef_mchp/board.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/board/reef_mchp/board.c b/board/reef_mchp/board.c index b9927976ab..3540cf334c 100644 --- a/board/reef_mchp/board.c +++ b/board/reef_mchp/board.c @@ -18,7 +18,7 @@ #include "driver/als_opt3001.h" #include "driver/accel_kionix.h" #include "driver/accel_kx022.h" -#include "driver/accelgyro_bmi160.h" +#include "driver/accelgyro_bmi_common.h" #include "driver/baro_bmp280.h" #include "driver/charger/bd9995x.h" #include "driver/tcpm/anx74xx.h" @@ -949,7 +949,7 @@ const mat33_fp_t mag_standard_ref = { /* sensor private data */ static struct kionix_accel_data g_kx022_data; -static struct bmi160_drv_data_t g_bmi160_data; +static struct bmi_drv_data_t g_bmi160_data; static struct bmp280_drv_data_t bmp280_drv_data; /* MCHP: struct not present in firmware-reef-9042.B */ static struct opt3001_drv_data_t g_opt3001_data = { @@ -1003,8 +1003,8 @@ struct motion_sensor_t motion_sensors[] = { .i2c_spi_addr_flags = BMI160_ADDR0_FLAGS, .rot_standard_ref = &base_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] = { @@ -1032,8 +1032,8 @@ struct motion_sensor_t motion_sensors[] = { .i2c_spi_addr_flags = BMI160_ADDR0_FLAGS, .default_range = 1000, /* dps */ .rot_standard_ref = &base_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, }, [BASE_MAG] = { .name = "Base Mag", diff --git a/board/reef_mchp/board.h b/board/reef_mchp/board.h index 32f826453d..c516b0eb5b 100644 --- a/board/reef_mchp/board.h +++ b/board/reef_mchp/board.h @@ -202,7 +202,7 @@ #define CONFIG_ACCEL_INTERRUPTS #define CONFIG_ACCELGYRO_BMI160_INT_EVENT \ TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL) -#define CONFIG_MAG_BMI160_BMM150 +#define CONFIG_MAG_BMI_BMM150 #define CONFIG_ACCELGYRO_SEC_ADDR_FLAGS BMM150_ADDR0_FLAGS #define CONFIG_MAG_CALIBRATE #define CONFIG_ACCEL_KX022 |