Merge remote-tracking branch cros/main into firmware-fpmcu-dartmonkey-releasefirmware-fpmcu-dartmonkey-release

Generated by: ./util/update_release_branch.py --board dartmonkey --relevant_paths_file
./util/fingerprint-relevant-paths.txt firmware-fpmcu-dartmonkey-release

Relevant changes:

git log --oneline 6c1587ca70..28712dae9d -- board/nocturne_fp
board/dartmonkey common/fpsensor docs/fingerprint driver/fingerprint
util/getversion.sh

ded9307b79 util/getversion.sh: Fix version when not in a git repo
956055e692 board: change Google USB vendor info
71b2ef709d Update license boilerplate text in source code files
33e11afda0 Revert "fpsensor: Build fpsensor source file with C++"
c8d0360723 fpsensor: Build fpsensor source file with C++
bc113abd53 fpsensor: Fix g++ compiler error
150a58a0dc fpsensor: Fix fp_set_sensor_mode return type
b33b5ce85b fpsensor: Remove nested designators for C++ compatibility
2e864b2539 tree-wide: const-ify argv for console commands
56d8b360f9 test: Add test for get ikm failure when seed not set
3a3d6c3690 test: Add test for fpsensor trivial key failure
233e6bbd08 fpsensor_crypto: Abstract calls to hmac_SHA256
0a041b285b docs/fingerprint: Typo correction
c03fab67e2 docs/fingerprint: Fix the path of fputils.py
0b5d4baf5a util/getversion.sh: Fix empty file list handling
6e128fe760 FPMCU dev board environment with Satlab
3eb29b6aa5 builtin: Move ssize_t to sys/types.h
345d62ebd1 docs/fingerprint: Update power numbers for latest dartmonkey release
c25ffdb316 common: Conditionally support printf %l and %i modifiers
9a3c514b45 test: Add a test to check if the debugger is connected
54e603413f Move standard library tests to their own file
43fa6b4bf8 docs/fingerprint: Update power numbers for latest bloonchipper release
25536f9a84 driver/fingerprint/fpc/bep/fpc_sensor_spi.c: Format with clang-format
4face99efd driver/fingerprint/fpc/libfp/fpc_sensor_pal.h: Format with clang-format
738de2b575 trng: Rename rand to trng_rand
14b8270edd docs/fingerprint: Update dragonclaw power numbers
0b268f93d1 driver/fingerprint/fpc/libfp/fpc_private.c: Format with clang-format
f80da163f2 driver/fingerprint/fpc/libfp/fpc_private.h: Format with clang-format
a0751778f4 board/nocturne_fp/ro_workarounds.c: Format with clang-format
5e9c85c9b1 driver/fingerprint/fpc/libfp/fpc_sensor_pal.c: Format with clang-format
c1f9dd3cf8 driver/fingerprint/fpc/libfp/fpc_bio_algorithm.h: Format with clang-format
eb1e1bed8d driver/fingerprint/fpc/libfp/fpc1145_private.h: Format with clang-format
6e7b611821 driver/fingerprint/fpc/bep/fpc_bio_algorithm.h: Format with clang-format
e0589cd5e2 driver/fingerprint/fpc/bep/fpc1035_private.h: Format with clang-format
58f0246dbe board/nocturne_fp/board_ro.c: Format with clang-format
7905e556a0 common/fpsensor/fpsensor_crypto.c: Format with clang-format
21289d170c driver/fingerprint/fpc/bep/fpc1025_private.h: Format with clang-format
98a20f937e common/fpsensor/fpsensor_state.c: Format with clang-format
a2d255d8af common/fpsensor/fpsensor.c: Format with clang-format
84e53a65da board/nocturne_fp/board.h: Format with clang-format
73055eeb3f driver/fingerprint/fpc/bep/fpc_private.c: Format with clang-format
0f7b5cb509 common/fpsensor/fpsensor_private.h: Format with clang-format
1ceade6e65 driver/fingerprint/fpc/bep/fpc_private.h: Format with clang-format
dca9d74321 Revert "trng: Rename rand to trng_rand"
a6b0b3554f trng: Rename rand to trng_rand
28d0b75b70 third_party/boringssl: Remove unused header

