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

25 files changed, 71 insertions, 47 deletions

diff --git a/zephyr/boards/arm/mec1727/Kconfig.board b/zephyr/boards/arm/mec1727/Kconfig.board
index 66a3993185..7b11c1a0e9 100644
--- a/zephyr/boards/arm/mec1727/Kconfig.board
+++ b/zephyr/boards/arm/mec1727/Kconfig.board
@@ -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.
 
diff --git a/zephyr/boards/arm/mec1727/Kconfig.defconfig b/zephyr/boards/arm/mec1727/Kconfig.defconfig
index 0708bda48c..8afdc63abf 100644
--- a/zephyr/boards/arm/mec1727/Kconfig.defconfig
+++ b/zephyr/boards/arm/mec1727/Kconfig.defconfig
@@ -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.
 
diff --git a/zephyr/boards/arm/mec1727/board.cmake b/zephyr/boards/arm/mec1727/board.cmake
index b67f47c819..d28d9c55e2 100644
--- a/zephyr/boards/arm/mec1727/board.cmake
+++ b/zephyr/boards/arm/mec1727/board.cmake
@@ -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.
 
diff --git a/zephyr/boards/arm/mec1727/mec1727.dts b/zephyr/boards/arm/mec1727/mec1727.dts
index d371f8a2dc..3852f35fa8 100644
--- a/zephyr/boards/arm/mec1727/mec1727.dts
+++ b/zephyr/boards/arm/mec1727/mec1727.dts
@@ -58,22 +58,18 @@
 		compatible = "named-adc-channels";
 
 		adc_ddr_soc: ddr_soc {
-			label = "TEMP_DDR_SOC";
 			enum-name = "ADC_TEMP_SENSOR_1_DDR_SOC";
 			io-channels = <&adc0 5>;
 		};
 		adc_ambient: ambient {
-			label = "TEMP_AMBIENT";
 			enum-name = "ADC_TEMP_SENSOR_2_AMBIENT";
 			io-channels = <&adc0 3>;
 		};
 		adc_charger: charger {
-			label = "TEMP_CHARGER";
 			enum-name = "ADC_TEMP_SENSOR_3_CHARGER";
 			io-channels = <&adc0 0>;
 		};
 		adc_wwan: wwan {
-			label = "TEMP_WWAN";
 			enum-name = "ADC_TEMP_SENSOR_4_WWAN";
 			io-channels = <&adc0 4>;
 		};
@@ -93,7 +89,6 @@
 		cros_kb_raw: cros-kb-raw@40009c00 {
 			compatible = "microchip,xec-cros-kb-raw";
 			reg = <0x40009c00 0x18>;
-			label = "CROS_KB_RAW_0";
 			interrupts = <135 0>;
 		};
 	};
diff --git a/zephyr/boards/arm/mec1727/mec1727_defconfig b/zephyr/boards/arm/mec1727/mec1727_defconfig
index 69f0ff53f5..b6aa0dd1e9 100644
--- a/zephyr/boards/arm/mec1727/mec1727_defconfig
+++ b/zephyr/boards/arm/mec1727/mec1727_defconfig
@@ -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.
 
@@ -12,6 +12,10 @@ CONFIG_RTOS_TIMER=y
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32768
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=32768
 
+# ADC
+CONFIG_ADC=y
+CONFIG_ADC_SHELL=n
+
 # Serial Drivers
 CONFIG_SERIAL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
@@ -28,6 +32,7 @@ CONFIG_PINCTRL=y
 
 # GPIO Controller
 CONFIG_GPIO=y
+CONFIG_GPIO_GET_CONFIG=y
 
 # Clock configuration
 CONFIG_CLOCK_CONTROL=y
diff --git a/zephyr/boards/arm/npcx7/Kconfig.board b/zephyr/boards/arm/npcx7/Kconfig.board
index 706f03a577..b5c0134b75 100644
--- a/zephyr/boards/arm/npcx7/Kconfig.board
+++ b/zephyr/boards/arm/npcx7/Kconfig.board
@@ -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.
 
