Skip to content

Commit 7ed69e5

Browse files
authored
Merge pull request #446 from FrameworkComputer/hx30.fix_4_ports_control
[fix] 4 ports leakage
2 parents 85a2d53 + b46f825 commit 7ed69e5

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

board/hx30/cypress5525.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1429,12 +1429,12 @@ DECLARE_DEFERRED(update_power_limit_deferred);
14291429
static int prev_charge_port = -1;
14301430
int board_set_active_charge_port(int charge_port)
14311431
{
1432-
ccprintf("start change port = %d", charge_port);
1432+
CPRINTS("start change port = %d, prev_charge_port = %d", charge_port, prev_charge_port);
14331433

14341434
/* port need change, stop all power and ready to switch. */
14351435
if (prev_charge_port != -1 && prev_charge_port != charge_port) {
14361436
update_soc_power_limit(false, true);
1437-
ccprintf("%s: all off", __func__);
1437+
CPRINTS("all off");
14381438
cypd_write_reg8(0, CYP5525_CUST_C_CTRL_CONTROL_REG, CYP5525_P0P1_TURN_OFF_C_CTRL);
14391439
cypd_write_reg8(1, CYP5525_CUST_C_CTRL_CONTROL_REG, CYP5525_P0P1_TURN_OFF_C_CTRL);
14401440
usleep(250*MSEC);
@@ -1447,12 +1447,14 @@ int board_set_active_charge_port(int charge_port)
14471447
int pd_controller = (charge_port & 0x02) >> 1;
14481448
int pd_port = charge_port & 0x01;
14491449

1450-
ccprintf("%s: choose port %d", __func__, charge_port);
1451-
ccprintf("%s: controller = %d, port = %d", __func__, pd_controller, pd_port);
1450+
CPRINTS("choose p %d, ctrler = %d, p = %d", charge_port, pd_controller, pd_port);
14521451
cypd_write_reg8(pd_controller, CYP5525_CUST_C_CTRL_CONTROL_REG,
14531452
pd_port ? CYP5525_P0_OFF_P1_CY : CYP5525_P0_CY_P1_OFF);
1453+
CPRINTS("force off ctrler = %d", (~pd_controller) & 0x01);
1454+
cypd_write_reg8((~pd_controller) & 0x01, CYP5525_CUST_C_CTRL_CONTROL_REG,
1455+
CYP5525_P0P1_TURN_OFF_C_CTRL);
14541456
} else {
1455-
ccprintf("%s: else = %d, set all ports auto", __func__, charge_port);
1457+
CPRINTS("else = %d, set all ports auto", charge_port);
14561458
cypd_write_reg8(0, CYP5525_CUST_C_CTRL_CONTROL_REG, CYP5525_P0P1_CONTROL_BY_CY);
14571459
cypd_write_reg8(1, CYP5525_CUST_C_CTRL_CONTROL_REG, CYP5525_P0P1_CONTROL_BY_CY);
14581460
}

0 commit comments

Comments
 (0)