power: apply safety margin on USB-PD only

Signed-off-by: Michał Kopeć <[email protected]>
Dasharo · Oct 18, 2024 · 4312637 · 4312637
1 parent 582481d
commit 4312637
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/board/system76/common/charger/bq24780s.c b/src/board/system76/common/charger/bq24780s.c
@@ -153,7 +153,7 @@ int16_t battery_charger_enable(void) {
     res = smbus_write(
         CHARGER_ADDRESS,
         REG_INPUT_CURRENT,
-        INPUT_CURRENT(battery_charger_input_current * 9 / 10)
+        INPUT_CURRENT(battery_charger_input_current)
     );
     if (res < 0)
         return res;

diff --git a/src/board/system76/common/charger/oz26786.c b/src/board/system76/common/charger/oz26786.c
@@ -172,7 +172,7 @@ int16_t battery_charger_enable(void) {
     res = smbus_write(
         CHARGER_ADDRESS,
         REG_ADAPTER_CURRENT,
-        INPUT_CURRENT((uint32_t)battery_charger_input_current * 93 / 100)
+        INPUT_CURRENT((uint32_t)battery_charger_input_current)
     );
     if (res < 0)
         return res;

diff --git a/src/board/system76/common/power.c b/src/board/system76/common/power.c
@@ -352,8 +352,6 @@ void power_peci_limit(bool ac) {
         supply_watts = (uint32_t)battery_charger_input_current *
             (uint32_t)battery_charger_input_voltage / 1000;
         DEBUG("%llu W supply detected\n", supply_watts);
-        // 7% safety margin
-        supply_watts = supply_watts * 93 / 100;
     }
 
     if (!ac || !supply_watts || options_get(OPT_ALLOW_BAT_BOOST)) {

diff --git a/src/board/system76/common/usbpd/tps65987.c b/src/board/system76/common/usbpd/tps65987.c
@@ -302,11 +302,13 @@ void usbpd_event(void) {
             } else if (sink_ctrl_1) {
                 while ((res = usbpd_current_limit(PORT_A_ADDRESS)) < 0 && retry--) {};
                 next_input_current = res < CHARGER_INPUT_CURRENT ? res : CHARGER_INPUT_CURRENT;
+                next_input_current = (uint32_t)next_input_current * 93 / 100;
                 next_input_voltage = BATTERY_CHARGER_VOLTAGE_PD;
 #ifdef USBPD_DUAL_PORT
             } else if (sink_ctrl_2) {
                 while ((res = usbpd_current_limit(PORT_B_ADDRESS)) < 0 && retry--) {};
                 next_input_current = res < CHARGER_INPUT_CURRENT ? res : CHARGER_INPUT_CURRENT;
+                next_input_current = (uint32_t)next_input_current * 93 / 100;
                 next_input_voltage = BATTERY_CHARGER_VOLTAGE_PD;
 #endif
             }