diff options
Diffstat (limited to 'board/cappy2/board.c')
-rw-r--r-- | board/cappy2/board.c | 610 |
1 files changed, 60 insertions, 550 deletions
diff --git a/board/cappy2/board.c b/board/cappy2/board.c index 42d6659072..ba0c4f04e9 100644 --- a/board/cappy2/board.c +++ b/board/cappy2/board.c @@ -3,51 +3,39 @@ * found in the LICENSE file. */ -/* Lalala board-specific configuration */ +/* cappy2 board-specific configuration */ + #include "adc_chip.h" #include "button.h" #include "cbi_fw_config.h" -#include "cbi_ssfc.h" -#include "cbi_fw_config.h" #include "charge_manager.h" #include "charge_state_v2.h" #include "charger.h" -#include "chipset.h" -#include "common.h" -#include "compile_time_macros.h" -#include "driver/accel_bma2x2.h" -#include "driver/accelgyro_bmi_common.h" -#include "driver/accelgyro_icm_common.h" -#include "driver/accelgyro_icm426xx.h" -#include "driver/accel_kionix.h" -#include "driver/temp_sensor/thermistor.h" -#include "temp_sensor.h" #include "driver/bc12/pi3usb9201.h" #include "driver/charger/isl923x.h" #include "driver/tcpm/raa489000.h" -#include "driver/tcpm/tcpci.h" -#include "driver/usb_mux/pi3usb3x532.h" -#include "driver/retimer/ps8802.h" -#include "extpower.h" +#include "driver/temp_sensor/thermistor.h" #include "gpio.h" #include "hooks.h" -#include "i2c.h" -#include "keyboard_config.h" #include "keyboard_raw.h" #include "keyboard_scan.h" #include "lid_switch.h" -#include "motion_sense.h" +#include "math_util.h" #include "power.h" #include "power_button.h" #include "pwm.h" #include "pwm_chip.h" -#include "stdbool.h" #include "switch.h" #include "system.h" #include "tablet_mode.h" #include "task.h" +#include "tcpm/tcpci.h" +#include "temp_sensor.h" +#include "uart.h" +#include "usb_charge.h" #include "usb_mux.h" +#include "usb_mux/ps8743_public.h" #include "usb_pd.h" #include "usb_pd_tcpm.h" @@ -56,66 +44,6 @@ #define INT_RECHECK_US 5000 -#define ADC_VOL_UP_MASK BIT(0) -#define ADC_VOL_DOWN_MASK BIT(1) - -static uint8_t new_adc_key_state; - -static void ps8762_chaddr_deferred(void); -DECLARE_DEFERRED(ps8762_chaddr_deferred); - -/******************************************************************************/ -/* USB-A Configuration */ -const int usb_port_enable[USB_PORT_COUNT] = { - GPIO_EN_USB_A0_VBUS, - GPIO_EN_USB_A1_VBUS, -}; - -/* Keyboard scan setting */ -struct keyboard_scan_config keyscan_config = { - /* - * F3 key scan cycle completed but scan input is not - * charging to logic high when EC start scan next - * column for "T" key, so we set .output_settle_us - * to 80us from 50us. - */ - .output_settle_us = 80, - .debounce_down_us = 9 * MSEC, - .debounce_up_us = 30 * MSEC, - .scan_period_us = 3 * MSEC, - .min_post_scan_delay_us = 1000, - .poll_timeout_us = 100 * MSEC, - .actual_key_mask = { - 0x1c, 0xff, 0xff, 0xff, 0xff, 0xf5, 0xff, - 0xa4, 0xff, 0xfe, 0x55, 0xfe, 0xff, 0xff, 0xff, /* full set */ - }, -}; - -static const struct ec_response_keybd_config lalala_keybd = { - /* Default Chromeos keyboard config */ - .num_top_row_keys = 10, - .action_keys = { - TK_BACK, /* T1 */ - TK_FORWARD, /* T2 */ - TK_REFRESH, /* T3 */ - TK_FULLSCREEN, /* T4 */ - TK_OVERVIEW, /* T5 */ - TK_BRIGHTNESS_DOWN, /* T6 */ - TK_BRIGHTNESS_UP, /* T7 */ - TK_VOL_MUTE, /* T8 */ - TK_VOL_DOWN, /* T9 */ - TK_VOL_UP, /* T10 */ - }, - /* No function keys, no numeric keypad, has screenlock key */ - .capabilities = KEYBD_CAP_SCRNLOCK_KEY, -}; - -__override const struct ec_response_keybd_config -*board_vivaldi_keybd_config(void) -{ - return &lalala_keybd; -} - /* C0 interrupt line shared by BC 1.2 and charger */ static void check_c0_line(void); DECLARE_DEFERRED(check_c0_line); @@ -155,39 +83,13 @@ static void usb_c0_interrupt(enum gpio_signal s) } -/* C1 interrupt line shared by BC 1.2, TCPC, and charger */ -static void check_c1_line(void); -DECLARE_DEFERRED(check_c1_line); - -static void notify_c1_chips(void) +static void c0_ccsbu_ovp_interrupt(enum gpio_signal s) { - schedule_deferred_pd_interrupt(1); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + cprints(CC_USBPD, "C0: CC OVP, SBU OVP, or thermal event"); + pd_handle_cc_overvoltage(0); } -static void check_c1_line(void) -{ - /* - * If line is still being held low, see if there's more to process from - * one of the chips. - */ - if (!gpio_get_level(GPIO_SUB_USB_C1_INT_ODL)) { - notify_c1_chips(); - hook_call_deferred(&check_c1_line_data, INT_RECHECK_US); - } -} - -static void sub_usb_c1_interrupt(enum gpio_signal s) -{ - /* Cancel any previous calls to check the interrupt line */ - hook_call_deferred(&check_c1_line_data, -1); - - /* Notify all chips using this line that an interrupt came in */ - notify_c1_chips(); - - /* Check the line again in 5ms */ - hook_call_deferred(&check_c1_line_data, INT_RECHECK_US); -} +/* Keyboard scan setting */ #include "gpio_list.h" @@ -214,6 +116,13 @@ const struct adc_t adc_channels[] = { .factor_div = ADC_READ_MAX + 1, .shift = 0, }, + [ADC_TEMP_SENSOR_3] = { + .name = "TEMP_SENSOR3", + .input_ch = NPCX_ADC_CH6, + .factor_mul = ADC_MAX_VOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + }, [ADC_VSNS_PP3300_A] = { .name = "PP3300_A_PGOOD", .input_ch = NPCX_ADC_CH9, @@ -224,60 +133,12 @@ const struct adc_t adc_channels[] = { }; BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); -/* Thermistors */ -const struct temp_sensor_t temp_sensors[] = { - [TEMP_SENSOR_1] = {.name = "Memory", - .type = TEMP_SENSOR_TYPE_BOARD, - .read = get_temp_3v3_51k1_47k_4050b, - .idx = ADC_TEMP_SENSOR_1}, - [TEMP_SENSOR_2] = {.name = "Ambient", - .type = TEMP_SENSOR_TYPE_BOARD, - .read = get_temp_3v3_51k1_47k_4050b, - .idx = ADC_TEMP_SENSOR_2}, -}; -BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); - -const static struct ec_thermal_config thermal_a = { - .temp_host = { - [EC_TEMP_THRESH_WARN] = 0, - [EC_TEMP_THRESH_HIGH] = C_TO_K(70), - [EC_TEMP_THRESH_HALT] = C_TO_K(85), - }, - .temp_host_release = { - [EC_TEMP_THRESH_WARN] = 0, - [EC_TEMP_THRESH_HIGH] = C_TO_K(65), - [EC_TEMP_THRESH_HALT] = 0, - }, -}; - -const static struct ec_thermal_config thermal_b = { - .temp_host = { - [EC_TEMP_THRESH_WARN] = 0, - [EC_TEMP_THRESH_HIGH] = C_TO_K(73), - [EC_TEMP_THRESH_HALT] = C_TO_K(85), - }, - .temp_host_release = { - [EC_TEMP_THRESH_WARN] = 0, - [EC_TEMP_THRESH_HIGH] = C_TO_K(65), - [EC_TEMP_THRESH_HALT] = 0, - }, -}; - -struct ec_thermal_config thermal_params[TEMP_SENSOR_COUNT]; - -static void setup_thermal(void) -{ - thermal_params[TEMP_SENSOR_1] = thermal_a; - thermal_params[TEMP_SENSOR_2] = thermal_b; -} - void board_hibernate(void) { /* * Both charger ICs need to be put into their "low power mode" before * entering the Z-state. */ - raa489000_hibernate(1, true); raa489000_hibernate(0, true); } @@ -289,15 +150,6 @@ void board_reset_pd_mcu(void) */ } -static void ps8762_chaddr_deferred(void) -{ - /* Switch PS8762 I2C Address to 0x50*/ - if (ps8802_chg_i2c_addr(I2C_PORT_SUB_USB_C1) == EC_SUCCESS) - CPRINTS("Switch PS8762 address to 0x50 success"); - else - CPRINTS("Switch PS8762 address to 0x50 failed"); -} - __override void board_power_5v_enable(int enable) { /* @@ -306,16 +158,8 @@ __override void board_power_5v_enable(int enable) * polarity on the sub board charger IC. */ gpio_set_level(GPIO_EN_PP5000, !!enable); - if (isl923x_set_comparator_inversion(1, !!enable)) - CPRINTS("Failed to %sable sub rails!", enable ? "en" : "dis"); + gpio_set_level(GPIO_EN_USB_A0_VBUS, !!enable); - if (!enable) - return; - /* - * Port C1 the PP3300_USB_C1 assert, delay 15ms - * colud be accessed PS8762 by I2C. - */ - hook_call_deferred(&ps8762_chaddr_deferred_data, 15 * MSEC); } int board_is_sourcing_vbus(int port) @@ -411,256 +255,6 @@ __override void typec_set_source_current_limit(int port, enum tcpc_rp_value rp) raa489000_set_output_current(port, rp); } -/* Sensors */ -static struct mutex g_lid_mutex; -static struct mutex g_base_mutex; - -/* Matrices to rotate accelerometers into the standard reference. */ -static const mat33_fp_t lid_standard_ref = { - { FLOAT_TO_FP(1), 0, 0}, - { 0, FLOAT_TO_FP(-1), 0}, - { 0, 0, FLOAT_TO_FP(-1)} -}; - -static const mat33_fp_t base_standard_ref = { - { 0, FLOAT_TO_FP(1), 0}, - { FLOAT_TO_FP(1), 0, 0}, - { 0, 0, FLOAT_TO_FP(-1)} -}; - - -/* BMA253 private data */ -static struct accelgyro_saved_data_t g_bma253_data; - -/* BMI160 private data */ -static struct bmi_drv_data_t g_bmi160_data; - -static const mat33_fp_t base_icm_ref = { - { FLOAT_TO_FP(-1), 0, 0}, - { 0, FLOAT_TO_FP(1), 0}, - { 0, 0, FLOAT_TO_FP(-1)} -}; - -/* ICM426 private data */ -static struct icm_drv_data_t g_icm426xx_data; -/* KX022 private data */ -static struct kionix_accel_data g_kx022_data; - -struct motion_sensor_t kx022_lid_accel = { - .name = "Lid Accel", - .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_KX022, - .type = MOTIONSENSE_TYPE_ACCEL, - .location = MOTIONSENSE_LOC_LID, - .drv = &kionix_accel_drv, - .mutex = &g_lid_mutex, - .drv_data = &g_kx022_data, - .port = I2C_PORT_ACCEL, - .i2c_spi_addr_flags = KX022_ADDR0_FLAGS, - .rot_standard_ref = &lid_standard_ref, - .min_frequency = KX022_ACCEL_MIN_FREQ, - .max_frequency = KX022_ACCEL_MAX_FREQ, - .default_range = 2, /* g, to support tablet mode */ - .config = { - /* EC use accel for angle detection */ - [SENSOR_CONFIG_EC_S0] = { - .odr = 10000 | ROUND_UP_FLAG, - }, - /* EC use accel for angle detection */ - [SENSOR_CONFIG_EC_S3] = { - .odr = 10000 | ROUND_UP_FLAG, - }, - }, -}; - -struct motion_sensor_t icm426xx_base_accel = { - .name = "Base Accel", - .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_ICM426XX, - .type = MOTIONSENSE_TYPE_ACCEL, - .location = MOTIONSENSE_LOC_BASE, - .drv = &icm426xx_drv, - .mutex = &g_base_mutex, - .drv_data = &g_icm426xx_data, - .port = I2C_PORT_ACCEL, - .i2c_spi_addr_flags = ICM426XX_ADDR0_FLAGS, - .default_range = 4, /* g, to meet CDD 7.3.1/C-1-4 reqs.*/ - .rot_standard_ref = &base_icm_ref, - .min_frequency = ICM426XX_ACCEL_MIN_FREQ, - .max_frequency = ICM426XX_ACCEL_MAX_FREQ, - .config = { - /* EC use accel for angle detection */ - [SENSOR_CONFIG_EC_S0] = { - .odr = 13000 | ROUND_UP_FLAG, - .ec_rate = 100 * MSEC, - }, - /* EC use accel for angle detection */ - [SENSOR_CONFIG_EC_S3] = { - .odr = 10000 | ROUND_UP_FLAG, - .ec_rate = 100 * MSEC, - }, - }, -}; - -struct motion_sensor_t icm426xx_base_gyro = { - .name = "Base Gyro", - .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_ICM426XX, - .type = MOTIONSENSE_TYPE_GYRO, - .location = MOTIONSENSE_LOC_BASE, - .drv = &icm426xx_drv, - .mutex = &g_base_mutex, - .drv_data = &g_icm426xx_data, - .port = I2C_PORT_ACCEL, - .i2c_spi_addr_flags = ICM426XX_ADDR0_FLAGS, - .default_range = 1000, /* dps */ - .rot_standard_ref = &base_icm_ref, - .min_frequency = ICM426XX_GYRO_MIN_FREQ, - .max_frequency = ICM426XX_GYRO_MAX_FREQ, -}; - -struct motion_sensor_t motion_sensors[] = { - [LID_ACCEL] = { - .name = "Lid Accel", - .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_BMA255, - .type = MOTIONSENSE_TYPE_ACCEL, - .location = MOTIONSENSE_LOC_LID, - .drv = &bma2x2_accel_drv, - .mutex = &g_lid_mutex, - .drv_data = &g_bma253_data, - .port = I2C_PORT_SENSOR, - .i2c_spi_addr_flags = BMA2x2_I2C_ADDR1_FLAGS, - .rot_standard_ref = &lid_standard_ref, - .default_range = 2, - .min_frequency = BMA255_ACCEL_MIN_FREQ, - .max_frequency = BMA255_ACCEL_MAX_FREQ, - .config = { - [SENSOR_CONFIG_EC_S0] = { - .odr = 10000 | ROUND_UP_FLAG, - }, - [SENSOR_CONFIG_EC_S3] = { - .odr = 10000 | ROUND_UP_FLAG, - }, - }, - }, - [BASE_ACCEL] = { - .name = "Base Accel", - .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_BMI160, - .type = MOTIONSENSE_TYPE_ACCEL, - .location = MOTIONSENSE_LOC_BASE, - .drv = &bmi160_drv, - .mutex = &g_base_mutex, - .drv_data = &g_bmi160_data, - .port = I2C_PORT_SENSOR, - .i2c_spi_addr_flags = BMI160_ADDR0_FLAGS, - .rot_standard_ref = &base_standard_ref, - .default_range = 4, - .min_frequency = BMI_ACCEL_MIN_FREQ, - .max_frequency = BMI_ACCEL_MAX_FREQ, - .config = { - [SENSOR_CONFIG_EC_S0] = { - .odr = 13000 | ROUND_UP_FLAG, - .ec_rate = 100 * MSEC, - }, - [SENSOR_CONFIG_EC_S3] = { - .odr = 10000 | ROUND_UP_FLAG, - .ec_rate = 100 * MSEC, - }, - }, - }, - [BASE_GYRO] = { - .name = "Base Gyro", - .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_BMI160, - .type = MOTIONSENSE_TYPE_GYRO, - .location = MOTIONSENSE_LOC_BASE, - .drv = &bmi160_drv, - .mutex = &g_base_mutex, - .drv_data = &g_bmi160_data, - .port = I2C_PORT_SENSOR, - .i2c_spi_addr_flags = BMI160_ADDR0_FLAGS, - .default_range = 1000, /* dps */ - .rot_standard_ref = &base_standard_ref, - .min_frequency = BMI_GYRO_MIN_FREQ, - .max_frequency = BMI_GYRO_MAX_FREQ, - }, -}; - -unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); - -void board_init(void) -{ - int on; - - gpio_enable_interrupt(GPIO_USB_C0_INT_ODL); - gpio_enable_interrupt(GPIO_SUB_USB_C1_INT_ODL); - check_c0_line(); - check_c1_line(); - - /* Enable gpio interrupt for base accelgyro sensor */ - gpio_enable_interrupt(GPIO_BASE_SIXAXIS_INT_L); - if (get_cbi_fw_config_tablet_mode()) { - if (get_cbi_ssfc_base_sensor() == SSFC_SENSOR_ICM426XX) { - motion_sensors[BASE_ACCEL] = icm426xx_base_accel; - motion_sensors[BASE_GYRO] = icm426xx_base_gyro; - cprints(CC_SYSTEM, "BASE GYRO is ICM426XX"); - } else - cprints(CC_SYSTEM, "BASE GYRO is BMI160"); - - if (get_cbi_ssfc_lid_sensor() == SSFC_SENSOR_KX022) { - motion_sensors[LID_ACCEL] = kx022_lid_accel; - cprints(CC_SYSTEM, "LID_ACCEL is KX022"); - } else - cprints(CC_SYSTEM, "LID_ACCEL is BMA253"); - - motion_sensor_count = ARRAY_SIZE(motion_sensors); - /* Enable gpio interrupt for base accelgyro sensor */ - gpio_enable_interrupt(GPIO_BASE_SIXAXIS_INT_L); - } else { - motion_sensor_count = 0; - gmr_tablet_switch_disable(); - /* Base accel is not stuffed, don't allow line to float */ - gpio_set_flags(GPIO_BASE_SIXAXIS_INT_L, - GPIO_INPUT | GPIO_PULL_DOWN); - } - - /* Turn on 5V if the system is on, otherwise turn it off. */ - on = chipset_in_state(CHIPSET_STATE_ON | CHIPSET_STATE_ANY_SUSPEND | - CHIPSET_STATE_SOFT_OFF); - board_power_5v_enable(on); - - /* Initialize THERMAL */ - setup_thermal(); -} -DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); - -void motion_interrupt(enum gpio_signal signal) -{ - switch (get_cbi_ssfc_base_sensor()) { - case SSFC_SENSOR_ICM426XX: - icm426xx_interrupt(signal); - break; - case SSFC_SENSOR_BMI160: - default: - bmi160_interrupt(signal); - break; - } -} - -__override void ocpc_get_pid_constants(int *kp, int *kp_div, - int *ki, int *ki_div, - int *kd, int *kd_div) -{ - *kp = 1; - *kp_div = 20; - *ki = 1; - *ki_div = 250; - *kd = 0; - *kd_div = 1; -} - int pd_snk_is_vbus_provided(int port) { return pd_check_vbus_level(port, VBUS_PRESENT); @@ -672,38 +266,16 @@ const struct charger_config_t chg_chips[] = { .i2c_addr_flags = ISL923X_ADDR_FLAGS, .drv = &isl923x_drv, }, - - { - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = ISL923X_ADDR_FLAGS, - .drv = &isl923x_drv, - }, }; -const unsigned int chg_cnt = ARRAY_SIZE(chg_chips); +/* BC 1.2 chip*/ const struct pi3usb9201_config_t pi3usb9201_bc12_chips[] = { { .i2c_port = I2C_PORT_USB_C0, .i2c_addr_flags = PI3USB9201_I2C_ADDR_3_FLAGS, .flags = PI3USB9201_ALWAYS_POWERED, }, - - { - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = PI3USB9201_I2C_ADDR_3_FLAGS, - .flags = PI3USB9201_ALWAYS_POWERED, - }, -}; - -/* PWM channels. Must be in the exactly same order as in enum pwm_channel. */ -const struct pwm_t pwm_channels[] = { - [PWM_CH_KBLIGHT] = { - .channel = 3, - .flags = PWM_CONFIG_DSLEEP, - .freq = 10000, - }, }; -BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT); const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { { @@ -715,31 +287,15 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { .flags = TCPC_FLAGS_TCPCI_REV2_0, .drv = &raa489000_tcpm_drv, }, - - { - .bus_type = EC_BUS_TYPE_I2C, - .i2c_info = { - .port = I2C_PORT_SUB_USB_C1, - .addr_flags = RAA489000_TCPC0_I2C_FLAGS, - }, - .flags = TCPC_FLAGS_TCPCI_REV2_0, - .drv = &raa489000_tcpm_drv, - }, }; const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { .usb_port = 0, .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = PI3USB3X532_I2C_ADDR0, - .driver = &pi3usb3x532_usb_mux_driver, + .i2c_addr_flags = PS8743_I2C_ADDR0_FLAG, + .driver = &ps8743_usb_mux_driver, }, - { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = PS8802_I2C_ADDR_FLAGS_CUSTOM, - .driver = &ps8802_usb_mux_driver, - } }; uint16_t tcpc_get_alert_status(void) @@ -754,100 +310,54 @@ uint16_t tcpc_get_alert_status(void) */ if (!gpio_get_level(GPIO_USB_C0_INT_ODL)) { if (!tcpc_read16(0, TCPC_REG_ALERT, ®val)) { - /* The TCPCI Rev 1.0 spec says to ignore bits 14:12. */ - if (!(tcpc_config[0].flags & TCPC_FLAGS_TCPCI_REV2_0)) - regval &= ~((1 << 14) | (1 << 13) | (1 << 12)); - if (regval) status |= PD_STATUS_TCPC_ALERT_0; } } - if (!gpio_get_level(GPIO_SUB_USB_C1_INT_ODL)) { - if (!tcpc_read16(1, TCPC_REG_ALERT, ®val)) { - /* TCPCI spec Rev 1.0 says to ignore bits 14:12. */ - if (!(tcpc_config[1].flags & TCPC_FLAGS_TCPCI_REV2_0)) - regval &= ~((1 << 14) | (1 << 13) | (1 << 12)); - - if (regval) - status |= PD_STATUS_TCPC_ALERT_1; - } - } - return status; } -int adc_to_physical_value(enum gpio_signal gpio) +void board_init(void) { - if (gpio == GPIO_VOLUME_UP_L) - return !!(new_adc_key_state & ADC_VOL_UP_MASK); - else if (gpio == GPIO_VOLUME_DOWN_L) - return !!(new_adc_key_state & ADC_VOL_DOWN_MASK); + int on; - CPRINTS("Not a volume up or down key"); - return 0; -} + gpio_enable_interrupt(GPIO_USB_C0_INT_ODL); -int button_is_adc_detected(enum gpio_signal gpio) -{ - return (gpio == GPIO_VOLUME_DOWN_L) || (gpio == GPIO_VOLUME_UP_L); -} + /* + * If interrupt lines are already low, schedule them to be processed + * after inits are completed. + */ + if (!gpio_get_level(GPIO_USB_C0_INT_ODL)) + hook_call_deferred(&check_c0_line_data, 0); -static void adc_vol_key_press_check(void) -{ - int volt = adc_read_channel(ADC_SUB_ANALOG); - static uint8_t old_adc_key_state; - uint8_t adc_key_state_change; - - if (volt > 2400 && volt < 2490) { - /* volume-up is pressed */ - new_adc_key_state = ADC_VOL_UP_MASK; - } else if (volt > 2600 && volt < 2690) { - /* volume-down is pressed */ - new_adc_key_state = ADC_VOL_DOWN_MASK; - } else if (volt < 2290) { - /* both volumn-up and volume-down are pressed */ - new_adc_key_state = ADC_VOL_UP_MASK | ADC_VOL_DOWN_MASK; - } else if (volt > 2700) { - /* both volumn-up and volume-down are released */ - new_adc_key_state = 0; - } - if (new_adc_key_state != old_adc_key_state) { - adc_key_state_change = old_adc_key_state ^ new_adc_key_state; - if (adc_key_state_change && ADC_VOL_UP_MASK) - button_interrupt(GPIO_VOLUME_UP_L); - if (adc_key_state_change && ADC_VOL_DOWN_MASK) - button_interrupt(GPIO_VOLUME_DOWN_L); - - old_adc_key_state = new_adc_key_state; - } -} -DECLARE_HOOK(HOOK_TICK, adc_vol_key_press_check, HOOK_PRIO_DEFAULT); + gpio_enable_interrupt(GPIO_USB_C0_CCSBU_OVP_ODL); -#ifndef TEST_BUILD -/* This callback disables keyboard when convertibles are fully open */ -void lid_angle_peripheral_enable(int enable) -{ - int chipset_in_s0 = chipset_in_state(CHIPSET_STATE_ON); + /* Turn on 5V if the system is on, otherwise turn it off. */ + on = chipset_in_state(CHIPSET_STATE_ON | CHIPSET_STATE_ANY_SUSPEND | + CHIPSET_STATE_SOFT_OFF); + board_power_5v_enable(on); + + /* modify AC DC prochot value */ + isl923x_set_ac_prochot(CHARGER_SOLO, 4096); + isl923x_set_dc_prochot(CHARGER_SOLO, 6000); - /* - * If the lid is in tablet position via other sensors, - * ignore the lid angle, which might be faulty then - * disable keyboard. - */ - if (tablet_get_mode()) - enable = 0; - - if (enable) { - keyboard_scan_enable(1, KB_SCAN_DISABLE_LID_ANGLE); - } else { - /* - * Ensure that the chipset is off before disabling the keyboard. - * When the chipset is on, the EC keeps the keyboard enabled and - * the AP decides whether to ignore input devices or not. - */ - if (!chipset_in_s0) - keyboard_scan_enable(0, KB_SCAN_DISABLE_LID_ANGLE); - } } -#endif +DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); + +/* Thermistors */ +const struct temp_sensor_t temp_sensors[] = { + [TEMP_SENSOR_1] = {.name = "Memory", + .type = TEMP_SENSOR_TYPE_BOARD, + .read = get_temp_3v3_51k1_47k_4050b, + .idx = ADC_TEMP_SENSOR_1}, + [TEMP_SENSOR_2] = {.name = "Ambient", + .type = TEMP_SENSOR_TYPE_BOARD, + .read = get_temp_3v3_51k1_47k_4050b, + .idx = ADC_TEMP_SENSOR_2}, + [TEMP_SENSOR_3] = {.name = "Cpu", + .type = TEMP_SENSOR_TYPE_BOARD, + .read = get_temp_3v3_51k1_47k_4050b, + .idx = ADC_TEMP_SENSOR_3}, +}; +BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); |