diff --git a/board/samus_pd/gpio.inc b/board/samus_pd/gpio.inc
index 6345b7b365..8e6a100cd9 100644
--- a/board/samus_pd/gpio.inc
+++ b/board/samus_pd/gpio.inc
@@ -106,7 +106,7 @@ GPIO(EC_JTAG_TCK,            C, 6,  GPIO_INPUT,    NULL)
 GPIO(EC_JTAG_TMS,            C, 7,  GPIO_INPUT,    NULL)
 GPIO(EC_JTAG_TDO,            C, 8,  GPIO_INPUT,    NULL)
 GPIO(EC_JTAG_TDI,            C, 9,  GPIO_INPUT,    NULL)
-GPIO(PD_ENTERING_RW,         B, 5,  GPIO_OUT_LOW,  NULL)
+GPIO(ENTERING_RW,            B, 5,  GPIO_OUT_LOW,  NULL)
 GPIO(PD_DISABLE_DEBUG,       E, 15, GPIO_OUT_HIGH, NULL)
 GPIO(PD_DEBUG_EN_L,          D, 4,  GPIO_INPUT | GPIO_PULL_UP, NULL)
 GPIO(PD_SPI_PP3300_EN_L,     A, 7,  GPIO_OUT_HIGH, NULL)
@@ -120,9 +120,6 @@ GPIO(AP_UART_TX,             D, 5,  GPIO_OUT_LOW,  NULL)
 GPIO(AP_UART_RX,             D, 6,  GPIO_INPUT,    NULL)
 #endif
 
-/* Unimplemented signals which we need to emulate for now */
-UNIMPLEMENTED(ENTERING_RW)
-
 ALTERNATE(B, 0x0008, 0, MODULE_USB_PD, 0) /* SPI1: SCK(PB3) */
 ALTERNATE(B, 0x2000, 0, MODULE_USB_PD, 0) /* SPI2: SCK(PB13) */
 ALTERNATE(B, 0x0002, 0, MODULE_USB_PD, 0) /* TIM14_CH1: PB1) */