openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This commit is contained in:
Magnus Damm 2013-05-22 15:04:14 +09:00 committed by Simon Horman
parent d23473828c
commit 43cb8cb739
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/mach-shmobile/setup-sh73a0.c
View File

@ -929,11 +929,17 @@ void __init sh73a0_add_standard_devices(void)
ARRAY_SIZE(sh73a0_late_devices)); 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 */ /* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */
void __init __weak sh73a0_register_twd(void) { } void __init __weak sh73a0_register_twd(void) { }
void __init sh73a0_earlytimer_init(void) void __init sh73a0_earlytimer_init(void)
{ {
sh73a0_init_delay();
sh73a0_clock_init(); sh73a0_clock_init();
shmobile_earlytimer_init(); shmobile_earlytimer_init();
sh73a0_register_twd(); sh73a0_register_twd();
@ -952,11 +958,6 @@ void __init sh73a0_add_early_devices(void)
#ifdef CONFIG_USE_OF #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 = { static const struct of_dev_auxdata sh73a0_auxdata_lookup[] __initconst = {
{}, {},
}; };