5 files changed, 24 insertions, 22 deletions

diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c
index 6be14389e4f3..2e40a5cf0163 100644
--- a/arch/arm/mach-omap2/prcm.c
+++ b/arch/arm/mach-omap2/prcm.c
@@ -70,7 +70,7 @@ static void omap_prcm_arch_reset(char mode, const char *cmd)
                 prcm_offs = OMAP3430_GR_MOD;
                 omap3_ctrl_write_boot_mode((cmd ? (u8)*cmd : 0));
         } else if (cpu_is_omap44xx()) {
-                omap4_prm_global_warm_sw_reset(); /* never returns */
+                omap4_prminst_global_warm_sw_reset(); /* never returns */
         } else {
                 WARN_ON(1);
         }
diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c
index faec860ebc0e..f81532934d1f 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);
-}
diff --git a/arch/arm/mach-omap2/prm44xx.h b/arch/arm/mach-omap2/prm44xx.h
index 3732e026a22f..725a6a86985b 100644
--- a/arch/arm/mach-omap2/prm44xx.h
+++ b/arch/arm/mach-omap2/prm44xx.h
@@ -755,8 +755,6 @@ extern u32 omap4_prm_set_inst_reg_bits(u32 bits, s16 inst, s16 idx);
 extern u32 omap4_prm_clear_inst_reg_bits(u32 bits, s16 inst, s16 idx);
 extern u32 omap4_prm_read_bits_shift(void __iomem *reg, u32 mask);
 
-extern void omap4_prm_global_warm_sw_reset(void);
-
 # endif
 
 #endif
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);
+}
diff --git a/arch/arm/mach-omap2/prminst44xx.h b/arch/arm/mach-omap2/prminst44xx.h
index c14ae294cd54..46f2efb36596 100644
--- a/arch/arm/mach-omap2/prminst44xx.h
+++ b/arch/arm/mach-omap2/prminst44xx.h
@@ -21,13 +21,13 @@ extern void omap4_prminst_write_inst_reg(u32 val, u8 part, s16 inst, u16 idx);
 extern u32 omap4_prminst_rmw_inst_reg_bits(u32 mask, u32 bits, u8 part,
                                            s16 inst, u16 idx);
 
-extern void omap4_prm_global_warm_sw_reset(void);
+extern void omap4_prminst_global_warm_sw_reset(void);
 
 extern int omap4_prminst_is_hardreset_asserted(u8 shift, u8 part, s16 inst,
-                                           u16 rstctrl_offs);
+                                               u16 rstctrl_offs);
 extern int omap4_prminst_assert_hardreset(u8 shift, u8 part, s16 inst,
-                                      u16 rstctrl_offs);
+                                          u16 rstctrl_offs);
 extern int omap4_prminst_deassert_hardreset(u8 shift, u8 part, s16 inst,
-                                        u16 rstctrl_offs);
+                                            u16 rstctrl_offs);
 
 #endif