* [PATCH] usb: typec: tcpci: set local CC to Rd only when cc1/cc2 status is Rp
@ 2024-12-11 10:57 Xu Yang
2024-12-16 9:47 ` Heikki Krogerus
0 siblings, 1 reply; 2+ messages in thread
From: Xu Yang @ 2024-12-11 10:57 UTC (permalink / raw)
To: heikki.krogerus, gregkh, andre.draszik, m.felsch, rdbabiera,
emanuele.ghidoli
Cc: linux-usb, imx, jun.li
The cc1 and cc2 status returned by tcpci_get_cc() may be TYPEC_CC_OPEN
or TYPEC_CC_RA. So don't assume it's just TYPEC_CC_RD or TYPEC_CC_RP_*.
This will let local port present Rd on CC only when cc1/cc2 status is
TYPEC_CC_RP_*.
Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
---
drivers/usb/typec/tcpm/tcpci.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c
index ed32583829be..2f15734a5043 100644
--- a/drivers/usb/typec/tcpm/tcpci.c
+++ b/drivers/usb/typec/tcpm/tcpci.c
@@ -282,7 +282,7 @@ static int tcpci_set_polarity(struct tcpc_dev *tcpc,
if (cc2 == TYPEC_CC_RD)
/* Role control would have the Rp setting when DRP was enabled */
reg |= FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_RP);
- else
+ else if (cc2 >= TYPEC_CC_RP_DEF)
reg |= FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_RD);
} else {
reg &= ~TCPC_ROLE_CTRL_CC1;
@@ -290,7 +290,7 @@ static int tcpci_set_polarity(struct tcpc_dev *tcpc,
if (cc1 == TYPEC_CC_RD)
/* Role control would have the Rp setting when DRP was enabled */
reg |= FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_RP);
- else
+ else if (cc1 >= TYPEC_CC_RP_DEF)
reg |= FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_RD);
}
}
--
2.34.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] usb: typec: tcpci: set local CC to Rd only when cc1/cc2 status is Rp
2024-12-11 10:57 [PATCH] usb: typec: tcpci: set local CC to Rd only when cc1/cc2 status is Rp Xu Yang
@ 2024-12-16 9:47 ` Heikki Krogerus
0 siblings, 0 replies; 2+ messages in thread
From: Heikki Krogerus @ 2024-12-16 9:47 UTC (permalink / raw)
To: Xu Yang
Cc: gregkh, andre.draszik, m.felsch, rdbabiera, emanuele.ghidoli,
linux-usb, imx, jun.li, Badhri Jagan Sridharan
On Wed, Dec 11, 2024 at 06:57:53PM +0800, Xu Yang wrote:
> The cc1 and cc2 status returned by tcpci_get_cc() may be TYPEC_CC_OPEN
> or TYPEC_CC_RA. So don't assume it's just TYPEC_CC_RD or TYPEC_CC_RP_*.
> This will let local port present Rd on CC only when cc1/cc2 status is
> TYPEC_CC_RP_*.
>
> Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
> drivers/usb/typec/tcpm/tcpci.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c
> index ed32583829be..2f15734a5043 100644
> --- a/drivers/usb/typec/tcpm/tcpci.c
> +++ b/drivers/usb/typec/tcpm/tcpci.c
> @@ -282,7 +282,7 @@ static int tcpci_set_polarity(struct tcpc_dev *tcpc,
> if (cc2 == TYPEC_CC_RD)
> /* Role control would have the Rp setting when DRP was enabled */
> reg |= FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_RP);
> - else
> + else if (cc2 >= TYPEC_CC_RP_DEF)
> reg |= FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_RD);
> } else {
> reg &= ~TCPC_ROLE_CTRL_CC1;
> @@ -290,7 +290,7 @@ static int tcpci_set_polarity(struct tcpc_dev *tcpc,
> if (cc1 == TYPEC_CC_RD)
> /* Role control would have the Rp setting when DRP was enabled */
> reg |= FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_RP);
> - else
> + else if (cc1 >= TYPEC_CC_RP_DEF)
> reg |= FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_RD);
> }
> }
--
heikki
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-12-16 9:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-11 10:57 [PATCH] usb: typec: tcpci: set local CC to Rd only when cc1/cc2 status is Rp Xu Yang
2024-12-16 9:47 ` Heikki Krogerus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox