From e98327249389b1a624bf3477b69e15e28d816418 Mon Sep 17 00:00:00 2001
From: Wai-Hong Tam <waihong@google.com>
Date: Wed, 12 May 2021 14:14:03 -0700
Subject: qcom: Generalize the power signals and functions for SC7x80

Rename the power signals from SC7180 to SC7X80. Rename the functions.

BRANCH=None
BUG=b:187980397
TEST=Built all the Chromium EC images and Zephyr EC images.

Change-Id: Icf932b5cc892dcc9e57bff10bdd6db8d532f24a9
Signed-off-by: Wai-Hong Tam <waihong@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2893485
Reviewed-by: Alexandru M Stan <amstan@chromium.org>
---
 include/power/qcom.h | 12 ++++++------
 power/qcom.c         | 28 ++++++++++++++--------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/include/power/qcom.h b/include/power/qcom.h
index 84b290479c..5b52d63c06 100644
--- a/include/power/qcom.h
+++ b/include/power/qcom.h
@@ -8,12 +8,12 @@
 
 #ifdef CONFIG_CHIPSET_SC7180
 enum power_signal {
-	SC7180_AP_RST_ASSERTED = 0,
-	SC7180_PS_HOLD,
-	SC7180_POWER_GOOD,
-	SC7180_WARM_RESET,
-	SC7180_AP_SUSPEND,
-	SC7180_DEPRECATED_AP_RST_REQ,
+	SC7X80_AP_RST_ASSERTED = 0,
+	SC7X80_PS_HOLD,
+	SC7X80_POWER_GOOD,
+	SC7X80_WARM_RESET,
+	SC7X80_AP_SUSPEND,
+	SC7X80_DEPRECATED_AP_RST_REQ,
 	POWER_SIGNAL_COUNT,
 };
 #endif
diff --git a/power/qcom.c b/power/qcom.c
index 5484f48f26..d95cfbbdd4 100644
--- a/power/qcom.c
+++ b/power/qcom.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * SC7180 SoC power sequencing module for Chrome EC
+ * SC7X80 SoC power sequencing module for Chrome EC
  *
  * This implements the following features:
  *
@@ -39,32 +39,32 @@
 
 /* Power signal list. Must match order of enum power_signal. */
 const struct power_signal_info power_signal_list[] = {
-	[SC7180_AP_RST_ASSERTED] = {
+	[SC7X80_AP_RST_ASSERTED] = {
 		GPIO_AP_RST_L,
 		POWER_SIGNAL_ACTIVE_LOW | POWER_SIGNAL_DISABLE_AT_BOOT,
 		"AP_RST_ASSERTED",
 	},
-	[SC7180_PS_HOLD] = {
+	[SC7X80_PS_HOLD] = {
 		GPIO_PS_HOLD,
 		POWER_SIGNAL_ACTIVE_HIGH,
 		"PS_HOLD",
 	},
-	[SC7180_POWER_GOOD] = {
+	[SC7X80_POWER_GOOD] = {
 		GPIO_POWER_GOOD,
 		POWER_SIGNAL_ACTIVE_HIGH,
 		"POWER_GOOD",
 	},
-	[SC7180_WARM_RESET] = {
+	[SC7X80_WARM_RESET] = {
 		GPIO_WARM_RESET_L,
 		POWER_SIGNAL_ACTIVE_HIGH,
 		"WARM_RESET_L",
 	},
-	[SC7180_AP_SUSPEND] = {
+	[SC7X80_AP_SUSPEND] = {
 		GPIO_AP_SUSPEND,
 		POWER_SIGNAL_ACTIVE_HIGH,
 		"AP_SUSPEND",
 	},
-	[SC7180_DEPRECATED_AP_RST_REQ] = {
+	[SC7X80_DEPRECATED_AP_RST_REQ] = {
 		GPIO_DEPRECATED_AP_RST_REQ,
 		POWER_SIGNAL_ACTIVE_HIGH,
 		"DEPRECATED_AP_RST_REQ",
@@ -73,9 +73,9 @@ const struct power_signal_info power_signal_list[] = {
 BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT);
 
 /* Masks for power signals */
-#define IN_POWER_GOOD		POWER_SIGNAL_MASK(SC7180_POWER_GOOD)
-#define IN_AP_RST_ASSERTED	POWER_SIGNAL_MASK(SC7180_AP_RST_ASSERTED)
-#define IN_SUSPEND		POWER_SIGNAL_MASK(SC7180_AP_SUSPEND)
+#define IN_POWER_GOOD		POWER_SIGNAL_MASK(SC7X80_POWER_GOOD)
+#define IN_AP_RST_ASSERTED	POWER_SIGNAL_MASK(SC7X80_AP_RST_ASSERTED)
+#define IN_SUSPEND		POWER_SIGNAL_MASK(SC7X80_AP_SUSPEND)
 
 
 /* Long power key press to force shutdown */
@@ -316,7 +316,7 @@ void chipset_power_good_interrupt(enum gpio_signal signal)
 	power_signal_interrupt(signal);
 }
 
-static void sc7180_lid_event(void)
+static void sc7x80_lid_event(void)
 {
 	/* Power task only cares about lid-open events */
 	if (!lid_is_open())
@@ -325,13 +325,13 @@ static void sc7180_lid_event(void)
 	lid_opened = 1;
 	task_wake(TASK_ID_CHIPSET);
 }
-DECLARE_HOOK(HOOK_LID_CHANGE, sc7180_lid_event, HOOK_PRIO_DEFAULT);
+DECLARE_HOOK(HOOK_LID_CHANGE, sc7x80_lid_event, HOOK_PRIO_DEFAULT);
 
-static void sc7180_powerbtn_changed(void)
+static void sc7x80_powerbtn_changed(void)
 {
 	task_wake(TASK_ID_CHIPSET);
 }
-DECLARE_HOOK(HOOK_POWER_BUTTON_CHANGE, sc7180_powerbtn_changed,
+DECLARE_HOOK(HOOK_POWER_BUTTON_CHANGE, sc7x80_powerbtn_changed,
 	     HOOK_PRIO_DEFAULT);
 
 /**
-- 
cgit v1.2.1