Merge pull request #455 from FrameworkComputer/hx30_DVT2_CHG_LOWPOWER

[modify] correct enable Charger LPM

Author: kiram9

board/hx30/board.c

@@ -14,6 +14,7 @@
 #include "adc_chip.h"
 #include "als.h"
 #include "bd99992gw.h"
+#include "battery.h"
 #include "button.h"
 #include "charge_state.h"
 #include "charger.h"
@@ -523,28 +524,64 @@ static void check_chassis_open(int init)
 	}
 }
 
-void charge_psys_onoff(uint8_t enable)
+
+void charge_gate_onoff(uint8_t enable)
 {
 	int control0 = 0x0000;
 	int control1 = 0x0000;
+
+	if (i2c_read16(I2C_PORT_CHARGER, ISL9241_ADDR_FLAGS,
+		ISL9241_REG_CONTROL0, &control0)) {
+		CPRINTS("read gate control1 fail");
+	}
+
+	if (i2c_read16(I2C_PORT_CHARGER, ISL9241_ADDR_FLAGS,
+		ISL9241_REG_CONTROL1, &control1)) {
+		CPRINTS("read gate control1 fail");
+	}
+
+	if (enable) {
+		control0 &= ~ISL9241_CONTROL0_NGATE;
+		control1 &= ~ISL9241_CONTROL1_BGATE;
+		CPRINTS("B&N Gate off");
+	} else {
+		control0 |= ISL9241_CONTROL0_NGATE;
+		control1 |= ISL9241_CONTROL1_BGATE;
+		CPRINTS("B&N Gate on");
+	}
+
+	if (i2c_write16(I2C_PORT_CHARGER, ISL9241_ADDR_FLAGS,
+		ISL9241_REG_CONTROL0, control0)) {
+		CPRINTS("Update gate control0 fail");
+	}
+
+	if (i2c_write16(I2C_PORT_CHARGER, ISL9241_ADDR_FLAGS,
+		ISL9241_REG_CONTROL1, control1)) {
+		CPRINTS("Update gate control1 fail");
+	}
+
+}
+
+
+void charge_psys_onoff(uint8_t enable)
+{
+	int control1 = 0x0000;
 	int control4 = 0x0000;
 	int data = 0x0000;
 
 	if (i2c_read16(I2C_PORT_CHARGER, ISL9241_ADDR_FLAGS,
 		ISL9241_REG_CONTROL1, &control1)) {
-		CPRINTS("read charger control1 fail");
+		CPRINTS("read psys control1 fail");
 	}
 
 	if (enable) {
-		control0 &= ~ISL9241_CONTROL0_NGATE;
-		control1 &= ~(ISL9241_CONTROL1_IMON | ISL9241_CONTROL1_BGATE);
+		control1 &= ~ISL9241_CONTROL1_IMON;
 		control1 |= ISL9241_CONTROL1_PSYS;
 		control4 &= ~ISL9241_CONTROL4_GP_COMPARATOR;
 		data = 0x0B00;		/* Set ACOK reference to 4.544V */
 		CPRINTS("Power saving disable");
 	} else {
-		control0 |= ISL9241_CONTROL0_NGATE;
-		control1 |= (ISL9241_CONTROL1_IMON | ISL9241_CONTROL1_BGATE);
+		control1 |= ISL9241_CONTROL1_IMON;
 		control1 &= ~ISL9241_CONTROL1_PSYS;
 		control4 |= ISL9241_CONTROL4_GP_COMPARATOR;
 		data = 0x0000;		/* Set ACOK reference to 0V */
@@ -557,22 +594,55 @@ void charge_psys_onoff(uint8_t enable)
 		CPRINTS("Update ACOK reference fail");
 	}
 
-	if (i2c_write16(I2C_PORT_CHARGER, ISL9241_ADDR_FLAGS,
-		ISL9241_REG_CONTROL0, control0)) {
-		CPRINTS("Update charger control0 fail");
-	}
-
 	if (i2c_write16(I2C_PORT_CHARGER, ISL9241_ADDR_FLAGS,
 		ISL9241_REG_CONTROL1, control1)) {
-		CPRINTS("Update charger control1 fail");
+		CPRINTS("Update psys control1 fail");
 	}
 
 	if (i2c_write16(I2C_PORT_CHARGER, ISL9241_ADDR_FLAGS,
 		ISL9241_REG_CONTROL4, control4)) {
-		CPRINTS("Update charger control4 fail");
+		CPRINTS("Update psys control4 fail");
 	}
 }
 
