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, 6 insertions, 6 deletions

diff --git a/arch/arm/mach-omap2/dsp.c b/arch/arm/mach-omap2/dsp.c
index cf5f3331af27..911cd2e68d46 100644
--- a/arch/arm/mach-omap2/dsp.c
+++ b/arch/arm/mach-omap2/dsp.c
@@ -38,12 +38,12 @@ static struct omap_dsp_platform_data omap_dsp_pdata __initdata = {
         .cpu_set_freq = omap_pm_cpu_set_freq,
         .cpu_get_freq = omap_pm_cpu_get_freq,
 #endif
-        .dsp_prm_read = prm_read_mod_reg,
-        .dsp_prm_write = prm_write_mod_reg,
-        .dsp_prm_rmw_bits = prm_rmw_mod_reg_bits,
-        .dsp_cm_read = cm_read_mod_reg,
-        .dsp_cm_write = cm_write_mod_reg,
-        .dsp_cm_rmw_bits = cm_rmw_mod_reg_bits,
+        .dsp_prm_read = omap2_prm_read_mod_reg,
+        .dsp_prm_write = omap2_prm_write_mod_reg,
+        .dsp_prm_rmw_bits = omap2_prm_rmw_mod_reg_bits,
+        .dsp_cm_read = omap2_cm_read_mod_reg,
+        .dsp_cm_write = omap2_cm_write_mod_reg,
+        .dsp_cm_rmw_bits = omap2_cm_rmw_mod_reg_bits,
 };
 
 static int __init omap_dsp_init(void)