From 9b6fc6b2134fabf53ab8c1017d98aa86b98e2c69 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 14 May 2021 14:32:35 +0200 Subject: [PATCH] Revert "usb: typec: tcpm: update power supply once partner accepts" This reverts commit 230bd196536bdb18cf825479e2deb487a58f36a5 which is 4050f2683f2c3151dc3dd1501ac88c57caf810ff commit upstream in 5.4.119 as it breaks the kernel abi. If it needs to come back, it needs to be done in an abi-preserving way. Bug: 161946584 Cc: Badhri Jagan Sridharan Signed-off-by: Greg Kroah-Hartman Change-Id: I81c5bdc4da5fc1c6760bbf16d7bd22ca7fe20509 --- drivers/usb/typec/tcpm/tcpm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index c3f7545f1f9a..4575cf047b6f 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -1814,7 +1814,6 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, port->pps_data.max_curr = port->pps_data.req_max_curr; port->req_supply_voltage = port->pps_data.req_out_volt; port->req_current_limit = port->pps_data.req_op_curr; - power_supply_changed(port->psy); tcpm_set_state(port, SNK_TRANSITION_SINK, 0); break; case SOFT_RESET_SEND: @@ -2338,6 +2337,7 @@ static unsigned int tcpm_pd_select_pps_apdo(struct tcpm_port *port) port->pps_data.req_out_volt)); port->pps_data.req_op_curr = min(port->pps_data.max_curr, port->pps_data.req_op_curr); + power_supply_changed(port->psy); } return src_pdo; @@ -2737,6 +2737,8 @@ static void tcpm_reset_port(struct tcpm_port *port) port->try_src_count = 0; port->try_snk_count = 0; port->usb_type = POWER_SUPPLY_USB_TYPE_C; + + power_supply_changed(port->psy); } static void tcpm_detach(struct tcpm_port *port)