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 480f40a5ee42..053e24ed3c48 100644 --- a/arch/arm/mach-omap2/prcm.c +++ b/arch/arm/mach-omap2/prcm.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include "prm2xxx_3xxx.h" | 35 | #include "prm2xxx_3xxx.h" |
36 | #include "prm44xx.h" | 36 | #include "prm44xx.h" |
37 | #include "prminst44xx.h" | 37 | #include "prminst44xx.h" |
38 | #include "cminst44xx.h" | ||
38 | #include "prm-regbits-24xx.h" | 39 | #include "prm-regbits-24xx.h" |
39 | #include "prm-regbits-44xx.h" | 40 | #include "prm-regbits-44xx.h" |
40 | #include "control.h" | 41 | #include "control.h" |
@@ -159,8 +160,30 @@ void __init omap2_set_globals_prcm(struct omap_globals *omap2_globals) | |||
159 | if (omap2_globals->prcm_mpu) | 160 | if (omap2_globals->prcm_mpu) |
160 | prcm_mpu_base = omap2_globals->prcm_mpu; | 161 | prcm_mpu_base = omap2_globals->prcm_mpu; |
161 | 162 | ||
162 | if (cpu_is_omap44xx()) { | 163 | if (cpu_is_omap44xx() || soc_is_omap54xx()) { |
163 | omap_prm_base_init(); | 164 | omap_prm_base_init(); |
164 | omap_cm_base_init(); | 165 | omap_cm_base_init(); |
165 | } | 166 | } |
166 | } | 167 | } |
168 | |||
169 | /* | ||
170 | * Stubbed functions so that common files continue to build when | ||
171 | * custom builds are used | ||
172 | * XXX These are temporary and should be removed at the earliest possible | ||
173 | * opportunity | ||
174 | */ | ||
175 | int __weak omap4_cminst_wait_module_idle(u8 part, u16 inst, s16 cdoffs, | ||
176 | u16 clkctrl_offs) | ||
177 | { | ||
178 | return 0; | ||
179 | } | ||
180 | |||
181 | void __weak omap4_cminst_module_enable(u8 mode, u8 part, u16 inst, | ||
182 | s16 cdoffs, u16 clkctrl_offs) | ||
183 | { | ||
184 | } | ||
185 | |||
186 | void __weak omap4_cminst_module_disable(u8 part, u16 inst, s16 cdoffs, | ||
187 | u16 clkctrl_offs) | ||
188 | { | ||
189 | } | ||