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, 82 insertions, 80 deletions

diff --git a/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/gpio.dts b/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/gpio.dts
index 49a40c6a54..77b4cf0573 100644
--- a/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/gpio.dts
+++ b/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/gpio.dts
@@ -1,4 +1,4 @@
-/* Copyright 2022 The Chromium OS Authors. All rights reserved.
+/* Copyright 2022 The ChromiumOS Authors
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -20,7 +20,7 @@
 			enum-name = "GPIO_PG_EC_ALL_SYS_PWRGD";
 		};
 		rsmrst_pwrgd: rsmrst-pwrgd {
-			gpios = <&gpio6 6 GPIO_INPUT>; /* 1.8V */
+			gpios = <&gpio6 6 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_PG_EC_RSMRST_ODL";
 		};
 		pch_slp_s0_n: pch-slp-s0-n-ec {
@@ -53,32 +53,33 @@
 		gpio_wp: wp-l {
 			gpios = <&gpiod 5 GPIO_INPUT>;
 		};
-		std-adp-prsnt {
+		std_adp_prsnt: std-adp-prsnt {
 			gpios = <&gpioc 6 GPIO_INPUT>;
+			enum-name = "GPIO_DC_JACK_PRESENT";
 		};
 		bc_acok: bc-acok-ec {
 			gpios = <&gpio0 2 GPIO_INPUT>;
 			enum-name = "GPIO_AC_PRESENT";
 		};
-		usbc-tcpc-alrt-p0 {
+		usbc_tcpc_alrt_p0: usbc-tcpc-alrt-p0 {
 			gpios = <&gpio4 0 GPIO_INPUT>;
 		};
 		/* NOTE: Netname is USBC_TCPC_PPC_ALRT_P0 */
-		usb-c0-c1-tcpc-rst-odl {
+		usb_c0_c1_tcpc_rst_odl: usb-c0-c1-tcpc-rst-odl {
 			gpios = <&gpiod 0 GPIO_ODR_HIGH>;
 		};
 		/* NOTE: Netname is USBC_TCPC_ALRT_P1 */
-		usbc-tcpc-ppc-alrt-p0 {
+		usbc_tcpc_ppc_alrt_p0: usbc-tcpc-ppc-alrt-p0 {
 			gpios = <&gpiod 1 GPIO_INPUT>;
 		};
-		usbc-tcpc-ppc-alrt-p1 {
+		usbc_tcpc_ppc_alrt_p1: usbc-tcpc-ppc-alrt-p1 {
 			gpios = <&gpioe 4 GPIO_INPUT>;
 		};
-		usbc-tcpc-alrt-p2 {
+		usbc_tcpc_alrt_p2: usbc-tcpc-alrt-p2 {
 			gpios = <&gpio9 1 GPIO_INPUT>;
 		};
 		/* NOTE: Netname is USBC_TCPC_PPC_ALRT_P3 */
-		usbc-tcpc-ppc-alrt-p3 {
+		usbc_tcpc_alrt_p3: usbc-tcpc-alrt-p3 {
 			gpios = <&gpiof 3 GPIO_INPUT>;
 		};
 		gpio_ec_pch_wake_odl: pch-wake-n {
@@ -97,11 +98,11 @@
 			gpios = <&gpio6 0 GPIO_INPUT>;
 			enum-name = "GPIO_CPU_PROCHOT";
 		};
-		sys-rst-odl-ec {
+		sys_rst_odl: sys-rst-odl-ec {
 			gpios = <&gpioc 5 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_SYS_RESET_L";
 		};
-		pm-rsmrst-r-n {
+		ec_pch_rsmrst_l: pm-rsmrst-r-n {
 			gpios = <&gpioa 4 GPIO_OUTPUT_LOW>; /* 1.8V */
 			enum-name = "GPIO_PCH_RSMRST_L";
 		};
@@ -112,11 +113,12 @@
 		ec_spi_oe_mecc: ec-spi-oe-mecc-r {
 			gpios = <&gpioa 7 GPIO_OUTPUT_LOW>; /* 1.8V */
 		};
-		ec-ds3-r {
+		en_pp3300_a: ec-ds3-r {
 			gpios = <&gpioc 4 GPIO_OUTPUT_LOW>;
 			enum-name = "GPIO_EN_PP3300_A";
+			alias = "GPIO_TEMP_SENSOR_POWER";
 		};
-		pch-pwrok-ec-r {
+		ec_pch_pwrok_od: pch-pwrok-ec-r {
 			gpios = <&gpiod 3 GPIO_ODR_LOW>;
 			enum-name = "GPIO_PCH_PWROK";
 		};
@@ -142,8 +144,9 @@
 			gpios = <&gpioc 0 GPIO_OUTPUT_LOW>;
 		};
 		/* NOTE: Netname is USBC_TCPC_ALRT_P3 */
-		ccd-mode-odl {
+		ccd_mode_odl: ccd-mode-odl {
 			gpios = <&gpio9 2 GPIO_INPUT>;
+			enum-name = "GPIO_CCD_MODE_ODL";
 		};
 		smb-bs-clk {
 			gpios = <&gpiob 3 GPIO_INPUT>;
@@ -158,10 +161,10 @@
 			gpios = <&gpiob 4 GPIO_INPUT>;
 		};
 		usbc-tcpc-i2c-clk-aic2 {
-			gpios = <&gpio9 0 GPIO_INPUT>;
+			gpios = <&gpio9 0 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 		};
 		usbc-tcpc-i2c-data-aic2 {
-			gpios = <&gpio8 7 GPIO_INPUT>;
+			gpios = <&gpio8 7 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 		};
 		/* Unused 1.8V pins */
 		i3c-1-sda-r {
@@ -189,22 +192,22 @@
 			gpios = <&gpioa 6 GPIO_INPUT>;
 		};
 		sml1-clk-mecc {
-			gpios = <&gpio3 3 GPIO_INPUT>;
+			gpios = <&gpio3 3 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 		};
 		sml1-data-mecc {
-			gpios = <&gpio3 6 GPIO_INPUT>;
+			gpios = <&gpio3 6 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 		};
 		sml1-alert {
-			gpios = <&gpioc 7 GPIO_INPUT>;
+			gpios = <&gpioc 7 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 		};
 		smb-pch-alrt {
 			gpios = <&gpioa 3 GPIO_INPUT>;
 		};
 		smb-pch-data {
-			gpios = <&gpioc 1 GPIO_INPUT>;
+			gpios = <&gpioc 1 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 		};
 		smb-pch-clk {
-			gpios = <&gpioc 2 GPIO_INPUT>;
+			gpios = <&gpioc 2 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 		};
 		/* Unused 3.3V pins */
 		cpu-cat-err-mecc {
@@ -255,7 +258,7 @@
 		tp-gpiof1 {
 			gpios = <&gpiof 1 GPIO_INPUT>;
 		};
-		usbc-tcpc-ppc-alrt-p2 {
+		usbc_tcpc_ppc_alrt_p2: usbc-tcpc-ppc-alrt-p2 {
 			gpios = <&gpiof 2 GPIO_INPUT>;
 		};
 		tp-gpiof4 {
@@ -285,80 +288,79 @@
 		};
 
 		/* USB C IOEX configuration */
-		usb-c0-hbr-ls-en {
+		usb_c0_hb_retimer_ls_en: usb-c0-hbr-ls-en {
 			gpios = <&ioex_c0 2 GPIO_OUTPUT_LOW>;
+			enum-name = "IOEX_USB_C0_HBR_LS_EN";
+			no-auto-init;
 		};
-		usb-c0-hbr-rst {
+		usb_c0_hb_retimer_rst: usb-c0-hbr-rst {
 			gpios = <&ioex_c0 3 GPIO_OUTPUT_LOW>;
+			enum-name = "IOEX_USB_C0_HBR_RST";
+			no-auto-init;
 		};
-		usb-c1-hbr-ls-en {
+		usb_c1_hb_retimer_ls_en: usb-c1-hbr-ls-en {
 			gpios = <&ioex_c1 2 GPIO_OUTPUT_LOW>;
+			enum-name = "IOEX_USB_C1_HBR_LS_EN";
+			no-auto-init;
 		};
-		usb-c1-hbr-rst {
+		usb_c1_hb_retimer_rst: usb-c1-hbr-rst {
 			gpios = <&ioex_c1 3 GPIO_OUTPUT_LOW>;
+			enum-name = "IOEX_USB_C1_HBR_RST";
+			no-auto-init;
 		};
 		usb-c0-mux-oe-n {
 			gpios = <&ioex_c0 4 GPIO_OUTPUT_LOW>;
+			no-auto-init;
 		};
 		usb-c0-mux-sbu-sel-0 {
 			gpios = <&ioex_c0 6 GPIO_OUTPUT_HIGH>;
+			enum-name = "IOEX_USB_C0_MUX_SBU_SEL_0";
+			no-auto-init;
 		};
 		usb-c0-mux-sbu-sel-1 {
 			gpios = <&ioex_c1 4 GPIO_OUTPUT_LOW>;
-		};
-	};
-
-	def-lvol-io-list {
-		compatible = "nuvoton,npcx-lvolctrl-def";
-		lvol-io-pads = <
-			&lvol_io66 /* RSMRET_PWRGD */
-			&lvol_io90 /* I2C1_SCL0 */
-			&lvol_io87 /* I2C1_SDA0 */
-			&lvol_io33 /* SML1_CLK_MECC */
-			&lvol_io36 /* SML1_DATA_MECC */
-			&lvol_ioc7 /* SML1_ALERT */
-			&lvol_ioc1 /* SMB_PCH_DATA */
-			&lvol_ioc2 /* SMB_PCH_CLK */
-		>;
-	};
-};
-
-&i2c0_0 {
-	nct38xx_C0:nct38xx_C0@70 {
-	#address-cells = <1>;
-	#size-cells = <0>;
-	compatible = "nuvoton,nct38xx-gpio";
-	reg = <0x70>;
-	label = "NCT38XX_C0";
-
-	ioex_c0:gpio@0 {
-			compatible = "nuvoton,nct38xx-gpio-port";
-			reg = <0x0>;
-			label = "NCT38XX_C0_GPIO0";
-			gpio-controller;
-			#gpio-cells = <2>;
-			ngpios = <8>;
-			pin_mask = <0xff>;
-			pinmux_mask = <0xf7>;
-		};
-	};
-
-	nct38xx_C1:nct38xx_C1@70 {
-		#address-cells = <1>;
-		#size-cells = <0>;
-		compatible = "nuvoton,nct38xx-gpio";
-		reg = <0x70>;
-		label = "NCT38XX_C1";
-
-		ioex_c1:gpio@0 {
-			compatible = "nuvoton,nct38xx-gpio-port";
-			reg = <0x0>;
-			label = "NCT38XX_C1_GPIO0";
-			gpio-controller;
-			#gpio-cells = <2>;
-			ngpios = <8>;
-			pin_mask = <0xff>;
-			pinmux_mask = <0xf7>;
+			enum-name = "IOEX_USB_C0_MUX_SBU_SEL_1";
+			no-auto-init;
+		};
+		usb-c0-c1-prochot-n {
+			gpios = <&ioex_c1 6 GPIO_INPUT>;
+			no-auto-init;
+		};
+		dg-bssb-sbu-sel {
+			gpios = <&ioex_c2_port1 4 GPIO_INPUT>;
+			no-auto-init;
+		};
+		usb_c2_hb_retimer_rst: usb-c2-hbr-rst {
+			gpios = <&ioex_c2_port1 1 (GPIO_ODR_LOW | \
+				GPIO_VOLTAGE_1P8)>;
+			enum-name = "IOEX_USB_C2_HBR_RST";
+			no-auto-init;
+		};
+		usb_c2_hb_retimer_ls_en: usb-c2-hbr-ls-en {
+			gpios = <&ioex_c2_port2 0 (GPIO_ODR_LOW | \
+				GPIO_VOLTAGE_1P8)>;
+			enum-name = "IOEX_USB_C2_HBR_LS_EN";
+			no-auto-init;
+		};
+		usb_c3_hb_retimer_rst: usb-c3-hbr-rst {
+			gpios = <&ioex_c2_port1 3 (GPIO_ODR_LOW | \
+				GPIO_VOLTAGE_1P8)>;
+			enum-name = "IOEX_USB_C3_HBR_RST";
+			no-auto-init;
+		};
+		usb_c3_hb_retimer_ls_en: usb-c3-hbr-ls-en {
+			gpios = <&ioex_c2_port3 3 (GPIO_ODR_LOW | \
+				GPIO_VOLTAGE_1P8)>;
+			enum-name = "IOEX_USB_C3_HBR_LS_EN";
+			no-auto-init;
+		};
+		usb-c2-c3-prochot-n {
+			gpios = <&ioex_c2_port0 0 GPIO_INPUT>;
+			no-auto-init;
+		};
+		/* unimplemented GPIOs */
+		en-pp5000 {
+			enum-name = "GPIO_EN_PP5000";
 		};
 	};
 };