diff options
Diffstat (limited to 'include/asm-arm/arch-omap/system.h')
| -rw-r--r-- | include/asm-arm/arch-omap/system.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/include/asm-arm/arch-omap/system.h b/include/asm-arm/arch-omap/system.h index 6724a81bd10b..67970d1a2020 100644 --- a/include/asm-arm/arch-omap/system.h +++ b/include/asm-arm/arch-omap/system.h | |||
| @@ -9,12 +9,13 @@ | |||
| 9 | 9 | ||
| 10 | #include <asm/mach-types.h> | 10 | #include <asm/mach-types.h> |
| 11 | #include <asm/hardware.h> | 11 | #include <asm/hardware.h> |
| 12 | #include <asm/arch/prcm.h> | ||
| 13 | 12 | ||
| 14 | #ifndef CONFIG_MACH_VOICEBLUE | 13 | #ifndef CONFIG_MACH_VOICEBLUE |
| 15 | #define voiceblue_reset() do {} while (0) | 14 | #define voiceblue_reset() do {} while (0) |
| 16 | #endif | 15 | #endif |
| 17 | 16 | ||
| 17 | extern void omap_prcm_arch_reset(char mode); | ||
| 18 | |||
| 18 | static inline void arch_idle(void) | 19 | static inline void arch_idle(void) |
| 19 | { | 20 | { |
| 20 | cpu_do_idle(); | 21 | cpu_do_idle(); |
| @@ -38,24 +39,12 @@ static inline void omap1_arch_reset(char mode) | |||
| 38 | omap_writew(1, ARM_RSTCT1); | 39 | omap_writew(1, ARM_RSTCT1); |
| 39 | } | 40 | } |
| 40 | 41 | ||
| 41 | static inline void omap2_arch_reset(char mode) | ||
| 42 | { | ||
| 43 | u32 rate; | ||
| 44 | struct clk *vclk, *sclk; | ||
| 45 | |||
| 46 | vclk = clk_get(NULL, "virt_prcm_set"); | ||
| 47 | sclk = clk_get(NULL, "sys_ck"); | ||
| 48 | rate = clk_get_rate(sclk); | ||
| 49 | clk_set_rate(vclk, rate); /* go to bypass for OMAP limitation */ | ||
| 50 | RM_RSTCTRL_WKUP |= 2; | ||
| 51 | } | ||
| 52 | |||
| 53 | static inline void arch_reset(char mode) | 42 | static inline void arch_reset(char mode) |
| 54 | { | 43 | { |
| 55 | if (!cpu_is_omap24xx()) | 44 | if (!cpu_is_omap24xx()) |
| 56 | omap1_arch_reset(mode); | 45 | omap1_arch_reset(mode); |
| 57 | else | 46 | else |
| 58 | omap2_arch_reset(mode); | 47 | omap_prcm_arch_reset(mode); |
| 59 | } | 48 | } |
| 60 | 49 | ||
| 61 | #endif | 50 | #endif |
