summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/control.c
diff options
context:
space:
mode:
authorTero Kristo <t-kristo@ti.com>2014-02-26 11:54:29 +0200
committerTero Kristo <t-kristo@ti.com>2014-07-04 17:02:14 +0300
commit9efcea09b0b56488e46ab3a36fe8dbce9eded529 (patch)
tree8178e61ea7c2636384ab979391e4165b6db1a152 /arch/arm/mach-omap2/control.c
parent55c6c3ad90f606d458d798b36f8ffca98c1894e0 (diff)
downloadlinux-stable-9efcea09b0b56488e46ab3a36fe8dbce9eded529.tar.gz
linux-stable-9efcea09b0b56488e46ab3a36fe8dbce9eded529.tar.bz2
linux-stable-9efcea09b0b56488e46ab3a36fe8dbce9eded529.zip
ARM: OMAP3: PRM: add API for checking and clearing cold reset status
This isolates the PRM register access within the PRM driver. Signed-off-by: Tero Kristo <t-kristo@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/control.c')
-rw-r--r--arch/arm/mach-omap2/control.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index 751f3549bf6f..f8eb3e4354ad 100644
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -282,13 +282,9 @@ void omap3_clear_scratchpad_contents(void)
void __iomem *v_addr;
u32 offset = 0;
v_addr = OMAP2_L4_IO_ADDRESS(OMAP343X_SCRATCHPAD_ROM);
- if (omap2_prm_read_mod_reg(OMAP3430_GR_MOD, OMAP3_PRM_RSTST_OFFSET) &
- OMAP3430_GLOBAL_COLD_RST_MASK) {
+ if (omap3xxx_prm_clear_global_cold_reset()) {
for ( ; offset <= max_offset; offset += 0x4)
writel_relaxed(0x0, (v_addr + offset));
- omap2_prm_set_mod_reg_bits(OMAP3430_GLOBAL_COLD_RST_MASK,
- OMAP3430_GR_MOD,
- OMAP3_PRM_RSTST_OFFSET);
}
}