BRANCH=None
BUG=b:244387210 b:242720240 b:215613183 b:242720910 b:236386294
BUG=b:234181908 b:244781166 b:234781655 b:234143158 b:234181908
BUG=b:237344361 b:236025198 b:234181908 b:180945056 chromium:1098010
BUG=b:246424843 b:234181908 b:131913998
TEST=`make -j buildall`
TEST=./util/run_device_tests.py --board dartmonkey
     Test "aes": PASSED
     Test "cec": PASSED
     Test "cortexm_fpu": PASSED
     Test "crc": PASSED
     Test "flash_physical": PASSED
     Test "flash_write_protect": PASSED
     Test "fpsensor_hw": PASSED
     Test "fpsensor_spi_ro": PASSED
     Test "fpsensor_spi_rw": PASSED
     Test "fpsensor_uart_ro": PASSED
     Test "fpsensor_uart_rw": PASSED
     Test "mpu_ro": PASSED
     Test "mpu_rw": PASSED
     Test "mutex": PASSED
     Test "pingpong": PASSED
     Test "printf": PASSED
     Test "queue": PASSED
     Test "rollback_region0": PASSED
     Test "rollback_region1": PASSED
     Test "rollback_entropy": PASSED
     Test "rtc": PASSED
     Test "sha256": PASSED
     Test "sha256_unrolled": PASSED
     Test "static_if": PASSED
     Test "stdlib": PASSED
     Test "system_is_locked_wp_on": PASSED
     Test "system_is_locked_wp_off": PASSED
     Test "timer_dos": PASSED
     Test "utils": PASSED
     Test "utils_str": PASSED
     Test "panic_data_dartmonkey_v2.0.2887": PASSED
     Test "panic_data_nocturne_fp_v2.2.64": PASSED
     Test "panic_data_nami_fp_v2.2.144": PASSED
Force-Relevant-Builds: all
Signed-off-by: Tom Hughes <tomhughes@chromium.org>

Change-Id: I2c312583a709fedae8fe11d92c22328c3b634bc7

1 files changed, 21 insertions, 21 deletions

diff --git a/driver/tcpm/rt1715.c b/driver/tcpm/rt1715.c
index 7985ee95a3..60bb3da068 100644
--- a/driver/tcpm/rt1715.c
+++ b/driver/tcpm/rt1715.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
+/* Copyright 2021 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -20,12 +20,11 @@
 static int rt1715_polarity[CONFIG_USB_PD_PORT_MAX_COUNT];
 static bool rt1715_initialized[CONFIG_USB_PD_PORT_MAX_COUNT];
 
-
 static int rt1715_enable_ext_messages(int port, int enable)
 {
 	return tcpc_update8(port, RT1715_REG_VENDOR_5,
-		  RT1715_REG_VENDOR_5_ENEXTMSG,
-		  enable ? MASK_SET : MASK_CLR);
+			    RT1715_REG_VENDOR_5_ENEXTMSG,
+			    enable ? MASK_SET : MASK_CLR);
 }
 
 static int rt1715_tcpci_tcpm_init(int port)
@@ -40,7 +39,7 @@ static int rt1715_tcpci_tcpm_init(int port)
 	if (!(rt1715_initialized[port])) {
 		/* RT1715 has a vendor-defined register reset */
 		rv = tcpc_update8(port, RT1715_REG_VENDOR_7,
-			RT1715_REG_VENDOR_7_SOFT_RESET, MASK_SET);
+				  RT1715_REG_VENDOR_7_SOFT_RESET, MASK_SET);
 		if (rv)
 			return rv;
 		rt1715_initialized[port] = true;
@@ -48,7 +47,7 @@ static int rt1715_tcpci_tcpm_init(int port)
 	}
 
 	rv = tcpc_update8(port, RT1715_REG_VENDOR_5,
-		  RT1715_REG_VENDOR_5_SHUTDOWN_OFF, MASK_SET);
+			  RT1715_REG_VENDOR_5_SHUTDOWN_OFF, MASK_SET);
 	if (rv)
 		return rv;
 
@@ -56,8 +55,8 @@ static int rt1715_tcpci_tcpm_init(int port)
 		rt1715_enable_ext_messages(port, 1);
 
 	rv = tcpc_write(port, RT1715_REG_I2CRST_CTRL,
-		  (RT1715_REG_I2CRST_CTRL_EN |
-		  RT1715_REG_I2CRST_CTRL_TOUT_200MS));
+			(RT1715_REG_I2CRST_CTRL_EN |
+			 RT1715_REG_I2CRST_CTRL_TOUT_200MS));
 	if (rv)
 		return rv;
 
