diff options
Diffstat (limited to 'board/shotzo/board.c')
| -rw-r--r-- | board/shotzo/board.c | 791 |
1 files changed, 247 insertions, 544 deletions
diff --git a/board/shotzo/board.c b/board/shotzo/board.c index a7cd45c7c6..dea75ee7d2 100644 --- a/board/shotzo/board.c +++ b/board/shotzo/board.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The ChromiumOS Authors. +/* Copyright 2022 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -8,16 +8,12 @@ #include "adc_chip.h" #include "button.h" #include "cbi_fw_config.h" -#include "cbi_ssfc.h" #include "charge_manager.h" #include "charge_state_v2.h" #include "charger.h" #include "cros_board_info.h" -#include "driver/accel_bma2x2.h" -#include "driver/accel_bma422.h" -#include "driver/accelgyro_lsm6dsm.h" -#include "driver/bc12/pi3usb9201.h" #include "driver/charger/sm5803.h" +#include "driver/led/oz554.h" #include "driver/temp_sensor/thermistor.h" #include "driver/tcpm/it83xx_pd.h" #include "driver/tcpm/ps8xxx.h" @@ -25,25 +21,19 @@ #include "gpio.h" #include "hooks.h" #include "intc.h" -#include "keyboard_scan.h" -#include "lid_switch.h" #include "power.h" #include "power_button.h" -#include "pwm.h" -#include "pwm_chip.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_pd.h" #include "usb_pd_tcpm.h" -#define CPRINTUSB(format, args...) cprints(CC_USBCHARGE, format, ## args) +#define CPRINTUSB(format, args...) cprints(CC_USBCHARGE, format, ##args) #define INT_RECHECK_US 5000 @@ -54,28 +44,12 @@ const int usb_port_enable[USB_PORT_COUNT] = { GPIO_EN_USB_A_5V, }; -__override void board_process_pd_alert(int port) -{ - /* - * PD_INT task will process this alert, and that task is only needed on - * C1. - */ - if (port != 1) - return; - - if (gpio_get_level(GPIO_USB_C1_INT_ODL)) - return; - - sm5803_handle_interrupt(port); -} - -/* C0 interrupt line shared by BC 1.2 and charger */ +/* C0 interrupt line triggered by charger */ static void check_c0_line(void); DECLARE_DEFERRED(check_c0_line); static void notify_c0_chips(void) { - usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); sm5803_interrupt(0); } @@ -103,337 +77,196 @@ static void usb_c0_interrupt(enum gpio_signal s) hook_call_deferred(&check_c0_line_data, INT_RECHECK_US); } -/* 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); - usb_charger_task_set_event(1, 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_USB_C1_INT_ODL)) { - notify_c1_chips(); - hook_call_deferred(&check_c1_line_data, INT_RECHECK_US); - } -} +/******************************************************************************/ +/* + * Barrel jack power supply handling + * + * EN_PPVAR_BJ_ADP_L must default active to ensure we can power on when the + * barrel jack is connected, and the USB-C port can bring the EC up fine in + * dead-battery mode. Both the USB-C and barrel jack switches do reverse + * protection, so we're safe to turn one on then the other off- but we should + * only do that if the system is off since it might still brown out. + */ -static void usb_c1_interrupt(enum gpio_signal s) +static int barrel_jack_adapter_is_present(void) { - /* Cancel any previous calls to check the interrupt line */ - hook_call_deferred(&check_c1_line_data, -1); + /* Shotzo barrel jack adapter present pin is active low. */ + return !gpio_get_level(GPIO_BJ_ADP_PRESENT_L); +} - /* Notify all chips using this line that an interrupt came in */ - notify_c1_chips(); +/* + * Barrel-jack power adapter ratings. + */ - /* Check the line again in 5ms */ - hook_call_deferred(&check_c1_line_data, INT_RECHECK_US); -} +#define BJ_ADP_RATING_DEFAULT 0 /* BJ power ratings default */ +static const struct { + int voltage; + int current; +} bj_power[] = { + { /* 0 - 90W (also default) */ + .voltage = 19500, + .current = 4500 }, +}; -static void board_enable_hdmi_hpd(int enable) +/* Debounced connection state of the barrel jack */ +static int8_t adp_connected = -1; +static void adp_connect_deferred(void) { - enum fw_config_db db = get_cbi_fw_config_db(); - int hdmi_hpd = gpio_get_level(GPIO_VOLUP_BTN_ODL_HDMI_HPD); - - if (db == DB_1A_HDMI || db == DB_LTE_HDMI || db == DB_1A_HDMI_LTE) { - /* Check if we can report HDMI_HPD signal to CPU */ - if (enable) - gpio_set_level(GPIO_EC_AP_USB_C1_HDMI_HPD, hdmi_hpd); - else - gpio_set_level(GPIO_EC_AP_USB_C1_HDMI_HPD, 0); + struct charge_port_info pi = { 0 }; + int connected = barrel_jack_adapter_is_present(); + + /* Debounce */ + if (connected == adp_connected) + return; + if (connected) { + unsigned int bj = BJ_ADP_RATING_DEFAULT; + + pi.voltage = bj_power[bj].voltage; + pi.current = bj_power[bj].current; } + charge_manager_update_charge(CHARGE_SUPPLIER_DEDICATED, + DEDICATED_CHARGE_PORT, &pi); + adp_connected = connected; } +DECLARE_DEFERRED(adp_connect_deferred); -static void button_sub_hdmi_hpd_interrupt(enum gpio_signal s) +#define ADP_DEBOUNCE_MS 1000 /* Debounce time for BJ plug/unplug */ +/* IRQ for BJ plug/unplug. It shouldn't be called if BJ is the power source. */ +static void adp_connect_interrupt(enum gpio_signal signal) { - enum fw_config_db db = get_cbi_fw_config_db(); - int hdmi_hpd = gpio_get_level(GPIO_VOLUP_BTN_ODL_HDMI_HPD); - - if (db == DB_1A_HDMI || db == DB_LTE_HDMI || db == DB_1A_HDMI_LTE) { - /* Do not report HDMI_HPD signal to CPU when system off. */ - if (!chipset_in_state(CHIPSET_STATE_ANY_OFF)) - gpio_set_level(GPIO_EC_AP_USB_C1_HDMI_HPD, hdmi_hpd); - } else - button_interrupt(s); + hook_call_deferred(&adp_connect_deferred_data, ADP_DEBOUNCE_MS * MSEC); } - -static void c0_ccsbu_ovp_interrupt(enum gpio_signal s) +static void adp_state_init(void) { - cprints(CC_USBPD, "C0: CC OVP, SBU OVP, or thermal event"); - pd_handle_cc_overvoltage(0); -} - -static void pen_detect_interrupt(enum gpio_signal s) -{ - int pen_detect = !gpio_get_level(GPIO_PEN_DET_ODL); + /* + * Initialize all charge suppliers to 0. The charge manager waits until + * all ports have reported in before doing anything. + */ + for (int i = 0; i < CHARGE_PORT_COUNT; i++) { + for (int j = 0; j < CHARGE_SUPPLIER_COUNT; j++) + charge_manager_update_charge(j, i, NULL); + } - gpio_set_level(GPIO_EN_PP5000_PEN, pen_detect); + /* Report charge state from the barrel jack. */ + adp_connect_deferred(); } +DECLARE_HOOK(HOOK_INIT, adp_state_init, HOOK_PRIO_INIT_CHARGE_MANAGER + 1); /* Must come after other header files and interrupt handler declarations */ #include "gpio_list.h" /* ADC channels */ const struct adc_t adc_channels[] = { - [ADC_VSNS_PP3300_A] = { - .name = "PP3300_A_PGOOD", - .factor_mul = ADC_MAX_MVOLT, - .factor_div = ADC_READ_MAX + 1, - .shift = 0, - .channel = CHIP_ADC_CH0 - }, - [ADC_TEMP_SENSOR_1] = { - .name = "TEMP_SENSOR1", - .factor_mul = ADC_MAX_MVOLT, - .factor_div = ADC_READ_MAX + 1, - .shift = 0, - .channel = CHIP_ADC_CH2 - }, - [ADC_TEMP_SENSOR_2] = { - .name = "TEMP_SENSOR2", - .factor_mul = ADC_MAX_MVOLT, - .factor_div = ADC_READ_MAX + 1, - .shift = 0, - .channel = CHIP_ADC_CH3 - }, - [ADC_SUB_ANALOG] = { - .name = "SUB_ANALOG", - .factor_mul = ADC_MAX_MVOLT, - .factor_div = ADC_READ_MAX + 1, - .shift = 0, - .channel = CHIP_ADC_CH13 - }, - [ADC_TEMP_SENSOR_3] = { - .name = "TEMP_SENSOR3", - .factor_mul = ADC_MAX_MVOLT, - .factor_div = ADC_READ_MAX + 1, - .shift = 0, - .channel = CHIP_ADC_CH15 - }, - [ADC_TEMP_SENSOR_4] = { - .name = "TEMP_SENSOR4", - .factor_mul = ADC_MAX_MVOLT, - .factor_div = ADC_READ_MAX + 1, - .shift = 0, - .channel = CHIP_ADC_CH16 - }, + [ADC_VSNS_PP3300_A] = { .name = "PP3300_A_PGOOD", + .factor_mul = ADC_MAX_MVOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + .channel = CHIP_ADC_CH0 }, + [ADC_TEMP_SENSOR_1] = { .name = "TEMP_SENSOR1", + .factor_mul = ADC_MAX_MVOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + .channel = CHIP_ADC_CH2 }, + [ADC_TEMP_SENSOR_2] = { .name = "TEMP_SENSOR2", + .factor_mul = ADC_MAX_MVOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + .channel = CHIP_ADC_CH3 }, + [ADC_SUB_ANALOG] = { .name = "SUB_ANALOG", + .factor_mul = ADC_MAX_MVOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + .channel = CHIP_ADC_CH13 }, + [ADC_TEMP_SENSOR_3] = { .name = "TEMP_SENSOR3", + .factor_mul = ADC_MAX_MVOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + .channel = CHIP_ADC_CH15 }, + [ADC_TEMP_SENSOR_4] = { .name = "TEMP_SENSOR4", + .factor_mul = ADC_MAX_MVOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + .channel = CHIP_ADC_CH16 }, }; BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); -/* BC 1.2 chips */ -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, - }, -}; - /* Charger chips */ -const struct charger_config_t chg_chips[] = { - [CHARGER_PRIMARY] = { - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = SM5803_ADDR_CHARGER_FLAGS, - .drv = &sm5803_drv, - }, - [CHARGER_SECONDARY] = { - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = SM5803_ADDR_CHARGER_FLAGS, - .drv = &sm5803_drv, - }, -}; +const struct charger_config_t + chg_chips[] = { [CHARGER_SOLO] = { + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = SM5803_ADDR_CHARGER_FLAGS, + .drv = &sm5803_drv, + } }; /* TCPCs */ -const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { - { - .bus_type = EC_BUS_TYPE_EMBEDDED, - .drv = &it83xx_tcpm_drv, - }, - { - .bus_type = EC_BUS_TYPE_I2C, - .i2c_info = { - .port = I2C_PORT_SUB_USB_C1, - .addr_flags = PS8XXX_I2C_ADDR1_FLAGS, - }, - .drv = &ps8xxx_tcpm_drv, - }, -}; +const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { { + .bus_type = EC_BUS_TYPE_EMBEDDED, + .drv = &it83xx_tcpm_drv, +} }; /* USB Muxes */ -const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { - { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, - }, - { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = PS8XXX_I2C_ADDR1_FLAGS, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, - }, -}; - -/* Sensor Mutexes */ -static struct mutex g_lid_mutex; -static struct mutex g_base_mutex; - -/* Sensor Data */ -static struct accelgyro_saved_data_t g_bma253_data; -static struct accelgyro_saved_data_t g_bma422_data; -static struct lsm6dsm_data lsm6dsm_data = LSM6DSM_DATA; - -/* Matrix to rotate accelrator into standard reference frame */ -static const mat33_fp_t base_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 lid_standard_ref = { - { FLOAT_TO_FP(1), 0, 0}, - { 0, FLOAT_TO_FP(-1), 0}, - { 0, 0, FLOAT_TO_FP(-1)} -}; - -/* Drivers */ -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_LSM6DSM, - .type = MOTIONSENSE_TYPE_ACCEL, - .location = MOTIONSENSE_LOC_BASE, - .drv = &lsm6dsm_drv, - .mutex = &g_base_mutex, - .drv_data = LSM6DSM_ST_DATA(lsm6dsm_data, - MOTIONSENSE_TYPE_ACCEL), - .port = I2C_PORT_SENSOR, - .i2c_spi_addr_flags = LSM6DSM_ADDR0_FLAGS, - .rot_standard_ref = &base_standard_ref, - .default_range = 4, /* g */ - .min_frequency = LSM6DSM_ODR_MIN_VAL, - .max_frequency = LSM6DSM_ODR_MAX_VAL, - .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, - }, +const struct usb_mux_chain usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { + .mux = + &(const struct usb_mux){ + .usb_port = 0, + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, + .driver = &it5205_usb_mux_driver, }, - }, - [BASE_GYRO] = { - .name = "Base Gyro", - .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_LSM6DSM, - .type = MOTIONSENSE_TYPE_GYRO, - .location = MOTIONSENSE_LOC_BASE, - .drv = &lsm6dsm_drv, - .mutex = &g_base_mutex, - .drv_data = LSM6DSM_ST_DATA(lsm6dsm_data, - MOTIONSENSE_TYPE_GYRO), - .port = I2C_PORT_SENSOR, - .i2c_spi_addr_flags = LSM6DSM_ADDR0_FLAGS, - .default_range = 1000 | ROUND_UP_FLAG, /* dps */ - .rot_standard_ref = &base_standard_ref, - .min_frequency = LSM6DSM_ODR_MIN_VAL, - .max_frequency = LSM6DSM_ODR_MAX_VAL, - }, -}; +} }; -unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); - -struct motion_sensor_t bma422_lid_accel = { - .name = "Lid Accel", - .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_BMA422, - .type = MOTIONSENSE_TYPE_ACCEL, - .location = MOTIONSENSE_LOC_LID, - .drv = &bma4_accel_drv, - .mutex = &g_lid_mutex, - .drv_data = &g_bma422_data, - .port = I2C_PORT_SENSOR, - .i2c_spi_addr_flags = BMA4_I2C_ADDR_PRIMARY, - .rot_standard_ref = &lid_standard_ref, - .default_range = 2, - .min_frequency = BMA4_ACCEL_MIN_FREQ, - .max_frequency = BMA4_ACCEL_MAX_FREQ, - .config = { - /* EC use accel for angle detection */ - [SENSOR_CONFIG_EC_S0] = { - .odr = 12500 | ROUND_UP_FLAG, - .ec_rate = 100 * MSEC, - }, - /* Sensor on in S3 */ - [SENSOR_CONFIG_EC_S3] = { - .odr = 12500 | ROUND_UP_FLAG, - .ec_rate = 0, - }, - }, -}; - -static void board_update_motion_sensor_config(void) +void oz554_board_init(void) { - if (get_cbi_ssfc_lid_sensor() == SSFC_SENSOR_BMA422) - motion_sensors[LID_ACCEL] = bma422_lid_accel; + int panel_id = 0; + int oz554_id; + + oz554_id = gpio_get_level(GPIO_BL_OZ554_ID); + panel_id |= gpio_get_level(GPIO_PANEL_ID0) << 0; + panel_id |= gpio_get_level(GPIO_PANEL_ID1) << 1; + panel_id |= gpio_get_level(GPIO_PANEL_ID2) << 2; + panel_id |= gpio_get_level(GPIO_PANEL_ID3) << 3; + + if (oz554_id == 0) + CPRINTUSB("OZ554ELN"); + else if (oz554_id == 1) + CPRINTUSB("OZ554ALN"); + else + CPRINTUSB("OZ554A UNKNOWN"); + + switch (panel_id) { + case 0x00: + CPRINTUSB("PANEL M238HAN"); + oz554_set_config(0, 0xF1); + oz554_set_config(1, 0x43); + oz554_set_config(2, 0x44); + oz554_set_config(5, 0xBF); + break; + case 0x08: + CPRINTUSB("PANEL MV238FHM"); + oz554_set_config(0, 0xF1); + oz554_set_config(1, 0x43); + oz554_set_config(2, 0x3C); + oz554_set_config(5, 0xD7); + break; + default: + CPRINTUSB("PANEL UNKNOWN"); + break; + } } void board_init(void) { int on; - enum fw_config_db db = get_cbi_fw_config_db(); - - if (db == DB_1A_HDMI || db == DB_LTE_HDMI || db == DB_1A_HDMI_LTE) { - /* Select HDMI option */ - gpio_set_level(GPIO_HDMI_SEL_L, 0); - } else { - /* Select AUX option */ - gpio_set_level(GPIO_HDMI_SEL_L, 1); - } + + gpio_enable_interrupt(GPIO_BJ_ADP_PRESENT_L); gpio_enable_interrupt(GPIO_USB_C0_INT_ODL); - gpio_enable_interrupt(GPIO_USB_C1_INT_ODL); /* Store board version for use in determining charge limits */ cbi_get_board_version(&board_version); @@ -444,42 +277,15 @@ void board_init(void) */ if (!gpio_get_level(GPIO_USB_C0_INT_ODL)) hook_call_deferred(&check_c0_line_data, 0); - if (!gpio_get_level(GPIO_USB_C1_INT_ODL)) - hook_call_deferred(&check_c1_line_data, 0); gpio_enable_interrupt(GPIO_USB_C0_CCSBU_OVP_ODL); - if (get_cbi_fw_config_tablet_mode() == TABLET_MODE_PRESENT) { - motion_sensor_count = ARRAY_SIZE(motion_sensors); - /* Enable Base Accel interrupt */ - gpio_enable_interrupt(GPIO_BASE_SIXAXIS_INT_L); - - board_update_motion_sensor_config(); - } 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); - } - - gpio_enable_interrupt(GPIO_PEN_DET_ODL); - - /* Make sure pen detection is triggered or not at sysjump */ - if (!gpio_get_level(GPIO_PEN_DET_ODL)) - gpio_set_level(GPIO_EN_PP5000_PEN, 1); - - /* Make sure HDMI_HPD signal can be reported to CPU at sysjump */ - board_enable_hdmi_hpd(1); + oz554_board_init(); + gpio_enable_interrupt(GPIO_PANEL_BACKLIGHT_EN); /* Charger on the MB will be outputting PROCHOT_ODL and OD CHG_DET */ - sm5803_configure_gpio0(CHARGER_PRIMARY, GPIO0_MODE_PROCHOT, 1); - sm5803_configure_chg_det_od(CHARGER_PRIMARY, 1); - - if (board_get_charger_chip_count() > 1) { - /* Charger on the sub-board will be a push-pull GPIO */ - sm5803_configure_gpio0(CHARGER_SECONDARY, GPIO0_MODE_OUTPUT, 0); - } + sm5803_configure_gpio0(CHARGER_SOLO, GPIO0_MODE_PROCHOT, 1); + sm5803_configure_chg_det_od(CHARGER_SOLO, 1); /* Turn on 5V if the system is on, otherwise turn it off */ on = chipset_in_state(CHIPSET_STATE_ON | CHIPSET_STATE_ANY_SUSPEND | @@ -490,47 +296,21 @@ DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); static void board_resume(void) { - sm5803_disable_low_power_mode(CHARGER_PRIMARY); - if (board_get_charger_chip_count() > 1) - sm5803_disable_low_power_mode(CHARGER_SECONDARY); - - /* Enable reporting HDMI_HPD to CPU when system resume */ - board_enable_hdmi_hpd(1); + sm5803_disable_low_power_mode(CHARGER_SOLO); } DECLARE_HOOK(HOOK_CHIPSET_RESUME, board_resume, HOOK_PRIO_DEFAULT); static void board_suspend(void) { - sm5803_enable_low_power_mode(CHARGER_PRIMARY); - if (board_get_charger_chip_count() > 1) - sm5803_enable_low_power_mode(CHARGER_SECONDARY); + sm5803_enable_low_power_mode(CHARGER_SOLO); } DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, board_suspend, HOOK_PRIO_DEFAULT); static void board_shutdown(void) { - /* Disable reporting HDMI_HPD to CPU at shutdown */ - board_enable_hdmi_hpd(0); } DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, board_shutdown, HOOK_PRIO_DEFAULT); -void board_hibernate(void) -{ - /* - * Put all charger ICs present into low power mode before entering - * z-state. - */ - sm5803_hibernate(CHARGER_PRIMARY); - if (board_get_charger_chip_count() > 1) - sm5803_hibernate(CHARGER_SECONDARY); -} - -__override void board_ocpc_init(struct ocpc_data *ocpc) -{ - /* There's no provision to measure Isys */ - ocpc->chg_flags[CHARGER_SECONDARY] |= OCPC_NO_ISYS_MEAS_CAP; -} - __override void board_pulse_entering_rw(void) { /* @@ -549,8 +329,7 @@ __override void board_pulse_entering_rw(void) void board_reset_pd_mcu(void) { /* - * Nothing to do. TCPC C0 is internal, TCPC C1 reset pin is not - * connected to the EC. + * Nothing to do. TCPC C0 is internal. */ } @@ -561,111 +340,104 @@ __override void board_power_5v_enable(int enable) * sets it through the charger GPIO. */ gpio_set_level(GPIO_EN_PP5000, !!enable); - - if (board_get_charger_chip_count() > 1) { - if (sm5803_set_gpio0_level(1, !!enable)) - CPRINTUSB("Failed to %sable sub rails!", enable ? - "en" : "dis"); - } } -__override uint8_t board_get_usb_pd_port_count(void) +uint16_t tcpc_get_alert_status(void) { - enum fw_config_db db = get_cbi_fw_config_db(); - - if (db == DB_1A_HDMI || db == DB_NONE || db == DB_LTE_HDMI - || db == DB_1A_HDMI_LTE) - return CONFIG_USB_PD_PORT_MAX_COUNT - 1; - else if (db == DB_1C || db == DB_1C_LTE || db == DB_1C_1A - || db == DB_1C_1A_LTE) - return CONFIG_USB_PD_PORT_MAX_COUNT; - - ccprints("Unhandled DB configuration: %d", db); + /* + * TCPC 0 is embedded in the EC and processes interrupts in the chip + * code (it83xx/intc.c) + */ return 0; } -__override uint8_t board_get_charger_chip_count(void) +void board_set_charge_limit(int port, int supplier, int charge_ma, int max_ma, + int charge_mv) { - enum fw_config_db db = get_cbi_fw_config_db(); - - if (db == DB_1A_HDMI || db == DB_NONE || db == DB_LTE_HDMI - || db == DB_1A_HDMI_LTE) - return CHARGER_NUM - 1; - else if (db == DB_1C || db == DB_1C_LTE || db == DB_1C_1A - || db == DB_1C_1A_LTE) - return CHARGER_NUM; - - ccprints("Unhandled DB configuration: %d", db); - return 0; + if (port == CHARGER_SOLO) { + charger_set_input_current_limit(CHARGER_SOLO, max_ma); + } } -uint16_t tcpc_get_alert_status(void) +__override int extpower_is_present(void) { - /* - * TCPC 0 is embedded in the EC and processes interrupts in the chip - * code (it83xx/intc.c) - */ + int port; + int rv; + bool acok; + + for (port = 0; port < board_get_usb_pd_port_count(); port++) { + rv = sm5803_is_acok(port, &acok); + if ((rv == EC_SUCCESS) && acok) + return 1; + } - uint16_t status = 0; - int regval; + if (!gpio_get_level(GPIO_EN_PPVAR_BJ_ADP_L)) + return 1; - /* Check whether TCPC 1 pulled the shared interrupt line */ - if (!gpio_get_level(GPIO_USB_C1_INT_ODL)) { - if (!tcpc_read16(1, TCPC_REG_ALERT, ®val)) { - if (regval) - status = PD_STATUS_TCPC_ALERT_1; - } - } + CPRINTUSB("No external power present."); - return status; + return 0; } -void board_set_charge_limit(int port, int supplier, int charge_ma, int max_ma, - int charge_mv) +int board_set_active_charge_port(int port) { - int icl = MAX(charge_ma, CONFIG_CHARGER_INPUT_CURRENT); + CPRINTUSB("Requested charge port change to %d", port); - /* Limit C1 on board version 0 to 2.0 A */ - if ((board_version == 0) && (port == 1)) - icl = MIN(icl, 2000); /* - * TODO(b/151955431): Characterize the input current limit in case a - * scaling needs to be applied here + * The charge manager may ask us to switch to no charger if we're + * running off USB-C only but upstream doesn't support PD. It requires + * that we accept this switch otherwise it triggers an assert and EC + * reset; it's not possible to boot the AP anyway, but we want to avoid + * resetting the EC so we can continue to do the "low power" LED blink. */ - charge_set_input_current_limit(icl, charge_mv); -} - -int board_set_active_charge_port(int port) -{ - int is_valid_port = (port >= 0 && port < board_get_usb_pd_port_count()); + if (port == CHARGE_PORT_NONE) + return EC_SUCCESS; - if (!is_valid_port && port != CHARGE_PORT_NONE) + if (port < 0 || CHARGE_PORT_COUNT <= port) return EC_ERROR_INVAL; - if (port == CHARGE_PORT_NONE) { - CPRINTUSB("Disabling all charge ports"); + if (port == charge_manager_get_active_charge_port()) + return EC_SUCCESS; - sm5803_vbus_sink_enable(CHARGER_PRIMARY, 0); + /* Don't charge from a source port */ + if (board_vbus_source_enabled(port)) + return EC_ERROR_INVAL; - if (board_get_charger_chip_count() > 1) - sm5803_vbus_sink_enable(CHARGER_SECONDARY, 0); + if (!chipset_in_state(CHIPSET_STATE_ANY_OFF)) { + int bj_active, bj_requested; - return EC_SUCCESS; - } + if (charge_manager_get_active_charge_port() != CHARGE_PORT_NONE) + /* Change is only permitted while the system is off */ + return EC_ERROR_INVAL; - CPRINTUSB("New chg p%d", port); + /* + * Current setting is no charge port but the AP is on, so the + * charge manager is out of sync (probably because we're + * reinitializing after sysjump). Reject requests that aren't + * in sync with our outputs. + */ + bj_active = !gpio_get_level(GPIO_EN_PPVAR_BJ_ADP_L); + bj_requested = port == CHARGE_PORT_BARRELJACK; + if (bj_active != bj_requested) + return EC_ERROR_INVAL; + } - /* - * Ensure other port is turned off, then enable new charge port - */ - if (port == 0) { - if (board_get_charger_chip_count() > 1) - sm5803_vbus_sink_enable(CHARGER_SECONDARY, 0); - sm5803_vbus_sink_enable(CHARGER_PRIMARY, 1); - - } else { - sm5803_vbus_sink_enable(CHARGER_PRIMARY, 0); - sm5803_vbus_sink_enable(CHARGER_SECONDARY, 1); + CPRINTUSB("New charger p%d", port); + + switch (port) { + case CHARGE_PORT_TYPEC0: + sm5803_vbus_sink_enable(CHARGER_SOLO, 1); + gpio_set_level(GPIO_EN_PPVAR_BJ_ADP_L, 1); + break; + case CHARGE_PORT_BARRELJACK: + /* Make sure BJ adapter is sourcing power */ + if (!barrel_jack_adapter_is_present()) + return EC_ERROR_INVAL; + gpio_set_level(GPIO_EN_PPVAR_BJ_ADP_L, 0); + sm5803_vbus_sink_enable(CHARGER_SOLO, 0); + break; + default: + return EC_ERROR_INVAL; } return EC_SUCCESS; @@ -696,92 +468,23 @@ __override void typec_set_source_current_limit(int port, enum tcpc_rp_value rp) charger_set_otg_current_voltage(port, current, 5000); } -/* PWM channels. Must be in the exactly same order as in enum pwm_channel. */ -const struct pwm_t pwm_channels[] = { - [PWM_CH_KBLIGHT] = { - .channel = 0, - .flags = PWM_CONFIG_DSLEEP, - .freq_hz = 10000, - } -}; -BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_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}, - [TEMP_SENSOR_3] = {.name = "Charger", - .type = TEMP_SENSOR_TYPE_BOARD, - .read = get_temp_3v3_51k1_47k_4050b, - .idx = ADC_TEMP_SENSOR_3}, - [TEMP_SENSOR_4] = {.name = "5V regular", - .type = TEMP_SENSOR_TYPE_BOARD, - .read = get_temp_3v3_51k1_47k_4050b, - .idx = ADC_TEMP_SENSOR_4}, + [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 = "Charger", + .type = TEMP_SENSOR_TYPE_BOARD, + .read = get_temp_3v3_51k1_47k_4050b, + .idx = ADC_TEMP_SENSOR_3 }, + [TEMP_SENSOR_4] = { .name = "5V regular", + .type = TEMP_SENSOR_TYPE_BOARD, + .read = get_temp_3v3_51k1_47k_4050b, + .idx = ADC_TEMP_SENSOR_4 }, }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); - -/* This callback disables keyboard when convertibles are fully open */ -__override void lid_angle_peripheral_enable(int enable) -{ - int chipset_in_s0 = chipset_in_state(CHIPSET_STATE_ON); - - /* - * 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); - } -} - -__override void ocpc_get_pid_constants(int *kp, int *kp_div, - int *ki, int *ki_div, - int *kd, int *kd_div) -{ - *kp = 3; - *kp_div = 20; - - *ki = 3; - *ki_div = 125; - - *kd = 4; - *kd_div = 40; -} - -#ifdef CONFIG_KEYBOARD_FACTORY_TEST -/* - * Map keyboard connector pins to EC GPIO pins for factory test. - * Pins mapped to {-1, -1} are skipped. - * The connector has 24 pins total, and there is no pin 0. - */ -const int keyboard_factory_scan_pins[][2] = { - {-1, -1}, {GPIO_KSO_H, 4}, {GPIO_KSO_H, 0}, {GPIO_KSO_H, 1}, - {GPIO_KSO_H, 3}, {GPIO_KSO_H, 2}, {GPIO_KSO_L, 5}, {GPIO_KSO_L, 6}, - {GPIO_KSO_L, 3}, {GPIO_KSO_L, 2}, {GPIO_KSI, 0}, {GPIO_KSO_L, 1}, - {GPIO_KSO_L, 4}, {GPIO_KSI, 3}, {GPIO_KSI, 2}, {GPIO_KSO_L, 0}, - {GPIO_KSI, 5}, {GPIO_KSI, 4}, {GPIO_KSO_L, 7}, {GPIO_KSI, 6}, - {GPIO_KSI, 7}, {GPIO_KSI, 1}, {-1, -1}, {-1, -1}, {-1, -1}, -}; - -const int keyboard_factory_scan_pins_used = - ARRAY_SIZE(keyboard_factory_scan_pins); -#endif |