diff --git a/src/mainboard/google/bluey/board.h b/src/mainboard/google/bluey/board.h
index 98e34fc64b..0544381e69 100644
--- a/src/mainboard/google/bluey/board.h
+++ b/src/mainboard/google/bluey/board.h
@@ -57,6 +57,7 @@ void setup_chromeos_gpios(void);
 bool is_off_mode(void);
 void configure_parallel_charging(void);
 void configure_parallel_charging_late(void);
+void configure_charging_debug_access(void);
 void enable_slow_battery_charging(void);
 void disable_slow_battery_charging(void);
 void launch_charger_applet(void);
diff --git a/src/mainboard/google/bluey/charging.c b/src/mainboard/google/bluey/charging.c
index f1af963ec2..690f30964f 100644
--- a/src/mainboard/google/bluey/charging.c
+++ b/src/mainboard/google/bluey/charging.c
@@ -139,6 +139,18 @@ void configure_parallel_charging(void)
 	spmi_write8(SPMI_ADDR(PMC8380F_SLAVE_ID, GPIO09_MODE_CTL), MODE_OUTPUT);
 }
 
+/*
+ * Enable SMB1 charging debug access port.
+ */
+void configure_charging_debug_access(void)
+{
+	if (!CONFIG(HAVE_CHARGING_DEBUG_ACCESS_PORT))
+		return;
+
+	printk(BIOS_INFO, "Enable charging debug access port support\n");
+	spmi_write8(SMB1_SCHG_TYPE_C_TYPE_C_DEBUG_ACCESS_SNK_CFG, EN_DEBUG_ACCESS_SNK);
+}
+
 /*
  * Late configuration for parallel charging.
  */
@@ -161,9 +173,6 @@ void enable_slow_battery_charging(void)
 	spmi_write8(SMB2_CHGR_MAX_FCC_CFG, FCC_1A_STEP_50MA);
 	spmi_write8(SMB1_CHGR_CHRG_EN_CMD, CHRG_ENABLE);
 	spmi_write8(SMB2_CHGR_CHRG_EN_CMD, CHRG_ENABLE);
-
-	if (CONFIG(HAVE_CHARGING_DEBUG_ACCESS_PORT))
-		spmi_write8(SMB1_SCHG_TYPE_C_TYPE_C_DEBUG_ACCESS_SNK_CFG, EN_DEBUG_ACCESS_SNK);
 }
 
 /*
diff --git a/src/mainboard/google/bluey/mainboard.c b/src/mainboard/google/bluey/mainboard.c
index 223daf89c8..64212d0e84 100644
--- a/src/mainboard/google/bluey/mainboard.c
+++ b/src/mainboard/google/bluey/mainboard.c
@@ -161,6 +161,7 @@ static void trigger_critical_battery_shutdown(void)
 static void mainboard_init(struct device *dev)
 {
 	configure_parallel_charging();
+	configure_charging_debug_access();
 
 	display_startup();