summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/prminst44xx.h
diff options
context:
space:
mode:
authorTero Kristo <t-kristo@ti.com>2014-10-27 08:39:25 -0700
committerTony Lindgren <tony@atomide.com>2014-10-27 08:39:25 -0700
commit37fb59d7e0b471f3aacd26bfdbb64a4dc71f189b (patch)
tree638df549fcb8505e9197c1877b7de47892b87f78 /arch/arm/mach-omap2/prminst44xx.h
parentefd44dc35f550e0cedd983d13e180da5e0d368a9 (diff)
downloadlinux-stable-37fb59d7e0b471f3aacd26bfdbb64a4dc71f189b.tar.gz
linux-stable-37fb59d7e0b471f3aacd26bfdbb64a4dc71f189b.tar.bz2
linux-stable-37fb59d7e0b471f3aacd26bfdbb64a4dc71f189b.zip
ARM: OMAP2+: PRM: add generic API for deasserting hardware reset
PRM driver now has a generic API for deasserting hardware resets. SoC specific support functions are registered through the prm_ll_data. Signed-off-by: Tero Kristo <t-kristo@ti.com> Acked-by: Paul Walmsley <paul@pwsan.com> Tested-by: Nishanth Menon <nm@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/prminst44xx.h')
-rw-r--r--arch/arm/mach-omap2/prminst44xx.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/prminst44xx.h b/arch/arm/mach-omap2/prminst44xx.h
index 583aa3774571..fb1c9d7a2f9d 100644
--- a/arch/arm/mach-omap2/prminst44xx.h
+++ b/arch/arm/mach-omap2/prminst44xx.h
@@ -30,8 +30,9 @@ extern int omap4_prminst_is_hardreset_asserted(u8 shift, u8 part, s16 inst,
u16 rstctrl_offs);
extern int omap4_prminst_assert_hardreset(u8 shift, u8 part, s16 inst,
u16 rstctrl_offs);
-extern int omap4_prminst_deassert_hardreset(u8 shift, u8 part, s16 inst,
- u16 rstctrl_offs);
+int omap4_prminst_deassert_hardreset(u8 shift, u8 st_shift, u8 part,
+ s16 inst, u16 rstctrl_offs,
+ u16 rstst_offs);
extern void omap_prm_base_init(void);