asurada/hayato: remove non-exist sensors

There's no e-compass on both devices, and no light sensor on hayato.
Remove those entries from motion_sensors array.

BUG=b:169634029
TEST=no "init failed" when booting hayato
BRANCH=none

Signed-off-by: Ting Shen <phoenixshen@google.com>
Change-Id: Id8db84da36694aa41be74314d9d0f9ca6312f4af
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2467544
Reviewed-by: Eric Yilun Lin <yllin@chromium.org>
Commit-Queue: Ting Shen <phoenixshen@chromium.org>
Tested-by: Ting Shen <phoenixshen@chromium.org>

3 files changed, 20 insertions, 41 deletions

diff --git a/board/asurada/board.c b/board/asurada/board.c
index 35b3aff3e5..9ddf68c27b 100644
--- a/board/asurada/board.c
+++ b/board/asurada/board.c
@@ -611,25 +611,6 @@ static struct mutex g_lid_mutex;
 static struct bmi_drv_data_t g_bmi160_data;
 static struct stprivate_data g_lis2dwl_data;
 
-/* Matrix to rotate accelrator into standard reference frame */
-/* TODO: update the matrix after we have assembled unit */
-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)},
-};
-
-/* TCS3400 private data */
-static struct als_drv_data_t g_tcs3400_data = {
-	.als_cal.scale = 1,
-	.als_cal.uscale = 0,
-	.als_cal.offset = 0,
-	.als_cal.channel_scale = {
-		.k_channel_scale = ALS_CHANNEL_SCALE(1.0), /* kc */
-		.cover_scale = ALS_CHANNEL_SCALE(1.0),     /* CT */
-	},
-};
-
 #ifdef BOARD_ASURADA
 /* Matrix to rotate accelerometer into standard reference frame */
 /* for rev 0 */
@@ -647,7 +628,17 @@ static void update_rotation_matrix(void)
 		&base_standard_ref_rev0;
 }
 DECLARE_HOOK(HOOK_INIT, update_rotation_matrix, HOOK_PRIO_INIT_ADC + 1);
-#endif
+
+/* TCS3400 private data */
+static struct als_drv_data_t g_tcs3400_data = {
+	.als_cal.scale = 1,
+	.als_cal.uscale = 0,
+	.als_cal.offset = 0,
+	.als_cal.channel_scale = {
+		.k_channel_scale = ALS_CHANNEL_SCALE(1.0), /* kc */
+		.cover_scale = ALS_CHANNEL_SCALE(1.0),     /* CT */
+	},
+};
 
 static struct tcs3400_rgb_drv_data_t g_tcs3400_rgb_data = {
 	/*
@@ -690,6 +681,7 @@ static struct tcs3400_rgb_drv_data_t g_tcs3400_rgb_data = {
 	.saturation.again = TCS_DEFAULT_AGAIN,
 	.saturation.atime = TCS_DEFAULT_ATIME,
 };
+#endif /* BOARD_ASURADA */
 
 struct motion_sensor_t motion_sensors[] = {
 	/*
@@ -741,22 +733,6 @@ struct motion_sensor_t motion_sensors[] = {
 		.min_frequency = BMI_GYRO_MIN_FREQ,
 		.max_frequency = BMI_GYRO_MAX_FREQ,
 	},
-	[BASE_MAG] = {
-		.name = "Base Mag",
-		.active_mask = SENSOR_ACTIVE_S0_S3,
-		.chip = MOTIONSENSE_CHIP_BMI160,
-		.type = MOTIONSENSE_TYPE_MAG,
-		.location = MOTIONSENSE_LOC_BASE,
-		.drv = &bmi160_drv,
-		.mutex = &g_base_mutex,
-		.drv_data = &g_bmi160_data,
-		.port = I2C_PORT_ACCEL,
-		.i2c_spi_addr_flags = BMI160_ADDR0_FLAGS,
-		.default_range = BIT(11), /* 16LSB / uT, fixed */
-		.rot_standard_ref = &mag_standard_ref,
-		.min_frequency = BMM150_MAG_MIN_FREQ,
-		.max_frequency = BMM150_MAG_MAX_FREQ(SPECIAL),
-	},
 	[LID_ACCEL] = {
 		.name = "Lid Accel",
 		.active_mask = SENSOR_ACTIVE_S0_S3,
@@ -785,6 +761,7 @@ struct motion_sensor_t motion_sensors[] = {
 			},
 		},
 	},