diff --git a/zephyr/boards/arm/npcx7/Kconfig.defconfig b/zephyr/boards/arm/npcx7/Kconfig.defconfig
index fcea4f964e..afa9640b5a 100644
--- a/zephyr/boards/arm/npcx7/Kconfig.defconfig
+++ b/zephyr/boards/arm/npcx7/Kconfig.defconfig
@@ -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.
 
diff --git a/zephyr/boards/arm/npcx7/board.cmake b/zephyr/boards/arm/npcx7/board.cmake
index f2117625b3..e1d12397eb 100644
--- a/zephyr/boards/arm/npcx7/board.cmake
+++ b/zephyr/boards/arm/npcx7/board.cmake
@@ -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.
 
diff --git a/zephyr/boards/arm/npcx7/npcx7.dts b/zephyr/boards/arm/npcx7/npcx7.dts
index 551c3fe3af..99e152c260 100644
--- a/zephyr/boards/arm/npcx7/npcx7.dts
+++ b/zephyr/boards/arm/npcx7/npcx7.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.
  */
@@ -38,10 +38,6 @@
 	named-adc-channels {
 		compatible = "named-adc-channels";
 	};
-
-	def-lvol-io-list {
-		compatible = "nuvoton,npcx-lvolctrl-def";
-	};
 };
 
 &uart1 {
@@ -88,3 +84,8 @@
 		     >;
 	pinctrl-names = "default";
 };
+
+/* PSL_OUT is fixed to GPIO85 in npcx7 series. */
+&power_ctrl_psl {
+	enable-gpios = <&gpio8 5 0>;
+};
diff --git a/zephyr/boards/arm/npcx7/npcx7_defconfig b/zephyr/boards/arm/npcx7/npcx7_defconfig
index 6cced28039..c6c8f6c3f4 100644
--- a/zephyr/boards/arm/npcx7/npcx7_defconfig
+++ b/zephyr/boards/arm/npcx7/npcx7_defconfig
@@ -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.
 
@@ -12,6 +12,10 @@ CONFIG_BOARD_NPCX7=y
 CONFIG_SERIAL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 
+# ADC
+CONFIG_ADC=y
+CONFIG_ADC_SHELL=n
+
 # Enable console
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
@@ -24,6 +28,7 @@ CONFIG_PINCTRL=y
 
 # GPIO Controller
 CONFIG_GPIO=y
+CONFIG_GPIO_GET_CONFIG=y
 
 # Clock configuration
 CONFIG_CLOCK_CONTROL=y
diff --git a/zephyr/boards/arm/npcx9/Kconfig.board b/zephyr/boards/arm/npcx9/Kconfig.board
index c469ada39e..64e02d2c92 100644
--- a/zephyr/boards/arm/npcx9/Kconfig.board
+++ b/zephyr/boards/arm/npcx9/Kconfig.board
@@ -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.
 
diff --git a/zephyr/boards/arm/npcx9/Kconfig.defconfig b/zephyr/boards/arm/npcx9/Kconfig.defconfig
index a8e2fbc0fd..f764ad0454 100644
--- a/zephyr/boards/arm/npcx9/Kconfig.defconfig
+++ b/zephyr/boards/arm/npcx9/Kconfig.defconfig
@@ -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.
 
diff --git a/zephyr/boards/arm/npcx9/board.cmake b/zephyr/boards/arm/npcx9/board.cmake
index a204305534..e5e2fedd4f 100644
--- a/zephyr/boards/arm/npcx9/board.cmake
+++ b/zephyr/boards/arm/npcx9/board.cmake
@@ -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.
 
diff --git a/zephyr/boards/arm/npcx9/npcx9.dtsi b/zephyr/boards/arm/npcx9/npcx9.dtsi
index 27ece8cdd6..d253928dea 100644
--- a/zephyr/boards/arm/npcx9/npcx9.dtsi
+++ b/zephyr/boards/arm/npcx9/npcx9.dtsi
@@ -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.
  */
@@ -33,10 +33,6 @@
 	named-adc-channels {
 		compatible = "named-adc-channels";
 	};
-
-	def-lvol-io-list {
-		compatible = "nuvoton,npcx-lvolctrl-def";
-	};
 };
 
 &uart1 {
@@ -56,3 +52,8 @@
 		pinmux-gpio;
 	};
 };
