| From 4050f2683f2c3151dc3dd1501ac88c57caf810ff Mon Sep 17 00:00:00 2001 |
| From: Badhri Jagan Sridharan <badhri@google.com> |
| Date: Wed, 7 Apr 2021 13:07:20 -0700 |
| Subject: usb: typec: tcpm: update power supply once partner accepts |
| |
| From: Badhri Jagan Sridharan <badhri@google.com> |
| |
| commit 4050f2683f2c3151dc3dd1501ac88c57caf810ff upstream. |
| |
| power_supply_changed needs to be called to notify clients |
| after the partner accepts the requested values for the pps |
| case. |
| |
| Also, remove the redundant power_supply_changed at the end |
| of the tcpm_reset_port as power_supply_changed is already |
| called right after usb_type is changed. |
| |
| Fixes: f2a8aa053c176 ("typec: tcpm: Represent source supply through power_supply") |
| Signed-off-by: Badhri Jagan Sridharan <badhri@google.com> |
| Cc: stable <stable@vger.kernel.org> |
| Reviewed-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> |
| Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> |
| Link: https://lore.kernel.org/r/20210407200723.1914388-3-badhri@google.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/usb/typec/tcpm/tcpm.c | 4 +--- |
| 1 file changed, 1 insertion(+), 3 deletions(-) |
| |
| --- a/drivers/usb/typec/tcpm/tcpm.c |
| +++ b/drivers/usb/typec/tcpm/tcpm.c |
| @@ -2014,6 +2014,7 @@ static void tcpm_pd_ctrl_request(struct |
| 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: |
| @@ -2550,7 +2551,6 @@ static unsigned int tcpm_pd_select_pps_a |
| 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; |
| @@ -2966,8 +2966,6 @@ static void tcpm_reset_port(struct tcpm_ |
| port->sink_cap_done = false; |
| if (port->tcpc->enable_frs) |
| port->tcpc->enable_frs(port->tcpc, false); |
| - |
| - power_supply_changed(port->psy); |
| } |
| |
| static void tcpm_detach(struct tcpm_port *port) |
