summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWai-Hong Tam <waihong@google.com>2020-10-20 13:59:36 -0700
committerCommit Bot <commit-bot@chromium.org>2020-10-22 20:02:00 +0000
commita5c40c2ee2096ed2e17abd23fb60df564397a6f9 (patch)
tree6d3457c238912675a7c612dd79c10b0423fabbab
parent6837703e92efad648cb3b63ddeb67879dc3940f3 (diff)
downloadchrome-ec-a5c40c2ee2096ed2e17abd23fb60df564397a6f9.tar.gz
Trogdor: Deprecate PMIC_FAULT_L signal
This signal is no longer connected to PMIC on recent hardware revisions. It is unused. Deprecate it. BRANCH=None BUG=b:171245607 TEST=Built the affected Trogdor images. Change-Id: I75562f1aa9e411df38afd321ab63b51e91e7d4f7 Signed-off-by: Wai-Hong Tam <waihong@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2488660 Reviewed-by: Alexandru M Stan <amstan@chromium.org>
Diffstat
-rw-r--r--baseboard/trogdor/baseboard.c4
-rw-r--r--baseboard/trogdor/baseboard.h1
-rw-r--r--board/coachz/gpio.inc2
-rw-r--r--board/lazor/gpio.inc2
-rw-r--r--board/pompom/gpio.inc2
-rw-r--r--board/trogdor/gpio.inc2
-rw-r--r--power/sc7180.c2
7 files changed, 4 insertions, 11 deletions
diff --git a/baseboard/trogdor/baseboard.c b/baseboard/trogdor/baseboard.c
index 817962dfad..0f104f83d2 100644
--- a/baseboard/trogdor/baseboard.c
+++ b/baseboard/trogdor/baseboard.c
@@ -35,10 +35,6 @@ const struct power_signal_info power_signal_list[] = {
GPIO_PS_HOLD,
POWER_SIGNAL_ACTIVE_HIGH,
"PS_HOLD"},
- [SC7180_PMIC_FAULT_L] = {
- GPIO_PMIC_FAULT_L,
- POWER_SIGNAL_ACTIVE_HIGH | POWER_SIGNAL_DISABLE_AT_BOOT,
- "PMIC_FAULT_L"},
[SC7180_POWER_GOOD] = {
GPIO_POWER_GOOD,
POWER_SIGNAL_ACTIVE_HIGH,
diff --git a/baseboard/trogdor/baseboard.h b/baseboard/trogdor/baseboard.h
index 8ddc22e4bb..da30b950ff 100644
--- a/baseboard/trogdor/baseboard.h
+++ b/baseboard/trogdor/baseboard.h
@@ -213,7 +213,6 @@
enum power_signal {
SC7180_AP_RST_ASSERTED = 0,
SC7180_PS_HOLD,
- SC7180_PMIC_FAULT_L,
SC7180_POWER_GOOD,
SC7180_WARM_RESET,
SC7180_AP_SUSPEND,
diff --git a/board/coachz/gpio.inc b/board/coachz/gpio.inc
index 9c7afae0ce..fe3b1b9dde 100644
--- a/board/coachz/gpio.inc
+++ b/board/coachz/gpio.inc
@@ -26,7 +26,6 @@ GPIO_INT(EC_FLASH_WP_ODL, PIN(A, 1), GPIO_INT_BOTH, switch_interrupt) /* Writ
GPIO_INT(LID_OPEN_EC, PIN(D, 2), GPIO_INT_BOTH, lid_interrupt) /* Lid open */
GPIO_INT(AP_RST_L, PIN(C, 1), GPIO_INT_BOTH | GPIO_SEL_1P8V, chipset_ap_rst_interrupt) /* PMIC to signal AP reset */
GPIO_INT(PS_HOLD, PIN(A, 4), GPIO_INT_BOTH | GPIO_PULL_DOWN, power_signal_interrupt) /* Indicate when AP triggers reset/shutdown */
-GPIO_INT(PMIC_FAULT_L, PIN(A, 3), GPIO_INT_BOTH, power_signal_interrupt) /* Any PMIC fault? */
GPIO_INT(AP_SUSPEND, PIN(5, 7), GPIO_INT_BOTH, power_signal_interrupt) /* Suspend signal from PMIC */
GPIO_INT(DEPRECATED_AP_RST_REQ, PIN(C, 2), GPIO_INT_BOTH | GPIO_PULL_DOWN | GPIO_SEL_1P8V, power_signal_interrupt) /* Deprecated AP initiated reset indicator */
/*
@@ -177,6 +176,7 @@ UNUSED(PIN(8, 1))
UNUSED(PIN(7, 6))
UNUSED(PIN(3, 4))
UNUSED(PIN(C, 0))
+UNUSED(PIN(A, 3))
UNUSED(PIN(6, 2))
UNUSED(PIN(8, 3))
UNUSED(PIN(B, 1))
diff --git a/board/lazor/gpio.inc b/board/lazor/gpio.inc
index 0aa3d9bce0..a94348240a 100644
--- a/board/lazor/gpio.inc
+++ b/board/lazor/gpio.inc
@@ -26,7 +26,6 @@ GPIO_INT(EC_WP_ODL, PIN(A, 1), GPIO_INT_BOTH, switch_interrupt) /* Writ
GPIO_INT(LID_OPEN_EC, PIN(D, 2), GPIO_INT_BOTH, lid_interrupt) /* Lid open */
GPIO_INT(AP_RST_L, PIN(C, 1), GPIO_INT_BOTH | GPIO_SEL_1P8V, chipset_ap_rst_interrupt) /* PMIC to signal AP reset */
GPIO_INT(PS_HOLD, PIN(A, 4), GPIO_INT_BOTH | GPIO_PULL_DOWN, power_signal_interrupt) /* Indicate when AP triggers reset/shutdown */
-GPIO_INT(PMIC_FAULT_L, PIN(A, 3), GPIO_INT_BOTH, power_signal_interrupt) /* Any PMIC fault? */
GPIO_INT(AP_SUSPEND, PIN(5, 7), GPIO_INT_BOTH, power_signal_interrupt) /* Suspend signal from PMIC */
GPIO_INT(DEPRECATED_AP_RST_REQ, PIN(C, 2), GPIO_INT_BOTH | GPIO_PULL_DOWN | GPIO_SEL_1P8V, power_signal_interrupt) /* Deprecated AP initiated reset indicator */
/*
@@ -146,6 +145,7 @@ UNUSED(PIN(3, 7))
UNUSED(PIN(7, 6))
UNUSED(PIN(3, 4))
UNUSED(PIN(C, 5))
+UNUSED(PIN(A, 3))
UNUSED(PIN(7, 3))
UNUSED(PIN(D, 7))
UNUSED(PIN(A, 5))
diff --git a/board/pompom/gpio.inc b/board/pompom/gpio.inc
index 72e97f8b47..eeb36dc66d 100644
--- a/board/pompom/gpio.inc
+++ b/board/pompom/gpio.inc
@@ -23,7 +23,6 @@ GPIO_INT(EC_WP_ODL, PIN(A, 1), GPIO_INT_BOTH, switch_interrupt) /* Writ
GPIO_INT(LID_OPEN_EC, PIN(D, 2), GPIO_INT_BOTH, lid_interrupt) /* Lid open */
GPIO_INT(AP_RST_L, PIN(C, 1), GPIO_INT_BOTH | GPIO_SEL_1P8V, chipset_ap_rst_interrupt) /* PMIC to signal AP reset */
GPIO_INT(PS_HOLD, PIN(A, 4), GPIO_INT_BOTH | GPIO_PULL_DOWN, power_signal_interrupt) /* Indicate when AP triggers reset/shutdown */
-GPIO_INT(PMIC_FAULT_L, PIN(A, 3), GPIO_INT_BOTH, power_signal_interrupt) /* Any PMIC fault? */
GPIO_INT(AP_SUSPEND, PIN(5, 7), GPIO_INT_BOTH, power_signal_interrupt) /* Suspend signal from PMIC */
GPIO_INT(DEPRECATED_AP_RST_REQ, PIN(C, 2), GPIO_INT_BOTH | GPIO_PULL_DOWN | GPIO_SEL_1P8V, power_signal_interrupt) /* Deprecated AP initiated reset indicator */
/*
@@ -140,6 +139,7 @@ UNUSED(PIN(7, 6))
UNUSED(PIN(3, 4))
UNUSED(PIN(C, 5))
UNUSED(PIN(C, 6))
+UNUSED(PIN(A, 3))
UNUSED(PIN(7, 3))
UNUSED(PIN(D, 7))
UNUSED(PIN(A, 5))
diff --git a/board/trogdor/gpio.inc b/board/trogdor/gpio.inc
index 58a7a89426..eebab1db27 100644
--- a/board/trogdor/gpio.inc
+++ b/board/trogdor/gpio.inc
@@ -26,7 +26,6 @@ GPIO_INT(EC_WP_ODL, PIN(A, 1), GPIO_INT_BOTH, switch_interrupt) /* Writ
GPIO_INT(LID_OPEN_EC, PIN(D, 2), GPIO_INT_BOTH, lid_interrupt) /* Lid open */
GPIO_INT(AP_RST_L, PIN(C, 1), GPIO_INT_BOTH | GPIO_SEL_1P8V, chipset_ap_rst_interrupt) /* PMIC to signal AP reset */
GPIO_INT(PS_HOLD, PIN(A, 4), GPIO_INT_BOTH | GPIO_PULL_DOWN, power_signal_interrupt) /* Indicate when AP triggers reset/shutdown */
-GPIO_INT(PMIC_FAULT_L, PIN(A, 3), GPIO_INT_BOTH, power_signal_interrupt) /* Any PMIC fault? */
GPIO_INT(AP_SUSPEND, PIN(5, 7), GPIO_INT_BOTH, power_signal_interrupt) /* Suspend signal from PMIC */
GPIO_INT(DEPRECATED_AP_RST_REQ, PIN(C, 2), GPIO_INT_BOTH | GPIO_PULL_DOWN | GPIO_SEL_1P8V, power_signal_interrupt) /* Deprecated AP initiated reset indicator */
/*
@@ -55,6 +54,7 @@ GPIO(PMIC_RESIN_L, PIN(3, 2), GPIO_ODR_HIGH) /* PMIC reset trigger */
GPIO(PMIC_KPD_PWR_ODL, PIN(D, 6), GPIO_ODR_HIGH) /* PMIC power button */
GPIO(EC_INT_L, PIN(A, 2), GPIO_ODR_HIGH) /* Interrupt line between AP and EC */
GPIO(QSIP_ON, PIN(5, 0), GPIO_OUT_LOW) /* Not used, for non-switchcap testing */
+GPIO(PMIC_FAULT_L, PIN(A, 3), GPIO_INPUT) /* Any PMIC fault? Deprecated since rev-1 */
/* Power enables */
GPIO(HIBERNATE_L, PIN(5, 2), GPIO_OUT_HIGH) /* EC hibernate */
diff --git a/power/sc7180.c b/power/sc7180.c
index dcdfcaf9d8..08612d1f55 100644
--- a/power/sc7180.c
+++ b/power/sc7180.c
@@ -562,7 +562,6 @@ static void power_off(void)
* switchcap off.
*/
power_signal_disable_interrupt(GPIO_AP_RST_L);
- power_signal_disable_interrupt(GPIO_PMIC_FAULT_L);
}
/* Check the switchcap status */
@@ -637,7 +636,6 @@ static int power_on(void)
/* Enable signal interrupts */
power_signal_enable_interrupt(GPIO_AP_RST_L);
- power_signal_enable_interrupt(GPIO_PMIC_FAULT_L);
ret = set_pmic_pwron(1);
if (ret != EC_SUCCESS) {
View Lorry Controller Status