diff options
| author | Jett Rink <jettrink@chromium.org> | 2018-03-19 15:27:27 -0600 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-03-20 14:38:42 -0700 |
| commit | 50da99d5d4587ac5f11bc820e42d396d73a93f6c (patch) | |
| tree | 778c428f7dd550cd33d6a0791f8f4eacf51f21c4 /power | |
| parent | b5fddbbe26ed27f1ade7d89e6acbeebaf15b315e (diff) | |
| download | chrome-ec-50da99d5d4587ac5f11bc820e42d396d73a93f6c.tar.gz | |
power: create CONFIG_CHIPSET_GEMINILAKE
Geminilake uses the same power sequencing code as Apollolake. Instead
of the board specifying the wrong chipset, we will make the correct
chipset reuse the existing power code.
This also gives us flexibility in the future if GLK needs to vary from
ALK in any of shared code.
BRANCH=none
BUG=b:74020444
TEST=build all
Change-Id: Icd00286ac4f0612d1bda56677c4141957480c6bf
Signed-off-by: Jett Rink <jettrink@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/969613
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Diffstat (limited to 'power')
| -rw-r--r-- | power/build.mk | 2 | ||||
| -rw-r--r-- | power/intel_x86.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/power/build.mk b/power/build.mk index 5d6db5f065..e24ea80cee 100644 --- a/power/build.mk +++ b/power/build.mk @@ -6,7 +6,7 @@ # Power management for application processor and peripherals # -power-$(CONFIG_CHIPSET_APOLLOLAKE)+=apollolake.o intel_x86.o +power-$(CONFIG_CHIPSET_APL_GLK)+=apollolake.o intel_x86.o power-$(CONFIG_CHIPSET_BRASWELL)+=braswell.o power-$(CONFIG_CHIPSET_CANNONLAKE)+=cannonlake.o intel_x86.o power-$(CONFIG_CHIPSET_ECDRIVEN)+=ec_driven.o diff --git a/power/intel_x86.c b/power/intel_x86.c index a1626d9b5c..2e983c514c 100644 --- a/power/intel_x86.c +++ b/power/intel_x86.c @@ -24,7 +24,8 @@ #include "wireless.h" /* Chipset specific header files */ -#ifdef CONFIG_CHIPSET_APOLLOLAKE +/* Geminilake and apollolake use same power sequencing. */ +#ifdef CONFIG_CHIPSET_APL_GLK #include "apollolake.h" #elif defined(CONFIG_CHIPSET_CANNONLAKE) #include "cannonlake.h" @@ -451,7 +452,7 @@ void common_intel_x86_handle_rsmrst(enum power_state state) board_before_rsmrst(rsmrst_in); #endif -#ifdef CONFIG_CHIPSET_APOLLOLAKE +#ifdef CONFIG_CHIPSET_APL_GLK /* Only passthrough RSMRST_L de-assertion on power up */ if (rsmrst_in && !power_s5_up) return; |