power: Combine chipset_reset_reason and chipset_shutdown_reason

When building with clang, it warns:

power/amd_x86.c:59:18: error: implicit conversion from enumeration type
'enum chipset_reset_reason' to different enumeration type 'enum
chipset_shutdown_reason' [-Werror,-Wenum-conversion]
        report_ap_reset(reason);

The two enums are already set up so that they don't overlap, so just
combine them into a single enum.

BRANCH=none
BUG=b:172020503
TEST=./util/compare_build.sh -b all -j 120
     => All boards match, except:
     burnet cerise damu fennel jacuzzi juniper kakadu kappa katsu kodama
     krane kukui makomo stern willow

Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Change-Id: I47620e59e02a84c04dde4469f36ad37dccbcd9e5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3238250
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>

11 files changed, 11 insertions, 11 deletions

diff --git a/power/amd_x86.c b/power/amd_x86.c
index c1b7b2d853..ae3367e227 100644
--- a/power/amd_x86.c
+++ b/power/amd_x86.c
@@ -47,7 +47,7 @@ static void chipset_force_g3(void)
 	gpio_set_level(GPIO_EN_PWR_A, 0);
 }
 
-void chipset_reset(enum chipset_reset_reason reason)
+void chipset_reset(enum chipset_shutdown_reason reason)
 {
 	CPRINTS("%s: %d", __func__, reason);
 
diff --git a/power/braswell.c b/power/braswell.c
index 288092c795..dd2e3a8bb5 100644
--- a/power/braswell.c
+++ b/power/braswell.c
@@ -69,7 +69,7 @@ void chipset_force_shutdown(enum chipset_shutdown_reason reason)
 	forcing_shutdown = 1;
 }
 
-void chipset_reset(enum chipset_reset_reason reason)
+void chipset_reset(enum chipset_shutdown_reason reason)
 {
 	CPRINTS("%s: %d", __func__, reason);
 	report_ap_reset(reason);
diff --git a/power/falconlite.c b/power/falconlite.c
index f401d1ff50..087b952e19 100644
--- a/power/falconlite.c
+++ b/power/falconlite.c
@@ -296,7 +296,7 @@ enum power_state power_chipset_init(void)
 	return POWER_G3;
 }
 
-void chipset_reset(enum chipset_reset_reason reason)
+void chipset_reset(enum chipset_shutdown_reason reason)
 {
 	CPRINTS("%s: %d", __func__, reason);
 	report_ap_reset(reason);
diff --git a/power/intel_x86.c b/power/intel_x86.c
index a982ff03c0..8c8ee908eb 100644
--- a/power/intel_x86.c
+++ b/power/intel_x86.c
@@ -607,7 +607,7 @@ __overridable void intel_x86_sys_reset_delay(void)
 	udelay(32 * MSEC);
 }
 
-void chipset_reset(enum chipset_reset_reason reason)
+void chipset_reset(enum chipset_shutdown_reason reason)
 {
 	/*
 	 * Irrespective of cold_reset value, always toggle SYS_RESET_L to
diff --git a/power/mt817x.c b/power/mt817x.c
index e7e23605f2..8f11af2364 100644
--- a/power/mt817x.c
+++ b/power/mt817x.c
@@ -644,7 +644,7 @@ static void power_on(void)
 	CPRINTS("AP running ...");
 }
 
-void chipset_reset(enum chipset_reset_reason reason)
+void chipset_reset(enum chipset_shutdown_reason reason)
 {
 	CPRINTS("%s: %d", __func__, reason);
 	report_ap_reset(reason);
diff --git a/power/mt8183.c b/power/mt8183.c
index bdbd319601..ddf49799e9 100644
--- a/power/mt8183.c
+++ b/power/mt8183.c
@@ -186,7 +186,7 @@ DECLARE_HOOK(HOOK_CHIPSET_RESET, handle_chipset_reset, HOOK_PRIO_FIRST);
 #endif /* CONFIG_POWER_TRACK_HOST_SLEEP_STATE */
 
 /* If chipset needs to be reset, EC also reboots to RO. */
-void chipset_reset(enum chipset_reset_reason reason)
+void chipset_reset(enum chipset_shutdown_reason reason)
 {
 	int flags = SYSTEM_RESET_HARD;
 
diff --git a/power/mt8192.c b/power/mt8192.c
index 625f3a0004..5a4bafe600 100644
--- a/power/mt8192.c
+++ b/power/mt8192.c
@@ -170,7 +170,7 @@ void chipset_exit_hard_off_button(void)
 }
 DECLARE_DEFERRED(chipset_exit_hard_off_button);
 
-void chipset_reset(enum chipset_reset_reason reason)
+void chipset_reset(enum chipset_shutdown_reason reason)
 {
 	CPRINTS("%s: %d", __func__, reason);
 	report_ap_reset(reason);
diff --git a/power/qcom.c b/power/qcom.c
index ef9e329111..fe9dabcce6 100644
--- a/power/qcom.c
+++ b/power/qcom.c
@@ -803,7 +803,7 @@ void chipset_force_shutdown(enum chipset_shutdown_reason reason)
 	task_wake(TASK_ID_CHIPSET);
 }
 
-void chipset_reset(enum chipset_reset_reason reason)
+void chipset_reset(enum chipset_shutdown_reason reason)
 {
 	int rv;
 
diff --git a/power/rk3288.c b/power/rk3288.c
index c647ab97b2..39f19ddeff 100644
--- a/power/rk3288.c
+++ b/power/rk3288.c
@@ -385,7 +385,7 @@ static void power_off(void)
 	hook_notify(HOOK_CHIPSET_SHUTDOWN_COMPLETE);
 }
 
-void chipset_reset(enum chipset_reset_reason reason)
+void chipset_reset(enum chipset_shutdown_reason reason)
 {
 	CPRINTS("%s(%d)", __func__, reason);
 	report_ap_reset(reason);
diff --git a/power/rk3399.c b/power/rk3399.c
index a11a732689..c1693057b9 100644
--- a/power/rk3399.c
+++ b/power/rk3399.c
@@ -215,7 +215,7 @@ void chipset_force_shutdown(enum chipset_shutdown_reason reason)
 }
 
 #define SYS_RST_HOLD_US (1 * MSEC)
-void chipset_reset(enum chipset_reset_reason reason)
+void chipset_reset(enum chipset_shutdown_reason reason)
 {
 #ifdef CONFIG_CMD_RTC
 	/* Print out the RTC to help correlate resets in logs. */
diff --git a/power/sdm845.c b/power/sdm845.c
index a8cc70b8ea..7157f98cc3 100644
--- a/power/sdm845.c
+++ b/power/sdm845.c
@@ -687,7 +687,7 @@ void chipset_force_shutdown(enum chipset_shutdown_reason reason)
 	task_wake(TASK_ID_CHIPSET);
 }
 
-void chipset_reset(enum chipset_reset_reason reason)
+void chipset_reset(enum chipset_shutdown_reason reason)
 {
 	int rv;