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

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

ARM: shmobile: r8a73a4: Use shmobile_init_delay() 



Adjust the r8a73a4 SoC support code to use shmobile_init_delay()
together with CPU Frequency settings from the DTS. Get rid of the
C code version and r8a73a4_init_early() that now are unused.

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

arch/arm/mach-shmobile/r8a73a4.h

+0 −1
Original line number Diff line number Diff line
@@ -14,6 +14,5 @@ void r8a73a4_add_standard_devices(void); 
void r8a73a4_add_dt_devices(void);

void r8a73a4_clock_init(void);

void r8a73a4_pinmux_init(void);

void r8a73a4_init_early(void);



#endif /* __ASM_R8A73A4_H__ */

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

+1 −8
Original line number Diff line number Diff line
@@ -295,13 +295,6 @@ void __init r8a73a4_add_standard_devices(void) 
	r8a73a4_register_dmac();

}



void __init r8a73a4_init_early(void)

{

#ifndef CONFIG_ARM_ARCH_TIMER

	shmobile_setup_delay(1500, 2, 4); /* Cortex-A15 @ 1500MHz */

#endif

}



#ifdef CONFIG_USE_OF



static const char *r8a73a4_boards_compat_dt[] __initdata = {
@@ -310,7 +303,7 @@ static const char *r8a73a4_boards_compat_dt[] __initdata = { 
};



DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)")

	.init_early	= r8a73a4_init_early,

	.init_early	= shmobile_init_delay,

	.init_late	= shmobile_init_late,

	.dt_compat	= r8a73a4_boards_compat_dt,

MACHINE_END