+
+/*
+ * Charger Low Power Mode Process
+ * modern standby should not turn off Bfet and Nfet
+ * DC only at S5 need enable
+ * AC+DC at S5 & Fully charge need enable
+ * AC+DC at Modern standby & Fully charge need enable
+ * AC only need disable
+ */
+void charger_low_power_update(void)
+{
+	static int ac_state;
+	static int dc_state;
+	int batt_status;
+
+	ac_state = extpower_is_present();
+	dc_state = battery_is_present();
+	battery_status(&batt_status);
+
+	if (dc_state && !ac_state &&
+		chipset_in_state(CHIPSET_STATE_ANY_OFF)) {
+		charge_gate_onoff(0);
+		charge_psys_onoff(0);
+	} else if (ac_state && dc_state &&
+		batt_status & STATUS_FULLY_CHARGED) {
+		if (chipset_in_state(CHIPSET_STATE_ANY_OFF)) {
+			charge_gate_onoff(0);
+			charge_psys_onoff(0);
+		} else if (chipset_in_state(CHIPSET_STATE_STANDBY))
+			charge_psys_onoff(0);
+	} else if (ac_state && !dc_state) {
+		charge_gate_onoff(1);
+		charge_psys_onoff(1);
+	}
+}
+DECLARE_HOOK(HOOK_AC_CHANGE, charger_low_power_update, HOOK_PRIO_DEFAULT);
+DECLARE_HOOK(HOOK_BATTERY_SOC_CHANGE, charger_low_power_update, HOOK_PRIO_DEFAULT);
+
 /* Initialize board. */
 static void board_init(void)
 {
@@ -603,6 +673,7 @@ DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT + 1);
 static void board_chipset_startup(void)
 {
 	CPRINTS("HOOK_CHIPSET_STARTUP - called board_chipset_startup");
+	charge_gate_onoff(1);
 	charge_psys_onoff(1);
 }
 DECLARE_HOOK(HOOK_CHIPSET_STARTUP,
@@ -612,12 +683,21 @@ DECLARE_HOOK(HOOK_CHIPSET_STARTUP,
 /* Called on AP S3 -> S5 transition */
 static void board_chipset_shutdown(void)
 {
+	int batt_status;
+
+	battery_status(&batt_status);
+
 	CPRINTS(" HOOK_CHIPSET_SHUTDOWN board_chipset_shutdown");
 
 #ifdef CONFIG_EMI_REGION1
 	lpc_set_host_event_mask(LPC_HOST_EVENT_SCI, 0);
 #endif
-	charge_psys_onoff(0);
+
+	/* avoid AC mode enable charger LPM when charging*/
+	if (!extpower_is_present() || (batt_status & STATUS_FULLY_CHARGED)) {
+		charge_gate_onoff(0);
+		charge_psys_onoff(0);
+	}
 }
 DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN,
 		board_chipset_shutdown,
@@ -630,6 +710,7 @@ static void board_chipset_resume(void)
 	/*gpio_set_level(GPIO_ENABLE_BACKLIGHT, 1);*/
 	gpio_set_level(GPIO_EC_MUTE_L, 1);
 	gpio_set_level(GPIO_CAM_EN, 1);
+	charge_psys_onoff(1);
 }
 DECLARE_HOOK(HOOK_CHIPSET_RESUME, board_chipset_resume,
 	     MOTION_SENSE_HOOK_PRIO-1);
@@ -643,6 +724,7 @@ static void board_chipset_suspend(void)
 		gpio_set_level(GPIO_EC_MUTE_L, 0);
 		gpio_set_level(GPIO_CAM_EN, 0);
 	}
+	charge_psys_onoff(0);
 }
 DECLARE_HOOK(HOOK_CHIPSET_SUSPEND,
 		board_chipset_suspend,