summaryrefslogtreecommitdiff
path: root/board/scarlet
diff options
context:
space:
mode:
Diffstat (limited to 'board/scarlet')
-rw-r--r--board/scarlet/board.c16
-rw-r--r--board/scarlet/board.h4
2 files changed, 16 insertions, 4 deletions
diff --git a/board/scarlet/board.c b/board/scarlet/board.c
index f109d0ada3..3120ef1efb 100644
--- a/board/scarlet/board.c
+++ b/board/scarlet/board.c
@@ -75,8 +75,20 @@ BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT);
/******************************************************************************/
/* I2C ports */
const struct i2c_port_t i2c_ports[] = {
- {"charger", I2C_PORT_CHARGER, 400, GPIO_I2C0_SCL, GPIO_I2C0_SDA},
- {"tcpc0", I2C_PORT_TCPC0, 1000, GPIO_I2C1_SCL, GPIO_I2C1_SDA},
+ {
+ .name = "charger",
+ .port = I2C_PORT_CHARGER,
+ .kbps = 400,
+ .scl = GPIO_I2C0_SCL,
+ .sda = GPIO_I2C0_SDA
+ },
+ {
+ .name = "tcpc0",
+ .port = I2C_PORT_TCPC0,
+ .kbps = 1000,
+ .scl = GPIO_I2C1_SCL,
+ .sda = GPIO_I2C1_SDA
+ },
};
const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);
diff --git a/board/scarlet/board.h b/board/scarlet/board.h
index f8d1ba7011..8d810d3217 100644
--- a/board/scarlet/board.h
+++ b/board/scarlet/board.h
@@ -10,6 +10,7 @@
/* Free up flash space */
#define CONFIG_DEBUG_ASSERT_BRIEF
+#define CONFIG_LTO
#define CONFIG_USB_PD_DEBUG_LEVEL 0
/* Optional modules */
@@ -61,7 +62,6 @@
#undef CONFIG_HOSTCMD_DEBUG_MODE
#define CONFIG_HOSTCMD_DEBUG_MODE HCDEBUG_OFF
#undef CONFIG_LID_SWITCH
-#undef CONFIG_LTO
#define CONFIG_POWER_BUTTON
#define CONFIG_POWER_BUTTON_IGNORE_LID
#define CONFIG_POWER_TRACK_HOST_SLEEP_STATE
@@ -186,7 +186,7 @@
#define VIRTUAL_BATTERY_ADDR_FLAGS 0x0B
/* Enable Accel over SPI */
-#define CONFIG_SPI_ACCEL_PORT 0 /* The first SPI master port (SPI2) */
+#define CONFIG_SPI_ACCEL_PORT 0 /* The first SPI controller port (SPI2) */
#define CONFIG_MKBP_INPUT_DEVICES
#define CONFIG_MKBP_EVENT