Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

ARM: s3c64xx: use machine specific hook for late init 



Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent a4b4674e

arch/arm/mach-s3c64xx/common.c

+5 −0
Original line number Diff line number Diff line
@@ -384,3 +384,8 @@ void s3c64xx_restart(char mode, const char *cmd) 
	/* if all else fails, or mode was for soft, jump to 0 */

	soft_restart(0);

}



void __init s3c64xx_init_late(void)

{

	s3c64xx_pm_late_initcall();

}

arch/arm/mach-s3c64xx/common.h

+7 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ void s3c64xx_register_clocks(unsigned long xtal, unsigned armclk_limit); 
void s3c64xx_setup_clocks(void);



void s3c64xx_restart(char mode, const char *cmd);

void s3c64xx_init_late(void);



#ifdef CONFIG_CPU_S3C6400
@@ -51,4 +52,10 @@ extern void s3c6410_init_clocks(int xtal); 
#define s3c6410_init NULL

#endif



#ifdef CONFIG_PM

int __init s3c64xx_pm_late_initcall(void);

#else

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

#endif



#endif /* __ARCH_ARM_MACH_S3C64XX_COMMON_H */

arch/arm/mach-s3c64xx/mach-anw6410.c

+1 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ MACHINE_START(ANW6410, "A&W6410") 
	.handle_irq	= vic_handle_irq,

	.map_io		= anw6410_map_io,

	.init_machine	= anw6410_machine_init,

	.init_late	= s3c64xx_init_late,

	.timer		= &s3c24xx_timer,

	.restart	= s3c64xx_restart,

MACHINE_END

arch/arm/mach-s3c64xx/mach-crag6410.c

+1 −0
Original line number Diff line number Diff line
@@ -811,6 +811,7 @@ MACHINE_START(WLF_CRAGG_6410, "Wolfson Cragganmore 6410") 
	.handle_irq	= vic_handle_irq,

	.map_io		= crag6410_map_io,

	.init_machine	= crag6410_machine_init,

	.init_late	= s3c64xx_init_late,

	.timer		= &s3c24xx_timer,

	.restart	= s3c64xx_restart,

MACHINE_END

arch/arm/mach-s3c64xx/mach-hmt.c

+1 −0
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ MACHINE_START(HMT, "Airgoo-HMT") 
	.handle_irq	= vic_handle_irq,

	.map_io		= hmt_map_io,

	.init_machine	= hmt_machine_init,

	.init_late	= s3c64xx_init_late,

	.timer		= &s3c24xx_timer,

	.restart	= s3c64xx_restart,

MACHINE_END