+
+/* PSL_OUT is fixed to GPIO85 in npcx9 series. */
+&power_ctrl_psl {
+	enable-gpios = <&gpio8 5 0>;
+};
diff --git a/zephyr/boards/arm/npcx9/npcx9m3f.dts b/zephyr/boards/arm/npcx9/npcx9m3f.dts
index 1b009dfa0b..a51aeccae1 100644
--- a/zephyr/boards/arm/npcx9/npcx9m3f.dts
+++ b/zephyr/boards/arm/npcx9/npcx9m3f.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.
  */
diff --git a/zephyr/boards/arm/npcx9/npcx9m3f_defconfig b/zephyr/boards/arm/npcx9/npcx9m3f_defconfig
index f35fa4564b..d3b4bcc3a2 100644
--- a/zephyr/boards/arm/npcx9/npcx9m3f_defconfig
+++ b/zephyr/boards/arm/npcx9/npcx9m3f_defconfig
@@ -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.
 
@@ -9,6 +9,10 @@ CONFIG_SOC_NPCX9M3F=y
 # Platform Configuration
 CONFIG_BOARD_NPCX9=y
 
+# ADC
+CONFIG_ADC=y
+CONFIG_ADC_SHELL=n
+
 # Serial Drivers
 CONFIG_SERIAL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
@@ -25,6 +29,7 @@ CONFIG_PINCTRL=y
 
 # GPIO Controller
 CONFIG_GPIO=y
+CONFIG_GPIO_GET_CONFIG=y
 
 # Clock configuration
 CONFIG_CLOCK_CONTROL=y
diff --git a/zephyr/boards/arm/npcx9/npcx9m7f.dts b/zephyr/boards/arm/npcx9/npcx9m7f.dts
index ebb355c877..5f936173e1 100644
--- a/zephyr/boards/arm/npcx9/npcx9m7f.dts
+++ b/zephyr/boards/arm/npcx9/npcx9m7f.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.
  */
diff --git a/zephyr/boards/arm/npcx9/npcx9m7f_defconfig b/zephyr/boards/arm/npcx9/npcx9m7f_defconfig
index b2015041f4..e742904aed 100644
--- a/zephyr/boards/arm/npcx9/npcx9m7f_defconfig
+++ b/zephyr/boards/arm/npcx9/npcx9m7f_defconfig
@@ -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.
 
@@ -9,6 +9,10 @@ CONFIG_SOC_NPCX9M7F=y
 # Platform Configuration
 CONFIG_BOARD_NPCX9=y
 
+# ADC
+CONFIG_ADC=y
+CONFIG_ADC_SHELL=n
+
 # Serial Drivers
 CONFIG_SERIAL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
@@ -25,6 +29,7 @@ CONFIG_PINCTRL=y
 
 # GPIO Controller
 CONFIG_GPIO=y
+CONFIG_GPIO_GET_CONFIG=y
 
 # Clock configuration
 CONFIG_CLOCK_CONTROL=y
diff --git a/zephyr/boards/arm/npcx_evb/Kconfig.board b/zephyr/boards/arm/npcx_evb/Kconfig.board
index 0a64548887..00b6b75f72 100644
--- a/zephyr/boards/arm/npcx_evb/Kconfig.board
+++ b/zephyr/boards/arm/npcx_evb/Kconfig.board
@@ -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.
 
diff --git a/zephyr/boards/arm/npcx_evb/Kconfig.defconfig b/zephyr/boards/arm/npcx_evb/Kconfig.defconfig
index c0c874ad26..512a8403e7 100644
--- a/zephyr/boards/arm/npcx_evb/Kconfig.defconfig
+++ b/zephyr/boards/arm/npcx_evb/Kconfig.defconfig
@@ -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.
 
diff --git a/zephyr/boards/arm/npcx_evb/npcx7_evb.dts b/zephyr/boards/arm/npcx_evb/npcx7_evb.dts
index 1780495feb..75ad9e33a6 100644
--- a/zephyr/boards/arm/npcx_evb/npcx7_evb.dts
+++ b/zephyr/boards/arm/npcx_evb/npcx7_evb.dts
@@ -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.
  */
@@ -22,3 +22,8 @@
 	pinctrl-0 = <&uart1_2_sin_sout_gp64_65>;
 	pinctrl-names = "default";
 };
