zephyr: npcx: clock: remove the guard for npcx_clock_get_sleep_ticks

The function npcx_clock_get_sleep_ticks is currently guarded by
CONFIG_PM && CONFIG_NPCX_PM_TRACE. The other codes guarded by
CONFIG_NPCX_PM_TRACE is used to trace and will print a lot of messages.
The user who wants to use npcx_clock_get_sleep_ticks has to enable this
flag and get a lot of console spam. This commit removes the guard
CONFIG_NPCX_PM_TRACE and makes this function is available when
CONFIG_PM is defined.
This CL also removed the unnecessary default CONFIG* to reflect the
change.
This CL has dependency on PR:
https://github.com/zephyrproject-rtos/zephyr/pull/44195

BRANCH=none
BUG=b:226593750
TEST=set CONFIG_NPCX_PM_TRACE=n, the deep sleep time can be printed by
"idlestats" console command.
TEST=pass "zmake testall --clobber"

Signed-off-by: Jun Lin <CHLin56@nuvoton.com>
Change-Id: I87138f075a80e7389d58ec5dd38a8ead320593b5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3552006
Tested-by: CH Lin <chlin56@nuvoton.com>
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>

7 files changed, 1 insertions, 13 deletions

diff --git a/zephyr/boards/arm/npcx7/npcx7_defconfig b/zephyr/boards/arm/npcx7/npcx7_defconfig
index afebc2383d..cc1cd1eb6d 100644
--- a/zephyr/boards/arm/npcx7/npcx7_defconfig
+++ b/zephyr/boards/arm/npcx7/npcx7_defconfig
@@ -4,7 +4,6 @@
 
 # Zephyr Kernel Configuration
 CONFIG_SOC_SERIES_NPCX7=y
-CONFIG_SOC_LOG_LEVEL_ERR=y
 
 # Platform Configuration
 CONFIG_BOARD_NPCX7=y
@@ -34,7 +33,6 @@ CONFIG_PM=y
 CONFIG_PM_DEVICE=y
 CONFIG_PM_POLICY_CUSTOM=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 ed1a44764b..18790143b0 100644
--- a/zephyr/boards/arm/npcx9/npcx9_defconfig
+++ b/zephyr/boards/arm/npcx9/npcx9_defconfig
@@ -5,7 +5,6 @@
 # Zephyr Kernel Configuration
 CONFIG_SOC_SERIES_NPCX9=y
 CONFIG_SOC_NPCX9M3F=y
-CONFIG_SOC_LOG_LEVEL_ERR=y
 
 # Platform Configuration
 CONFIG_BOARD_NPCX9=y
@@ -35,7 +34,6 @@ CONFIG_PM=y
 CONFIG_PM_DEVICE=y
 CONFIG_PM_POLICY_CUSTOM=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 828304e5c9..5f79c4ce8a 100644
--- a/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig
+++ b/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig
@@ -49,7 +49,6 @@ CONFIG_PM=y
 CONFIG_PM_DEVICE=y
 CONFIG_PM_POLICY_CUSTOM=y
 CONFIG_UART_CONSOLE_INPUT_EXPIRED=y
-CONFIG_NPCX_PM_TRACE=y
 
 # BBRAM
 CONFIG_BBRAM=y
diff --git a/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig b/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig
index ef0737a059..d4473b0f64 100644
--- a/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig
+++ b/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig
@@ -49,7 +49,6 @@ CONFIG_PM=y
 CONFIG_PM_DEVICE=y
 CONFIG_PM_POLICY_CUSTOM=y
 CONFIG_UART_CONSOLE_INPUT_EXPIRED=y
-CONFIG_NPCX_PM_TRACE=y
 
 # BBRAM
 CONFIG_BBRAM=y
diff --git a/zephyr/drivers/cros_system/cros_system_npcx.c b/zephyr/drivers/cros_system/cros_system_npcx.c
index 038ca89ec0..879b792ee1 100644
--- a/zephyr/drivers/cros_system/cros_system_npcx.c
+++ b/zephyr/drivers/cros_system/cros_system_npcx.c
@@ -572,7 +572,7 @@ static const struct cros_system_driver_api cros_system_driver_npcx_api = {
 	.chip_vendor = cros_system_npcx_get_chip_vendor,
 	.chip_name = cros_system_npcx_get_chip_name,
 	.chip_revision = cros_system_npcx_get_chip_revision,
-#ifdef CONFIG_NPCX_PM_TRACE
+#ifdef CONFIG_PM
 	.deep_sleep_ticks = cros_system_npcx_deep_sleep_ticks,
 #endif
 };
diff --git a/zephyr/projects/npcx_evb/npcx7/prj.conf b/zephyr/projects/npcx_evb/npcx7/prj.conf
index 2e8fa83cf8..0b858a3a82 100644
--- a/zephyr/projects/npcx_evb/npcx7/prj.conf
+++ b/zephyr/projects/npcx_evb/npcx7/prj.conf
@@ -54,7 +54,4 @@ CONFIG_LOG=y
 # Avoid underflow info from tachometer
 CONFIG_SENSOR_LOG_LEVEL_ERR=y
 
-# Avoid info storm from power management
-CONFIG_SOC_LOG_LEVEL_ERR=y
-
 CONFIG_SYSCON=y
diff --git a/zephyr/projects/npcx_evb/npcx9/prj.conf b/zephyr/projects/npcx_evb/npcx9/prj.conf
index c025e32ec5..becb9ed228 100644
--- a/zephyr/projects/npcx_evb/npcx9/prj.conf
+++ b/zephyr/projects/npcx_evb/npcx9/prj.conf
@@ -58,7 +58,4 @@ CONFIG_LOG=y
 # Avoid underflow info from tachometer
 CONFIG_SENSOR_LOG_LEVEL_ERR=y
 
-# Avoid info storm from power management
-CONFIG_SOC_LOG_LEVEL_ERR=y
-
 CONFIG_SYSCON=y