diff options
author | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2012-11-17 09:22:24 -0500 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-20 08:46:48 -0500 |
commit | 9d2027830c6306b079d5e888d40ec1f2efebd6ad (patch) | |
tree | d47d9ad6975a0895bfd78cc6f83300c72993de21 /arch/arm/mach-mvebu | |
parent | c4c34d608482b48c1c007fecea5a7a5c65168fa2 (diff) |
clk: armada-370-xp: add support for clock framework
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by Gregory CLEMENT <gregory.clement@free-electrons.com>
Diffstat (limited to 'arch/arm/mach-mvebu')
-rw-r--r-- | arch/arm/mach-mvebu/Kconfig | 4 | ||||
-rw-r--r-- | arch/arm/mach-mvebu/armada-370-xp.c | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 416d46ef7ebd..79299cd94f0f 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig | |||
@@ -9,6 +9,10 @@ config ARCH_MVEBU | |||
9 | select PINCTRL | 9 | select PINCTRL |
10 | select PLAT_ORION | 10 | select PLAT_ORION |
11 | select SPARSE_IRQ | 11 | select SPARSE_IRQ |
12 | select CLKDEV_LOOKUP | ||
13 | select MVEBU_CLK_CORE | ||
14 | select MVEBU_CLK_CPU | ||
15 | select MVEBU_CLK_GATING | ||
12 | 16 | ||
13 | if ARCH_MVEBU | 17 | if ARCH_MVEBU |
14 | 18 | ||
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c index 49d791548ad6..3292d6da5dc7 100644 --- a/arch/arm/mach-mvebu/armada-370-xp.c +++ b/arch/arm/mach-mvebu/armada-370-xp.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/of_platform.h> | 17 | #include <linux/of_platform.h> |
18 | #include <linux/io.h> | 18 | #include <linux/io.h> |
19 | #include <linux/time-armada-370-xp.h> | 19 | #include <linux/time-armada-370-xp.h> |
20 | #include <linux/clk/mvebu.h> | ||
20 | #include <asm/mach/arch.h> | 21 | #include <asm/mach/arch.h> |
21 | #include <asm/mach/map.h> | 22 | #include <asm/mach/map.h> |
22 | #include <asm/mach/time.h> | 23 | #include <asm/mach/time.h> |
@@ -37,8 +38,14 @@ void __init armada_370_xp_map_io(void) | |||
37 | iotable_init(armada_370_xp_io_desc, ARRAY_SIZE(armada_370_xp_io_desc)); | 38 | iotable_init(armada_370_xp_io_desc, ARRAY_SIZE(armada_370_xp_io_desc)); |
38 | } | 39 | } |
39 | 40 | ||
41 | void __init armada_370_xp_timer_and_clk_init(void) | ||
42 | { | ||
43 | mvebu_clocks_init(); | ||
44 | armada_370_xp_timer_init(); | ||
45 | } | ||
46 | |||
40 | struct sys_timer armada_370_xp_timer = { | 47 | struct sys_timer armada_370_xp_timer = { |
41 | .init = armada_370_xp_timer_init, | 48 | .init = armada_370_xp_timer_and_clk_init, |
42 | }; | 49 | }; |
43 | 50 | ||
44 | static void __init armada_370_xp_dt_init(void) | 51 | static void __init armada_370_xp_dt_init(void) |