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

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

ARM: exynos: use machine specific hook for late init 



Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent c914283f

arch/arm/mach-exynos/common.c

+5 −0
Original line number Diff line number Diff line
@@ -285,6 +285,11 @@ void exynos5_restart(char mode, const char *cmd) 
	__raw_writel(0x1, EXYNOS_SWRESET);

}



void __init exynos_init_late(void)

{

	exynos_pm_late_initcall();

}



/*

 * exynos_map_io

 *

arch/arm/mach-exynos/common.h

+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,13 @@ void exynos4_init_irq(void); 
void exynos5_init_irq(void);

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

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

void exynos_init_late(void);



#ifdef CONFIG_PM_GENERIC_DOMAINS

int exynos_pm_late_initcall(void);

#else

static int exynos_pm_late_initcall(void) { return 0; }

#endif



#ifdef CONFIG_ARCH_EXYNOS4

void exynos4_register_clocks(void);

arch/arm/mach-exynos/mach-armlex4210.c

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ MACHINE_START(ARMLEX4210, "ARMLEX4210") 
	.map_io		= armlex4210_map_io,

	.handle_irq	= gic_handle_irq,

	.init_machine	= armlex4210_machine_init,

	.init_late	= exynos_init_late,

	.timer		= &exynos4_timer,

	.restart	= exynos4_restart,

MACHINE_END

arch/arm/mach-exynos/mach-exynos4-dt.c

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)") 
	.map_io		= exynos4210_dt_map_io,

	.handle_irq	= gic_handle_irq,

	.init_machine	= exynos4210_dt_machine_init,

	.init_late	= exynos_init_late,

	.timer		= &exynos4_timer,

	.dt_compat	= exynos4210_dt_compat,

	.restart        = exynos4_restart,

arch/arm/mach-exynos/mach-exynos5-dt.c

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ DT_MACHINE_START(EXYNOS5_DT, "SAMSUNG EXYNOS5 (Flattened Device Tree)") 
	.map_io		= exynos5250_dt_map_io,

	.handle_irq	= gic_handle_irq,

	.init_machine	= exynos5250_dt_machine_init,

	.init_late	= exynos_init_late,

	.timer		= &exynos4_timer,

	.dt_compat	= exynos5250_dt_compat,

	.restart        = exynos5_restart,