Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66db6428 authored by Tero Kristo's avatar Tero Kristo
Browse files

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: default avatarTero Kristo <t-kristo@ti.com>
parent 4e3870f3

arch/arm/mach-omap2/cm44xx.h

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#define OMAP4_CM_CLKSTCTRL				0x0000

#define OMAP4_CM_STATICDEP				0x0004



void omap_cm_base_init(void);

int omap4_cm_init(void);



#endif

arch/arm/mach-omap2/cminst44xx.c

+3 −1
Original line number Diff line number Diff line
@@ -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);

}

arch/arm/mach-omap2/io.c

+0 −4
Original line number Diff line number Diff line
@@ -623,7 +623,6 @@ void __init am43xx_init_early(void) 
				  NULL);

	omap2_set_globals_prm(AM33XX_L4_WK_IO_ADDRESS(AM43XX_PRCM_BASE));

	omap2_set_globals_cm(AM33XX_L4_WK_IO_ADDRESS(AM43XX_PRCM_BASE), NULL);

	omap_cm_base_init();

	omap3xxx_check_revision();

	am33xx_check_features();

	omap44xx_prm_init();
@@ -653,7 +652,6 @@ void __init omap4430_init_early(void) 
	omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(OMAP4430_CM_BASE),

			     OMAP2_L4_IO_ADDRESS(OMAP4430_CM2_BASE));

	omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP4430_PRCM_MPU_BASE));

	omap_cm_base_init();

	omap4xxx_check_revision();

	omap4xxx_check_features();

	omap4_cm_init();
@@ -688,7 +686,6 @@ void __init omap5_init_early(void) 
			     OMAP2_L4_IO_ADDRESS(OMAP54XX_CM_CORE_BASE));

	omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE));

	omap4_pm_init_early();

	omap_cm_base_init();

	omap44xx_prm_init();

	omap5xxx_check_revision();

	omap4_cm_init();
@@ -719,7 +716,6 @@ void __init dra7xx_init_early(void) 
			     OMAP2_L4_IO_ADDRESS(OMAP54XX_CM_CORE_BASE));

	omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE));

	omap4_pm_init_early();

	omap_cm_base_init();

	omap44xx_prm_init();

	dra7xxx_check_revision();

	omap4_cm_init();