diff options
author | Paul Walmsley <paul@pwsan.com> | 2010-12-21 23:05:14 -0500 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2010-12-21 23:05:14 -0500 |
commit | dac9a77120e2724e22696f06f3ecb4838da1e3e4 (patch) | |
tree | 7f7d91166a35efcdd4daf3e161e6532892250ef1 /arch/arm/mach-omap2/prm44xx.h | |
parent | 2ace831ffc8feaffb8bc03da89ff43d948efdc97 (diff) |
OMAP4: PRCM: move global reset function for OMAP4 to an OMAP4-specific file
Move the OMAP4 global software reset function to the OMAP4-specific
prm44xx.c file, where it belongs. Part of the long-term process of
moving all of the direct PRCM register writes into lower-layer code.
Also add OCP barriers on OMAP2/3/4 to reduce the chance that the MPU
will continue executing while the system is supposed to be resetting
itself.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: Rajendra Nayak <rnayak@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/prm44xx.h')
-rw-r--r-- | arch/arm/mach-omap2/prm44xx.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/prm44xx.h b/arch/arm/mach-omap2/prm44xx.h index 358865344d58..95542aec6c90 100644 --- a/arch/arm/mach-omap2/prm44xx.h +++ b/arch/arm/mach-omap2/prm44xx.h | |||
@@ -756,6 +756,8 @@ extern int omap4_prm_is_hardreset_asserted(void __iomem *rstctrl_reg, u8 shift); | |||
756 | extern int omap4_prm_assert_hardreset(void __iomem *rstctrl_reg, u8 shift); | 756 | extern int omap4_prm_assert_hardreset(void __iomem *rstctrl_reg, u8 shift); |
757 | extern int omap4_prm_deassert_hardreset(void __iomem *rstctrl_reg, u8 shift); | 757 | extern int omap4_prm_deassert_hardreset(void __iomem *rstctrl_reg, u8 shift); |
758 | 758 | ||
759 | extern void omap4_prm_global_warm_sw_reset(void); | ||
760 | |||
759 | # endif | 761 | # endif |
760 | 762 | ||
761 | #endif | 763 | #endif |