summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiana Z <dzigterman@chromium.org>2022-03-16 14:44:28 -0600
committerCommit Bot <commit-bot@chromium.org>2022-03-17 00:42:07 +0000
commit83dc64e5ef30dd3b573e53dec92c6b36b6ad6884 (patch)
treef2038bf4db95c4c4b9c4e982d788964008d6a596
parent87b748f2f0dab97497e24ad30cc337d0ab3792c6 (diff)
downloadchrome-ec-83dc64e5ef30dd3b573e53dec92c6b36b6ad6884.tar.gz
Zephyr: Enable CONFIG_PM_DEVICE on all boards
This config used to be automatically enabled before CL:3504555. Now, enable the config explicitly and also ensure platforms have NPCX idle stats available. BRANCH=None BUG=b:224579318 TEST=on skyrim, observe no watchdog warnings in G3 with no charger Signed-off-by: Diana Z <dzigterman@chromium.org> Change-Id: Icbb2ea76425dd8750a0ab25e75f65c6da268defd Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3529815 Reviewed-by: Keith Short <keithshort@chromium.org> Commit-Queue: Keith Short <keithshort@chromium.org>
-rw-r--r--zephyr/boards/arm/brya/brya_defconfig1
-rw-r--r--zephyr/boards/arm/npcx7/npcx7_defconfig2
-rw-r--r--zephyr/boards/arm/npcx9/npcx9_defconfig2
-rw-r--r--zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig1
-rw-r--r--zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig1
-rw-r--r--zephyr/boards/arm/volteer/volteer_defconfig1
6 files changed, 8 insertions, 0 deletions
diff --git a/zephyr/boards/arm/brya/brya_defconfig b/zephyr/boards/arm/brya/brya_defconfig
index 8c45d933f0..9fd02476ee 100644
--- a/zephyr/boards/arm/brya/brya_defconfig
+++ b/zephyr/boards/arm/brya/brya_defconfig
@@ -28,6 +28,7 @@ CONFIG_CLOCK_CONTROL=y
# Power Management
CONFIG_PM=y
+CONFIG_PM_DEVICE=y
CONFIG_PM_POLICY_APP=y
CONFIG_UART_CONSOLE_INPUT_EXPIRED=y
CONFIG_NPCX_PM_TRACE=y
diff --git a/zephyr/boards/arm/npcx7/npcx7_defconfig b/zephyr/boards/arm/npcx7/npcx7_defconfig
index 09cc30c0bd..05c10944e5 100644
--- a/zephyr/boards/arm/npcx7/npcx7_defconfig
+++ b/zephyr/boards/arm/npcx7/npcx7_defconfig
@@ -30,8 +30,10 @@ CONFIG_WATCHDOG=y
# Power Management
CONFIG_PM=y
+CONFIG_PM_DEVICE=y
CONFIG_PM_POLICY_APP=y
CONFIG_UART_CONSOLE_INPUT_EXPIRED=y
+CONFIG_NPCX_PM_TRACE=y
# BBRAM
CONFIG_BBRAM=y
diff --git a/zephyr/boards/arm/npcx9/npcx9_defconfig b/zephyr/boards/arm/npcx9/npcx9_defconfig
index 988bb9592b..8ad0b21f15 100644
--- a/zephyr/boards/arm/npcx9/npcx9_defconfig
+++ b/zephyr/boards/arm/npcx9/npcx9_defconfig
@@ -31,8 +31,10 @@ CONFIG_WATCHDOG=y
# Power Management
CONFIG_PM=y
+CONFIG_PM_DEVICE=y
CONFIG_PM_POLICY_APP=y
CONFIG_UART_CONSOLE_INPUT_EXPIRED=y
+CONFIG_NPCX_PM_TRACE=y
# BBRAM
CONFIG_BBRAM=y
diff --git a/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig b/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig
index c3114032b0..7cdd8d6f67 100644
--- a/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig
+++ b/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig
@@ -46,6 +46,7 @@ CONFIG_PWM_SHELL=n
# Power Management
CONFIG_PM=y
+CONFIG_PM_DEVICE=y
CONFIG_PM_POLICY_APP=y
CONFIG_UART_CONSOLE_INPUT_EXPIRED=y
CONFIG_NPCX_PM_TRACE=y
diff --git a/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig b/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig
index fbee9f140f..8c3a1f85a8 100644
--- a/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig
+++ b/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig
@@ -46,6 +46,7 @@ CONFIG_PWM_SHELL=n
# Power Management
CONFIG_PM=y
+CONFIG_PM_DEVICE=y
CONFIG_PM_POLICY_APP=y
CONFIG_UART_CONSOLE_INPUT_EXPIRED=y
CONFIG_NPCX_PM_TRACE=y
diff --git a/zephyr/boards/arm/volteer/volteer_defconfig b/zephyr/boards/arm/volteer/volteer_defconfig
index 6b959918f4..db34ab2610 100644
--- a/zephyr/boards/arm/volteer/volteer_defconfig
+++ b/zephyr/boards/arm/volteer/volteer_defconfig
@@ -36,6 +36,7 @@ CONFIG_ADC_SHELL=n
# Power Management
CONFIG_PM=y
+CONFIG_PM_DEVICE=y
CONFIG_PM_POLICY_APP=y
CONFIG_UART_CONSOLE_INPUT_EXPIRED=y
CONFIG_NPCX_PM_TRACE=y