zephyr: ap_pwrseq: select CONFIG_AP_PWRSEQ automatically

Select CONFIG_AP_PWRSEQ and drop a few unnecessary #if guards.

BRANCH=none
BUG=none
TEST=cq dry run
TEST=zmake compare-builds -a

Change-Id: Ia85badce8b5bb998c99c13b8039b2d52f1ab5b22
Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4097132
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
Reviewed-by: Aaron Massey <aaronmassey@google.com>

7 files changed, 2 insertions, 10 deletions

diff --git a/zephyr/program/intelrvp/zephyr_ap_pwrseq.conf b/zephyr/program/intelrvp/zephyr_ap_pwrseq.conf
index d33b9bc963..888106e738 100644
--- a/zephyr/program/intelrvp/zephyr_ap_pwrseq.conf
+++ b/zephyr/program/intelrvp/zephyr_ap_pwrseq.conf
@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 # Zephyr Inbuilt AP Power Sequencing Config
-CONFIG_AP_PWRSEQ=y
 CONFIG_X86_NON_DSX_PWRSEQ_CONSOLE=y
 CONFIG_X86_NON_DSX_PWRSEQ_HOST_CMD=y
 CONFIG_AP_PWRSEQ_S0IX=y
diff --git a/zephyr/program/nissa/program.conf b/zephyr/program/nissa/program.conf
index ff2e7c47a7..17fab6ddb6 100644
--- a/zephyr/program/nissa/program.conf
+++ b/zephyr/program/nissa/program.conf
@@ -41,7 +41,6 @@ CONFIG_PLATFORM_EC_PORT80=y
 CONFIG_PLATFORM_EC_PORT80_QUIET=y
 
 # AP Power Sequencing
-CONFIG_AP_PWRSEQ=y
 CONFIG_X86_NON_DSX_PWRSEQ_ADL=y
 CONFIG_X86_NON_DSX_PWRSEQ_CONSOLE=y
 CONFIG_X86_NON_DSX_PWRSEQ_HOST_CMD=y
diff --git a/zephyr/program/rex/program.conf b/zephyr/program/rex/program.conf
index 9cf28cdcfa..fa5fdbbf37 100644
--- a/zephyr/program/rex/program.conf
+++ b/zephyr/program/rex/program.conf
@@ -43,7 +43,6 @@ CONFIG_PLATFORM_EC_POWERSEQ_SLP_S3_L_OVERRIDE=n
 CONFIG_PLATFORM_EC_POWERSEQ_PP5000_CONTROL=n
 
 # Zephyr Inbuilt AP Power Sequencing Config
-CONFIG_AP_PWRSEQ=y
 CONFIG_X86_NON_DSX_PWRSEQ_CONSOLE=y
 CONFIG_AP_PWRSEQ_S0IX=y
 CONFIG_AP_PWRSEQ_S0IX_ERROR_RECOVERY=y
diff --git a/zephyr/subsys/ap_pwrseq/Kconfig b/zephyr/subsys/ap_pwrseq/Kconfig
index 8fc2423a15..b982d58866 100644
--- a/zephyr/subsys/ap_pwrseq/Kconfig
+++ b/zephyr/subsys/ap_pwrseq/Kconfig
@@ -4,6 +4,8 @@
 
 menuconfig AP_PWRSEQ
 	bool "AP Power sequencing support"
+	default y
+	depends on DT_HAS_INTEL_AP_PWRSEQ_ENABLED
 	select HAS_TASK_POWERBTN
 	select GPIO_GET_CONFIG
 	help
diff --git a/zephyr/subsys/ap_pwrseq/include/power_signals.h b/zephyr/subsys/ap_pwrseq/include/power_signals.h
index 5d3e97a52e..eea258a80d 100644
--- a/zephyr/subsys/ap_pwrseq/include/power_signals.h
+++ b/zephyr/subsys/ap_pwrseq/include/power_signals.h
@@ -41,8 +41,6 @@
 
 #include <zephyr/devicetree.h>
 
-#if DT_HAS_COMPAT_STATUS_OKAY(intel_ap_pwrseq)
-
 /*
  * Create guards so that code used for a source is only
  * included if that signal source is configured in the
@@ -325,6 +323,4 @@ static inline int power_wait_signals_timeout(power_signal_mask_t want,
  */
 #define POWER_SIGNAL_MASK(signal) (1 << (signal))
 
-#endif /* DT_HAS_COMPAT_STATUS_OKAY */
-
 #endif /* __AP_PWRSEQ_POWER_SIGNALS_H__ */
diff --git a/zephyr/subsys/ap_pwrseq/power_signals.c b/zephyr/subsys/ap_pwrseq/power_signals.c
index 1ae8604a3a..e767cbda07 100644
--- a/zephyr/subsys/ap_pwrseq/power_signals.c
+++ b/zephyr/subsys/ap_pwrseq/power_signals.c
@@ -17,10 +17,8 @@
 
 LOG_MODULE_DECLARE(ap_pwrseq, CONFIG_AP_PWRSEQ_LOG_LEVEL);
 
-#if DT_HAS_COMPAT_STATUS_OKAY(intel_ap_pwrseq)
 BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(intel_ap_pwrseq) == 1,
 	     "Only one node for intel_ap_pwrseq is allowed");
-#endif
 
 BUILD_ASSERT(POWER_SIGNAL_COUNT <= 32, "Too many power signals");
 
diff --git a/zephyr/test/ap_power/prj.conf b/zephyr/test/ap_power/prj.conf
index 53c6accdd3..c0d2b43467 100644
--- a/zephyr/test/ap_power/prj.conf
+++ b/zephyr/test/ap_power/prj.conf
@@ -38,7 +38,6 @@ CONFIG_EMUL=y
 CONFIG_GPIO=y
 CONFIG_HEAP_MEM_POOL_SIZE=1024
 
-CONFIG_AP_PWRSEQ=y
 CONFIG_AP_PWRSEQ_STACK_SIZE=1024
 
 CONFIG_ESPI=y