diff options
Diffstat (limited to 'board/morphius/board.c')
| -rw-r--r-- | board/morphius/board.c | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/board/morphius/board.c b/board/morphius/board.c index 48712ffb0c..d9717bbe05 100644 --- a/board/morphius/board.c +++ b/board/morphius/board.c @@ -246,9 +246,9 @@ const struct pi3hdx1204_tuning pi3hdx1204_tuning = { /***************************************************************************** * Base Gyro Sensor dynamic configuration */ -static enum ec_cfg_base_gyro_sensor_type base_gyro_config; +static enum ec_ssfc_base_gyro_sensor base_gyro_config = SSFC_BASE_GYRO_NONE; -enum ec_cfg_base_gyro_sensor_type get_base_gyro_sensor(void) +enum ec_ssfc_base_gyro_sensor get_base_gyro_sensor(void) { switch (get_cbi_ssfc_base_sensor()) { case SSFC_BASE_GYRO_NONE: @@ -263,10 +263,10 @@ static void setup_base_gyro_config(void) base_gyro_config = get_base_gyro_sensor(); switch (base_gyro_config) { - case BASE_GYRO_BMI160: + case SSFC_BASE_GYRO_BMI160: ccprints("BASE GYRO is BMI160"); break; - case BASE_GYRO_ICM426XX: + case SSFC_BASE_GYRO_ICM426XX: motion_sensors[BASE_ACCEL] = icm426xx_base_accel; motion_sensors[BASE_GYRO] = icm426xx_base_gyro; ccprints("BASE GYRO is ICM426XX"); @@ -279,10 +279,10 @@ static void setup_base_gyro_config(void) void motion_interrupt(enum gpio_signal signal) { switch (base_gyro_config) { - case BASE_GYRO_BMI160: + case SSFC_BASE_GYRO_BMI160: bmi160_interrupt(signal); break; - case BASE_GYRO_ICM426XX: + case SSFC_BASE_GYRO_ICM426XX: icm426xx_interrupt(signal); break; default: @@ -383,7 +383,7 @@ static void setup_v0_charger(void) */ DECLARE_HOOK(HOOK_INIT, setup_v0_charger, HOOK_PRIO_INIT_I2C); -enum gpio_signal board_usbc_port_to_hpd_gpio(int port) +int board_usbc_port_to_hpd_gpio_or_ioex(int port) { /* USB-C0 always uses USB_C0_HPD (= DP3_HPD). */ if (port == 0) @@ -581,17 +581,20 @@ const struct temp_sensor_t temp_sensors[] = { }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); -const static struct ec_thermal_config thermal_cpu = { - .temp_host = { - [EC_TEMP_THRESH_HIGH] = C_TO_K(90), - [EC_TEMP_THRESH_HALT] = C_TO_K(105), - }, - .temp_host_release = { - [EC_TEMP_THRESH_HIGH] = C_TO_K(80), - }, - .temp_fan_off = C_TO_K(98), - .temp_fan_max = C_TO_K(99), -}; +/* + * TODO(b/202062363): Remove when clang is fixed. + */ +#define THERMAL_CPU \ + { \ + .temp_host = { \ + [EC_TEMP_THRESH_HIGH] = C_TO_K(90), \ + [EC_TEMP_THRESH_HALT] = C_TO_K(105), \ + }, \ + .temp_host_release = { \ + [EC_TEMP_THRESH_HIGH] = C_TO_K(80), \ + }, \ + } +__maybe_unused static const struct ec_thermal_config thermal_cpu = THERMAL_CPU; struct ec_thermal_config thermal_params[TEMP_SENSOR_COUNT]; |