shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-03-26 12:30:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: usb: typec: tcpm: Update tcpm_update_sink_capabilities

Browse Source 
https://lore.kernel.org/r/20210114145053.1952756-2-kyletso@google.com
introduced AMS. Update tcpm_update_sink_capabilities to use AMS
as well.

Bug: 169695061
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
Change-Id: I2578d404a067e1b76b1697b02ded7ab83d81ab9e
This commit is contained in:
Badhri Jagan Sridharan
2021-04-13 14:20:32 -07:00
parent c50ebbb88d
commit 8d92227969
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/usb/typec/tcpm/tcpm.c
View File

@@ -5948,13 +5948,14 @@ static int tcpm_copy_pdos(u32 *dest_pdo, const u32 *src_pdo, unsigned int nr_pdo
int tcpm_update_sink_capabilities(struct tcpm_port *port, const u32 *pdo, unsigned int nr_pdo,
unsigned int operating_snk_mw)
{
int ret = 0;
if (tcpm_validate_caps(port, pdo, nr_pdo))
return -EINVAL;
mutex_lock(&port->lock);
port->nr_snk_pdo = tcpm_copy_pdos(port->snk_pdo, pdo, nr_pdo);
port->operating_snk_mw = operating_snk_mw;
port->update_sink_caps = true;
switch (port->state) {
case SNK_NEGOTIATE_CAPABILITIES:
@@ -5963,15 +5964,25 @@ int tcpm_update_sink_capabilities(struct tcpm_port *port, const u32 *pdo, unsign
case SNK_TRANSITION_SINK:
case SNK_TRANSITION_SINK_VBUS:
if (port->pps_data.active)
tcpm_set_state(port, SNK_NEGOTIATE_PPS_CAPABILITIES, 0);
port->upcoming_state = SNK_NEGOTIATE_PPS_CAPABILITIES;
else if (port->pd_capable)
port->upcoming_state = SNK_NEGOTIATE_CAPABILITIES;
else
tcpm_set_state(port, SNK_NEGOTIATE_CAPABILITIES, 0);
break;
port->update_sink_caps = true;
ret = tcpm_ams_start(port, POWER_NEGOTIATION);
if (ret == -EAGAIN) {
port->upcoming_state = INVALID_STATE;
break;
}
break;
default:
break;
}
mutex_unlock(&port->lock);
return 0;
return ret;
}
EXPORT_SYMBOL_GPL(tcpm_update_sink_capabilities);