summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/cminst44xx.c
diff options
context:
space:
mode:
authorTero Kristo <t-kristo@ti.com>2014-11-06 14:39:40 +0200
committerTero Kristo <t-kristo@ti.com>2015-03-25 11:03:42 +0200
commit66db6428d5dccac9f38d92d521a9b3de8d9d0b0b (patch)
tree2da0d209927535d0818ec30de8cf8663136e69a9 /arch/arm/mach-omap2/cminst44xx.c
parent4e3870f3f62b18d92ff1ec5e7ff408afed0766f0 (diff)
downloadlinux-66db6428d5dccac9f38d92d521a9b3de8d9d0b0b.tar.bz2
ARM: OMAP4+: CM: move omap_cm_base_init under OMAP4 CM driver
There is no need to call this separately from io.c, rather this can be done commonly under the CM driver. Also, this patch makes the API static, as it is no longer used outside the driver file. Signed-off-by: Tero Kristo <t-kristo@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/cminst44xx.c')
-rw-r--r--arch/arm/mach-omap2/cminst44xx.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/cminst44xx.c b/arch/arm/mach-omap2/cminst44xx.c
index 95a8cff66aff..9319034bebff 100644
--- a/arch/arm/mach-omap2/cminst44xx.c
+++ b/arch/arm/mach-omap2/cminst44xx.c
@@ -63,7 +63,7 @@ static void __iomem *_cm_bases[OMAP4_MAX_PRCM_PARTITIONS];
* Populates the base addresses of the _cm_bases
* array used for read/write of cm module registers.
*/
-void omap_cm_base_init(void)
+static void omap_cm_base_init(void)
{
_cm_bases[OMAP4430_PRM_PARTITION] = prm_base;
_cm_bases[OMAP4430_CM1_PARTITION] = cm_base;
@@ -516,6 +516,8 @@ static struct cm_ll_data omap4xxx_cm_ll_data = {
int __init omap4_cm_init(void)
{
+ omap_cm_base_init();
+
return cm_register(&omap4xxx_cm_ll_data);
}