From 8a3b36f436dab866c22bc959ce1cdabd32357f9b Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Fri, 30 Sep 2005 11:41:07 +0300 Subject: [PATCH] ARM: OMAP: Reorganize system.h and make omap2 reboot work Reorganize system.h and make omap2 reboot work --- include/asm-arm/arch-omap/system.h | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/include/asm-arm/arch-omap/system.h b/include/asm-arm/arch-omap/system.h index ff37bc27e60..049907a3303 100644 --- a/include/asm-arm/arch-omap/system.h +++ b/include/asm-arm/arch-omap/system.h @@ -7,7 +7,12 @@ #include #include #include -#include + +#ifndef CONFIG_MACH_VOICEBLUE +#define voiceblue_reset() do {} while (0) +#endif + +#define OMAP24XX_PM_RSTCTRL_WKUP (OMAP24XX_PRCM_BASE + 0x450) static inline void arch_idle(void) { @@ -17,7 +22,11 @@ static inline void arch_idle(void) static inline void arch_reset(char mode) { -#ifdef CONFIG_ARCH_OMAP16XX + if (cpu_is_omap24xx()) { + omap_writew(0x3, OMAP24XX_PM_RSTCTRL_WKUP); + return; /* Should never get here */ + } + /* * Workaround for 5912/1611b bug mentioned in sprz209d.pdf p. 28 * "Global Software Reset Affects Traffic Controller Frequency". @@ -27,13 +36,12 @@ static inline void arch_reset(char mode) DPLL_CTL); omap_writew(0x8, ARM_RSTCT1); } -#endif -#ifdef CONFIG_MACH_VOICEBLUE + if (machine_is_voiceblue()) voiceblue_reset(); else -#endif omap_writew(1, ARM_RSTCT1); + } #endif -- 2.41.1