+#ifdef BOARD_ASURADA
 	[CLEAR_ALS] = {
 		.name = "Clear Light",
 		.active_mask = SENSOR_ACTIVE_S0_S3,
@@ -820,5 +797,6 @@ struct motion_sensor_t motion_sensors[] = {
 		.min_frequency = 0,
 		.max_frequency = 0,
 	},
+#endif /* BOARD_ASURADA */
 };
 const unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors);
diff --git a/board/asurada/board.h b/board/asurada/board.h
index 795b426807..59ae33ae60 100644
--- a/board/asurada/board.h
+++ b/board/asurada/board.h
@@ -159,7 +159,6 @@
 #define CONFIG_ACCELGYRO_BMI160 /* Base accel */
 #define CONFIG_ACCELGYRO_BMI160_INT_EVENT \
 	TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL)
-#define CONFIG_ACCELGYRO_SEC_ADDR_FLAGS BMM150_ADDR0_FLAGS
 
 #define CONFIG_ACCEL_LIS2DWL
 #define CONFIG_ACCEL_LIS2DW_AS_BASE
@@ -174,9 +173,7 @@
 #define CONFIG_CMD_ACCEL_INFO
 #define CONFIG_CMD_ACCELS
 
-#define CONFIG_MAG_BMI_BMM150
-#define CONFIG_MAG_CALIBRATE
-
+#ifdef BOARD_ASURADA
 #define ALS_COUNT 1
 #define CONFIG_ALS_TCS3400
 #define CONFIG_ALS_TCS3400_INT_EVENT \
@@ -184,6 +181,7 @@
 #define CONFIG_ALS_TCS3400_EMULATED_IRQ_EVENT
 
 #define CONFIG_ACCEL_FORCE_MODE_MASK BIT(CLEAR_ALS)
+#endif
 
 /* SPI / Host Command */
 #undef CONFIG_HOSTCMD_DEBUG_MODE
@@ -270,10 +268,11 @@ enum board_sub_board {
 enum sensor_id {
 	BASE_ACCEL = 0,
 	BASE_GYRO,
-	BASE_MAG,
 	LID_ACCEL,
+#ifdef BOARD_ASURADA
 	CLEAR_ALS,
 	RGB_ALS,
+#endif
 	SENSOR_COUNT,
 };
 
diff --git a/board/asurada/gpio.inc b/board/asurada/gpio.inc
index 02458ec518..c1d8413320 100644
--- a/board/asurada/gpio.inc
+++ b/board/asurada/gpio.inc
@@ -33,8 +33,10 @@ GPIO_INT(BASE_IMU_INT_L,     PIN(J, 2), GPIO_INT_FALLING | GPIO_SEL_1P8V,
          bmi160_interrupt)
 GPIO_INT(LID_ACCEL_INT_L,    PIN(J, 3), GPIO_INT_FALLING | GPIO_SEL_1P8V,
          lis2dw12_interrupt)
+#ifdef BOARD_ASURADA
 GPIO_INT(ALS_RGB_INT_ODL,    PIN(F, 0), GPIO_INT_FALLING,
          tcs3400_interrupt)
+#endif
 
 /* USB-C interrupts */
 GPIO_INT(USB_C0_PPC_INT_ODL, PIN(D, 1), GPIO_INT_BOTH, ppc_interrupt)