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/kukui | |
| 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/kukui')
| -rw-r--r-- | board/kukui/board.c | 20 | ||||
| -rw-r--r-- | board/kukui/board.h | 6 |
2 files changed, 13 insertions, 13 deletions
diff --git a/board/kukui/board.c b/board/kukui/board.c index 5476030130..2f71e46c89 100644 --- a/board/kukui/board.c +++ b/board/kukui/board.c @@ -14,7 +14,7 @@ #include "chipset.h" #include "common.h" #include "console.h" -#include "driver/accelgyro_bmi160.h" +#include "driver/accelgyro_bmi_common.h" #include "driver/als_tcs3400.h" #include "driver/bc12/pi3usb9201.h" #include "driver/charger/rt946x.h" @@ -359,7 +359,7 @@ void sensor_board_proc_double_tap(void) #ifndef VARIANT_KUKUI_NO_SENSORS static struct mutex g_lid_mutex; -static struct bmi160_drv_data_t g_bmi160_data; +static struct bmi_drv_data_t g_bmi160_data; /* TCS3400 private data */ static struct als_drv_data_t g_tcs3400_data = { @@ -430,14 +430,14 @@ static const mat33_fp_t lid_standard_ref = { }; #endif /* BOARD_KUKUI */ -#ifdef CONFIG_MAG_BMI160_BMM150 +#ifdef CONFIG_MAG_BMI_BMM150 /* Matrix to rotate accelrator into standard reference frame */ static const mat33_fp_t mag_standard_ref = { {0, FLOAT_TO_FP(-1), 0}, {FLOAT_TO_FP(-1), 0, 0}, {0, 0, FLOAT_TO_FP(-1)} }; -#endif /* CONFIG_MAG_BMI160_BMM150 */ +#endif /* CONFIG_MAG_BMI_BMM150 */ struct motion_sensor_t motion_sensors[] = { /* @@ -458,8 +458,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 = { /* Enable accel in S0 */ [SENSOR_CONFIG_EC_S0] = { @@ -486,10 +486,10 @@ 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, }, -#ifdef CONFIG_MAG_BMI160_BMM150 +#ifdef CONFIG_MAG_BMI_BMM150 [LID_MAG] = { .name = "Lid Mag", .active_mask = SENSOR_ACTIVE_S0_S3, @@ -506,7 +506,7 @@ struct motion_sensor_t motion_sensors[] = { .min_frequency = BMM150_MAG_MIN_FREQ, .max_frequency = BMM150_MAG_MAX_FREQ(SPECIAL), }, -#endif /* CONFIG_MAG_BMI160_BMM150 */ +#endif /* CONFIG_MAG_BMI_BMM150 */ [CLEAR_ALS] = { .name = "Clear Light", .active_mask = SENSOR_ACTIVE_S0_S3, diff --git a/board/kukui/board.h b/board/kukui/board.h index 2057ab191a..9624837a14 100644 --- a/board/kukui/board.h +++ b/board/kukui/board.h @@ -49,7 +49,7 @@ /* Motion Sensors */ #ifdef SECTION_IS_RW #ifndef BOARD_KRANE -#define CONFIG_MAG_BMI160_BMM150 +#define CONFIG_MAG_BMI_BMM150 #define CONFIG_ACCELGYRO_SEC_ADDR_FLAGS BMM150_ADDR0_FLAGS #define CONFIG_MAG_CALIBRATE #endif /* !BOARD_KRANE */ @@ -122,9 +122,9 @@ enum power_signal { enum sensor_id { LID_ACCEL = 0, LID_GYRO, -#ifdef CONFIG_MAG_BMI160_BMM150 +#ifdef CONFIG_MAG_BMI_BMM150 LID_MAG, -#endif /* CONFIG_MAG_BMI160_BMM150 */ +#endif /* CONFIG_MAG_BMI_BMM150 */ CLEAR_ALS, RGB_ALS, VSYNC, |