X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;ds=sidebyside;f=arch%2Farm%2Fmach-shmobile%2Fsetup-sh73a0.c;h=faea74a2151b1ca6849065f27e2d356711fe8ba5;hb=18656782a820f075cb5c168a2e381a8938b1550a;hp=a8593d1241be7f2ad77a47b33b2ba0af91b3ee8b;hpb=a233bb742aed62fc6164073d9835135f639b8828;p=mirror_ubuntu-artful-kernel.git

diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index a8593d1241be..faea74a2151b 100644
--- 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);
 }