Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 339795
b: refs/heads/master
c: 76e0e16
h: refs/heads/master
i:
  339793: 9b53f25
  339791: b6bf03c
v: v3
  • Loading branch information
Paul Walmsley committed Nov 8, 2012
1 parent 6b3aa41 commit 34827ab
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 129f557723701b20257f5ad4deb89aac0afb95ac
refs/heads/master: 76e0e16d91af22dd6313000ff8018069123f8ed0
12 changes: 0 additions & 12 deletions trunk/arch/arm/mach-omap2/prcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,6 @@ void __iomem *prcm_mpu_base;

#define MAX_MODULE_ENABLE_WAIT 100000

u32 omap_prcm_get_reset_sources(void)
{
/* XXX This presumably needs modification for 34XX */
if (cpu_is_omap24xx() || cpu_is_omap34xx())
return omap2_prm_read_mod_reg(WKUP_MOD, OMAP2_RM_RSTST) & 0x7f;
if (cpu_is_omap44xx())
return omap2_prm_read_mod_reg(WKUP_MOD, OMAP4_RM_RSTST) & 0x7f;

return 0;
}
EXPORT_SYMBOL(omap_prcm_get_reset_sources);

/* Resets clock rates and reboots the system. Only called from system.h */
void omap_prcm_restart(char mode, const char *cmd)
{
Expand Down
1 change: 0 additions & 1 deletion trunk/arch/arm/plat-omap/include/plat/prcm.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#ifndef __ASM_ARM_ARCH_OMAP_PRCM_H
#define __ASM_ARM_ARCH_OMAP_PRCM_H

u32 omap_prcm_get_reset_sources(void);
int omap2_cm_wait_idlest(void __iomem *reg, u32 mask, u8 idlest,
const char *name);

Expand Down

0 comments on commit 34827ab

Please sign in to comment.