Merge pull request #1052 from FrameworkComputer/marigold.power_0617

Marigold:  modify charger and power limit settings

Author: JohnAZoidberg

driver/charger/isl9241.h

@@ -49,6 +49,7 @@
 #define RAA489110_CONTROL0_EN_FORCE_BUCK_MODE BIT(10)
 #define ISL9241_CONTROL0_EN_BYPASS_GATE BIT(11)
 #define ISL9241_CONTROL0_NGATE_OFF BIT(12)
+#define ISL9241_CONTROL0_CSIN_SINK_DISCHARGE BIT(15)
 
 #define ISL9241_REG_INFORMATION1 0x3A
 #define ISL9241_REG_INFORMATION1_LOW_VSYS_PROCHOT BIT(10)

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

@@ -125,7 +125,8 @@ static void charger_chips_init(void)
 		goto init_fail;
 
 	if (i2c_write16(I2C_PORT_CHARGER, ISL9241_ADDR_FLAGS,
-		ISL9241_REG_CONTROL0, 0x0000))
+		ISL9241_REG_CONTROL0,
+		ISL9241_CONTROL0_CSIN_SINK_DISCHARGE))
 		goto init_fail;
 
 	val = ISL9241_CONTROL1_PROCHOT_REF_6800;

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

@@ -92,7 +92,7 @@ void update_soc_power_limit(bool force_update, bool force_no_adapter)
 	} else {
 		if (active_power >= 55) {
 			/* ADP >= 55W */
-			pl1_watt = 25;
+			pl1_watt = 30;
 			pl2_watt = MIN((((active_power * 90) / 100) - 20), 60);
 			psyspl2_watt = ((active_power * 95) / 100);
 
@@ -106,7 +106,7 @@ void update_soc_power_limit(bool force_update, bool force_no_adapter)
 
 		} else {
 			/*ADP < 55W*/
-			pl1_watt = 25;
+			pl1_watt = 30;
 			pl2_watt = 30;
 			psyspl2_watt = ((active_power * 95) / 100);