4 files changed, 20 insertions, 13 deletions
diff --git a/baseboard/asurada/baseboard.c b/baseboard/asurada/baseboard.c
index c315841a6a..3a881c275a 100644
--- a/baseboard/asurada/baseboard.c
+++ b/baseboard/asurada/baseboard.c
@@ -8,14 +8,15 @@
 #include "adc.h"
 #include "button.h"
 #include "charge_manager.h"
+#include "charger.h"
+#include "charger.h"
 #include "charge_state.h"
 #include "charge_state_v2.h"
-#include "charger.h"
 #include "chipset.h"
 #include "common.h"
 #include "console.h"
-#include "driver/accel_lis2dw12.h"
 #include "driver/accelgyro_bmi_common.h"
+#include "driver/accel_lis2dw12.h"
 #include "driver/als_tcs3400.h"
 #include "driver/bc12/mt6360.h"
 #include "driver/charger/isl923x.h"
@@ -30,8 +31,8 @@
 #include "keyboard_scan.h"
 #include "lid_switch.h"
 #include "motion_sense.h"
-#include "power.h"
 #include "power_button.h"
+#include "power.h"
 #include "regulator.h"
 #include "spi.h"
 #include "switch.h"
@@ -41,7 +42,6 @@
 #include "timer.h"
 #include "uart.h"
 
-/* This must be last. */
 #include "gpio_list.h"
 
 /* Wake-up pins for hibernate */
diff --git a/baseboard/asurada/baseboard.h b/baseboard/asurada/baseboard.h
index a8b62ccf59..62f74e1f57 100644
--- a/baseboard/asurada/baseboard.h
+++ b/baseboard/asurada/baseboard.h
@@ -60,8 +60,7 @@
 #define CONFIG_CHARGER
 #define CONFIG_CHARGE_RAMP_HW
 #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_ISL9238C
 #define CONFIG_CHARGER_MAINTAIN_VBAT
 #define CONFIG_CHARGER_OTG
@@ -184,8 +183,8 @@
 #ifndef __ASSEMBLER__
 
 #include "gpio_signal.h"
-#include "power/mt8192.h"
 #include "registers.h"
+#include "power/mt8192.h"
 
 void board_reset_pd_mcu(void);
 enum board_sub_board board_get_sub_board(void);
diff --git a/baseboard/asurada/regulator.c b/baseboard/asurada/regulator.c
index 0487f8faa6..e2731c8385 100644
--- a/baseboard/asurada/regulator.c
+++ b/baseboard/asurada/regulator.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include "bc12/mt6360_public.h"
 #include "common.h"
+#include "bc12/mt6360_public.h"
 
 /* SD Card */
 int board_regulator_get_info(uint32_t index, char *name, uint16_t *num_voltages,
diff --git a/baseboard/asurada/usbc_config.c b/baseboard/asurada/usbc_config.c
index 89b027124e..0be43d343a 100644
--- a/baseboard/asurada/usbc_config.c
+++ b/baseboard/asurada/usbc_config.c
@@ -7,11 +7,11 @@
 
 #include "adc.h"
 #include "baseboard_common.h"
-#include "bc12/mt6360_public.h"
 #include "bc12/pi3usb9201_public.h"
+#include "bc12/mt6360_public.h"
 #include "button.h"
-#include "charge_state_v2.h"
 #include "charger.h"
+#include "charge_state_v2.h"
 #include "charger/isl923x_public.h"
 #include "console.h"
 #include "ec_commands.h"
@@ -20,19 +20,20 @@
 #include "hooks.h"
 #include "i2c.h"
 #include "lid_switch.h"
+#include "task.h"
+#include "ppc/syv682x_public.h"
 #include "power.h"
 #include "power_button.h"
-#include "ppc/syv682x_public.h"
 #include "spi.h"
 #include "switch.h"
 #include "tablet_mode.h"
-#include "task.h"
 #include "tcpm/it8xxx2_pd_public.h"
 #include "uart.h"
+#include "usbc_ppc.h"
 #include "usb_charge.h"
 #include "usb_mux.h"
-#include "usb_mux/it5205_public.h"
 #include "usb_mux/ps8743_public.h"
+#include "usb_mux/it5205_public.h"
 #include "usb_pd_tcpm.h"
 #include "usbc_ppc.h"
 
@@ -308,6 +309,13 @@ void board_reset_pd_mcu(void)
 	 */
 }
 
+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 board_pd_vconn_ctrl(int port, enum usbpd_cc_pin cc_pin, int enabled)
 {
 	/*