diff --git a/board/grunt/board.c b/board/grunt/board.c
index c3ba3b7374..9d9cb14d67 100644
--- a/board/grunt/board.c
+++ b/board/grunt/board.c
@@ -313,6 +313,7 @@ void board_tcpc_init(void)
 		mux->hpd_update(port, 0, 0);
 	}
 }
+DECLARE_HOOK(HOOK_INIT, board_tcpc_init, HOOK_PRIO_INIT_I2C + 1);
 
 void board_overcurrent_event(int port)
 {
diff --git a/board/grunt/board.h b/board/grunt/board.h
index 9356ad74f6..ceeb2584e2 100644
--- a/board/grunt/board.h
+++ b/board/grunt/board.h
@@ -78,7 +78,6 @@
 #define CONFIG_USB_PD_LOGGING
 #define CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT TYPEC_RP_3A0
 #define CONFIG_USB_PD_PORT_COUNT 2
-#define CONFIG_USB_PD_TCPC_BOARD_INIT
 #define CONFIG_USB_PD_TCPC_LOW_POWER
 #define CONFIG_USB_PD_TCPM_ANX74XX
 #define CONFIG_USB_PD_TCPM_MUX