aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-kirkwood/board-dt.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-05-31 23:23:25 -0700
committerOlof Johansson <olof@lixom.net>2013-05-31 23:23:25 -0700
commit85b9174fda1d516198b4a46a7795e43636a3ea4c (patch)
tree2721a32c07ca3e1d46df573a19b4e92853688966 /arch/arm/mach-kirkwood/board-dt.c
parent2dbefbf6a803d65f6327fe617f5e1960f218ce01 (diff)
parentea7e0bd7e78868bbe6df6834595ef96166dd296a (diff)
downloadkernel_goldelico_gta04-85b9174fda1d516198b4a46a7795e43636a3ea4c.zip
kernel_goldelico_gta04-85b9174fda1d516198b4a46a7795e43636a3ea4c.tar.gz
kernel_goldelico_gta04-85b9174fda1d516198b4a46a7795e43636a3ea4c.tar.bz2
Merge tag 'seb_clk-3.11' of git://git.infradead.org/users/jcooper/linux into next/soc
From Jason Cooper: mvebu clock restructuring for v3.11 - clk: mvebu - reorganize by SoC to remove built up #ifdefs - add clk flags per clock gate * tag 'seb_clk-3.11' of git://git.infradead.org/users/jcooper/linux: clk: mvebu: disintegrate obsolete file ARM: mvebu: move DT boards to SoC-centric clock init ARM: kirkwood: move DT boards to SoC-centric clock init ARM: dove: move DT boards to SoC-centric clock init clk: mvebu: add Armada XP SoC-centric clock init clk: mvebu: add Armada 370 SoC-centric clock init clk: mvebu: add Kirkwood SoC-centric clock init clk: mvebu: add Dove SoC-centric clock init clk: mvebu: add common clock functions for core clk and clk gating clk: mvebu: introduce per-clock-gate flags
Diffstat (limited to 'arch/arm/mach-kirkwood/board-dt.c')
-rw-r--r--arch/arm/mach-kirkwood/board-dt.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index 57d4fa1..cee5dc7 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>
@@ -72,7 +71,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();
}