diff options
| author | Ching-Kang Yen <chingkang@chromium.org> | 2020-04-16 23:57:17 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-10-12 15:10:31 +0000 |
| commit | 2e061c1d0b63f273a68fa802d2f19a6bcbe62c13 (patch) | |
| tree | a573680698e987bc39586801d1800e0df04a9f50 /board/scarlet/board.c | |
| parent | b9124243c52d6ac5a7d687da581724025fe090cf (diff) | |
| download | chrome-ec-2e061c1d0b63f273a68fa802d2f19a6bcbe62c13.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
Conflicts:
Changed many board.c files, which were diverted from the branch
point. Some boards do not exist in this branch.
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>
(cherry picked from commit 557dafbacbc61cd4c5dec9f27ead4ea17b67aac6)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3115727
Tested-by: Rong Chang <rongchang@chromium.org>
Auto-Submit: Rong Chang <rongchang@chromium.org>
Commit-Queue: Rong Chang <rongchang@chromium.org>
Diffstat (limited to 'board/scarlet/board.c')
| -rw-r--r-- | board/scarlet/board.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/board/scarlet/board.c b/board/scarlet/board.c index aece3503ae..b68864f908 100644 --- a/board/scarlet/board.c +++ b/board/scarlet/board.c @@ -15,7 +15,7 @@ #include "common.h" #include "console.h" #include "ec_commands.h" -#include "driver/accelgyro_bmi160.h" +#include "driver/accelgyro_bmi_common.h" #include "driver/charger/rt946x.h" #include "driver/sync.h" #include "driver/tcpm/fusb302.h" @@ -376,7 +376,7 @@ int board_get_version(void) /* Mutexes */ static struct mutex g_base_mutex; -static struct bmi160_drv_data_t g_bmi160_data; +static struct bmi_drv_data_t g_bmi160_data; /* Matrix to rotate accelerometer into standard reference frame */ const mat33_fp_t base_standard_ref = { @@ -404,8 +404,8 @@ struct motion_sensor_t motion_sensors[] = { .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .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 = { /* Enable accel in S0 */ [SENSOR_CONFIG_EC_S0] = { @@ -427,8 +427,8 @@ struct motion_sensor_t motion_sensors[] = { .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .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, }, [VSYNC] = { .name = "Camera vsync", |