diff options
author | Paul Walmsley <paul@pwsan.com> | 2012-10-21 01:01:10 -0600 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2012-10-21 01:01:10 -0600 |
commit | 139563ad27e7baad7935b8113940f0d804cf513b (patch) | |
tree | f367d3813f1fb83773782537ad658f3cf3bb0508 /arch/arm/mach-omap2/prm44xx.c | |
parent | 7a0c19337c38a1ffa7587272e7784e6431e78eaa (diff) | |
download | linux-stable-139563ad27e7baad7935b8113940f0d804cf513b.tar.gz linux-stable-139563ad27e7baad7935b8113940f0d804cf513b.tar.bz2 linux-stable-139563ad27e7baad7935b8113940f0d804cf513b.zip |
ARM: OMAP2+: PRM: split PRM functions into OMAP2, OMAP3-specific files
Move OMAP3xxx-specific PRM functions & macros into prm3xxx.[ch] and
OMAP2xxx-specific macros into prm2xxx.h. (prm2xxx.c will be created
by a subsequent patch when it's needed.) Move basic PRM register
access functions into static inline functions in prm2xxx_3xxx.h, leaving
only OMAP2/3 hardreset functions in prm2xxx_3xxx.c.
Also clarify the initcall function naming to reinforce that this code
is specifically for the PRM IP block.
This is in preparation for the upcoming powerdomain series and the
upcoming move of this code to drivers/.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Reviewed-by: Russ Dill <Russ.Dill@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/prm44xx.c')
-rw-r--r-- | arch/arm/mach-omap2/prm44xx.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c index f0c4d5f4a174..06bb67910a31 100644 --- a/arch/arm/mach-omap2/prm44xx.c +++ b/arch/arm/mach-omap2/prm44xx.c @@ -291,12 +291,13 @@ static void __init omap44xx_prm_enable_io_wakeup(void) OMAP4_PRM_IO_PMCTRL_OFFSET); } -static int __init omap4xxx_prcm_init(void) +static int __init omap4xxx_prm_init(void) { - if (cpu_is_omap44xx()) { - omap44xx_prm_enable_io_wakeup(); - return omap_prcm_register_chain_handler(&omap4_prcm_irq_setup); - } - return 0; + if (!cpu_is_omap44xx()) + return 0; + + omap44xx_prm_enable_io_wakeup(); + + return omap_prcm_register_chain_handler(&omap4_prcm_irq_setup); } -subsys_initcall(omap4xxx_prcm_init); +subsys_initcall(omap4xxx_prm_init); |