summaryrefslogtreecommitdiff
path: root/board/samus_pd
diff options
context:
space:
mode:
Diffstat (limited to 'board/samus_pd')
-rw-r--r--board/samus_pd/board.c17
-rw-r--r--board/samus_pd/board.h3
2 files changed, 1 insertions, 19 deletions
diff --git a/board/samus_pd/board.c b/board/samus_pd/board.c
index 8e574527c1..270c82e7e9 100644
--- a/board/samus_pd/board.c
+++ b/board/samus_pd/board.c
@@ -207,7 +207,6 @@ void board_config_pre_init(void)
/* Initialize board. */
static void board_init(void)
{
- int pd_enable;
int slp_s5 = gpio_get_level(GPIO_PCH_SLP_S5_L);
int slp_s3 = gpio_get_level(GPIO_PCH_SLP_S3_L);
@@ -254,22 +253,6 @@ static void board_init(void)
if (system_get_image_copy() == SYSTEM_IMAGE_RW)
pd_status_flags |= PD_STATUS_IN_RW;
- /*
- * Do not enable PD communication in RO as a security measure.
- * We don't want to allow communication to outside world until
- * we jump to RW. This can by overridden with the removal of
- * the write protect screw to allow for easier testing, and for
- * booting without a battery.
- */
- if (system_get_image_copy() != SYSTEM_IMAGE_RW
- && system_is_locked()) {
- ccprintf("[%T PD comm disabled]\n");
- pd_enable = 0;
- } else {
- pd_enable = 1;
- }
- pd_comm_enable(pd_enable);
-
#ifdef CONFIG_PWM
/* Enable ILIM PWM: initial duty cycle 0% = 500mA limit. */
pwm_enable(PWM_CH_ILIM, 1);
diff --git a/board/samus_pd/board.h b/board/samus_pd/board.h
index a1f34546e5..e0a7b4e929 100644
--- a/board/samus_pd/board.h
+++ b/board/samus_pd/board.h
@@ -52,8 +52,7 @@
#define CONFIG_USB_PD_ALT_MODE
#define CONFIG_USB_PD_ALT_MODE_DFP
#define CONFIG_USB_PD_CHECK_MAX_REQUEST_ALLOWED
-#undef CONFIG_USB_PD_COMM_ENABLED
-#define CONFIG_USB_PD_COMM_ENABLED 0
+#define CONFIG_USB_PD_COMM_LOCKED
#define CONFIG_USB_PD_CUSTOM_VDM
#define CONFIG_USB_PD_DUAL_ROLE
#define CONFIG_USB_PD_TRY_SRC