diff options
| author | Scott Collyer <scollyer@google.com> | 2022-08-10 12:18:43 -0700 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-08-15 21:16:46 +0000 |
| commit | 9d4d0c455faa7fe72bafd26da6142b961bc836c9 (patch) | |
| tree | 2a6d9d3fe4e25875291bda31cde5219944f9adc3 | |
| parent | 487174e0067ed01616f0981c0669e040f39af909 (diff) | |
| download | chrome-ec-9d4d0c455faa7fe72bafd26da6142b961bc836c9.tar.gz | |
rex: Use VW for sleep S3 and enable EC_SYSTEM_UNLOCKED
This CL fixes an issue where the config option was set to use VW for
sleep S3, but the power_signal node did not reflect this.
In addition, CONFIG_PLATFORM_EC_SYSTEM_UNLOCKED was added and
CONFIG_PLATFORM_EC_BRINGUP was removed to allow for the AP to boot up
automatically.
BRANCH=none
BUG=b:240434243
TEST=zmake build rex
Signed-off-by: Scott Collyer <scollyer@google.com>
Change-Id: I83c939d5637736a7460f8f5388ebcaddf389bd35
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3823913
Reviewed-by: Fabio Baltieri <fabiobaltieri@google.com>
Reviewed-by: Madhu P <mparuchuri@google.com>
Tested-by: Scott Collyer <scollyer@chromium.org>
Reviewed-by: Li1 Feng <li1.feng@intel.com>
Commit-Queue: Scott Collyer <scollyer@chromium.org>
| -rw-r--r-- | zephyr/projects/rex/power_signals.dts | 13 | ||||
| -rw-r--r-- | zephyr/projects/rex/prj.conf | 3 |
2 files changed, 11 insertions, 5 deletions
diff --git a/zephyr/projects/rex/power_signals.dts b/zephyr/projects/rex/power_signals.dts index 1df4a4bb0c..bf96ead2af 100644 --- a/zephyr/projects/rex/power_signals.dts +++ b/zephyr/projects/rex/power_signals.dts @@ -65,11 +65,18 @@ interrupt-flags = <GPIO_INT_EDGE_BOTH>; }; pwr-slp-s3-l { - compatible = "intel,ap-pwrseq-gpio"; + compatible = "intel,ap-pwrseq-vw"; dbg-label = "SLP_S3_L input from PCH"; enum-name = "PWR_SLP_S3"; - gpios = <&gpio4 1 GPIO_ACTIVE_LOW>; - interrupt-flags = <GPIO_INT_EDGE_BOTH>; + virtual-wire = "ESPI_VWIRE_SIGNAL_SLP_S4"; + vw-invert; +/* + * TODO: Initially, use virtual wire for sleep S3 signal instead of + * of the GPIO signal which also exists. + * compatible = "intel,ap-pwrseq-gpio"; + * gpios = <&gpio4 1 GPIO_ACTIVE_LOW>; + * interrupt-flags = <GPIO_INT_EDGE_BOTH>; + */ }; pwr-slp-s4 { compatible = "intel,ap-pwrseq-vw"; diff --git a/zephyr/projects/rex/prj.conf b/zephyr/projects/rex/prj.conf index 1b0fdfe93b..40c0990936 100644 --- a/zephyr/projects/rex/prj.conf +++ b/zephyr/projects/rex/prj.conf @@ -8,6 +8,7 @@ CONFIG_SHIMMED_TASKS=y CONFIG_SYSCON=y # Enable during development CONFIG_LTO=n +CONFIG_PLATFORM_EC_SYSTEM_UNLOCKED=y # Logging CONFIG_LOG=y @@ -38,8 +39,6 @@ CONFIG_X86_NON_DSX_PWRSEQ_HOST_CMD=y # TODO (b/240434243): This may be needed, but using eSPI VW for now CONFIG_PLATFORM_EC_POWERSEQ_SLP_S3_L_OVERRIDE=n CONFIG_PLATFORM_EC_POWERSEQ_PP5000_CONTROL=n -# Note: this config will prevent AP from powering on automatically -CONFIG_PLATFORM_EC_BRINGUP=y # Zephyr Inbuilt AP Power Sequencing Config CONFIG_AP_PWRSEQ=y |