Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-omap2 / dsp.c

diff --git a/arch/arm/mach-omap2/dsp.c b/arch/arm/mach-omap2/dsp.c
index 6feeeae6c21bcb302cc4bb51c977b87528feb747..911cd2e68d46e060291e67a14110e86f17e232f5 100644 (file)
--- a/arch/arm/mach-omap2/dsp.c
+++ b/arch/arm/mach-omap2/dsp.c
@@ -11,9 +11,16 @@
  * published by the Free Software Foundation.
  */
 
+/*
+ * XXX The function pointers to the PRM/CM functions are incorrect and
+ * should be removed.  No device driver should be changing PRM/CM bits
+ * directly; that's a layering violation -- those bits are the responsibility
+ * of the OMAP PM core code.
+ */
+
 #include <linux/platform_device.h>
-#include "prm.h"
-#include "cm.h"
+#include "cm2xxx_3xxx.h"
+#include "prm2xxx_3xxx.h"
 #ifdef CONFIG_BRIDGE_DVFS
 #include <plat/omap-pm.h>
 #endif
@@ -31,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)