| Message ID | 1582128343-22438-1-git-send-email-jun.li@nxp.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 67540460193bb5dc3841590bc76e1421d56dc173 |
| Headers | show |
| Series | usb: typec: tcpm: move to SNK_UNATTACHED if sink removed for DRP | expand |
On Thu, Feb 20, 2020 at 12:05:43AM +0800, jun.li@nxp.com wrote: > From: Li Jun <jun.li@nxp.com> > > Per typec spec: > Figure 4-15 Connection State Diagram: DRP > Figure 4-16 Connection State Diagram: DRP with Accessory and Try.SRC > Support > Figure 4-17 Connection State Diagram: DRP with Accessory and Try.SNK > Support > DRP port should move to Unattached.SNK instead of Unattached.SRC if > sink removed. > > Signed-off-by: Li Jun <jun.li@nxp.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/usb/typec/tcpm/tcpm.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c > index 78077c2..3174180 100644 > --- a/drivers/usb/typec/tcpm/tcpm.c > +++ b/drivers/usb/typec/tcpm/tcpm.c > @@ -3680,8 +3680,12 @@ static void _tcpm_cc_change(struct tcpm_port *port, enum typec_cc_status cc1, > case SRC_SEND_CAPABILITIES: > case SRC_READY: > if (tcpm_port_is_disconnected(port) || > - !tcpm_port_is_source(port)) > - tcpm_set_state(port, SRC_UNATTACHED, 0); > + !tcpm_port_is_source(port)) { > + if (port->port_type == TYPEC_PORT_SRC) > + tcpm_set_state(port, SRC_UNATTACHED, 0); > + else > + tcpm_set_state(port, SNK_UNATTACHED, 0); > + } > break; > case SNK_UNATTACHED: > if (tcpm_port_is_sink(port)) > -- > 2.7.4 >
On Thu, Feb 20, 2020 at 12:05:43AM +0800, jun.li@nxp.com wrote: > From: Li Jun <jun.li@nxp.com> > > Per typec spec: > Figure 4-15 Connection State Diagram: DRP > Figure 4-16 Connection State Diagram: DRP with Accessory and Try.SRC > Support > Figure 4-17 Connection State Diagram: DRP with Accessory and Try.SNK > Support > DRP port should move to Unattached.SNK instead of Unattached.SRC if > sink removed. > > Signed-off-by: Li Jun <jun.li@nxp.com> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > drivers/usb/typec/tcpm/tcpm.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c > index 78077c2..3174180 100644 > --- a/drivers/usb/typec/tcpm/tcpm.c > +++ b/drivers/usb/typec/tcpm/tcpm.c > @@ -3680,8 +3680,12 @@ static void _tcpm_cc_change(struct tcpm_port *port, enum typec_cc_status cc1, > case SRC_SEND_CAPABILITIES: > case SRC_READY: > if (tcpm_port_is_disconnected(port) || > - !tcpm_port_is_source(port)) > - tcpm_set_state(port, SRC_UNATTACHED, 0); > + !tcpm_port_is_source(port)) { > + if (port->port_type == TYPEC_PORT_SRC) > + tcpm_set_state(port, SRC_UNATTACHED, 0); > + else > + tcpm_set_state(port, SNK_UNATTACHED, 0); > + } > break; > case SNK_UNATTACHED: > if (tcpm_port_is_sink(port)) > -- > 2.7.4 thanks,
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index 78077c2..3174180 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -3680,8 +3680,12 @@ static void _tcpm_cc_change(struct tcpm_port *port, enum typec_cc_status cc1, case SRC_SEND_CAPABILITIES: case SRC_READY: if (tcpm_port_is_disconnected(port) || - !tcpm_port_is_source(port)) - tcpm_set_state(port, SRC_UNATTACHED, 0); + !tcpm_port_is_source(port)) { + if (port->port_type == TYPEC_PORT_SRC) + tcpm_set_state(port, SRC_UNATTACHED, 0); + else + tcpm_set_state(port, SNK_UNATTACHED, 0); + } break; case SNK_UNATTACHED: if (tcpm_port_is_sink(port))