diff options
| author | Simon Glass <sjg@chromium.org> | 2021-01-07 13:05:09 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-01-15 03:56:38 +0000 |
| commit | 01f48bf5fca91586feaffc56d05b19922a8290dd (patch) | |
| tree | 425bfbbe9cdfcfa4169215e832b607292572bd32 | |
| parent | 19a21f6045a179852a3ee8e56cf33b8f1b6c8358 (diff) | |
| download | chrome-ec-01f48bf5fca91586feaffc56d05b19922a8290dd.tar.gz | |
volteer: Enable the chgramp task
Bring in the PI3USB9201 BC1.2 driver and the required USB-C config,
so we can enable this task.
BUG=b:175434113
TEST=make BOARD=volteer -j30
build volteer on zephyr
Cq-Depend: chromium:2617039
Change-Id: I0b4150f28d31c227d0a22defc7e69107878ee7cc
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/zephyr-chrome/+/2618536
Commit-Queue: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2630174
Tested-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
| -rw-r--r-- | zephyr/projects/volteer/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | zephyr/projects/volteer/include/gpio_map.h | 2 | ||||
| -rw-r--r-- | zephyr/projects/volteer/prj.conf | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/zephyr/projects/volteer/CMakeLists.txt b/zephyr/projects/volteer/CMakeLists.txt index 188f284fca..322d5cc546 100644 --- a/zephyr/projects/volteer/CMakeLists.txt +++ b/zephyr/projects/volteer/CMakeLists.txt @@ -34,6 +34,7 @@ zephyr_include_directories( target_sources(app PRIVATE "${PLATFORM_EC_BASEBOARD}/battery_presence.c") target_sources(app PRIVATE "${PLATFORM_EC_BASEBOARD}/charger.c") target_sources(app PRIVATE "${PLATFORM_EC_BASEBOARD}/usb_pd_policy.c") +target_sources(app PRIVATE "${PLATFORM_EC_BASEBOARD}/usbc_config.c") # Include selected EC source for the board target_sources(app PRIVATE "${PLATFORM_EC_BOARD}/battery.c") diff --git a/zephyr/projects/volteer/include/gpio_map.h b/zephyr/projects/volteer/include/gpio_map.h index 29cbf26f2d..77ecfed9cf 100644 --- a/zephyr/projects/volteer/include/gpio_map.h +++ b/zephyr/projects/volteer/include/gpio_map.h @@ -60,6 +60,8 @@ #define GPIO_USB_C0_OC_ODL NAMED_GPIO(usb_c0_oc_odl) #define GPIO_USB_C1_OC_ODL NAMED_GPIO(usb_c1_oc_odl) +#define GPIO_USB_C1_BC12_INT_ODL GPIO_USB_C1_MIX_INT_ODL + /* * Set EC_CROS_GPIO_INTERRUPTS to a space-separated list of GPIO_INT items. * diff --git a/zephyr/projects/volteer/prj.conf b/zephyr/projects/volteer/prj.conf index ff8175329a..e1a2d07107 100644 --- a/zephyr/projects/volteer/prj.conf +++ b/zephyr/projects/volteer/prj.conf @@ -32,6 +32,8 @@ CONFIG_HAS_TASK_POWERBTN=y # USB-C and charging CONFIG_HAS_TASK_CHARGER=y +CONFIG_HAS_TASK_USB_CHG_P1=y +CONFIG_PLATFORM_EC_BC12_DETECT_PI3USB9201=y CONFIG_PLATFORM_EC_USB_PID=0x503e CONFIG_PLATFORM_EC_USBC_PPC_SN5S330=y CONFIG_PLATFORM_EC_USBC_PPC_SYV682X=y |