diff options
author | Diana Z <dzigterman@chromium.org> | 2020-03-19 12:04:13 -0600 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-03-24 23:19:25 +0000 |
commit | bb4aee8eaf39ef68da363786771439d3c330c912 (patch) | |
tree | a978b2726892686295492a33db9fee3a1d99e21f /baseboard/dedede | |
parent | dc71caed2ee356da20d308f720dd281fc5826c4b (diff) | |
download | chrome-ec-bb4aee8eaf39ef68da363786771439d3c330c912.tar.gz |
Waddledee: Complete basic EC tasks
This commit adds tasks to cover PD functionality, charging, and LED
behavior. The charger and TCPC functionality are a part of the ITE
variant code for now, but may be moved out as OEM boards are determined.
BUG=b:146557556
BRANCH=None
TEST=make -j buldall
Signed-off-by: Diana Z <dzigterman@chromium.org>
Change-Id: I50df3caabfae5e3981d7a8b76c0a76332f7d00a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2110532
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'baseboard/dedede')
-rw-r--r-- | baseboard/dedede/baseboard.h | 27 | ||||
-rw-r--r-- | baseboard/dedede/variant_ec_it8320.c | 248 |
2 files changed, 270 insertions, 5 deletions
diff --git a/baseboard/dedede/baseboard.h b/baseboard/dedede/baseboard.h index 0c2c82f90b..0b18483ccc 100644 --- a/baseboard/dedede/baseboard.h +++ b/baseboard/dedede/baseboard.h @@ -32,6 +32,16 @@ #define CONFIG_FLASH_SIZE (512 * 1024) #define CONFIG_SPI_FLASH_REGS #define CONFIG_SPI_FLASH_W25Q80 /* Internal SPI flash type. */ + + /* USB defines specific to external TCPCs */ + #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE + #define CONFIG_USB_PD_VBUS_DETECT_TCPC + #define CONFIG_USB_PD_DISCHARGE_TCPC + /* #define CONFIG_USB_PD_TCPC_LOW_POWER */ + + /* Variant references the TCPCs to determine Vbus sourcing */ + #define CONFIG_USB_PD_5V_EN_CUSTOM + #elif defined(VARIANT_DEDEDE_EC_IT8320) /* Flash clock must be > (50Mhz / 2) */ #define CONFIG_IT83XX_FLASH_CLOCK_48MHZ @@ -43,6 +53,18 @@ #define I2C_PORT_USB_C0 IT83XX_I2C_CH_F #define I2C_ADDR_EEPROM_FLAGS 0x50 + + #define CONFIG_CHARGER_SM5803 /* C0 and C1: Charger */ + #define CONFIG_FPU /* For charger calculations */ + + #define CONFIG_USB_PD_TCPM_ITE_ON_CHIP /* C0: ITE EC TCPC */ + #define CONFIG_USB_PD_TCPM_ANX7447 /* C1: ANX TCPC + Mux */ + #define CONFIG_BC12_DETECT_PI3USB9201 /* BC 1.2 */ + + /* Vbus is controlled by the charger */ + #define CONFIG_USB_PD_VBUS_DETECT_CHARGER + #define CONFIG_USB_PD_5V_CHARGER_CTRL + #define CONFIG_CHARGER_OTG #else #error "Must define a VARIANT_DEDEDE_EC!" #endif @@ -113,7 +135,6 @@ #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 1 #define CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON 15001 #define CONFIG_USB_CHARGER -#define CONFIG_USB_PD_5V_EN_CUSTOM #define CONFIG_TRICKLE_CHARGING #undef CONFIG_CHARGER_SINGLE_CHIP @@ -149,13 +170,10 @@ /* USB PD */ #define CONFIG_USB_PD_ALT_MODE #define CONFIG_USB_PD_ALT_MODE_DFP -#define CONFIG_USB_PD_DISCHARGE_TCPC #define CONFIG_USB_PD_DP_HPD_GPIO #define CONFIG_USB_PD_DUAL_ROLE -#define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE #define CONFIG_USB_PD_LOGGING #define CONFIG_USB_PD_PORT_MAX_COUNT 2 -/* #define CONFIG_USB_PD_TCPC_LOW_POWER */ #define CONFIG_USB_PD_TCPM_MUX #define CONFIG_USB_PD_TCPM_TCPCI #define CONFIG_USB_PD_TRY_SRC @@ -168,7 +186,6 @@ #undef CONFIG_USB_PD_TRY_SRC_MIN_BATT_SOC #define CONFIG_USB_PD_TRY_SRC_MIN_BATT_SOC 5 /* #define CONFIG_USB_PD_VBUS_DETECT_CHARGER */ -#define CONFIG_USB_PD_VBUS_DETECT_TCPC #define CONFIG_USB_PD_VBUS_MEASURE_CHARGER #define CONFIG_USB_PD_DECODE_SOP #define CONFIG_USB_PID 0x5042 diff --git a/baseboard/dedede/variant_ec_it8320.c b/baseboard/dedede/variant_ec_it8320.c index 8106b6c7ab..8fa134ab1b 100644 --- a/baseboard/dedede/variant_ec_it8320.c +++ b/baseboard/dedede/variant_ec_it8320.c @@ -6,9 +6,17 @@ /* Common code for VARIANT_DEDEDE_IT8320 configuration */ #include "adc_chip.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 "console.h" +#include "driver/bc12/pi3usb9201.h" +#include "driver/charger/sm5803.h" +#include "driver/tcpm/anx7447.h" +#include "driver/tcpm/it83xx_pd.h" #include "gpio.h" #include "hooks.h" #include "i2c.h" @@ -16,6 +24,10 @@ #include "pwm.h" #include "pwm_chip.h" #include "registers.h" +#include "tcpci.h" +#include "usb_pd_tcpm.h" + +#define CPRINTUSB(format, args...) cprints(CC_USBCHARGE, format, ## args) /* ADC channels */ const struct adc_t adc_channels[] = { @@ -35,6 +47,33 @@ BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); /* TODO(b/149094481): Set up ADC comparator interrupts for ITE */ +/* BC12 chips */ +const struct pi3usb9201_config_t pi3usb9201_bc12_chips[] = { + { + .i2c_port = I2C_PORT_USB_C0, + .i2c_addr_flags = PI3USB9201_I2C_ADDR_3_FLAGS, + }, + { + .i2c_port = I2C_PORT_SUB_USB_C1, + .i2c_addr_flags = PI3USB9201_I2C_ADDR_3_FLAGS, + }, +}; + +/* 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 unsigned int chg_cnt = ARRAY_SIZE(chg_chips); + /* I2C Ports */ const struct i2c_port_t i2c_ports[] = { { @@ -63,3 +102,212 @@ const struct i2c_port_t i2c_ports[] = { }, }; const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); + +/* 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 = AN7447_TCPC0_I2C_ADDR_FLAGS, + }, + .drv = &anx7447_tcpm_drv, + .flags = TCPC_FLAGS_TCPCI_REV2_0, + }, +}; + +uint16_t tcpc_get_alert_status(void) +{ + /* + * TCPC 0 is embedded in the EC and processes interrupts in the chip + * code (it83xx/intc.c) + */ + + uint16_t status = 0; + int regval; + + /* 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; + } + } + + return status; +} + +int extpower_is_present(void) +{ + int chg0 = 0; + int chg1 = 0; + + sm5803_get_chg_det(0, &chg0); + sm5803_get_chg_det(1, &chg1); + + return chg0 || chg1; +} + +void board_set_charge_limit(int port, int supplier, int charge_ma, int max_ma, + int charge_mv) +{ + int icl = MAX(charge_ma, CONFIG_CHARGER_INPUT_CURRENT); + + /* + * TODO(b/151955431): Characterize the input current limit in case a + * scaling needs to be applied here + */ + charge_set_input_current_limit(icl, charge_mv); +} + +int board_set_active_charge_port(int port) +{ + int is_valid_port = (port >= 0 && port < CONFIG_USB_PD_PORT_MAX_COUNT); + int p0_otg, p1_otg; + + if (!is_valid_port && port != CHARGE_PORT_NONE) + return EC_ERROR_INVAL; + + /* TODO(b/147440290): charger functions should take chgnum */ + p0_otg = chg_chips[0].drv->is_sourcing_otg_power(0, 0); + p1_otg = chg_chips[1].drv->is_sourcing_otg_power(1, 1); + + if (port == CHARGE_PORT_NONE) { + CPRINTUSB("Disabling all charge ports"); + + if (!p0_otg) + chg_chips[0].drv->set_mode(0, + CHARGE_FLAG_INHIBIT_CHARGE); + if (!p1_otg) + chg_chips[1].drv->set_mode(1, + CHARGE_FLAG_INHIBIT_CHARGE); + + return EC_SUCCESS; + } + + CPRINTUSB("New chg p%d", port); + + /* + * Charger task will take care of enabling charging on the new charge + * port. Here, we ensure the other port is not charging by changing + * CHG_EN + */ + if (port == 0) { + if (p0_otg) { + CPRINTUSB("Skip enable p%d", port); + return EC_ERROR_INVAL; + } + if (!p1_otg) { + chg_chips[1].drv->set_mode(1, + CHARGE_FLAG_INHIBIT_CHARGE); + } + } else { + if (p1_otg) { + CPRINTUSB("Skip enable p%d", port); + return EC_ERROR_INVAL; + } + if (!p0_otg) { + chg_chips[0].drv->set_mode(0, + CHARGE_FLAG_INHIBIT_CHARGE); + } + } + + return EC_SUCCESS; +} + +/* Vconn control for integrated ITE TCPC */ +void board_pd_vconn_ctrl(int port, enum usbpd_cc_pin cc_pin, int enabled) +{ + /* Vconn control is only for port 0 */ + if (port) + return; + + if (cc_pin == USBPD_CC_PIN_1) + gpio_set_level(GPIO_EN_USB_C0_CC1_VCONN, !!enabled); + else + gpio_set_level(GPIO_EN_USB_C0_CC2_VCONN, !!enabled); +} + +__override void typec_set_source_current_limit(int port, enum tcpc_rp_value rp) +{ + int current; + + if (port < 0 || port > CONFIG_USB_PD_PORT_MAX_COUNT) + return; + + current = (rp == TYPEC_RP_3A0) ? 3000 : 1500; + + chg_chips[port].drv->set_otg_current_voltage(port, current, 5000); +} + + +int pd_check_vconn_swap(int port) +{ + /* Allow VCONN swaps if the AP is on */ + return chipset_in_state(CHIPSET_STATE_ANY_SUSPEND | CHIPSET_STATE_ON); +} + +void pd_power_supply_reset(int port) +{ + int prev_en; + + if (port < 0 || port >= CONFIG_USB_PD_PORT_MAX_COUNT) + return; + + /* TODO(b/147440290): charger functions should take chgnum */ + prev_en = chg_chips[port].drv->is_sourcing_otg_power(port, port); + + /* Disable Vbus */ + chg_chips[port].drv->enable_otg_power(port, 0); + + /* Discharge Vbus if previously enabled */ + if (prev_en) + sm5803_set_vbus_disch(port, 1); + +#ifdef CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT + /* Give back the current quota we are no longer using */ + charge_manager_source_port(port, 0); +#endif /* defined(CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT) */ + + /* Notify host of power info change. */ + pd_send_host_event(PD_EVENT_POWER_CHANGE); +} + +int pd_set_power_supply_ready(int port) +{ + enum ec_error_list rv; + + /* Disable charging */ + rv = chg_chips[port].drv->set_mode(port, CHARGE_FLAG_INHIBIT_CHARGE); + if (rv) + return rv; + + /* Disable Vbus discharge */ + sm5803_set_vbus_disch(port, 0); + + /* Provide Vbus */ + chg_chips[port].drv->enable_otg_power(port, 1); + +#ifdef CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT + /* Ensure we advertise the proper available current quota */ + charge_manager_source_port(port, 1); +#endif /* defined(CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT) */ + + /* Notify host of power info change. */ + pd_send_host_event(PD_EVENT_POWER_CHANGE); + + return EC_SUCCESS; +} + +int pd_snk_is_vbus_provided(int port) +{ + int chg_det = 0; + + sm5803_get_chg_det(port, &chg_det); + + return chg_det; +} |