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

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

Relevant changes:

git log --oneline e5fb0b9ba4..28712dae9d -- board/hatch_fp
board/bloonchipper 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
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
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
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
dc3e9008b8 board/hatch_fp/board.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:246424843 b:234181908 b:244781166 b:234181908 b:244387210
BUG=b:242720240 chromium:1098010 b:180945056 b:236025198 b:234181908
BUG=b:234181908 b:237344361 b:131913998 b:236386294 b:234143158
BUG=b:234781655 b:215613183 b:242720910
TEST=`make -j buildall`
TEST=./test/run_device_tests.py --board bloonchipper
     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 "stm32f_rtc": PASSED
     Test "panic_data_bloonchipper_v2.0.4277": PASSED
     Test "panic_data_bloonchipper_v2.0.5938": PASSED

Force-Relevant-Builds: all
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Change-Id: I264ad0ffe7afcd507a1e483c6e934a9c4fea47c3

1 files changed, 34 insertions, 34 deletions

diff --git a/driver/charger/bq25710.h b/driver/charger/bq25710.h
index bb1ee1ba99..078160e66e 100644
--- a/driver/charger/bq25710.h
+++ b/driver/charger/bq25710.h
@@ -1,4 +1,4 @@
-/* Copyright 2018 The Chromium OS Authors. All rights reserved.
+/* Copyright 2018 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
@@ -11,57 +11,57 @@
 /* SMBUS Interface */
 #define BQ25710_SMBUS_ADDR1_FLAGS 0x09
 
-#define BQ25710_BC12_MIN_VOLTAGE_MV	1408
+#define BQ25710_BC12_MIN_VOLTAGE_MV 1408
 
 /* Registers */
-#define BQ25710_REG_CHARGE_OPTION_0		0x12
-#define BQ25710_REG_CHARGE_CURRENT		0x14
-#define BQ25710_REG_MAX_CHARGE_VOLTAGE		0x15
-#define BQ25710_REG_CHARGER_STATUS		0x20
-#define BQ25710_REG_PROCHOT_STATUS		0x21
-#define BQ25710_REG_IIN_DPM			0x22
-#define BQ25710_REG_ADC_VBUS_PSYS		0x23
-#define BQ25710_REG_ADC_IBAT			0x24
-#define BQ25710_REG_ADC_CMPIN_IIN		0x25
-#define BQ25710_REG_ADC_VSYS_VBAT		0x26
-#define BQ25710_REG_CHARGE_OPTION_1		0x30
-#define BQ25710_REG_CHARGE_OPTION_2		0x31
-#define BQ25710_REG_CHARGE_OPTION_3		0x32
-#define BQ25710_REG_PROCHOT_OPTION_0		0x33
-#define BQ25710_REG_PROCHOT_OPTION_1		0x34
-#define BQ25710_REG_ADC_OPTION			0x35
-#define BQ25720_REG_CHARGE_OPTION_4		0x36
-#define BQ25720_REG_VMIN_ACTIVE_PROTECTION	0x37
-#define BQ25710_REG_OTG_VOLTAGE			0x3B
-#define BQ25710_REG_OTG_CURRENT			0x3C
-#define BQ25710_REG_INPUT_VOLTAGE		0x3D
-#define BQ25710_REG_MIN_SYSTEM_VOLTAGE		0x3E
-#define BQ25710_REG_IIN_HOST			0x3F
-#define BQ25710_REG_MANUFACTURER_ID		0xFE
-#define BQ25710_REG_DEVICE_ADDRESS		0xFF
+#define BQ25710_REG_CHARGE_OPTION_0 0x12
+#define BQ25710_REG_CHARGE_CURRENT 0x14
+#define BQ25710_REG_MAX_CHARGE_VOLTAGE 0x15
+#define BQ25710_REG_CHARGER_STATUS 0x20
+#define BQ25710_REG_PROCHOT_STATUS 0x21
+#define BQ25710_REG_IIN_DPM 0x22
+#define BQ25710_REG_ADC_VBUS_PSYS 0x23
+#define BQ25710_REG_ADC_IBAT 0x24
+#define BQ25710_REG_ADC_CMPIN_IIN 0x25
+#define BQ25710_REG_ADC_VSYS_VBAT 0x26
+#define BQ25710_REG_CHARGE_OPTION_1 0x30
+#define BQ25710_REG_CHARGE_OPTION_2 0x31
+#define BQ25710_REG_CHARGE_OPTION_3 0x32
+#define BQ25710_REG_PROCHOT_OPTION_0 0x33
+#define BQ25710_REG_PROCHOT_OPTION_1 0x34
+#define BQ25710_REG_ADC_OPTION 0x35
+#define BQ25720_REG_CHARGE_OPTION_4 0x36
+#define BQ25720_REG_VMIN_ACTIVE_PROTECTION 0x37
+#define BQ25710_REG_OTG_VOLTAGE 0x3B
+#define BQ25710_REG_OTG_CURRENT 0x3C
+#define BQ25710_REG_INPUT_VOLTAGE 0x3D
+#define BQ25710_REG_MIN_SYSTEM_VOLTAGE 0x3E
+#define BQ25710_REG_IIN_HOST 0x3F
+#define BQ25710_REG_MANUFACTURER_ID 0xFE
+#define BQ25710_REG_DEVICE_ADDRESS 0xFF
 
 /* ADC conversion time ins ms */
 #if defined(CONFIG_CHARGER_BQ25720)
-#define BQ25710_ADC_OPTION_ADC_CONV_MS		25
+#define BQ25710_ADC_OPTION_ADC_CONV_MS 25
 #elif defined(CONFIG_CHARGER_BQ25710)
-#define BQ25710_ADC_OPTION_ADC_CONV_MS		10
+#define BQ25710_ADC_OPTION_ADC_CONV_MS 10
 #else
 #error Only the BQ25720 and BQ25710 are supported by bq25710 driver.
 #endif
 
 /* ADCVBUS/PSYS Register */
 #if defined(CONFIG_CHARGER_BQ25720)
-#define BQ25720_ADC_VBUS_STEP_MV		96
+#define BQ25720_ADC_VBUS_STEP_MV 96
 #elif defined(CONFIG_CHARGER_BQ25710)
-#define BQ25710_ADC_VBUS_STEP_MV		64
-#define BQ25710_ADC_VBUS_BASE_MV		3200
+#define BQ25710_ADC_VBUS_STEP_MV 64
+#define BQ25710_ADC_VBUS_BASE_MV 3200
 #else
 #error Only the BQ25720 and BQ25710 are supported by bq25710 driver.
 #endif
 
 /* Min System Voltage Register */
-#define BQ25710_MIN_SYSTEM_VOLTAGE_STEP_MV	256
-#define BQ25720_VSYS_MIN_VOLTAGE_STEP_MV	100
+#define BQ25710_MIN_SYSTEM_VOLTAGE_STEP_MV 256
+#define BQ25720_VSYS_MIN_VOLTAGE_STEP_MV 100
 
 extern const struct charger_drv bq25710_drv;