+
+/* PSL_OUT is fixed to GPIO85 in npcx7 series. */
+&power_ctrl_psl {
+	enable-gpios = <&gpio8 5 0>;
+};
diff --git a/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig b/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig
index 169108f18b..faee09f492 100644
--- a/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig
+++ b/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig
@@ -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.
 
@@ -29,6 +29,7 @@ CONFIG_PINCTRL=y
 
 # GPIO Controller
 CONFIG_GPIO=y
+CONFIG_GPIO_GET_CONFIG=y
 
 # Clock configuration
 CONFIG_CLOCK_CONTROL=y
diff --git a/zephyr/boards/arm/npcx_evb/npcx9_evb.dts b/zephyr/boards/arm/npcx_evb/npcx9_evb.dts
index 6669575466..1def8dc48f 100644
--- a/zephyr/boards/arm/npcx_evb/npcx9_evb.dts
+++ b/zephyr/boards/arm/npcx_evb/npcx9_evb.dts
@@ -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.
  */
@@ -23,3 +23,8 @@
 		     &uart1_2_sout_gp65>;
 	pinctrl-names = "default";
 };
+
+/* PSL_OUT is fixed to GPIO85 in npcx9 series. */
+&power_ctrl_psl {
+	enable-gpios = <&gpio8 5 0>;
+};
diff --git a/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig b/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig
index e64abd9e73..da75b3d113 100644
--- a/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig
+++ b/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig
@@ -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.
 
@@ -29,6 +29,7 @@ CONFIG_PINCTRL=y
 
 # GPIO Controller
 CONFIG_GPIO=y
+CONFIG_GPIO_GET_CONFIG=y
 
 # Clock configuration
 CONFIG_CLOCK_CONTROL=y
diff --git a/zephyr/boards/arm/npcx_evb/npcx_evb.dtsi b/zephyr/boards/arm/npcx_evb/npcx_evb.dtsi
index 9a9f221bfc..615df09a64 100644
--- a/zephyr/boards/arm/npcx_evb/npcx_evb.dtsi
+++ b/zephyr/boards/arm/npcx_evb/npcx_evb.dtsi
@@ -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.
  */
@@ -22,23 +22,23 @@
 
 		i2c_evb_0_0 {
 			i2c-port = <&i2c0_0>;
-			enum-name = "I2C_PORT_EVB_0";
+			enum-names = "I2C_PORT_EVB_0";
 		};
 		i2c_evb_1_0 {
 			i2c-port = <&i2c1_0>;
-			enum-name = "I2C_PORT_EVB_1";
+			enum-names = "I2C_PORT_EVB_1";
 		};
 		i2c_evb_2_0 {
 			i2c-port = <&i2c2_0>;
-			enum-name = "I2C_PORT_EVB_2";
+			enum-names = "I2C_PORT_EVB_2";
 		};
 		i2c_evb_3_0 {
 			i2c-port = <&i2c3_0>;
-			enum-name = "I2C_PORT_EVB_3";
+			enum-names = "I2C_PORT_EVB_3";
 		};
 		i2c_evb_7_0 {
 			i2c-port = <&i2c7_0>;
-			enum-name = "I2C_PORT_EVB_7";
+			enum-names = "I2C_PORT_EVB_7";
 		};
 	};
 
@@ -46,27 +46,22 @@
 		compatible = "named-adc-channels";
 
 		adc_ch_0 {
-			label = "ADC0";
 			enum-name = "ADC_EVB_CH_0";
 			io-channels = <&adc0 0>;
 		};
 		adc_ch_1 {
-			label = "ADC1";
 			enum-name = "ADC_EVB_CH_1";
 			io-channels = <&adc0 1>;
 		};
 		adc_ch_2 {
-			label = "ADC2";
 			enum-name = "ADC_EVB_CH_2";
 			io-channels = <&adc0 2>;
 		};
 		adc_ch_3 {
-			label = "ADC3";
 			enum-name = "ADC_EVB_CH_3";
 			io-channels = <&adc0 3>;
 		};
 		adc_ch_4 {
-			label = "ADC4";
 			enum-name = "ADC_EVB_CH_4";
 			io-channels = <&adc0 4>;
 		};