aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorTero Kristo <t-kristo@ti.com>2014-11-06 07:39:40 -0500
committerTero Kristo <t-kristo@ti.com>2015-03-25 05:03:42 -0400
commit66db6428d5dccac9f38d92d521a9b3de8d9d0b0b (patch)
tree2da0d209927535d0818ec30de8cf8663136e69a9 /arch/arm
parent4e3870f3f62b18d92ff1ec5e7ff408afed0766f0 (diff)
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')
-rw-r--r--arch/arm/mach-omap2/cm44xx.h1
-rw-r--r--arch/arm/mach-omap2/cminst44xx.c4
-rw-r--r--arch/arm/mach-omap2/io.c4
3 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/cm44xx.h b/arch/arm/mach-omap2/cm44xx.h
index 728d06a4af19..ad6e263c5a6b 100644
--- a/arch/arm/mach-omap2/cm44xx.h
+++ b/arch/arm/mach-omap2/cm44xx.h
@@ -23,7 +23,6 @@
23#define OMAP4_CM_CLKSTCTRL 0x0000 23#define OMAP4_CM_CLKSTCTRL 0x0000
24#define OMAP4_CM_STATICDEP 0x0004 24#define OMAP4_CM_STATICDEP 0x0004
25 25
26void omap_cm_base_init(void);
27int omap4_cm_init(void); 26int omap4_cm_init(void);
28 27
29#endif 28#endif
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];
63 * Populates the base addresses of the _cm_bases 63 * Populates the base addresses of the _cm_bases
64 * array used for read/write of cm module registers. 64 * array used for read/write of cm module registers.
65 */ 65 */
66void omap_cm_base_init(void) 66static void omap_cm_base_init(void)
67{ 67{
68 _cm_bases[OMAP4430_PRM_PARTITION] = prm_base; 68 _cm_bases[OMAP4430_PRM_PARTITION] = prm_base;
69 _cm_bases[OMAP4430_CM1_PARTITION] = cm_base; 69 _cm_bases[OMAP4430_CM1_PARTITION] = cm_base;
@@ -516,6 +516,8 @@ static struct cm_ll_data omap4xxx_cm_ll_data = {
516 516
517int __init omap4_cm_init(void) 517int __init omap4_cm_init(void)
518{ 518{
519 omap_cm_base_init();
520
519 return cm_register(&omap4xxx_cm_ll_data); 521 return cm_register(&omap4xxx_cm_ll_data);
520} 522}
521 523
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 5569c2f63acf..364b530bf029 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -623,7 +623,6 @@ void __init am43xx_init_early(void)
623 NULL); 623 NULL);
624 omap2_set_globals_prm(AM33XX_L4_WK_IO_ADDRESS(AM43XX_PRCM_BASE)); 624 omap2_set_globals_prm(AM33XX_L4_WK_IO_ADDRESS(AM43XX_PRCM_BASE));
625 omap2_set_globals_cm(AM33XX_L4_WK_IO_ADDRESS(AM43XX_PRCM_BASE), NULL); 625 omap2_set_globals_cm(AM33XX_L4_WK_IO_ADDRESS(AM43XX_PRCM_BASE), NULL);
626 omap_cm_base_init();
627 omap3xxx_check_revision(); 626 omap3xxx_check_revision();
628 am33xx_check_features(); 627 am33xx_check_features();
629 omap44xx_prm_init(); 628 omap44xx_prm_init();
@@ -653,7 +652,6 @@ void __init omap4430_init_early(void)
653 omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(OMAP4430_CM_BASE), 652 omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(OMAP4430_CM_BASE),
654 OMAP2_L4_IO_ADDRESS(OMAP4430_CM2_BASE)); 653 OMAP2_L4_IO_ADDRESS(OMAP4430_CM2_BASE));
655 omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP4430_PRCM_MPU_BASE)); 654 omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP4430_PRCM_MPU_BASE));
656 omap_cm_base_init();
657 omap4xxx_check_revision(); 655 omap4xxx_check_revision();
658 omap4xxx_check_features(); 656 omap4xxx_check_features();
659 omap4_cm_init(); 657 omap4_cm_init();
@@ -688,7 +686,6 @@ void __init omap5_init_early(void)
688 OMAP2_L4_IO_ADDRESS(OMAP54XX_CM_CORE_BASE)); 686 OMAP2_L4_IO_ADDRESS(OMAP54XX_CM_CORE_BASE));
689 omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE)); 687 omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE));
690 omap4_pm_init_early(); 688 omap4_pm_init_early();
691 omap_cm_base_init();
692 omap44xx_prm_init(); 689 omap44xx_prm_init();
693 omap5xxx_check_revision(); 690 omap5xxx_check_revision();
694 omap4_cm_init(); 691 omap4_cm_init();
@@ -719,7 +716,6 @@ void __init dra7xx_init_early(void)
719 OMAP2_L4_IO_ADDRESS(OMAP54XX_CM_CORE_BASE)); 716 OMAP2_L4_IO_ADDRESS(OMAP54XX_CM_CORE_BASE));
720 omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE)); 717 omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE));
721 omap4_pm_init_early(); 718 omap4_pm_init_early();
722 omap_cm_base_init();
723 omap44xx_prm_init(); 719 omap44xx_prm_init();
724 dra7xxx_check_revision(); 720 dra7xxx_check_revision();
725 omap4_cm_init(); 721 omap4_cm_init();