diff options
| author | Aaron Ding <aaronding@google.com> | 2021-08-20 23:09:47 +0800 |
|---|---|---|
| committer | Aaron Ding <aaronding@google.com> | 2021-08-20 23:10:25 +0800 |
| commit | a58c0f72212f1ac0b3c9fe8bd654645241b4412a (patch) | |
| tree | 065f24d3f7b27a8acae62a36542bcb6ed2ac3b84 | |
| parent | 62f56dfee1a8ebe5915143596b69c4f923aaf511 (diff) | |
| parent | e795051a67dda71d88103449cd6997398ab7cd0a (diff) | |
| download | reset-a58c0f72212f1ac0b3c9fe8bd654645241b4412a.tar.gz | |
Merge android-gs-cloudripper-5.10 into android13-gs-pixel-5.10
Change-Id: I10ed0eb48d1e665877306a71eb15aee4f9911a33
Signed-off-by: Aaron Ding <aaronding@google.com>
| -rw-r--r-- | exynos-gs101-reboot.c | 2 | ||||
| -rw-r--r-- | exynos-gs201-reboot.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/exynos-gs101-reboot.c b/exynos-gs101-reboot.c index 068ebc2..91be306 100644 --- a/exynos-gs101-reboot.c +++ b/exynos-gs101-reboot.c @@ -203,7 +203,7 @@ static int exynos_restart_handler(struct notifier_block *this, unsigned long mod if (s2mpg10_get_rev_id() == S2MPG10_EVT0 || !rsbm_supported || - dbg_snapshot_get_panic_status()) { + !dbg_snapshot_get_reboot_status()) { ret = set_priv_reg(pmu_alive_base + warm_reboot_offset, warm_reboot_trigger); /* TODO: this is a temporary workaround. must remove. see b/169128860 */ diff --git a/exynos-gs201-reboot.c b/exynos-gs201-reboot.c index 0e46aa9..5c0f044 100644 --- a/exynos-gs201-reboot.c +++ b/exynos-gs201-reboot.c @@ -163,7 +163,7 @@ static int exynos_restart_handler(struct notifier_block *this, unsigned long mod /* Do S/W Reset */ pr_emerg("%s: Exynos SoC reset right now\n", __func__); - if (dbg_snapshot_get_panic_status()) { + if (!dbg_snapshot_get_reboot_status()) { set_priv_reg(pmu_alive_base + warm_reboot_offset, warm_reboot_trigger); } else { pr_emerg("Set PS_HOLD Low.\n"); |