diff options
author | Simon Glass <sjg@chromium.org> | 2021-06-11 16:42:29 -0600 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-06-22 17:38:53 +0000 |
commit | f22f45ed3ac381129755e995d039ef7391fbaa3b (patch) | |
tree | 2bbe6eabf0ac7b42fb9fbcb1577aa3714ef3a1f9 /zephyr/projects/asurada | |
parent | 2697b7b7d82b843f6d9f5d81953e03b316468dca (diff) | |
download | chrome-ec-f22f45ed3ac381129755e995d039ef7391fbaa3b.tar.gz |
zephyr: hayato: Enable USB-C support
Add the required Kconfig options for this feature and bring in the
associated source code. Add the interrupts also.
BUG=b:189855648
BRANCH=none
TEST=with other CLs, build asurada for Zephyr
Change-Id: Iac1cb23ccd66eac06339d12372dd0ae7eb85941d
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2935952
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Diffstat (limited to 'zephyr/projects/asurada')
-rw-r--r-- | zephyr/projects/asurada/hayato/CMakeLists.txt | 7 | ||||
-rw-r--r-- | zephyr/projects/asurada/hayato/include/gpio_map.h | 14 | ||||
-rw-r--r-- | zephyr/projects/asurada/hayato/prj.conf | 55 |
3 files changed, 72 insertions, 4 deletions
diff --git a/zephyr/projects/asurada/hayato/CMakeLists.txt b/zephyr/projects/asurada/hayato/CMakeLists.txt index dede01ec31..cd0512d5bf 100644 --- a/zephyr/projects/asurada/hayato/CMakeLists.txt +++ b/zephyr/projects/asurada/hayato/CMakeLists.txt @@ -18,7 +18,12 @@ set(PLATFORM_EC_BOARD "${PLATFORM_EC}/board/hayato" CACHE PATH zephyr_library_sources( "${PLATFORM_EC_BASEBOARD}/board_chipset.c" - "${PLATFORM_EC_BASEBOARD}/board_id.c") + "${PLATFORM_EC_BASEBOARD}/board_id.c" + "${PLATFORM_EC_BASEBOARD}/usbc_config.c" + "${PLATFORM_EC_BASEBOARD}/usb_pd_policy.c") + +zephyr_library_sources( + "${PLATFORM_EC_BOARD}/battery.c") # Board specific sensor implementation zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_MOTIONSENSE diff --git a/zephyr/projects/asurada/hayato/include/gpio_map.h b/zephyr/projects/asurada/hayato/include/gpio_map.h index c8504425d7..67263d7a83 100644 --- a/zephyr/projects/asurada/hayato/include/gpio_map.h +++ b/zephyr/projects/asurada/hayato/include/gpio_map.h @@ -41,9 +41,17 @@ GPIO_INT(GPIO_LID_ACCEL_INT_L, \ GPIO_INT_EDGE_FALLING, lis2dw12_interrupt) \ GPIO_INT(GPIO_TABLET_MODE_L, \ - GPIO_INT_EDGE_BOTH, gmr_tablet_switch_isr) - - + GPIO_INT_EDGE_BOTH, gmr_tablet_switch_isr) \ + GPIO_INT(GPIO_USB_C0_PPC_INT_ODL, \ + GPIO_INT_EDGE_BOTH, ppc_interrupt) \ + GPIO_INT(GPIO_USB_C0_BC12_INT_ODL, \ + GPIO_INT_EDGE_FALLING, bc12_interrupt) \ + GPIO_INT(GPIO_USB_C1_BC12_INT_L, \ + GPIO_INT_EDGE_FALLING, bc12_interrupt) \ + GPIO_INT(GPIO_AC_PRESENT, \ + GPIO_INT_EDGE_BOTH, extpower_interrupt) \ + GPIO_INT(GPIO_X_EC_GPIO2, \ + GPIO_INT_EDGE_FALLING, x_ec_interrupt) #define GPIO_EN_PP5000 GPIO_EN_PP5000_A diff --git a/zephyr/projects/asurada/hayato/prj.conf b/zephyr/projects/asurada/hayato/prj.conf index 54d5db8d59..46a0c8c9e7 100644 --- a/zephyr/projects/asurada/hayato/prj.conf +++ b/zephyr/projects/asurada/hayato/prj.conf @@ -36,3 +36,58 @@ CONFIG_PLATFORM_EC_HOSTCMD=y CONFIG_PLATFORM_EC_SWITCH=n CONFIG_PLATFORM_EC_VBOOT=n CONFIG_PLATFORM_EC_VBOOT_HASH=n + +# Battery +CONFIG_HAS_TASK_USB_CHG_P1=y +CONFIG_PLATFORM_EC_BATTERY=y +CONFIG_PLATFORM_EC_BATTERY_CUT_OFF=y +CONFIG_PLATFORM_EC_BATTERY_FUEL_GAUGE=y +CONFIG_PLATFORM_EC_BATTERY_PRESENT_GPIO=y +CONFIG_PLATFORM_EC_BATT_FULL_CHIPSET_OFF_INPUT_LIMIT_MV=9000 +CONFIG_PLATFORM_EC_CHARGER_DISCHARGE_ON_AC=y +CONFIG_PLATFORM_EC_CHARGER_PSYS=y +CONFIG_PLATFORM_EC_CHARGER_PSYS_READ=y +CONFIG_PLATFORM_EC_CHARGER_ISL9238C=y +CONFIG_PLATFORM_EC_CHARGER_MAINTAIN_VBAT=y +CONFIG_PLATFORM_EC_CHARGER_OTG=y +# BOARD_RS2 +CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR=10 +# BOARD_RS1 +CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR_AC=20 +CONFIG_PLATFORM_EC_CONSOLE_CMD_CHARGER_ADC_AMON_BMON=y +CONFIG_PLATFORM_EC_I2C_VIRTUAL_BATTERY=y + +# USB-C +CONFIG_HAS_TASK_PD_C1=y +CONFIG_HAS_TASK_PD_INT_C1=y +CONFIG_PLATFORM_EC_BC12_DETECT_PI3USB9201=y +CONFIG_PLATFORM_EC_BC12_DETECT_MT6360=y +CONFIG_PLATFORM_EC_BC12_SINGLE_DRIVER=n +CONFIG_PLATFORM_EC_MT6360_BC12_GPIO=y +CONFIG_PLATFORM_EC_USBC_PPC_DEDICATED_INT=y +CONFIG_PLATFORM_EC_USBC_PPC_SYV682C=y +CONFIG_PLATFORM_EC_USBC_PPC_SYV682X=y +CONFIG_PLATFORM_EC_USB_MUX_IT5205=y +CONFIG_PLATFORM_EC_USB_MUX_PS8743=y +CONFIG_PLATFORM_EC_USB_MUX_VIRTUAL=y +CONFIG_PLATFORM_EC_USB_PD_DISCHARGE_PPC=y +CONFIG_PLATFORM_EC_USB_PD_DP_HPD_GPIO=y +CONFIG_PLATFORM_EC_USB_PD_DP_HPD_GPIO_CUSTOM=y +CONFIG_PLATFORM_EC_USB_PD_FRS=y +CONFIG_PLATFORM_EC_USB_PD_FRS_PPC=y +CONFIG_PLATFORM_EC_USB_PD_ITE_ACTIVE_PORT_COUNT=2 +CONFIG_PLATFORM_EC_USB_PD_LOGGING=y +CONFIG_PLATFORM_EC_USB_PD_TCPM_DRIVER_IT8XXX2=y +CONFIG_PLATFORM_EC_USB_PD_TCPC_RUNTIME_CONFIG=n +CONFIG_PLATFORM_EC_USB_PD_TCPM_ITE_ON_CHIP=y +CONFIG_PLATFORM_EC_USB_PD_TCPM_TCPCI=y +CONFIG_PLATFORM_EC_USB_PD_VBUS_DETECT_PPC=y +CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_ADC_EACH_PORT=y +CONFIG_PLATFORM_EC_USB_A_PORT_COUNT=1 +CONFIG_PLATFORM_EC_USB_PORT_POWER_DUMB_CUSTOM_HOOK=y + +# USB ID +# This is allocated for Asurada +# http://google3/hardware/standards/usb/ +# TODO(b/183608112): Move to device tree +CONFIG_PLATFORM_EC_USB_PID=0x5053 |