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

Commit 425dc8b2 authored by Tero Kristo's avatar Tero Kristo
Browse files

ARM: OMAP2+: CM: move SoC specific init calls within a generic API 



This gets rid of need for some exported driver APIs, and simplifies the
initialization of the CM driver. Done in preparation to make CM a
separate driver. The init data is now also passed to the SoC specific
implementations, allowing future expansion to add feature flags etc.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
parent 48e0c114

arch/arm/mach-omap2/cm2xxx.c

+1 −2
Original line number Diff line number Diff line
@@ -393,9 +393,8 @@ static struct cm_ll_data omap2xxx_cm_ll_data = { 
	.wait_module_ready	= &omap2xxx_cm_wait_module_ready,

};



int __init omap2xxx_cm_init(void)

int __init omap2xxx_cm_init(const struct omap_prcm_init_data *data)

{

	omap2_cm_base_init();

	return cm_register(&omap2xxx_cm_ll_data);

}

arch/arm/mach-omap2/cm2xxx.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ extern u32 omap2xxx_cm_get_core_pll_config(void); 
extern void omap2xxx_cm_set_mod_dividers(u32 mpu, u32 dsp, u32 gfx, u32 core,

					 u32 mdm);



extern int __init omap2xxx_cm_init(void);

int __init omap2xxx_cm_init(const struct omap_prcm_init_data *data);



#endif

arch/arm/mach-omap2/cm33xx.c

+1 −2
Original line number Diff line number Diff line
@@ -352,9 +352,8 @@ static struct cm_ll_data am33xx_cm_ll_data = { 
	.module_disable		= &am33xx_cm_module_disable,

};



int __init am33xx_cm_init(void)

int __init am33xx_cm_init(const struct omap_prcm_init_data *data)

{

	omap2_cm_base_init();

	return cm_register(&am33xx_cm_ll_data);

}

arch/arm/mach-omap2/cm33xx.h

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include "cm.h"

#include "cm-regbits-33xx.h"

#include "prcm-common.h"



/* CM base address */

#define AM33XX_CM_BASE		0x44e00000
@@ -374,6 +375,6 @@ 




#ifndef __ASSEMBLER__

int am33xx_cm_init(void);

int am33xx_cm_init(const struct omap_prcm_init_data *data);

#endif /* ASSEMBLER */

#endif

arch/arm/mach-omap2/cm3xxx.c

+1 −2
Original line number Diff line number Diff line
@@ -671,10 +671,9 @@ static struct cm_ll_data omap3xxx_cm_ll_data = { 
	.wait_module_ready	= &omap3xxx_cm_wait_module_ready,

};



int __init omap3xxx_cm_init(void)

int __init omap3xxx_cm_init(const struct omap_prcm_init_data *data)

{

	omap2_clk_legacy_provider_init(TI_CLKM_CM, cm_base + OMAP3430_IVA2_MOD);

	omap2_cm_base_init();

	return cm_register(&omap3xxx_cm_ll_data);

}