diff options
| author | Divagar Mohandass <divagar.mohandass@intel.com> | 2019-12-23 00:03:12 +0530 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-12-25 07:28:22 +0000 |
| commit | 20dda1348f921c81c7f6da93ed7eeb67da9f891b (patch) | |
| tree | 6e1575f44abd1bc82a7ae239ba40b18b563074d5 | |
| parent | b9c725f7a5f3bfb0019fa319e922199cdcb05948 (diff) | |
| download | chrome-ec-20dda1348f921c81c7f6da93ed7eeb67da9f891b.tar.gz | |
power: add support for Jasperlake chipset
- Jasperlake power sequencing flow is same as Icelake
- Rename CONFIG_CHIPSET_ICL_TGL as CONFIG_CHIPSET_ICELAKE
to avoid duplicate code
- define CONFIG_CHIPSET_ICELAKE on CONFIG_CHIPSET_JASPERLAKE or
CONFIG_CHIPSET_TIGERLAKE
BRANCH=none
BUG=b:146693933
TEST=make buildall -j
Change-Id: I25f43d85fcfc7fbbfe06787e5a201983c0e49cc7
Signed-off-by: Divagar Mohandass <divagar.mohandass@intel.com>
Signed-off-by: Vijay Hiremath <vijay.p.hiremath@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1980090
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
| -rw-r--r-- | include/config.h | 13 | ||||
| -rw-r--r-- | power/build.mk | 2 | ||||
| -rw-r--r-- | power/intel_x86.h | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/include/config.h b/include/config.h index a2b248e7b3..330fccb68f 100644 --- a/include/config.h +++ b/include/config.h @@ -1096,6 +1096,7 @@ #undef CONFIG_CHIPSET_ECDRIVEN /* Dummy power module */ #undef CONFIG_CHIPSET_GEMINILAKE /* Intel Geminilake (x86) */ #undef CONFIG_CHIPSET_ICELAKE /* Intel Icelake (x86) */ +#undef CONFIG_CHIPSET_JASPERLAKE /* Intel Jasperlake (x86) */ #undef CONFIG_CHIPSET_MT817X /* MediaTek MT817x */ #undef CONFIG_CHIPSET_MT8183 /* MediaTek MT8183 */ #undef CONFIG_CHIPSET_RK3288 /* Rockchip rk3288 */ @@ -1108,7 +1109,6 @@ /* Shared chipset support; automatically gets defined below. */ #undef CONFIG_CHIPSET_APL_GLK /* Apollolake & Geminilake */ -#undef CONFIG_CHIPSET_ICL_TGL /* Icelake & Tigerlake */ /* Support chipset throttling */ #undef CONFIG_CHIPSET_CAN_THROTTLE @@ -4850,6 +4850,7 @@ #undef CONFIG_CHIPSET_COMETLAKE #undef CONFIG_CHIPSET_GEMINILAKE #undef CONFIG_CHIPSET_ICELAKE +#undef CONFIG_CHIPSET_JASPERLAKE #undef CONFIG_CHIPSET_MT817X #undef CONFIG_CHIPSET_MT8183 #undef CONFIG_CHIPSET_RK3399 @@ -4949,9 +4950,9 @@ #define CONFIG_CHIPSET_APL_GLK #endif -#if defined(CONFIG_CHIPSET_ICELAKE) || \ +#if defined(CONFIG_CHIPSET_JASPERLAKE) || \ defined(CONFIG_CHIPSET_TIGERLAKE) -#define CONFIG_CHIPSET_ICL_TGL +#define CONFIG_CHIPSET_ICELAKE #endif #if defined(CONFIG_CHIPSET_APL_GLK) @@ -4965,15 +4966,13 @@ defined(CONFIG_CHIPSET_COMETLAKE_DISCRETE) || \ defined(CONFIG_CHIPSET_GEMINILAKE) || \ defined(CONFIG_CHIPSET_ICELAKE) || \ - defined(CONFIG_CHIPSET_SKYLAKE) || \ - defined(CONFIG_CHIPSET_TIGERLAKE) + defined(CONFIG_CHIPSET_SKYLAKE) #define CONFIG_POWER_COMMON #endif #if defined(CONFIG_CHIPSET_CANNONLAKE) || \ defined(CONFIG_CHIPSET_ICELAKE) || \ - defined(CONFIG_CHIPSET_SKYLAKE) || \ - defined(CONFIG_CHIPSET_TIGERLAKE) + defined(CONFIG_CHIPSET_SKYLAKE) #define CONFIG_CHIPSET_X86_RSMRST_DELAY #endif diff --git a/power/build.mk b/power/build.mk index 2a22057982..27dadebbd5 100644 --- a/power/build.mk +++ b/power/build.mk @@ -12,7 +12,7 @@ power-$(CONFIG_CHIPSET_CANNONLAKE)+=cannonlake.o intel_x86.o power-$(CONFIG_CHIPSET_COMETLAKE)+=cometlake.o intel_x86.o power-$(CONFIG_CHIPSET_COMETLAKE_DISCRETE)+=cometlake-discrete.o intel_x86.o power-$(CONFIG_CHIPSET_ECDRIVEN)+=ec_driven.o -power-$(CONFIG_CHIPSET_ICL_TGL)+=icelake.o intel_x86.o +power-$(CONFIG_CHIPSET_ICELAKE)+=icelake.o intel_x86.o power-$(CONFIG_CHIPSET_MT817X)+=mt817x.o power-$(CONFIG_CHIPSET_MT8183)+=mt8183.o power-$(CONFIG_CHIPSET_RK3288)+=rk3288.o diff --git a/power/intel_x86.h b/power/intel_x86.h index b54c60e2c3..b1e60bd17f 100644 --- a/power/intel_x86.h +++ b/power/intel_x86.h @@ -22,7 +22,7 @@ #include "cometlake.h" #elif defined(CONFIG_CHIPSET_COMETLAKE_DISCRETE) #include "cometlake-discrete.h" -#elif defined(CONFIG_CHIPSET_ICL_TGL) +#elif defined(CONFIG_CHIPSET_ICELAKE) #include "icelake.h" #elif defined(CONFIG_CHIPSET_SKYLAKE) #include "skylake.h" |