diff options
| author | Wai-Hong Tam <waihong@google.com> | 2020-01-23 15:20:12 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-01-24 21:12:58 +0000 |
| commit | ba608292244d859fc6af0b76c44049976da9fcd1 (patch) | |
| tree | 400de322d1fa163483dfe2eb6d2b59eb80814607 | |
| parent | 5b21ec1b453f114e892ffa8f972f50339d6ee3fc (diff) | |
| download | chrome-ec-ba608292244d859fc6af0b76c44049976da9fcd1.tar.gz | |
Trogdor: Deprecate AP_RST_REQ handling logic
This logic is no longer used. Should be deprecated.
BRANCH=None
BUG=b:148238496
TEST=Assert the AP_RST_REQ signal, no reboot happens.
Change-Id: Icade7ede9a8fb48313123ad59b5a36a8aa1a71bf
Signed-off-by: Wai-Hong Tam <waihong@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2018056
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Alexandru M Stan <amstan@chromium.org>
| -rw-r--r-- | board/trogdor/gpio.inc | 2 | ||||
| -rw-r--r-- | power/sc7180.c | 14 |
2 files changed, 1 insertions, 15 deletions
diff --git a/board/trogdor/gpio.inc b/board/trogdor/gpio.inc index 853498b0ca..66a7dd99f1 100644 --- a/board/trogdor/gpio.inc +++ b/board/trogdor/gpio.inc @@ -26,7 +26,6 @@ GPIO_INT(EC_VOLDN_BTN_ODL, PIN(7, 0), GPIO_INT_BOTH | GPIO_PULL_UP, button_inte GPIO_INT(EC_VOLUP_BTN_ODL, PIN(F, 2), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) /* Volume Down button */ GPIO_INT(EC_WP_ODL, PIN(A, 1), GPIO_INT_BOTH, switch_interrupt) /* Write protection */ GPIO_INT(LID_OPEN_EC, PIN(D, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, lid_interrupt) /* Lid open? */ -GPIO_INT(AP_RST_REQ, PIN(C, 2), GPIO_INT_RISING | GPIO_PULL_DOWN | GPIO_SEL_1P8V, chipset_reset_request_interrupt) /* Reset request from AP */ GPIO_INT(AP_RST_L, PIN(C, 1), GPIO_INT_BOTH | GPIO_SEL_1P8V, power_signal_interrupt) /* PMIC to signal AP reset */ GPIO_INT(PS_HOLD, PIN(A, 4), GPIO_INT_BOTH | GPIO_PULL_DOWN | GPIO_SEL_1P8V, power_signal_interrupt) /* Indicate when AP triggers reset/shutdown */ GPIO_INT(PMIC_FAULT_L, PIN(A, 3), GPIO_INT_BOTH | GPIO_SEL_1P8V, power_signal_interrupt) /* Any PMIC fault? */ @@ -62,6 +61,7 @@ GPIO(PM845_RESIN_L, PIN(3, 2), GPIO_ODR_HIGH | GPIO_SEL_1P8V) /* PMIC r GPIO(PMIC_KPD_PWR_ODL, PIN(D, 6), GPIO_ODR_HIGH | GPIO_SEL_1P8V) /* PMIC power button */ GPIO(EC_INT_L, PIN(A, 2), GPIO_ODR_HIGH) /* Interrupt line between AP and EC */ GPIO(AP_SUSPEND_L, PIN(5, 7), GPIO_INPUT) /* Suspend signal from AP/PMIC */ +GPIO(AP_RST_REQ, PIN(C, 2), GPIO_INPUT) /* Deprecated AP initiated reset indicator */ /* Power enables */ GPIO(SWITCHCAP_ON, PIN(D, 5), GPIO_OUT_LOW) /* Enable switch cap */ diff --git a/power/sc7180.c b/power/sc7180.c index 3da8d5c4bb..50e8485609 100644 --- a/power/sc7180.c +++ b/power/sc7180.c @@ -150,19 +150,6 @@ static void request_cold_reset(void) task_wake(TASK_ID_CHIPSET); } -/* AP-requested reset GPIO interrupt handlers */ -static void chipset_reset_request_handler(void) -{ - CPRINTS("AP wants reset"); - chipset_reset(CHIPSET_RESET_AP_REQ); -} -DECLARE_DEFERRED(chipset_reset_request_handler); - -void chipset_reset_request_interrupt(enum gpio_signal signal) -{ - hook_call_deferred(&chipset_reset_request_handler_data, 0); -} - void chipset_warm_reset_interrupt(enum gpio_signal signal) { /* @@ -411,7 +398,6 @@ enum power_state power_chipset_init(void) uint32_t reset_flags = system_get_reset_flags(); /* Enable interrupts */ - gpio_enable_interrupt(GPIO_AP_RST_REQ); gpio_enable_interrupt(GPIO_WARM_RESET_L); gpio_enable_interrupt(GPIO_POWER_GOOD); |