sh: use common clock framework with device tree boards

Rich Felker · Rich Felker · commit 15f0c8f2f378 · 2016-08-05T03:29:45.000Z
Enable common clk framework for DT-based boards and disable code that
depends on the legacy sh clk framework when common clk is enabled.
Once legacy drivers are converted over, the old code can be removed
entirely.

Signed-off-by: Rich Felker &lt;dalias@libc.org&gt;
diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig
@@ -11,6 +11,7 @@ config SH_DEVICE_TREE
 	select OF
 	select OF_EARLY_FLATTREE
 	select CLKSRC_OF
+	select COMMON_CLK
 	select GENERIC_CALIBRATE_DELAY
 	help
 	  Select Board Described by Device Tree to build a kernel that
diff --git a/arch/sh/kernel/cpu/clock.c b/arch/sh/kernel/cpu/clock.c
@@ -24,11 +24,13 @@ int __init clk_init(void)
 {
 	int ret;
 
+#ifndef CONFIG_COMMON_CLK
 	ret = arch_clk_init();
 	if (unlikely(ret)) {
 		pr_err("%s: CPU clock registration failed.\n", __func__);
 		return ret;
 	}
+#endif
 
 	if (sh_mv.mv_clk_init) {
 		ret = sh_mv.mv_clk_init();
@@ -39,11 +41,13 @@ int __init clk_init(void)
 		}
 	}
 
+#ifndef CONFIG_COMMON_CLK
 	/* Kick the child clocks.. */
 	recalculate_root_clocks();
 
 	/* Enable the necessary init clocks */
 	clk_enable_init_clocks();
+#endif
 
 	return ret;
 }

Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,13 @@ int __init clk_init(void)`
`24`	`24`	`{`
`25`	`25`	`int ret;`
`26`	`26`
	`27`	`+#ifndef CONFIG_COMMON_CLK`
`27`	`28`	`ret = arch_clk_init();`
`28`	`29`	`if (unlikely(ret)) {`
`29`	`30`	`pr_err("%s: CPU clock registration failed.\n", __func__);`
`30`	`31`	`return ret;`
`31`	`32`	`}`
	`33`	`+#endif`
`32`	`34`
`33`	`35`	`if (sh_mv.mv_clk_init) {`
`34`	`36`	`ret = sh_mv.mv_clk_init();`
`@@ -39,11 +41,13 @@ int __init clk_init(void)`
`39`	`41`	`}`
`40`	`42`	`}`
`41`	`43`
	`44`	`+#ifndef CONFIG_COMMON_CLK`
`42`	`45`	`/* Kick the child clocks.. */`
`43`	`46`	`recalculate_root_clocks();`
`44`	`47`
`45`	`48`	`/* Enable the necessary init clocks */`
`46`	`49`	`clk_enable_init_clocks();`
	`50`	`+#endif`
`47`	`51`
`48`	`52`	`return ret;`
`49`	`53`	`}`