diff options
| author |   Badhri Jagan Sridharan <badhri@google.com> | 2017-08-15 16:22:13 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-18 15:57:16 -0700 |
| commit | fce042f02ef03c5d05fc33b692133e2ed0b9dc18 (patch) | |
| tree | 04d26ada761a5ab06ef4bb53ac098ebeec884341 /drivers/staging/typec | |
| parent | staging: typec: tcpm: Check cc status before entering SRC_TRY_DEBOUCE (diff) | |
| download | linux-dev-fce042f02ef03c5d05fc33b692133e2ed0b9dc18.tar.xz linux-dev-fce042f02ef03c5d05fc33b692133e2ed0b9dc18.zip | |
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>
Diffstat (limited to 'drivers/staging/typec')
| -rw-r--r-- | drivers/staging/typec/tcpm.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/drivers/staging/typec/tcpm.c b/drivers/staging/typec/tcpm.c index 6df72f648de0..903261e80bd4 100644 --- a/drivers/staging/typec/tcpm.c +++ b/drivers/staging/typec/tcpm.c @@ -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; |