Commit 0efd7faa authored by Magnus Damm's avatar Magnus Damm Committed by Simon Horman
Browse files

ARM: shmobile: Rename to r8a7790_init_early() 



Rename r8a7790_init_delay() into r8a7790_init_early()
to make the function name show that more than just
delay setup may happen in the future.

Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 0750a545

arch/arm/mach-shmobile/board-lager-reference.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static const char *lager_boards_compat_dt[] __initdata = { 
};



DT_MACHINE_START(LAGER_DT, "lager")

	.init_early	= r8a7790_init_delay,

	.init_early	= r8a7790_init_early,

	.init_machine	= lager_add_standard_devices,

	.init_time	= r8a7790_timer_init,

	.dt_compat	= lager_boards_compat_dt,

arch/arm/mach-shmobile/board-lager.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static const char *lager_boards_compat_dt[] __initdata = { 
};



DT_MACHINE_START(LAGER_DT, "lager")

	.init_early	= r8a7790_init_delay,

	.init_early	= r8a7790_init_early,

	.init_time	= r8a7790_timer_init,

	.init_machine	= lager_add_standard_devices,

	.dt_compat	= lager_boards_compat_dt,

arch/arm/mach-shmobile/include/mach/r8a7790.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ void r8a7790_add_standard_devices(void); 
void r8a7790_add_dt_devices(void);

void r8a7790_clock_init(void);

void r8a7790_pinmux_init(void);

void r8a7790_init_delay(void);

void r8a7790_init_early(void);

void r8a7790_timer_init(void);



#define MD(nr) BIT(nr)

arch/arm/mach-shmobile/setup-r8a7790.c

+2 −2
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ void __init r8a7790_timer_init(void) 
	clocksource_of_init();

}



void __init r8a7790_init_delay(void)

void __init r8a7790_init_early(void)

{

#ifndef CONFIG_ARM_ARCH_TIMER

	shmobile_setup_delay(1300, 2, 4); /* Cortex-A15 @ 1300MHz */
@@ -282,7 +282,7 @@ static const char *r8a7790_boards_compat_dt[] __initdata = { 
};



DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")

	.init_early	= r8a7790_init_delay,

	.init_early	= r8a7790_init_early,

	.init_time	= r8a7790_timer_init,

	.dt_compat	= r8a7790_boards_compat_dt,

MACHINE_END

CRA Git | Maintained and supported by SUSTech CRA and CCSE