Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[cascardo/linux.git] / arch / arm / mach-shmobile / setup-sh73a0.c

diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index a8593d1..faea74a 100644 (file)
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -766,7 +766,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();
 }
@@ -785,8 +787,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);
 }