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>

1 files changed, 19 insertions, 0 deletions

diff --git a/arch/arm/mach-omap2/prminst44xx.c b/arch/arm/mach-omap2/prminst44xx.c
index 35e02aac1de9..3a7bab16edd5 100644
--- a/arch/arm/mach-omap2/prminst44xx.c
+++ b/arch/arm/mach-omap2/prminst44xx.c
@@ -155,3 +155,22 @@ int omap4_prminst_deassert_hardreset(u8 shift, u8 part, s16 inst,
 
         return (c == MAX_MODULE_HARDRESET_WAIT) ? -EBUSY : 0;
 }
+
+
+void omap4_prminst_global_warm_sw_reset(void)
+{
+        u32 v;
+
+        v = omap4_prminst_read_inst_reg(OMAP4430_PRM_PARTITION,
+                                    OMAP4430_PRM_DEVICE_INST,
+                                    OMAP4_PRM_RSTCTRL_OFFSET);
+        v |= OMAP4430_RST_GLOBAL_WARM_SW_MASK;
+        omap4_prminst_write_inst_reg(v, OMAP4430_PRM_PARTITION,
+                                 OMAP4430_PRM_DEVICE_INST,
+                                 OMAP4_PRM_RSTCTRL_OFFSET);
+
+        /* OCP barrier */
+        v = omap4_prminst_read_inst_reg(OMAP4430_PRM_PARTITION,
+                                    OMAP4430_PRM_DEVICE_INST,
+                                    OMAP4_PRM_RSTCTRL_OFFSET);
+}