diff options
author | Kevin K Wong <kevin.k.wong@intel.com> | 2015-06-25 01:55:10 -0700 |
---|---|---|
committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-06-30 08:58:31 +0000 |
commit | daea221d5619a7278e8cd31ba9438028f306906c (patch) | |
tree | 225498102b530736baee428d1e63864033675762 | |
parent | 590c76d910d4e474b8713b71dae379608b06a265 (diff) | |
download | chrome-ec-daea221d5619a7278e8cd31ba9438028f306906c.tar.gz |
kunimitsu: add initial PD support
This is based off glados commit:
glados: limit type-C voltage to 5V to increase charging reliability
Change-Id: I4d67b62a18cf40d645b132081a431f9ce187168b
Reviewed-on: https://chromium-review.googlesource.com/276366
BUG=none
TEST=Verified PD negotiate on Port 0 on Kunimitsu Fab2.
Port 1 is also functional after hardware changes.
BRANCH=none
Change-Id: I0cb1edcf1703f55882f81c65e6359a45be4c1629
Signed-off-by: Kevin K Wong <kevin.k.wong@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/281833
Reviewed-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Alec Berg <alecaberg@chromium.org>
-rw-r--r-- | board/kunimitsu/board.c | 198 | ||||
-rw-r--r-- | board/kunimitsu/board.h | 58 | ||||
-rw-r--r-- | board/kunimitsu/build.mk | 1 | ||||
-rw-r--r-- | board/kunimitsu/ec.tasklist | 5 | ||||
-rw-r--r-- | board/kunimitsu/gpio.inc | 38 | ||||
-rw-r--r-- | board/kunimitsu/usb_pd_policy.c | 350 |
6 files changed, 626 insertions, 24 deletions
diff --git a/board/kunimitsu/board.c b/board/kunimitsu/board.c index a53c32e97f..11ec67f3be 100644 --- a/board/kunimitsu/board.c +++ b/board/kunimitsu/board.c @@ -4,10 +4,13 @@ */ /* Skylake Chrome Reference Design board-specific configuration */ +#include "adc_chip.h" #include "als.h" #include "button.h" +#include "charge_manager.h" #include "charge_state.h" #include "charger.h" +#include "console.h" #include "driver/accel_kxcj9.h" #include "driver/als_isl29035.h" #include "driver/temp_sensor/tmp432.h" @@ -20,6 +23,7 @@ #include "math_util.h" #include "motion_lid.h" #include "motion_sense.h" +#include "pi3usb9281.h" #include "power.h" #include "power_button.h" #include "switch.h" @@ -28,31 +32,73 @@ #include "temp_sensor_chip.h" #include "thermal.h" #include "timer.h" +#include "usb_charge.h" +#include "usb_pd.h" +#include "usb_pd_tcpm.h" #include "util.h" +#define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args) +#define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ## args) + #define GPIO_KB_INPUT (GPIO_INPUT | GPIO_PULL_UP) #define GPIO_KB_OUTPUT (GPIO_ODR_HIGH) #define GPIO_KB_OUTPUT_COL2 (GPIO_OUT_LOW) +/* Default input current limit when VBUS is present */ +#define DEFAULT_CURR_LIMIT 500 /* mA */ + /* Exchange status with PD MCU. */ static void pd_mcu_interrupt(enum gpio_signal signal) { + /* Exchange status with PD MCU to determine interrupt cause */ + host_command_pd_send_status(0); +} + +static void update_vbus_supplier(int port, int vbus_level) +{ + struct charge_port_info charge; + + /* + * If VBUS is low, or VBUS is high and we are not outputting VBUS + * ourselves, then update the VBUS supplier. + */ + if (!vbus_level || !usb_charger_port_is_sourcing_vbus(port)) { + charge.voltage = USB_BC12_CHARGE_VOLTAGE; + charge.current = vbus_level ? DEFAULT_CURR_LIMIT : 0; + charge_manager_update_charge(CHARGE_SUPPLIER_VBUS, + port, + &charge); + } } void vbus0_evt(enum gpio_signal signal) { + /* VBUS present GPIO is inverted */ + int vbus_level = !gpio_get_level(signal); + + CPRINTF("VBUS C0, %d\n", vbus_level); + update_vbus_supplier(0, vbus_level); + task_wake(TASK_ID_PD_C0); } void vbus1_evt(enum gpio_signal signal) { + /* VBUS present GPIO is inverted */ + int vbus_level = !gpio_get_level(signal); + + CPRINTF("VBUS C1, %d\n", vbus_level); + update_vbus_supplier(0, vbus_level); + task_wake(TASK_ID_PD_C1); } void usb0_evt(enum gpio_signal signal) { + task_wake(TASK_ID_USB_CHG_P0); } void usb1_evt(enum gpio_signal signal) { + task_wake(TASK_ID_USB_CHG_P1); } #include "gpio_list.h" @@ -67,12 +113,45 @@ const struct power_signal_info power_signal_list[] = { }; BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT); +/* ADC channels */ +const struct adc_t adc_channels[] = { + /* Vbus sensing. Converted to mV, full ADC is equivalent to 33V. */ + [ADC_VBUS] = {"VBUS", 33000, 1024, 0, 1}, + /* Adapter current output or battery discharging current */ + [ADC_AMON_BMON] = {"AMON_BMON", 1, 1, 0, 3}, + /* System current consumption */ + [ADC_PSYS] = {"PSYS", 1, 1, 0, 4}, + +}; +BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); + const struct i2c_port_t i2c_ports[] = { {"batt", MEC1322_I2C0_0, 100, GPIO_I2C0_0_SCL, GPIO_I2C0_0_SDA}, - {"sensors", MEC1322_I2C2, 100, GPIO_I2C2_SCL, GPIO_I2C2_SDA }, + {"muxes", MEC1322_I2C0_1, 100, GPIO_I2C0_1_SCL, GPIO_I2C0_1_SDA}, + {"pd_mcu", MEC1322_I2C1, 1000, GPIO_I2C1_SCL, GPIO_I2C1_SDA}, + {"sensors", MEC1322_I2C2, 400, GPIO_I2C2_SCL, GPIO_I2C2_SDA }, + {"pmic", MEC1322_I2C3, 400, GPIO_I2C3_SCL, GPIO_I2C3_SDA }, }; const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); +struct pi3usb9281_config pi3usb9281_chips[] = { + { + .i2c_port = I2C_PORT_USB_CHARGER_1, + .mux_lock = NULL, + }, + { + .i2c_port = I2C_PORT_USB_CHARGER_2, + .mux_lock = NULL, + }, +}; +BUILD_ASSERT(ARRAY_SIZE(pi3usb9281_chips) == + CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT); + +void board_set_usb_switches(int port, enum usb_switch setting) +{ + /* TODO: Set open / close USB switches based on param */ +} + /** * Discharge battery when on AC power for factory test. */ @@ -81,6 +160,16 @@ int board_discharge_on_ac(int enable) return charger_discharge_on_ac(enable); } +/** + * Reset PD MCU + */ +void board_reset_pd_mcu(void) +{ + gpio_set_level(GPIO_PD_RST_L, 0); + usleep(100); + gpio_set_level(GPIO_PD_RST_L, 1); +} + /* Four Motion sensors */ /* kxcj9 mutex and local/private data*/ static struct mutex g_kxcj9_mutex[2]; @@ -215,3 +304,110 @@ const struct button_config buttons[CONFIG_BUTTON_COUNT] = { }; BUILD_ASSERT(ARRAY_SIZE(buttons) == CONFIG_BUTTON_COUNT); +/* Initialize board. */ +static void board_init(void) +{ + int i; + struct charge_port_info charge_none; + + /* Enable PD MCU interrupt */ + gpio_enable_interrupt(GPIO_PD_MCU_INT); + /* Enable VBUS interrupt */ + gpio_enable_interrupt(GPIO_USB_C0_VBUS_WAKE_L); + gpio_enable_interrupt(GPIO_USB_C1_VBUS_WAKE_L); + + /* Initialize all pericom charge suppliers to 0 */ + charge_none.voltage = USB_BC12_CHARGE_VOLTAGE; + charge_none.current = 0; + for (i = 0; i < CONFIG_USB_PD_PORT_COUNT; i++) { + charge_manager_update_charge(CHARGE_SUPPLIER_PROPRIETARY, + i, + &charge_none); + charge_manager_update_charge(CHARGE_SUPPLIER_BC12_CDP, + i, + &charge_none); + charge_manager_update_charge(CHARGE_SUPPLIER_BC12_DCP, + i, + &charge_none); + charge_manager_update_charge(CHARGE_SUPPLIER_BC12_SDP, + i, + &charge_none); + charge_manager_update_charge(CHARGE_SUPPLIER_OTHER, + i, + &charge_none); + } + + /* Initialize VBUS supplier based on whether or not VBUS is present */ + update_vbus_supplier(0, !gpio_get_level(GPIO_USB_C0_VBUS_WAKE_L)); + update_vbus_supplier(1, !gpio_get_level(GPIO_USB_C1_VBUS_WAKE_L)); + + /* Enable pericom BC1.2 interrupts */ + gpio_enable_interrupt(GPIO_USB_C0_BC12_INT_L); + gpio_enable_interrupt(GPIO_USB_C1_BC12_INT_L); +} +DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); + +/** + * Set active charge port -- only one port can be active at a time. + * + * @param charge_port Charge port to enable. + * + * Returns EC_SUCCESS if charge port is accepted and made active, + * EC_ERROR_* otherwise. + */ +int board_set_active_charge_port(int charge_port) +{ + /* charge port is a realy physical port */ + int is_real_port = (charge_port >= 0 && + charge_port < CONFIG_USB_PD_PORT_COUNT); + /* check if we are source vbus on that port */ + int source = gpio_get_level(charge_port == 0 ? GPIO_USB_C0_5V_EN : + GPIO_USB_C1_5V_EN); + + if (is_real_port && source) { + CPRINTS("Skip enable p%d", charge_port); + return EC_ERROR_INVAL; + } + + CPRINTS("New chg p%d", charge_port); + + if (charge_port == CHARGE_PORT_NONE) { + /* + * TODO: currently we only get VBUS knowledge when charge + * is enabled. so, when not charging, we need to enable + * both ports. but, this is dangerous if you have two + * chargers plugged in and you set charge override to -1 + * then it will enable both sides! + */ + gpio_set_level(GPIO_USB_C0_CHARGE_EN_L, 0); + gpio_set_level(GPIO_USB_C1_CHARGE_EN_L, 0); + } else { + /* Make sure non-charging port is disabled */ + gpio_set_level(charge_port ? GPIO_USB_C0_CHARGE_EN_L : + GPIO_USB_C1_CHARGE_EN_L, 1); + /* Enable charging port */ + gpio_set_level(charge_port ? GPIO_USB_C1_CHARGE_EN_L : + GPIO_USB_C0_CHARGE_EN_L, 0); + } + + return EC_SUCCESS; +} + +/** + * Set the charge limit based upon desired maximum. + * + * @param charge_ma Desired charge limit (mA). + */ +void board_set_charge_limit(int charge_ma) +{ + charge_set_input_current_limit(MAX(charge_ma, + CONFIG_CHARGER_INPUT_CURRENT)); +} + +/* Charge manager callback function, called on delayed override timeout */ +void board_charge_manager_override_timeout(void) +{ + /* TODO: what to do here? */ +} +DECLARE_DEFERRED(board_charge_manager_override_timeout); + diff --git a/board/kunimitsu/board.h b/board/kunimitsu/board.h index 94ad91139e..91ac65c5f9 100644 --- a/board/kunimitsu/board.h +++ b/board/kunimitsu/board.h @@ -9,9 +9,12 @@ #define __CROS_EC_BOARD_H /* Optional features */ +#define CONFIG_ADC #define CONFIG_BATTERY_CUT_OFF +#define CONFIG_BATTERY_PRESENT_GPIO GPIO_BAT_PRESENT_L #define CONFIG_BATTERY_SMART #define CONFIG_BUTTON_COUNT 2 +#define CONFIG_CHARGE_MANAGER #define CONFIG_CHARGER #define CONFIG_CHARGER_V2 @@ -25,6 +28,7 @@ #define CONFIG_CHIPSET_SKYLAKE #define CONFIG_CLOCK_CRYSTAL #define CONFIG_EXTPOWER_GPIO +#define CONFIG_HOSTCMD_PD #define CONFIG_I2C #define CONFIG_KEYBOARD_COL2_INVERTED #undef CONFIG_KEYBOARD_KSO_BASE @@ -36,7 +40,16 @@ #define CONFIG_POWER_BUTTON_X86 #define CONFIG_POWER_COMMON #define CONFIG_POWER_SHUTDOWN_PAUSE_IN_S5 - +#define CONFIG_USB_CHARGER +#define CONFIG_USB_POWER_DELIVERY +#define CONFIG_USB_PD_ALT_MODE +#define CONFIG_USB_PD_ALT_MODE_DFP +#define CONFIG_USB_PD_CUSTOM_VDM +#define CONFIG_USB_PD_DUAL_ROLE +#define CONFIG_USB_PD_PORT_COUNT 2 +#define CONFIG_USB_PD_TCPM_TCPCI +#define CONFIG_USB_SWITCH_PI3USB9281 +#define CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT 2 #define CONFIG_SCI_GPIO GPIO_PCH_SCI_L #define CONFIG_SPI_PORT 1 @@ -59,8 +72,16 @@ #define I2C_PORT_BATTERY MEC1322_I2C0_0 #define I2C_PORT_CHARGER MEC1322_I2C0_0 #define I2C_PORT_THERMAL MEC1322_I2C0_0 +#define I2C_PORT_USB_CHARGER_1 MEC1322_I2C0_1 +#define I2C_PORT_PD_MCU MEC1322_I2C1 +#define I2C_PORT_TCPC MEC1322_I2C1 #define I2C_PORT_ALS MEC1322_I2C2 #define I2C_PORT_ACCEL MEC1322_I2C2 +#define I2C_PORT_PMIC MEC1322_I2C3 +#define I2C_PORT_USB_CHARGER_2 MEC1322_I2C3 + +#undef DEFERRABLE_MAX_COUNT +#define DEFERRABLE_MAX_COUNT 11 #define CONFIG_ALS #define CONFIG_ALS_ISL29035 @@ -74,12 +95,8 @@ #define CONFIG_LID_ANGLE_SENSOR_LID 1 /* Modules we want to exclude */ -#undef CONFIG_EEPROM -#undef CONFIG_EOPTION -#undef CONFIG_PSTORE +#undef CONFIG_CONSOLE_CMDHELP #undef CONFIG_PECI -#undef CONFIG_FANS -#undef CONFIG_ADC #undef CONFIG_WAKE_PIN #ifndef __ASSEMBLER__ @@ -87,6 +104,15 @@ #include "gpio_signal.h" #include "registers.h" +/* ADC signal */ +enum adc_channel { + ADC_VBUS, + ADC_AMON_BMON, + ADC_PSYS, + /* Number of ADC channels */ + ADC_CH_COUNT +}; + /* power signal definitions */ enum power_signal { X86_RSMRST_L_PWRGD = 0, @@ -117,9 +143,29 @@ enum als_id { ALS_COUNT, }; +/* start as a sink in case we have no other power supply/battery */ +#define PD_DEFAULT_STATE PD_STATE_SNK_DISCONNECTED + +/* TODO: determine the following board specific type-C power constants */ +/* + * delay to turn on the power supply max is ~16ms. + * delay to turn off the power supply max is about ~180ms. + */ +#define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ +#define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ + +/* Define typical operating power and max power */ +#define PD_OPERATING_POWER_MW 15000 +#define PD_MAX_POWER_MW 60000 +#define PD_MAX_CURRENT_MA 3000 +#define PD_MAX_VOLTAGE_MV 20000 + /* Discharge battery when on AC power for factory test. */ int board_discharge_on_ac(int enable); +/* Reset PD MCU */ +void board_reset_pd_mcu(void); + #endif /* !__ASSEMBLER__ */ #endif /* __CROS_EC_BOARD_H */ diff --git a/board/kunimitsu/build.mk b/board/kunimitsu/build.mk index 51743a17c7..da7f5f9f98 100644 --- a/board/kunimitsu/build.mk +++ b/board/kunimitsu/build.mk @@ -12,3 +12,4 @@ CHIP_SPI_SIZE_KB:=512 board-y=board.o board-$(CONFIG_BATTERY_SMART)+=battery.o +board-$(CONFIG_USB_POWER_DELIVERY)+=usb_pd_policy.o diff --git a/board/kunimitsu/ec.tasklist b/board/kunimitsu/ec.tasklist index cc61737250..83638be5c3 100644 --- a/board/kunimitsu/ec.tasklist +++ b/board/kunimitsu/ec.tasklist @@ -18,12 +18,17 @@ */ #define CONFIG_TASK_LIST \ TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \ + TASK_ALWAYS(USB_CHG_P0, usb_charger_task, NULL, TASK_STACK_SIZE) \ + TASK_ALWAYS(USB_CHG_P1, usb_charger_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(CHARGER, charger_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_NOTEST(MOTIONSENSE, motion_sense_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_NOTEST(CHIPSET, chipset_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_NOTEST(KEYPROTO, keyboard_protocol_task, NULL, TASK_STACK_SIZE) \ + TASK_NOTEST(PDCMD, pd_command_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(CONSOLE, console_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_ALWAYS(POWERBTN, power_button_task, NULL, TASK_STACK_SIZE) \ TASK_NOTEST(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \ + TASK_ALWAYS(PD_C0, pd_task, NULL, LARGER_TASK_STACK_SIZE) \ + TASK_ALWAYS(PD_C1, pd_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_NOTEST(PORT80, port80_task, NULL, TASK_STACK_SIZE) diff --git a/board/kunimitsu/gpio.inc b/board/kunimitsu/gpio.inc index e945cc48f3..f52af42f46 100644 --- a/board/kunimitsu/gpio.inc +++ b/board/kunimitsu/gpio.inc @@ -19,7 +19,7 @@ GPIO_INT(PCH_SLP_SUS_L, PIN(12), GPIO_INT_BOTH | GPIO_PULL_UP, power_signal GPIO_INT(VOLUME_UP_L, PIN(31), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) GPIO_INT(VOLUME_DOWN_L, PIN(47), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) GPIO_INT(PMIC_INT_L, PIN(50), GPIO_INT_FALLING, power_signal_interrupt) -GPIO_INT(PD_MCU_INT, PIN(122), GPIO_INT_RISING | GPIO_INT_DSLEEP, pd_mcu_interrupt) +GPIO_INT(PD_MCU_INT, PIN(122), GPIO_INT_FALLING | GPIO_INT_DSLEEP, pd_mcu_interrupt) GPIO_INT(USB_C0_VBUS_WAKE_L,PIN(152), GPIO_INT_BOTH, vbus0_evt) GPIO_INT(USB_C1_VBUS_WAKE_L,PIN(123), GPIO_INT_BOTH, vbus1_evt) GPIO_INT(USB_C0_BC12_INT_L, PIN(124), GPIO_INT_FALLING, usb0_evt) @@ -30,14 +30,16 @@ GPIO(ROP_DSW_PWROK, PIN(55), GPIO_INPUT) GPIO(PD_RST_L, PIN(130), GPIO_ODR_HIGH) GPIO(USB2_OTG_ID, PIN(13), GPIO_ODR_HIGH) /* I2C pins - these will be reconfigured for alternate function below */ -GPIO(I2C0_0_SCL, PIN(15), GPIO_ODR_HIGH) -GPIO(I2C0_0_SDA, PIN(16), GPIO_ODR_HIGH) -GPIO(I2C1_SCL, PIN(22), GPIO_ODR_HIGH) -GPIO(I2C1_SDA, PIN(23), GPIO_ODR_HIGH) -GPIO(I2C2_SCL, PIN(20), GPIO_ODR_HIGH) -GPIO(I2C2_SDA, PIN(21), GPIO_ODR_HIGH) -GPIO(I2C3_SCL, PIN(24), GPIO_ODR_HIGH) -GPIO(I2C3_SDA, PIN(25), GPIO_ODR_HIGH) +GPIO(I2C0_0_SCL, PIN(15), GPIO_INPUT) +GPIO(I2C0_0_SDA, PIN(16), GPIO_INPUT) +GPIO(I2C0_1_SCL, PIN(134), GPIO_INPUT) +GPIO(I2C0_1_SDA, PIN(17), GPIO_INPUT) +GPIO(I2C1_SCL, PIN(22), GPIO_INPUT) +GPIO(I2C1_SDA, PIN(23), GPIO_INPUT) +GPIO(I2C2_SCL, PIN(20), GPIO_INPUT) +GPIO(I2C2_SDA, PIN(21), GPIO_INPUT) +GPIO(I2C3_SCL, PIN(24), GPIO_INPUT) +GPIO(I2C3_SDA, PIN(25), GPIO_INPUT) GPIO(PCH_SCI_L, PIN(26), GPIO_ODR_HIGH) GPIO(NC_034, PIN(34), GPIO_INPUT | GPIO_PULL_UP) @@ -48,7 +50,7 @@ GPIO(PCH_SMI_L, PIN(44), GPIO_ODR_HIGH) GPIO(PCH_PWRBTN_L, PIN(45), GPIO_OUT_HIGH) GPIO(USB_C0_DP_HPD, PIN(46), GPIO_OUT_HIGH) GPIO(USB_C1_DP_HPD, PIN(51), GPIO_OUT_HIGH) -GPIO(CPU_PROCHOT, PIN(52), GPIO_OPEN_DRAIN) +GPIO(CPU_PROCHOT, PIN(52), GPIO_OUT_LOW) GPIO(ENABLE_TOUCHPAD, PIN(53), GPIO_OUT_HIGH) GPIO(BAT_PRESENT_L, PIN(56), GPIO_INPUT) GPIO(USB_PD_WAKE, PIN(60), GPIO_OUT_LOW) @@ -75,11 +77,11 @@ GPIO(PCH_RSMRST_L, PIN(143), GPIO_OUT_LOW) GPIO(PLATFORM_EC_PROCHOT, PIN(151), GPIO_INPUT) GPIO(USB_C0_5V_EN, PIN(154), GPIO_OUT_LOW) GPIO(USB_C1_5V_EN, PIN(204), GPIO_OUT_LOW) -GPIO(USB_C0_CHARGE_EN_L, PIN(64), GPIO_OUT_HIGH) -GPIO(USB_C1_CHARGE_EN_L, PIN(157), GPIO_OUT_HIGH) +GPIO(USB_C0_CHARGE_EN_L, PIN(64), GPIO_OUT_LOW) +GPIO(USB_C1_CHARGE_EN_L, PIN(157), GPIO_OUT_LOW) GPIO(PP1800_DX_SENSOR_EN, PIN(11), GPIO_OUT_LOW) GPIO(PP1800_DX_AUDIO_EN, PIN(160), GPIO_OUT_LOW) -GPIO(RTC_RST, PIN(163), GPIO_OPEN_DRAIN) +GPIO(PCH_RTCRST_L, PIN(163), GPIO_ODR_HIGH) GPIO(NC_201, PIN(201), GPIO_INPUT | GPIO_PULL_UP) GPIO(ENABLE_BACKLIGHT, PIN(202), GPIO_OUT_HIGH) @@ -92,10 +94,6 @@ GPIO(KBD_KSO2, PIN(101), GPIO_KB_OUTPUT_COL2) GPIO(PVT_CS0, PIN(146), GPIO_ODR_HIGH) GPIO(SYS_RESET_L, PIN(121), GPIO_ODR_HIGH) -GPIO(V_BOOSTIN, PIN(57), GPIO_INPUT) -GPIO(BC_IBAT, PIN(61), GPIO_INPUT) -GPIO(BC_MON, PIN(62), GPIO_INPUT) - GPIO(NC_11, PIN(11), GPIO_INPUT | GPIO_PULL_UP) GPIO(NC_150, PIN(150), GPIO_INPUT | GPIO_PULL_UP) GPIO(CHARGE_LED1, PIN(155), GPIO_OUT_HIGH) @@ -147,6 +145,12 @@ ALTERNATE(PIN_MASK(2, 0x3f), 2, MODULE_I2C, GPIO_PULL_UP) /* I2C0_1 CLK - GPIO134 */ ALTERNATE(PIN_MASK(13, 0x10), 2, MODULE_I2C, GPIO_PULL_UP) +/* ADC pins */ +/* ADC1 - GPIO057 / PPVAR_BOOSTIN_SENSE */ +ALTERNATE(PIN_MASK(5, 0x80), 1, MODULE_ADC, GPIO_ANALOG) +/* ADC3 - GPIO061 / IADP_ACMON_BMON. ADC4 - GPIO062 / PMON_PSYS */ +ALTERNATE(PIN_MASK(6, 0x06), 1, MODULE_ADC, GPIO_ANALOG) + /* VCC1_RST# - GPIO131 */ ALTERNATE(PIN_MASK(13, 0x02), 1, MODULE_PMU, 0) /* nRESET_OUT - GPIO121 */ diff --git a/board/kunimitsu/usb_pd_policy.c b/board/kunimitsu/usb_pd_policy.c new file mode 100644 index 0000000000..d5e0a235a9 --- /dev/null +++ b/board/kunimitsu/usb_pd_policy.c @@ -0,0 +1,350 @@ +/* Copyright 2015 The Chromium OS Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#include "atomic.h" +#include "charge_manager.h" +#include "common.h" +#include "console.h" +#include "gpio.h" +#include "hooks.h" +#include "host_command.h" +#include "registers.h" +#include "system.h" +#include "task.h" +#include "timer.h" +#include "util.h" +#include "usb_pd.h" + +#define CPRINTF(format, args...) cprintf(CC_USBPD, format, ## args) +#define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args) + +#define PDO_FIXED_FLAGS (PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP) + +/* TODO: fill in correct source and sink capabilities */ +const uint32_t pd_src_pdo[] = { + PDO_FIXED(5000, 1500, PDO_FIXED_FLAGS), +}; +const int pd_src_pdo_cnt = ARRAY_SIZE(pd_src_pdo); + +const uint32_t pd_snk_pdo[] = { + PDO_FIXED(5000, 500, PDO_FIXED_FLAGS), + PDO_BATT(5000, 20000, 15000), + PDO_VAR(5000, 20000, 3000), +}; +const int pd_snk_pdo_cnt = ARRAY_SIZE(pd_snk_pdo); + +int pd_is_valid_input_voltage(int mv) +{ + return 1; +} + +int pd_check_requested_voltage(uint32_t rdo) +{ + int max_ma = rdo & 0x3FF; + int op_ma = (rdo >> 10) & 0x3FF; + int idx = rdo >> 28; + uint32_t pdo; + uint32_t pdo_ma; + + if (!idx || idx > pd_src_pdo_cnt) + return EC_ERROR_INVAL; /* Invalid index */ + + /* check current ... */ + pdo = pd_src_pdo[idx - 1]; + pdo_ma = (pdo & 0x3ff); + if (op_ma > pdo_ma) + return EC_ERROR_INVAL; /* too much op current */ + if (max_ma > pdo_ma) + return EC_ERROR_INVAL; /* too much max current */ + + CPRINTF("Requested %d V %d mA (for %d/%d mA)\n", + ((pdo >> 10) & 0x3ff) * 50, (pdo & 0x3ff) * 10, + ((rdo >> 10) & 0x3ff) * 10, (rdo & 0x3ff) * 10); + + return EC_SUCCESS; +} + +void pd_transition_voltage(int idx) +{ + /* No-operation: we are always 5V */ +} + +int pd_set_power_supply_ready(int port) +{ + /* Disable charging */ + gpio_set_level(port ? GPIO_USB_C1_CHARGE_EN_L : + GPIO_USB_C0_CHARGE_EN_L, 1); + /* Provide VBUS */ + gpio_set_level(port ? GPIO_USB_C1_5V_EN : + GPIO_USB_C0_5V_EN, 1); + + return EC_SUCCESS; /* we are ready */ +} + +void pd_power_supply_reset(int port) +{ + /* Disable VBUS */ + gpio_set_level(port ? GPIO_USB_C1_5V_EN : + GPIO_USB_C0_5V_EN, 0); + /* + * TODO: Currently we can only detect VBUS when charge_en is + * asserted, so, if there is no active charge port, then enable + * charge_en. If the other port is the active charger, then leave + * this port disabled. + */ + if (charge_manager_get_active_charge_port() != !port) + gpio_set_level(port ? GPIO_USB_C1_CHARGE_EN_L : + GPIO_USB_C0_CHARGE_EN_L, 0); +} + +void pd_set_input_current_limit(int port, uint32_t max_ma, + uint32_t supply_voltage) +{ +#ifdef CONFIG_CHARGE_MANAGER + struct charge_port_info charge; + charge.current = max_ma; + charge.voltage = supply_voltage; + charge_manager_update_charge(CHARGE_SUPPLIER_PD, port, &charge); +#endif + /* notify host of power info change */ +} + +void typec_set_input_current_limit(int port, uint32_t max_ma, + uint32_t supply_voltage) +{ +#ifdef CONFIG_CHARGE_MANAGER + struct charge_port_info charge; + charge.current = max_ma; + charge.voltage = supply_voltage; + charge_manager_update_charge(CHARGE_SUPPLIER_TYPEC, port, &charge); +#endif + + /* notify host of power info change */ +} + +int pd_snk_is_vbus_provided(int port) +{ + return !gpio_get_level(port ? GPIO_USB_C1_VBUS_WAKE_L : + GPIO_USB_C0_VBUS_WAKE_L); +} + +int pd_board_checks(void) +{ + return EC_SUCCESS; +} + +int pd_check_power_swap(int port) +{ + /* + * Allow power swap as long as we are acting as a dual role device, + * otherwise assume our role is fixed (not in S0 or console command + * to fix our role). + */ + return pd_get_dual_role() == PD_DRP_TOGGLE_ON ? 1 : 0; +} + +int pd_check_data_swap(int port, int data_role) +{ + /* Allow data swap if we are a UFP, otherwise don't allow */ + return (data_role == PD_ROLE_UFP) ? 1 : 0; +} + +void pd_execute_data_swap(int port, int data_role) +{ + /* TODO: need to open/close D+/D- switch based on role */ +} + +void pd_check_pr_role(int port, int pr_role, int partner_pr_swap) +{ + /* If sink, and dual role toggling is on, then switch to source */ + if (partner_pr_swap && pr_role == PD_ROLE_SINK && + pd_get_dual_role() == PD_DRP_TOGGLE_ON) + pd_request_power_swap(port); +} + +void pd_check_dr_role(int port, int dr_role, int partner_dr_swap) +{ + /* If UFP, try to switch to DFP */ + if (partner_dr_swap && dr_role == PD_ROLE_UFP) + pd_request_data_swap(port); +} +/* ----------------- Vendor Defined Messages ------------------ */ +const struct svdm_response svdm_rsp = { + .identity = NULL, + .svids = NULL, + .modes = NULL, +}; + +int pd_custom_vdm(int port, int cnt, uint32_t *payload, + uint32_t **rpayload) +{ + int cmd = PD_VDO_CMD(payload[0]); + uint16_t dev_id = 0; + int is_rw; + + /* make sure we have some payload */ + if (cnt == 0) + return 0; + + switch (cmd) { + case VDO_CMD_VERSION: + /* guarantee last byte of payload is null character */ + *(payload + cnt - 1) = 0; + CPRINTF("version: %s\n", (char *)(payload+1)); + break; + case VDO_CMD_READ_INFO: + case VDO_CMD_SEND_INFO: + /* copy hash */ + if (cnt == 7) { + dev_id = VDO_INFO_HW_DEV_ID(payload[6]); + is_rw = VDO_INFO_IS_RW(payload[6]); + + CPRINTF("DevId:%d.%d SW:%d RW:%d\n", + HW_DEV_ID_MAJ(dev_id), + HW_DEV_ID_MIN(dev_id), + VDO_INFO_SW_DBG_VER(payload[6]), + is_rw); + } else if (cnt == 6) { + /* really old devices don't have last byte */ + pd_dev_store_rw_hash(port, dev_id, payload + 1, + SYSTEM_IMAGE_UNKNOWN); + } + break; + case VDO_CMD_CURRENT: + CPRINTF("Current: %dmA\n", payload[1]); + break; + case VDO_CMD_FLIP: + /* board_flip_usb_mux(port); */ + break; +#ifdef CONFIG_USB_PD_LOGGING + case VDO_CMD_GET_LOG: + pd_log_recv_vdm(port, cnt, payload); + break; +#endif /* CONFIG_USB_PD_LOGGING */ + } + + return 0; +} + +#ifdef CONFIG_USB_PD_ALT_MODE_DFP +static int dp_flags[CONFIG_USB_PD_PORT_COUNT]; + +static void svdm_safe_dp_mode(int port) +{ + /* make DP interface safe until configure */ + dp_flags[port] = 0; + /* board_set_usb_mux(port, TYPEC_MUX_NONE, pd_get_polarity(port)); */ +} + +static int svdm_enter_dp_mode(int port, uint32_t mode_caps) +{ + /* Only enter mode if device is DFP_D capable */ + if (mode_caps & MODE_DP_SNK) { + svdm_safe_dp_mode(port); + return 0; + } + + return -1; +} + +static int svdm_dp_status(int port, uint32_t *payload) +{ + int opos = pd_alt_mode(port, USB_SID_DISPLAYPORT); + payload[0] = VDO(USB_SID_DISPLAYPORT, 1, + CMD_DP_STATUS | VDO_OPOS(opos)); + payload[1] = VDO_DP_STATUS(0, /* HPD IRQ ... not applicable */ + 0, /* HPD level ... not applicable */ + 0, /* exit DP? ... no */ + 0, /* usb mode? ... no */ + 0, /* multi-function ... no */ + (!!(dp_flags[port] & DP_FLAGS_DP_ON)), + 0, /* power low? ... no */ + (!!(dp_flags[port] & DP_FLAGS_DP_ON))); + return 2; +}; + +static int svdm_dp_config(int port, uint32_t *payload) +{ + int opos = pd_alt_mode(port, USB_SID_DISPLAYPORT); + /* board_set_usb_mux(port, TYPEC_MUX_DP, pd_get_polarity(port)); */ + payload[0] = VDO(USB_SID_DISPLAYPORT, 1, + CMD_DP_CONFIG | VDO_OPOS(opos)); + payload[1] = VDO_DP_CFG(MODE_DP_PIN_E, /* pin mode */ + 1, /* DPv1.3 signaling */ + 2); /* UFP connected */ + return 2; +}; + +static void svdm_dp_post_config(int port) +{ + dp_flags[port] |= DP_FLAGS_DP_ON; + if (!(dp_flags[port] & DP_FLAGS_HPD_HI_PENDING)) + return; +} + +static int svdm_dp_attention(int port, uint32_t *payload) +{ + /* ack */ + return 1; +} + +static void svdm_exit_dp_mode(int port) +{ + svdm_safe_dp_mode(port); + /* gpio_set_level(PORT_TO_HPD(port), 0); */ +} + +static int svdm_enter_gfu_mode(int port, uint32_t mode_caps) +{ + /* Always enter GFU mode */ + return 0; +} + +static void svdm_exit_gfu_mode(int port) +{ +} + +static int svdm_gfu_status(int port, uint32_t *payload) +{ + /* + * This is called after enter mode is successful, send unstructured + * VDM to read info. + */ + pd_send_vdm(port, USB_VID_GOOGLE, VDO_CMD_READ_INFO, NULL, 0); + return 0; +} + +static int svdm_gfu_config(int port, uint32_t *payload) +{ + return 0; +} + +static int svdm_gfu_attention(int port, uint32_t *payload) +{ + return 0; +} + +const struct svdm_amode_fx supported_modes[] = { + { + .svid = USB_SID_DISPLAYPORT, + .enter = &svdm_enter_dp_mode, + .status = &svdm_dp_status, + .config = &svdm_dp_config, + .post_config = &svdm_dp_post_config, + .attention = &svdm_dp_attention, + .exit = &svdm_exit_dp_mode, + }, + { + .svid = USB_VID_GOOGLE, + .enter = &svdm_enter_gfu_mode, + .status = &svdm_gfu_status, + .config = &svdm_gfu_config, + .attention = &svdm_gfu_attention, + .exit = &svdm_exit_gfu_mode, + } +}; +const int supported_modes_cnt = ARRAY_SIZE(supported_modes); +#endif /* CONFIG_USB_PD_ALT_MODE_DFP */ + |