diff options
| author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-05-11 01:08:08 (GMT) |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-05-29 19:21:13 (GMT) |
| commit | ed9f30a273d3868737104d17234859ca02c857b7 (patch) | |
| tree | be0b61fe63e66491dce88610d9dfc5ad4c1912ab /arch/arm/mach-kirkwood | |
| parent | 367dc18dbae2d94e6486af3edc268443d716cb34 (diff) | |
| download | linux-fsl-qoriq-ed9f30a273d3868737104d17234859ca02c857b7.tar.xz | |
ARM: kirkwood: move DT boards to SoC-centric clock init
SoC centric clock init for Kirkwood can be used by calling of_clk_init.
Use it and get rid of mvebu_clocks_init.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/mach-kirkwood')
| -rw-r--r-- | arch/arm/mach-kirkwood/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/board-dt.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig index 7509a89..79ee9f2 100644 --- a/arch/arm/mach-kirkwood/Kconfig +++ b/arch/arm/mach-kirkwood/Kconfig @@ -134,13 +134,12 @@ comment "Device tree entries" config ARCH_KIRKWOOD_DT bool "Marvell Kirkwood Flattened Device Tree" + select KIRKWOOD_CLK select POWER_SUPPLY select POWER_RESET select POWER_RESET_GPIO select REGULATOR select REGULATOR_FIXED_VOLTAGE - select MVEBU_CLK_CORE - select MVEBU_CLK_GATING select USE_OF help Say 'Y' here if you want your kernel to support the diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c index e9647b8..2f695e5 100644 --- a/arch/arm/mach-kirkwood/board-dt.c +++ b/arch/arm/mach-kirkwood/board-dt.c @@ -15,7 +15,6 @@ #include <linux/of.h> #include <linux/of_platform.h> #include <linux/clk-provider.h> -#include <linux/clk/mvebu.h> #include <linux/kexec.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -77,7 +76,7 @@ static void __init kirkwood_legacy_clk_init(void) static void __init kirkwood_of_clk_init(void) { - mvebu_clocks_init(); + of_clk_init(NULL); kirkwood_legacy_clk_init(); } |