diff options
author | Benoit Cousson <b-cousson@ti.com> | 2011-07-10 05:56:31 -0600 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2011-07-10 05:56:31 -0600 |
commit | e54433f10d67f8e2cf786e8173281f1caeda1959 (patch) | |
tree | 9df5add5ec24724037fc13efb7c4d40090c15104 /arch/arm/mach-omap2/prm44xx.c | |
parent | eaac329dfa6d3a4025242bf34d33aa3cb9df9f9f (diff) | |
download | op-kernel-dev-e54433f10d67f8e2cf786e8173281f1caeda1959.zip op-kernel-dev-e54433f10d67f8e2cf786e8173281f1caeda1959.tar.gz |
OMAP4: prm: Replace warm reset API with the offset based version
The warm reset function was still using the obsolete API.
Replace it by the new one and move the file to the proper c file.
Change the function names to stick to the file convention as
suggested by Paul Walmsley <paul@pwsan.com>:
prm_xxx -> prminst_xxx
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/prm44xx.c')
-rw-r--r-- | arch/arm/mach-omap2/prm44xx.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c index faec860..f815329 100644 --- a/arch/arm/mach-omap2/prm44xx.c +++ b/arch/arm/mach-omap2/prm44xx.c @@ -87,18 +87,3 @@ u32 omap4_prm_clear_inst_reg_bits(u32 bits, s16 inst, s16 reg) { return omap4_prm_rmw_inst_reg_bits(bits, 0x0, inst, reg); } - -void omap4_prm_global_warm_sw_reset(void) -{ - u32 v; - - v = omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST, - OMAP4_RM_RSTCTRL); - v |= OMAP4430_RST_GLOBAL_WARM_SW_MASK; - omap4_prm_write_inst_reg(v, OMAP4430_PRM_DEVICE_INST, - OMAP4_RM_RSTCTRL); - - /* OCP barrier */ - v = omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST, - OMAP4_RM_RSTCTRL); -} |