diff options
-rw-r--r-- | zephyr/projects/volteer/CMakeLists.txt | 2 | ||||
-rw-r--r-- | zephyr/projects/volteer/prj.conf | 1 | ||||
-rw-r--r-- | zephyr/projects/volteer/src/usb_pd_policy.c | 81 |
3 files changed, 2 insertions, 82 deletions
diff --git a/zephyr/projects/volteer/CMakeLists.txt b/zephyr/projects/volteer/CMakeLists.txt index cc07dbc13f..60d2a73e9a 100644 --- a/zephyr/projects/volteer/CMakeLists.txt +++ b/zephyr/projects/volteer/CMakeLists.txt @@ -32,10 +32,10 @@ zephyr_include_directories( # Include selected EC source for the baseboard target_sources(app PRIVATE "${PLATFORM_EC_BASEBOARD}/battery_presence.c") +target_sources(app PRIVATE "${PLATFORM_EC_BASEBOARD}/usb_pd_policy.c") # Local sources to make things build. These are being removed as we are able # to build the EC source instead. target_sources(app PRIVATE "src/battery.c") target_sources(app PRIVATE "src/pwrok_signals.c") target_sources(app PRIVATE "src/usbc_config.c") -target_sources(app PRIVATE "src/usb_pd_policy.c") diff --git a/zephyr/projects/volteer/prj.conf b/zephyr/projects/volteer/prj.conf index 4ffac7112e..ff8175329a 100644 --- a/zephyr/projects/volteer/prj.conf +++ b/zephyr/projects/volteer/prj.conf @@ -32,6 +32,7 @@ CONFIG_HAS_TASK_POWERBTN=y # USB-C and charging CONFIG_HAS_TASK_CHARGER=y +CONFIG_PLATFORM_EC_USB_PID=0x503e CONFIG_PLATFORM_EC_USBC_PPC_SN5S330=y CONFIG_PLATFORM_EC_USBC_PPC_SYV682X=y CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_NOT_PRESENT=y diff --git a/zephyr/projects/volteer/src/usb_pd_policy.c b/zephyr/projects/volteer/src/usb_pd_policy.c deleted file mode 100644 index 39bbd918a5..0000000000 --- a/zephyr/projects/volteer/src/usb_pd_policy.c +++ /dev/null @@ -1,81 +0,0 @@ -/* Copyright 2019 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. - */ -/* Shared USB-C policy for Volteer boards */ -#include "charge_manager.h" -#include "compile_time_macros.h" -#include "console.h" -#include "gpio.h" -#include "usb_mux.h" -#include "usbc_ppc.h" -#include "usb_pd.h" -#include "system.h" - -#define CPRINTF(format, args...) cprintf(CC_USBPD, format, ## args) -#define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args) - -int pd_check_vconn_swap(int port) -{ - /* Only allow vconn swap if pp5000_A rail is enabled */ - return gpio_get_level(GPIO_EN_PP5000_A); -} - -void pd_power_supply_reset(int port) -{ - int prev_en; - - prev_en = ppc_is_sourcing_vbus(port); - - /* Disable VBUS. */ - ppc_vbus_source_enable(port, 0); - - /* Enable discharge if we were previously sourcing 5V */ - if (prev_en) - pd_set_vbus_discharge(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) -{ - int rv; - - /* Disable charging. */ - rv = ppc_vbus_sink_enable(port, 0); - if (rv) - return rv; - - pd_set_vbus_discharge(port, 0); - - /* Provide Vbus. */ - rv = ppc_vbus_source_enable(port, 1); - if (rv) - return rv; - -#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) -{ - return ppc_is_vbus_present(port); -} - -int board_vbus_source_enabled(int port) -{ - return ppc_is_sourcing_vbus(port); -} |