Commit 63a293e0 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

ARM: OMAP2+: PRM: initialize some PRM functions early 



Some PRM functions will need to be called by the hwmod code early in
kernel init.  To handle this, split the PRM initialization code into
early and late phases.  The early init is handled via mach-omap2/io.c,
while the late init is handled by subsys_initcall().

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 558a0780

arch/arm/mach-omap2/io.c

+8 −0
Original line number Diff line number Diff line
@@ -51,6 +51,10 @@ 
#include "prcm_mpu44xx.h"

#include "prminst44xx.h"

#include "cminst44xx.h"

#include "prm2xxx.h"

#include "prm3xxx.h"

#include "prm44xx.h"



/*

 * The machine specific code may provide the extra mapping besides the

 * default mapping provided here.
@@ -392,6 +396,7 @@ void __init omap2420_init_early(void) 
	omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP2420_PRM_BASE));

	omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(OMAP2420_CM_BASE), NULL);

	omap2xxx_check_revision();

	omap2xxx_prm_init();

	omap2xxx_cm_init();

	omap_common_init_early();

	omap2xxx_voltagedomains_init();
@@ -422,6 +427,7 @@ void __init omap2430_init_early(void) 
	omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP2430_PRM_BASE));

	omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(OMAP2430_CM_BASE), NULL);

	omap2xxx_check_revision();

	omap2xxx_prm_init();

	omap2xxx_cm_init();

	omap_common_init_early();

	omap2xxx_voltagedomains_init();
@@ -457,6 +463,7 @@ void __init omap3_init_early(void) 
	omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(OMAP3430_CM_BASE), NULL);

	omap3xxx_check_revision();

	omap3xxx_check_features();

	omap3xxx_prm_init();

	omap3xxx_cm_init();

	omap_common_init_early();

	omap3xxx_voltagedomains_init();
@@ -591,6 +598,7 @@ void __init omap4430_init_early(void) 
	omap_cm_base_init();

	omap4xxx_check_revision();

	omap4xxx_check_features();

	omap44xx_prm_init();

	omap_common_init_early();

	omap44xx_voltagedomains_init();

	omap44xx_powerdomains_init();

arch/arm/mach-omap2/prm2xxx.c

+1 −2
Original line number Diff line number Diff line
@@ -118,14 +118,13 @@ static struct prm_ll_data omap2xxx_prm_ll_data = { 
	.read_reset_sources = &omap2xxx_prm_read_reset_sources,

};



static int __init omap2xxx_prm_init(void)

int __init omap2xxx_prm_init(void)

{

	if (!cpu_is_omap24xx())

		return 0;



	return prm_register(&omap2xxx_prm_ll_data);

}

subsys_initcall(omap2xxx_prm_init);



static void __exit omap2xxx_prm_exit(void)

{

arch/arm/mach-omap2/prm2xxx.h

+1 −2
Original line number Diff line number Diff line
@@ -126,8 +126,7 @@ extern int omap2xxx_clkdm_wakeup(struct clockdomain *clkdm); 


extern void omap2xxx_prm_dpll_reset(void);



extern int __init prm2xxx_init(void);

extern int __exit prm2xxx_exit(void);

extern int __init omap2xxx_prm_init(void);



#endif

arch/arm/mach-omap2/prm3xxx.c

+10 −7
Original line number Diff line number Diff line
@@ -383,27 +383,30 @@ static struct prm_ll_data omap3xxx_prm_ll_data = { 
	.read_reset_sources = &omap3xxx_prm_read_reset_sources,

};



static int __init omap3xxx_prm_init(void)

int __init omap3xxx_prm_init(void)

{

	if (!cpu_is_omap34xx())

		return 0;



	return prm_register(&omap3xxx_prm_ll_data);

}



static int __init omap3xxx_prm_late_init(void)

{

	int ret;



	if (!cpu_is_omap34xx())

		return 0;



	ret = prm_register(&omap3xxx_prm_ll_data);

	if (ret)

		return ret;



	omap3xxx_prm_enable_io_wakeup();

	ret = omap_prcm_register_chain_handler(&omap3_prcm_irq_setup);

	if (!ret)

		irq_set_status_flags(omap_prcm_event_to_irq("io"),

				     IRQ_NOAUTOEN);





	return ret;

}

subsys_initcall(omap3xxx_prm_init);

subsys_initcall(omap3xxx_prm_late_init);



static void __exit omap3xxx_prm_exit(void)

{

arch/arm/mach-omap2/prm3xxx.h

+1 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ extern void omap3xxx_prm_restore_irqen(u32 *saved_mask); 


extern void omap3xxx_prm_dpll3_reset(void);



extern int __init omap3xxx_prm_init(void);

extern u32 omap3xxx_prm_get_reset_sources(void);



#endif /* __ASSEMBLER */

CRA Git | Maintained and supported by SUSTech CRA and CCSE