Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15f0c8f2 authored by Rich Felker's avatar Rich Felker
Browse files

sh: use common clock framework with device tree boards 



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: default avatarRich Felker <dalias@libc.org>
parent 74bdaa61

arch/sh/boards/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/sh/kernel/cpu/clock.c

+4 −0
Original line number Diff line number Diff line
@@ -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;

}