aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mvebu/armada-370-xp.c
diff options
context:
space:
mode:
authorSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>2013-05-10 21:08:09 -0400
committerJason Cooper <jason@lakedaemon.net>2013-05-29 15:21:20 -0400
commit9cbbc51551522efbc8313d45178a3415fd474eab (patch)
tree8bc506d82ceec2d0fa73c28b0f0d245408140030 /arch/arm/mach-mvebu/armada-370-xp.c
parented9f30a273d3868737104d17234859ca02c857b7 (diff)
ARM: mvebu: move DT boards to SoC-centric clock init
SoC centric clock init for Armada 370/XP 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-mvebu/armada-370-xp.c')
-rw-r--r--arch/arm/mach-mvebu/armada-370-xp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index 42a4cb3087e2..1d018e420208 100644
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -14,10 +14,10 @@
14 14
15#include <linux/kernel.h> 15#include <linux/kernel.h>
16#include <linux/init.h> 16#include <linux/init.h>
17#include <linux/clk-provider.h>
17#include <linux/of_platform.h> 18#include <linux/of_platform.h>
18#include <linux/io.h> 19#include <linux/io.h>
19#include <linux/time-armada-370-xp.h> 20#include <linux/time-armada-370-xp.h>
20#include <linux/clk/mvebu.h>
21#include <linux/dma-mapping.h> 21#include <linux/dma-mapping.h>
22#include <linux/mbus.h> 22#include <linux/mbus.h>
23#include <linux/irqchip.h> 23#include <linux/irqchip.h>
@@ -45,7 +45,7 @@ void __init armada_370_xp_map_io(void)
45 45
46void __init armada_370_xp_timer_and_clk_init(void) 46void __init armada_370_xp_timer_and_clk_init(void)
47{ 47{
48 mvebu_clocks_init(); 48 of_clk_init(NULL);
49 armada_370_xp_timer_init(); 49 armada_370_xp_timer_init();
50} 50}
51 51