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

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

ARM: shmobile: sh73a0: Always use shmobile_setup_delay() 



Break out the function sh73a0_init_delay() that now
gets called both for the C version of the code and
the DT -reference boards. This way we handle both
cases in the same way.

Allows us to boot with TWD only in the kernel configuration
for C board code. TWD is not yet enabled in the case of
DT -reference - this due to a dependency on CCF.

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

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

+6 −5
Original line number Diff line number Diff line
@@ -929,11 +929,17 @@ void __init sh73a0_add_standard_devices(void) 
			    ARRAY_SIZE(sh73a0_late_devices));

}



void __init sh73a0_init_delay(void)

{

	shmobile_setup_delay(1196, 44, 46); /* Cortex-A9 @ 1196MHz */

}



/* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */

void __init __weak sh73a0_register_twd(void) { }



void __init sh73a0_earlytimer_init(void)

{

	sh73a0_init_delay();

	sh73a0_clock_init();

	shmobile_earlytimer_init();

	sh73a0_register_twd();
@@ -952,11 +958,6 @@ void __init sh73a0_add_early_devices(void) 


#ifdef CONFIG_USE_OF



void __init sh73a0_init_delay(void)

{

	shmobile_setup_delay(1196, 44, 46); /* Cortex-A9 @ 1196MHz */

}



static const struct of_dev_auxdata sh73a0_auxdata_lookup[] __initconst = {

	{},

};