summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hughes <tomhughes@chromium.org>2021-10-25 17:11:58 +0000
committerCommit Bot <commit-bot@chromium.org>2021-11-12 20:05:40 +0000
commitf5b8386e9ce857d8057ea8bedf19d94885a08cde (patch)
treef4df55f3abb199cd5c732f2d2a514e4e346d08b7
parent2f128a15b96b61257a4ec04b7618deac0913ba16 (diff)
downloadchrome-ec-f5b8386e9ce857d8057ea8bedf19d94885a08cde.tar.gz
power: add casts for power signals
When building with clang, it warns: power/icelake.c:49:11: error: implicit conversion from enumeration type 'enum espi_vw_signal' to different enumeration type 'enum gpio_signal' [-Werror,-Wenum-conversion] .gpio = SLP_S4_SIGNAL_L, ^~~~~~~~~~~~~~~ include/power/intel_x86.h:40:25: note: expanded from macro 'SLP_S4_SIGNAL_L' Although "enum espi_vw_signal" and "enum gpio_signal" are not directly compatible, it appears that the code in power/common.c takes that into account by calling espi_signal_is_vw(). BRANCH=none BUG=b:172020503 TEST=./util/compare_build.sh -b all -j 120 => MATCH Signed-off-by: Tom Hughes <tomhughes@chromium.org> Change-Id: Ibb3ac42516d2e293cf707ca92eacd6bd7c11049c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3243003 Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
-rw-r--r--power/alderlake_slg4bd44540.c2
-rw-r--r--power/icelake.c2
-rw-r--r--power/skylake.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/power/alderlake_slg4bd44540.c b/power/alderlake_slg4bd44540.c
index 381b86bd1e..7c6e16b9c1 100644
--- a/power/alderlake_slg4bd44540.c
+++ b/power/alderlake_slg4bd44540.c
@@ -63,7 +63,7 @@ const struct power_signal_info power_signal_list[] = {
.name = "SLP_S3_DEASSERTED",
},
[X86_SLP_S4_DEASSERTED] = {
- .gpio = SLP_S4_SIGNAL_L,
+ .gpio = (enum gpio_signal)SLP_S4_SIGNAL_L,
.flags = POWER_SIGNAL_ACTIVE_HIGH,
.name = "SLP_S4_DEASSERTED",
},
diff --git a/power/icelake.c b/power/icelake.c
index c47f44c146..120df9f578 100644
--- a/power/icelake.c
+++ b/power/icelake.c
@@ -46,7 +46,7 @@ const struct power_signal_info power_signal_list[] = {
.name = "SLP_S3_DEASSERTED",
},
[X86_SLP_S4_DEASSERTED] = {
- .gpio = SLP_S4_SIGNAL_L,
+ .gpio = (enum gpio_signal)SLP_S4_SIGNAL_L,
.flags = POWER_SIGNAL_ACTIVE_HIGH,
.name = "SLP_S4_DEASSERTED",
},
diff --git a/power/skylake.c b/power/skylake.c
index c68035e099..511ab8c32f 100644
--- a/power/skylake.c
+++ b/power/skylake.c
@@ -31,12 +31,12 @@ const struct power_signal_info power_signal_list[] = {
},
#endif
[X86_SLP_S3_DEASSERTED] = {
- SLP_S3_SIGNAL_L,
+ (enum gpio_signal)SLP_S3_SIGNAL_L,
POWER_SIGNAL_ACTIVE_HIGH,
"SLP_S3_DEASSERTED",
},
[X86_SLP_S4_DEASSERTED] = {
- SLP_S4_SIGNAL_L,
+ (enum gpio_signal)SLP_S4_SIGNAL_L,
POWER_SIGNAL_ACTIVE_HIGH,
"SLP_S4_DEASSERTED",
},