mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-28 11:18:45 +07:00
staging: typec: tcpm: Report right typec_pwr_opmode
At present, TCPM does not take into account the actual resistor value presented in the CC line and therefore reports TYPEC_PWR_MODE_USB irrespective of the power_op_mode it is in. This patch makes TCPM consider the actual value of Rp. Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
c79d92bda8
commit
fce042f02e
@ -2130,9 +2130,23 @@ static void tcpm_swap_complete(struct tcpm_port *port, int result)
|
||||
}
|
||||
}
|
||||
|
||||
enum typec_pwr_opmode tcpm_get_pwr_opmode(enum typec_cc_status cc)
|
||||
{
|
||||
switch (cc) {
|
||||
case TYPEC_CC_RP_1_5:
|
||||
return TYPEC_PWR_MODE_1_5A;
|
||||
case TYPEC_CC_RP_3_0:
|
||||
return TYPEC_PWR_MODE_3_0A;
|
||||
case TYPEC_CC_RP_DEF:
|
||||
default:
|
||||
return TYPEC_PWR_MODE_USB;
|
||||
}
|
||||
}
|
||||
|
||||
static void run_state_machine(struct tcpm_port *port)
|
||||
{
|
||||
int ret;
|
||||
enum typec_pwr_opmode opmode;
|
||||
|
||||
port->enter_state = port->state;
|
||||
switch (port->state) {
|
||||
@ -2209,7 +2223,8 @@ static void run_state_machine(struct tcpm_port *port)
|
||||
ret < 0 ? 0 : PD_T_PS_SOURCE_ON);
|
||||
break;
|
||||
case SRC_STARTUP:
|
||||
typec_set_pwr_opmode(port->typec_port, TYPEC_PWR_MODE_USB);
|
||||
opmode = tcpm_get_pwr_opmode(tcpm_rp_cc(port));
|
||||
typec_set_pwr_opmode(port->typec_port, opmode);
|
||||
port->pwr_opmode = TYPEC_PWR_MODE_USB;
|
||||
port->caps_count = 0;
|
||||
port->message_id = 0;
|
||||
@ -2371,7 +2386,9 @@ static void run_state_machine(struct tcpm_port *port)
|
||||
break;
|
||||
case SNK_STARTUP:
|
||||
/* XXX: callback into infrastructure */
|
||||
typec_set_pwr_opmode(port->typec_port, TYPEC_PWR_MODE_USB);
|
||||
opmode = tcpm_get_pwr_opmode(port->polarity ?
|
||||
port->cc2 : port->cc1);
|
||||
typec_set_pwr_opmode(port->typec_port, opmode);
|
||||
port->pwr_opmode = TYPEC_PWR_MODE_USB;
|
||||
port->message_id = 0;
|
||||
port->rx_msgid = -1;
|
||||
|
Loading…
Reference in New Issue
Block a user