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>

diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index 93ebe3430bfe707ac234b35f37deb54a1998a531..354cab111bf17ea61a0e68a6673beb7d643a9bb9 100644 (file)
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -763,7 +763,9 @@ void __init __weak sh73a0_register_twd(void) { }
 void __init sh73a0_earlytimer_init(void)
 {
        shmobile_init_delay();
+#ifndef CONFIG_COMMON_CLK
        sh73a0_clock_init();
+#endif
        shmobile_earlytimer_init();
        sh73a0_register_twd();
 }
@@ -782,8 +784,9 @@ void __init sh73a0_add_early_devices(void)
 void __init sh73a0_add_standard_devices_dt(void)
 {
        /* clocks are setup late during boot in the case of DT */
+#ifndef CONFIG_COMMON_CLK
        sh73a0_clock_init();
-
+#endif
        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }