diff options
| author | Will McVicker <willmcvicker@google.com> | 2022-01-19 16:37:24 -0800 |
|---|---|---|
| committer | Will McVicker <willmcvicker@google.com> | 2022-01-19 16:37:24 -0800 |
| commit | 8dc32cfccd2f7cfa43ec2f5cc2998ea70a868222 (patch) | |
| tree | e0b72e8a6b023d94eb11684da127d0c82dd632c0 | |
| parent | 9671f5fc3a398bc615b62be5aba9b2b9adb6f994 (diff) | |
| parent | 79d86067a8742a93dd590bca80be0f01c4414457 (diff) | |
| download | reset-8dc32cfccd2f7cfa43ec2f5cc2998ea70a868222.tar.gz | |
Merge 'aosp/android-gs-raviole-5.10-android12-qpr1-d' into 'aosp/android13-gs-raviole-5.15'
* 'android-gs-raviole-5.10-android12-qpr1-d' of sso://android/kernel/google-modules/power/reset:
power: reset: add in_panic for swreset
power: reset: support emergency_restart swreset
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: I0c6c5e514a8d2d233c6e5dc17ac592429a819fc1
| -rw-r--r-- | exynos-reboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/exynos-reboot.c b/exynos-reboot.c index 0987750..c834c28 100644 --- a/exynos-reboot.c +++ b/exynos-reboot.c @@ -188,7 +188,7 @@ static int exynos_restart_handler(struct notifier_block *this, unsigned long mod pr_emerg("%s: Exynos SoC reset right now\n", __func__); if (s2mpg10_get_rev_id() == S2MPG10_EVT0 || - !rsbm_supported || + !rsbm_supported || !dbg_snapshot_get_reboot_status() || dbg_snapshot_get_panic_status()) { set_priv_reg(pmu_alive_base + warm_reboot_offset, warm_reboot_trigger); } else { |