| author | Xiaoliang Wang <xiaoliang.wang@amlogic.com> | 2018-11-08 06:33:01 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@droid04> | 2018-11-08 06:33:01 (GMT) |
| commit | 235c04c63a364fad4264091eb550db7a2d76ae56 (patch) | |
| tree | 7e1195661e6ea4a70478840da4b2194377c6dda3 | |
| parent | b79a217014a483f5516356f18643ed3575aab1ce (diff) | |
| parent | b3c3b37c61b04284839175f2a7371fdf1ca0a7cf (diff) | |
| download | common-235c04c63a364fad4264091eb550db7a2d76ae56.zip common-235c04c63a364fad4264091eb550db7a2d76ae56.tar.gz common-235c04c63a364fad4264091eb550db7a2d76ae56.tar.bz2 | |
Merge "reboot: reason: add reboot_reason quiescent [1/4]" into p-amlogic
| -rw-r--r-- | drivers/amlogic/reboot/reboot.c | 8 | ||||
| -rw-r--r-- | include/linux/amlogic/reboot.h | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/amlogic/reboot/reboot.c b/drivers/amlogic/reboot/reboot.c index 4a1cc9b..6e5cd09 100644 --- a/drivers/amlogic/reboot/reboot.c +++ b/drivers/amlogic/reboot/reboot.c @@ -61,6 +61,14 @@ static u32 parse_reason(const char *cmd) reboot_reason = MESON_CRASH_REBOOT; else if (strcmp(cmd, "uboot_suspend") == 0) reboot_reason = MESON_UBOOT_SUSPEND; + else if (strcmp(cmd, "quiescent") == 0 || + strcmp(cmd, ",quiescent") == 0) + reboot_reason = MESON_QUIESCENT_REBOOT; + else if (strcmp(cmd, "recovery,quiescent") == 0 || + strcmp(cmd, "factory_reset,quiescent") == 0 || + strcmp(cmd, "quiescent,recovery") == 0 || + strcmp(cmd, "quiescent,factory_reset") == 0) + reboot_reason = MESON_RECOVERY_QUIESCENT_REBOOT; } else { if (kernel_panic) { if (strcmp(kernel_panic, "kernel_panic") == 0) { diff --git a/include/linux/amlogic/reboot.h b/include/linux/amlogic/reboot.h index de8c690..bf50223 100644 --- a/include/linux/amlogic/reboot.h +++ b/include/linux/amlogic/reboot.h @@ -25,5 +25,7 @@ #define MESON_HIBERNATE 6 #define MESON_BOOTLOADER_REBOOT 7 #define MESON_RPMBP_REBOOT 9 +#define MESON_QUIESCENT_REBOOT 10 #define MESON_CRASH_REBOOT 11 #define MESON_KERNEL_PANIC 12 +#define MESON_RECOVERY_QUIESCENT_REBOOT 14 |