diff options
Diffstat (limited to 'arch/arm/mach-omap2/prcm.c')
| -rw-r--r-- | arch/arm/mach-omap2/prcm.c | 25 | 
1 files changed, 24 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c index 480f40a5ee4..053e24ed3c4 100644 --- a/arch/arm/mach-omap2/prcm.c +++ b/arch/arm/mach-omap2/prcm.c @@ -35,6 +35,7 @@  #include "prm2xxx_3xxx.h"  #include "prm44xx.h"  #include "prminst44xx.h" +#include "cminst44xx.h"  #include "prm-regbits-24xx.h"  #include "prm-regbits-44xx.h"  #include "control.h" @@ -159,8 +160,30 @@ void __init omap2_set_globals_prcm(struct omap_globals *omap2_globals)  	if (omap2_globals->prcm_mpu)  		prcm_mpu_base = omap2_globals->prcm_mpu; -	if (cpu_is_omap44xx()) { +	if (cpu_is_omap44xx() || soc_is_omap54xx()) {  		omap_prm_base_init();  		omap_cm_base_init();  	}  } + +/* + * Stubbed functions so that common files continue to build when + * custom builds are used + * XXX These are temporary and should be removed at the earliest possible + * opportunity + */ +int __weak omap4_cminst_wait_module_idle(u8 part, u16 inst, s16 cdoffs, +					u16 clkctrl_offs) +{ +	return 0; +} + +void __weak omap4_cminst_module_enable(u8 mode, u8 part, u16 inst, +				s16 cdoffs, u16 clkctrl_offs) +{ +} + +void __weak omap4_cminst_module_disable(u8 part, u16 inst, s16 cdoffs, +				 u16 clkctrl_offs) +{ +}  |