diff options
author | R Sricharan <r.sricharan@ti.com> | 2012-07-04 07:04:00 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2012-07-04 07:04:00 -0400 |
commit | 3f4990f44a5dcf15a053a041c813fa73ffa75608 (patch) | |
tree | e6d09bdbfe81d5fe379e8fb755ec899a1e220d2c /arch/arm/mach-omap2/prm_common.c | |
parent | bed9d1bb4ed8c9bdaca77d31a2562c3a9dae43a7 (diff) |
ARM: OMAP2+: PRM/CM: Move the stubbed prm and cm functions to prcm.c file and make them __weak
Some prm and cm registers read/write and status functions
are built only for some custom OMAP2+ builds and are stubbed
in header files for other builds under ifdef statements.
But this results in adding new CONFIG_ARCH_OMAPXXX
checks when SOCs are added in the future. So move them
to a common place for OMAP2+ and make them 'weak' implementations.
This way no new ifdefs would be required in the future and also
cleans up the existing code.
Signed-off-by: R Sricharan <r.sricharan@ti.com>
[paul@pwsan.com: unsplit quoted strings; moved PRM functions to
mach-omap2/prm_common.c; resolved sparse warnings]
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/prm_common.c')
-rw-r--r-- | arch/arm/mach-omap2/prm_common.c | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c index dfe00ddb5c60..663ade3b2f45 100644 --- a/arch/arm/mach-omap2/prm_common.c +++ b/arch/arm/mach-omap2/prm_common.c | |||
@@ -319,3 +319,65 @@ err: | |||
319 | omap_prcm_irq_cleanup(); | 319 | omap_prcm_irq_cleanup(); |
320 | return -ENOMEM; | 320 | return -ENOMEM; |
321 | } | 321 | } |
322 | |||
323 | /* | ||
324 | * Stubbed functions so that common files continue to build when | ||
325 | * custom builds are used | ||
326 | * XXX These are temporary and should be removed at the earliest possible | ||
327 | * opportunity | ||
328 | */ | ||
329 | u32 __weak omap2_prm_read_mod_reg(s16 module, u16 idx) | ||
330 | { | ||
331 | WARN(1, "prm: omap2xxx/omap3xxx specific function called on non-omap2xxx/3xxx\n"); | ||
332 | return 0; | ||
333 | } | ||
334 | |||
335 | void __weak omap2_prm_write_mod_reg(u32 val, s16 module, u16 idx) | ||
336 | { | ||
337 | WARN(1, "prm: omap2xxx/omap3xxx specific function called on non-omap2xxx/3xxx\n"); | ||
338 | } | ||
339 | |||
340 | u32 __weak omap2_prm_rmw_mod_reg_bits(u32 mask, u32 bits, | ||
341 | s16 module, s16 idx) | ||
342 | { | ||
343 | WARN(1, "prm: omap2xxx/omap3xxx specific function called on non-omap2xxx/3xxx\n"); | ||
344 | return 0; | ||
345 | } | ||
346 | |||
347 | u32 __weak omap2_prm_set_mod_reg_bits(u32 bits, s16 module, s16 idx) | ||
348 | { | ||
349 | WARN(1, "prm: omap2xxx/omap3xxx specific function called on non-omap2xxx/3xxx\n"); | ||
350 | return 0; | ||
351 | } | ||
352 | |||
353 | u32 __weak omap2_prm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx) | ||
354 | { | ||
355 | WARN(1, "prm: omap2xxx/omap3xxx specific function called on non-omap2xxx/3xxx\n"); | ||
356 | return 0; | ||
357 | } | ||
358 | |||
359 | u32 __weak omap2_prm_read_mod_bits_shift(s16 domain, s16 idx, u32 mask) | ||
360 | { | ||
361 | WARN(1, "prm: omap2xxx/omap3xxx specific function called on non-omap2xxx/3xxx\n"); | ||
362 | return 0; | ||
363 | } | ||
364 | |||
365 | int __weak omap2_prm_is_hardreset_asserted(s16 prm_mod, u8 shift) | ||
366 | { | ||
367 | WARN(1, "prm: omap2xxx/omap3xxx specific function called on non-omap2xxx/3xxx\n"); | ||
368 | return 0; | ||
369 | } | ||
370 | |||
371 | int __weak omap2_prm_assert_hardreset(s16 prm_mod, u8 shift) | ||
372 | { | ||
373 | WARN(1, "prm: omap2xxx/omap3xxx specific function called on non-omap2xxx/3xxx\n"); | ||
374 | return 0; | ||
375 | } | ||
376 | |||
377 | int __weak omap2_prm_deassert_hardreset(s16 prm_mod, u8 rst_shift, | ||
378 | u8 st_shift) | ||
379 | { | ||
380 | WARN(1, "prm: omap2xxx/omap3xxx specific function called on non-omap2xxx/3xxx\n"); | ||
381 | return 0; | ||
382 | } | ||
383 | |||