aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-11-05 08:36:40 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 07:57:22 -0500
commit5e3aa527c390377cdeea444f14ef5a28a0aab618 (patch)
tree35071d55a06d3a6559f69d12e2d58f9c6c80218c
parente6849374f3fcec5a51ab6df40ae4d8034ba1c5e0 (diff)
ARM: restart: remove comments about adding code to arch_reset()
arch_reset() is deprecated; systems should hook into system restart via the 'restart' method in the platforms machine description record. Acked-by: Nicolas Pitre <nico@linaro.org> Acked-by: Jamie Iles <jamie@jamieiles.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-msm/include/mach/system.h4
-rw-r--r--arch/arm/mach-picoxcell/include/mach/system.h1
-rw-r--r--arch/arm/mach-ux500/include/mach/system.h1
-rw-r--r--arch/arm/mach-zynq/include/mach/system.h1
4 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-msm/include/mach/system.h b/arch/arm/mach-msm/include/mach/system.h
index d2e83f42ba16..e180e8b4598a 100644
--- a/arch/arm/mach-msm/include/mach/system.h
+++ b/arch/arm/mach-msm/include/mach/system.h
@@ -12,14 +12,10 @@
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 */ 14 */
15
16#include <mach/hardware.h>
17
18void arch_idle(void); 15void arch_idle(void);
19 16
20static inline void arch_reset(char mode, const char *cmd) 17static inline void arch_reset(char mode, const char *cmd)
21{ 18{
22 for (;;) ; /* depends on IPC w/ other core */
23} 19}
24 20
25/* low level hardware reset hook -- for example, hitting the 21/* low level hardware reset hook -- for example, hitting the
diff --git a/arch/arm/mach-picoxcell/include/mach/system.h b/arch/arm/mach-picoxcell/include/mach/system.h
index 67c589b0c1bc..a12da634fddf 100644
--- a/arch/arm/mach-picoxcell/include/mach/system.h
+++ b/arch/arm/mach-picoxcell/include/mach/system.h
@@ -25,7 +25,6 @@ static inline void arch_idle(void)
25 25
26static inline void arch_reset(int mode, const char *cmd) 26static inline void arch_reset(int mode, const char *cmd)
27{ 27{
28 /* Watchdog reset to go here. */
29} 28}
30 29
31#endif /* __ASM_ARCH_SYSTEM_H */ 30#endif /* __ASM_ARCH_SYSTEM_H */
diff --git a/arch/arm/mach-ux500/include/mach/system.h b/arch/arm/mach-ux500/include/mach/system.h
index c0cd8006f1a2..ae1dff1d7e65 100644
--- a/arch/arm/mach-ux500/include/mach/system.h
+++ b/arch/arm/mach-ux500/include/mach/system.h
@@ -19,7 +19,6 @@ static inline void arch_idle(void)
19 19
20static inline void arch_reset(char mode, const char *cmd) 20static inline void arch_reset(char mode, const char *cmd)
21{ 21{
22 /* yet to be implemented - TODO */
23} 22}
24 23
25#endif 24#endif
diff --git a/arch/arm/mach-zynq/include/mach/system.h b/arch/arm/mach-zynq/include/mach/system.h
index 1b84d705c675..34be7ed4b678 100644
--- a/arch/arm/mach-zynq/include/mach/system.h
+++ b/arch/arm/mach-zynq/include/mach/system.h
@@ -22,7 +22,6 @@ static inline void arch_idle(void)
22 22
23static inline void arch_reset(char mode, const char *cmd) 23static inline void arch_reset(char mode, const char *cmd)
24{ 24{
25 /* Add architecture specific reset processing here */
26} 25}
27 26
28#endif 27#endif