mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 16:15:11 +00:00
ARM: shmobile: sh73a0: disable legacy clock initialization
Disables sh73a0_clock_init() if CCF is enabled. Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This commit is contained in:
parent
f73e1e28b5
commit
09bd745b55
1 changed files with 4 additions and 1 deletions
|
@ -763,7 +763,9 @@ void __init __weak sh73a0_register_twd(void) { }
|
||||||
void __init sh73a0_earlytimer_init(void)
|
void __init sh73a0_earlytimer_init(void)
|
||||||
{
|
{
|
||||||
shmobile_init_delay();
|
shmobile_init_delay();
|
||||||
|
#ifndef CONFIG_COMMON_CLK
|
||||||
sh73a0_clock_init();
|
sh73a0_clock_init();
|
||||||
|
#endif
|
||||||
shmobile_earlytimer_init();
|
shmobile_earlytimer_init();
|
||||||
sh73a0_register_twd();
|
sh73a0_register_twd();
|
||||||
}
|
}
|
||||||
|
@ -782,8 +784,9 @@ void __init sh73a0_add_early_devices(void)
|
||||||
void __init sh73a0_add_standard_devices_dt(void)
|
void __init sh73a0_add_standard_devices_dt(void)
|
||||||
{
|
{
|
||||||
/* clocks are setup late during boot in the case of DT */
|
/* clocks are setup late during boot in the case of DT */
|
||||||
|
#ifndef CONFIG_COMMON_CLK
|
||||||
sh73a0_clock_init();
|
sh73a0_clock_init();
|
||||||
|
#endif
|
||||||
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
|
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue