marigold: control CSIN SINK Discharge (#1057)

when plug-out ac should set 0x39 bit15 for fast discharge
until charger response acok level to low.

This is to solve the icon side effect issue when theAC is removed. Set charger 0x39 bit15 to "1" to speed up the sink input current. Because there is not set it back to "0", the charger continues to discharge in the AC state, increasing power consumption.

The solution proposed by the Power team is that the AC is unplugged, bit15 will be set to "1" first, and then set to "0" when the charger response acok level to low is reached, which can avoid this problem.

Signed-off-by: LeoCX_Tsai <LeoCX_Tsai@compal.com>
Co-authored-by: Daniel Schaefer <dhs@frame.work>

Author: LeoCX-Tsai

zephyr/program/framework/include/marigold/charger.h

@@ -10,7 +10,8 @@
  * Control ACOK by active charger port voltage
  *
  * @param voltage			active port voltage
+ * @param port			    active port
  */
-void acok_control(int voltage);
+void acok_control(int voltage, int port);
 
 #endif /* __CHARGER_H__ */

zephyr/program/framework/marigold/src/charger.c

@@ -126,7 +126,7 @@ static void charger_chips_init(void)
 
 	if (i2c_write16(I2C_PORT_CHARGER, ISL9241_ADDR_FLAGS,
 		ISL9241_REG_CONTROL0,
-		ISL9241_CONTROL0_CSIN_SINK_DISCHARGE))
+		0x0000))
 		goto init_fail;
 
 	val = ISL9241_CONTROL1_PROCHOT_REF_6800;
@@ -313,10 +313,28 @@ __override void board_hibernate(void)
 	charge_gate_onoff(0);
 }
 
-void acok_control(int voltage)
+void acok_control(int voltage, int port)
 {
 	static int pre_acok_data;
 	int acok_data = 0x00;
+	int control0 = 0x0000;
+
+	/* when detect AC but PD not connect, set BIT15 for fast Discharge */
+	if (extpower_is_present() && port == -1) {
+
+		if (i2c_read16(I2C_PORT_CHARGER, ISL9241_ADDR_FLAGS,
+			ISL9241_REG_CONTROL0, &control0)) {
+			CPRINTS("ISL9241: read control0 fail");
+		}
+
+		CPRINTS("CSIN SINK Discharge Enable");
+		control0 |= ISL9241_CONTROL0_CSIN_SINK_DISCHARGE;
+
+		if (i2c_write16(I2C_PORT_CHARGER, ISL9241_ADDR_FLAGS,
+		ISL9241_REG_CONTROL0, control0)) {
+			CPRINTS("ISL9241: Enable CSIN SINK control0 fail");
+		}
+	}
 
 	if (!charger_psys_enable_flag)
 		return;
@@ -334,3 +352,26 @@ void acok_control(int voltage)
 		pre_acok_data = acok_data;
 	}
 }
+
+/* only disable the fast discharge when the acok deasserts */
+void disable_fast_discharge(void)
+{
+	int control0 = 0x0000;
+
+	if (extpower_is_present())
+		return;
+
+	if (i2c_read16(I2C_PORT_CHARGER, ISL9241_ADDR_FLAGS,
+		ISL9241_REG_CONTROL0, &control0)) {
+		CPRINTS("ISL9241: read control0 fail");
+	}
+
+	CPRINTS("CSIN SINK Discharge Disable");
+	control0 &= ~ISL9241_CONTROL0_CSIN_SINK_DISCHARGE;
+
+	if (i2c_write16(I2C_PORT_CHARGER, ISL9241_ADDR_FLAGS,
+		ISL9241_REG_CONTROL0, control0)) {
+		CPRINTS("ISL9241: Disable CSIN SINK control0 fail");
+	}
+}
+DECLARE_HOOK(HOOK_AC_CHANGE, disable_fast_discharge, HOOK_PRIO_DEFAULT);

zephyr/program/framework/src/cypd_ccg6.c

@@ -300,7 +300,7 @@ int board_set_active_charge_port(int charge_port)
 	hook_call_deferred(&update_power_state_deferred_data, 100 * MSEC);
 
 #ifdef CONFIG_BOARD_MARIGOLD
-	acok_control(pd_port_states[charge_port].voltage);
+	acok_control(pd_port_states[charge_port].voltage, charge_port);
 #endif	/*CONFIG_BOARD_MARIGOLD*/
 
 	return EC_SUCCESS;