@@ -71,27 +70,27 @@ static int rt1715_tcpci_tcpm_init(int port)
 	 * (min 250 us, max 500 us).
 	 */
 	rv = tcpc_write(port, RT1715_REG_TTCPC_FILTER,
-		  RT1715_REG_TTCPC_FILTER_400US);
+			RT1715_REG_TTCPC_FILTER_400US);
 	if (rv)
 		return rv;
 
 	rv = tcpc_write(port, RT1715_REG_DRP_TOGGLE_CYCLE,
-		  RT1715_REG_DRP_TOGGLE_CYCLE_76MS);
+			RT1715_REG_DRP_TOGGLE_CYCLE_76MS);
 	if (rv)
 		return rv;
 
 	/* PHY control */
 	/* Set PHY control registers to Richtek recommended values */
 	rv = tcpc_write(port, RT1715_REG_PHY_CTRL1,
-		  (RT1715_REG_PHY_CTRL1_ENRETRY |
-		  RT1715_REG_PHY_CTRL1_TRANSCNT_7 |
-		  RT1715_REG_PHY_CTRL1_TRXFILTER_125NS));
+			(RT1715_REG_PHY_CTRL1_ENRETRY |
+			 RT1715_REG_PHY_CTRL1_TRANSCNT_7 |
+			 RT1715_REG_PHY_CTRL1_TRXFILTER_125NS));
 	if (rv)
 		return rv;
 
 	/* Set PHY control registers to Richtek recommended values */
 	rv = tcpc_write(port, RT1715_REG_PHY_CTRL2,
-		  RT1715_REG_PHY_CTRL2_CDRTHRESH_2_58US);
+			RT1715_REG_PHY_CTRL2_CDRTHRESH_2_58US);
 	if (rv)
 		return rv;
 
@@ -113,14 +112,14 @@ static inline int rt1715_init_cc_params(int port, int cc_level)
 		/* RXCC threshold : 0.55V */
 		en = RT1715_REG_BMCIO_RXDZEN_DISABLE;
 
-		sel = RT1715_REG_BMCIO_RXDZSEL_OCCTRL_600MA
-		  | RT1715_REG_BMCIO_RXDZSEL_SEL;
+		sel = RT1715_REG_BMCIO_RXDZSEL_OCCTRL_600MA |
+		      RT1715_REG_BMCIO_RXDZSEL_SEL;
 	} else {
 		/* RD threshold : 0.35V & RP threshold : 0.75V */
 		en = RT1715_REG_BMCIO_RXDZEN_ENABLE;
 
-		sel = RT1715_REG_BMCIO_RXDZSEL_OCCTRL_600MA
-		  | RT1715_REG_BMCIO_RXDZSEL_SEL;
+		sel = RT1715_REG_BMCIO_RXDZSEL_OCCTRL_600MA |
+		      RT1715_REG_BMCIO_RXDZSEL_SEL;
 	}
 
 	rv = tcpc_write(port, RT1715_REG_BMCIO_RXDZEN, en);
@@ -131,7 +130,7 @@ static inline int rt1715_init_cc_params(int port, int cc_level)
 }
 
 static int rt1715_get_cc(int port, enum tcpc_cc_voltage_status *cc1,
-	enum tcpc_cc_voltage_status *cc2)
+			 enum tcpc_cc_voltage_status *cc2)
 {
 	int rv;
 
@@ -235,7 +234,7 @@ const struct tcpm_drv rt1715_tcpm_drv = {
 	.set_cc = &tcpci_tcpm_set_cc,
 	.set_polarity = &rt1715_set_polarity,
 #ifdef CONFIG_USB_PD_DECODE_SOP
-	.sop_prime_enable   = &tcpci_tcpm_sop_prime_enable,
+	.sop_prime_enable = &tcpci_tcpm_sop_prime_enable,
 #endif
 	.set_vconn = &rt1715_set_vconn,
 	.set_msg_header = &tcpci_tcpm_set_msg_header,
@@ -257,5 +256,6 @@ const struct tcpm_drv rt1715_tcpm_drv = {
 #ifdef CONFIG_USB_PD_TCPC_LOW_POWER
 	.enter_low_power_mode = &rt1715_enter_low_power_mode,
 #endif
-	.set_bist_test_mode	= &tcpci_set_bist_test_mode,
+	.set_bist_test_mode = &tcpci_set_bist_test_mode,
+	.get_bist_test_mode = &tcpci_get_bist_test_mode,
 };