diff options
| author | lschyi <lschyi@google.com> | 2022-05-31 16:59:13 +0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-06-08 09:47:13 +0000 |
| commit | bec50dfb0660145734c163c2fd2129149e3d5d98 (patch) | |
| tree | bd7a5493cc7c75187b311bd69c5bc2c5fc6ef539 | |
| parent | 15e11018d2c71a7424382837af65f1a309b38373 (diff) | |
| download | chrome-ec-bec50dfb0660145734c163c2fd2129149e3d5d98.tar.gz | |
kingler: Set up USB C1 SBU protection with TCPM SBU
The USB C1 SBU line in kingler is provided by TCPM module, enable it in
the configuration and remove setting it from tcpc board init function.
BUG=b:208372205
TEST=manually test with inserting a type c display, then check the SBU
register is set enabled and external display is functioning.
BRANCH=none
Change-Id: I69189e19d3151181655b9290eed7d19e1c318e4f
Signed-off-by: lschyi <lschyi@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3682601
Reviewed-by: Eric Yilun Lin <yllin@google.com>
Commit-Queue: Sung-Chi Li <lschyi@chromium.org>
Tested-by: Sung-Chi Li <lschyi@chromium.org>
| -rw-r--r-- | zephyr/projects/corsola/prj_kingler.conf | 1 | ||||
| -rw-r--r-- | zephyr/projects/corsola/src/kingler/usbc_config.c | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/zephyr/projects/corsola/prj_kingler.conf b/zephyr/projects/corsola/prj_kingler.conf index 191a104cde..021d97fd91 100644 --- a/zephyr/projects/corsola/prj_kingler.conf +++ b/zephyr/projects/corsola/prj_kingler.conf @@ -122,6 +122,7 @@ CONFIG_PLATFORM_EC_USB_PD_DEBUG_FIXED_LEVEL=y CONFIG_PLATFORM_EC_USB_PD_DEBUG_LEVEL=2 CONFIG_PLATFORM_EC_USB_PD_TCPM_ANX7447=y CONFIG_PLATFORM_EC_USB_PD_TCPM_RT1718S=y +CONFIG_PLATFORM_EC_USB_PD_TCPM_SBU=y CONFIG_PLATFORM_EC_USB_PD_VBUS_DETECT_TCPC=y CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_BY_BOARD=y diff --git a/zephyr/projects/corsola/src/kingler/usbc_config.c b/zephyr/projects/corsola/src/kingler/usbc_config.c index d710e36187..42aa0a31d6 100644 --- a/zephyr/projects/corsola/src/kingler/usbc_config.c +++ b/zephyr/projects/corsola/src/kingler/usbc_config.c @@ -192,12 +192,6 @@ __override int board_rt1718s_init(int port) RETURN_ERROR(rt1718s_update_bits8(port, RT1718S_GPIO2_VBUS_CTRL, RT1718S_GPIO2_VBUS_CTRL_FRS_RX_VBUS, 0xFF)); - /* Turn on SBU switch */ - RETURN_ERROR(rt1718s_update_bits8(port, RT1718S_RT2_SBU_CTRL_01, - RT1718S_RT2_SBU_CTRL_01_SBU_VIEN | - RT1718S_RT2_SBU_CTRL_01_SBU2_SWEN | - RT1718S_RT2_SBU_CTRL_01_SBU1_SWEN, - 0xFF)); /* Trigger GPIO 1/2 change when FRS signal received */ RETURN_ERROR(rt1718s_update_bits8(port, RT1718S_FRS_CTRL3, RT1718S_FRS_CTRL3_FRS_RX_WAIT_GPIO2 | |