Commit a4b4674e authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: prima2: use machine specific hook for late init 



Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Reviewed-by: default avatarBarry Song <baohua.song@csr.com>
parent cafa6190

arch/arm/mach-prima2/common.h

+6 −0
Original line number Diff line number Diff line
@@ -24,4 +24,10 @@ static inline void sirfsoc_map_lluart(void) {} 
extern void __init sirfsoc_map_lluart(void);

#endif



#ifdef CONFIG_SUSPEND

extern int sirfsoc_pm_init(void);

#else

static inline int sirfsoc_pm_init(void) { return 0; }

#endif



#endif

arch/arm/mach-prima2/pm.c

+1 −2
Original line number Diff line number Diff line
@@ -85,12 +85,11 @@ static const struct platform_suspend_ops sirfsoc_pm_ops = { 
	.valid = suspend_valid_only_mem,

};



static int __init sirfsoc_pm_init(void)

int __init sirfsoc_pm_init(void)

{

	suspend_set_ops(&sirfsoc_pm_ops);

	return 0;

}

late_initcall(sirfsoc_pm_init);



static const struct of_device_id pwrc_ids[] = {

	{ .compatible = "sirf,prima2-pwrc" },

arch/arm/mach-prima2/prima2.c

+6 −0
Original line number Diff line number Diff line
@@ -25,6 +25,11 @@ void __init sirfsoc_mach_init(void) 
	of_platform_bus_probe(NULL, sirfsoc_of_bus_ids, NULL);

}



void __init sirfsoc_init_late(void)

{

	sirfsoc_pm_init();

}



static const char *prima2cb_dt_match[] __initdata = {

       "sirf,prima2-cb",

       NULL
@@ -39,6 +44,7 @@ MACHINE_START(PRIMA2_EVB, "prima2cb") 
	.timer		= &sirfsoc_timer,

	.dma_zone_size	= SZ_256M,

	.init_machine	= sirfsoc_mach_init,

	.init_late	= sirfsoc_init_late,

	.dt_compat      = prima2cb_dt_match,

	.restart	= sirfsoc_restart,

MACHINE_END