Re: [PATCH v2 2/2] Input: pm8941-pwrkey - Respect reboot_mode for warm reset
flat view
From: Luca Weiss <hidden>
Date: 2021-07-25 19:49:27
Also in:
linux-arm-msm, lkml
Hi Shawn, On Mittwoch, 14. Juli 2021 11:58:49 CEST Shawn Guo wrote:
On some devices, e.g. Sony Xperia M4 Aqua, warm reset is used to reboot device into bootloader and recovery mode. Instead of always doing hard reset, add a check on reboot_mode for possible warm reset. Signed-off-by: Shawn Guo <redacted>
Tested-by: Luca Weiss <redacted> Rebooting into bootloader works on fairphone-fp2 with these commands now: $ echo warm > /sys/kernel/reboot/mode $ reboot-mode bootloader reboot-mode is this small utility: https://gitlab.com/postmarketOS/reboot-mode/-/blob/master/reboot-mode.c Regards Luca
quoted hunk ↗ jump to hunk
--- drivers/input/misc/pm8941-pwrkey.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)diff --git a/drivers/input/misc/pm8941-pwrkey.cb/drivers/input/misc/pm8941-pwrkey.c index cf8104454e74..9b14d6eb1918 100644--- a/drivers/input/misc/pm8941-pwrkey.c +++ b/drivers/input/misc/pm8941-pwrkey.c@@ -27,6 +27,7 @@ #define PON_PS_HOLD_RST_CTL2 0x5b #define PON_PS_HOLD_ENABLE BIT(7) #define PON_PS_HOLD_TYPE_MASK 0x0f +#define PON_PS_HOLD_TYPE_WARM_RESET 1 #define PON_PS_HOLD_TYPE_SHUTDOWN 4 #define PON_PS_HOLD_TYPE_HARD_RESET 7@@ -93,7 +94,10 @@ static int pm8941_reboot_notify(struct notifier_block*nb, break; case SYS_RESTART: default: - reset_type = PON_PS_HOLD_TYPE_HARD_RESET; + if (reboot_mode == REBOOT_WARM) + reset_type = PON_PS_HOLD_TYPE_WARM_RESET; + else + reset_type = PON_PS_HOLD_TYPE_HARD_RESET; break; }