diff options
| author | Ting Shen <phoenixshen@google.com> | 2021-08-20 16:23:30 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-08-25 08:13:24 +0000 |
| commit | be2500881dfbc6ec77885599a01f4f31b32f6239 (patch) | |
| tree | df5e978a121aa33909c2769af24a1b87c0dbc827 /driver/tcpm/rt1718s.c | |
| parent | 7373dc974cd6b29babaf36895ab763defb9cf820 (diff) | |
| download | chrome-ec-be2500881dfbc6ec77885599a01f4f31b32f6239.tar.gz | |
rt1718s: enable FRS
BUG=b:190348051
TEST=Combined with other CLs in the chain, verify FRS workable on Tomato
BRANCH=none
Signed-off-by: Ting Shen <phoenixshen@google.com>
Change-Id: I52a020b1288928eb9a0f3ada1364776cd8e78337
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3109709
Reviewed-by: Eric Yilun Lin <yllin@google.com>
Commit-Queue: Ting Shen <phoenixshen@chromium.org>
Tested-by: Ting Shen <phoenixshen@chromium.org>
Diffstat (limited to 'driver/tcpm/rt1718s.c')
| -rw-r--r-- | driver/tcpm/rt1718s.c | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/driver/tcpm/rt1718s.c b/driver/tcpm/rt1718s.c index 96a08785c2..ca5151ba90 100644 --- a/driver/tcpm/rt1718s.c +++ b/driver/tcpm/rt1718s.c @@ -224,14 +224,6 @@ static int rt1718s_init(int port) need_sw_reset = false; } - if (IS_ENABLED(CONFIG_USB_PD_FRS_TCPC)) - /* Set vbus frs low unmasked, Rx frs unmasked */ - RETURN_ERROR(rt1718s_update_bits8(port, RT1718S_RT_MASK1, - RT1718S_RT_MASK1_M_VBUS_FRS_LOW | - RT1718S_RT_MASK1_M_RX_FRS, - 0xFF)); - - RETURN_ERROR(rt1718s_bc12_init(port)); /* Set VBUS_VOL_SEL to 20V */ @@ -357,6 +349,27 @@ void rt1718s_vendor_defined_alert(int port) { int rv, value; + if (IS_ENABLED(CONFIG_USB_PD_FRS_PPC) && + IS_ENABLED(CONFIG_USBC_PPC_RT1718S)) { + int int1; + + rv = rt1718s_read8(port, RT1718S_RT_INT1, &int1); + if (rv) + return; + rv = rt1718s_write8(port, RT1718S_RT_INT1, int1); + if (rv) + return; + + if ((int1 & RT1718S_RT_INT1_INT_RX_FRS)) { + pd_got_frs_signal(port); + + tcpc_write16(port, TCPC_REG_ALERT, + TCPC_REG_ALERT_VENDOR_DEF); + /* ignore other interrupts for faster frs handling */ + return; + } + } + /* Process BC12 alert */ rv = rt1718s_read8(port, RT1718S_RT_INT6, &value); if (rv) @@ -393,7 +406,9 @@ static void rt1718s_alert(int port) tcpc_read16(port, TCPC_REG_ALERT, &alert); if (alert & TCPC_REG_ALERT_VENDOR_DEF) rt1718s_vendor_defined_alert(port); - tcpci_tcpc_alert(port); + + if (alert & ~TCPC_REG_ALERT_VENDOR_DEF) + tcpci_tcpc_alert(port); } #ifdef CONFIG_USB_PD_TCPC_LOW_POWER |