summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/cm2xxx.c
diff options
context:
space:
mode:
authorTero Kristo <t-kristo@ti.com>2014-03-04 20:19:03 +0400
committerPaul Walmsley <paul@pwsan.com>2014-05-16 08:34:25 +0400
commit7af1363742e0e2752e90d5de2ddb9c48665fc567 (patch)
tree5c552ea6a09b734fe4e00cd98e9f6cd4f979aade /arch/arm/mach-omap2/cm2xxx.c
parent250e27ee950bf67ceeb812eb4c8f2fea58d3e2b6 (diff)
downloadlinux-7af1363742e0e2752e90d5de2ddb9c48665fc567.tar.xz
ARM: OMAP2/3: CM: remove some external dependencies
Done in preparation to move the CM driver to its own driver folder. These drivers will not have access to functionality under mach-omap2 anymore. Signed-off-by: Tero Kristo <t-kristo@ti.com> Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/cm2xxx.c')
-rw-r--r--arch/arm/mach-omap2/cm2xxx.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/arch/arm/mach-omap2/cm2xxx.c b/arch/arm/mach-omap2/cm2xxx.c
index ce25abbcffae..8be6ea50c092 100644
--- a/arch/arm/mach-omap2/cm2xxx.c
+++ b/arch/arm/mach-omap2/cm2xxx.c
@@ -18,9 +18,6 @@
#include <linux/err.h>
#include <linux/io.h>
-#include "soc.h"
-#include "iomap.h"
-#include "common.h"
#include "prm2xxx.h"
#include "cm.h"
#include "cm2xxx.h"
@@ -390,7 +387,7 @@ void omap2xxx_cm_set_mod_dividers(u32 mpu, u32 dsp, u32 gfx, u32 core, u32 mdm)
tmp = omap2_cm_read_mod_reg(CORE_MOD, CM_CLKSEL1) &
OMAP24XX_CLKSEL_DSS2_MASK;
omap2_cm_write_mod_reg(core | tmp, CORE_MOD, CM_CLKSEL1);
- if (cpu_is_omap2430())
+ if (mdm)
omap2_cm_write_mod_reg(mdm, OMAP2430_MDM_MOD, CM_CLKSEL);
}
@@ -405,19 +402,11 @@ static struct cm_ll_data omap2xxx_cm_ll_data = {
int __init omap2xxx_cm_init(void)
{
- if (!cpu_is_omap24xx())
- return 0;
-
return cm_register(&omap2xxx_cm_ll_data);
}
static void __exit omap2xxx_cm_exit(void)
{
- if (!cpu_is_omap24xx())
- return;
-
- /* Should never happen */
- WARN(cm_unregister(&omap2xxx_cm_ll_data),
- "%s: cm_ll_data function pointer mismatch\n", __func__);
+ cm_unregister(&omap2xxx_cm_ll_data);
}
__exitcall(omap2xxx_cm_exit);