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

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

ARM: shmobile: Make r8a73a4 Arch timer optional 



Update the r8a73a4 code to allow using other
timers than Arch timer for clock event

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

arch/arm/mach-shmobile/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ config ARCH_R8A73A4 
	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_GIC

	select CPU_V7

	select HAVE_ARM_ARCH_TIMER

	select SH_CLK_CPG

	select RENESAS_IRQC

	select ARCH_HAS_CPUFREQ

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

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ static const char *ape6evm_boards_compat_dt[] __initdata = { 
};



DT_MACHINE_START(APE6EVM_DT, "ape6evm")

	.init_early	= r8a73a4_init_delay,

	.init_time	= shmobile_timer_init,

	.init_machine	= ape6evm_add_standard_devices,

	.dt_compat	= ape6evm_boards_compat_dt,

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

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

void r8a73a4_clock_init(void);

void r8a73a4_pinmux_init(void);

void r8a73a4_init_delay(void);



#endif /* __ASM_R8A73A4_H__ */

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

+8 −0
Original line number Diff line number Diff line
@@ -202,6 +202,13 @@ void __init r8a73a4_add_standard_devices(void) 
	r8a7790_register_cmt(10);

}



void __init r8a73a4_init_delay(void)

{

#ifndef CONFIG_ARM_ARCH_TIMER

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

#endif

}



#ifdef CONFIG_USE_OF

void __init r8a73a4_add_standard_devices_dt(void)

{
@@ -215,6 +222,7 @@ static const char *r8a73a4_boards_compat_dt[] __initdata = { 
};



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

	.init_early	= r8a73a4_init_delay,

	.init_machine	= r8a73a4_add_standard_devices_dt,

	.init_time	= shmobile_timer_init,

	.dt_compat	= r8a73a4_boards_compat_dt,