3 files changed, 14 insertions, 8 deletions

diff --git a/baseboard/guybrush/baseboard.c b/baseboard/guybrush/baseboard.c
index c79d14cf6d..5d36f5be9a 100644
--- a/baseboard/guybrush/baseboard.c
+++ b/baseboard/guybrush/baseboard.c
@@ -5,25 +5,25 @@
 
 /* Guybrush family-specific configuration */
 
+#include "cros_board_info.h"
 #include "base_fw_config.h"
 #include "battery_fuel_gauge.h"
 #include "charge_manager.h"
 #include "charge_ramp.h"
-#include "charge_state.h"
 #include "charge_state_v2.h"
+#include "charge_state.h"
 #include "charger.h"
 #include "chip/npcx/ps2_chip.h"
 #include "chip/npcx/pwm_chip.h"
 #include "chipset.h"
-#include "cros_board_info.h"
 #include "driver/ppc/aoz1380_public.h"
 #include "driver/ppc/nx20p348x.h"
 #include "driver/retimer/anx7491.h"
 #include "driver/retimer/ps8811.h"
 #include "driver/retimer/ps8818_public.h"
 #include "driver/tcpm/nct38xx.h"
-#include "driver/usb_mux/amd_fp6.h"
 #include "driver/usb_mux/anx7451.h"
+#include "driver/usb_mux/amd_fp6.h"
 #include "fan.h"
 #include "fan_chip.h"
 #include "gpio.h"
@@ -246,7 +246,7 @@ const struct usb_mux usbc1_ps8818 = {
 	.usb_port = USBC_PORT_C1,
 	.i2c_port = I2C_PORT_TCPC1,
 	.flags = USB_MUX_FLAG_RESETS_IN_G3,
-	.i2c_addr_flags = PS8818_I2C_ADDR0_FLAGS,
+	.i2c_addr_flags = PS8818_I2C_ADDR_FLAGS,
 	.driver = &ps8818_usb_retimer_driver,
 	.board_set = &board_c1_ps8818_mux_set,
 };
@@ -534,6 +534,13 @@ int board_aoz1380_set_vbus_source_current_limit(int port, enum tcpc_rp_value rp)
 	return rv;
 }
 
+void board_set_charge_limit(int port, int supplier, int charge_ma, int max_ma,
+			    int charge_mv)
+{
+	charge_set_input_current_limit(
+		MAX(charge_ma, CONFIG_CHARGER_INPUT_CURRENT), charge_mv);
+}
+
 void sbu_fault_interrupt(enum ioex_signal signal)
 {
 	int port = (signal == IOEX_USB_C0_SBU_FAULT_ODL) ? 0 : 1;
@@ -574,7 +581,7 @@ static void reset_nct38xx_port(int port)
 						GPIO_USB_C0_TCPC_RST_L :
 						GPIO_USB_C1_TCPC_RST_L;
 
-	if (port < 0 || port >= USBC_PORT_COUNT) {
+	if (port < 0 || port > USBC_PORT_COUNT) {
 		CPRINTSUSB("%s invalid port %d", __func__, port);
 		return;
 	}
diff --git a/baseboard/guybrush/baseboard.h b/baseboard/guybrush/baseboard.h
index e5223abfbe..04b1e10c97 100644
--- a/baseboard/guybrush/baseboard.h
+++ b/baseboard/guybrush/baseboard.h
@@ -162,8 +162,7 @@
 #define CONFIG_CHARGER
 #define CONFIG_CHARGE_MANAGER
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
-#define CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT 512
-#define CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT 512
+#define CONFIG_CHARGER_INPUT_CURRENT 512
 #define CONFIG_CHARGER_ISL9241
 #define CONFIG_CHARGER_SENSE_RESISTOR 10
 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 20
diff --git a/baseboard/guybrush/cbi.c b/baseboard/guybrush/cbi.c
index 1baf506297..6ce6fe0eb7 100644
--- a/baseboard/guybrush/cbi.c
+++ b/baseboard/guybrush/cbi.c
@@ -6,8 +6,8 @@
 /* Guybrush CrOS Board Info(CBI) utilities */
 
 #include "base_fw_config.h"
-#include "common.h"
 #include "console.h"
+#include "common.h"
 #include "cros_board_info.h"
 #include "hooks.h"