summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Barnes <robbarnes@google.com>2021-02-09 07:41:36 -0700
committerCommit Bot <commit-bot@chromium.org>2021-02-10 18:03:54 +0000
commitd91a433c715099dc2bf7a2f5e9155fcfec69ef16 (patch)
tree3fed18cfa48f929a163638dd7569a72749ef829f
parent323a9788a25afe73ca646ef14824ca22711c506a (diff)
downloadchrome-ec-d91a433c715099dc2bf7a2f5e9155fcfec69ef16.tar.gz
power: Rename stoney.c to amd_x86.c
Rename stoney.c to amd_x86.c since it covers all currently supported AMD chipsets. Add CHIPSET_CEZANNE to guard any differences between STONEY and CEZANNE chipsets. BUG=b:175234270 BRANCH=None TEST=Build for zork and guybrush Signed-off-by: Rob Barnes <robbarnes@google.com> Change-Id: I96f82127729d64970b8d46fc8ef4ddba6489dd8a Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2683923 Reviewed-by: Edward Hill <ecgh@chromium.org> Reviewed-by: Denis Brockus <dbrockus@chromium.org> Reviewed-by: Diana Z <dzigterman@chromium.org>
-rw-r--r--baseboard/guybrush/baseboard.h2
-rw-r--r--include/config.h2
-rw-r--r--power/amd_x86.c (renamed from power/stoney.c)2
-rw-r--r--power/build.mk3
4 files changed, 6 insertions, 3 deletions
diff --git a/baseboard/guybrush/baseboard.h b/baseboard/guybrush/baseboard.h
index a2caca06cd..d9d305d01f 100644
--- a/baseboard/guybrush/baseboard.h
+++ b/baseboard/guybrush/baseboard.h
@@ -76,7 +76,7 @@
#define GPIO_EC_INT_L GPIO_EC_SOC_INT_L
/* Chipset config */
-#define CONFIG_CHIPSET_STONEY
+#define CONFIG_CHIPSET_CEZANNE
#define CONFIG_CHIPSET_CAN_THROTTLE
#define CONFIG_CHIPSET_RESET_HOOK
diff --git a/include/config.h b/include/config.h
index ddf4778841..4e4c81f357 100644
--- a/include/config.h
+++ b/include/config.h
@@ -1177,6 +1177,7 @@
#undef CONFIG_CHIPSET_MT817X /* MediaTek MT817x */
#undef CONFIG_CHIPSET_MT8183 /* MediaTek MT8183 */
#undef CONFIG_CHIPSET_MT8192 /* MediaTek MT8192 */
+#undef CONFIG_CHIPSET_CEZANNE /* AMD Cezanne (x86) */
#undef CONFIG_CHIPSET_RK3288 /* Rockchip rk3288 */
#undef CONFIG_CHIPSET_RK3399 /* Rockchip rk3399 */
#undef CONFIG_CHIPSET_SKYLAKE /* Intel Skylake (x86) */
@@ -5532,6 +5533,7 @@
#undef CONFIG_CHIPSET_MT817X
#undef CONFIG_CHIPSET_MT8183
#undef CONFIG_CHIPSET_MT8192
+#undef CONFIG_CHIPSET_CEZANNE
#undef CONFIG_CHIPSET_RK3399
#undef CONFIG_CHIPSET_RK3288
#undef CONFIG_CHIPSET_SDM845
diff --git a/power/stoney.c b/power/amd_x86.c
index a889cc9102..7924d6f361 100644
--- a/power/stoney.c
+++ b/power/amd_x86.c
@@ -3,7 +3,7 @@
* found in the LICENSE file.
*/
-/* Stoney power sequencing module for Chrome EC */
+/* AMD x86 power sequencing module for Chrome EC */
#include "chipset.h"
#include "common.h"
diff --git a/power/build.mk b/power/build.mk
index a278c8d32b..3dcd387d29 100644
--- a/power/build.mk
+++ b/power/build.mk
@@ -18,11 +18,12 @@ power-$(CONFIG_CHIPSET_ICELAKE)+=icelake.o intel_x86.o
power-$(CONFIG_CHIPSET_MT817X)+=mt817x.o
power-$(CONFIG_CHIPSET_MT8183)+=mt8183.o
power-$(CONFIG_CHIPSET_MT8192)+=mt8192.o
+power-$(CONFIG_CHIPSET_CEZANNE)+=amd_x86.o
power-$(CONFIG_CHIPSET_RK3288)+=rk3288.o
power-$(CONFIG_CHIPSET_RK3399)+=rk3399.o
power-$(CONFIG_CHIPSET_SC7180)+=sc7180.o
power-$(CONFIG_CHIPSET_SDM845)+=sdm845.o
power-$(CONFIG_CHIPSET_SKYLAKE)+=skylake.o intel_x86.o
-power-$(CONFIG_CHIPSET_STONEY)+=stoney.o
+power-$(CONFIG_CHIPSET_STONEY)+=amd_x86.o
power-$(CONFIG_POWER_COMMON)+=common.o
power-$(CONFIG_POWER_TRACK_HOST_SLEEP_STATE)+=host_sleep.o