OMAP2/3: PRM/CM: prefix OMAP2 PRM/CM functions with "omap2_"

Now that OMAP4-specific PRCM functions have been added, distinguish the
existing OMAP2/3-specific PRCM functions by prefixing them with "omap2_".

This patch should not result in any functional change.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Jarkko Nikula <jhnikula@gmail.com>
Cc: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: Rajendra Nayak <rnayak@ti.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c
index 1f5d68beabf3..1a4efb5e435a 100644
--- a/arch/arm/mach-omap2/pm-debug.c
+++ b/arch/arm/mach-omap2/pm-debug.c
@@ -45,10 +45,10 @@ u32 wakeup_timer_milliseconds;
 
 #define DUMP_PRM_MOD_REG(mod, reg)    \
         regs[reg_count].name = #mod "." #reg; \
-        regs[reg_count++].val = prm_read_mod_reg(mod, reg)
+        regs[reg_count++].val = omap2_prm_read_mod_reg(mod, reg)
 #define DUMP_CM_MOD_REG(mod, reg)     \
         regs[reg_count].name = #mod "." #reg; \
-        regs[reg_count++].val = cm_read_mod_reg(mod, reg)
+        regs[reg_count++].val = omap2_cm_read_mod_reg(mod, reg)
 #define DUMP_PRM_REG(reg) \
         regs[reg_count].name = #reg; \
         regs[reg_count++].val = __raw_readl(reg)
@@ -328,10 +328,10 @@ static void pm_dbg_regset_store(u32 *ptr)
                 for (j = pm_dbg_reg_modules[i].low;
                         j <= pm_dbg_reg_modules[i].high; j += 4) {
                         if (pm_dbg_reg_modules[i].type == MOD_CM)
-                                val = cm_read_mod_reg(
+                                val = omap2_cm_read_mod_reg(
                                         pm_dbg_reg_modules[i].offset, j);
                         else
-                                val = prm_read_mod_reg(
+                                val = omap2_prm_read_mod_reg(
                                         pm_dbg_reg_modules[i].offset, j);
                         *(ptr++) = val;
                 }