diff options
| -rw-r--r-- | board/volteer/board.c | 7 | ||||
| -rw-r--r-- | board/volteer/usbc_config.c | 8 | ||||
| -rw-r--r-- | zephyr/projects/volteer/prj.conf | 1 |
3 files changed, 9 insertions, 7 deletions
diff --git a/board/volteer/board.c b/board/volteer/board.c index c7e40892d2..bc9446c2af 100644 --- a/board/volteer/board.c +++ b/board/volteer/board.c @@ -255,10 +255,3 @@ const struct pwm_t pwm_channels[] = { }, }; BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT); - -/******************************************************************************/ -/* USB-A charging control */ - -const int usb_port_enable[USB_PORT_COUNT] = { - GPIO_EN_PP5000_USBA, -}; diff --git a/board/volteer/usbc_config.c b/board/volteer/usbc_config.c index bc2d368ffd..9e76eef5bd 100644 --- a/board/volteer/usbc_config.c +++ b/board/volteer/usbc_config.c @@ -6,6 +6,7 @@ /* Volteer family-specific USB-C configuration */ #include "common.h" #include "cbi_ec_fw_config.h" +#include "gpio.h" #include "hooks.h" #include "system.h" #include "timer.h" @@ -198,6 +199,13 @@ BUILD_ASSERT(ARRAY_SIZE(tcpc_config) == USBC_PORT_COUNT); BUILD_ASSERT(CONFIG_USB_PD_PORT_MAX_COUNT == USBC_PORT_COUNT); /******************************************************************************/ +/* USB-A charging control */ + +const int usb_port_enable[USB_PORT_COUNT] = { + GPIO_EN_PP5000_USBA, +}; + +/******************************************************************************/ /* USBC mux configuration - Tiger Lake includes internal mux */ struct usb_mux usbc1_tcss_usb_mux = { .usb_port = USBC_PORT_C1, diff --git a/zephyr/projects/volteer/prj.conf b/zephyr/projects/volteer/prj.conf index b29a121a22..e6ae1b5959 100644 --- a/zephyr/projects/volteer/prj.conf +++ b/zephyr/projects/volteer/prj.conf @@ -53,3 +53,4 @@ CONFIG_PLATFORM_EC_USB_PD_TCPM_MUX=y CONFIG_HAS_TASK_PD_C1=y CONFIG_HAS_TASK_PD_INT_C1=y CONFIG_PLATFORM_EC_USBC_PPC_DEDICATED_INT=y +CONFIG_PLATFORM_EC_USB_A_PORT_COUNT=1 |