summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJurijs Soloveckis <jurijs.soloveckis@stericsson.com>2011-09-13 14:35:28 +0200
committerRajagopala V <rajagopala.v@stericsson.com>2011-09-22 14:57:01 +0530
commit0100d9a02ae4b3f670606e17fb86380780c7d63f (patch)
tree71d8795950a9227df142850e9bed747659b4a590
parent36fc08941fe96cb5db9be5d93a2c9a2eabee8081 (diff)
ux500: sw reset: Changes in reset reasons
Removed duplications in the reset reasons, new code for the reset recovery is added. ST-Ericsson ID: 355901 ST-Ericsson Linux next: N/A ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Iaf74ac5cffc9c28df84af5c6cecf1dbaa0bb7567 Signed-off-by: Jurijs Soloveckis <jurijs.soloveckis@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30847 Reviewed-by: QATOOLS Reviewed-by: QABUILD Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
-rw-r--r--arch/arm/mach-ux500/include/mach/reboot_reasons.h1
-rw-r--r--arch/arm/mach-ux500/reboot_reasons.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/include/mach/reboot_reasons.h b/arch/arm/mach-ux500/include/mach/reboot_reasons.h
index a8d816253e6..2c21aab58c4 100644
--- a/arch/arm/mach-ux500/include/mach/reboot_reasons.h
+++ b/arch/arm/mach-ux500/include/mach/reboot_reasons.h
@@ -26,6 +26,7 @@
#define SW_RESET_NORMAL 0xc001
#define SW_RESET_CHARGING 0xCAFE
#define SW_RESET_COLDSTART 0x0
+#define SW_RESET_RECOVERY 0x5502
/*
* The array reboot_reasons[] is used when you want to map a string to a reboot
diff --git a/arch/arm/mach-ux500/reboot_reasons.c b/arch/arm/mach-ux500/reboot_reasons.c
index 6a44493570d..c78a11c21ea 100644
--- a/arch/arm/mach-ux500/reboot_reasons.c
+++ b/arch/arm/mach-ux500/reboot_reasons.c
@@ -16,7 +16,7 @@
struct reboot_reason reboot_reasons[] = {
{"crash", SW_RESET_CRASH},
{"factory-reset", SW_RESET_FACTORY_RESET},
- {"recovery", SW_RESET_NORMAL},
+ {"recovery", SW_RESET_RECOVERY},
{"charging", SW_RESET_CHARGING},
{"coldstart", SW_RESET_COLDSTART},
{"none", SW_RESET_NO_ARGUMENT}, /* Normal Boot */