提交 09bd745b 编写于 作者: U Ulrich Hecht 提交者: Simon Horman

ARM: shmobile: sh73a0: disable legacy clock initialization

Disables sh73a0_clock_init() if CCF is enabled.
Signed-off-by: NUlrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: NLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: NGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: NGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: NSimon Horman <horms+renesas@verge.net.au>
上级 f73e1e28
...@@ -763,7 +763,9 @@ void __init __weak sh73a0_register_twd(void) { } ...@@ -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) ...@@ -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);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册