diff options
author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-08-27 09:19:10 -0400 |
---|---|---|
committer | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-09-29 15:09:37 -0400 |
commit | 638085eea1cb218bc9267d8629fb1982e1ff7c3b (patch) | |
tree | 45451084ad7735ca9eb5d73a79a1eb56210d27a9 /arch/arm/mach-nspire | |
parent | e70ded64e6e08d7d35932b4a66a791480edfc0d1 (diff) |
ARM: nspire: remove custom .init_time hook
With arch/arm calling of_clk_init(NULL) from time_init(), we can now
remove custom .init_time hooks.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Diffstat (limited to 'arch/arm/mach-nspire')
-rw-r--r-- | arch/arm/mach-nspire/nspire.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/mach-nspire/nspire.c b/arch/arm/mach-nspire/nspire.c index 99e26092a9f7..4b2ed2e8352f 100644 --- a/arch/arm/mach-nspire/nspire.c +++ b/arch/arm/mach-nspire/nspire.c | |||
@@ -14,11 +14,9 @@ | |||
14 | #include <linux/of_platform.h> | 14 | #include <linux/of_platform.h> |
15 | #include <linux/irqchip.h> | 15 | #include <linux/irqchip.h> |
16 | #include <linux/irqchip/arm-vic.h> | 16 | #include <linux/irqchip/arm-vic.h> |
17 | #include <linux/clk-provider.h> | ||
18 | #include <linux/clkdev.h> | 17 | #include <linux/clkdev.h> |
19 | #include <linux/amba/bus.h> | 18 | #include <linux/amba/bus.h> |
20 | #include <linux/amba/clcd.h> | 19 | #include <linux/amba/clcd.h> |
21 | #include <linux/clocksource.h> | ||
22 | 20 | ||
23 | #include <asm/mach/arch.h> | 21 | #include <asm/mach/arch.h> |
24 | #include <asm/mach-types.h> | 22 | #include <asm/mach-types.h> |
@@ -65,12 +63,6 @@ static void __init nspire_init(void) | |||
65 | nspire_auxdata, NULL); | 63 | nspire_auxdata, NULL); |
66 | } | 64 | } |
67 | 65 | ||
68 | static void __init nspire_init_time(void) | ||
69 | { | ||
70 | of_clk_init(NULL); | ||
71 | clocksource_of_init(); | ||
72 | } | ||
73 | |||
74 | static void nspire_restart(char mode, const char *cmd) | 66 | static void nspire_restart(char mode, const char *cmd) |
75 | { | 67 | { |
76 | void __iomem *base = ioremap(NSPIRE_MISC_PHYS_BASE, SZ_4K); | 68 | void __iomem *base = ioremap(NSPIRE_MISC_PHYS_BASE, SZ_4K); |
@@ -83,7 +75,6 @@ static void nspire_restart(char mode, const char *cmd) | |||
83 | DT_MACHINE_START(NSPIRE, "TI-NSPIRE") | 75 | DT_MACHINE_START(NSPIRE, "TI-NSPIRE") |
84 | .dt_compat = nspire_dt_match, | 76 | .dt_compat = nspire_dt_match, |
85 | .map_io = nspire_map_io, | 77 | .map_io = nspire_map_io, |
86 | .init_time = nspire_init_time, | ||
87 | .init_machine = nspire_init, | 78 | .init_machine = nspire_init, |
88 | .restart = nspire_restart, | 79 | .restart = nspire_restart, |
89 | MACHINE_END | 80 | MACHINE_END |