diff options
-rw-r--r-- | arch/arm/mach-omap2/prcm.c | 12 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/prcm.h | 1 |
2 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c index cff270a178c5..05c754edbf3f 100644 --- a/arch/arm/mach-omap2/prcm.c +++ b/arch/arm/mach-omap2/prcm.c | |||
@@ -47,18 +47,6 @@ void __iomem *prcm_mpu_base; | |||
47 | 47 | ||
48 | #define MAX_MODULE_ENABLE_WAIT 100000 | 48 | #define MAX_MODULE_ENABLE_WAIT 100000 |
49 | 49 | ||
50 | u32 omap_prcm_get_reset_sources(void) | ||
51 | { | ||
52 | /* XXX This presumably needs modification for 34XX */ | ||
53 | if (cpu_is_omap24xx() || cpu_is_omap34xx()) | ||
54 | return omap2_prm_read_mod_reg(WKUP_MOD, OMAP2_RM_RSTST) & 0x7f; | ||
55 | if (cpu_is_omap44xx()) | ||
56 | return omap2_prm_read_mod_reg(WKUP_MOD, OMAP4_RM_RSTST) & 0x7f; | ||
57 | |||
58 | return 0; | ||
59 | } | ||
60 | EXPORT_SYMBOL(omap_prcm_get_reset_sources); | ||
61 | |||
62 | /* Resets clock rates and reboots the system. Only called from system.h */ | 50 | /* Resets clock rates and reboots the system. Only called from system.h */ |
63 | void omap_prcm_restart(char mode, const char *cmd) | 51 | void omap_prcm_restart(char mode, const char *cmd) |
64 | { | 52 | { |
diff --git a/arch/arm/plat-omap/include/plat/prcm.h b/arch/arm/plat-omap/include/plat/prcm.h index 267f43bb2a4e..a76cbd4b0592 100644 --- a/arch/arm/plat-omap/include/plat/prcm.h +++ b/arch/arm/plat-omap/include/plat/prcm.h | |||
@@ -27,7 +27,6 @@ | |||
27 | #ifndef __ASM_ARM_ARCH_OMAP_PRCM_H | 27 | #ifndef __ASM_ARM_ARCH_OMAP_PRCM_H |
28 | #define __ASM_ARM_ARCH_OMAP_PRCM_H | 28 | #define __ASM_ARM_ARCH_OMAP_PRCM_H |
29 | 29 | ||
30 | u32 omap_prcm_get_reset_sources(void); | ||
31 | int omap2_cm_wait_idlest(void __iomem *reg, u32 mask, u8 idlest, | 30 | int omap2_cm_wait_idlest(void __iomem *reg, u32 mask, u8 idlest, |
32 | const char *name); | 31 | const char *name); |
33 | 32 | ||