1 files changed, 25 insertions, 14 deletions

diff --git a/board/metaknight/board.c b/board/metaknight/board.c
index 253ce31571..fc138bbbe2 100644
--- a/board/metaknight/board.c
+++ b/board/metaknight/board.c
@@ -567,8 +567,6 @@ struct motion_sensor_t lsm6dsm_base_accel = {
 	.mutex = &g_base_mutex,
 	.drv_data = LSM6DSM_ST_DATA(lsm6dsm_data,
 			MOTIONSENSE_TYPE_ACCEL),
-	.int_signal = GPIO_BASE_SIXAXIS_INT_L,
-	.flags = MOTIONSENSE_FLAG_INT_SIGNAL,
 	.port = I2C_PORT_SENSOR,
 	.i2c_spi_addr_flags = LSM6DSM_ADDR0_FLAGS,
 	.rot_standard_ref = &base_lsm6dsm_ref,
@@ -597,8 +595,6 @@ struct motion_sensor_t lsm6dsm_base_gyro = {
 	.mutex = &g_base_mutex,
 	.drv_data = LSM6DSM_ST_DATA(lsm6dsm_data,
 			MOTIONSENSE_TYPE_GYRO),
-	.int_signal = GPIO_BASE_SIXAXIS_INT_L,
-	.flags = MOTIONSENSE_FLAG_INT_SIGNAL,
 	.port = I2C_PORT_SENSOR,
 	.i2c_spi_addr_flags = LSM6DSM_ADDR0_FLAGS,
 	.default_range = 1000 | ROUND_UP_FLAG, /* dps */
@@ -878,28 +874,43 @@ void motion_interrupt(enum gpio_signal signal)
 
 const struct i2c_port_t i2c_ports[] = {
 	{
-		"eeprom", I2C_PORT_EEPROM, 400, GPIO_EC_I2C_EEPROM_SCL,
-		GPIO_EC_I2C_EEPROM_SDA
+		.name = "eeprom",
+		.port = I2C_PORT_EEPROM,
+		.kbps = 400,
+		.scl  = GPIO_EC_I2C_EEPROM_SCL,
+		.sda  = GPIO_EC_I2C_EEPROM_SDA
 	},
 
 	{
-		"battery", I2C_PORT_BATTERY, 100, GPIO_EC_I2C_BATTERY_SCL,
-		GPIO_EC_I2C_BATTERY_SDA
+		.name = "battery",
+		.port = I2C_PORT_BATTERY,
+		.kbps = 100,
+		.scl  = GPIO_EC_I2C_BATTERY_SCL,
+		.sda  = GPIO_EC_I2C_BATTERY_SDA
 	},
 
 	{
-		"sensor", I2C_PORT_SENSOR, 400, GPIO_EC_I2C_SENSOR_SCL,
-		GPIO_EC_I2C_SENSOR_SDA
+		.name = "sensor",
+		.port = I2C_PORT_SENSOR,
+		.kbps = 400,
+		.scl  = GPIO_EC_I2C_SENSOR_SCL,
+		.sda  = GPIO_EC_I2C_SENSOR_SDA
 	},
 
 	{
-		"usbc0", I2C_PORT_USB_C0, 1000, GPIO_EC_I2C_USB_C0_SCL,
-		GPIO_EC_I2C_USB_C0_SDA
+		.name = "usbc0",
+		.port = I2C_PORT_USB_C0,
+		.kbps = 1000,
+		.scl  = GPIO_EC_I2C_USB_C0_SCL,
+		.sda  = GPIO_EC_I2C_USB_C0_SDA
 	},
 #if CONFIG_USB_PD_PORT_MAX_COUNT > 1
 	{
-		"sub_usbc1", I2C_PORT_SUB_USB_C1, 1000,
-		GPIO_EC_I2C_SUB_USB_C1_SCL, GPIO_EC_I2C_SUB_USB_C1_SDA
+		.name = "sub_usbc1",
+		.port = I2C_PORT_SUB_USB_C1,
+		.kbps = 1000,
+		.scl  = GPIO_EC_I2C_SUB_USB_C1_SCL,
+		.sda  = GPIO_EC_I2C_SUB_USB_C1_SDA
 	},
 #endif
 };