herobrine_npcx9: Switch to use BMI260 sensor driver

Switch the base accel/gyro sensor from BMI160 to BMI260.

BRANCH=None
BUG=b:194194887
TEST=Built the herobrine_npcx9 image successfully.

Change-Id: I45b5ba072a787ae53f5f5158701dd61cb0c0410f
Signed-off-by: Wai-Hong Tam <waihong@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3042984
Reviewed-by: Stephen Boyd <swboyd@chromium.org>

3 files changed, 15 insertions, 15 deletions

diff --git a/board/herobrine_npcx9/board.c b/board/herobrine_npcx9/board.c
index 2f2e59bdae..eaf6ed0399 100644
--- a/board/herobrine_npcx9/board.c
+++ b/board/herobrine_npcx9/board.c
@@ -146,7 +146,7 @@ __override uint32_t board_get_sku_id(void)
 /* Initialize board. */
 static void board_init(void)
 {
-	/* Enable interrupt for BMI160 sensor */
+	/* Enable interrupt for BMI260 sensor */
 	gpio_enable_interrupt(GPIO_ACCEL_GYRO_INT_L);
 
 	/* Set the backlight duty cycle to 0. AP will override it later. */
@@ -180,7 +180,7 @@ DECLARE_HOOK(HOOK_CHIPSET_RESUME, board_chipset_resume, HOOK_PRIO_DEFAULT);
 static struct mutex g_base_mutex;
 static struct mutex g_lid_mutex;
 
-static struct bmi_drv_data_t g_bmi160_data;
+static struct bmi_drv_data_t g_bmi260_data;
 static struct accelgyro_saved_data_t g_bma255_data;
 
 /* Matrix to rotate accelerometer into standard reference frame */
@@ -224,21 +224,21 @@ struct motion_sensor_t motion_sensors[] = {
 	 },
 	},
 	/*
-	 * Note: bmi160: supports accelerometer and gyro sensor
+	 * Note: BMI260: supports accelerometer and gyro sensor
 	 * Requirement: accelerometer sensor must init before gyro sensor
 	 * DO NOT change the order of the following table.
 	 */
 	[BASE_ACCEL] = {
 	 .name = "Base Accel",
 	 .active_mask = SENSOR_ACTIVE_S0_S3,
-	 .chip = MOTIONSENSE_CHIP_BMI160,
+	 .chip = MOTIONSENSE_CHIP_BMI260,
 	 .type = MOTIONSENSE_TYPE_ACCEL,
 	 .location = MOTIONSENSE_LOC_BASE,
-	 .drv = &bmi160_drv,
+	 .drv = &bmi260_drv,
 	 .mutex = &g_base_mutex,
-	 .drv_data = &g_bmi160_data,
+	 .drv_data = &g_bmi260_data,
 	 .port = I2C_PORT_SENSOR,
-	 .i2c_spi_addr_flags = BMI160_ADDR0_FLAGS,
+	 .i2c_spi_addr_flags = BMI260_ADDR0_FLAGS,
 	 .rot_standard_ref = &base_standard_ref,
 	 .default_range = 4,  /* g, to meet CDD 7.3.1/C-1-4 reqs */
 	 .min_frequency = BMI_ACCEL_MIN_FREQ,
@@ -256,14 +256,14 @@ struct motion_sensor_t motion_sensors[] = {
 	[BASE_GYRO] = {
 	 .name = "Gyro",
 	 .active_mask = SENSOR_ACTIVE_S0_S3,
-	 .chip = MOTIONSENSE_CHIP_BMI160,
+	 .chip = MOTIONSENSE_CHIP_BMI260,
 	 .type = MOTIONSENSE_TYPE_GYRO,
 	 .location = MOTIONSENSE_LOC_BASE,
-	 .drv = &bmi160_drv,
+	 .drv = &bmi260_drv,
 	 .mutex = &g_base_mutex,
-	 .drv_data = &g_bmi160_data,
+	 .drv_data = &g_bmi260_data,
 	 .port = I2C_PORT_SENSOR,
-	 .i2c_spi_addr_flags = BMI160_ADDR0_FLAGS,
+	 .i2c_spi_addr_flags = BMI260_ADDR0_FLAGS,
 	 .default_range = 1000, /* dps */
 	 .rot_standard_ref = &base_standard_ref,
 	 .min_frequency = BMI_GYRO_MIN_FREQ,
diff --git a/board/herobrine_npcx9/board.h b/board/herobrine_npcx9/board.h
index 0c7d7278db..1800d1255f 100644
--- a/board/herobrine_npcx9/board.h
+++ b/board/herobrine_npcx9/board.h
@@ -41,10 +41,10 @@
 #define CONFIG_USB_PORT_POWER_DUMB
 
 /* Sensors */
-/* BMI160 Base accel/gyro */
-#define CONFIG_ACCELGYRO_BMI160
+/* BMI260 Base accel/gyro */
+#define CONFIG_ACCELGYRO_BMI260
 #define CONFIG_ACCEL_INTERRUPTS
-#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \
+#define CONFIG_ACCELGYRO_BMI260_INT_EVENT \
 	TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL)
 #define OPT3001_I2C_ADDR_FLAGS OPT3001_I2C_ADDR1_FLAGS
 
diff --git a/board/herobrine_npcx9/gpio.inc b/board/herobrine_npcx9/gpio.inc
index 5c13269be3..4091c19d18 100644
--- a/board/herobrine_npcx9/gpio.inc
+++ b/board/herobrine_npcx9/gpio.inc
@@ -39,7 +39,7 @@ GPIO_INT(AP_EC_SPI_CS_L,    PIN(5, 3), GPIO_INT_FALLING | GPIO_PULL_DOWN, shi_cs
 
 /* Sensor interrupts */
 GPIO_INT(TABLET_MODE_L,     PIN(C, 6), GPIO_INT_BOTH, gmr_tablet_switch_isr)
-GPIO_INT(ACCEL_GYRO_INT_L,  PIN(A, 3), GPIO_INT_FALLING, bmi160_interrupt)  /* Accelerometer/gyro interrupt */
+GPIO_INT(ACCEL_GYRO_INT_L,  PIN(A, 3), GPIO_INT_FALLING, bmi260_interrupt)  /* Accelerometer/gyro interrupt */
 
 GPIO(RTC_EC_WAKE_ODL ,      PIN(0, 2), GPIO_INPUT)     /* RTC interrupt */
 GPIO(EC_ENTERING_RW,        PIN(7, 2), GPIO_OUT_LOW)   /* Indicate when EC is entering RW code */