diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-07-03 08:46:05 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-08-25 10:27:15 -0400 |
commit | 572e85e3aa58f11671759e9cfa6b9b5d79b131fd (patch) | |
tree | 71baaad38a18eead9d42dd1b0239d154107dcc08 /arch/arm/mach-at91 | |
parent | 4ae9ccf2fab87aaf9e0e906ba85675be020f6948 (diff) |
ARM: at91/pm: Remove show_reset_status function
Both the reset and poweroff drivers are now implementing what the
show_reset_status function used to do. Hence, we can remove this rather hackish
function that prevents us from doing further cleanup.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91')
-rw-r--r-- | arch/arm/mach-at91/pm.c | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 5920373809c5..4073ab7f38f3 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c | |||
@@ -34,79 +34,8 @@ | |||
34 | #include "pm.h" | 34 | #include "pm.h" |
35 | #include "gpio.h" | 35 | #include "gpio.h" |
36 | 36 | ||
37 | /* | ||
38 | * Show the reason for the previous system reset. | ||
39 | */ | ||
40 | |||
41 | #include "at91_rstc.h" | ||
42 | #include "at91_shdwc.h" | ||
43 | |||
44 | static void (*at91_pm_standby)(void); | 37 | static void (*at91_pm_standby)(void); |
45 | 38 | ||
46 | static void __init show_reset_status(void) | ||
47 | { | ||
48 | static char reset[] __initdata = "reset"; | ||
49 | |||
50 | static char general[] __initdata = "general"; | ||
51 | static char wakeup[] __initdata = "wakeup"; | ||
52 | static char watchdog[] __initdata = "watchdog"; | ||
53 | static char software[] __initdata = "software"; | ||
54 | static char user[] __initdata = "user"; | ||
55 | static char unknown[] __initdata = "unknown"; | ||
56 | |||
57 | static char signal[] __initdata = "signal"; | ||
58 | static char rtc[] __initdata = "rtc"; | ||
59 | static char rtt[] __initdata = "rtt"; | ||
60 | static char restore[] __initdata = "power-restored"; | ||
61 | |||
62 | char *reason, *r2 = reset; | ||
63 | u32 reset_type, wake_type; | ||
64 | |||
65 | if (!at91_shdwc_base || !at91_rstc_base) | ||
66 | return; | ||
67 | |||
68 | reset_type = at91_rstc_read(AT91_RSTC_SR) & AT91_RSTC_RSTTYP; | ||
69 | wake_type = at91_shdwc_read(AT91_SHDW_SR); | ||
70 | |||
71 | switch (reset_type) { | ||
72 | case AT91_RSTC_RSTTYP_GENERAL: | ||
73 | reason = general; | ||
74 | break; | ||
75 | case AT91_RSTC_RSTTYP_WAKEUP: | ||
76 | /* board-specific code enabled the wakeup sources */ | ||
77 | reason = wakeup; | ||
78 | |||
79 | /* "wakeup signal" */ | ||
80 | if (wake_type & AT91_SHDW_WAKEUP0) | ||
81 | r2 = signal; | ||
82 | else { | ||
83 | r2 = reason; | ||
84 | if (wake_type & AT91_SHDW_RTTWK) /* rtt wakeup */ | ||
85 | reason = rtt; | ||
86 | else if (wake_type & AT91_SHDW_RTCWK) /* rtc wakeup */ | ||
87 | reason = rtc; | ||
88 | else if (wake_type == 0) /* power-restored wakeup */ | ||
89 | reason = restore; | ||
90 | else /* unknown wakeup */ | ||
91 | reason = unknown; | ||
92 | } | ||
93 | break; | ||
94 | case AT91_RSTC_RSTTYP_WATCHDOG: | ||
95 | reason = watchdog; | ||
96 | break; | ||
97 | case AT91_RSTC_RSTTYP_SOFTWARE: | ||
98 | reason = software; | ||
99 | break; | ||
100 | case AT91_RSTC_RSTTYP_USER: | ||
101 | reason = user; | ||
102 | break; | ||
103 | default: | ||
104 | reason = unknown; | ||
105 | break; | ||
106 | } | ||
107 | pr_info("AT91: Starting after %s %s\n", reason, r2); | ||
108 | } | ||
109 | |||
110 | static int at91_pm_valid_state(suspend_state_t state) | 39 | static int at91_pm_valid_state(suspend_state_t state) |
111 | { | 40 | { |
112 | switch (state) { | 41 | switch (state) { |
@@ -346,7 +275,6 @@ static int __init at91_pm_init(void) | |||
346 | 275 | ||
347 | suspend_set_ops(&at91_pm_ops); | 276 | suspend_set_ops(&at91_pm_ops); |
348 | 277 | ||
349 | show_reset_status(); | ||
350 | return 0; | 278 | return 0; |
351 | } | 279 | } |
352 | arch_initcall(at91_pm_init); | 280 | arch_initcall(at91_pm_init); |